Sprinkler

This commit is contained in:
Jean-Francois Martel 2017-04-23 10:16:06 -04:00
parent 46d6d4ac05
commit 2c22dda0f4
10 changed files with 159 additions and 61 deletions

15
.qmake.stash Normal file
View File

@ -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

View File

@ -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;

View File

@ -0,0 +1,6 @@
#include "SprinklerDevice.h"
CSprinklerDevice::CSprinklerDevice(QObject *parent) : QObject(parent)
{
}

View File

@ -0,0 +1,17 @@
#ifndef SPRINKLERDEVICE_H
#define SPRINKLERDEVICE_H
#include <QObject>
class CSprinklerDevice : public QObject
{
Q_OBJECT
public:
explicit CSprinklerDevice(QObject *parent = 0);
signals:
public slots:
};
#endif // SPRINKLERDEVICE_H

View File

@ -0,0 +1,13 @@
#include "SprinklerDeviceGuiItem.h"
CSprinklerDeviceGuiItem::CSprinklerDeviceGuiItem(QWidget *parent) :
QWidget(parent)
{
setupUi(this);
}
CSprinklerDeviceGuiItem::~CSprinklerDeviceGuiItem()
{
}

View File

@ -0,0 +1,22 @@
#ifndef SPRINKLERDEVICEGUIITEM_H
#define SPRINKLERDEVICEGUIITEM_H
#include <QWidget>
#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

View File

@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CSprinklerDeviceGuiItem</class>
<widget class="QWidget" name="CSprinklerDeviceGuiItem">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>540</width>
<height>399</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QLabel" name="SprinklerAddress">
<property name="geometry">
<rect>
<x>20</x>
<y>10</y>
<width>101</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>Address : </string>
</property>
</widget>
<widget class="QLabel" name="SprinklerFlowSpeed">
<property name="geometry">
<rect>
<x>20</x>
<y>50</y>
<width>131</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>Flow speed :</string>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>30</x>
<y>100</y>
<width>54</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>State : </string>
</property>
</widget>
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>220</x>
<y>20</y>
<width>80</width>
<height>25</height>
</rect>
</property>
<property name="text">
<string>PushButton</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>

View File

@ -23,7 +23,7 @@
</rect>
</property>
<property name="text">
<string>Sprinklers</string>
<string>Sprinklers network</string>
</property>
</widget>
</widget>

View File

@ -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

View File

@ -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 <QtCore/QVariant>
#include <QtWidgets/QAction>
#include <QtWidgets/QApplication>
#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QWidget>
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