uvos/TrainControllerUi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch from spaces to tabs

Browse Source
This commit is contained in:
uvos
2022-02-11 11:46:30 +01:00
parent 57edc50b6b
commit 872488d174
30 changed files with 971 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/items/auxitem.cpp
View File

@ -1,18 +1,19 @@
#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)
{
}
void AuxItem::setValue(uint8_t value)
{
Item::setValue(value);
micro_->setAuxPwm(value);
Item::setValue(value);
micro_->setAuxPwm(value);
}
void AuxItem::store(QJsonObject &json)
{
json["Type"] = "Aux";
Item::store(json);
json["Type"] = "Aux";
Item::store(json);
}

11
src/items/auxitem.h
View File

@ -5,16 +5,17 @@
class AuxItem: public Item
{
Q_OBJECT
Q_OBJECT
private:
Microcontroller* micro_;
Microcontroller* micro_;
public slots:
virtual void setValue(uint8_t value);
virtual void setValue(uint8_t value);
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);
};

19
src/items/item.cpp
View File

@ -10,28 +10,29 @@ ItemData::ItemData(uint32_t itemIdIn, QString name, int8_t value): name_(name),
QString ItemData::getName() const
{
return name_;
return name_;
}
void ItemData::setName(QString name)
{
name_ = name;
name_ = name;
}
int8_t ItemData::getValue() const
{
return value_;
return value_;
}
uint32_t ItemData::id() const
{
return itemId_;
return itemId_;
}
//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)
{
}
@ -47,16 +48,16 @@ Item::~Item()
void Item::setFunction(uint8_t function, bool on)
{
functionChanged(function, on);
functionChanged(function, on);
}
void Item::setValue(int8_t value)
{
value_ = value;
valueChanged(value_);
value_ = value;
valueChanged(value_);
}
void Item::informValue(int8_t value)
{
Item::setValue(value);
Item::setValue(value);
}

31
src/items/item.h
View File

@ -11,28 +11,34 @@ class Actor;
class ItemData
{
protected:
QString name_;
QString name_;
int8_t value_;
uint32_t itemId_;
uint32_t itemId_;
public:
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{ return itemId_!=in.itemId_; }
inline bool operator==(const ItemData& in) const
{
return itemId_==in.itemId_;
}
inline bool operator!=(const ItemData& in) const
{
return itemId_!=in.itemId_;
}
uint32_t id() const;
uint32_t id() const;
void setName(QString name);
void setName(QString name);
int8_t getValue() const;
virtual QString getName() const;
virtual QString getName() const;
};
class Item: public QObject, public ItemData
{
Q_OBJECT
Q_OBJECT
private:
signals:
@ -43,14 +49,15 @@ signals:
public slots:
virtual void setValue(int8_t value);
virtual void setFunction(uint8_t funciton, bool value);
virtual void setFunction(uint8_t funciton, bool value);
public:
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(uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "Item", int8_t value = 0,
QObject *parent = nullptr);
Item(const ItemData& itemData, QObject *parent = nullptr);
virtual ~Item();
virtual ~Item();
void informValue(int8_t value);

56
src/items/itemstore.cpp
View File

@ -15,12 +15,12 @@ void ItemStore::addItem(std::shared_ptr<Item> item)
qWarning()<<"invalid item";
return;
}
bool mached = false;
for(unsigned i = 0; i < items_.size(); i++ )
if(*items_[i] == *item) mached = true;
if(!mached)
{
items_.push_back(std::shared_ptr<Item>(item));
bool mached = false;
for(unsigned i = 0; i < items_.size(); i++ )
if(*items_[i] == *item) mached = true;
if(!mached)
{
items_.push_back(std::shared_ptr<Item>(item));
if(dynamic_cast<Train*>(item.get()))
{
@ -36,9 +36,9 @@ void ItemStore::addItem(std::shared_ptr<Item> item)
}
}
itemAdded(std::weak_ptr<Item>(items_.back()));
}
qDebug()<<"Got item: "<<item->id()<<" matched: "<<mached;
itemAdded(std::weak_ptr<Item>(items_.back()));
}
qDebug()<<"Got item: "<<item->id()<<" matched: "<<mached;
}
void ItemStore::jsReqNewItem()
@ -69,43 +69,43 @@ void ItemStore::jsReqNewItem()
void ItemStore::addItems(const std::vector<std::shared_ptr<Item>>& itemIn)
{
for(unsigned j = 0; j < itemIn.size(); j++)
addItem(itemIn[j]);
for(unsigned j = 0; j < itemIn.size(); j++)
addItem(itemIn[j]);
}
void ItemStore::removeItem(const ItemData& item)
{
for(unsigned j = 0; j < items_.size(); j++)
{
if(item == *items_[j])
{
items_.erase(items_.begin()+j);
--j;
}
}
for(unsigned j = 0; j < items_.size(); j++)
{
if(item == *items_[j])
{
items_.erase(items_.begin()+j);
--j;
}
}
}
void ItemStore::clear()
{
for(size_t i = 0; i < items_.size(); ++i) itemDeleted(*items_[i]);
items_.clear();
for(size_t i = 0; i < items_.size(); ++i) itemDeleted(*items_[i]);
items_.clear();
}
void ItemStore::itemStateChanged(const ItemData& item)
{
for(unsigned i = 0; i < items_.size(); i++ )
{
if(items_[i]->operator==(item))
{
for(unsigned i = 0; i < items_.size(); i++ )
{
if(items_[i]->operator==(item))
{
if(items_[i]->getValue() != item.getValue())items_[i]->informValue(item.getValue());
}
if(items_[i]->getValue() != item.getValue())items_[i]->informValue(item.getValue());
}
}
}
}

