diff --git a/Modules/ImageViewer/imagevieweritem.cpp b/Modules/ImageViewer/imagevieweritem.cpp
index e6e7dfc0644fd1e326b1af278e5811b0678c255f..3b8b745d6069e0647f46d5c541700c5db2834cf9 100644
--- a/Modules/ImageViewer/imagevieweritem.cpp
+++ b/Modules/ImageViewer/imagevieweritem.cpp
@@ -70,7 +70,10 @@ void ImageViewerItem::setId(int value)
XmlObject ImageViewerItem::toXmlObject() const
{
- return xml;
+ XmlObject xmlObj = xml;
+ xmlObj.addAttribute("topX", getTopLeftCornerPosition().x());
+ xmlObj.addAttribute("topY", getTopLeftCornerPosition().y());
+ return xmlObj;
}
void ImageViewerItem::operator =(const ImageViewerItem &other)
@@ -193,6 +196,12 @@ void ImageViewerItem::setXml(const XmlObject &value)
XmlObject *text = childs[0];
setText(text->getTextValue());
}
+
+
+ int topx, topy;
+ if(value.getIntAttribute("topX", topx) && value.getIntAttribute("topY", topy)){
+ setTopLeftCornerPosition(QPointF(topx, topy));
+ }
}
QString ImageViewerItem::getCurrentBorderColor() const
diff --git a/Modules/ImageViewer/imageviewermodule.cpp b/Modules/ImageViewer/imageviewermodule.cpp
index 9a1e7e933398e1f7f1c72ff47147fe2249933d21..388628ade4793c54da6ac9b81c24b5ce7a77637d 100644
--- a/Modules/ImageViewer/imageviewermodule.cpp
+++ b/Modules/ImageViewer/imageviewermodule.cpp
@@ -7,14 +7,14 @@
#include "Modules/Utility/contextmenuseparator.h"
#include "Core/modulemessagesbroker.h"
#include "Modules/skywardhubstrings.h"
-#include "imageviewermodulesettings.h"
#include <QMouseEvent>
#include <QMessageBox>
+#include <QInputDialog>
ImageViewerModule::ImageViewerModule(QWidget *parent) : DefaultModule(parent), ui(new Ui::ImageViewerModule)
{
ui->setupUi(this);
- showImage(filePath);
+ showImage(fileName);
defaultContextMenuSetup();
connect(ui->graphicsView, &QGraphicsView::customContextMenuRequested, this, &ImageViewerModule::onCustomContextMenuRequested);
connect(&scene, &CustomGraphicsScene::mouseMoved, this, &ImageViewerModule::onMouseMoved);
@@ -44,78 +44,33 @@ QWidget *ImageViewerModule::toWidget()
XmlObject ImageViewerModule::toXmlObject()
{
XmlObject obj(getName(ModuleId::IMAGEVIEWER));
- obj.addAttribute("ImagePath",filePath);
-
- for(QString l : labels.keys()){
- XmlObject label("Label");
- label.addAttribute("Name",l);
- label.addAttribute("x",QString::number(labels[l]->x()));
- label.addAttribute("y",QString::number(labels[l]->y()));
- label.addAttribute("Topic", getTopicOf(l));
- obj.addChild(label);
+ obj.addAttribute("ImageName", fileName);
+
+ for(int key : imageViewerItems.keys()){
+ ImageViewerItem* item = imageViewerItems[key];
+ obj.addChild(item->toXmlObject());
}
+
return obj;
}
void ImageViewerModule::fromXmlObject(const XmlObject &xmlObject)
{
if(xmlObject.getObjectName() == getName(ModuleId::IMAGEVIEWER)){
- QString path = xmlObject.getAttribute("ImagePath");
+ QString path = xmlObject.getAttribute("ImageName");
if(path != ""){
- this->filePath = path;
- showImage(filePath);
+ this->fileName = path;
+ showImage(fileName);
}
for(int i = 0; i < xmlObject.childCount(); i++){
XmlObject child = xmlObject.childAt(i);
- if(child.getObjectName() == "Label"){
- QString name = child.getAttribute("Name");
- bool ok_x;
- int x = child.getAttribute("x").toInt(&ok_x);
- bool ok_y;
- int y = child.getAttribute("y").toInt(&ok_y);
- QString topic = child.getAttribute("Topic");
-
- if(name != "" && ok_x && ok_y && topic != ""){
- QString finalName = addLabel(name);
- onXChanged(finalName,x);
- onYChanged(finalName,y);
- onTopicChanged(finalName, topic);
- }
+ if(child.getObjectName() == "svg"){
+ addItem(child);
}
}
}
}
-QString ImageViewerModule::addLabel(const QString &labelName)
-{
- int count = 0;
- QString tempName(labelName);
- while (labels.contains(tempName)) {
- count++;
- tempName = labelName + " " + QString::number(count);
- }
-
- labels[tempName] = scene.addText(tempName);
-
- initializeText(labels[tempName]);
- return tempName;
-}
-
-void ImageViewerModule::initializeText(QGraphicsTextItem *label)
-{
- if(label != nullptr){
- label->setTextWidth(200);
-
- QTextOption option = label->document()->defaultTextOption();
- option.setAlignment(Qt::AlignCenter);
- label->document()->setDefaultTextOption(option);
-
- QFont font;
- font.setPointSize(18);
- label->setDefaultTextColor(QColor(0, 165, 0));
- label->setFont(font);
- }
-}
void ImageViewerModule::resizeEvent(QResizeEvent *event)
{
@@ -123,19 +78,11 @@ void ImageViewerModule::resizeEvent(QResizeEvent *event)
fitImage();
}
-
-QString ImageViewerModule::getTopicOf(const QString &labelName)
-{
- for(QString topic : labelsSubscriptions.keys()){
- if(labelName == labelsSubscriptions[topic])
- return topic;
- }
- return "";
-}
-
-void ImageViewerModule::showImage(const QString &filePath)
+void ImageViewerModule::showImage(const QString &filename)
{
- QPixmap pixmap(filePath);
+ firstResizeDone = false;
+ QString filePaht = SkywardHubStrings::defaultConfigurationFolder + "/" + filename;
+ QPixmap pixmap(filePaht);
showImage(pixmap);
}
@@ -147,102 +94,24 @@ void ImageViewerModule::showImage(const QPixmap &pixmap)
fitImage();
}
-void ImageViewerModule::onSettingsClicked()
+void ImageViewerModule::addItem(const XmlObject &xml)
{
- ImageViewerModuleSettings *settingsPanel = new ImageViewerModuleSettings();
- for(QString s: labels.keys()){
- settingsPanel->addLabelsView(s, labels[s]->x(), labels[s]->y(), getTopicOf(s));
- }
- settingsPanel->setWindowTitle("Image Settings");
- settingsPanel->setImageFilePath(filePath);
- connect(settingsPanel, &ImageViewerModuleSettings::addLabelRequested, this, &ImageViewerModule::onLabelAddedRequest);
- connect(settingsPanel, &ImageViewerModuleSettings::labelDeleted, this, &ImageViewerModule::onLabelDeleted);
- connect(settingsPanel, &ImageViewerModuleSettings::xChanged, this, &ImageViewerModule::onXChanged);
- connect(settingsPanel, &ImageViewerModuleSettings::yChanged, this, &ImageViewerModule::onYChanged);
- connect(settingsPanel, &ImageViewerModuleSettings::topicChanged, this, &ImageViewerModule::onTopicChanged);
- connect(settingsPanel, &ImageViewerModuleSettings::imageFilePathChanged, this, &ImageViewerModule::onImageFilePathChanged);
- settingsPanel->show();
-}
-
-void ImageViewerModule::onLabelAddedRequest(ImageViewerModuleSettings *sender, const QString &labelName)
-{
- QString tempName = addLabel(labelName);
- if(sender != nullptr){
- sender->addLabelsView(tempName);
- }
-}
-
-void ImageViewerModule::onLabelDeleted(const QString &labelName)
-{
- if(labels.contains(labelName)){
- QGraphicsTextItem *label = labels[labelName];
- scene.removeItem(label);
- delete label;
- labels.remove(labelName);
- unsubscribeLabels(labelName);
- }
-}
-
-void ImageViewerModule::onXChanged(const QString &labelName, int x)
-{
- if(labels.contains(labelName)){
- labels[labelName]->setX(x);
- }
-}
-
-void ImageViewerModule::onYChanged(const QString &labelName, int y)
-{
- if(labels.contains(labelName)){
- labels[labelName]->setY(y);
- }
-}
-
-void ImageViewerModule::unsubscribeLabels(const QString &label){
- QString topic = getTopicOf(label);
- if(topic != ""){
- getCore()->getModuleMessagesBroker()->unsubscribe(topic,this);
- labelsSubscriptions.remove(topic);
- }
-}
-
-void ImageViewerModule::onTopicChanged(const QString &labelName, const QString &newTopic)
-{
- if(labelsSubscriptions.contains(newTopic)){
- if(labelsSubscriptions[newTopic] == labelName)
- return;
- }
-
- while (getTopicOf(labelName) != "") {
- unsubscribeLabels(labelName);
- }
-
- labelsSubscriptions[newTopic] = labelName;
- getCore()->getModuleMessagesBroker()->subscribe(newTopic,this, [this](const ModuleMessage &msg){
- this->onReceiveMsg(msg);
- });
-}
+ int itemId = onAddNewItemRequested();
+ if(imageViewerItems.contains(itemId)){
+ ImageViewerItem *item = imageViewerItems[itemId];
+ item->setXml(xml);
-//void ImageViewerModule::onReceiveMsg(const ModuleMessage &msg)
-//{
-// if(labelsSubscriptions.contains(msg.topic())){
-// QString labelName = labelsSubscriptions[msg.topic()];
-// if(labels.contains(labelName)){
-// setLabelText(labels[labelName], msg.payload());
-// }
-// }
-//}
-
-void ImageViewerModule::setLabelText(QGraphicsTextItem *label, const QString &txt)
-{
- if(label != nullptr){
- label->setPlainText(/*labelName +'\n' +*/ txt);
+ if(!item->getTopic().isEmpty()){
+ onItemTopicChanged(item);
+ }
+ scene.updateImageViewItem(item);
}
}
void ImageViewerModule::addCustomActionsToMenu()
{
- QAction* settings = new QAction("Settings");
- connect(settings, &QAction::triggered,this, &ImageViewerModule::onSettingsClicked);
+ QAction* settings = new QAction("Change Image Name");
+ connect(settings, &QAction::triggered,this, &ImageViewerModule::onChangeImageRequested);
QAction* fitView = new QAction("Fit Image");
connect(fitView, &QAction::triggered,this, &ImageViewerModule::fitImage);
@@ -263,6 +132,16 @@ void ImageViewerModule::addCustomActionsToMenu()
addActionToMenu(showInfo);
}
+void ImageViewerModule::onChangeImageRequested()
+{
+ bool ok;
+ QString text = QInputDialog::getText(this, "Select new image name",
+ "Input a new name for the image file. Remembre to put the extention at the end of the file and put the file in the " + SkywardHubStrings::defaultConfigurationFolder + " folder" ,
+ QLineEdit::Normal, fileName, &ok);
+ if (ok && !text.isEmpty())
+ onImageFilePathChanged(text);
+}
+
void ImageViewerModule::fitImage()
@@ -274,18 +153,15 @@ void ImageViewerModule::onImageFilePathChanged(const QString &newFilePath)
{
QString trimmedFilePath = newFilePath.trimmed();
if(trimmedFilePath != ""){
- filePath = trimmedFilePath;
- showImage(filePath);
+ fileName = trimmedFilePath;
+ showImage(fileName);
}
}
-
-// NEW IMPLEMENTATION ______________________________________________
-
-void ImageViewerModule::onAddNewItemRequested()
+int ImageViewerModule::onAddNewItemRequested()
{
- addNewItem(QPointF(200, 100));
+ return addNewItem(defaultCreationPoint);
}
void ImageViewerModule::onMouseMoved(const QPointF &point)
@@ -339,9 +215,9 @@ void ImageViewerModule::onDoubleClick(const QPointF &point)
}
}
-void ImageViewerModule::addNewItem(const QPointF &point)
+int ImageViewerModule::addNewItem(const QPointF &point)
{
- addItem(createNewItem(point));
+ return addItem(createNewItem(point));
}
int ImageViewerModule::pickUnusedItemId()
@@ -360,10 +236,11 @@ ImageViewerItem *ImageViewerModule::createNewItem(const QPointF &point)
return newItem;
}
-void ImageViewerModule::addItem(ImageViewerItem *item)
+int ImageViewerModule::addItem(ImageViewerItem *item)
{
imageViewerItems[item->getId()] = item;
scene.addImageViewItem(item);
+ return item->getId();
}
void ImageViewerModule::showInSettings(ImageViewerItem *item)
diff --git a/Modules/ImageViewer/imageviewermodule.h b/Modules/ImageViewer/imageviewermodule.h
index a002aa4c99787493d8d03706d28645d863030ee4..c3279465e10841421d7d4aa3cfee59c653f42be6 100644
--- a/Modules/ImageViewer/imageviewermodule.h
+++ b/Modules/ImageViewer/imageviewermodule.h
@@ -27,19 +27,12 @@ public:
XmlObject toXmlObject() override;
void fromXmlObject(const XmlObject &xmlObject) override;
- QString addLabel(const QString &labelName);
- QString getTopicOf(const QString &labelName);
-
- void showImage(const QString &filePath);
+ void showImage(const QString &filename);
void showImage(const QPixmap &pixmap);
+ void addItem(const XmlObject &xml);
public slots:
- void onSettingsClicked();
- void onLabelAddedRequest(ImageViewerModuleSettings *sender, const QString &labelName);
- void onLabelDeleted(const QString &labelName);
- void onXChanged(const QString &labelName, int x);
- void onYChanged(const QString &labelName, int y);
- void onTopicChanged(const QString &oldTopic, const QString &newTopic);
+
void onItemTopicChanged(ImageViewerItem *item);
void onReceiveMsg(const ModuleMessage &msg);
void fitImage();
@@ -47,22 +40,18 @@ public slots:
void onItemDeleteRequested(int itemId);
protected:
- void unsubscribeLabels(const QString &label);
- void initializeText(QGraphicsTextItem* label);
void resizeEvent(QResizeEvent *event) override;
- void setLabelText(QGraphicsTextItem* label, const QString &txt);
void addCustomActionsToMenu() override;
-
- // NEW IMPLEMENTATION ______________________________________________
- void onAddNewItemRequested();
+ void onChangeImageRequested();
+ int onAddNewItemRequested();
void onMouseMoved(const QPointF &point);
void onDragStarted(const QPointF &initialPosition);
void onDragStopped();
void onDoubleClick(const QPointF &point);
- void addNewItem(const QPointF &point);
+ int addNewItem(const QPointF &point);
int pickUnusedItemId();
ImageViewerItem* createNewItem(const QPointF &point);
- void addItem(ImageViewerItem *item);
+ int addItem(ImageViewerItem *item);
void showInSettings(ImageViewerItem *item);
void onSettingsSetupRequested(int id);
void onSettingsSetupToAllRequested();
@@ -72,17 +61,14 @@ private:
CustomGraphicsScene scene;
QGraphicsPixmapItem backgroundImg;
- QString filePath = SkywardHubStrings::defaultConfigurationFolder + "/overview.png";
- QMap<QString,QGraphicsTextItem*> labels;
- QMap<QString, QString> labelsSubscriptions; // Topic -> Label name
-
- bool isLeftMousePressed = false;
+ QString fileName = "overview.png";
QMap<int, ImageViewerItem*> imageViewerItems;
QMap<int, QString> topicMap; // Item id -> Topic
int lastUsedId = 0;
bool firstResizeDone = false;
ImageViewerSettings settingsPanel;
+ QPointF defaultCreationPoint = QPointF(200, 100);
};
#endif // IMAGEVIEWERMODULE_H
diff --git a/Modules/ImageViewer/imageviewermodulesettings.cpp b/Modules/ImageViewer/imageviewermodulesettings.cpp
deleted file mode 100644
index 2a3788ee010b2a0ee9312252abdb2bac62ba8e5d..0000000000000000000000000000000000000000
--- a/Modules/ImageViewer/imageviewermodulesettings.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-#include "imageviewermodulesettings.h"
-#include "ui_imageviewermodulesettings.h"
-
-#include <QRadioButton>
-#include <QLabel>
-#include <QSpinBox>
-#include <QHBoxLayout>
-#include <QDebug>
-#include <QFileDialog>
-
-ImageViewerModuleSettings::ImageViewerModuleSettings(QWidget *parent) : QWidget(parent), ui(new Ui::ImageViewerModuleSettings)
-{
- ui->setupUi(this);
- this->setAttribute(Qt::WA_DeleteOnClose, true);
- connectUiSlots();
-}
-
-ImageViewerModuleSettings::~ImageViewerModuleSettings()
-{
- delete ui;
- for(auto list : child.values()){
- for(QObject *c : list){
- delete c;
- }
- }
-}
-
-void ImageViewerModuleSettings::setImageFilePath(const QString &filePath)
-{
- ui->imageFilePath_lineEdit->setText(filePath);
-}
-
-void ImageViewerModuleSettings::onDeleteClicked()
-{
- if(selectedObject != nullptr && child.contains(selectedObject)){
- QList<QObject*> list = child[selectedObject];
- child.remove(selectedObject);
- QString labelName = selectedObject->text();
- for(QObject *c : list){
- delete c;
- }
- selectedObject = nullptr;
- emit labelDeleted(labelName);
- }
-}
-
-void ImageViewerModuleSettings::onAddClicked()
-{
- QString txt = ui->fieldName_lineEdit->text().trimmed();
- if(txt != nullptr && txt != ""){
- emit addLabelRequested(this,txt);
- }
-}
-
-void ImageViewerModuleSettings::onSearchClicked()
-{
- QString filePath = QFileDialog::getOpenFileName(nullptr, "Select image file","","");
- if(filePath != ""){
- setImageFilePath(filePath);
- }
-}
-
-void ImageViewerModuleSettings::onSaveFilePathClicked()
-{
- emit imageFilePathChanged(ui->imageFilePath_lineEdit->text());
-}
-
-void ImageViewerModuleSettings::addLabelsView(const QString &txt, int x, int y, const QString topic)
-{
- QHBoxLayout *layout = new QHBoxLayout();
-
- QRadioButton *radioButton = new QRadioButton(txt);
- QLabel *topicLabel = new QLabel(" Topic:");
- QLineEdit *topicEdit = new QLineEdit();
- QLabel *xName = new QLabel("x");
- QSpinBox *xView = new QSpinBox();
- QLabel *yName = new QLabel("y");
- QSpinBox *yView = new QSpinBox();
-
- int max = 1080;
- xView->setMaximum(max);
- xView->setValue(x);
- yView->setMaximum(max);
- yView->setValue(y);
-
- topicEdit->setText(topic);
-
- layout->addWidget(radioButton);
- layout->addWidget(topicLabel);
- layout->addWidget(topicEdit);
- layout->addWidget(xName);
- layout->addWidget(xView);
- layout->addWidget(yName);
- layout->addWidget(yView);
-
- child[radioButton].append(layout);
- child[radioButton].append(radioButton);
- child[radioButton].append(topicLabel);
- child[radioButton].append(topicEdit);
- child[radioButton].append(xName);
- child[radioButton].append(xView);
- child[radioButton].append(yName);
- child[radioButton].append(yView);
-
- ui->labels_layout->addLayout(layout);
-
- connect(radioButton,&QRadioButton::clicked,this, [this, radioButton](){
- selectedObject = radioButton;
- });
-
- connect(xView,QOverload<int>::of(&QSpinBox::valueChanged),this, [this,radioButton](int x){
- emit xChanged(radioButton->text(),x);
- });
-
- connect(yView,QOverload<int>::of(&QSpinBox::valueChanged),this, [this,radioButton](int y){
- emit yChanged(radioButton->text(),y);
- });
-
- connect(topicEdit,&QLineEdit::editingFinished,this, [this,radioButton, topicEdit](){
- QString txt = topicEdit->text().trimmed();
- emit topicChanged(radioButton->text(),txt);
- });
-}
-
-void ImageViewerModuleSettings::connectUiSlots()
-{
- connect(ui->delete_button,&QPushButton::clicked,this,&ImageViewerModuleSettings::onDeleteClicked);
- connect(ui->add_button,&QPushButton::clicked,this,&ImageViewerModuleSettings::onAddClicked);
- connect(ui->pushButton_search,&QPushButton::clicked,this,&ImageViewerModuleSettings::onSearchClicked);
- connect(ui->pushButton_saveFilePath,&QPushButton::clicked,this,&ImageViewerModuleSettings::onSaveFilePathClicked);
-}
-
diff --git a/Modules/ImageViewer/imageviewermodulesettings.h b/Modules/ImageViewer/imageviewermodulesettings.h
deleted file mode 100644
index a021bd16be0add8db006ef19579dabeaaba00f37..0000000000000000000000000000000000000000
--- a/Modules/ImageViewer/imageviewermodulesettings.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef IMAGEVIEWERMODULESETTINGS_H
-#define IMAGEVIEWERMODULESETTINGS_H
-
-#include <QWidget>
-#include <QList>
-#include <QGraphicsTextItem>
-#include <QRadioButton>
-
-namespace Ui {
-class ImageViewerModuleSettings;
-}
-
-class ImageViewerModuleSettings : public QWidget
-{
- Q_OBJECT
-
-public:
- explicit ImageViewerModuleSettings(QWidget *parent = nullptr);
- ~ImageViewerModuleSettings();
-
- void addLabelsView(const QString &txt, int x = 0, int y = 0, const QString topic = "");
- void setImageFilePath(const QString &filePath);
-
-signals:
- void imageFilePathChanged(const QString &newFIlePath);
- void xChanged(const QString &labelName, int x);
- void yChanged(const QString &labelName, int y);
- void addLabelRequested(ImageViewerModuleSettings *sender, const QString &labelName);
- void labelDeleted(const QString &labelName);
- void topicChanged(const QString &labelName, const QString &topic);
-
-protected slots:
- void onDeleteClicked();
- void onAddClicked();
- void onSearchClicked();
- void onSaveFilePathClicked();
-
-protected:
- void connectUiSlots();
-
-private:
- Ui::ImageViewerModuleSettings *ui;
- QMap<QObject*,QList<QObject*>> child;
- QRadioButton *selectedObject = nullptr;
-};
-
-#endif // IMAGEVIEWERMODULESETTINGS_H
diff --git a/Modules/ImageViewer/imageviewermodulesettings.ui b/Modules/ImageViewer/imageviewermodulesettings.ui
deleted file mode 100644
index 918e7c59cd763448fedc0979c8582ba15c942e7b..0000000000000000000000000000000000000000
--- a/Modules/ImageViewer/imageviewermodulesettings.ui
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ImageViewerModuleSettings</class>
- <widget class="QWidget" name="ImageViewerModuleSettings">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>719</width>
- <height>393</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Form</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Image Path</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="imageFilePath_lineEdit"/>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_search">
- <property name="text">
- <string>Search</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_saveFilePath">
- <property name="text">
- <string>Save</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QScrollArea" name="scrollArea">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="widgetResizable">
- <bool>true</bool>
- </property>
- <widget class="QWidget" name="scrollArea_layout">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>695</width>
- <height>307</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QVBoxLayout" name="labels_layout"/>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>192</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Field Name</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="fieldName_lineEdit"/>
- </item>
- <item>
- <widget class="QPushButton" name="add_button">
- <property name="text">
- <string>Add</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="delete_button">
- <property name="text">
- <string>Delete</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/SkywardHub.pro b/SkywardHub.pro
index 38ec4ce2c3021317d030b82a49683b792a5c7296..89fb89067b1c480d4211f9358d6de70f99c8e65d 100644
--- a/SkywardHub.pro
+++ b/SkywardHub.pro
@@ -39,7 +39,6 @@ SOURCES += \
Modules/ImageViewer/customgraphicsscene.cpp \
Modules/ImageViewer/imagevieweritem.cpp \
Modules/ImageViewer/imageviewermodule.cpp \
- Modules/ImageViewer/imageviewermodulesettings.cpp \
Modules/ImageViewer/imageviewersettings.cpp \
Modules/MainWindow/skywardhubmainwindow.cpp \
Modules/MainWindow/window.cpp \
@@ -98,7 +97,6 @@ HEADERS += \
Modules/ImageViewer/customgraphicsscene.h \
Modules/ImageViewer/imagevieweritem.h \
Modules/ImageViewer/imageviewermodule.h \
- Modules/ImageViewer/imageviewermodulesettings.h \
Modules/ImageViewer/imageviewersettings.h \
Modules/MainWindow/skywardhubmainwindow.h \
Modules/MainWindow/window.h \
@@ -135,7 +133,6 @@ FORMS += \
Modules/Fsm/fsmviewermodule.ui \
Modules/Graph/graphmodule.ui \
Modules/ImageViewer/imageviewermodule.ui \
- Modules/ImageViewer/imageviewermodulesettings.ui \
Modules/ImageViewer/imageviewersettings.ui \
Modules/MainWindow/skywardhubmainwindow.ui \
Modules/MainWindow/window.ui \
diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user
index 3992eed5663434d43ac47e36b59fe56664e8ecf1..7a28e25a7f68859477cf87703eecbeff98f27afc 100644
--- a/SkywardHub.pro.user
+++ b/SkywardHub.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.13.0, 2020-12-08T18:22:37. -->
+<!-- Written by QtCreator 4.13.0, 2020-12-09T20:21:36. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>