jfmartel/ZT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrections et améliorations Historien

Browse Source
This commit is contained in:
jfmartel 2024-07-11 14:26:37 -04:00
parent 09ce9cbf5d
commit 8eb851b2cd
9 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sftpbatch
View File

@ -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 ./LOG/LogZT.txt CVRT-LogZT.txt
put ./ING/IngLog.txt CVRT-IngLog.txt put ./ING/IngLog.txt CVRT-IngLog.txt

2
sources/GuiElements/StatusBar.cpp
View File

@ -231,7 +231,7 @@ void CStatusBar::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
{ {
painter->setPen(Qt::black); painter->setPen(Qt::black);
Text.clear(); Text.clear();
Text.sprintf("Modbus: Désactivé"); Text.sprintf("Modbus: N/A");
TextRect.adjust(20,0,0,0); TextRect.adjust(20,0,0,0);
painter->drawText(TextRect, Qt::AlignLeft, Text); painter->drawText(TextRect, Qt::AlignLeft, Text);
TextRect.adjust(painter->fontMetrics().width(Text),0,0,0); TextRect.adjust(painter->fontMetrics().width(Text),0,0,0);

11
sources/GuiElements/ZTPage.cpp
View File

@ -482,3 +482,14 @@ void CZTPage::ModbusSEIDisconnected()
{ {
mStatusBar->SetSEIModbusState(SB_MODBUS_DISCONNECTED); mStatusBar->SetSEIModbusState(SB_MODBUS_DISCONNECTED);
} }
void CZTPage::ModbusHistorienConnected()
{
mStatusBar->SetHistorienModbusState(SB_MODBUS_CONNECTED);
}
void CZTPage::ModbusHistorienDisconnected()
{
mStatusBar->SetHistorienModbusState(SB_MODBUS_DISCONNECTED);
}

2
sources/GuiElements/ZTPage.h
View File

@ -111,6 +111,8 @@ public slots:
void ModbusCCDisconnected(); void ModbusCCDisconnected();
void ModbusSEIConnected(); void ModbusSEIConnected();
void ModbusSEIDisconnected(); void ModbusSEIDisconnected();
void ModbusHistorienConnected();
void ModbusHistorienDisconnected();
}; };

20
sources/Modbus/PIHistorianManager.cpp
View File

