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

Compilation sur Qt 5.14.2

Browse Source 
Compatibilité avec les fichiers logs contenant les états des fonctions de détection.
This commit is contained in:
jfmartel
2024-08-15 14:05:30 -04:00
parent be2f8638a1
commit ce57a2e501
33 changed files with 21154 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/GuiElements/DatabaseMgrPage.cpp
+6
View File
@@ -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);
sources/GuiElements/DatabaseMgrPage.h
+1 -1
View File
@@ -144,7 +144,7 @@ private:
QGraphicsRectItem *mBackgroundRect;
CTextButtonWidget *mCancelButton, *mImportDataButton, *mCancelImportButton;
QCheckBox *mImportErrorDataOnlyChkBx, *mFilterDuplicateChkBx, *mDeleteSourceDataChkBx;
QCheckBox *mImportErrorDataOnlyChkBx, *mFilterDuplicateChkBx, *mDeleteSourceDataChkBx, *mImportInPlace;
QProgressBar *mProgressBar;
QGraphicsTextItem *mProgressStatusText;
sources/GuiElements/LogViewPage.cpp
+52 -65
View File
@@ -36,12 +36,12 @@
#include <QTextCodec>
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<CGraphDiscreteDataPair*>;
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;
sources/GuiElements/LogViewPage.h
+3 -4
View File
@@ -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;
sources/GuiElements/LogsListPage.cpp
+1 -1
View File
@@ -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();
sources/GuiElements/NetworkCtrlPage.cpp
+1 -1
View File
@@ -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;
sources/GuiElements/NetworkZTListPage.cpp
+35 -35
View File
@@ -32,7 +32,7 @@
#include <QString>
#include <QTextCodec>
#include <QHeaderView>
#include <NetworkManager.h>
//#include <NetworkManager.h>
#include <QDebug>
@@ -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));
sources/GuiElements/OptionsPage.cpp
+1 -1
View File
@@ -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();
sources/GuiElements/RemoteZTCtrlPage.cpp
+1 -1
View File
@@ -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;
sources/GuiElements/RemoteZTPage.cpp
+1 -1
View File
@@ -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;
sources/GuiElements/ZTLogsListPage.cpp
+1 -1
View File
@@ -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;