diff --git a/.qmake.stash b/.qmake.stash new file mode 100644 index 0000000..d717b0a --- /dev/null +++ b/.qmake.stash @@ -0,0 +1,15 @@ +QMAKE_DEFAULT_INCDIRS = \ + /usr/include/c++/5 \ + /usr/include/x86_64-linux-gnu/c++/5 \ + /usr/include/c++/5/backward \ + /usr/lib/gcc/x86_64-linux-gnu/5/include \ + /usr/local/include \ + /usr/lib/gcc/x86_64-linux-gnu/5/include-fixed \ + /usr/include/x86_64-linux-gnu \ + /usr/include +QMAKE_DEFAULT_LIBDIRS = \ + /usr/lib/gcc/x86_64-linux-gnu/5 \ + /usr/lib/x86_64-linux-gnu \ + /usr/lib \ + /lib/x86_64-linux-gnu \ + /lib diff --git a/Sources/SMSClient/SMSMasterCtrlInterface.cpp b/Sources/SMSClient/SMSMasterCtrlInterface.cpp index 746e278..2ef0393 100644 --- a/Sources/SMSClient/SMSMasterCtrlInterface.cpp +++ b/Sources/SMSClient/SMSMasterCtrlInterface.cpp @@ -11,9 +11,10 @@ CSMSMasterCtrlInterface::CSMSMasterCtrlInterface(CSMSClient *ProgramHandle) { mDeviceAddress = 1; mNetworkPort = 2182; - mMasterCtrlAddress = "127.0.0.1"; +// mMasterCtrlAddress = "127.0.0.1"; // mNetworkPort = 6463; -// mMasterCtrlAddress = "192.168.0.112"; + // mMasterCtrlAddress = "192.168.0.100"; + mMasterCtrlAddress = "mortel.myftp.org"; mNetworkCommSocket = 0; mMyDeviceID = ID_SMS_CLIENT; diff --git a/Sources/Sprinkler/SprinklerDevice.cpp b/Sources/Sprinkler/SprinklerDevice.cpp new file mode 100644 index 0000000..de5a299 --- /dev/null +++ b/Sources/Sprinkler/SprinklerDevice.cpp @@ -0,0 +1,6 @@ +#include "SprinklerDevice.h" + +CSprinklerDevice::CSprinklerDevice(QObject *parent) : QObject(parent) +{ + +} diff --git a/Sources/Sprinkler/SprinklerDevice.h b/Sources/Sprinkler/SprinklerDevice.h new file mode 100644 index 0000000..fae6808 --- /dev/null +++ b/Sources/Sprinkler/SprinklerDevice.h @@ -0,0 +1,17 @@ +#ifndef SPRINKLERDEVICE_H +#define SPRINKLERDEVICE_H + +#include + +class CSprinklerDevice : public QObject +{ + Q_OBJECT +public: + explicit CSprinklerDevice(QObject *parent = 0); + +signals: + +public slots: +}; + +#endif // SPRINKLERDEVICE_H \ No newline at end of file diff --git a/Sources/Sprinkler/SprinklerDeviceGuiItem.cpp b/Sources/Sprinkler/SprinklerDeviceGuiItem.cpp new file mode 100644 index 0000000..c81e7fe --- /dev/null +++ b/Sources/Sprinkler/SprinklerDeviceGuiItem.cpp @@ -0,0 +1,13 @@ +#include "SprinklerDeviceGuiItem.h" + + +CSprinklerDeviceGuiItem::CSprinklerDeviceGuiItem(QWidget *parent) : + QWidget(parent) +{ + setupUi(this); +} + +CSprinklerDeviceGuiItem::~CSprinklerDeviceGuiItem() +{ + +} diff --git a/Sources/Sprinkler/SprinklerDeviceGuiItem.h b/Sources/Sprinkler/SprinklerDeviceGuiItem.h new file mode 100644 index 0000000..f164e82 --- /dev/null +++ b/Sources/Sprinkler/SprinklerDeviceGuiItem.h @@ -0,0 +1,22 @@ +#ifndef SPRINKLERDEVICEGUIITEM_H +#define SPRINKLERDEVICEGUIITEM_H + +#include +#include "ui_SprinklerDeviceGuiItem.h" + +namespace Ui { +class CSprinklerDeviceGuiItem; +} + +class CSprinklerDeviceGuiItem : public QWidget, public Ui::CSprinklerDeviceGuiItem +{ + Q_OBJECT + +public: + explicit CSprinklerDeviceGuiItem(QWidget *parent = 0); + ~CSprinklerDeviceGuiItem(); + + +}; + +#endif // SPRINKLERDEVICEGUIITEM_H diff --git a/Sources/Sprinkler/SprinklerDeviceGuiItem.ui b/Sources/Sprinkler/SprinklerDeviceGuiItem.ui new file mode 100644 index 0000000..65a2c68 --- /dev/null +++ b/Sources/Sprinkler/SprinklerDeviceGuiItem.ui @@ -0,0 +1,74 @@ + + + CSprinklerDeviceGuiItem + + + + 0 + 0 + 540 + 399 + + + + Form + + + + + 20 + 10 + 101 + 41 + + + + Address : + + + + + + 20 + 50 + 131 + 41 + + + + Flow speed : + + + + + + 30 + 100 + 54 + 17 + + + + State : + + + + + + 220 + 20 + 80 + 25 + + + + PushButton + + + true + + + + + + diff --git a/Sources/Sprinkler/SprinklerGui.ui b/Sources/Sprinkler/SprinklerGui.ui index 4cfbdd8..cc48cb4 100644 --- a/Sources/Sprinkler/SprinklerGui.ui +++ b/Sources/Sprinkler/SprinklerGui.ui @@ -23,7 +23,7 @@ - Sprinklers + Sprinklers network diff --git a/SystemGui.pro b/SystemGui.pro index 79b7e52..946534b 100644 --- a/SystemGui.pro +++ b/SystemGui.pro @@ -42,7 +42,9 @@ SOURCES += \ Sources/SMSClient/Contact.cpp \ Sources/SMSClient/ContactRepository.cpp \ Sources/SystemTrayManager.cpp \ - Sources/Sprinkler/SprinklerGui.cpp + Sources/Sprinkler/SprinklerGui.cpp \ + Sources/Sprinkler/SprinklerDeviceGuiItem.cpp \ + Sources/Sprinkler/SprinklerDevice.cpp HEADERS += Sources/AbstractNetworkInterface.h \ Sources/GuiMain.h \ @@ -60,8 +62,11 @@ HEADERS += Sources/AbstractNetworkInterface.h \ Sources/SMSClient/Contact.h \ Sources/SMSClient/ContactRepository.h \ Sources/SystemTrayManager.h \ - Sources/Sprinkler/SprinklerGui.h + Sources/Sprinkler/SprinklerGui.h \ + Sources/Sprinkler/SprinklerDeviceGuiItem.h \ + Sources/Sprinkler/SprinklerDevice.h FORMS += \ SMSGui.ui \ - Sources/Sprinkler/SprinklerGui.ui + Sources/Sprinkler/SprinklerGui.ui \ + Sources/Sprinkler/SprinklerDeviceGuiItem.ui diff --git a/ui_SprinklerGui.h b/ui_SprinklerGui.h deleted file mode 100644 index d79a24c..0000000 --- a/ui_SprinklerGui.h +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************** -** Form generated from reading UI file 'SprinklerGui.ui' -** -** Created by: Qt User Interface Compiler version 5.5.0 -** -** WARNING! All changes made in this file will be lost when recompiling UI file! -********************************************************************************/ - -#ifndef UI_SPRINKLERGUI_H -#define UI_SPRINKLERGUI_H - -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_CSprinklerGui -{ -public: - QLabel *label; - - void setupUi(QWidget *CSprinklerGui) - { - if (CSprinklerGui->objectName().isEmpty()) - CSprinklerGui->setObjectName(QStringLiteral("CSprinklerGui")); - CSprinklerGui->resize(1047, 560); - label = new QLabel(CSprinklerGui); - label->setObjectName(QStringLiteral("label")); - label->setGeometry(QRect(0, -10, 201, 51)); - - retranslateUi(CSprinklerGui); - - QMetaObject::connectSlotsByName(CSprinklerGui); - } // setupUi - - void retranslateUi(QWidget *CSprinklerGui) - { - CSprinklerGui->setWindowTitle(QApplication::translate("CSprinklerGui", "Form", 0)); - label->setText(QApplication::translate("CSprinklerGui", "Sprinklers", 0)); - } // retranslateUi - -}; - -namespace Ui { - class CSprinklerGui: public Ui_CSprinklerGui {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_SPRINKLERGUI_H