@ -42,6 +42,7 @@ void CPIHistorianManager::NewModbusConnection()
connect(NewSession,SIGNAL(PIHistorianSessionClosed(CPIHistorianSession*)),this,SLOT(HistorianSessionClosed(CPIHistorianSession*))); connect(NewSession,SIGNAL(PIHistorianSessionClosed(CPIHistorianSession*)),this,SLOT(HistorianSessionClosed(CPIHistorianSession*)));
mHistorianSessionsList.append(NewSession); mHistorianSessionsList.append(NewSession);
NewSession->OpenSession(SessionSocket); NewSession->OpenSession(SessionSocket);
emit HistorianConnected();
} }
} }
@ -55,6 +56,11 @@ void CPIHistorianManager::HistorianSessionClosed(CPIHistorianSession *SessionPtr
CPIHistorianSession *Session = mHistorianSessionsList.takeAt(i); CPIHistorianSession *Session = mHistorianSessionsList.takeAt(i);
Session->CloseSession(); Session->CloseSession();
delete Session; delete Session;
if(mHistorianSessionsList.size() == 0)
{
emit HistorianDisconnected();
}
return; 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_ID2_REG_ADD,ZT1PassageInfo.mTrainCompo2);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_LAST_TRAIN_ID3_REG_ADD,ZT1PassageInfo.mTrainCompo3); mPIHistorianRepo->WriteSingleReg(HISTORIAN_LAST_TRAIN_ID3_REG_ADD,ZT1PassageInfo.mTrainCompo3);
mNbPassagesToday ++;
mPIHistorianRepo->WriteSingleReg(HISTORIAN_TRAINS_TODAY_REG_ADD,mNbPassagesToday);
QDateTime PassageDateTime = ZT1PassageInfo.mPassageDateTime; QDateTime PassageDateTime = ZT1PassageInfo.mPassageDateTime;
quint16 year, month, day, hour, minute, seconds; quint16 year, month, day, hour, minute, seconds;
year = (quint16)PassageDateTime.date().year(); year = (quint16)PassageDateTime.date().year();
@ -415,7 +425,7 @@ int CPIHistorianManager::NewZT1Passage(CZTPassageInfo ZT1PassageInfo)
} }
mNbPassagesToday ++;
mNbDeclToday += NbDecl; mNbDeclToday += NbDecl;
mNbDeclTotal += NbDecl; mNbDeclTotal += NbDecl;
mNbFNToday += NbDeclFN; mNbFNToday += NbDeclFN;
@ -423,9 +433,8 @@ int CPIHistorianManager::NewZT1Passage(CZTPassageInfo ZT1PassageInfo)
mNbPPIZT1Today += NbDeclPPI; mNbPPIZT1Today += NbDeclPPI;
mNbPPEZT1Today += NbDeclPPE; 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_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_FN_DETECTS_TODAY_REG_ADD,mNbFNToday);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPI_ZT1_DETECTS_TODAY_REG_ADD,mNbPPIZT1Today); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPI_ZT1_DETECTS_TODAY_REG_ADD,mNbPPIZT1Today);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPE_ZT1_DETECTS_TODAY_REG_ADD,mNbPPEZT1Today); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPE_ZT1_DETECTS_TODAY_REG_ADD,mNbPPEZT1Today);
@ -433,6 +442,8 @@ int CPIHistorianManager::NewZT1Passage(CZTPassageInfo ZT1PassageInfo)
} }
return RET_OK; return RET_OK;
} }
@ -561,7 +572,7 @@ int CPIHistorianManager::NewZT2Passage(CZTPassageInfo ZT2PassageInfo)
void CPIHistorianManager::StartHistorianTimer() void CPIHistorianManager::StartHistorianTimer()
{ {
QTime Time = QTime::currentTime(); QTime Time = QTime::currentTime();
int Delay = Time.msecsTo(QTime(23,59,59)); int Delay = Time.msecsTo(QTime(23,59,59,999));
if(Delay < 0) if(Delay < 0)
{ {
Delay += MSECS_IN_A_DAY; Delay += MSECS_IN_A_DAY;
@ -578,6 +589,7 @@ void CPIHistorianManager::HistorianTimerExpired()
mNbPPEZT1Today = 0; mNbPPEZT1Today = 0;
mNbPPIZT2Today = 0; mNbPPIZT2Today = 0;
mNbPPEZT2Today = 0; mNbPPEZT2Today = 0;
mNbDeclToday = 0;
StartHistorianTimer(); StartHistorianTimer();

3
sources/Modbus/PIHistorianManager.h
View File

@ -56,6 +56,9 @@ public slots:
void SEIDisconnected(); void SEIDisconnected();
void HistorianTimerExpired(); void HistorianTimerExpired();
signals:
void HistorianConnected();
void HistorianDisconnected();
}; };

14
sources/Simulator/SimulationScenario.cpp
View File

@ -165,7 +165,7 @@ unsigned int CSimulationScenario::CreateScenario()
// InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0); // InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0);
//FN DETECTION //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_FN,0);
InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY); InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY);
@ -173,19 +173,19 @@ unsigned int CSimulationScenario::CreateScenario()
InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY); InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY);
//PPI DETECTION //PPI DETECTION
// if(bogie == 6 || bogie == 9) if(bogie == 6 || bogie == 9)
// InsertNewStep(STEP_ACTION_ACTIVATE_PPI,0); InsertNewStep(STEP_ACTION_ACTIVATE_PPI,0);
//FN DETECTION //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_DEACTIVATE_FN,0);
// InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY);
InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY); InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY);
//PPI DETECTION //PPI DETECTION
// if(bogie == 6 || bogie == 9) if(bogie == 6 || bogie == 9)
// InsertNewStep(STEP_ACTION_DEACTIVATE_PPI,0); InsertNewStep(STEP_ACTION_DEACTIVATE_PPI,0);
// if(bogie != 2 && bogie != 11) // if(bogie != 2 && bogie != 11)
// InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0); // InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0);

8
sources/ZTVersion.h
View File

@ -29,9 +29,15 @@
#ifndef ZTVERSION_H #ifndef ZTVERSION_H
#define ZTVERSION_H #define ZTVERSION_H
#define ZT_SOFT_VERSION "V1.27" #define ZT_SOFT_VERSION "V1.28"
//LOG DES CHANGEMENTS //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 //Version 1.27
//-Ajout du flag pour ignorer la clef RSA lors du transfert FTP. Suite aux problemes //-Ajout du flag pour ignorer la clef RSA lors du transfert FTP. Suite aux problemes
// a Beaugrand. // a Beaugrand.

3
sources/Zonetest.cpp
View File

@ -612,6 +612,9 @@ unsigned int CZoneTest::InitZT()
connect(mModbusSEIMgr,SIGNAL(ModbusMasterConnected(qint32,qint32)),mPIHistorianManager,SLOT(SEIConnected(qint32,qint32))); connect(mModbusSEIMgr,SIGNAL(ModbusMasterConnected(qint32,qint32)),mPIHistorianManager,SLOT(SEIConnected(qint32,qint32)));
connect(mModbusSEIMgr,SIGNAL(ModbusMasterDisconnected()),mPIHistorianManager,SLOT(SEIDisconnected())); 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->UpdateDetectionFunctions(mZTSettings->mDetectionFunctionSettings);
mPIHistorianManager->UpdatePGTreshold(mZTSettings->mPGTreshold); mPIHistorianManager->UpdatePGTreshold(mZTSettings->mPGTreshold);