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

Pas trop certain de ce qui a changé...

Browse Source
This commit is contained in:
JF
2020-04-30 12:33:27 -04:00
parent db917394e0
commit 1ea9fa200a
11 changed files with 477 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/GuiElements/DatabaseMgrPage.cpp
+2 -1
View File
@@ -161,6 +161,7 @@ CDatabaseMgrPage::CDatabaseMgrPage(QGraphicsWidget *Parent, bool EngMode)
mDeleteDBDuplicatesBtn->setParentItem(this);
mDeleteDBDuplicatesBtn->setPos(360,110);
connect(mDeleteDBDuplicatesBtn,SIGNAL(TxtButtonClicked(CTextButtonWidget*)),this,SLOT(ButtonClicked(CTextButtonWidget*)));
mDeleteDBDuplicatesBtn->hide();
mDeleteNonErrorLogs = new CTextButtonWidget("Effacer passages sans décl.");
mDeleteNonErrorLogs->setParentItem(this);
@@ -578,7 +579,7 @@ void CDatabaseMgrPage::UpdateDBStats()
void CDatabaseMgrPage::EnableEngineeringMode()
{
mDeleteDBDuplicatesBtn->show();
//mDeleteDBDuplicatesBtn->show();
mDeleteNonErrorLogs->show();
mDeleteZTLogFiles->show();
mRebuildDatabaseFile->show();
sources/GuiElements/LogsListPage.cpp
+11 -4
View File
@@ -166,7 +166,7 @@ CLogsListPage::CLogsListPage(QGraphicsWidget *Parent)
mStationsFilterComboBox = new QComboBox();
WidgetProxy->setWidget(mStationsFilterComboBox);
WidgetProxy->setPos(250,420);
mStationsFilterComboBox->insertItems(0,QStringList() << "Toutes" << "Angrignon" << "Snowdon" << "Henri Bourassa" << "Honoré Beaugrand" << "Longueuil" << "Berri UQAM" << "Montmorency (10/12)" << "Montmorency (10/22)" << "Côte Vertu" << "Saint-Michel");
mStationsFilterComboBox->insertItems(0,QStringList() << "Toutes" << "Angrignon" << "Snowdon" << "Henri Bourassa" << "Honoré Beaugrand" << "Longueuil" << "Berri UQAM" << "Montmorency" << "Montmorency (10/12)" << "Montmorency (10/22)" << "Côte Vertu" << "Saint-Michel" << "Du Collège");
mStationsFilterComboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents);
mStationsFilterComboBox->adjustSize();
mStationsFilterComboBox->setMaxVisibleItems(15);
@@ -522,20 +522,27 @@ void CLogsListPage::LogsTableCellClicked(int row, int column)
}
QString TrainCompo = "Non Disponible";
if(ZT1LogElement->mFlags.mTrainCompo1 != 0)
// if(!((ZT1LogElement->mFlags.mTrainCompo1 == 0) && (ZT1LogElement->mFlags.mTrainCompo2 == 0) && (ZT1LogElement->mFlags.mTrainCompo3 == 0)))
{
TrainCompo = QString("%1-%2-%3").arg(ZT1LogElement->mFlags.mTrainCompo1)\
.arg(ZT1LogElement->mFlags.mTrainCompo2)
.arg(ZT1LogElement->mFlags.mTrainCompo3);
}
Summary = QString("Passage:\n\nDate: %1\nHeure: %2\nZone Test : ZT1\nTrain : %3\nCompo: %6\nNombre d'éléments: %4\nProblématique: %5\n\n\nDéclenchements: \n")\
QString Iti("Principal");
if(ZT1LogElement->mFlags.mZT1ITI == ZT_SECONDARY_ITI)
{
Iti = "Secondaire (10/22)";
}
Summary = QString("Passage:\n\nDate: %1\nHeure: %2\nItinéraire: %7\nZone Test : ZT1\nTrain : %3\nCompo: %6\nNombre d'éléments: %4\nProblématique: %5\n\n\nDéclenchements: \n")\
.arg(ZT1LogElement->mPassageDateTime.toString("yyyy/MM/dd"))\
.arg(ZT1LogElement->mPassageDateTime.toString("hh:mm:ss"))\
.arg(TrainType)\
.arg(ZT1LogElement->mNbElements)\
.arg(Problem)
.arg(TrainCompo);
.arg(TrainCompo)
.arg(Iti);
// Summary.sprintf("Passage:\n\nDate: %s\nHeure: %s\nZone Test : ZT1\nTrain : %s\nNombre d'éléments: %d\nProblématique: %s\n\n\nDéclenchements: \n",
// ZT1LogElement->mPassageDateTime.toString("yyyy/MM/dd").toAscii().data(),
// ZT1LogElement->mPassageDateTime.toString("hh:mm:ss").toAscii().data(),
sources/PassageArchiver.h.autosave
+17
View File
@@ -0,0 +1,17 @@
#ifndef PASSAGEARCHIVER_H
#define PASSAGEARCHIVER_H
#include "GlobalDefine.h"
#include "LogMgr.h"
class CPassageArchiver
{
public:
CLogMgr *mLogMgrHandle;
CPassageArchiver();
};
#endif // PASSAGEARCHIVER_H
sources/TrainLogFileMgr.cpp
+2
View File
@@ -354,6 +354,7 @@ CLogElement* CTrainLogFileMgr::OpenTrainLog(QString LogFilePathName,unsigned int
PassageLog->mFlags.mTrainCompo2 = 0;
PassageLog->mFlags.mTrainCompo3 = 0;
PassageLog->mFlags.mModbusTrainType = MODBUS_CC_TRAIN_TYPE_INVALID_NOT_UPDATED;
PassageLog->mFlags.mZT1ITI = ZT_PRIMARY_ITI;
}
else if(LogFileVersion == 2)
{
@@ -368,6 +369,7 @@ CLogElement* CTrainLogFileMgr::OpenTrainLog(QString LogFilePathName,unsigned int
PassageLog->mFlags.mTrainCompo2 = 0;
PassageLog->mFlags.mTrainCompo3 = 0;
PassageLog->mFlags.mModbusTrainType = MODBUS_CC_TRAIN_TYPE_INVALID_NOT_UPDATED;
PassageLog->mFlags.mZT1ITI = ZT_PRIMARY_ITI;
}
else if(LogFileVersion == 3)
{
sources/ZTData.cpp
+2 -2
View File
@@ -170,7 +170,7 @@ QDataStream &operator<<(QDataStream &out, const CZT1FlagsData &source)
<< source.mTrainCompo2
<< source.mTrainCompo3
<< source.mModbusTrainType
<< source.mUnusedFlag12
<< source.mZT1ITI
<< source.mUnusedFlag13
<< source.mUnusedFlag14
<< source.mUnusedFlag15
@@ -195,7 +195,7 @@ QDataStream &operator>>(QDataStream &in, CZT1FlagsData &dest)
>> dest.mTrainCompo2
>> dest.mTrainCompo3
>> dest.mModbusTrainType
>> dest.mUnusedFlag12
>> dest.mZT1ITI
>> dest.mUnusedFlag13
>> dest.mUnusedFlag14
>> dest.mUnusedFlag15
sources/ZTData.h
+7 -1
View File
@@ -62,6 +62,12 @@ enum eCDVType
CDV_SWITCH_TYPE
};
enum eZTITI
{
ZT_PRIMARY_ITI, // Itinéraire 10/12 ou en voie normale
ZT_SECONDARY_ITI, // Itinéraire 10/22 ou autre changement de voie (quai banalisé)
ZT_MAX_ITI
};
enum eDetectionID
{
DETECTION_MAGNETIC_SENSOR_COUNT,
@@ -214,7 +220,7 @@ public:
qint32 mTrainCompo2;
qint32 mTrainCompo3;
qint32 mModbusTrainType;
qint32 mUnusedFlag12;
qint32 mZT1ITI;
qint32 mUnusedFlag13;
qint32 mUnusedFlag14;
qint32 mUnusedFlag15;
sources/ZTLogFilesMgr.cpp
+1
View File
@@ -1,3 +1,4 @@
#include "ZTLogFilesMgr.h"
#include <QFileInfo>
#include <QTextStream>