From 6500e25bd5dc2c44393e98472c19fdd37c45d012 Mon Sep 17 00:00:00 2001 From: jfmartel Date: Wed, 4 Oct 2017 10:11:15 -0400 Subject: [PATCH] -Modification du widget de connexion Ethernet -Ajout d'une connexion pour l'historien --- Images/connexion_rouge.png | Bin 0 -> 11339 bytes Images/connexion_vert.png | Bin 0 -> 11339 bytes ZT.pro | 6 +- sources/GuiElements/EthConnWidget.cpp | 78 ++++++++++++++++++++++++++ sources/GuiElements/EthConnWidget.h | 25 +++++++++ sources/GuiElements/StatusBar.cpp | 56 +++++++++++++----- sources/GuiElements/StatusBar.h | 8 ++- 7 files changed, 156 insertions(+), 17 deletions(-) create mode 100755 Images/connexion_rouge.png create mode 100755 Images/connexion_vert.png create mode 100644 sources/GuiElements/EthConnWidget.cpp create mode 100644 sources/GuiElements/EthConnWidget.h diff --git a/Images/connexion_rouge.png b/Images/connexion_rouge.png new file mode 100755 index 0000000000000000000000000000000000000000..3e3ceb2fc96f1b110ed109c7a79a7472179824f5 GIT binary patch literal 11339 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 VEp)+RKPL=6cFaVF + +CEthConnWidget::CEthConnWidget(QString Label,QGraphicsItem *Parent) +{ + + setParentItem(Parent); + mLabel = new QGraphicsTextItem(this); + mEthOnPixmap = new QGraphicsPixmapItem(this); + mEthONImage.load("./Images/connexion_vert.png"); + + mEthOffPixmap = new QGraphicsPixmapItem(this); + mEthOFFImage.load("./Images/connexion_rouge.png"); + + mLabel->setPlainText(Label); + mLabel->adjustSize(); + + EthOFF(); + + resize(25,25); + +} + +void CEthConnWidget::resizeEvent(QGraphicsSceneResizeEvent *event) +{ + Q_UNUSED(event) + + mEthOnPixmap->setPixmap(QPixmap().fromImage(mEthONImage).scaled(boundingRect().width(),boundingRect().height())); + mEthOffPixmap->setPixmap(QPixmap().fromImage(mEthOFFImage).scaled(boundingRect().width(),boundingRect().height())); + //mLabel->setPos((boundingRect().width()/2) - ((QFontMetrics(mLabel->font()).width(mLabel->toPlainText())/2)),boundingRect().height()-10); + mLabel->setPos((boundingRect().width()/2) - (mLabel->boundingRect().width()/2),mEthOnPixmap->boundingRect().bottom()-9); +} + +void CEthConnWidget::EthOFF() +{ + mEthOnPixmap->hide(); + mEthOffPixmap->show(); +} + +void CEthConnWidget::EthON() +{ + mEthOnPixmap->show(); + mEthOffPixmap->hide(); +} + +void CEthConnWidget::SetEth(bool ON) +{ + if(ON == true) + EthON(); + else + EthOFF(); +} diff --git a/sources/GuiElements/EthConnWidget.h b/sources/GuiElements/EthConnWidget.h new file mode 100644 index 0000000..36b1e17 --- /dev/null +++ b/sources/GuiElements/EthConnWidget.h @@ -0,0 +1,25 @@ +#ifndef ETHCONNWIDGET_H +#define ETHCONNWIDGET_H + +#include "GlobalDefine.h" +#include + +class CEthConnWidget : public QGraphicsWidget +{ + Q_OBJECT + +public: + CEthConnWidget(QString Label,QGraphicsItem *Parent = 0); + + QGraphicsTextItem *mLabel; + QImage mEthONImage,mEthOFFImage; + QGraphicsPixmapItem *mEthOnPixmap,*mEthOffPixmap; + + void EthON(); + void EthOFF(); + void SetEth(bool ON); + + virtual void resizeEvent(QGraphicsSceneResizeEvent *event); +}; + +#endif // ETHCONNWIDGET_H diff --git a/sources/GuiElements/StatusBar.cpp b/sources/GuiElements/StatusBar.cpp index 40f7e50..9e897d8 100644 --- a/sources/GuiElements/StatusBar.cpp +++ b/sources/GuiElements/StatusBar.cpp @@ -32,8 +32,9 @@ #include CStatusBar::CStatusBar(QGraphicsItem *Parent): - mCCModbusONOFF("",this), - mSEIModbusONOFF("",this) + mCCModbusONOFF("CC",this), + mSEIModbusONOFF("SEI",this), + mHistorienModbusONOFF("HIS",this) { setParentItem(Parent); @@ -46,17 +47,24 @@ CStatusBar::CStatusBar(QGraphicsItem *Parent): mZT1Status = mZT2Status = SB_ZT_INACTIVE_STATUS; mCCModbusState = SB_MODBUS_NOT_PRESENT; - mSEIModbusState = SB_MODBUS_NOT_PRESENT; + mSEIModbusState = SB_MODBUS_CONNECTED;//SB_MODBUS_NOT_PRESENT; + mHistoModbusState = SB_MODBUS_CONNECTED; mCCModbusONOFF.setParentItem(this); - mCCModbusONOFF.setPos(760,0); - mCCModbusONOFF.LedOFF(); + mCCModbusONOFF.setPos(730,0); + mCCModbusONOFF.EthOFF(); mCCModbusONOFF.hide(); mSEIModbusONOFF.setParentItem(this); - mSEIModbusONOFF.setPos(845,0); - mSEIModbusONOFF.LedOFF(); + mSEIModbusONOFF.setPos(765,0); + mSEIModbusONOFF.EthOFF(); mSEIModbusONOFF.hide(); + + mHistorienModbusONOFF.setParentItem(this); + mHistorienModbusONOFF.setPos(800,0); + mHistorienModbusONOFF.EthOFF(); + mHistorienModbusONOFF.hide(); + // QGraphicsRectItem *temprect = new QGraphicsRectItem(this); // temprect->setRect(boundingRect()); // temprect->show(); @@ -181,7 +189,7 @@ void CStatusBar::paint(QPainter *painter, const QStyleOptionGraphicsItem *option painter->drawText(TextRect, Qt::AlignLeft, Text); TextRect.adjust(painter->fontMetrics().width(Text),0,0,0); - if(mCCModbusState == SB_MODBUS_CONNECTED) + /* if(mCCModbusState == SB_MODBUS_CONNECTED) { painter->setPen(Qt::darkGreen); Text.clear(); @@ -217,7 +225,7 @@ void CStatusBar::paint(QPainter *painter, const QStyleOptionGraphicsItem *option TextRect.adjust(50,0,0,0); painter->drawText(TextRect, Qt::AlignLeft, Text); TextRect.adjust(painter->fontMetrics().width(Text),0,0,0); - } + }*/ } } @@ -255,12 +263,12 @@ unsigned int CStatusBar::SetCCModbusState(unsigned int State) mCCModbusState = State; if(State == SB_MODBUS_CONNECTED) { - mCCModbusONOFF.LedON(); + mCCModbusONOFF.EthON(); mCCModbusONOFF.show(); } else if(State == SB_MODBUS_DISCONNECTED) { - mCCModbusONOFF.LedOFF(); + mCCModbusONOFF.EthOFF(); mCCModbusONOFF.show(); } else if(State == SB_MODBUS_NOT_PRESENT) @@ -277,12 +285,12 @@ unsigned int CStatusBar::SetSEIModbusState(unsigned int State) mSEIModbusState = State; if(State == SB_MODBUS_CONNECTED) { - mSEIModbusONOFF.LedON(); + mSEIModbusONOFF.EthON(); mSEIModbusONOFF.show(); } else if(State == SB_MODBUS_DISCONNECTED) { - mSEIModbusONOFF.LedOFF(); + mSEIModbusONOFF.EthOFF(); mSEIModbusONOFF.show(); } else if(State == SB_MODBUS_NOT_PRESENT) @@ -293,3 +301,25 @@ unsigned int CStatusBar::SetSEIModbusState(unsigned int State) update(boundingRect()); return RET_OK; } + +unsigned int CStatusBar::SetHistorienModbusState(unsigned int State) +{ + mHistoModbusState = State; + if(State == SB_MODBUS_CONNECTED) + { + mHistorienModbusONOFF.EthON(); + mHistorienModbusONOFF.show(); + } + else if(State == SB_MODBUS_DISCONNECTED) + { + mHistorienModbusONOFF.EthOFF(); + mHistorienModbusONOFF.show(); + } + else if(State == SB_MODBUS_NOT_PRESENT) + { + mHistorienModbusONOFF.hide(); + } + + update(boundingRect()); + return RET_OK; +} diff --git a/sources/GuiElements/StatusBar.h b/sources/GuiElements/StatusBar.h index 68b65f4..eb65e1b 100644 --- a/sources/GuiElements/StatusBar.h +++ b/sources/GuiElements/StatusBar.h @@ -31,6 +31,7 @@ #include "GlobalDefine.h" #include #include "LedWidget.h" +#include "EthConnWidget.h" enum eZTStatus { @@ -61,13 +62,16 @@ public: unsigned int SetNbTriggers(unsigned int Value); unsigned int SetCCModbusState(unsigned int State); unsigned int SetSEIModbusState(unsigned int State); + unsigned int SetHistorienModbusState(unsigned int State); private: QString mZT1StatusString, mZT2StatusString; unsigned int mZT1Status, mZT2Status; unsigned int mNbTrainsPass, mNbTriggers; - unsigned int mCCModbusState, mSEIModbusState; - CLedWidget mCCModbusONOFF, mSEIModbusONOFF; + unsigned int mCCModbusState, mSEIModbusState, mHistoModbusState; + CEthConnWidget mCCModbusONOFF, mSEIModbusONOFF, mHistorienModbusONOFF; + //CLedWidget mCCModbusONOFF, mSEIModbusONOFF; + }; #endif // STATUSBAR_H