From ce57a2e501085c19d6bd448606f8e976604708b4 Mon Sep 17 00:00:00 2001 From: jfmartel Date: Thu, 15 Aug 2024 14:05:30 -0400 Subject: [PATCH] Compilation sur Qt 5.14.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compatibilité avec les fichiers logs contenant les états des fonctions de détection. --- .gitignore | 1 + .qmake.stash | 21 + Configuration/Settings.bak | Bin 0 -> 424 bytes Configuration/Settings.ozs | Bin 424 -> 458 bytes Makefile | 567 +- Makefile.Debug | 10235 +++++++++++++++++++- Makefile.Release | 10235 +++++++++++++++++++- OutilZT.pro | 2 +- OutilZT.pro.user.5a351af.22 | 514 + sources/DirParserThread.cpp | 2 +- sources/GlobalDefine.h | 4 +- sources/GuiElements/DatabaseMgrPage.cpp | 6 + sources/GuiElements/DatabaseMgrPage.h | 2 +- sources/GuiElements/LogViewPage.cpp | 117 +- sources/GuiElements/LogViewPage.h | 7 +- sources/GuiElements/LogsListPage.cpp | 2 +- sources/GuiElements/NetworkCtrlPage.cpp | 2 +- sources/GuiElements/NetworkZTListPage.cpp | 70 +- sources/GuiElements/OptionsPage.cpp | 2 +- sources/GuiElements/RemoteZTCtrlPage.cpp | 2 +- sources/GuiElements/RemoteZTPage.cpp | 2 +- sources/GuiElements/ZTLogsListPage.cpp | 2 +- sources/LogMgr.cpp | 6 +- sources/MainPanel.cpp | 7 +- sources/MainPanel.h | 2 +- sources/NetworkManager.cpp | 13 +- sources/OutilZT.cpp | 82 +- sources/Settings.cpp | 2 + sources/TrainLogFileMgr.cpp | 8 +- sources/ZTData.cpp | 8 +- sources/ZTData.h | 4 +- sources/ZTLogFilesMgr.cpp | 2 + sources/main.cpp | 2 +- 33 files changed, 21154 insertions(+), 777 deletions(-) create mode 100644 .qmake.stash create mode 100644 Configuration/Settings.bak create mode 100644 OutilZT.pro.user.5a351af.22 diff --git a/.gitignore b/.gitignore index 388b712..7f9566c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ SNW5 /object_script.OutilZT.Debug /object_script.OutilZT.Release /Trains.zip +/ArchiveLogZT_ANG_20240306/* diff --git a/.qmake.stash b/.qmake.stash new file mode 100644 index 0000000..4f433cb --- /dev/null +++ b/.qmake.stash @@ -0,0 +1,21 @@ +QMAKE_CXX.QT_COMPILER_STDCXX = 201402L +QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 7 +QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 +QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0 +QMAKE_CXX.COMPILER_MACROS = \ + QT_COMPILER_STDCXX \ + QMAKE_GCC_MAJOR_VERSION \ + QMAKE_GCC_MINOR_VERSION \ + QMAKE_GCC_PATCH_VERSION +QMAKE_CXX.INCDIRS = \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++ \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/x86_64-w64-mingw32 \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include/c++/backward \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0/include-fixed \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/x86_64-w64-mingw32/include +QMAKE_CXX.LIBDIRS = \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc/x86_64-w64-mingw32/7.3.0 \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib/gcc \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/x86_64-w64-mingw32/lib \ + C:/Qt/Qt5.14.2/Tools/mingw730_64/lib diff --git a/Configuration/Settings.bak b/Configuration/Settings.bak new file mode 100644 index 0000000000000000000000000000000000000000..afe1455e99511b32469bd5531a6525c099c36d13 GIT binary patch literal 424 zcmdnB_S8QH1_n0<7X~W^eFk5KM21X;JRr*rNGCI70LfH_B8Fn1h!=xDgA3@5tgqCSI(Y9#>q8-y%h;~h5DcUoQm1y5ILeYU~tVM^W5s8jWBNiR2W`Ad@slEX; CLoG!B literal 424 zcmdnB_S8QH1_n0<7X~Ya7zSU4M21X;JRr*rNGCI70LfH_B8Fn1h!=xDgA + + + + + EnvironmentId + {5a351af6-dc3b-4afc-af92-7da5e3a5cd12} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + -fno-delayed-template-parsing + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit + 0 + 0 + 0 + + D:/Main/Fichiers/JOB/build-OutilZT-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + + true + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/Main/Fichiers/JOB/build-OutilZT-Desktop_Qt_5_14_2_MinGW_64_bit-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + + D:/Main/Fichiers/JOB/build-OutilZT-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + + + true + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 3 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + Qt4ProjectManager.Qt4RunConfiguration:D:/Main/Fichiers/JOB/OutilZT/OutilZT.pro + D:/Main/Fichiers/JOB/OutilZT/OutilZT.pro + + false + + false + true + true + false + false + true + + D:/Main/Fichiers/JOB/build-OutilZT-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + + 1 + + + + ProjectExplorer.Project.Target.1 + + Qt 4.8.7 + Qt 4.8.7 + {8820e404-d75e-4d7e-80ff-354d5dfc06d1} + 0 + 0 + 0 + + D:/Main/Fichiers/JOB/build-OutilZT-Qt_4_8_7-Debug + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + + + D:/Main/Fichiers/JOB/build-OutilZT-Qt_4_8_7-Release + + + true + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + + 2 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + dwarf + + cpu-cycles + + + 250 + + -e + cpu-cycles + --call-graph + dwarf,4096 + -F + 250 + + -F + true + 4096 + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + kcachegrind + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + ProjectExplorer.CustomExecutableRunConfiguration + + + false + + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 22 + + + Version + 22 + + diff --git a/sources/DirParserThread.cpp b/sources/DirParserThread.cpp index 90362af..24613a1 100644 --- a/sources/DirParserThread.cpp +++ b/sources/DirParserThread.cpp @@ -89,7 +89,7 @@ int CDirParserThread::ParseDir(QDir dir, bool KeepData) void CDirParserThread::SetParsingInfo(QDir dir, QString Filter, bool KeepData) { - qDebug("DirParserThread parsing info: dir: %s, Filter: %s",dir.dirName().toAscii().data(),Filter.toAscii().data()); + //qDebug("DirParserThread parsing info: dir: %s, Filter: %s",dir.dirName().toAscii().data(),Filter.toAscii().data()); mRootDir = dir; mKeepData = KeepData; mFilter = Filter; diff --git a/sources/GlobalDefine.h b/sources/GlobalDefine.h index f5f72df..aeb96ef 100644 --- a/sources/GlobalDefine.h +++ b/sources/GlobalDefine.h @@ -28,8 +28,8 @@ #define GLOBAL_DEFINE //Screen resolution. -#define SCREEN_RES_WIDTH 1200 -#define SCREEN_RES_HEIGHT 700 +#define SCREEN_RES_WIDTH 1600 +#define SCREEN_RES_HEIGHT 768 //Train parameters #define MR_BOGIE_LENGTH 1.52 //meters diff --git a/sources/GuiElements/DatabaseMgrPage.cpp b/sources/GuiElements/DatabaseMgrPage.cpp index dc38fae..80a5020 100644 --- a/sources/GuiElements/DatabaseMgrPage.cpp +++ b/sources/GuiElements/DatabaseMgrPage.cpp @@ -116,6 +116,12 @@ CDatabaseMgrPage::CDatabaseMgrPage(QGraphicsWidget *Parent, bool EngMode) WidgetProxy->setPos(60,140); mFilterDuplicateChkBx->setChecked(true); + WidgetProxy = new QGraphicsProxyWidget(this); + mImportInPlace = new QCheckBox("Importer en place"); + WidgetProxy->setWidget(mImportInPlace); + WidgetProxy->setPos(60,170); + mImportInPlace->setChecked(true); + // WidgetProxy = new QGraphicsProxyWidget(this); // mDeleteSourceDataChkBx = new QCheckBox("Effacer données sources"); // WidgetProxy->setWidget(mDeleteSourceDataChkBx); diff --git a/sources/GuiElements/DatabaseMgrPage.h b/sources/GuiElements/DatabaseMgrPage.h index 9a4ef62..873d066 100644 --- a/sources/GuiElements/DatabaseMgrPage.h +++ b/sources/GuiElements/DatabaseMgrPage.h @@ -144,7 +144,7 @@ private: QGraphicsRectItem *mBackgroundRect; CTextButtonWidget *mCancelButton, *mImportDataButton, *mCancelImportButton; - QCheckBox *mImportErrorDataOnlyChkBx, *mFilterDuplicateChkBx, *mDeleteSourceDataChkBx; + QCheckBox *mImportErrorDataOnlyChkBx, *mFilterDuplicateChkBx, *mDeleteSourceDataChkBx, *mImportInPlace; QProgressBar *mProgressBar; QGraphicsTextItem *mProgressStatusText; diff --git a/sources/GuiElements/LogViewPage.cpp b/sources/GuiElements/LogViewPage.cpp index 0a444ac..a424cf0 100644 --- a/sources/GuiElements/LogViewPage.cpp +++ b/sources/GuiElements/LogViewPage.cpp @@ -36,12 +36,12 @@ #include -CLogViewPage::CLogViewPage(QGraphicsWidget *Parent, qreal LogViewPageWidth) +CLogViewPage::CLogViewPage(int Width, QGraphicsWidget *Parent) { - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + //QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); setParentItem(Parent); - setAcceptsHoverEvents(true); + setAcceptHoverEvents(true); @@ -75,19 +75,17 @@ CLogViewPage::CLogViewPage(QGraphicsWidget *Parent, qreal LogViewPageWidth) qreal PlotsHeight = ((GRAPH_ZONE_HEIGHT - 60) / (ZT1_DISCREET_PLOTTABLE_NB_PARAM + ZT1_ANALOG_PLOTTABLE_NB_PARAM)); PlotsHeight -= (20 + (10/(ZT1_DISCREET_PLOTTABLE_NB_PARAM + ZT1_ANALOG_PLOTTABLE_NB_PARAM))) ; //space between plots int CurPlot = 0; - mGraphZoneWidth = LogViewPageWidth - GRAPH_ZONE_X_OFFSET; - qDebug("Size = %f",mGraphZoneWidth); + int GraphZoneWidth = Width - GRAPH_ZONE_X_OFFSET;//boundingRect().width(); for(int param = 0; param < ZT1_DISCREET_PLOTTABLE_NB_PARAM; param++) { mZT1DiscreetPlots[param].mParamID = param; mZT1DiscreetPlots[param].mDataSet = new QList; CGraphItem * NewGraph = new CGraphItem(this); - //NewGraph->setPos(GRAPH_ZONE_X_OFFSET,param * (40 + 20)+10); NewGraph->setPos(GRAPH_ZONE_X_OFFSET,CurPlot++ * (PlotsHeight + 20) + 10); // NewGraph->resize(GRAPH_ZONE_WIDTH,PlotsHeight); - NewGraph->resize(mGraphZoneWidth,PlotsHeight); + NewGraph->resize(GraphZoneWidth,PlotsHeight); mZT1DiscreetPlots[param].mPlotGaph = NewGraph; mZT1DiscreetPlots[param].mPlotGaph->SetData(mZT1DiscreetPlots[param].mDataSet); @@ -109,8 +107,8 @@ CLogViewPage::CLogViewPage(QGraphicsWidget *Parent, qreal LogViewPageWidth) CAnalogGraphItem *NewGraph = new CAnalogGraphItem(this); // NewGraph->setPos(GRAPH_ZONE_X_OFFSET,(param+DISCREET_PLOTTABLE_NB_PARAM)*(40+20)+10); NewGraph->setPos(GRAPH_ZONE_X_OFFSET,CurPlot++ * (PlotsHeight + 20) + 10); - //NewGraph->resize(GRAPH_ZONE_WIDTH,PlotsHeight); - NewGraph->resize(mGraphZoneWidth,PlotsHeight); + // NewGraph->resize(GRAPH_ZONE_WIDTH,PlotsHeight); + NewGraph->resize(GraphZoneWidth,PlotsHeight); mZT1AnalogPlots[param].mPlotGaph = NewGraph; mZT1AnalogPlots[param].mPlotGaph->SetData(mZT1AnalogPlots[param].mDataSet); @@ -120,8 +118,7 @@ CLogViewPage::CLogViewPage(QGraphicsWidget *Parent, qreal LogViewPageWidth) mZT1AnalogPlots[ZT1_ANALOG_PLOTTABLE_TRAIN_SPEED_PARAM].mPlotGaph->SetLabel("Vitesse",GRAPH_ZONE_X_OFFSET); mZT1AnalogPlots[ZT1_ANALOG_PLOTTABLE_PGCOMBINED_PARAM].mPlotGaph->SetLabel("Détection",GRAPH_ZONE_X_OFFSET); mZT1AnalogPlots[ZT1_ANALOG_PLOTTABLE_SDF_DATA_PARAM].mPlotGaph->SetLabel("SDF",GRAPH_ZONE_X_OFFSET); - // mZT1AnalogPlots[ZT1_ANALOG_PLOTTABLE_SDF_DATA_PARAM].mPlotGaph->resize(GRAPH_ZONE_WIDTH,PlotsHeight*2); - mZT1AnalogPlots[ZT1_ANALOG_PLOTTABLE_SDF_DATA_PARAM].mPlotGaph->resize(mGraphZoneWidth,PlotsHeight*2); + mZT1AnalogPlots[ZT1_ANALOG_PLOTTABLE_SDF_DATA_PARAM].mPlotGaph->resize(GraphZoneWidth,PlotsHeight*2); //Setup ZT2 Plots PlotsHeight = ((GRAPH_ZONE_HEIGHT - 60) / (ZT2_DISCREET_PLOTTABLE_NB_PARAM + ZT2_ANALOG_PLOTTABLE_NB_PARAM)); @@ -135,7 +132,8 @@ CLogViewPage::CLogViewPage(QGraphicsWidget *Parent, qreal LogViewPageWidth) CGraphItem * NewGraph = new CGraphItem(this); //NewGraph->setPos(GRAPH_ZONE_X_OFFSET,param * (40 + 20)+10); NewGraph->setPos(GRAPH_ZONE_X_OFFSET,CurPlot++ * (PlotsHeight + 20) + 10); - NewGraph->resize(900,PlotsHeight); +// NewGraph->resize(GRAPH_ZONE_WIDTH,PlotsHeight); + NewGraph->resize(GraphZoneWidth,PlotsHeight); mZT2DiscreetPlots[param].mPlotGaph = NewGraph; mZT2DiscreetPlots[param].mPlotGaph->SetData(mZT2DiscreetPlots[param].mDataSet); @@ -153,10 +151,10 @@ CLogViewPage::CLogViewPage(QGraphicsWidget *Parent, qreal LogViewPageWidth) mVCursor->setZValue(2); // mHCursor = new CHorizontalGraphCursorWidget(GRAPH_ZONE_WIDTH,this); - mHCursor = new CHorizontalGraphCursorWidget(mGraphZoneWidth,this); + mHCursor = new CHorizontalGraphCursorWidget(GraphZoneWidth,this); mHCursor->setPos(0,0); - //mHCursor->resize(GRAPH_ZONE_WIDTH,3); - mHCursor->resize(mGraphZoneWidth,3); + // mHCursor->resize(GRAPH_ZONE_WIDTH,3); + mHCursor->resize(GraphZoneWidth,3); mHCursor->setZValue(2); // mCursorPosTxt = new QGraphicsTextItem(this); @@ -165,22 +163,22 @@ CLogViewPage::CLogViewPage(QGraphicsWidget *Parent, qreal LogViewPageWidth) mCursorsZoomButton = new CTextButtonWidget("Zoom curseurs"); mCursorsZoomButton->setParentItem(this); - mCursorsZoomButton->setPos(10,700-100); + mCursorsZoomButton->setPos(10,700); connect(mCursorsZoomButton,SIGNAL(TxtButtonClicked(CTextButtonWidget*)),this,SLOT(ButtonClicked(CTextButtonWidget*))); mZoomInButton = new CTextButtonWidget(" +",0,25,25); mZoomInButton->setParentItem(this); - mZoomInButton->setPos(95,730-100); + mZoomInButton->setPos(95,730); connect(mZoomInButton,SIGNAL(TxtButtonClicked(CTextButtonWidget*)),this,SLOT(ButtonClicked(CTextButtonWidget*))); mZoomOutButton = new CTextButtonWidget(" -",0,25,25); mZoomOutButton->setParentItem(this); - mZoomOutButton->setPos(10,730-100); + mZoomOutButton->setPos(10,730); connect(mZoomOutButton,SIGNAL(TxtButtonClicked(CTextButtonWidget*)),this,SLOT(ButtonClicked(CTextButtonWidget*))); mZoomResetButton = new CTextButtonWidget(" R",0,25,25); mZoomResetButton->setParentItem(this); - mZoomResetButton->setPos(50,730-100); + mZoomResetButton->setPos(50,730); connect(mZoomResetButton,SIGNAL(TxtButtonClicked(CTextButtonWidget*)),this,SLOT(ButtonClicked(CTextButtonWidget*))); mStaticCursor1 = new CVerticalGraphCursorWidget(GRAPH_ZONE_HEIGHT,this); @@ -196,46 +194,45 @@ CLogViewPage::CLogViewPage(QGraphicsWidget *Parent, qreal LogViewPageWidth) mStaticCursor2->hide(); mStaticCursorDeltaTimeTxt = new QGraphicsTextItem(this); - mStaticCursorDeltaTimeTxt->setPos(130,700-100); + mStaticCursorDeltaTimeTxt->setPos(130,700); mStaticCursorDeltaTimeTxt->setPlainText("Delta curseurs: ?"); mCursor1TimeTxt = new QGraphicsTextItem(this); - mCursor1TimeTxt->setPlainText("Curs. 1 : ?"); - mCursor1TimeTxt->setPos(130,720-100); + mCursor1TimeTxt->setPlainText("Position curseur 1 : ?"); + mCursor1TimeTxt->setPos(130,720); mCursor2TimeTxt = new QGraphicsTextItem(this); - mCursor2TimeTxt->setPlainText("Curs. 2 : ?"); - mCursor2TimeTxt->setPos(130,740-100); + mCursor2TimeTxt->setPlainText("Position curseur 2 : ?"); + mCursor2TimeTxt->setPos(130,740); mPassageStats1Txt = new QGraphicsTextItem(this); - mPassageStats1Txt->setPos(250,700-100); + mPassageStats1Txt->setPos(350,700); mPassageStats1Txt->setPlainText("Date & heure: \nStation : \nPosition : "); mPassageStats2Txt = new QGraphicsTextItem(this); - mPassageStats2Txt->setPos(500,700-100); + mPassageStats2Txt->setPos(600,700); mPassageStats2Txt->setPlainText("Vitesse Max : Mph\nVitesse Min: Mph\nSeuil PG : "); - -// mRuler = new CGraphRulerWidget(GRAPH_ZONE_WIDTH,this); - mRuler = new CGraphRulerWidget(mGraphZoneWidth,this); + // mRuler = new CGraphRulerWidget(GRAPH_ZONE_WIDTH,this); + mRuler = new CGraphRulerWidget(GraphZoneWidth,this); mRuler->setZValue(1); - mRuler->setPos(GRAPH_ZONE_X_OFFSET,670-100); + mRuler->setPos(GRAPH_ZONE_X_OFFSET,670); // mRuler->resize(GRAPH_ZONE_WIDTH,20); - mRuler->resize(mGraphZoneWidth,20); + mRuler->resize(GraphZoneWidth,20); -// mRankRuler = new CRankRulerWidget(GRAPH_ZONE_WIDTH,this); - mRankRuler = new CRankRulerWidget(mGraphZoneWidth,this); + //mRankRuler = new CRankRulerWidget(GRAPH_ZONE_WIDTH,this); + mRankRuler = new CRankRulerWidget(GraphZoneWidth,this); mRankRuler->setZValue(1); -// mRankRuler->resize(GRAPH_ZONE_WIDTH,10); - mRankRuler->resize(mGraphZoneWidth,10); - mRankRuler->setPos(GRAPH_ZONE_X_OFFSET,655-100); + // mRankRuler->resize(GRAPH_ZONE_WIDTH,10); + mRankRuler->resize(GraphZoneWidth,10); + mRankRuler->setPos(GRAPH_ZONE_X_OFFSET,655); mRankRuler->SetLabel("Rang:",GRAPH_ZONE_X_OFFSET); -// mEventRuler = new CEventRulerWidget(GRAPH_ZONE_WIDTH,this); - mEventRuler = new CEventRulerWidget(mGraphZoneWidth,this); + // mEventRuler = new CEventRulerWidget(GRAPH_ZONE_WIDTH,this); + mEventRuler = new CEventRulerWidget(GraphZoneWidth,this); mEventRuler->setZValue(1); -// mEventRuler->resize(GRAPH_ZONE_WIDTH,10); - mEventRuler = new CEventRulerWidget(mGraphZoneWidth,this); - mEventRuler->setPos(GRAPH_ZONE_X_OFFSET,640-100); + // mEventRuler->resize(GRAPH_ZONE_WIDTH,10); + mEventRuler->resize(GraphZoneWidth,10); + mEventRuler->setPos(GRAPH_ZONE_X_OFFSET,640); mEventRuler->SetLabel("Décl:",GRAPH_ZONE_X_OFFSET); mScrollAnimationTimer.start(); @@ -641,8 +638,7 @@ void CLogViewPage::SetLogData(CLogElement *element) mTotalTimeSpan = mMaxTime - mMinTime; mCurTimeSpan = mStopTime - mStartTime; -// mCurPixelTickValue = (qreal)GRAPH_ZONE_WIDTH/(qreal)mCurTimeSpan; //pixels per microsecs - mCurPixelTickValue = mGraphZoneWidth/(qreal)mCurTimeSpan; //pixels per microsecs + mCurPixelTickValue = (qreal)GRAPH_ZONE_WIDTH/(qreal)mCurTimeSpan; //pixels per microsecs mCursorPos = mStartTime; mPassageStats1Txt->setPlainText(QString().sprintf("Date & heure: %s\nStation : %s\nPosition : %s",mPassageDateTime.toUtf8().data(),mPassageStation.toUtf8().data()," ")); @@ -769,8 +765,7 @@ void CLogViewPage::ZoomIn(bool CenterOnCursor) //Convert time to pixels (in the new timespan) quint64 AbsoluteTime = CursorTime - StartTime; -// qreal PixelsPernSecs = (qreal)GRAPH_ZONE_WIDTH/(NewSpan); - qreal PixelsPernSecs = mGraphZoneWidth/(NewSpan); + qreal PixelsPernSecs = (qreal)GRAPH_ZONE_WIDTH/(NewSpan); qreal Pixel = AbsoluteTime * PixelsPernSecs; Pixel += GRAPH_ZONE_X_OFFSET; @@ -779,8 +774,7 @@ void CLogViewPage::ZoomIn(bool CenterOnCursor) qreal DeltaX = Pixel - mCursorPos; //convert this to an amount of time -// qint64 DeltaTime = ((qint64)DeltaX * NewSpan)/GRAPH_ZONE_WIDTH; - qint64 DeltaTime = ((qint64)DeltaX * NewSpan)/mGraphZoneWidth; + qint64 DeltaTime = ((qint64)DeltaX * NewSpan)/GRAPH_ZONE_WIDTH; //Shift the timespan to center the zoom on the cursor. StartTime += DeltaTime; @@ -833,8 +827,7 @@ void CLogViewPage::ZoomOut(bool CenterOnCursor) //Convert time to pixels (in the new timespan) quint64 AbsoluteTime = CursorTime - StartTime; - //qreal PixelsPernSecs = (qreal)GRAPH_ZONE_WIDTH/(NewSpan); - qreal PixelsPernSecs = mGraphZoneWidth/(NewSpan); + qreal PixelsPernSecs = (qreal)GRAPH_ZONE_WIDTH/(NewSpan); qreal Pixel = AbsoluteTime * PixelsPernSecs; Pixel += GRAPH_ZONE_X_OFFSET; @@ -843,8 +836,7 @@ void CLogViewPage::ZoomOut(bool CenterOnCursor) qreal DeltaX = Pixel - mCursorPos; //convert this to an amount of time -// qint64 DeltaTime = ((qint64)DeltaX * NewSpan)/GRAPH_ZONE_WIDTH; - qint64 DeltaTime = ((qint64)DeltaX * NewSpan)/mGraphZoneWidth; + qint64 DeltaTime = ((qint64)DeltaX * NewSpan)/GRAPH_ZONE_WIDTH; //Shift the timespan to center the zoom on the cursor. StartTime += DeltaTime; @@ -894,7 +886,7 @@ void CLogViewPage::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) mStaticCursor1->SetCursor(); mStaticCursor1->show(); UpdateStaticCursorsDeltaTime(); - mCursor1TimeTxt->setPlainText(QString().sprintf("Curs. 1 : %d ms",(int)(mStaticCursor1->GetTime()/1000000))); + mCursor1TimeTxt->setPlainText(QString().sprintf("Position curseur 1 : %d ms",(int)(mStaticCursor1->GetTime()/1000000))); } } if(event->button() == Qt::RightButton) @@ -903,7 +895,7 @@ void CLogViewPage::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) mStaticCursor2->SetTime(GetTimeForPixel(event->pos().x())); mStaticCursor2->SetCursor(); mStaticCursor2->show(); - mCursor2TimeTxt->setPlainText(QString().sprintf("Curs. 2 : %d ms",(int)(mStaticCursor2->GetTime()/1000000))); + mCursor2TimeTxt->setPlainText(QString().sprintf("Position curseur 2 : %d ms",(int)(mStaticCursor2->GetTime()/1000000))); UpdateStaticCursorsDeltaTime(); } @@ -918,8 +910,7 @@ void CLogViewPage::mouseMoveEvent(QGraphicsSceneMouseEvent *event) //qreal Drag = 50; if(Drag != 0) { -// qreal TickValue = (qreal)GRAPH_ZONE_WIDTH/(qreal)mCurTimeSpan; - qreal TickValue = mGraphZoneWidth/(qreal)mCurTimeSpan; + qreal TickValue = (qreal)GRAPH_ZONE_WIDTH/(qreal)mCurTimeSpan; qreal temp = TickValue/Drag; //quint64 usecsDrag = 1/(mCurPixelTickValue/Drag); qint64 usecsDrag = 1/temp; @@ -1070,8 +1061,7 @@ void CLogViewPage::hoverMoveEvent(QGraphicsSceneHoverEvent *event) qreal CLogViewPage::GetPixelForTime(quint64 Time) { quint64 AbsoluteTime = Time - mStartTime; - //qreal PixelsPernSecs = (qreal)GRAPH_ZONE_WIDTH/(mStopTime - mStartTime); - qreal PixelsPernSecs = mGraphZoneWidth/(mStopTime - mStartTime); + qreal PixelsPernSecs = (qreal)GRAPH_ZONE_WIDTH/(mStopTime - mStartTime); qreal Pixel = AbsoluteTime * PixelsPernSecs; return Pixel+GRAPH_ZONE_X_OFFSET; @@ -1080,8 +1070,7 @@ qreal CLogViewPage::GetPixelForTime(quint64 Time) quint64 CLogViewPage::GetTimeForPixel(qreal PixelPos) { PixelPos -= GRAPH_ZONE_X_OFFSET; - //qreal nSecsPerPixels = (mStopTime - mStartTime)/GRAPH_ZONE_WIDTH; - qreal nSecsPerPixels = (mStopTime - mStartTime)/mGraphZoneWidth; + qreal nSecsPerPixels = (mStopTime - mStartTime)/GRAPH_ZONE_WIDTH; quint64 AbsoluteTimeForPixel = PixelPos*nSecsPerPixels; quint64 Time = mStartTime + AbsoluteTimeForPixel; @@ -1106,8 +1095,7 @@ unsigned int CLogViewPage::ShowSpan(quint64 TimePos1, quint64 TimePos2) } mCurTimeSpan = mStopTime - mStartTime; - //mCurPixelTickValue = (qreal)GRAPH_ZONE_WIDTH/(qreal)mCurTimeSpan; //pixels per microsecs - mCurPixelTickValue = mGraphZoneWidth/(qreal)mCurTimeSpan; //pixels per microsecs + mCurPixelTickValue = (qreal)GRAPH_ZONE_WIDTH/(qreal)mCurTimeSpan; //pixels per microsecs if(mViewType == ZT1_LOG_TYPE) { @@ -1180,10 +1168,9 @@ unsigned int CLogViewPage::AdjustMouseCursorPos(qreal PosX, qreal PosY) mCursorPos = PosX; if(mCursorPos < GRAPH_ZONE_X_OFFSET) mCursorPos = GRAPH_ZONE_X_OFFSET; -// else if(mCursorPos > GRAPH_ZONE_WIDTH + GRAPH_ZONE_X_OFFSET) -// mCursorPos = GRAPH_ZONE_WIDTH + GRAPH_ZONE_X_OFFSET; - else if(mCursorPos > mGraphZoneWidth + GRAPH_ZONE_X_OFFSET) - mCursorPos = mGraphZoneWidth + GRAPH_ZONE_X_OFFSET; + else if(mCursorPos > GRAPH_ZONE_WIDTH + GRAPH_ZONE_X_OFFSET) + mCursorPos = GRAPH_ZONE_WIDTH + GRAPH_ZONE_X_OFFSET; + qreal HCursorPos = PosY; if(HCursorPos > GRAPH_ZONE_HEIGHT) HCursorPos = GRAPH_ZONE_HEIGHT; diff --git a/sources/GuiElements/LogViewPage.h b/sources/GuiElements/LogViewPage.h index 697e19d..7a340d0 100644 --- a/sources/GuiElements/LogViewPage.h +++ b/sources/GuiElements/LogViewPage.h @@ -46,8 +46,8 @@ #include "EventsRulerWidget.h" #include "QElapsedTimer" -#define GRAPH_ZONE_WIDTH 880//900 -#define GRAPH_ZONE_HEIGHT 600//700 +#define GRAPH_ZONE_WIDTH 680//900 +#define GRAPH_ZONE_HEIGHT 650//700 #define GRAPH_ZONE_X_OFFSET 70 //50 #define MIN_TIMESPAN 1000 //1 millisecond @@ -123,7 +123,7 @@ class CLogViewPage : public CGuiPage { Q_OBJECT public: - CLogViewPage(QGraphicsWidget *Parent = 0, qreal LogViewPageWidth = 800); + CLogViewPage(int Width,QGraphicsWidget *Parent = 0); ~CLogViewPage(); COutilZT *mProgramHandle; @@ -167,7 +167,6 @@ private: QGraphicsTextItem *mStaticCursorDeltaTimeTxt, *mCursor1TimeTxt, *mCursor2TimeTxt; QGraphicsTextItem *mPassageStats1Txt,*mPassageStats2Txt; QString mPassageDateTime, mPassageStation; - qreal mGraphZoneWidth; CGraphRulerWidget *mRuler; CRankRulerWidget *mRankRuler; diff --git a/sources/GuiElements/LogsListPage.cpp b/sources/GuiElements/LogsListPage.cpp index 555a2de..614243f 100644 --- a/sources/GuiElements/LogsListPage.cpp +++ b/sources/GuiElements/LogsListPage.cpp @@ -45,7 +45,7 @@ CLogsListPage::~CLogsListPage() CLogsListPage::CLogsListPage(QGraphicsWidget *Parent) { - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + //QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); setParentItem(Parent); mProgramHandle = 0; mStationFilter.clear(); diff --git a/sources/GuiElements/NetworkCtrlPage.cpp b/sources/GuiElements/NetworkCtrlPage.cpp index e3ba9e0..32ff841 100644 --- a/sources/GuiElements/NetworkCtrlPage.cpp +++ b/sources/GuiElements/NetworkCtrlPage.cpp @@ -43,7 +43,7 @@ CNetworkCtrlPage::~CNetworkCtrlPage() CNetworkCtrlPage::CNetworkCtrlPage(QGraphicsWidget *Parent) { - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); +// QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); setParentItem(Parent); mProgramHandle = 0; mIsConnecting = false; diff --git a/sources/GuiElements/NetworkZTListPage.cpp b/sources/GuiElements/NetworkZTListPage.cpp index 2188682..1d74321 100644 --- a/sources/GuiElements/NetworkZTListPage.cpp +++ b/sources/GuiElements/NetworkZTListPage.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +//#include #include @@ -43,7 +43,7 @@ CNetworkZTListPage::~CNetworkZTListPage() CNetworkZTListPage::CNetworkZTListPage(QGraphicsWidget *Parent) { - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + //QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); setParentItem(Parent); mProgramHandle = 0; @@ -450,39 +450,39 @@ void CNetworkZTListPage::ZTNetworkStatusChanged(int ZTID,int Status) QString ZTStatus; QColor Color; - switch(Status) - { - case CNetworkManager::ZT_NETWORK_OFFLINE_STATUS: - { - ZTStatus = "Hors Ligne"; - Color = Qt::red; - break; - } - case CNetworkManager::ZT_NETWORK_ONLINE_STATUS: - { - ZTStatus = "En Ligne"; - Color = Qt::darkGreen; - break; - } - case CNetworkManager::ZT_NETWORK_SEARCHING_STATUS: - { - ZTStatus = "Recherche..."; - Color = Qt::black; - break; - } - case CNetworkManager::ZT_NETWORK_UNKNOWN_STATUS: - { - ZTStatus = "Inconnu"; - Color = Qt::black; - break; - } - case CNetworkManager::ZT_NETWORK_CONNECTED_STATUS: - { - ZTStatus = "Connecté"; - Color = Qt::darkBlue; - break; - } - } +// switch(Status) +// { +// case CNetworkManager::ZT_NETWORK_OFFLINE_STATUS: +// { +// ZTStatus = "Hors Ligne"; +// Color = Qt::red; +// break; +// } +// case CNetworkManager::ZT_NETWORK_ONLINE_STATUS: +// { +// ZTStatus = "En Ligne"; +// Color = Qt::darkGreen; +// break; +// } +// case CNetworkManager::ZT_NETWORK_SEARCHING_STATUS: +// { +// ZTStatus = "Recherche..."; +// Color = Qt::black; +// break; +// } +// case CNetworkManager::ZT_NETWORK_UNKNOWN_STATUS: +// { +// ZTStatus = "Inconnu"; +// Color = Qt::black; +// break; +// } +// case CNetworkManager::ZT_NETWORK_CONNECTED_STATUS: +// { +// ZTStatus = "Connecté"; +// Color = Qt::darkBlue; +// break; +// } +// } mZTListTable->item(ZTID,2)->setText(ZTStatus); mZTListTable->item(ZTID,2)->setForeground(QBrush(Color)); diff --git a/sources/GuiElements/OptionsPage.cpp b/sources/GuiElements/OptionsPage.cpp index 618fff5..b970098 100644 --- a/sources/GuiElements/OptionsPage.cpp +++ b/sources/GuiElements/OptionsPage.cpp @@ -149,7 +149,7 @@ void COptionsPage::ButtonClicked(CTextButtonWidget *BtnPtr) if(DataFilePath.isEmpty()) return; - qDebug("open file %s",DataFilePath.toAscii().data()); + qDebug("open file %s",qPrintable(DataFilePath)); mProgramHandle->DataSourceDirChanged(DataFilePath); QString tmp = "Répertoire de données: "; tmp += mProgramHandle->GetLogDataPath(); diff --git a/sources/GuiElements/RemoteZTCtrlPage.cpp b/sources/GuiElements/RemoteZTCtrlPage.cpp index 9a2f51d..d27015f 100644 --- a/sources/GuiElements/RemoteZTCtrlPage.cpp +++ b/sources/GuiElements/RemoteZTCtrlPage.cpp @@ -43,7 +43,7 @@ CRemoteZTCtrlPage::~CRemoteZTCtrlPage() CRemoteZTCtrlPage::CRemoteZTCtrlPage(QGraphicsWidget *Parent) { - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); +// QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); setParentItem(Parent); mProgramHandle = 0; diff --git a/sources/GuiElements/RemoteZTPage.cpp b/sources/GuiElements/RemoteZTPage.cpp index 27cb3cf..366d2ee 100644 --- a/sources/GuiElements/RemoteZTPage.cpp +++ b/sources/GuiElements/RemoteZTPage.cpp @@ -42,7 +42,7 @@ CRemoteZTPage::~CRemoteZTPage() CRemoteZTPage::CRemoteZTPage(QGraphicsWidget *Parent) { - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); +// QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); setParentItem(Parent); mProgramHandle = 0; diff --git a/sources/GuiElements/ZTLogsListPage.cpp b/sources/GuiElements/ZTLogsListPage.cpp index 66b4ed1..156c357 100644 --- a/sources/GuiElements/ZTLogsListPage.cpp +++ b/sources/GuiElements/ZTLogsListPage.cpp @@ -46,7 +46,7 @@ CZTLogsListPage::~CZTLogsListPage() CZTLogsListPage::CZTLogsListPage(QGraphicsWidget *Parent) { - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); +// QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); setParentItem(Parent); mProgramHandle = 0; mZTLogFilesManager = 0; diff --git a/sources/LogMgr.cpp b/sources/LogMgr.cpp index e63b28a..accd75f 100644 --- a/sources/LogMgr.cpp +++ b/sources/LogMgr.cpp @@ -150,6 +150,7 @@ unsigned int CLogMgr::ParseLogs(bool RebuildDatabase, bool KeepData) QByteArray DBData = DatabaseFile->readAll(); QDataStream *DBStrm = new QDataStream(DBData); + DBStrm->setVersion(QDataStream::Qt_4_8); qint32 NBRecords; *DBStrm >> NBRecords; @@ -264,6 +265,7 @@ unsigned int CLogMgr::SaveDatabaseFile() QBuffer FileBuffer(&byteArray); FileBuffer.open(QIODevice::WriteOnly); QDataStream *DBStrm = new QDataStream(&FileBuffer); + DBStrm->setVersion(QDataStream::Qt_4_8); qint32 NBRecords = mPassagesList.size(); *DBStrm << NBRecords; @@ -277,8 +279,10 @@ unsigned int CLogMgr::SaveDatabaseFile() { CZT1LogElement *NewElement = (CZT1LogElement*)mPassagesList.at(i); + QDateTime test = NewElement->mPassageDateTime; - *DBStrm << NewElement->mPassageDateTime +// *DBStrm << NewElement->mPassageDateTime + *DBStrm << test << NewElement->mTrainType << NewElement->mNbElements << NewElement->mThreadDataStartTime diff --git a/sources/MainPanel.cpp b/sources/MainPanel.cpp index 268e043..abf352f 100644 --- a/sources/MainPanel.cpp +++ b/sources/MainPanel.cpp @@ -90,10 +90,11 @@ Panel::Panel() //////////////////////// setMouseTracking(true); - qreal LogViewPageWidth(650); + + const static int LogViewPageWidth(950); mMainPage = new CMainPage(); - mDatabaseModeLogViewPage = new CLogViewPage(0,LogViewPageWidth); + mDatabaseModeLogViewPage = new CLogViewPage(LogViewPageWidth); mDatabaseModeLogListPage = new CLogsListPage(); mOptionsPage = new COptionsPage(); mNetworkZTListPage = new CNetworkZTListPage(); @@ -101,7 +102,7 @@ Panel::Panel() mRemoteZTPage = new CRemoteZTPage(); mZTLogViewerPage = new CZTLogViewerPage(0,false); mNetworkModeLogListPage = new CLogsListPage(); - mNetworkModeLogViewPage = new CLogViewPage(0,LogViewPageWidth); + mNetworkModeLogViewPage = new CLogViewPage(LogViewPageWidth); mProgressBarPage = new CProgressBarPage(); mRemoteZTCtrlPage = new CRemoteZTCtrlPage(); mDatabaseMgrPage = new CDatabaseMgrPage(); diff --git a/sources/MainPanel.h b/sources/MainPanel.h index d09a2a8..c51110e 100644 --- a/sources/MainPanel.h +++ b/sources/MainPanel.h @@ -29,7 +29,7 @@ /* ************************************************************************** */ #include "GlobalDefine.h" -#include +#include #include #include diff --git a/sources/NetworkManager.cpp b/sources/NetworkManager.cpp index 64ee951..290f10c 100644 --- a/sources/NetworkManager.cpp +++ b/sources/NetworkManager.cpp @@ -2,10 +2,9 @@ #include #include "OutilZT.h" -CNetworkManager CNetworkManager::mSingleton; +//CNetworkManager CNetworkManager::mSingleton; -CNetworkManager::CNetworkManager(QObject *parent) : - QObject(parent) +CNetworkManager::CNetworkManager(QObject *parent) { mConfig = 0; mCurZTID = 0; @@ -124,7 +123,7 @@ void CNetworkManager::NetworkStateMachine(eNetworkSMEvent event) { case NETWORK_SM_SOCKET_CONNECTED_EVENT: { - qDebug("%s Connected",mConfig->mNetworkCfgList.at(mCurZTID).mIPAdress.toAscii().data()); + //qDebug("%s Connected",mConfig->mNetworkCfgList.at(mCurZTID).mIPAdress.toAscii().data()); emit NetworkZTConnected(mCurZTID); emit NetworkZTConnectionStatus(mCurZTID,ZT_NETWORK_CONNECTED_STATUS); @@ -136,7 +135,7 @@ void CNetworkManager::NetworkStateMachine(eNetworkSMEvent event) } case NETWORK_SM_SOCKET_ERROR_EVENT: { - qDebug("%s Socket error",mConfig->mNetworkCfgList.at(mCurZTID).mIPAdress.toAscii().data()); +// qDebug("%s Socket error",mConfig->mNetworkCfgList.at(mCurZTID).mIPAdress.toAscii().data()); emit NetworkZTConnectionError(mCurZTID); mNetworkSMState = NETWORK_SM_STANDBY_STATE; break; @@ -163,7 +162,7 @@ void CNetworkManager::NetworkStateMachine(eNetworkSMEvent event) { case NETWORK_SM_SOCKET_ERROR_EVENT: { - qDebug("%s Socket error",mConfig->mNetworkCfgList.at(mCurZTID).mIPAdress.toAscii().data()); +// qDebug("%s Socket error",mConfig->mNetworkCfgList.at(mCurZTID).mIPAdress.toAscii().data()); break; } case NETWORK_SM_SOCKET_DISCONNECTED_EVENT: @@ -276,7 +275,7 @@ unsigned int CNetworkManager::ConnectToZT(int ZTID) mCurZTID = ZTID; mNetworkSMState = NETWORK_SM_INITIATE_CLIENT_CONNECTION_STATE; mZTTcpSocket.connectToHost(mConfig->mNetworkCfgList.at(mCurZTID).mIPAdress,ZT_TCP_PORT); - qDebug("Connecting to %s", mConfig->mNetworkCfgList.at(mCurZTID).mIPAdress.toAscii().data()); +// qDebug("Connecting to %s", mConfig->mNetworkCfgList.at(mCurZTID).mIPAdress.toAscii().data()); return RET_OK; } diff --git a/sources/OutilZT.cpp b/sources/OutilZT.cpp index 2355b3b..cb98daa 100644 --- a/sources/OutilZT.cpp +++ b/sources/OutilZT.cpp @@ -31,7 +31,7 @@ #include "OutilZT.h" #include #include -#include "NetworkManager.h" +//#include "NetworkManager.h" #include #include @@ -51,7 +51,7 @@ COutilZT::~COutilZT() unsigned int COutilZT::Start() { - QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); + // QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8")); panel.mDatabaseModeLogListPage->mLogMgrHandle = &mDatabaseModeLogManager; @@ -96,19 +96,19 @@ unsigned int COutilZT::Start() - CNetworkManager::instance()->BindPointers(this); - CNetworkManager::instance()->SetConfig(&mSettingsData); - panel.mNetworkZTListPage->SetConfig(&mSettingsData); - panel.mOptionsPage->SetSettings(&mSettingsData); - connect(CNetworkManager::instance(),SIGNAL(NetworkZTConnectionStatus(int,int)),panel.mNetworkZTListPage,SLOT(ZTNetworkStatusChanged(int,int))); - connect(CNetworkManager::instance(),SIGNAL(NetworkZTConnected(int)),panel.mNetworkCtrlPage,SLOT(NetworkZTConnected(int))); - connect(CNetworkManager::instance(),SIGNAL(NetworkZTConnectionError(int)),panel.mNetworkCtrlPage,SLOT(NetworkZTConnectionFailed(int))); - connect(CNetworkManager::instance(),SIGNAL(NetworkZTDisconnected(int)),panel.mNetworkCtrlPage,SLOT(NetworkZTConnectionFailed(int))); - connect(CNetworkManager::instance(),SIGNAL(NetworkTCPRx()),panel.mNetworkCtrlPage,SLOT(NetworkRx())); - connect(CNetworkManager::instance(),SIGNAL(NetworkTCPTx()),panel.mNetworkCtrlPage,SLOT(NetworkTx())); +// CNetworkManager::instance()->BindPointers(this); +// CNetworkManager::instance()->SetConfig(&mSettingsData); +// panel.mNetworkZTListPage->SetConfig(&mSettingsData); +// panel.mOptionsPage->SetSettings(&mSettingsData); +// connect(CNetworkManager::instance(),SIGNAL(NetworkZTConnectionStatus(int,int)),panel.mNetworkZTListPage,SLOT(ZTNetworkStatusChanged(int,int))); +// connect(CNetworkManager::instance(),SIGNAL(NetworkZTConnected(int)),panel.mNetworkCtrlPage,SLOT(NetworkZTConnected(int))); +// connect(CNetworkManager::instance(),SIGNAL(NetworkZTConnectionError(int)),panel.mNetworkCtrlPage,SLOT(NetworkZTConnectionFailed(int))); +// connect(CNetworkManager::instance(),SIGNAL(NetworkZTDisconnected(int)),panel.mNetworkCtrlPage,SLOT(NetworkZTConnectionFailed(int))); +// connect(CNetworkManager::instance(),SIGNAL(NetworkTCPRx()),panel.mNetworkCtrlPage,SLOT(NetworkRx())); +// connect(CNetworkManager::instance(),SIGNAL(NetworkTCPTx()),panel.mNetworkCtrlPage,SLOT(NetworkTx())); - connect(CNetworkManager::instance(),SIGNAL(NetworkZTConnected(int)),panel.mRemoteZTPage,SLOT(NetworkZTConnected(int))); - connect(CNetworkManager::instance(),SIGNAL(NetworkZTDisconnected(int)),panel.mRemoteZTPage,SLOT(NetworkZTDisconnected(int))); +// connect(CNetworkManager::instance(),SIGNAL(NetworkZTConnected(int)),panel.mRemoteZTPage,SLOT(NetworkZTConnected(int))); +// connect(CNetworkManager::instance(),SIGNAL(NetworkZTDisconnected(int)),panel.mRemoteZTPage,SLOT(NetworkZTDisconnected(int))); // panel.mDatabaseModeLogListPage->RefreshList(); // panel.mZTLogsListPage->RefreshList(); @@ -518,7 +518,7 @@ unsigned int COutilZT::ZTLogFilesFetchingTick(CZTLogFilesMgr *Caller, int Index, unsigned int COutilZT::ConnectToZTRequest() { int ID = panel.mNetworkZTListPage->GetSelectedZT(); - CNetworkManager::instance()->ConnectToZT(ID); + // CNetworkManager::instance()->ConnectToZT(ID); return RET_OK; } @@ -530,17 +530,17 @@ unsigned int COutilZT::RxStationName(QString StationName) unsigned int COutilZT::DisconnectZTRequest() { - return CNetworkManager::instance()->DisconnectZT(); + // return CNetworkManager::instance()->DisconnectZT(); } unsigned int COutilZT::RefreshRemoteZTStatusRequest() { - if(CNetworkManager::instance()->RefreshRemoteZTStatus() == RET_OK) - { - panel.mNetworkCtrlPage->DisableNetworkButtons(); - return RET_OK; - } +// if(CNetworkManager::instance()->RefreshRemoteZTStatus() == RET_OK) +// { +// panel.mNetworkCtrlPage->DisableNetworkButtons(); +// return RET_OK; +// } return RET_ERROR; } @@ -555,11 +555,11 @@ unsigned int COutilZT::RxZTStatus(const CTCPZTStatus &status) unsigned int COutilZT::DownloadZTLogRequest() { - if(CNetworkManager::instance()->DownloadZTLog() == RET_OK) - { - panel.mNetworkCtrlPage->DisableNetworkButtons(); - return RET_OK; - } +// if(CNetworkManager::instance()->DownloadZTLog() == RET_OK) +// { +// panel.mNetworkCtrlPage->DisableNetworkButtons(); +// return RET_OK; +// } return RET_ERROR; } @@ -573,11 +573,11 @@ unsigned int COutilZT::RxZTLog(QString ZTLog) unsigned int COutilZT::DownloadTrainLogsRequest() { - if(CNetworkManager::instance()->DownloadTrainLogs() == RET_OK) - { - panel.mNetworkCtrlPage->DisableNetworkButtons(); - return RET_OK; - } +// if(CNetworkManager::instance()->DownloadTrainLogs() == RET_OK) +// { +// panel.mNetworkCtrlPage->DisableNetworkButtons(); +// return RET_OK; +// } return RET_ERROR; } @@ -617,11 +617,11 @@ unsigned int COutilZT::RxTrainLogsDownloadFinished() unsigned int COutilZT::DeleteRemoteZTLogRequest() { - if(CNetworkManager::instance()->DeleteRemoteZTLog() == RET_OK) - { - panel.mNetworkCtrlPage->DisableNetworkButtons(); - return RET_OK; - } +// if(CNetworkManager::instance()->DeleteRemoteZTLog() == RET_OK) +// { +// panel.mNetworkCtrlPage->DisableNetworkButtons(); +// return RET_OK; +// } return RET_ERROR; } @@ -633,11 +633,11 @@ unsigned int COutilZT::RemoteZTLogDeleted(bool Success) unsigned int COutilZT::SetZTFunctionsStatus(CTCPZTFunctionsStatus status) { - if(CNetworkManager::instance()->SetZTFunctions(status) == RET_OK) - { - panel.mNetworkCtrlPage->DisableNetworkButtons(); - return RET_OK; - } +// if(CNetworkManager::instance()->SetZTFunctions(status) == RET_OK) +// { +// panel.mNetworkCtrlPage->DisableNetworkButtons(); +// return RET_OK; +// } return RET_ERROR; } diff --git a/sources/Settings.cpp b/sources/Settings.cpp index eda35b3..7b810e8 100644 --- a/sources/Settings.cpp +++ b/sources/Settings.cpp @@ -53,6 +53,7 @@ unsigned int CSettingsFileMgr::LoadSettings(CSettingsData *SettingsData) } QDataStream * InputStream = new QDataStream(SettingsFile); + InputStream->setVersion(QDataStream::Qt_4_8); quint32 MagicNbr;// = 0xBAADCAFE; @@ -100,6 +101,7 @@ unsigned int CSettingsFileMgr::SaveSettings(CSettingsData *SettingsData) } QDataStream * OutputStream = new QDataStream(SettingsFile); + OutputStream->setVersion(QDataStream::Qt_4_8); quint32 MagicNbr = 0xBAADCAFE; diff --git a/sources/TrainLogFileMgr.cpp b/sources/TrainLogFileMgr.cpp index 86c8bc1..49b55f2 100644 --- a/sources/TrainLogFileMgr.cpp +++ b/sources/TrainLogFileMgr.cpp @@ -56,6 +56,7 @@ unsigned int CTrainLogFileMgr::SaveTrainLog(QString LogFilePathName, CZT1Log *ZT return RET_ERROR; QDataStream * OutputStream = new QDataStream(BinaryLogFile); + OutputStream->setVersion(QDataStream::Qt_4_8); quint32 MagicNbr = 0xDEADBEEF; @@ -184,6 +185,7 @@ unsigned int CTrainLogFileMgr::SaveTrainLog(QString LogFilePathName, QVectorsetVersion(QDataStream::Qt_4_8); quint32 MagicNbr = 0xDEADBEEF; @@ -268,6 +270,7 @@ CLogElement* CTrainLogFileMgr::OpenTrainLog(QString LogFilePathName,unsigned int } QDataStream * InputStream = new QDataStream(BinaryLogFile); + InputStream->setVersion(QDataStream::Qt_4_8); quint32 MagicNbr,NbLogEntry,NbDetections,LogType; @@ -292,7 +295,7 @@ CLogElement* CTrainLogFileMgr::OpenTrainLog(QString LogFilePathName,unsigned int LogFileVersion = 2; FileProtected = true; } - else if(MagicNbr == 0xDEADBEEF+15) + else if(MagicNbr == 0xDEADBEEF+15 || MagicNbr == 0xDEADBEEF+16 ) { LogFileVersion = 3; @@ -313,7 +316,7 @@ CLogElement* CTrainLogFileMgr::OpenTrainLog(QString LogFilePathName,unsigned int } else { - qDebug(QString().sprintf("Fichier de passage invalide (Magic number) %s",LogFilePathName.toAscii().data()).toAscii().data()); + qDebug(qPrintable(QString().sprintf("Fichier de passage invalide (Magic number) %s",qPrintable(LogFilePathName)))); BinaryLogFile->close(); delete BinaryLogFile; delete InputStream; @@ -518,6 +521,7 @@ unsigned int CTrainLogFileMgr::SetTrainLogProtected(bool IsProtected, QString Lo return RET_ERROR; QDataStream * Stream = new QDataStream(BinaryLogFile); + Stream->setVersion(QDataStream::Qt_4_8); quint32 MagicNbr; diff --git a/sources/ZTData.cpp b/sources/ZTData.cpp index 0d6a831..e133ac2 100644 --- a/sources/ZTData.cpp +++ b/sources/ZTData.cpp @@ -171,7 +171,7 @@ QDataStream &operator<<(QDataStream &out, const CZT1FlagsData &source) << source.mTrainCompo3 << source.mModbusTrainType << source.mZT1ITI - << source.mUnusedFlag13 + << source.mZTDetectionsConfig << source.mUnusedFlag14 << source.mUnusedFlag15 << source.mUnusedFlag16 @@ -196,7 +196,7 @@ QDataStream &operator>>(QDataStream &in, CZT1FlagsData &dest) >> dest.mTrainCompo3 >> dest.mModbusTrainType >> dest.mZT1ITI - >> dest.mUnusedFlag13 + >> dest.mZTDetectionsConfig >> dest.mUnusedFlag14 >> dest.mUnusedFlag15 >> dest.mUnusedFlag16 @@ -309,7 +309,7 @@ QDataStream &operator<<(QDataStream &out, const CZT2FlagsData &source) << source.mTrainCompo2 << source.mTrainCompo3 << source.mModbusTrainType - << source.mUnusedFlag6 + << source.mZTDetectionsConfig << source.mUnusedFlag7 << source.mUnusedFlag8 << source.mUnusedFlag9 @@ -325,7 +325,7 @@ QDataStream &operator>>(QDataStream &in, CZT2FlagsData &dest) >> dest.mTrainCompo2 >> dest.mTrainCompo3 >> dest.mModbusTrainType - >> dest.mUnusedFlag6 + >> dest.mZTDetectionsConfig >> dest.mUnusedFlag7 >> dest.mUnusedFlag8 >> dest.mUnusedFlag9 diff --git a/sources/ZTData.h b/sources/ZTData.h index 7249c37..69d8749 100644 --- a/sources/ZTData.h +++ b/sources/ZTData.h @@ -221,7 +221,7 @@ public: qint32 mTrainCompo3; qint32 mModbusTrainType; qint32 mZT1ITI; - qint32 mUnusedFlag13; + qint32 mZTDetectionsConfig; qint32 mUnusedFlag14; qint32 mUnusedFlag15; qint32 mUnusedFlag16; @@ -298,7 +298,7 @@ public: qint32 mTrainCompo2; qint32 mTrainCompo3; qint32 mModbusTrainType; - qint32 mUnusedFlag6; + qint32 mZTDetectionsConfig; qint32 mUnusedFlag7; qint32 mUnusedFlag8; qint32 mUnusedFlag9; diff --git a/sources/ZTLogFilesMgr.cpp b/sources/ZTLogFilesMgr.cpp index b553b85..cb0168d 100644 --- a/sources/ZTLogFilesMgr.cpp +++ b/sources/ZTLogFilesMgr.cpp @@ -83,6 +83,7 @@ void CZTLogFilesMgr::ParseZTLogFiles(bool RebuildDatabase) QByteArray DBData = DatabaseFile->readAll(); QDataStream *DBStrm = new QDataStream(DBData); + DBStrm->setVersion(QDataStream::Qt_4_8); qint32 NBRecords; *DBStrm >> NBRecords; @@ -366,6 +367,7 @@ int CZTLogFilesMgr::SaveDatabaseFile() QBuffer FileBuffer(&byteArray); FileBuffer.open(QIODevice::WriteOnly); QDataStream *DBStrm = new QDataStream(&FileBuffer); + DBStrm->setVersion(QDataStream::Qt_4_8); qint32 NBRecords = mZTLogFilesList.size(); *DBStrm << NBRecords; diff --git a/sources/main.cpp b/sources/main.cpp index 26f1f63..d0c6cfd 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) { - QApplication::setGraphicsSystem("raster"); +// QApplication::setGraphicsSystem("raster"); //Qt Mainframe application instance. QApplication a(argc, argv);