diff --git a/Makefile b/Makefile index 3a89b36..62c237a 100644 --- a/Makefile +++ b/Makefile @@ -1,51 +1,35 @@ ############################################################################# # Makefile for building: OutilZT -# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu Jan 18 13:05:57 2018 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Fri Jan 19 13:26:09 2018 # Project: OutilZT.pro # Template: app -# Command: c:\Qt\4.8.1\bin\qmake.exe -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile OutilZT.pro +# Command: c:/Qt/4.8.1/bin/qmake.exe -spec ../../Qt/4.8.1/mkspecs/win32-g++ CONFIG+=declarative_debug -o Makefile OutilZT.pro ############################################################################# -first: release -install: release-install -uninstall: release-uninstall +first: debug +install: debug-install +uninstall: debug-uninstall MAKEFILE = Makefile -QMAKE = c:\Qt\4.8.1\bin\qmake.exe -DEL_FILE = del -CHK_DIR_EXISTS= if not exist -MKDIR = mkdir -COPY = copy /y +QMAKE = c:/Qt/4.8.1/bin/qmake.exe +DEL_FILE = rm +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p +COPY = cp COPY_FILE = $(COPY) -COPY_DIR = xcopy /s /q /y /i +COPY_DIR = cp -r INSTALL_FILE = $(COPY_FILE) INSTALL_PROGRAM = $(COPY_FILE) INSTALL_DIR = $(COPY_DIR) -DEL_FILE = del +DEL_FILE = rm SYMLINK = DEL_DIR = rmdir -MOVE = move -CHK_DIR_EXISTS= if not exist -MKDIR = mkdir +MOVE = mv +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p SUBTARGETS = \ - release \ - debug + debug \ + release -release: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release -release-make_default: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release -release-make_first: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release first -release-all: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release all -release-clean: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release clean -release-distclean: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release distclean -release-install: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release install -release-uninstall: $(MAKEFILE).Release FORCE - $(MAKE) -f $(MAKEFILE).Release uninstall debug: $(MAKEFILE).Debug FORCE $(MAKE) -f $(MAKEFILE).Debug debug-make_default: $(MAKEFILE).Debug FORCE @@ -62,6 +46,22 @@ debug-install: $(MAKEFILE).Debug FORCE $(MAKE) -f $(MAKEFILE).Debug install debug-uninstall: $(MAKEFILE).Debug FORCE $(MAKE) -f $(MAKEFILE).Debug uninstall +release: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release +release-make_default: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release +release-make_first: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release first +release-all: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release all +release-clean: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release clean +release-distclean: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release distclean +release-install: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release install +release-uninstall: $(MAKEFILE).Release FORCE + $(MAKE) -f $(MAKEFILE).Release uninstall Makefile: OutilZT.pro ../../Qt/4.8.1/mkspecs/win32-g++/qmake.conf ../../Qt/4.8.1/mkspecs/qconfig.pri \ ../../Qt/4.8.1/mkspecs/modules/qt_webkit_version.pri \ @@ -70,10 +70,11 @@ Makefile: OutilZT.pro ../../Qt/4.8.1/mkspecs/win32-g++/qmake.conf ../../Qt/4.8. ../../Qt/4.8.1/mkspecs/features/exclusive_builds.prf \ ../../Qt/4.8.1/mkspecs/features/default_pre.prf \ ../../Qt/4.8.1/mkspecs/features/win32/default_pre.prf \ - ../../Qt/4.8.1/mkspecs/features/release.prf \ + ../../Qt/4.8.1/mkspecs/features/debug.prf \ ../../Qt/4.8.1/mkspecs/features/debug_and_release.prf \ ../../Qt/4.8.1/mkspecs/features/default_post.prf \ ../../Qt/4.8.1/mkspecs/features/win32/default_post.prf \ + ../../Qt/4.8.1/mkspecs/features/declarative_debug.prf \ ../../Qt/4.8.1/mkspecs/features/win32/rtti.prf \ ../../Qt/4.8.1/mkspecs/features/win32/exceptions.prf \ ../../Qt/4.8.1/mkspecs/features/win32/stl.prf \ @@ -88,60 +89,61 @@ Makefile: OutilZT.pro ../../Qt/4.8.1/mkspecs/win32-g++/qmake.conf ../../Qt/4.8. ../../Qt/4.8.1/mkspecs/features/yacc.prf \ ../../Qt/4.8.1/mkspecs/features/lex.prf \ ../../Qt/4.8.1/mkspecs/features/include_source_dir.prf \ - c:/Qt/4.8.1/lib/qtmain.prl - $(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile OutilZT.pro -..\..\Qt\4.8.1\mkspecs\qconfig.pri: -..\..\Qt\4.8.1\mkspecs\modules\qt_webkit_version.pri: -..\..\Qt\4.8.1\mkspecs\features\qt_functions.prf: -..\..\Qt\4.8.1\mkspecs\features\qt_config.prf: -..\..\Qt\4.8.1\mkspecs\features\exclusive_builds.prf: -..\..\Qt\4.8.1\mkspecs\features\default_pre.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\default_pre.prf: -..\..\Qt\4.8.1\mkspecs\features\release.prf: -..\..\Qt\4.8.1\mkspecs\features\debug_and_release.prf: -..\..\Qt\4.8.1\mkspecs\features\default_post.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\default_post.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\rtti.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\exceptions.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\stl.prf: -..\..\Qt\4.8.1\mkspecs\features\shared.prf: -..\..\Qt\4.8.1\mkspecs\features\warn_on.prf: -..\..\Qt\4.8.1\mkspecs\features\qt.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\thread.prf: -..\..\Qt\4.8.1\mkspecs\features\moc.prf: -..\..\Qt\4.8.1\mkspecs\features\win32\windows.prf: -..\..\Qt\4.8.1\mkspecs\features\resources.prf: -..\..\Qt\4.8.1\mkspecs\features\uic.prf: -..\..\Qt\4.8.1\mkspecs\features\yacc.prf: -..\..\Qt\4.8.1\mkspecs\features\lex.prf: -..\..\Qt\4.8.1\mkspecs\features\include_source_dir.prf: -c:\Qt\4.8.1\lib\qtmain.prl: + c:/Qt/4.8.1/lib/qtmaind.prl + $(QMAKE) -spec ../../Qt/4.8.1/mkspecs/win32-g++ CONFIG+=declarative_debug -o Makefile OutilZT.pro +../../Qt/4.8.1/mkspecs/qconfig.pri: +../../Qt/4.8.1/mkspecs/modules/qt_webkit_version.pri: +../../Qt/4.8.1/mkspecs/features/qt_functions.prf: +../../Qt/4.8.1/mkspecs/features/qt_config.prf: +../../Qt/4.8.1/mkspecs/features/exclusive_builds.prf: +../../Qt/4.8.1/mkspecs/features/default_pre.prf: +../../Qt/4.8.1/mkspecs/features/win32/default_pre.prf: +../../Qt/4.8.1/mkspecs/features/debug.prf: +../../Qt/4.8.1/mkspecs/features/debug_and_release.prf: +../../Qt/4.8.1/mkspecs/features/default_post.prf: +../../Qt/4.8.1/mkspecs/features/win32/default_post.prf: +../../Qt/4.8.1/mkspecs/features/declarative_debug.prf: +../../Qt/4.8.1/mkspecs/features/win32/rtti.prf: +../../Qt/4.8.1/mkspecs/features/win32/exceptions.prf: +../../Qt/4.8.1/mkspecs/features/win32/stl.prf: +../../Qt/4.8.1/mkspecs/features/shared.prf: +../../Qt/4.8.1/mkspecs/features/warn_on.prf: +../../Qt/4.8.1/mkspecs/features/qt.prf: +../../Qt/4.8.1/mkspecs/features/win32/thread.prf: +../../Qt/4.8.1/mkspecs/features/moc.prf: +../../Qt/4.8.1/mkspecs/features/win32/windows.prf: +../../Qt/4.8.1/mkspecs/features/resources.prf: +../../Qt/4.8.1/mkspecs/features/uic.prf: +../../Qt/4.8.1/mkspecs/features/yacc.prf: +../../Qt/4.8.1/mkspecs/features/lex.prf: +../../Qt/4.8.1/mkspecs/features/include_source_dir.prf: +c:\Qt\4.8.1\lib\qtmaind.prl: qmake: qmake_all FORCE - @$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile OutilZT.pro + @$(QMAKE) -spec ../../Qt/4.8.1/mkspecs/win32-g++ CONFIG+=declarative_debug -o Makefile OutilZT.pro qmake_all: FORCE -make_default: release-make_default debug-make_default FORCE -make_first: release-make_first debug-make_first FORCE -all: release-all debug-all FORCE -clean: release-clean debug-clean FORCE -distclean: release-distclean debug-distclean FORCE +make_default: debug-make_default release-make_default FORCE +make_first: debug-make_first release-make_first FORCE +all: debug-all release-all FORCE +clean: debug-clean release-clean FORCE +distclean: debug-distclean release-distclean FORCE -$(DEL_FILE) Makefile check: first -release-mocclean: $(MAKEFILE).Release - $(MAKE) -f $(MAKEFILE).Release mocclean debug-mocclean: $(MAKEFILE).Debug $(MAKE) -f $(MAKEFILE).Debug mocclean -mocclean: release-mocclean debug-mocclean +release-mocclean: $(MAKEFILE).Release + $(MAKE) -f $(MAKEFILE).Release mocclean +mocclean: debug-mocclean release-mocclean -release-mocables: $(MAKEFILE).Release - $(MAKE) -f $(MAKEFILE).Release mocables debug-mocables: $(MAKEFILE).Debug $(MAKE) -f $(MAKEFILE).Debug mocables -mocables: release-mocables debug-mocables +release-mocables: $(MAKEFILE).Release + $(MAKE) -f $(MAKEFILE).Release mocables +mocables: debug-mocables release-mocables FORCE: -$(MAKEFILE).Release: Makefile $(MAKEFILE).Debug: Makefile +$(MAKEFILE).Release: Makefile diff --git a/Makefile.Debug b/Makefile.Debug index fcd4665..4159605 100644 --- a/Makefile.Debug +++ b/Makefile.Debug @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: OutilZT -# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu Jan 18 13:05:57 2018 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Fri Jan 19 13:26:09 2018 # Project: OutilZT.pro # Template: app ############################################################################# @@ -12,100 +12,100 @@ CXX = g++ DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN CFLAGS = -g -Wall $(DEFINES) CXXFLAGS = -g -frtti -fexceptions -mthreads -Wall $(DEFINES) -INCPATH = -I"..\..\Qt\4.8.1\include\QtCore" -I"..\..\Qt\4.8.1\include\QtNetwork" -I"..\..\Qt\4.8.1\include\QtGui" -I"..\..\Qt\4.8.1\include" -I"." -I"sources" -I"sources\GuiElements" -I"..\..\Qt\4.8.1\include\ActiveQt" -I"debug" -I"..\..\Qt\4.8.1\mkspecs\win32-g++" +INCPATH = -I'../../Qt/4.8.1/include/QtCore' -I'../../Qt/4.8.1/include/QtNetwork' -I'../../Qt/4.8.1/include/QtGui' -I'../../Qt/4.8.1/include' -I'.' -I'sources' -I'sources/GuiElements' -I'../../Qt/4.8.1/include/ActiveQt' -I'debug' -I'../../Qt/4.8.1/mkspecs/win32-g++' LINK = g++ LFLAGS = -mthreads -Wl,-subsystem,windows -LIBS = -L"c:\Qt\4.8.1\lib" -lmingw32 -lqtmaind -lQtGuid4 -lQtNetworkd4 -lQtCored4 -QMAKE = c:\Qt\4.8.1\bin\qmake.exe -IDC = c:\Qt\4.8.1\bin\idc.exe +LIBS = -L'c:/Qt/4.8.1/lib' -lmingw32 -lqtmaind -lQtGuid4 -lQtNetworkd4 -lQtCored4 +QMAKE = c:/Qt/4.8.1/bin/qmake.exe +IDC = c:/Qt/4.8.1/bin/idc.exe IDL = midl ZIP = zip -r -9 DEF_FILE = RES_FILE = -COPY = copy /y -SED = +COPY = cp +SED = sed COPY_FILE = $(COPY) -COPY_DIR = xcopy /s /q /y /i -DEL_FILE = del +COPY_DIR = cp -r +DEL_FILE = rm DEL_DIR = rmdir -MOVE = move -CHK_DIR_EXISTS= if not exist -MKDIR = mkdir +MOVE = mv +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p INSTALL_FILE = $(COPY_FILE) INSTALL_PROGRAM = $(COPY_FILE) INSTALL_DIR = $(COPY_DIR) ####### Output directory -OBJECTS_DIR = debug +OBJECTS_DIR = debug/ ####### Files -SOURCES = sources\main.cpp \ - sources\OutilZT.cpp \ - sources\MainPanel.cpp \ - sources\GuiElements\MainPage.cpp \ - sources\GuiElements\GuiPage.cpp \ - sources\GuiElements\PushButton.cpp \ - sources\GuiElements\LogViewPage.cpp \ - sources\GuiElements\TextButtonWidget.cpp \ - sources\GuiElements\RankRulerWidget.cpp \ - sources\GuiElements\GraphCursorWidget.cpp \ - sources\GuiElements\EventsRulerWidget.cpp \ - sources\GuiElements\AnalogGraphItem.cpp \ - sources\GuiElements\GraphItem.cpp \ - sources\GuiElements\GraphRulerWidget.cpp \ - sources\ZTData.cpp \ - sources\LogMgr.cpp \ - sources\TrainLogFileMgr.cpp \ - sources\GuiElements\LogsListPage.cpp \ - sources\GuiElements\OptionsPage.cpp \ - sources\Settings.cpp \ - sources\GuiElements\NetworkZTListPage.cpp \ - sources\GuiElements\ToggleTextButtonWidget.cpp \ - sources\GuiElements\NetworkCtrlPage.cpp \ - sources\NetworkManager.cpp \ - sources\GuiElements\TxRxWidget.cpp \ - sources\TCPProtocol.cpp \ - sources\GuiElements\RemoteZTPage.cpp \ - sources\GuiElements\ZTLogViewerPage.cpp \ - sources\GuiElements\ProgressBarPage.cpp \ - sources\GuiElements\RemoteZTCtrlPage.cpp \ - sources\GuiElements\ToggleButtonWidget.cpp \ - sources\UDPProtocol.cpp \ - sources\GuiElements\DatabaseMgrPage.cpp \ - sources\GuiElements\ZTLogsListPage.cpp \ - sources\ZTLogFilesMgr.cpp \ - sources\DirParserThread.cpp debug\moc_OutilZT.cpp \ - debug\moc_MainPanel.cpp \ - debug\moc_MainPage.cpp \ - debug\moc_Guipage.cpp \ - debug\moc_PushButton.cpp \ - debug\moc_LogViewPage.cpp \ - debug\moc_TextButtonWidget.cpp \ - debug\moc_RankRulerWidget.cpp \ - debug\moc_GraphCursorWidget.cpp \ - debug\moc_EventsRulerWidget.cpp \ - debug\moc_AnalogGraphItem.cpp \ - debug\moc_GraphItem.cpp \ - debug\moc_GraphRulerWidget.cpp \ - debug\moc_LogMgr.cpp \ - debug\moc_LogsListPage.cpp \ - debug\moc_OptionsPage.cpp \ - debug\moc_NetworkZTListPage.cpp \ - debug\moc_ToggleTextButtonWidget.cpp \ - debug\moc_NetworkCtrlPage.cpp \ - debug\moc_NetworkManager.cpp \ - debug\moc_TxRxWidget.cpp \ - debug\moc_RemoteZTPage.cpp \ - debug\moc_ZTLogViewerPage.cpp \ - debug\moc_ProgressBarPage.cpp \ - debug\moc_RemoteZTCtrlPage.cpp \ - debug\moc_ToggleButtonWidget.cpp \ - debug\moc_DatabaseMgrPage.cpp \ - debug\moc_ZTLogsListPage.cpp \ - debug\moc_ZTLogFilesMgr.cpp \ - debug\moc_DirParserThread.cpp +SOURCES = sources/main.cpp \ + sources/OutilZT.cpp \ + sources/MainPanel.cpp \ + sources/GuiElements/MainPage.cpp \ + sources/GuiElements/GuiPage.cpp \ + sources/GuiElements/PushButton.cpp \ + sources/GuiElements/LogViewPage.cpp \ + sources/GuiElements/TextButtonWidget.cpp \ + sources/GuiElements/RankRulerWidget.cpp \ + sources/GuiElements/GraphCursorWidget.cpp \ + sources/GuiElements/EventsRulerWidget.cpp \ + sources/GuiElements/AnalogGraphItem.cpp \ + sources/GuiElements/GraphItem.cpp \ + sources/GuiElements/GraphRulerWidget.cpp \ + sources/ZTData.cpp \ + sources/LogMgr.cpp \ + sources/TrainLogFileMgr.cpp \ + sources/GuiElements/LogsListPage.cpp \ + sources/GuiElements/OptionsPage.cpp \ + sources/Settings.cpp \ + sources/GuiElements/NetworkZTListPage.cpp \ + sources/GuiElements/ToggleTextButtonWidget.cpp \ + sources/GuiElements/NetworkCtrlPage.cpp \ + sources/NetworkManager.cpp \ + sources/GuiElements/TxRxWidget.cpp \ + sources/TCPProtocol.cpp \ + sources/GuiElements/RemoteZTPage.cpp \ + sources/GuiElements/ZTLogViewerPage.cpp \ + sources/GuiElements/ProgressBarPage.cpp \ + sources/GuiElements/RemoteZTCtrlPage.cpp \ + sources/GuiElements/ToggleButtonWidget.cpp \ + sources/UDPProtocol.cpp \ + sources/GuiElements/DatabaseMgrPage.cpp \ + sources/GuiElements/ZTLogsListPage.cpp \ + sources/ZTLogFilesMgr.cpp \ + sources/DirParserThread.cpp debug/moc_OutilZT.cpp \ + debug/moc_MainPanel.cpp \ + debug/moc_MainPage.cpp \ + debug/moc_Guipage.cpp \ + debug/moc_PushButton.cpp \ + debug/moc_LogViewPage.cpp \ + debug/moc_TextButtonWidget.cpp \ + debug/moc_RankRulerWidget.cpp \ + debug/moc_GraphCursorWidget.cpp \ + debug/moc_EventsRulerWidget.cpp \ + debug/moc_AnalogGraphItem.cpp \ + debug/moc_GraphItem.cpp \ + debug/moc_GraphRulerWidget.cpp \ + debug/moc_LogMgr.cpp \ + debug/moc_LogsListPage.cpp \ + debug/moc_OptionsPage.cpp \ + debug/moc_NetworkZTListPage.cpp \ + debug/moc_ToggleTextButtonWidget.cpp \ + debug/moc_NetworkCtrlPage.cpp \ + debug/moc_NetworkManager.cpp \ + debug/moc_TxRxWidget.cpp \ + debug/moc_RemoteZTPage.cpp \ + debug/moc_ZTLogViewerPage.cpp \ + debug/moc_ProgressBarPage.cpp \ + debug/moc_RemoteZTCtrlPage.cpp \ + debug/moc_ToggleButtonWidget.cpp \ + debug/moc_DatabaseMgrPage.cpp \ + debug/moc_ZTLogsListPage.cpp \ + debug/moc_ZTLogFilesMgr.cpp \ + debug/moc_DirParserThread.cpp OBJECTS = debug/main.o \ debug/OutilZT.o \ debug/MainPanel.o \ @@ -174,9 +174,9 @@ OBJECTS = debug/main.o \ debug/moc_DirParserThread.o DIST = QMAKE_TARGET = OutilZT -DESTDIR = debug\ #avoid trailing-slash linebreak +DESTDIR = debug/ #avoid trailing-slash linebreak TARGET = OutilZT.exe -DESTDIR_TARGET = debug\OutilZT.exe +DESTDIR_TARGET = debug/OutilZT.exe ####### Implicit rules @@ -203,13 +203,13 @@ $(DESTDIR_TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.OutilZT.Debug $(LIBS) qmake: FORCE - @$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile.Debug OutilZT.pro + @$(QMAKE) -spec ../../Qt/4.8.1/mkspecs/win32-g++ CONFIG+=declarative_debug -o Makefile.Debug OutilZT.pro dist: - $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro ..\..\Qt\4.8.1\mkspecs\qconfig.pri ..\..\Qt\4.8.1\mkspecs\modules\qt_webkit_version.pri ..\..\Qt\4.8.1\mkspecs\features\qt_functions.prf ..\..\Qt\4.8.1\mkspecs\features\qt_config.prf ..\..\Qt\4.8.1\mkspecs\features\exclusive_builds.prf ..\..\Qt\4.8.1\mkspecs\features\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\debug.prf ..\..\Qt\4.8.1\mkspecs\features\debug_and_release.prf ..\..\Qt\4.8.1\mkspecs\features\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\build_pass.prf ..\..\Qt\4.8.1\mkspecs\features\win32\rtti.prf ..\..\Qt\4.8.1\mkspecs\features\win32\exceptions.prf ..\..\Qt\4.8.1\mkspecs\features\win32\stl.prf ..\..\Qt\4.8.1\mkspecs\features\shared.prf ..\..\Qt\4.8.1\mkspecs\features\warn_on.prf ..\..\Qt\4.8.1\mkspecs\features\qt.prf ..\..\Qt\4.8.1\mkspecs\features\win32\thread.prf ..\..\Qt\4.8.1\mkspecs\features\moc.prf ..\..\Qt\4.8.1\mkspecs\features\win32\windows.prf ..\..\Qt\4.8.1\mkspecs\features\resources.prf ..\..\Qt\4.8.1\mkspecs\features\uic.prf ..\..\Qt\4.8.1\mkspecs\features\yacc.prf ..\..\Qt\4.8.1\mkspecs\features\lex.prf ..\..\Qt\4.8.1\mkspecs\features\include_source_dir.prf c:\Qt\4.8.1\lib\qtmaind.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES + $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro ../../Qt/4.8.1/mkspecs/qconfig.pri ../../Qt/4.8.1/mkspecs/modules/qt_webkit_version.pri ../../Qt/4.8.1/mkspecs/features/qt_functions.prf ../../Qt/4.8.1/mkspecs/features/qt_config.prf ../../Qt/4.8.1/mkspecs/features/exclusive_builds.prf ../../Qt/4.8.1/mkspecs/features/default_pre.prf ../../Qt/4.8.1/mkspecs/features/win32/default_pre.prf ../../Qt/4.8.1/mkspecs/features/debug.prf ../../Qt/4.8.1/mkspecs/features/debug_and_release.prf ../../Qt/4.8.1/mkspecs/features/default_post.prf ../../Qt/4.8.1/mkspecs/features/win32/default_post.prf ../../Qt/4.8.1/mkspecs/features/build_pass.prf ../../Qt/4.8.1/mkspecs/features/declarative_debug.prf ../../Qt/4.8.1/mkspecs/features/win32/rtti.prf ../../Qt/4.8.1/mkspecs/features/win32/exceptions.prf ../../Qt/4.8.1/mkspecs/features/win32/stl.prf ../../Qt/4.8.1/mkspecs/features/shared.prf ../../Qt/4.8.1/mkspecs/features/warn_on.prf ../../Qt/4.8.1/mkspecs/features/qt.prf ../../Qt/4.8.1/mkspecs/features/win32/thread.prf ../../Qt/4.8.1/mkspecs/features/moc.prf ../../Qt/4.8.1/mkspecs/features/win32/windows.prf ../../Qt/4.8.1/mkspecs/features/resources.prf ../../Qt/4.8.1/mkspecs/features/uic.prf ../../Qt/4.8.1/mkspecs/features/yacc.prf ../../Qt/4.8.1/mkspecs/features/lex.prf ../../Qt/4.8.1/mkspecs/features/include_source_dir.prf c:\Qt\4.8.1\lib\qtmaind.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean - -$(DEL_FILE) debug\main.o debug\OutilZT.o debug\MainPanel.o debug\MainPage.o debug\GuiPage.o debug\PushButton.o debug\LogViewPage.o debug\TextButtonWidget.o debug\RankRulerWidget.o debug\GraphCursorWidget.o debug\EventsRulerWidget.o debug\AnalogGraphItem.o debug\GraphItem.o debug\GraphRulerWidget.o debug\ZTData.o debug\LogMgr.o debug\TrainLogFileMgr.o debug\LogsListPage.o debug\OptionsPage.o debug\Settings.o debug\NetworkZTListPage.o debug\ToggleTextButtonWidget.o debug\NetworkCtrlPage.o debug\NetworkManager.o debug\TxRxWidget.o debug\TCPProtocol.o debug\RemoteZTPage.o debug\ZTLogViewerPage.o debug\ProgressBarPage.o debug\RemoteZTCtrlPage.o debug\ToggleButtonWidget.o debug\UDPProtocol.o debug\DatabaseMgrPage.o debug\ZTLogsListPage.o debug\ZTLogFilesMgr.o debug\DirParserThread.o debug\moc_OutilZT.o debug\moc_MainPanel.o debug\moc_MainPage.o debug\moc_Guipage.o debug\moc_PushButton.o debug\moc_LogViewPage.o debug\moc_TextButtonWidget.o debug\moc_RankRulerWidget.o debug\moc_GraphCursorWidget.o debug\moc_EventsRulerWidget.o debug\moc_AnalogGraphItem.o debug\moc_GraphItem.o debug\moc_GraphRulerWidget.o debug\moc_LogMgr.o debug\moc_LogsListPage.o debug\moc_OptionsPage.o debug\moc_NetworkZTListPage.o debug\moc_ToggleTextButtonWidget.o debug\moc_NetworkCtrlPage.o debug\moc_NetworkManager.o debug\moc_TxRxWidget.o debug\moc_RemoteZTPage.o debug\moc_ZTLogViewerPage.o debug\moc_ProgressBarPage.o debug\moc_RemoteZTCtrlPage.o debug\moc_ToggleButtonWidget.o debug\moc_DatabaseMgrPage.o debug\moc_ZTLogsListPage.o debug\moc_ZTLogFilesMgr.o debug\moc_DirParserThread.o + -$(DEL_FILE) debug/main.o debug/OutilZT.o debug/MainPanel.o debug/MainPage.o debug/GuiPage.o debug/PushButton.o debug/LogViewPage.o debug/TextButtonWidget.o debug/RankRulerWidget.o debug/GraphCursorWidget.o debug/EventsRulerWidget.o debug/AnalogGraphItem.o debug/GraphItem.o debug/GraphRulerWidget.o debug/ZTData.o debug/LogMgr.o debug/TrainLogFileMgr.o debug/LogsListPage.o debug/OptionsPage.o debug/Settings.o debug/NetworkZTListPage.o debug/ToggleTextButtonWidget.o debug/NetworkCtrlPage.o debug/NetworkManager.o debug/TxRxWidget.o debug/TCPProtocol.o debug/RemoteZTPage.o debug/ZTLogViewerPage.o debug/ProgressBarPage.o debug/RemoteZTCtrlPage.o debug/ToggleButtonWidget.o debug/UDPProtocol.o debug/DatabaseMgrPage.o debug/ZTLogsListPage.o debug/ZTLogFilesMgr.o debug/DirParserThread.o debug/moc_OutilZT.o debug/moc_MainPanel.o debug/moc_MainPage.o debug/moc_Guipage.o debug/moc_PushButton.o debug/moc_LogViewPage.o debug/moc_TextButtonWidget.o debug/moc_RankRulerWidget.o debug/moc_GraphCursorWidget.o debug/moc_EventsRulerWidget.o debug/moc_AnalogGraphItem.o debug/moc_GraphItem.o debug/moc_GraphRulerWidget.o debug/moc_LogMgr.o debug/moc_LogsListPage.o debug/moc_OptionsPage.o debug/moc_NetworkZTListPage.o debug/moc_ToggleTextButtonWidget.o debug/moc_NetworkCtrlPage.o debug/moc_NetworkManager.o debug/moc_TxRxWidget.o debug/moc_RemoteZTPage.o debug/moc_ZTLogViewerPage.o debug/moc_ProgressBarPage.o debug/moc_RemoteZTCtrlPage.o debug/moc_ToggleButtonWidget.o debug/moc_DatabaseMgrPage.o debug/moc_ZTLogsListPage.o debug/moc_ZTLogFilesMgr.o debug/moc_DirParserThread.o distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -223,7 +223,7 @@ mocables: compiler_moc_header_make_all compiler_moc_source_make_all compiler_moc_header_make_all: debug/moc_OutilZT.cpp debug/moc_MainPanel.cpp debug/moc_MainPage.cpp debug/moc_Guipage.cpp debug/moc_PushButton.cpp debug/moc_LogViewPage.cpp debug/moc_TextButtonWidget.cpp debug/moc_RankRulerWidget.cpp debug/moc_GraphCursorWidget.cpp debug/moc_EventsRulerWidget.cpp debug/moc_AnalogGraphItem.cpp debug/moc_GraphItem.cpp debug/moc_GraphRulerWidget.cpp debug/moc_LogMgr.cpp debug/moc_LogsListPage.cpp debug/moc_OptionsPage.cpp debug/moc_NetworkZTListPage.cpp debug/moc_ToggleTextButtonWidget.cpp debug/moc_NetworkCtrlPage.cpp debug/moc_NetworkManager.cpp debug/moc_TxRxWidget.cpp debug/moc_RemoteZTPage.cpp debug/moc_ZTLogViewerPage.cpp debug/moc_ProgressBarPage.cpp debug/moc_RemoteZTCtrlPage.cpp debug/moc_ToggleButtonWidget.cpp debug/moc_DatabaseMgrPage.cpp debug/moc_ZTLogsListPage.cpp debug/moc_ZTLogFilesMgr.cpp debug/moc_DirParserThread.cpp compiler_moc_header_clean: - -$(DEL_FILE) debug\moc_OutilZT.cpp debug\moc_MainPanel.cpp debug\moc_MainPage.cpp debug\moc_Guipage.cpp debug\moc_PushButton.cpp debug\moc_LogViewPage.cpp debug\moc_TextButtonWidget.cpp debug\moc_RankRulerWidget.cpp debug\moc_GraphCursorWidget.cpp debug\moc_EventsRulerWidget.cpp debug\moc_AnalogGraphItem.cpp debug\moc_GraphItem.cpp debug\moc_GraphRulerWidget.cpp debug\moc_LogMgr.cpp debug\moc_LogsListPage.cpp debug\moc_OptionsPage.cpp debug\moc_NetworkZTListPage.cpp debug\moc_ToggleTextButtonWidget.cpp debug\moc_NetworkCtrlPage.cpp debug\moc_NetworkManager.cpp debug\moc_TxRxWidget.cpp debug\moc_RemoteZTPage.cpp debug\moc_ZTLogViewerPage.cpp debug\moc_ProgressBarPage.cpp debug\moc_RemoteZTCtrlPage.cpp debug\moc_ToggleButtonWidget.cpp debug\moc_DatabaseMgrPage.cpp debug\moc_ZTLogsListPage.cpp debug\moc_ZTLogFilesMgr.cpp debug\moc_DirParserThread.cpp + -$(DEL_FILE) debug/moc_OutilZT.cpp debug/moc_MainPanel.cpp debug/moc_MainPage.cpp debug/moc_Guipage.cpp debug/moc_PushButton.cpp debug/moc_LogViewPage.cpp debug/moc_TextButtonWidget.cpp debug/moc_RankRulerWidget.cpp debug/moc_GraphCursorWidget.cpp debug/moc_EventsRulerWidget.cpp debug/moc_AnalogGraphItem.cpp debug/moc_GraphItem.cpp debug/moc_GraphRulerWidget.cpp debug/moc_LogMgr.cpp debug/moc_LogsListPage.cpp debug/moc_OptionsPage.cpp debug/moc_NetworkZTListPage.cpp debug/moc_ToggleTextButtonWidget.cpp debug/moc_NetworkCtrlPage.cpp debug/moc_NetworkManager.cpp debug/moc_TxRxWidget.cpp debug/moc_RemoteZTPage.cpp debug/moc_ZTLogViewerPage.cpp debug/moc_ProgressBarPage.cpp debug/moc_RemoteZTCtrlPage.cpp debug/moc_ToggleButtonWidget.cpp debug/moc_DatabaseMgrPage.cpp debug/moc_ZTLogsListPage.cpp debug/moc_ZTLogFilesMgr.cpp debug/moc_DirParserThread.cpp debug/moc_OutilZT.cpp: sources/MainPanel.h \ sources/GlobalDefine.h \ sources/LogMgr.h \ @@ -234,22 +234,22 @@ debug/moc_OutilZT.cpp: sources/MainPanel.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h \ sources/OutilZT.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o debug\moc_OutilZT.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/OutilZT.h -o debug/moc_OutilZT.cpp debug/moc_MainPanel.cpp: sources/GlobalDefine.h \ sources/MainPanel.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o debug\moc_MainPanel.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/MainPanel.h -o debug/moc_MainPanel.cpp debug/moc_MainPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/MainPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o debug\moc_MainPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/MainPage.h -o debug/moc_MainPage.cpp debug/moc_Guipage.cpp: sources/GuiElements/Guipage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o debug\moc_Guipage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/Guipage.h -o debug/moc_Guipage.cpp debug/moc_PushButton.cpp: sources/GuiElements/PushButton.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o debug\moc_PushButton.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/PushButton.h -o debug/moc_PushButton.cpp debug/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ @@ -261,123 +261,123 @@ debug/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/RankRulerWidget.h \ sources/GuiElements/EventsRulerWidget.h \ sources/GuiElements/LogViewPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o debug\moc_LogViewPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/LogViewPage.h -o debug/moc_LogViewPage.cpp debug/moc_TextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o debug\moc_TextButtonWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/TextButtonWidget.h -o debug/moc_TextButtonWidget.cpp debug/moc_RankRulerWidget.cpp: sources/GuiElements/RankRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o debug\moc_RankRulerWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/RankRulerWidget.h -o debug/moc_RankRulerWidget.cpp debug/moc_GraphCursorWidget.cpp: sources/GuiElements/GraphCursorWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o debug\moc_GraphCursorWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/GraphCursorWidget.h -o debug/moc_GraphCursorWidget.cpp debug/moc_EventsRulerWidget.cpp: sources/GuiElements/EventsRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o debug\moc_EventsRulerWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/EventsRulerWidget.h -o debug/moc_EventsRulerWidget.cpp debug/moc_AnalogGraphItem.cpp: sources/GuiElements/AnalogGraphItem.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o debug\moc_AnalogGraphItem.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/AnalogGraphItem.h -o debug/moc_AnalogGraphItem.cpp debug/moc_GraphItem.cpp: sources/GuiElements/GraphItem.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o debug\moc_GraphItem.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/GraphItem.h -o debug/moc_GraphItem.cpp debug/moc_GraphRulerWidget.cpp: sources/GuiElements/GraphRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o debug\moc_GraphRulerWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/GraphRulerWidget.h -o debug/moc_GraphRulerWidget.cpp debug/moc_LogMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/LogMgr.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o debug\moc_LogMgr.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/LogMgr.h -o debug/moc_LogMgr.cpp debug/moc_LogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/LogsListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o debug\moc_LogsListPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/LogsListPage.h -o debug/moc_LogsListPage.cpp debug/moc_OptionsPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/OptionsPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o debug\moc_OptionsPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/OptionsPage.h -o debug/moc_OptionsPage.cpp debug/moc_NetworkZTListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/NetworkZTListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o debug\moc_NetworkZTListPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/NetworkZTListPage.h -o debug/moc_NetworkZTListPage.cpp debug/moc_ToggleTextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleTextButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o debug\moc_ToggleTextButtonWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ToggleTextButtonWidget.h -o debug/moc_ToggleTextButtonWidget.cpp debug/moc_NetworkCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/TxRxWidget.h \ sources/GuiElements/NetworkCtrlPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o debug\moc_NetworkCtrlPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/NetworkCtrlPage.h -o debug/moc_NetworkCtrlPage.cpp debug/moc_NetworkManager.cpp: sources/GlobalDefine.h \ sources/ZTData.h \ sources/TCPProtocol.h \ sources/UDPProtocol.h \ sources/NetworkManager.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o debug\moc_NetworkManager.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/NetworkManager.h -o debug/moc_NetworkManager.cpp debug/moc_TxRxWidget.cpp: sources/GuiElements/TxRxWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o debug\moc_TxRxWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/TxRxWidget.h -o debug/moc_TxRxWidget.cpp debug/moc_RemoteZTPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/RemoteZTPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o debug\moc_RemoteZTPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/RemoteZTPage.h -o debug/moc_RemoteZTPage.cpp debug/moc_ZTLogViewerPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogViewerPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o debug\moc_ZTLogViewerPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ZTLogViewerPage.h -o debug/moc_ZTLogViewerPage.cpp debug/moc_ProgressBarPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ProgressBarPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o debug\moc_ProgressBarPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ProgressBarPage.h -o debug/moc_ProgressBarPage.cpp debug/moc_RemoteZTCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleButtonWidget.h \ sources/GuiElements/RemoteZTCtrlPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o debug\moc_RemoteZTCtrlPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/RemoteZTCtrlPage.h -o debug/moc_RemoteZTCtrlPage.cpp debug/moc_ToggleButtonWidget.cpp: sources/GuiElements/ToggleButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o debug\moc_ToggleButtonWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ToggleButtonWidget.h -o debug/moc_ToggleButtonWidget.cpp debug/moc_DatabaseMgrPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/DatabaseMgrPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o debug\moc_DatabaseMgrPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/DatabaseMgrPage.h -o debug/moc_DatabaseMgrPage.cpp debug/moc_ZTLogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogsListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o debug\moc_ZTLogsListPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ZTLogsListPage.h -o debug/moc_ZTLogsListPage.cpp debug/moc_ZTLogFilesMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/ZTLogFilesMgr.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o debug\moc_ZTLogFilesMgr.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/ZTLogFilesMgr.h -o debug/moc_ZTLogFilesMgr.cpp debug/moc_DirParserThread.cpp: sources/GlobalDefine.h \ sources/TrainLogFileMgr.h \ sources/ZTData.h \ sources/DirParserThread.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o debug\moc_DirParserThread.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/DirParserThread.h -o debug/moc_DirParserThread.cpp compiler_rcc_make_all: compiler_rcc_clean: @@ -410,7 +410,7 @@ debug/main.o: sources/main.cpp sources/OutilZT.h \ sources/Settings.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\main.o sources\main.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/main.o sources/main.cpp debug/OutilZT.o: sources/OutilZT.cpp sources/OutilZT.h \ sources/MainPanel.h \ @@ -424,22 +424,22 @@ debug/OutilZT.o: sources/OutilZT.cpp sources/OutilZT.h \ sources/ZTLogFilesMgr.h \ sources/NetworkManager.h \ sources/UDPProtocol.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\OutilZT.o sources\OutilZT.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/OutilZT.o sources/OutilZT.cpp debug/MainPanel.o: sources/MainPanel.cpp sources/MainPanel.h \ sources/GlobalDefine.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\MainPanel.o sources\MainPanel.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/MainPanel.o sources/MainPanel.cpp debug/MainPage.o: sources/GuiElements/MainPage.cpp sources/GuiElements/MainPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\MainPage.o sources\GuiElements\MainPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/MainPage.o sources/GuiElements/MainPage.cpp debug/GuiPage.o: sources/GuiElements/GuiPage.cpp sources/GuiElements/Guipage.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\GuiPage.o sources\GuiElements\GuiPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/GuiPage.o sources/GuiElements/GuiPage.cpp debug/PushButton.o: sources/GuiElements/PushButton.cpp sources/GuiElements/PushButton.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\PushButton.o sources\GuiElements\PushButton.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/PushButton.o sources/GuiElements/PushButton.cpp debug/LogViewPage.o: sources/GuiElements/LogViewPage.cpp sources/GuiElements/LogViewPage.h \ sources/GuiElements/Guipage.h \ @@ -451,32 +451,32 @@ debug/LogViewPage.o: sources/GuiElements/LogViewPage.cpp sources/GuiElements/Log sources/GuiElements/AnalogGraphItem.h \ sources/GuiElements/RankRulerWidget.h \ sources/GuiElements/EventsRulerWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\LogViewPage.o sources\GuiElements\LogViewPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/LogViewPage.o sources/GuiElements/LogViewPage.cpp debug/TextButtonWidget.o: sources/GuiElements/TextButtonWidget.cpp sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\TextButtonWidget.o sources\GuiElements\TextButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/TextButtonWidget.o sources/GuiElements/TextButtonWidget.cpp debug/RankRulerWidget.o: sources/GuiElements/RankRulerWidget.cpp sources/GuiElements/RankRulerWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\RankRulerWidget.o sources\GuiElements\RankRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/RankRulerWidget.o sources/GuiElements/RankRulerWidget.cpp debug/GraphCursorWidget.o: sources/GuiElements/GraphCursorWidget.cpp sources/GuiElements/GraphCursorWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\GraphCursorWidget.o sources\GuiElements\GraphCursorWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/GraphCursorWidget.o sources/GuiElements/GraphCursorWidget.cpp debug/EventsRulerWidget.o: sources/GuiElements/EventsRulerWidget.cpp sources/GuiElements/EventsRulerWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\EventsRulerWidget.o sources\GuiElements\EventsRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/EventsRulerWidget.o sources/GuiElements/EventsRulerWidget.cpp debug/AnalogGraphItem.o: sources/GuiElements/AnalogGraphItem.cpp sources/GuiElements/AnalogGraphItem.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\AnalogGraphItem.o sources\GuiElements\AnalogGraphItem.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/AnalogGraphItem.o sources/GuiElements/AnalogGraphItem.cpp debug/GraphItem.o: sources/GuiElements/GraphItem.cpp sources/GuiElements/GraphItem.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\GraphItem.o sources\GuiElements\GraphItem.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/GraphItem.o sources/GuiElements/GraphItem.cpp debug/GraphRulerWidget.o: sources/GuiElements/GraphRulerWidget.cpp sources/GuiElements/GraphRulerWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\GraphRulerWidget.o sources\GuiElements\GraphRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/GraphRulerWidget.o sources/GuiElements/GraphRulerWidget.cpp debug/ZTData.o: sources/ZTData.cpp sources/ZTData.h \ sources/GlobalDefine.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ZTData.o sources\ZTData.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ZTData.o sources/ZTData.cpp debug/LogMgr.o: sources/LogMgr.cpp sources/LogMgr.h \ sources/ZTData.h \ @@ -488,47 +488,47 @@ debug/LogMgr.o: sources/LogMgr.cpp sources/LogMgr.h \ sources/Settings.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\LogMgr.o sources\LogMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/LogMgr.o sources/LogMgr.cpp debug/TrainLogFileMgr.o: sources/TrainLogFileMgr.cpp sources/TrainLogFileMgr.h \ sources/GlobalDefine.h \ sources/ZTData.h \ sources/LogMgr.h \ sources/DirParserThread.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\TrainLogFileMgr.o sources\TrainLogFileMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/TrainLogFileMgr.o sources/TrainLogFileMgr.cpp debug/LogsListPage.o: sources/GuiElements/LogsListPage.cpp sources/GuiElements/LogsListPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\LogsListPage.o sources\GuiElements\LogsListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/LogsListPage.o sources/GuiElements/LogsListPage.cpp debug/OptionsPage.o: sources/GuiElements/OptionsPage.cpp sources/GuiElements/OptionsPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\OptionsPage.o sources\GuiElements\OptionsPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/OptionsPage.o sources/GuiElements/OptionsPage.cpp debug/Settings.o: sources/Settings.cpp sources/Settings.h \ sources/GlobalDefine.h \ sources/ZTData.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\Settings.o sources\Settings.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/Settings.o sources/Settings.cpp debug/NetworkZTListPage.o: sources/GuiElements/NetworkZTListPage.cpp sources/GuiElements/NetworkZTListPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\NetworkZTListPage.o sources\GuiElements\NetworkZTListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/NetworkZTListPage.o sources/GuiElements/NetworkZTListPage.cpp debug/ToggleTextButtonWidget.o: sources/GuiElements/ToggleTextButtonWidget.cpp sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ToggleTextButtonWidget.o sources\GuiElements\ToggleTextButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ToggleTextButtonWidget.o sources/GuiElements/ToggleTextButtonWidget.cpp debug/NetworkCtrlPage.o: sources/GuiElements/NetworkCtrlPage.cpp sources/GuiElements/NetworkCtrlPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/TxRxWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\NetworkCtrlPage.o sources\GuiElements\NetworkCtrlPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/NetworkCtrlPage.o sources/GuiElements/NetworkCtrlPage.cpp debug/NetworkManager.o: sources/NetworkManager.cpp sources/NetworkManager.h \ sources/GlobalDefine.h \ @@ -542,54 +542,54 @@ debug/NetworkManager.o: sources/NetworkManager.cpp sources/NetworkManager.h \ sources/TrainLogFileMgr.h \ sources/Settings.h \ sources/ZTLogFilesMgr.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\NetworkManager.o sources\NetworkManager.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/NetworkManager.o sources/NetworkManager.cpp debug/TxRxWidget.o: sources/GuiElements/TxRxWidget.cpp sources/GuiElements/TxRxWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\TxRxWidget.o sources\GuiElements\TxRxWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/TxRxWidget.o sources/GuiElements/TxRxWidget.cpp debug/TCPProtocol.o: sources/TCPProtocol.cpp sources/TCPProtocol.h \ sources/GlobalDefine.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\TCPProtocol.o sources\TCPProtocol.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/TCPProtocol.o sources/TCPProtocol.cpp debug/RemoteZTPage.o: sources/GuiElements/RemoteZTPage.cpp sources/GuiElements/RemoteZTPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\RemoteZTPage.o sources\GuiElements\RemoteZTPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/RemoteZTPage.o sources/GuiElements/RemoteZTPage.cpp debug/ZTLogViewerPage.o: sources/GuiElements/ZTLogViewerPage.cpp sources/GuiElements/ZTLogViewerPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ZTLogViewerPage.o sources\GuiElements\ZTLogViewerPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ZTLogViewerPage.o sources/GuiElements/ZTLogViewerPage.cpp debug/ProgressBarPage.o: sources/GuiElements/ProgressBarPage.cpp sources/GuiElements/ProgressBarPage.h \ sources/GuiElements/Guipage.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ProgressBarPage.o sources\GuiElements\ProgressBarPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ProgressBarPage.o sources/GuiElements/ProgressBarPage.cpp debug/RemoteZTCtrlPage.o: sources/GuiElements/RemoteZTCtrlPage.cpp sources/GuiElements/RemoteZTCtrlPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\RemoteZTCtrlPage.o sources\GuiElements\RemoteZTCtrlPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/RemoteZTCtrlPage.o sources/GuiElements/RemoteZTCtrlPage.cpp debug/ToggleButtonWidget.o: sources/GuiElements/ToggleButtonWidget.cpp sources/GuiElements/ToggleButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ToggleButtonWidget.o sources\GuiElements\ToggleButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ToggleButtonWidget.o sources/GuiElements/ToggleButtonWidget.cpp debug/UDPProtocol.o: sources/UDPProtocol.cpp sources/UDPProtocol.h \ sources/GlobalDefine.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\UDPProtocol.o sources\UDPProtocol.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/UDPProtocol.o sources/UDPProtocol.cpp debug/DatabaseMgrPage.o: sources/GuiElements/DatabaseMgrPage.cpp sources/GuiElements/DatabaseMgrPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\DatabaseMgrPage.o sources\GuiElements\DatabaseMgrPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DatabaseMgrPage.o sources/GuiElements/DatabaseMgrPage.cpp debug/ZTLogsListPage.o: sources/GuiElements/ZTLogsListPage.cpp sources/GuiElements/ZTLogsListPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ZTLogsListPage.o sources\GuiElements\ZTLogsListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ZTLogsListPage.o sources/GuiElements/ZTLogsListPage.cpp debug/ZTLogFilesMgr.o: sources/ZTLogFilesMgr.cpp sources/ZTLogFilesMgr.h \ sources/ZTData.h \ @@ -601,103 +601,103 @@ debug/ZTLogFilesMgr.o: sources/ZTLogFilesMgr.cpp sources/ZTLogFilesMgr.h \ sources/LogMgr.h \ sources/Settings.h \ sources/TCPProtocol.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ZTLogFilesMgr.o sources\ZTLogFilesMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/ZTLogFilesMgr.o sources/ZTLogFilesMgr.cpp debug/DirParserThread.o: sources/DirParserThread.cpp sources/DirParserThread.h \ sources/GlobalDefine.h \ sources/TrainLogFileMgr.h \ sources/ZTData.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\DirParserThread.o sources\DirParserThread.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/DirParserThread.o sources/DirParserThread.cpp debug/moc_OutilZT.o: debug/moc_OutilZT.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_OutilZT.o debug\moc_OutilZT.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_OutilZT.o debug/moc_OutilZT.cpp debug/moc_MainPanel.o: debug/moc_MainPanel.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_MainPanel.o debug\moc_MainPanel.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_MainPanel.o debug/moc_MainPanel.cpp debug/moc_MainPage.o: debug/moc_MainPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_MainPage.o debug\moc_MainPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_MainPage.o debug/moc_MainPage.cpp debug/moc_Guipage.o: debug/moc_Guipage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_Guipage.o debug\moc_Guipage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_Guipage.o debug/moc_Guipage.cpp debug/moc_PushButton.o: debug/moc_PushButton.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_PushButton.o debug\moc_PushButton.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_PushButton.o debug/moc_PushButton.cpp debug/moc_LogViewPage.o: debug/moc_LogViewPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_LogViewPage.o debug\moc_LogViewPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_LogViewPage.o debug/moc_LogViewPage.cpp debug/moc_TextButtonWidget.o: debug/moc_TextButtonWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_TextButtonWidget.o debug\moc_TextButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_TextButtonWidget.o debug/moc_TextButtonWidget.cpp debug/moc_RankRulerWidget.o: debug/moc_RankRulerWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_RankRulerWidget.o debug\moc_RankRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_RankRulerWidget.o debug/moc_RankRulerWidget.cpp debug/moc_GraphCursorWidget.o: debug/moc_GraphCursorWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_GraphCursorWidget.o debug\moc_GraphCursorWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_GraphCursorWidget.o debug/moc_GraphCursorWidget.cpp debug/moc_EventsRulerWidget.o: debug/moc_EventsRulerWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_EventsRulerWidget.o debug\moc_EventsRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_EventsRulerWidget.o debug/moc_EventsRulerWidget.cpp debug/moc_AnalogGraphItem.o: debug/moc_AnalogGraphItem.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_AnalogGraphItem.o debug\moc_AnalogGraphItem.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_AnalogGraphItem.o debug/moc_AnalogGraphItem.cpp debug/moc_GraphItem.o: debug/moc_GraphItem.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_GraphItem.o debug\moc_GraphItem.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_GraphItem.o debug/moc_GraphItem.cpp debug/moc_GraphRulerWidget.o: debug/moc_GraphRulerWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_GraphRulerWidget.o debug\moc_GraphRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_GraphRulerWidget.o debug/moc_GraphRulerWidget.cpp debug/moc_LogMgr.o: debug/moc_LogMgr.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_LogMgr.o debug\moc_LogMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_LogMgr.o debug/moc_LogMgr.cpp debug/moc_LogsListPage.o: debug/moc_LogsListPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_LogsListPage.o debug\moc_LogsListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_LogsListPage.o debug/moc_LogsListPage.cpp debug/moc_OptionsPage.o: debug/moc_OptionsPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_OptionsPage.o debug\moc_OptionsPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_OptionsPage.o debug/moc_OptionsPage.cpp debug/moc_NetworkZTListPage.o: debug/moc_NetworkZTListPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_NetworkZTListPage.o debug\moc_NetworkZTListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_NetworkZTListPage.o debug/moc_NetworkZTListPage.cpp debug/moc_ToggleTextButtonWidget.o: debug/moc_ToggleTextButtonWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_ToggleTextButtonWidget.o debug\moc_ToggleTextButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ToggleTextButtonWidget.o debug/moc_ToggleTextButtonWidget.cpp debug/moc_NetworkCtrlPage.o: debug/moc_NetworkCtrlPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_NetworkCtrlPage.o debug\moc_NetworkCtrlPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_NetworkCtrlPage.o debug/moc_NetworkCtrlPage.cpp debug/moc_NetworkManager.o: debug/moc_NetworkManager.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_NetworkManager.o debug\moc_NetworkManager.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_NetworkManager.o debug/moc_NetworkManager.cpp debug/moc_TxRxWidget.o: debug/moc_TxRxWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_TxRxWidget.o debug\moc_TxRxWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_TxRxWidget.o debug/moc_TxRxWidget.cpp debug/moc_RemoteZTPage.o: debug/moc_RemoteZTPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_RemoteZTPage.o debug\moc_RemoteZTPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_RemoteZTPage.o debug/moc_RemoteZTPage.cpp debug/moc_ZTLogViewerPage.o: debug/moc_ZTLogViewerPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_ZTLogViewerPage.o debug\moc_ZTLogViewerPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ZTLogViewerPage.o debug/moc_ZTLogViewerPage.cpp debug/moc_ProgressBarPage.o: debug/moc_ProgressBarPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_ProgressBarPage.o debug\moc_ProgressBarPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ProgressBarPage.o debug/moc_ProgressBarPage.cpp debug/moc_RemoteZTCtrlPage.o: debug/moc_RemoteZTCtrlPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_RemoteZTCtrlPage.o debug\moc_RemoteZTCtrlPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_RemoteZTCtrlPage.o debug/moc_RemoteZTCtrlPage.cpp debug/moc_ToggleButtonWidget.o: debug/moc_ToggleButtonWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_ToggleButtonWidget.o debug\moc_ToggleButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ToggleButtonWidget.o debug/moc_ToggleButtonWidget.cpp debug/moc_DatabaseMgrPage.o: debug/moc_DatabaseMgrPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_DatabaseMgrPage.o debug\moc_DatabaseMgrPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DatabaseMgrPage.o debug/moc_DatabaseMgrPage.cpp debug/moc_ZTLogsListPage.o: debug/moc_ZTLogsListPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_ZTLogsListPage.o debug\moc_ZTLogsListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ZTLogsListPage.o debug/moc_ZTLogsListPage.cpp debug/moc_ZTLogFilesMgr.o: debug/moc_ZTLogFilesMgr.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_ZTLogFilesMgr.o debug\moc_ZTLogFilesMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_ZTLogFilesMgr.o debug/moc_ZTLogFilesMgr.cpp debug/moc_DirParserThread.o: debug/moc_DirParserThread.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_DirParserThread.o debug\moc_DirParserThread.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug/moc_DirParserThread.o debug/moc_DirParserThread.cpp ####### Install diff --git a/Makefile.Release b/Makefile.Release index c53c170..f5f50d0 100644 --- a/Makefile.Release +++ b/Makefile.Release @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: OutilZT -# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu Jan 18 13:05:57 2018 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Fri Jan 19 13:26:09 2018 # Project: OutilZT.pro # Template: app ############################################################################# @@ -12,100 +12,100 @@ CXX = g++ DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN CFLAGS = -O2 -Wall $(DEFINES) CXXFLAGS = -O2 -frtti -fexceptions -mthreads -Wall $(DEFINES) -INCPATH = -I"..\..\Qt\4.8.1\include\QtCore" -I"..\..\Qt\4.8.1\include\QtNetwork" -I"..\..\Qt\4.8.1\include\QtGui" -I"..\..\Qt\4.8.1\include" -I"." -I"sources" -I"sources\GuiElements" -I"..\..\Qt\4.8.1\include\ActiveQt" -I"release" -I"..\..\Qt\4.8.1\mkspecs\win32-g++" +INCPATH = -I'../../Qt/4.8.1/include/QtCore' -I'../../Qt/4.8.1/include/QtNetwork' -I'../../Qt/4.8.1/include/QtGui' -I'../../Qt/4.8.1/include' -I'.' -I'sources' -I'sources/GuiElements' -I'../../Qt/4.8.1/include/ActiveQt' -I'release' -I'../../Qt/4.8.1/mkspecs/win32-g++' LINK = g++ LFLAGS = -Wl,-s -mthreads -Wl,-subsystem,windows -LIBS = -L"c:\Qt\4.8.1\lib" -lmingw32 -lqtmain -lQtGui4 -lQtNetwork4 -lQtCore4 -QMAKE = c:\Qt\4.8.1\bin\qmake.exe -IDC = c:\Qt\4.8.1\bin\idc.exe +LIBS = -L'c:/Qt/4.8.1/lib' -lmingw32 -lqtmain -lQtGui4 -lQtNetwork4 -lQtCore4 +QMAKE = c:/Qt/4.8.1/bin/qmake.exe +IDC = c:/Qt/4.8.1/bin/idc.exe IDL = midl ZIP = zip -r -9 DEF_FILE = RES_FILE = -COPY = copy /y -SED = +COPY = cp +SED = sed COPY_FILE = $(COPY) -COPY_DIR = xcopy /s /q /y /i -DEL_FILE = del +COPY_DIR = cp -r +DEL_FILE = rm DEL_DIR = rmdir -MOVE = move -CHK_DIR_EXISTS= if not exist -MKDIR = mkdir +MOVE = mv +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p INSTALL_FILE = $(COPY_FILE) INSTALL_PROGRAM = $(COPY_FILE) INSTALL_DIR = $(COPY_DIR) ####### Output directory -OBJECTS_DIR = release +OBJECTS_DIR = release/ ####### Files -SOURCES = sources\main.cpp \ - sources\OutilZT.cpp \ - sources\MainPanel.cpp \ - sources\GuiElements\MainPage.cpp \ - sources\GuiElements\GuiPage.cpp \ - sources\GuiElements\PushButton.cpp \ - sources\GuiElements\LogViewPage.cpp \ - sources\GuiElements\TextButtonWidget.cpp \ - sources\GuiElements\RankRulerWidget.cpp \ - sources\GuiElements\GraphCursorWidget.cpp \ - sources\GuiElements\EventsRulerWidget.cpp \ - sources\GuiElements\AnalogGraphItem.cpp \ - sources\GuiElements\GraphItem.cpp \ - sources\GuiElements\GraphRulerWidget.cpp \ - sources\ZTData.cpp \ - sources\LogMgr.cpp \ - sources\TrainLogFileMgr.cpp \ - sources\GuiElements\LogsListPage.cpp \ - sources\GuiElements\OptionsPage.cpp \ - sources\Settings.cpp \ - sources\GuiElements\NetworkZTListPage.cpp \ - sources\GuiElements\ToggleTextButtonWidget.cpp \ - sources\GuiElements\NetworkCtrlPage.cpp \ - sources\NetworkManager.cpp \ - sources\GuiElements\TxRxWidget.cpp \ - sources\TCPProtocol.cpp \ - sources\GuiElements\RemoteZTPage.cpp \ - sources\GuiElements\ZTLogViewerPage.cpp \ - sources\GuiElements\ProgressBarPage.cpp \ - sources\GuiElements\RemoteZTCtrlPage.cpp \ - sources\GuiElements\ToggleButtonWidget.cpp \ - sources\UDPProtocol.cpp \ - sources\GuiElements\DatabaseMgrPage.cpp \ - sources\GuiElements\ZTLogsListPage.cpp \ - sources\ZTLogFilesMgr.cpp \ - sources\DirParserThread.cpp release\moc_OutilZT.cpp \ - release\moc_MainPanel.cpp \ - release\moc_MainPage.cpp \ - release\moc_Guipage.cpp \ - release\moc_PushButton.cpp \ - release\moc_LogViewPage.cpp \ - release\moc_TextButtonWidget.cpp \ - release\moc_RankRulerWidget.cpp \ - release\moc_GraphCursorWidget.cpp \ - release\moc_EventsRulerWidget.cpp \ - release\moc_AnalogGraphItem.cpp \ - release\moc_GraphItem.cpp \ - release\moc_GraphRulerWidget.cpp \ - release\moc_LogMgr.cpp \ - release\moc_LogsListPage.cpp \ - release\moc_OptionsPage.cpp \ - release\moc_NetworkZTListPage.cpp \ - release\moc_ToggleTextButtonWidget.cpp \ - release\moc_NetworkCtrlPage.cpp \ - release\moc_NetworkManager.cpp \ - release\moc_TxRxWidget.cpp \ - release\moc_RemoteZTPage.cpp \ - release\moc_ZTLogViewerPage.cpp \ - release\moc_ProgressBarPage.cpp \ - release\moc_RemoteZTCtrlPage.cpp \ - release\moc_ToggleButtonWidget.cpp \ - release\moc_DatabaseMgrPage.cpp \ - release\moc_ZTLogsListPage.cpp \ - release\moc_ZTLogFilesMgr.cpp \ - release\moc_DirParserThread.cpp +SOURCES = sources/main.cpp \ + sources/OutilZT.cpp \ + sources/MainPanel.cpp \ + sources/GuiElements/MainPage.cpp \ + sources/GuiElements/GuiPage.cpp \ + sources/GuiElements/PushButton.cpp \ + sources/GuiElements/LogViewPage.cpp \ + sources/GuiElements/TextButtonWidget.cpp \ + sources/GuiElements/RankRulerWidget.cpp \ + sources/GuiElements/GraphCursorWidget.cpp \ + sources/GuiElements/EventsRulerWidget.cpp \ + sources/GuiElements/AnalogGraphItem.cpp \ + sources/GuiElements/GraphItem.cpp \ + sources/GuiElements/GraphRulerWidget.cpp \ + sources/ZTData.cpp \ + sources/LogMgr.cpp \ + sources/TrainLogFileMgr.cpp \ + sources/GuiElements/LogsListPage.cpp \ + sources/GuiElements/OptionsPage.cpp \ + sources/Settings.cpp \ + sources/GuiElements/NetworkZTListPage.cpp \ + sources/GuiElements/ToggleTextButtonWidget.cpp \ + sources/GuiElements/NetworkCtrlPage.cpp \ + sources/NetworkManager.cpp \ + sources/GuiElements/TxRxWidget.cpp \ + sources/TCPProtocol.cpp \ + sources/GuiElements/RemoteZTPage.cpp \ + sources/GuiElements/ZTLogViewerPage.cpp \ + sources/GuiElements/ProgressBarPage.cpp \ + sources/GuiElements/RemoteZTCtrlPage.cpp \ + sources/GuiElements/ToggleButtonWidget.cpp \ + sources/UDPProtocol.cpp \ + sources/GuiElements/DatabaseMgrPage.cpp \ + sources/GuiElements/ZTLogsListPage.cpp \ + sources/ZTLogFilesMgr.cpp \ + sources/DirParserThread.cpp release/moc_OutilZT.cpp \ + release/moc_MainPanel.cpp \ + release/moc_MainPage.cpp \ + release/moc_Guipage.cpp \ + release/moc_PushButton.cpp \ + release/moc_LogViewPage.cpp \ + release/moc_TextButtonWidget.cpp \ + release/moc_RankRulerWidget.cpp \ + release/moc_GraphCursorWidget.cpp \ + release/moc_EventsRulerWidget.cpp \ + release/moc_AnalogGraphItem.cpp \ + release/moc_GraphItem.cpp \ + release/moc_GraphRulerWidget.cpp \ + release/moc_LogMgr.cpp \ + release/moc_LogsListPage.cpp \ + release/moc_OptionsPage.cpp \ + release/moc_NetworkZTListPage.cpp \ + release/moc_ToggleTextButtonWidget.cpp \ + release/moc_NetworkCtrlPage.cpp \ + release/moc_NetworkManager.cpp \ + release/moc_TxRxWidget.cpp \ + release/moc_RemoteZTPage.cpp \ + release/moc_ZTLogViewerPage.cpp \ + release/moc_ProgressBarPage.cpp \ + release/moc_RemoteZTCtrlPage.cpp \ + release/moc_ToggleButtonWidget.cpp \ + release/moc_DatabaseMgrPage.cpp \ + release/moc_ZTLogsListPage.cpp \ + release/moc_ZTLogFilesMgr.cpp \ + release/moc_DirParserThread.cpp OBJECTS = release/main.o \ release/OutilZT.o \ release/MainPanel.o \ @@ -174,9 +174,9 @@ OBJECTS = release/main.o \ release/moc_DirParserThread.o DIST = QMAKE_TARGET = OutilZT -DESTDIR = release\ #avoid trailing-slash linebreak +DESTDIR = release/ #avoid trailing-slash linebreak TARGET = OutilZT.exe -DESTDIR_TARGET = release\OutilZT.exe +DESTDIR_TARGET = release/OutilZT.exe ####### Implicit rules @@ -203,13 +203,13 @@ $(DESTDIR_TARGET): $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.OutilZT.Release $(LIBS) qmake: FORCE - @$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile.Release OutilZT.pro + @$(QMAKE) -spec ../../Qt/4.8.1/mkspecs/win32-g++ CONFIG+=declarative_debug -o Makefile.Release OutilZT.pro dist: - $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro ..\..\Qt\4.8.1\mkspecs\qconfig.pri ..\..\Qt\4.8.1\mkspecs\modules\qt_webkit_version.pri ..\..\Qt\4.8.1\mkspecs\features\qt_functions.prf ..\..\Qt\4.8.1\mkspecs\features\qt_config.prf ..\..\Qt\4.8.1\mkspecs\features\exclusive_builds.prf ..\..\Qt\4.8.1\mkspecs\features\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\release.prf ..\..\Qt\4.8.1\mkspecs\features\debug_and_release.prf ..\..\Qt\4.8.1\mkspecs\features\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\build_pass.prf ..\..\Qt\4.8.1\mkspecs\features\win32\rtti.prf ..\..\Qt\4.8.1\mkspecs\features\win32\exceptions.prf ..\..\Qt\4.8.1\mkspecs\features\win32\stl.prf ..\..\Qt\4.8.1\mkspecs\features\shared.prf ..\..\Qt\4.8.1\mkspecs\features\warn_on.prf ..\..\Qt\4.8.1\mkspecs\features\qt.prf ..\..\Qt\4.8.1\mkspecs\features\win32\thread.prf ..\..\Qt\4.8.1\mkspecs\features\moc.prf ..\..\Qt\4.8.1\mkspecs\features\win32\windows.prf ..\..\Qt\4.8.1\mkspecs\features\resources.prf ..\..\Qt\4.8.1\mkspecs\features\uic.prf ..\..\Qt\4.8.1\mkspecs\features\yacc.prf ..\..\Qt\4.8.1\mkspecs\features\lex.prf ..\..\Qt\4.8.1\mkspecs\features\include_source_dir.prf c:\Qt\4.8.1\lib\qtmain.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES + $(ZIP) OutilZT.zip $(SOURCES) $(DIST) OutilZT.pro ../../Qt/4.8.1/mkspecs/qconfig.pri ../../Qt/4.8.1/mkspecs/modules/qt_webkit_version.pri ../../Qt/4.8.1/mkspecs/features/qt_functions.prf ../../Qt/4.8.1/mkspecs/features/qt_config.prf ../../Qt/4.8.1/mkspecs/features/exclusive_builds.prf ../../Qt/4.8.1/mkspecs/features/default_pre.prf ../../Qt/4.8.1/mkspecs/features/win32/default_pre.prf ../../Qt/4.8.1/mkspecs/features/release.prf ../../Qt/4.8.1/mkspecs/features/debug_and_release.prf ../../Qt/4.8.1/mkspecs/features/default_post.prf ../../Qt/4.8.1/mkspecs/features/win32/default_post.prf ../../Qt/4.8.1/mkspecs/features/build_pass.prf ../../Qt/4.8.1/mkspecs/features/declarative_debug.prf ../../Qt/4.8.1/mkspecs/features/win32/rtti.prf ../../Qt/4.8.1/mkspecs/features/win32/exceptions.prf ../../Qt/4.8.1/mkspecs/features/win32/stl.prf ../../Qt/4.8.1/mkspecs/features/shared.prf ../../Qt/4.8.1/mkspecs/features/warn_on.prf ../../Qt/4.8.1/mkspecs/features/qt.prf ../../Qt/4.8.1/mkspecs/features/win32/thread.prf ../../Qt/4.8.1/mkspecs/features/moc.prf ../../Qt/4.8.1/mkspecs/features/win32/windows.prf ../../Qt/4.8.1/mkspecs/features/resources.prf ../../Qt/4.8.1/mkspecs/features/uic.prf ../../Qt/4.8.1/mkspecs/features/yacc.prf ../../Qt/4.8.1/mkspecs/features/lex.prf ../../Qt/4.8.1/mkspecs/features/include_source_dir.prf c:\Qt\4.8.1\lib\qtmain.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean - -$(DEL_FILE) release\main.o release\OutilZT.o release\MainPanel.o release\MainPage.o release\GuiPage.o release\PushButton.o release\LogViewPage.o release\TextButtonWidget.o release\RankRulerWidget.o release\GraphCursorWidget.o release\EventsRulerWidget.o release\AnalogGraphItem.o release\GraphItem.o release\GraphRulerWidget.o release\ZTData.o release\LogMgr.o release\TrainLogFileMgr.o release\LogsListPage.o release\OptionsPage.o release\Settings.o release\NetworkZTListPage.o release\ToggleTextButtonWidget.o release\NetworkCtrlPage.o release\NetworkManager.o release\TxRxWidget.o release\TCPProtocol.o release\RemoteZTPage.o release\ZTLogViewerPage.o release\ProgressBarPage.o release\RemoteZTCtrlPage.o release\ToggleButtonWidget.o release\UDPProtocol.o release\DatabaseMgrPage.o release\ZTLogsListPage.o release\ZTLogFilesMgr.o release\DirParserThread.o release\moc_OutilZT.o release\moc_MainPanel.o release\moc_MainPage.o release\moc_Guipage.o release\moc_PushButton.o release\moc_LogViewPage.o release\moc_TextButtonWidget.o release\moc_RankRulerWidget.o release\moc_GraphCursorWidget.o release\moc_EventsRulerWidget.o release\moc_AnalogGraphItem.o release\moc_GraphItem.o release\moc_GraphRulerWidget.o release\moc_LogMgr.o release\moc_LogsListPage.o release\moc_OptionsPage.o release\moc_NetworkZTListPage.o release\moc_ToggleTextButtonWidget.o release\moc_NetworkCtrlPage.o release\moc_NetworkManager.o release\moc_TxRxWidget.o release\moc_RemoteZTPage.o release\moc_ZTLogViewerPage.o release\moc_ProgressBarPage.o release\moc_RemoteZTCtrlPage.o release\moc_ToggleButtonWidget.o release\moc_DatabaseMgrPage.o release\moc_ZTLogsListPage.o release\moc_ZTLogFilesMgr.o release\moc_DirParserThread.o + -$(DEL_FILE) release/main.o release/OutilZT.o release/MainPanel.o release/MainPage.o release/GuiPage.o release/PushButton.o release/LogViewPage.o release/TextButtonWidget.o release/RankRulerWidget.o release/GraphCursorWidget.o release/EventsRulerWidget.o release/AnalogGraphItem.o release/GraphItem.o release/GraphRulerWidget.o release/ZTData.o release/LogMgr.o release/TrainLogFileMgr.o release/LogsListPage.o release/OptionsPage.o release/Settings.o release/NetworkZTListPage.o release/ToggleTextButtonWidget.o release/NetworkCtrlPage.o release/NetworkManager.o release/TxRxWidget.o release/TCPProtocol.o release/RemoteZTPage.o release/ZTLogViewerPage.o release/ProgressBarPage.o release/RemoteZTCtrlPage.o release/ToggleButtonWidget.o release/UDPProtocol.o release/DatabaseMgrPage.o release/ZTLogsListPage.o release/ZTLogFilesMgr.o release/DirParserThread.o release/moc_OutilZT.o release/moc_MainPanel.o release/moc_MainPage.o release/moc_Guipage.o release/moc_PushButton.o release/moc_LogViewPage.o release/moc_TextButtonWidget.o release/moc_RankRulerWidget.o release/moc_GraphCursorWidget.o release/moc_EventsRulerWidget.o release/moc_AnalogGraphItem.o release/moc_GraphItem.o release/moc_GraphRulerWidget.o release/moc_LogMgr.o release/moc_LogsListPage.o release/moc_OptionsPage.o release/moc_NetworkZTListPage.o release/moc_ToggleTextButtonWidget.o release/moc_NetworkCtrlPage.o release/moc_NetworkManager.o release/moc_TxRxWidget.o release/moc_RemoteZTPage.o release/moc_ZTLogViewerPage.o release/moc_ProgressBarPage.o release/moc_RemoteZTCtrlPage.o release/moc_ToggleButtonWidget.o release/moc_DatabaseMgrPage.o release/moc_ZTLogsListPage.o release/moc_ZTLogFilesMgr.o release/moc_DirParserThread.o distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -223,7 +223,7 @@ mocables: compiler_moc_header_make_all compiler_moc_source_make_all compiler_moc_header_make_all: release/moc_OutilZT.cpp release/moc_MainPanel.cpp release/moc_MainPage.cpp release/moc_Guipage.cpp release/moc_PushButton.cpp release/moc_LogViewPage.cpp release/moc_TextButtonWidget.cpp release/moc_RankRulerWidget.cpp release/moc_GraphCursorWidget.cpp release/moc_EventsRulerWidget.cpp release/moc_AnalogGraphItem.cpp release/moc_GraphItem.cpp release/moc_GraphRulerWidget.cpp release/moc_LogMgr.cpp release/moc_LogsListPage.cpp release/moc_OptionsPage.cpp release/moc_NetworkZTListPage.cpp release/moc_ToggleTextButtonWidget.cpp release/moc_NetworkCtrlPage.cpp release/moc_NetworkManager.cpp release/moc_TxRxWidget.cpp release/moc_RemoteZTPage.cpp release/moc_ZTLogViewerPage.cpp release/moc_ProgressBarPage.cpp release/moc_RemoteZTCtrlPage.cpp release/moc_ToggleButtonWidget.cpp release/moc_DatabaseMgrPage.cpp release/moc_ZTLogsListPage.cpp release/moc_ZTLogFilesMgr.cpp release/moc_DirParserThread.cpp compiler_moc_header_clean: - -$(DEL_FILE) release\moc_OutilZT.cpp release\moc_MainPanel.cpp release\moc_MainPage.cpp release\moc_Guipage.cpp release\moc_PushButton.cpp release\moc_LogViewPage.cpp release\moc_TextButtonWidget.cpp release\moc_RankRulerWidget.cpp release\moc_GraphCursorWidget.cpp release\moc_EventsRulerWidget.cpp release\moc_AnalogGraphItem.cpp release\moc_GraphItem.cpp release\moc_GraphRulerWidget.cpp release\moc_LogMgr.cpp release\moc_LogsListPage.cpp release\moc_OptionsPage.cpp release\moc_NetworkZTListPage.cpp release\moc_ToggleTextButtonWidget.cpp release\moc_NetworkCtrlPage.cpp release\moc_NetworkManager.cpp release\moc_TxRxWidget.cpp release\moc_RemoteZTPage.cpp release\moc_ZTLogViewerPage.cpp release\moc_ProgressBarPage.cpp release\moc_RemoteZTCtrlPage.cpp release\moc_ToggleButtonWidget.cpp release\moc_DatabaseMgrPage.cpp release\moc_ZTLogsListPage.cpp release\moc_ZTLogFilesMgr.cpp release\moc_DirParserThread.cpp + -$(DEL_FILE) release/moc_OutilZT.cpp release/moc_MainPanel.cpp release/moc_MainPage.cpp release/moc_Guipage.cpp release/moc_PushButton.cpp release/moc_LogViewPage.cpp release/moc_TextButtonWidget.cpp release/moc_RankRulerWidget.cpp release/moc_GraphCursorWidget.cpp release/moc_EventsRulerWidget.cpp release/moc_AnalogGraphItem.cpp release/moc_GraphItem.cpp release/moc_GraphRulerWidget.cpp release/moc_LogMgr.cpp release/moc_LogsListPage.cpp release/moc_OptionsPage.cpp release/moc_NetworkZTListPage.cpp release/moc_ToggleTextButtonWidget.cpp release/moc_NetworkCtrlPage.cpp release/moc_NetworkManager.cpp release/moc_TxRxWidget.cpp release/moc_RemoteZTPage.cpp release/moc_ZTLogViewerPage.cpp release/moc_ProgressBarPage.cpp release/moc_RemoteZTCtrlPage.cpp release/moc_ToggleButtonWidget.cpp release/moc_DatabaseMgrPage.cpp release/moc_ZTLogsListPage.cpp release/moc_ZTLogFilesMgr.cpp release/moc_DirParserThread.cpp release/moc_OutilZT.cpp: sources/MainPanel.h \ sources/GlobalDefine.h \ sources/LogMgr.h \ @@ -234,22 +234,22 @@ release/moc_OutilZT.cpp: sources/MainPanel.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h \ sources/OutilZT.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\OutilZT.h -o release\moc_OutilZT.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/OutilZT.h -o release/moc_OutilZT.cpp release/moc_MainPanel.cpp: sources/GlobalDefine.h \ sources/MainPanel.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\MainPanel.h -o release\moc_MainPanel.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/MainPanel.h -o release/moc_MainPanel.cpp release/moc_MainPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/MainPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\MainPage.h -o release\moc_MainPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/MainPage.h -o release/moc_MainPage.cpp release/moc_Guipage.cpp: sources/GuiElements/Guipage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\Guipage.h -o release\moc_Guipage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/Guipage.h -o release/moc_Guipage.cpp release/moc_PushButton.cpp: sources/GuiElements/PushButton.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\PushButton.h -o release\moc_PushButton.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/PushButton.h -o release/moc_PushButton.cpp release/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ @@ -261,123 +261,123 @@ release/moc_LogViewPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/RankRulerWidget.h \ sources/GuiElements/EventsRulerWidget.h \ sources/GuiElements/LogViewPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogViewPage.h -o release\moc_LogViewPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/LogViewPage.h -o release/moc_LogViewPage.cpp release/moc_TextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TextButtonWidget.h -o release\moc_TextButtonWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/TextButtonWidget.h -o release/moc_TextButtonWidget.cpp release/moc_RankRulerWidget.cpp: sources/GuiElements/RankRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RankRulerWidget.h -o release\moc_RankRulerWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/RankRulerWidget.h -o release/moc_RankRulerWidget.cpp release/moc_GraphCursorWidget.cpp: sources/GuiElements/GraphCursorWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphCursorWidget.h -o release\moc_GraphCursorWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/GraphCursorWidget.h -o release/moc_GraphCursorWidget.cpp release/moc_EventsRulerWidget.cpp: sources/GuiElements/EventsRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\EventsRulerWidget.h -o release\moc_EventsRulerWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/EventsRulerWidget.h -o release/moc_EventsRulerWidget.cpp release/moc_AnalogGraphItem.cpp: sources/GuiElements/AnalogGraphItem.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\AnalogGraphItem.h -o release\moc_AnalogGraphItem.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/AnalogGraphItem.h -o release/moc_AnalogGraphItem.cpp release/moc_GraphItem.cpp: sources/GuiElements/GraphItem.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphItem.h -o release\moc_GraphItem.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/GraphItem.h -o release/moc_GraphItem.cpp release/moc_GraphRulerWidget.cpp: sources/GuiElements/GraphRulerWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\GraphRulerWidget.h -o release\moc_GraphRulerWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/GraphRulerWidget.h -o release/moc_GraphRulerWidget.cpp release/moc_LogMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/LogMgr.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\LogMgr.h -o release\moc_LogMgr.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/LogMgr.h -o release/moc_LogMgr.cpp release/moc_LogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/LogsListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\LogsListPage.h -o release\moc_LogsListPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/LogsListPage.h -o release/moc_LogsListPage.cpp release/moc_OptionsPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/OptionsPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\OptionsPage.h -o release\moc_OptionsPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/OptionsPage.h -o release/moc_OptionsPage.cpp release/moc_NetworkZTListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/NetworkZTListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkZTListPage.h -o release\moc_NetworkZTListPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/NetworkZTListPage.h -o release/moc_NetworkZTListPage.cpp release/moc_ToggleTextButtonWidget.cpp: sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleTextButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleTextButtonWidget.h -o release\moc_ToggleTextButtonWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ToggleTextButtonWidget.h -o release/moc_ToggleTextButtonWidget.cpp release/moc_NetworkCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/TxRxWidget.h \ sources/GuiElements/NetworkCtrlPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\NetworkCtrlPage.h -o release\moc_NetworkCtrlPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/NetworkCtrlPage.h -o release/moc_NetworkCtrlPage.cpp release/moc_NetworkManager.cpp: sources/GlobalDefine.h \ sources/ZTData.h \ sources/TCPProtocol.h \ sources/UDPProtocol.h \ sources/NetworkManager.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\NetworkManager.h -o release\moc_NetworkManager.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/NetworkManager.h -o release/moc_NetworkManager.cpp release/moc_TxRxWidget.cpp: sources/GuiElements/TxRxWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\TxRxWidget.h -o release\moc_TxRxWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/TxRxWidget.h -o release/moc_TxRxWidget.cpp release/moc_RemoteZTPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/RemoteZTPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTPage.h -o release\moc_RemoteZTPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/RemoteZTPage.h -o release/moc_RemoteZTPage.cpp release/moc_ZTLogViewerPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogViewerPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogViewerPage.h -o release\moc_ZTLogViewerPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ZTLogViewerPage.h -o release/moc_ZTLogViewerPage.cpp release/moc_ProgressBarPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/ProgressBarPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ProgressBarPage.h -o release\moc_ProgressBarPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ProgressBarPage.h -o release/moc_ProgressBarPage.cpp release/moc_RemoteZTCtrlPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleButtonWidget.h \ sources/GuiElements/RemoteZTCtrlPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\RemoteZTCtrlPage.h -o release\moc_RemoteZTCtrlPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/RemoteZTCtrlPage.h -o release/moc_RemoteZTCtrlPage.cpp release/moc_ToggleButtonWidget.cpp: sources/GuiElements/ToggleButtonWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ToggleButtonWidget.h -o release\moc_ToggleButtonWidget.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ToggleButtonWidget.h -o release/moc_ToggleButtonWidget.cpp release/moc_DatabaseMgrPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/DatabaseMgrPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\DatabaseMgrPage.h -o release\moc_DatabaseMgrPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/DatabaseMgrPage.h -o release/moc_DatabaseMgrPage.cpp release/moc_ZTLogsListPage.cpp: sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ZTLogsListPage.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\GuiElements\ZTLogsListPage.h -o release\moc_ZTLogsListPage.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/GuiElements/ZTLogsListPage.h -o release/moc_ZTLogsListPage.cpp release/moc_ZTLogFilesMgr.cpp: sources/ZTData.h \ sources/GlobalDefine.h \ sources/DirParserThread.h \ sources/TrainLogFileMgr.h \ sources/ZTLogFilesMgr.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\ZTLogFilesMgr.h -o release\moc_ZTLogFilesMgr.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/ZTLogFilesMgr.h -o release/moc_ZTLogFilesMgr.cpp release/moc_DirParserThread.cpp: sources/GlobalDefine.h \ sources/TrainLogFileMgr.h \ sources/ZTData.h \ sources/DirParserThread.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources\DirParserThread.h -o release\moc_DirParserThread.cpp + C:/Qt/4.8.1/bin/moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 sources/DirParserThread.h -o release/moc_DirParserThread.cpp compiler_rcc_make_all: compiler_rcc_clean: @@ -410,7 +410,7 @@ release/main.o: sources/main.cpp sources/OutilZT.h \ sources/Settings.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\main.o sources\main.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/main.o sources/main.cpp release/OutilZT.o: sources/OutilZT.cpp sources/OutilZT.h \ sources/MainPanel.h \ @@ -424,22 +424,22 @@ release/OutilZT.o: sources/OutilZT.cpp sources/OutilZT.h \ sources/ZTLogFilesMgr.h \ sources/NetworkManager.h \ sources/UDPProtocol.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\OutilZT.o sources\OutilZT.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/OutilZT.o sources/OutilZT.cpp release/MainPanel.o: sources/MainPanel.cpp sources/MainPanel.h \ sources/GlobalDefine.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\MainPanel.o sources\MainPanel.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/MainPanel.o sources/MainPanel.cpp release/MainPage.o: sources/GuiElements/MainPage.cpp sources/GuiElements/MainPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\MainPage.o sources\GuiElements\MainPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/MainPage.o sources/GuiElements/MainPage.cpp release/GuiPage.o: sources/GuiElements/GuiPage.cpp sources/GuiElements/Guipage.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\GuiPage.o sources\GuiElements\GuiPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/GuiPage.o sources/GuiElements/GuiPage.cpp release/PushButton.o: sources/GuiElements/PushButton.cpp sources/GuiElements/PushButton.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\PushButton.o sources\GuiElements\PushButton.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/PushButton.o sources/GuiElements/PushButton.cpp release/LogViewPage.o: sources/GuiElements/LogViewPage.cpp sources/GuiElements/LogViewPage.h \ sources/GuiElements/Guipage.h \ @@ -451,32 +451,32 @@ release/LogViewPage.o: sources/GuiElements/LogViewPage.cpp sources/GuiElements/L sources/GuiElements/AnalogGraphItem.h \ sources/GuiElements/RankRulerWidget.h \ sources/GuiElements/EventsRulerWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\LogViewPage.o sources\GuiElements\LogViewPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/LogViewPage.o sources/GuiElements/LogViewPage.cpp release/TextButtonWidget.o: sources/GuiElements/TextButtonWidget.cpp sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\TextButtonWidget.o sources\GuiElements\TextButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/TextButtonWidget.o sources/GuiElements/TextButtonWidget.cpp release/RankRulerWidget.o: sources/GuiElements/RankRulerWidget.cpp sources/GuiElements/RankRulerWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\RankRulerWidget.o sources\GuiElements\RankRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/RankRulerWidget.o sources/GuiElements/RankRulerWidget.cpp release/GraphCursorWidget.o: sources/GuiElements/GraphCursorWidget.cpp sources/GuiElements/GraphCursorWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\GraphCursorWidget.o sources\GuiElements\GraphCursorWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/GraphCursorWidget.o sources/GuiElements/GraphCursorWidget.cpp release/EventsRulerWidget.o: sources/GuiElements/EventsRulerWidget.cpp sources/GuiElements/EventsRulerWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\EventsRulerWidget.o sources\GuiElements\EventsRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/EventsRulerWidget.o sources/GuiElements/EventsRulerWidget.cpp release/AnalogGraphItem.o: sources/GuiElements/AnalogGraphItem.cpp sources/GuiElements/AnalogGraphItem.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\AnalogGraphItem.o sources\GuiElements\AnalogGraphItem.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/AnalogGraphItem.o sources/GuiElements/AnalogGraphItem.cpp release/GraphItem.o: sources/GuiElements/GraphItem.cpp sources/GuiElements/GraphItem.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\GraphItem.o sources\GuiElements\GraphItem.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/GraphItem.o sources/GuiElements/GraphItem.cpp release/GraphRulerWidget.o: sources/GuiElements/GraphRulerWidget.cpp sources/GuiElements/GraphRulerWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\GraphRulerWidget.o sources\GuiElements\GraphRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/GraphRulerWidget.o sources/GuiElements/GraphRulerWidget.cpp release/ZTData.o: sources/ZTData.cpp sources/ZTData.h \ sources/GlobalDefine.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ZTData.o sources\ZTData.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ZTData.o sources/ZTData.cpp release/LogMgr.o: sources/LogMgr.cpp sources/LogMgr.h \ sources/ZTData.h \ @@ -488,47 +488,47 @@ release/LogMgr.o: sources/LogMgr.cpp sources/LogMgr.h \ sources/Settings.h \ sources/TCPProtocol.h \ sources/ZTLogFilesMgr.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\LogMgr.o sources\LogMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/LogMgr.o sources/LogMgr.cpp release/TrainLogFileMgr.o: sources/TrainLogFileMgr.cpp sources/TrainLogFileMgr.h \ sources/GlobalDefine.h \ sources/ZTData.h \ sources/LogMgr.h \ sources/DirParserThread.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\TrainLogFileMgr.o sources\TrainLogFileMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/TrainLogFileMgr.o sources/TrainLogFileMgr.cpp release/LogsListPage.o: sources/GuiElements/LogsListPage.cpp sources/GuiElements/LogsListPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\LogsListPage.o sources\GuiElements\LogsListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/LogsListPage.o sources/GuiElements/LogsListPage.cpp release/OptionsPage.o: sources/GuiElements/OptionsPage.cpp sources/GuiElements/OptionsPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\OptionsPage.o sources\GuiElements\OptionsPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/OptionsPage.o sources/GuiElements/OptionsPage.cpp release/Settings.o: sources/Settings.cpp sources/Settings.h \ sources/GlobalDefine.h \ sources/ZTData.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\Settings.o sources\Settings.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/Settings.o sources/Settings.cpp release/NetworkZTListPage.o: sources/GuiElements/NetworkZTListPage.cpp sources/GuiElements/NetworkZTListPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\NetworkZTListPage.o sources\GuiElements\NetworkZTListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/NetworkZTListPage.o sources/GuiElements/NetworkZTListPage.cpp release/ToggleTextButtonWidget.o: sources/GuiElements/ToggleTextButtonWidget.cpp sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ToggleTextButtonWidget.o sources\GuiElements\ToggleTextButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ToggleTextButtonWidget.o sources/GuiElements/ToggleTextButtonWidget.cpp release/NetworkCtrlPage.o: sources/GuiElements/NetworkCtrlPage.cpp sources/GuiElements/NetworkCtrlPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/TxRxWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\NetworkCtrlPage.o sources\GuiElements\NetworkCtrlPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/NetworkCtrlPage.o sources/GuiElements/NetworkCtrlPage.cpp release/NetworkManager.o: sources/NetworkManager.cpp sources/NetworkManager.h \ sources/GlobalDefine.h \ @@ -542,54 +542,54 @@ release/NetworkManager.o: sources/NetworkManager.cpp sources/NetworkManager.h \ sources/TrainLogFileMgr.h \ sources/Settings.h \ sources/ZTLogFilesMgr.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\NetworkManager.o sources\NetworkManager.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/NetworkManager.o sources/NetworkManager.cpp release/TxRxWidget.o: sources/GuiElements/TxRxWidget.cpp sources/GuiElements/TxRxWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\TxRxWidget.o sources\GuiElements\TxRxWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/TxRxWidget.o sources/GuiElements/TxRxWidget.cpp release/TCPProtocol.o: sources/TCPProtocol.cpp sources/TCPProtocol.h \ sources/GlobalDefine.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\TCPProtocol.o sources\TCPProtocol.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/TCPProtocol.o sources/TCPProtocol.cpp release/RemoteZTPage.o: sources/GuiElements/RemoteZTPage.cpp sources/GuiElements/RemoteZTPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/ToggleTextButtonWidget.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\RemoteZTPage.o sources\GuiElements\RemoteZTPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/RemoteZTPage.o sources/GuiElements/RemoteZTPage.cpp release/ZTLogViewerPage.o: sources/GuiElements/ZTLogViewerPage.cpp sources/GuiElements/ZTLogViewerPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ZTLogViewerPage.o sources\GuiElements\ZTLogViewerPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ZTLogViewerPage.o sources/GuiElements/ZTLogViewerPage.cpp release/ProgressBarPage.o: sources/GuiElements/ProgressBarPage.cpp sources/GuiElements/ProgressBarPage.h \ sources/GuiElements/Guipage.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ProgressBarPage.o sources\GuiElements\ProgressBarPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ProgressBarPage.o sources/GuiElements/ProgressBarPage.cpp release/RemoteZTCtrlPage.o: sources/GuiElements/RemoteZTCtrlPage.cpp sources/GuiElements/RemoteZTCtrlPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/TextButtonWidget.h \ sources/GuiElements/ToggleButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\RemoteZTCtrlPage.o sources\GuiElements\RemoteZTCtrlPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/RemoteZTCtrlPage.o sources/GuiElements/RemoteZTCtrlPage.cpp release/ToggleButtonWidget.o: sources/GuiElements/ToggleButtonWidget.cpp sources/GuiElements/ToggleButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ToggleButtonWidget.o sources\GuiElements\ToggleButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ToggleButtonWidget.o sources/GuiElements/ToggleButtonWidget.cpp release/UDPProtocol.o: sources/UDPProtocol.cpp sources/UDPProtocol.h \ sources/GlobalDefine.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\UDPProtocol.o sources\UDPProtocol.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/UDPProtocol.o sources/UDPProtocol.cpp release/DatabaseMgrPage.o: sources/GuiElements/DatabaseMgrPage.cpp sources/GuiElements/DatabaseMgrPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\DatabaseMgrPage.o sources\GuiElements\DatabaseMgrPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DatabaseMgrPage.o sources/GuiElements/DatabaseMgrPage.cpp release/ZTLogsListPage.o: sources/GuiElements/ZTLogsListPage.cpp sources/GuiElements/ZTLogsListPage.h \ sources/GuiElements/Guipage.h \ sources/GuiElements/PushButton.h \ sources/GuiElements/TextButtonWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ZTLogsListPage.o sources\GuiElements\ZTLogsListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ZTLogsListPage.o sources/GuiElements/ZTLogsListPage.cpp release/ZTLogFilesMgr.o: sources/ZTLogFilesMgr.cpp sources/ZTLogFilesMgr.h \ sources/ZTData.h \ @@ -601,103 +601,103 @@ release/ZTLogFilesMgr.o: sources/ZTLogFilesMgr.cpp sources/ZTLogFilesMgr.h \ sources/LogMgr.h \ sources/Settings.h \ sources/TCPProtocol.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ZTLogFilesMgr.o sources\ZTLogFilesMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/ZTLogFilesMgr.o sources/ZTLogFilesMgr.cpp release/DirParserThread.o: sources/DirParserThread.cpp sources/DirParserThread.h \ sources/GlobalDefine.h \ sources/TrainLogFileMgr.h \ sources/ZTData.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\DirParserThread.o sources\DirParserThread.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/DirParserThread.o sources/DirParserThread.cpp release/moc_OutilZT.o: release/moc_OutilZT.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_OutilZT.o release\moc_OutilZT.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_OutilZT.o release/moc_OutilZT.cpp release/moc_MainPanel.o: release/moc_MainPanel.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_MainPanel.o release\moc_MainPanel.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_MainPanel.o release/moc_MainPanel.cpp release/moc_MainPage.o: release/moc_MainPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_MainPage.o release\moc_MainPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_MainPage.o release/moc_MainPage.cpp release/moc_Guipage.o: release/moc_Guipage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_Guipage.o release\moc_Guipage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_Guipage.o release/moc_Guipage.cpp release/moc_PushButton.o: release/moc_PushButton.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_PushButton.o release\moc_PushButton.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_PushButton.o release/moc_PushButton.cpp release/moc_LogViewPage.o: release/moc_LogViewPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_LogViewPage.o release\moc_LogViewPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_LogViewPage.o release/moc_LogViewPage.cpp release/moc_TextButtonWidget.o: release/moc_TextButtonWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_TextButtonWidget.o release\moc_TextButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_TextButtonWidget.o release/moc_TextButtonWidget.cpp release/moc_RankRulerWidget.o: release/moc_RankRulerWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_RankRulerWidget.o release\moc_RankRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_RankRulerWidget.o release/moc_RankRulerWidget.cpp release/moc_GraphCursorWidget.o: release/moc_GraphCursorWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_GraphCursorWidget.o release\moc_GraphCursorWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_GraphCursorWidget.o release/moc_GraphCursorWidget.cpp release/moc_EventsRulerWidget.o: release/moc_EventsRulerWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_EventsRulerWidget.o release\moc_EventsRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_EventsRulerWidget.o release/moc_EventsRulerWidget.cpp release/moc_AnalogGraphItem.o: release/moc_AnalogGraphItem.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_AnalogGraphItem.o release\moc_AnalogGraphItem.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_AnalogGraphItem.o release/moc_AnalogGraphItem.cpp release/moc_GraphItem.o: release/moc_GraphItem.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_GraphItem.o release\moc_GraphItem.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_GraphItem.o release/moc_GraphItem.cpp release/moc_GraphRulerWidget.o: release/moc_GraphRulerWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_GraphRulerWidget.o release\moc_GraphRulerWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_GraphRulerWidget.o release/moc_GraphRulerWidget.cpp release/moc_LogMgr.o: release/moc_LogMgr.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_LogMgr.o release\moc_LogMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_LogMgr.o release/moc_LogMgr.cpp release/moc_LogsListPage.o: release/moc_LogsListPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_LogsListPage.o release\moc_LogsListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_LogsListPage.o release/moc_LogsListPage.cpp release/moc_OptionsPage.o: release/moc_OptionsPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_OptionsPage.o release\moc_OptionsPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_OptionsPage.o release/moc_OptionsPage.cpp release/moc_NetworkZTListPage.o: release/moc_NetworkZTListPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_NetworkZTListPage.o release\moc_NetworkZTListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_NetworkZTListPage.o release/moc_NetworkZTListPage.cpp release/moc_ToggleTextButtonWidget.o: release/moc_ToggleTextButtonWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_ToggleTextButtonWidget.o release\moc_ToggleTextButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ToggleTextButtonWidget.o release/moc_ToggleTextButtonWidget.cpp release/moc_NetworkCtrlPage.o: release/moc_NetworkCtrlPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_NetworkCtrlPage.o release\moc_NetworkCtrlPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_NetworkCtrlPage.o release/moc_NetworkCtrlPage.cpp release/moc_NetworkManager.o: release/moc_NetworkManager.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_NetworkManager.o release\moc_NetworkManager.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_NetworkManager.o release/moc_NetworkManager.cpp release/moc_TxRxWidget.o: release/moc_TxRxWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_TxRxWidget.o release\moc_TxRxWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_TxRxWidget.o release/moc_TxRxWidget.cpp release/moc_RemoteZTPage.o: release/moc_RemoteZTPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_RemoteZTPage.o release\moc_RemoteZTPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_RemoteZTPage.o release/moc_RemoteZTPage.cpp release/moc_ZTLogViewerPage.o: release/moc_ZTLogViewerPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_ZTLogViewerPage.o release\moc_ZTLogViewerPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ZTLogViewerPage.o release/moc_ZTLogViewerPage.cpp release/moc_ProgressBarPage.o: release/moc_ProgressBarPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_ProgressBarPage.o release\moc_ProgressBarPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ProgressBarPage.o release/moc_ProgressBarPage.cpp release/moc_RemoteZTCtrlPage.o: release/moc_RemoteZTCtrlPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_RemoteZTCtrlPage.o release\moc_RemoteZTCtrlPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_RemoteZTCtrlPage.o release/moc_RemoteZTCtrlPage.cpp release/moc_ToggleButtonWidget.o: release/moc_ToggleButtonWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_ToggleButtonWidget.o release\moc_ToggleButtonWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ToggleButtonWidget.o release/moc_ToggleButtonWidget.cpp release/moc_DatabaseMgrPage.o: release/moc_DatabaseMgrPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_DatabaseMgrPage.o release\moc_DatabaseMgrPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DatabaseMgrPage.o release/moc_DatabaseMgrPage.cpp release/moc_ZTLogsListPage.o: release/moc_ZTLogsListPage.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_ZTLogsListPage.o release\moc_ZTLogsListPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ZTLogsListPage.o release/moc_ZTLogsListPage.cpp release/moc_ZTLogFilesMgr.o: release/moc_ZTLogFilesMgr.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_ZTLogFilesMgr.o release\moc_ZTLogFilesMgr.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_ZTLogFilesMgr.o release/moc_ZTLogFilesMgr.cpp release/moc_DirParserThread.o: release/moc_DirParserThread.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_DirParserThread.o release\moc_DirParserThread.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/moc_DirParserThread.o release/moc_DirParserThread.cpp ####### Install diff --git a/sources/DirParserThread.cpp b/sources/DirParserThread.cpp index dd258a0..90362af 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: ",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/GuiElements/DatabaseMgrPage.cpp b/sources/GuiElements/DatabaseMgrPage.cpp index 70fcec5..d630cff 100644 --- a/sources/GuiElements/DatabaseMgrPage.cpp +++ b/sources/GuiElements/DatabaseMgrPage.cpp @@ -731,6 +731,8 @@ int CDatabaseImporterThread::ArchiveDB() } + delete m7zipProcess; + int IgnoredFiles = 0; diff --git a/sources/GuiElements/LogsListPage.cpp b/sources/GuiElements/LogsListPage.cpp index 9fef110..25f8f61 100644 --- a/sources/GuiElements/LogsListPage.cpp +++ b/sources/GuiElements/LogsListPage.cpp @@ -514,12 +514,34 @@ void CLogsListPage::LogsTableCellClicked(int row, int column) Problem = "NON"; } MeanSpeed = ZT1LogElement->mMeanSpeed; - 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(), - CZTData::GetTrainTypeString(ZT1LogElement->mTrainType), - ZT1LogElement->mNbElements, - Problem.toAscii().data()); + + QString TrainType = CZTData::GetModbusTrainTypeString(ZT1LogElement->mFlags.mModbusTrainType); + if(TrainType == "Inconnu") + { + TrainType = CZTData::GetTrainTypeString(ZT1LogElement->mTrainType); + } + + QString TrainCompo = "Non Disponible"; + if(ZT1LogElement->mFlags.mTrainCompo1 != 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")\ + .arg(ZT1LogElement->mPassageDateTime.toString("yyyy/MM/dd"))\ + .arg(ZT1LogElement->mPassageDateTime.toString("hh:mm:ss"))\ + .arg(TrainType)\ + .arg(ZT1LogElement->mNbElements)\ + .arg(Problem) + .arg(TrainCompo); +// 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(), +// CZTData::GetTrainTypeString(ZT1LogElement->mTrainType), +// ZT1LogElement->mNbElements, +// Problem.toAscii().data()); if(ZT1LogElement->mZTDetections.size() > 0) { @@ -570,11 +592,29 @@ void CLogsListPage::LogsTableCellClicked(int row, int column) { Problem = "NON"; } - Summary.sprintf("Statistiques du passage:\n\nDate: %s\nHeure: %s\nZone Test: ZT2\nNombre d'éléments: %d\nProblématique: %s\n\n\n\nDéclenchements: \n", - ZT2LogElement->mPassageDateTime.toString("yyyy/MM/dd").toAscii().data(), - ZT2LogElement->mPassageDateTime.toString("hh:mm:ss").toAscii().data(), - ZT2LogElement->mNbElements, - Problem.toAscii().data()); +// Summary.sprintf("Statistiques du passage:\n\nDate: %s\nHeure: %s\nZone Test: ZT2\nNombre d'éléments: %d\nProblématique: %s\n\n\n\nDéclenchements: \n", +// ZT2LogElement->mPassageDateTime.toString("yyyy/MM/dd").toAscii().data(), +// ZT2LogElement->mPassageDateTime.toString("hh:mm:ss").toAscii().data(), +// ZT2LogElement->mNbElements, +// Problem.toAscii().data()); + + QString TrainType = CZTData::GetModbusTrainTypeString(ZT2LogElement->mFlags.mModbusTrainType); + + QString TrainCompo = "Non Disponible"; + if(ZT2LogElement->mFlags.mTrainCompo1 != 0) + { + TrainCompo = QString("%1-%2-%3").arg(ZT2LogElement->mFlags.mTrainCompo1)\ + .arg(ZT2LogElement->mFlags.mTrainCompo2) + .arg(ZT2LogElement->mFlags.mTrainCompo3); + } + + Summary = QString("Passage:\n\nDate: %1\nHeure: %2\nZone Test : ZT2\nTrain : %3\nCompo: %6\nNombre d'éléments: %4\nProblématique: %5\n\n\nDéclenchements: \n")\ + .arg(ZT2LogElement->mPassageDateTime.toString("yyyy/MM/dd"))\ + .arg(ZT2LogElement->mPassageDateTime.toString("hh:mm:ss"))\ + .arg(TrainType)\ + .arg(ZT2LogElement->mNbElements)\ + .arg(Problem) + .arg(TrainCompo); if(ZT2LogElement->mZTDetections.size() > 0) { diff --git a/sources/LogMgr.h b/sources/LogMgr.h index dce340c..b912009 100644 --- a/sources/LogMgr.h +++ b/sources/LogMgr.h @@ -61,6 +61,7 @@ public: CZT1FlagsData mFlags; QString mStationName; bool mFileProtected; + int mFileVersion; }; //QDataStream &operator<<(QDataStream &out, const CZT1LogElement &source); //QDataStream &operator>>(QDataStream &in, CZT1LogElement &dest); diff --git a/sources/TrainLogFileMgr.cpp b/sources/TrainLogFileMgr.cpp index 2ded831..f407fb7 100644 --- a/sources/TrainLogFileMgr.cpp +++ b/sources/TrainLogFileMgr.cpp @@ -292,9 +292,27 @@ CLogElement* CTrainLogFileMgr::OpenTrainLog(QString LogFilePathName,unsigned int LogFileVersion = 2; FileProtected = true; } + else if(MagicNbr == 0xDEADBEEF+15) + { + LogFileVersion = 3; + + qint32 OutilZTFlags[10]; + for(int i = 0; i < 10; i++) + { + *InputStream >> OutilZTFlags[i]; + } + + if(OutilZTFlags[OUTILZT_FILE_PROTECTED_FLAG] == 1) + { + FileProtected = true; + } + else + { + FileProtected = false; + } + } else { - qDebug(QString().sprintf("Fichier de passage invalide (Magic number) %s",LogFilePathName.toAscii().data()).toAscii().data()); BinaryLogFile->close(); delete BinaryLogFile; @@ -331,8 +349,27 @@ CLogElement* CTrainLogFileMgr::OpenTrainLog(QString LogFilePathName,unsigned int >> PassageLog->mFlags.mPGCalibrationON >> PassageLog->mFlags.mPGTresholdValue >> PassageLog->mFlags.mAnalogTracePresent; + + PassageLog->mFlags.mTrainCompo1 = 0; + PassageLog->mFlags.mTrainCompo2 = 0; + PassageLog->mFlags.mTrainCompo3 = 0; + PassageLog->mFlags.mModbusTrainType = MODBUS_CC_TRAIN_TYPE_INVALID_NOT_UPDATED; } else if(LogFileVersion == 2) + { + *InputStream >> PassageLog->mFlags.mExtPGOffset + >> PassageLog->mFlags.mIntPGOffset + >> PassageLog->mFlags.mPGCalibrationON + >> PassageLog->mFlags.mPGTresholdValue + >> PassageLog->mFlags.mAnalogTracePresent + >> PassageLog->mFlags.mIsProblematicPassage; + + PassageLog->mFlags.mTrainCompo1 = 0; + PassageLog->mFlags.mTrainCompo2 = 0; + PassageLog->mFlags.mTrainCompo3 = 0; + PassageLog->mFlags.mModbusTrainType = MODBUS_CC_TRAIN_TYPE_INVALID_NOT_UPDATED; + } + else if(LogFileVersion == 3) { *InputStream >> PassageLog->mFlags; } @@ -371,9 +408,6 @@ CLogElement* CTrainLogFileMgr::OpenTrainLog(QString LogFilePathName,unsigned int #endif } - - - BinaryLogFile->close(); delete BinaryLogFile; delete InputStream; @@ -400,12 +434,24 @@ CLogElement* CTrainLogFileMgr::OpenTrainLog(QString LogFilePathName,unsigned int *InputStream >> NbDetections; *InputStream >> PassageLog->mStationName; if(LogFileVersion == 2) + { + *InputStream >> PassageLog->mFlags.mIsProblematicPassage; + PassageLog->mFlags.mModbusTrainType = MODBUS_CC_TRAIN_TYPE_INVALID_NOT_UPDATED; + PassageLog->mFlags.mTrainCompo1 = 0; + PassageLog->mFlags.mTrainCompo2 = 0; + PassageLog->mFlags.mTrainCompo3 = 0; + } + else if(LogFileVersion == 3) { *InputStream >> PassageLog->mFlags; } else { PassageLog->mFlags.mIsProblematicPassage = 2; + PassageLog->mFlags.mModbusTrainType = MODBUS_CC_TRAIN_TYPE_INVALID_NOT_UPDATED; + PassageLog->mFlags.mTrainCompo1 = 0; + PassageLog->mFlags.mTrainCompo2 = 0; + PassageLog->mFlags.mTrainCompo3 = 0; } *InputStream >> NbElements; *InputStream >> DateTime; @@ -475,7 +521,7 @@ unsigned int CTrainLogFileMgr::SetTrainLogProtected(bool IsProtected, QString Lo *Stream >> MagicNbr; - BinaryLogFile->seek(0); + if(IsProtected == true) { @@ -487,8 +533,27 @@ unsigned int CTrainLogFileMgr::SetTrainLogProtected(bool IsProtected, QString Lo else if(MagicNbr == 0xDEADBEEF || MagicNbr == 0xDEADBEEF + 1) { MagicNbr += 2; + BinaryLogFile->seek(0); *Stream << MagicNbr; } + else if(MagicNbr == 0xDEADBEEF + 15) + { + //Use the reserved registers inside the file... + qint32 Flags[10]; + for(int i = 0; i < 10; i++) + { + *Stream >> Flags[i]; + } + + Flags[OUTILZT_FILE_PROTECTED_FLAG] = 1; + BinaryLogFile->seek(0); + *Stream >> MagicNbr; //Dummy read; + + for(int i = 0; i < 10; i++) + { + *Stream << Flags[i]; + } + } else { //Log File Error @@ -504,6 +569,7 @@ unsigned int CTrainLogFileMgr::SetTrainLogProtected(bool IsProtected, QString Lo { //file is already protected MagicNbr -= 2; + BinaryLogFile->seek(0); *Stream << MagicNbr; } @@ -511,6 +577,24 @@ unsigned int CTrainLogFileMgr::SetTrainLogProtected(bool IsProtected, QString Lo { //file is already unprotected } + else if(MagicNbr == 0xDEADBEEF + 15) + { + //Use the reserved registers inside the file... + qint32 Flags[10]; + for(int i = 0; i < 10; i++) + { + *Stream >> Flags[i]; + } + + Flags[OUTILZT_FILE_PROTECTED_FLAG] = 0; + BinaryLogFile->seek(0); + *Stream >> MagicNbr; //Dummy read; + + for(int i = 0; i < 10; i++) + { + *Stream << Flags[i]; + } + } else { //Log File Error diff --git a/sources/ZTData.cpp b/sources/ZTData.cpp index 2a52884..c5fe46f 100644 --- a/sources/ZTData.cpp +++ b/sources/ZTData.cpp @@ -82,6 +82,42 @@ const char* CZTData::GetTrainTypeString(unsigned int TrainType) return TrainTypeString[TrainType]; } +const char* CZTData::GetModbusTrainTypeString(unsigned int TrainType) +{ + switch(TrainType) + { + case MODBUS_CC_TRAIN_TYPE_MR63: + { + return "MR63"; + break; + } + case MODBUS_CC_TRAIN_TYPE_MR73: + { + return "MR73"; + break; + } + case MODBUS_CC_TRAIN_TYPE_MPM10: + { + return "MPM10"; + break; + } + case MODBUS_CC_TRAIN_TYPE_MAINTENANCE: + { + return "Vehicule Travaux"; + break; + } + case MODBUS_CC_TRAIN_TYPE_INVALID_ATS_OFFLINE: + case MODBUS_CC_TRAIN_TYPE_INVALID_SERVICE_REBOOT: + case MODBUS_CC_TRAIN_TYPE_INVALID_NOT_UPDATED: + case MODBUS_CC_TRAIN_TYPE_INVALID_SACL_OFFLINE: + default: + { + return "Inconnu"; + break; + } + } +} + CZT1LogData::CZT1LogData(CZT1ThreadData *ThreadData): mZT1ThreadData(ThreadData) @@ -130,7 +166,19 @@ QDataStream &operator<<(QDataStream &out, const CZT1FlagsData &source) << source.mPGTresholdValue << source.mAnalogTracePresent << source.mIsProblematicPassage - ; + << source.mTrainCompo1 + << source.mTrainCompo2 + << source.mTrainCompo3 + << source.mModbusTrainType + << source.mUnusedFlag12 + << source.mUnusedFlag13 + << source.mUnusedFlag14 + << source.mUnusedFlag15 + << source.mUnusedFlag16 + << source.mUnusedFlag17 + << source.mUnusedFlag18 + << source.mUnusedFlag19 + << source.mUnusedFlag20; return out; } @@ -143,7 +191,19 @@ QDataStream &operator>>(QDataStream &in, CZT1FlagsData &dest) >> dest.mPGTresholdValue >> dest.mAnalogTracePresent >> dest.mIsProblematicPassage - ; + >> dest.mTrainCompo1 + >> dest.mTrainCompo2 + >> dest.mTrainCompo3 + >> dest.mModbusTrainType + >> dest.mUnusedFlag12 + >> dest.mUnusedFlag13 + >> dest.mUnusedFlag14 + >> dest.mUnusedFlag15 + >> dest.mUnusedFlag16 + >> dest.mUnusedFlag17 + >> dest.mUnusedFlag18 + >> dest.mUnusedFlag19 + >> dest.mUnusedFlag20; return in; } @@ -245,7 +305,15 @@ CZT2LogData::~CZT2LogData() QDataStream &operator<<(QDataStream &out, const CZT2FlagsData &source) { out << source.mIsProblematicPassage - ; + << source.mTrainCompo1 + << source.mTrainCompo2 + << source.mTrainCompo3 + << source.mModbusTrainType + << source.mUnusedFlag6 + << source.mUnusedFlag7 + << source.mUnusedFlag8 + << source.mUnusedFlag9 + << source.mUnusedFlag10; return out; } @@ -253,7 +321,15 @@ QDataStream &operator<<(QDataStream &out, const CZT2FlagsData &source) QDataStream &operator>>(QDataStream &in, CZT2FlagsData &dest) { in >> dest.mIsProblematicPassage - ; + >> dest.mTrainCompo1 + >> dest.mTrainCompo2 + >> dest.mTrainCompo3 + >> dest.mModbusTrainType + >> dest.mUnusedFlag6 + >> dest.mUnusedFlag7 + >> dest.mUnusedFlag8 + >> dest.mUnusedFlag9 + >> dest.mUnusedFlag10;; return in; } diff --git a/sources/ZTData.h b/sources/ZTData.h index b388fd9..0bec354 100644 --- a/sources/ZTData.h +++ b/sources/ZTData.h @@ -102,6 +102,35 @@ enum eTrainTypeID TRAIN_TYPE_MAX_ID }; +enum eOutilZTFlagsIndex +{ + OUTILZT_FILE_PROTECTED_FLAG, + OUTILSZT_UNUSED_FLAG_2, + OUTILSZT_UNUSED_FLAG_3, + OUTILSZT_UNUSED_FLAG_4, + OUTILSZT_UNUSED_FLAG_5, + OUTILSZT_UNUSED_FLAG_6, + OUTILSZT_UNUSED_FLAG_7, + OUTILSZT_UNUSED_FLAG_8, + OUTILSZT_UNUSED_FLAG_9, + OUTILSZT_UNUSED_FLAG_10 +}; + +enum eModbusCCTrainTypes +{ + MODBUS_CC_TRAIN_TYPE_MR63 = 63, + MODBUS_CC_TRAIN_TYPE_MR73 = 73, + MODBUS_CC_TRAIN_TYPE_MPM10 = 10, + MODBUS_CC_TRAIN_TYPE_MAINTENANCE = 0, + MODBUS_CC_TRAIN_TYPE_INVALID_ATS_OFFLINE = 98, + MODBUS_CC_TRAIN_TYPE_INVALID_SERVICE_REBOOT = 97, + MODBUS_CC_TRAIN_TYPE_INVALID_NOT_UPDATED = 99, + MODBUS_CC_TRAIN_TYPE_INVALID_SACL_OFFLINE = 96, + + MODBUS_CC_TRAIN_TYPE_MAX_VALUE +}; + + enum eZT1FlagsID { ZT1_INT_PG_OFFSET_FLAG_ID, @@ -138,6 +167,7 @@ public: static const char *TrainTypeString[]; static const char *GetTrainTypeString(unsigned int TrainType); + static const char *GetModbusTrainTypeString(unsigned int TrainType); }; @@ -180,6 +210,19 @@ public: qint32 mPGCalibrationON; qint32 mAnalogTracePresent; qint32 mIsProblematicPassage; //This flag will be set if problems have been detected but not sent to PCC due to PURE comitee rules. + qint32 mTrainCompo1; + qint32 mTrainCompo2; + qint32 mTrainCompo3; + qint32 mModbusTrainType; + qint32 mUnusedFlag12; + qint32 mUnusedFlag13; + qint32 mUnusedFlag14; + qint32 mUnusedFlag15; + qint32 mUnusedFlag16; + qint32 mUnusedFlag17; + qint32 mUnusedFlag18; + qint32 mUnusedFlag19; + qint32 mUnusedFlag20; }; QDataStream &operator<<(QDataStream &out, const CZT1FlagsData &source); @@ -245,6 +288,15 @@ class CZT2FlagsData { public: qint32 mIsProblematicPassage; //This flag will be set if problems have been detected but not sent to PCC due to PURE comitee rules. + qint32 mTrainCompo1; + qint32 mTrainCompo2; + qint32 mTrainCompo3; + qint32 mModbusTrainType; + qint32 mUnusedFlag6; + qint32 mUnusedFlag7; + qint32 mUnusedFlag8; + qint32 mUnusedFlag9; + qint32 mUnusedFlag10; }; QDataStream &operator<<(QDataStream &out, const CZT2FlagsData &source);