switch from spaces to tabs
This commit is contained in:
@ -1,6 +1,7 @@
|
|||||||
#include "auxitem.h"
|
#include "auxitem.h"
|
||||||
|
|
||||||
AuxItem::AuxItem(Microcontroller* micro, uint32_t itemIdIn, QString name, uint8_t value, QObject* parent): Item(itemIdIn, name, value, parent), micro_(micro)
|
AuxItem::AuxItem(Microcontroller* micro, uint32_t itemIdIn, QString name, uint8_t value,
|
||||||
|
QObject* parent): Item(itemIdIn, name, value, parent), micro_(micro)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,8 @@ public slots:
|
|||||||
virtual void setValue(uint8_t value);
|
virtual void setValue(uint8_t value);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AuxItem(Microcontroller* micro, uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "", uint8_t value = 0, QObject* parent = nullptr);
|
AuxItem(Microcontroller* micro, uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "",
|
||||||
|
uint8_t value = 0, QObject* parent = nullptr);
|
||||||
|
|
||||||
virtual void store(QJsonObject& json);
|
virtual void store(QJsonObject& json);
|
||||||
};
|
};
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#include "auxitem.h"
|
#include "auxitem.h"
|
||||||
|
|
||||||
AuxItem::AuxItem(Microcontroller* micro, uint32_t itemIdIn, QString name, uint8_t value, QObject* parent): Item(itemIdIn, name, value, parent), micro_(micro)
|
AuxItem::AuxItem(Microcontroller* micro, uint32_t itemIdIn, QString name, uint8_t value,
|
||||||
|
QObject* parent): Item(itemIdIn, name, value, parent), micro_(micro)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,8 @@ public slots:
|
|||||||
virtual void setValue(uint8_t value);
|
virtual void setValue(uint8_t value);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
AuxItem(Microcontroller* micro, uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "", uint8_t value = 0, QObject* parent = nullptr);
|
AuxItem(Microcontroller* micro, uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "",
|
||||||
|
uint8_t value = 0, QObject* parent = nullptr);
|
||||||
|
|
||||||
virtual void store(QJsonObject& json);
|
virtual void store(QJsonObject& json);
|
||||||
};
|
};
|
||||||
|
@ -31,7 +31,8 @@ uint32_t ItemData::id() const
|
|||||||
|
|
||||||
//item
|
//item
|
||||||
|
|
||||||
Item::Item(uint32_t itemIdIn, QString name, int8_t value, QObject *parent): QObject(parent), ItemData (itemIdIn, name, value)
|
Item::Item(uint32_t itemIdIn, QString name, int8_t value, QObject *parent): QObject(parent), ItemData (itemIdIn, name,
|
||||||
|
value)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -19,8 +19,14 @@ public:
|
|||||||
|
|
||||||
ItemData(uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "Item", int8_t value = 0);
|
ItemData(uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "Item", int8_t value = 0);
|
||||||
|
|
||||||
inline bool operator==(const ItemData& in) const{ return itemId_==in.itemId_; }
|
inline bool operator==(const ItemData& in) const
|
||||||
inline bool operator!=(const ItemData& in) const{ return itemId_!=in.itemId_; }
|
{
|
||||||
|
return itemId_==in.itemId_;
|
||||||
|
}
|
||||||
|
inline bool operator!=(const ItemData& in) const
|
||||||
|
{
|
||||||
|
return itemId_!=in.itemId_;
|
||||||
|
}
|
||||||
|
|
||||||
uint32_t id() const;
|
uint32_t id() const;
|
||||||
|
|
||||||
@ -47,7 +53,8 @@ public slots:
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
Item(uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "Item", int8_t value = 0, QObject *parent = nullptr);
|
Item(uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "Item", int8_t value = 0,
|
||||||
|
QObject *parent = nullptr);
|
||||||
Item(const ItemData& itemData, QObject *parent = nullptr);
|
Item(const ItemData& itemData, QObject *parent = nullptr);
|
||||||
|
|
||||||
virtual ~Item();
|
virtual ~Item();
|
||||||
|
@ -14,9 +14,12 @@ private:
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
ItemStore(QObject *parent = nullptr);
|
ItemStore(QObject *parent = nullptr);
|
||||||
virtual ~ItemStore(){}
|
virtual ~ItemStore() {}
|
||||||
|
|
||||||
inline std::vector< std::shared_ptr<Item> >* getItems(){ return &items_; }
|
inline std::vector< std::shared_ptr<Item> >* getItems()
|
||||||
|
{
|
||||||
|
return &items_;
|
||||||
|
}
|
||||||
|
|
||||||
void clear();
|
void clear();
|
||||||
|
|
||||||
|
@ -14,13 +14,19 @@ public:
|
|||||||
|
|
||||||
Train(uint8_t id = 0, uint8_t address = 0, uint8_t functionMask = 0, int8_t initalValue = 0);
|
Train(uint8_t id = 0, uint8_t address = 0, uint8_t functionMask = 0, int8_t initalValue = 0);
|
||||||
|
|
||||||
uint8_t getFunctionMask() {return functionMask_;}
|
uint8_t getFunctionMask()
|
||||||
|
{
|
||||||
|
return functionMask_;
|
||||||
|
}
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void reverse();
|
void reverse();
|
||||||
virtual void setFunction(uint8_t function, bool on);
|
virtual void setFunction(uint8_t function, bool on);
|
||||||
virtual void setValue(int8_t value);
|
virtual void setValue(int8_t value);
|
||||||
uint8_t getTrainId(){return train_id_;}
|
uint8_t getTrainId()
|
||||||
|
{
|
||||||
|
return train_id_;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TRAIN_H
|
#endif // TRAIN_H
|
||||||
|
@ -13,7 +13,10 @@ public:
|
|||||||
|
|
||||||
explicit Turnout(uint8_t id = 0, uint8_t address = 0, uint8_t subaddress = 0, int8_t initalValue = 0);
|
explicit Turnout(uint8_t id = 0, uint8_t address = 0, uint8_t subaddress = 0, int8_t initalValue = 0);
|
||||||
virtual void setValue(int8_t value);
|
virtual void setValue(int8_t value);
|
||||||
uint8_t getTurnoutId(){return turnoutId_;}
|
uint8_t getTurnoutId()
|
||||||
|
{
|
||||||
|
return turnoutId_;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TURNOUT_H
|
#endif // TURNOUT_H
|
||||||
|
@ -35,11 +35,14 @@ int main(int argc, char *argv[])
|
|||||||
parser.addVersionOption();
|
parser.addVersionOption();
|
||||||
QCommandLineOption tcpOption(QStringList() << "t" << "tcp", QCoreApplication::translate("main", "Use Tcp connection"));
|
QCommandLineOption tcpOption(QStringList() << "t" << "tcp", QCoreApplication::translate("main", "Use Tcp connection"));
|
||||||
parser.addOption(tcpOption);
|
parser.addOption(tcpOption);
|
||||||
QCommandLineOption hostOption(QStringList() << "H" << "host", QCoreApplication::translate("main", "Set server host ip addres"), "adress");
|
QCommandLineOption hostOption(QStringList() << "H" << "host", QCoreApplication::translate("main",
|
||||||
|
"Set server host ip addres"), "adress");
|
||||||
parser.addOption(hostOption);
|
parser.addOption(hostOption);
|
||||||
QCommandLineOption portOption(QStringList() << "p" << "port", QCoreApplication::translate("main", "Set server Port in TCP mode or Serial port in serial mode"), "port");
|
QCommandLineOption portOption(QStringList() << "p" << "port", QCoreApplication::translate("main",
|
||||||
|
"Set server Port in TCP mode or Serial port in serial mode"), "port");
|
||||||
parser.addOption(portOption);
|
parser.addOption(portOption);
|
||||||
QCommandLineOption serialOption(QStringList() << "s" << "serial", QCoreApplication::translate("main", "Use serial connection"));
|
QCommandLineOption serialOption(QStringList() << "s" << "serial", QCoreApplication::translate("main",
|
||||||
|
"Use serial connection"));
|
||||||
parser.addOption(serialOption);
|
parser.addOption(serialOption);
|
||||||
QCommandLineOption baudOption(QStringList() << "b" << "baud", QCoreApplication::translate("main", "Set Baud Rate"));
|
QCommandLineOption baudOption(QStringList() << "b" << "baud", QCoreApplication::translate("main", "Set Baud Rate"));
|
||||||
parser.addOption(baudOption);
|
parser.addOption(baudOption);
|
||||||
|
@ -105,7 +105,8 @@ std::shared_ptr<Item> Microcontroller::processTrainLine(const QString& buffer)
|
|||||||
QStringList bufferList = buffer.split(' ');
|
QStringList bufferList = buffer.split(' ');
|
||||||
if(bufferList.size() >= 14 && buffer.startsWith("TRAIN NUMBER:"))
|
if(bufferList.size() >= 14 && buffer.startsWith("TRAIN NUMBER:"))
|
||||||
{
|
{
|
||||||
return std::shared_ptr<Item>(new Train(bufferList[2].toInt(), bufferList[4].toInt(), bufferList[13].toInt(nullptr, 2), bufferList[9].toInt()));
|
return std::shared_ptr<Item>(new Train(bufferList[2].toInt(), bufferList[4].toInt(), bufferList[13].toInt(nullptr, 2),
|
||||||
|
bufferList[9].toInt()));
|
||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
@ -115,7 +116,8 @@ std::shared_ptr<Item> Microcontroller::processTurnoutLine(const QString& buffer)
|
|||||||
QStringList bufferList = buffer.split(' ');
|
QStringList bufferList = buffer.split(' ');
|
||||||
if(bufferList.size() >= 11 && buffer.startsWith("TURNOUT NUMBER:"))
|
if(bufferList.size() >= 11 && buffer.startsWith("TURNOUT NUMBER:"))
|
||||||
{
|
{
|
||||||
return std::shared_ptr<Item>(new Turnout(bufferList[2].toInt(), bufferList[4].toInt(), bufferList[6].toInt(), bufferList[11].toInt()));
|
return std::shared_ptr<Item>(new Turnout(bufferList[2].toInt(), bufferList[4].toInt(), bufferList[6].toInt(),
|
||||||
|
bufferList[11].toInt()));
|
||||||
}
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,10 @@ public:
|
|||||||
std::weak_ptr<Item> getItem();
|
std::weak_ptr<Item> getItem();
|
||||||
void setItem(std::weak_ptr<Item>);
|
void setItem(std::weak_ptr<Item>);
|
||||||
bool itemIsSet();
|
bool itemIsSet();
|
||||||
bool getWantsNewItem() {return wantsNewItem;}
|
bool getWantsNewItem()
|
||||||
|
{
|
||||||
|
return wantsNewItem;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TRAINJS_H
|
#endif // TRAINJS_H
|
||||||
|
@ -5,7 +5,8 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include "../items/item.h"
|
#include "../items/item.h"
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui
|
||||||
|
{
|
||||||
class ItemCreationDialog;
|
class ItemCreationDialog;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,8 @@
|
|||||||
#include "../items/itemstore.h"
|
#include "../items/itemstore.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui
|
||||||
|
{
|
||||||
class RelayScrollBox;
|
class RelayScrollBox;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "itemsettingsdialog.h"
|
#include "itemsettingsdialog.h"
|
||||||
#include "ui_itemsettingsdialog.h"
|
#include "ui_itemsettingsdialog.h"
|
||||||
#include<memory>
|
#include<memory>
|
||||||
|
|
||||||
|
@ -6,7 +6,8 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include "../items/item.h"
|
#include "../items/item.h"
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui
|
||||||
|
{
|
||||||
class ItemSettingsDialog;
|
class ItemSettingsDialog;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,8 +24,14 @@ ItemWidget::ItemWidget(std::weak_ptr<Item> item, QWidget *parent) :
|
|||||||
connect(ui->checkBox_f3, &QCheckBox::stateChanged, this, &ItemWidget::f3);
|
connect(ui->checkBox_f3, &QCheckBox::stateChanged, this, &ItemWidget::f3);
|
||||||
connect(ui->checkBox_f4, &QCheckBox::stateChanged, this, &ItemWidget::f4);
|
connect(ui->checkBox_f4, &QCheckBox::stateChanged, this, &ItemWidget::f4);
|
||||||
connect(ui->pushButton_reverse, &QPushButton::clicked, this, &ItemWidget::reverse);
|
connect(ui->pushButton_reverse, &QPushButton::clicked, this, &ItemWidget::reverse);
|
||||||
connect(ui->radioButton_left, &QRadioButton::clicked, this, [this](){setValue(0);});
|
connect(ui->radioButton_left, &QRadioButton::clicked, this, [this]()
|
||||||
connect(ui->radioButton_right, &QRadioButton::clicked, this, [this](){setValue(1);});
|
{
|
||||||
|
setValue(0);
|
||||||
|
});
|
||||||
|
connect(ui->radioButton_right, &QRadioButton::clicked, this, [this]()
|
||||||
|
{
|
||||||
|
setValue(1);
|
||||||
|
});
|
||||||
|
|
||||||
connect(workingItem.get(), &Item::valueChanged, this, &ItemWidget::moveToValue);
|
connect(workingItem.get(), &Item::valueChanged, this, &ItemWidget::moveToValue);
|
||||||
|
|
||||||
|
@ -7,7 +7,8 @@
|
|||||||
#include "itemsettingsdialog.h"
|
#include "itemsettingsdialog.h"
|
||||||
#include "../items/item.h"
|
#include "../items/item.h"
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui
|
||||||
|
{
|
||||||
class ItemWidget;
|
class ItemWidget;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user