27
src/items/itemstore.h
View File

@ -7,18 +7,21 @@
class ItemStore: public QObject
{
Q_OBJECT
Q_OBJECT
private:
std::vector< std::shared_ptr<Item> > items_;
std::vector< std::shared_ptr<Item> > items_;
public:
ItemStore(QObject *parent = nullptr);
virtual ~ItemStore(){}
ItemStore(QObject *parent = nullptr);
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();
private slots:
@ -26,13 +29,13 @@ private slots:
signals:
void itemDeleted(ItemData item);
void itemAdded(std::weak_ptr<Item> Item);
void itemDeleted(ItemData item);
void itemAdded(std::weak_ptr<Item> Item);
public slots:
void removeItem(const ItemData& item);
void addItem(std::shared_ptr<Item> item);
void addItems(const std::vector<std::shared_ptr<Item>>& itemsIn);
void itemStateChanged(const ItemData& item);
void removeItem(const ItemData& item);
void addItem(std::shared_ptr<Item> item);
void addItems(const std::vector<std::shared_ptr<Item>>& itemsIn);
void itemStateChanged(const ItemData& item);
};

20
src/items/train.cpp
View File

@ -2,8 +2,8 @@
Train::Train(uint8_t id, uint8_t address, uint8_t functionMask, int8_t initalValue):
Item(address, QString("Train ")+QString::number(id), initalValue),
functionMask_(functionMask),
train_id_(id)
functionMask_(functionMask),
train_id_(id)
{
}
@ -11,21 +11,21 @@ Microcontroller *Train::micro = nullptr;
void Train::setFunction(uint8_t funciton, bool value)
{
Item::setFunction(funciton, value);
if(micro)
micro->trainSetFunction(train_id_, funciton, value);
Item::setFunction(funciton, value);
if(micro)
micro->trainSetFunction(train_id_, funciton, value);
}
void Train::setValue(int8_t value)
{
Item::setValue(value);
if(micro)
micro->trainSetSpeed(train_id_, value);
Item::setValue(value);
if(micro)
micro->trainSetSpeed(train_id_, value);
}
void Train::reverse()
{
if(micro)
micro->trainReverse(train_id_);
if(micro)
micro->trainReverse(train_id_);
}

20
src/items/train.h
View File

@ -6,21 +6,27 @@
class Train : public Item
{
Q_OBJECT
uint8_t functionMask_;
uint8_t train_id_;
Q_OBJECT
uint8_t functionMask_;
uint8_t train_id_;
public:
static Microcontroller *micro;
static Microcontroller *micro;
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:
void reverse();
void reverse();
virtual void setFunction(uint8_t function, bool on);
virtual void setValue(int8_t value);
uint8_t getTrainId(){return train_id_;}
uint8_t getTrainId()
{
return train_id_;
}
};
#endif // TRAIN_H

8
src/items/turnout.cpp
View File

@ -6,13 +6,13 @@ Turnout::Turnout(uint8_t id, uint8_t address, uint8_t subaddress, int8_t initalV
: Item(address | (subaddress << 8), QString("Turnout ")+QString::number(id), initalValue),
subaddress_(subaddress), turnoutId_(id)
{
itemId_ = address | (subaddress << 8);
name_ = QString("Turnout ")+QString::number(id);
itemId_ = address | (subaddress << 8);
name_ = QString("Turnout ")+QString::number(id);
}
void Turnout::setValue(int8_t value)
{
Item::setValue(value);
if(micro)
Item::setValue(value);
if(micro)
micro->tunoutSetDirection(turnoutId_, value > 0);
}

11
src/items/turnout.h
View File

@ -6,14 +6,17 @@
class Turnout : public Item
{
uint8_t subaddress_;
uint8_t turnoutId_;
uint8_t subaddress_;
uint8_t turnoutId_;
public:
static Microcontroller *micro;
static Microcontroller *micro;
explicit Turnout(uint8_t id = 0, uint8_t address = 0, uint8_t subaddress = 0, int8_t initalValue = 0);
virtual void setValue(int8_t value);
uint8_t getTurnoutId(){return turnoutId_;}
uint8_t getTurnoutId()
{
return turnoutId_;
}
};
#endif // TURNOUT_H