diff --git a/sftpbatch b/sftpbatch index e9edfde..e2f6df7 100644 --- a/sftpbatch +++ b/sftpbatch @@ -1,3 +1,3 @@ -put ./Trains/LOGZT1_2024-07-08-07-43-56-265.bin CVRT-D-LOGZT1_2024-07-08-07-43-56-265.bin +put ./Trains/LOGZT1_2024-07-11-13-46-13-519.bin CVRT-D-LOGZT1_2024-07-11-13-46-13-519.bin put ./LOG/LogZT.txt CVRT-LogZT.txt put ./ING/IngLog.txt CVRT-IngLog.txt \ No newline at end of file diff --git a/sources/GuiElements/StatusBar.cpp b/sources/GuiElements/StatusBar.cpp index 77f28a1..d8c5d6e 100644 --- a/sources/GuiElements/StatusBar.cpp +++ b/sources/GuiElements/StatusBar.cpp @@ -231,7 +231,7 @@ void CStatusBar::paint(QPainter *painter, const QStyleOptionGraphicsItem *option { painter->setPen(Qt::black); Text.clear(); - Text.sprintf("Modbus: Désactivé"); + Text.sprintf("Modbus: N/A"); TextRect.adjust(20,0,0,0); painter->drawText(TextRect, Qt::AlignLeft, Text); TextRect.adjust(painter->fontMetrics().width(Text),0,0,0); diff --git a/sources/GuiElements/ZTPage.cpp b/sources/GuiElements/ZTPage.cpp index 6ebcc16..5fc284f 100644 --- a/sources/GuiElements/ZTPage.cpp +++ b/sources/GuiElements/ZTPage.cpp @@ -482,3 +482,14 @@ void CZTPage::ModbusSEIDisconnected() { mStatusBar->SetSEIModbusState(SB_MODBUS_DISCONNECTED); } + +void CZTPage::ModbusHistorienConnected() +{ + mStatusBar->SetHistorienModbusState(SB_MODBUS_CONNECTED); + +} + +void CZTPage::ModbusHistorienDisconnected() +{ + mStatusBar->SetHistorienModbusState(SB_MODBUS_DISCONNECTED); +} diff --git a/sources/GuiElements/ZTPage.h b/sources/GuiElements/ZTPage.h index e1f9c94..712e6b3 100644 --- a/sources/GuiElements/ZTPage.h +++ b/sources/GuiElements/ZTPage.h @@ -111,6 +111,8 @@ public slots: void ModbusCCDisconnected(); void ModbusSEIConnected(); void ModbusSEIDisconnected(); + void ModbusHistorienConnected(); + void ModbusHistorienDisconnected(); }; diff --git a/sources/Modbus/PIHistorianManager.cpp b/sources/Modbus/PIHistorianManager.cpp index 7de4dc4..376a179 100644 --- a/sources/Modbus/PIHistorianManager.cpp +++ b/sources/Modbus/PIHistorianManager.cpp @@ -42,6 +42,7 @@ void CPIHistorianManager::NewModbusConnection() connect(NewSession,SIGNAL(PIHistorianSessionClosed(CPIHistorianSession*)),this,SLOT(HistorianSessionClosed(CPIHistorianSession*))); mHistorianSessionsList.append(NewSession); NewSession->OpenSession(SessionSocket); + emit HistorianConnected(); } } @@ -55,6 +56,11 @@ void CPIHistorianManager::HistorianSessionClosed(CPIHistorianSession *SessionPtr CPIHistorianSession *Session = mHistorianSessionsList.takeAt(i); Session->CloseSession(); delete Session; + + if(mHistorianSessionsList.size() == 0) + { + emit HistorianDisconnected(); + } return; } } @@ -270,6 +276,10 @@ int CPIHistorianManager::NewZT1Passage(CZTPassageInfo ZT1PassageInfo) mPIHistorianRepo->WriteSingleReg(HISTORIAN_LAST_TRAIN_ID2_REG_ADD,ZT1PassageInfo.mTrainCompo2); mPIHistorianRepo->WriteSingleReg(HISTORIAN_LAST_TRAIN_ID3_REG_ADD,ZT1PassageInfo.mTrainCompo3); + mNbPassagesToday ++; + mPIHistorianRepo->WriteSingleReg(HISTORIAN_TRAINS_TODAY_REG_ADD,mNbPassagesToday); + + QDateTime PassageDateTime = ZT1PassageInfo.mPassageDateTime; quint16 year, month, day, hour, minute, seconds; year = (quint16)PassageDateTime.date().year(); @@ -415,7 +425,7 @@ int CPIHistorianManager::NewZT1Passage(CZTPassageInfo ZT1PassageInfo) } - mNbPassagesToday ++; + mNbDeclToday += NbDecl; mNbDeclTotal += NbDecl; mNbFNToday += NbDeclFN; @@ -423,9 +433,8 @@ int CPIHistorianManager::NewZT1Passage(CZTPassageInfo ZT1PassageInfo) mNbPPIZT1Today += NbDeclPPI; mNbPPEZT1Today += NbDeclPPE; - mPIHistorianRepo->WriteSingleReg(HISTORIAN_TRAINS_TODAY_REG_ADD,mNbPassagesToday); - mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TOTAL_REG_ADD,ZT1PassageInfo.mNbDeclenchements); mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TODAY_REG_ADD,mNbDeclToday); + mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TOTAL_REG_ADD,ZT1PassageInfo.mNbDeclenchements); mPIHistorianRepo->WriteSingleReg(HISTORIAN_FN_DETECTS_TODAY_REG_ADD,mNbFNToday); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPI_ZT1_DETECTS_TODAY_REG_ADD,mNbPPIZT1Today); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPE_ZT1_DETECTS_TODAY_REG_ADD,mNbPPEZT1Today); @@ -433,6 +442,8 @@ int CPIHistorianManager::NewZT1Passage(CZTPassageInfo ZT1PassageInfo) } + + return RET_OK; } @@ -561,7 +572,7 @@ int CPIHistorianManager::NewZT2Passage(CZTPassageInfo ZT2PassageInfo) void CPIHistorianManager::StartHistorianTimer() { QTime Time = QTime::currentTime(); - int Delay = Time.msecsTo(QTime(23,59,59)); + int Delay = Time.msecsTo(QTime(23,59,59,999)); if(Delay < 0) { Delay += MSECS_IN_A_DAY; @@ -578,6 +589,7 @@ void CPIHistorianManager::HistorianTimerExpired() mNbPPEZT1Today = 0; mNbPPIZT2Today = 0; mNbPPEZT2Today = 0; + mNbDeclToday = 0; StartHistorianTimer(); diff --git a/sources/Modbus/PIHistorianManager.h b/sources/Modbus/PIHistorianManager.h index 23534f4..b8a44ea 100644 --- a/sources/Modbus/PIHistorianManager.h +++ b/sources/Modbus/PIHistorianManager.h @@ -56,6 +56,9 @@ public slots: void SEIDisconnected(); void HistorianTimerExpired(); +signals: + void HistorianConnected(); + void HistorianDisconnected(); }; diff --git a/sources/Simulator/SimulationScenario.cpp b/sources/Simulator/SimulationScenario.cpp index 044878c..b5bd3b3 100644 --- a/sources/Simulator/SimulationScenario.cpp +++ b/sources/Simulator/SimulationScenario.cpp @@ -165,7 +165,7 @@ unsigned int CSimulationScenario::CreateScenario() // InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0); //FN DETECTION - if(bogie != 7 /*&& bogie != 8 && bogie != 3*/) +// if(bogie != 7 /*&& bogie != 8 && bogie != 3*/) InsertNewStep(STEP_ACTION_ACTIVATE_FN,0); InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY); @@ -173,19 +173,19 @@ unsigned int CSimulationScenario::CreateScenario() InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY); //PPI DETECTION -// if(bogie == 6 || bogie == 9) -// InsertNewStep(STEP_ACTION_ACTIVATE_PPI,0); + if(bogie == 6 || bogie == 9) + InsertNewStep(STEP_ACTION_ACTIVATE_PPI,0); //FN DETECTION - if(bogie != 7 /*&& bogie != 8 && bogie != 3*/) +// if(bogie != 7 /*&& bogie != 8 && bogie != 3*/) InsertNewStep(STEP_ACTION_DEACTIVATE_FN,0); -// InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); + InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY); //PPI DETECTION -// if(bogie == 6 || bogie == 9) -// InsertNewStep(STEP_ACTION_DEACTIVATE_PPI,0); + if(bogie == 6 || bogie == 9) + InsertNewStep(STEP_ACTION_DEACTIVATE_PPI,0); // if(bogie != 2 && bogie != 11) // InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0); diff --git a/sources/ZTVersion.h b/sources/ZTVersion.h index a9c95b4..5473443 100755 --- a/sources/ZTVersion.h +++ b/sources/ZTVersion.h @@ -29,9 +29,15 @@ #ifndef ZTVERSION_H #define ZTVERSION_H -#define ZT_SOFT_VERSION "V1.27" +#define ZT_SOFT_VERSION "V1.28" //LOG DES CHANGEMENTS +//Version 1.28 +//Corrections à l'interface historien: +//-Correction du Nb de déclenchements aujourd'hui qui n'est pas remis à zéro +//-Correction du Nb de passages aujourd'hui qui ne se met pas à jour +//-Changement du calcul du Nb de ms avant minuit à la ms près (plutôt qu'à la seconde) + //Version 1.27 //-Ajout du flag pour ignorer la clef RSA lors du transfert FTP. Suite aux problemes // a Beaugrand. diff --git a/sources/Zonetest.cpp b/sources/Zonetest.cpp index e9d0af3..fcf69e0 100644 --- a/sources/Zonetest.cpp +++ b/sources/Zonetest.cpp @@ -612,6 +612,9 @@ unsigned int CZoneTest::InitZT() connect(mModbusSEIMgr,SIGNAL(ModbusMasterConnected(qint32,qint32)),mPIHistorianManager,SLOT(SEIConnected(qint32,qint32))); connect(mModbusSEIMgr,SIGNAL(ModbusMasterDisconnected()),mPIHistorianManager,SLOT(SEIDisconnected())); } + connect(mPIHistorianManager,SIGNAL(HistorianConnected()),panel.mZTMainPage,SLOT(ModbusHistorienConnected())); + connect(mPIHistorianManager,SIGNAL(HistorianDisconnected()),panel.mZTMainPage,SLOT(ModbusHistorienDisconnected())); + panel.mZTMainPage->ModbusHistorienDisconnected(); mPIHistorianManager->UpdateDetectionFunctions(mZTSettings->mDetectionFunctionSettings); mPIHistorianManager->UpdatePGTreshold(mZTSettings->mPGTreshold);