From ea4c6769f4e7bd13c8cdcc74685bdfe7aa38849d Mon Sep 17 00:00:00 2001 From: JF Date: Fri, 3 May 2019 13:46:54 -0400 Subject: [PATCH] Dev --- CableTestBench.pro | 12 +- CableTestBench.pro.user | 2 +- Makefile | 2 +- Makefile.Debug | 66 +++++-- Makefile.Release | 66 +++++-- Sources/CableTestBench.cpp | 5 + Sources/CableTestBench.h | 3 + Sources/CableTestBenchDefs.cpp | 61 ++++++ Sources/CableTestBenchDefs.h | 85 ++------- Sources/CableTestEngine.h | 8 + Sources/CableTestPage.ui | 2 +- Sources/Connector.cpp | 9 +- Sources/Connector.h | 4 + Sources/IOModulesInterface.cpp | 37 ++++ Sources/IOModulesInterface.h | 18 ++ Sources/MainPage.cpp | 28 +-- Sources/MainPage.h | 1 + Sources/MainWindow.cpp | 15 +- Sources/MainWindow.h | 2 + Sources/OptionsPage.cpp | 16 ++ Sources/OptionsPage.h | 26 +++ Sources/OptionsPage.ui | 221 ++++++++++++++++++++++ Sources/Widgets/ConnectorSelectWidget.cpp | 7 +- object_script.CableTestBench.Debug | 5 + object_script.CableTestBench.Release | 5 + ui_CMainPage.h | 2 +- ui_CableTestPage.h | 4 +- ui_OptionsPage.h | 129 +++++++++++++ ui_VisualInspectionPage.h | 2 +- 29 files changed, 713 insertions(+), 130 deletions(-) create mode 100644 Sources/CableTestBenchDefs.cpp create mode 100644 Sources/IOModulesInterface.cpp create mode 100644 Sources/IOModulesInterface.h create mode 100644 Sources/OptionsPage.cpp create mode 100644 Sources/OptionsPage.h create mode 100644 Sources/OptionsPage.ui create mode 100644 ui_OptionsPage.h diff --git a/CableTestBench.pro b/CableTestBench.pro index 88801c8..2edc036 100644 --- a/CableTestBench.pro +++ b/CableTestBench.pro @@ -30,7 +30,10 @@ SOURCES += \ Sources/Cable.cpp \ Sources/VisualInspectionResult.cpp \ Sources/TestReport.cpp \ - Sources/CableTestEngine.cpp + Sources/CableTestEngine.cpp \ + Sources/OptionsPage.cpp \ + Sources/CableTestBenchDefs.cpp \ + Sources/IOModulesInterface.cpp HEADERS += \ Sources/MainWindow.h \ @@ -48,12 +51,15 @@ HEADERS += \ Sources/Cable.h \ Sources/VisualInspectionResult.h \ Sources/TestReport.h \ - Sources/CableTestEngine.h + Sources/CableTestEngine.h \ + Sources/OptionsPage.h \ + Sources/IOModulesInterface.h FORMS += \ Sources/CMainPage.ui \ Sources/VisualInspectionPage.ui \ - Sources/CableTestPage.ui + Sources/CableTestPage.ui \ + Sources/OptionsPage.ui win32:CONFIG(release, debug|release): LIBS += -L$$PWD/Sources/SeaMaxWin/Lib/ -lSeaMAX else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/Sources/SeaMaxWin/Lib/ -lSeaMAX diff --git a/CableTestBench.pro.user b/CableTestBench.pro.user index 2108df9..a7f3e51 100644 --- a/CableTestBench.pro.user +++ b/CableTestBench.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/Makefile b/Makefile index 3e6bef2..a7b9b7a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: CableTestBench -# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu May 2 14:55:50 2019 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Fri May 3 13:12:37 2019 # Project: CableTestBench.pro # Template: app # Command: c:\Qt\4.8.1\bin\qmake.exe -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=declarative_debug -o Makefile CableTestBench.pro diff --git a/Makefile.Debug b/Makefile.Debug index d926d57..477a3b8 100644 --- a/Makefile.Debug +++ b/Makefile.Debug @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: CableTestBench -# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu May 2 14:55:50 2019 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Fri May 3 13:12:37 2019 # Project: CableTestBench.pro # Template: app ############################################################################# @@ -54,7 +54,11 @@ SOURCES = Sources\MainWindow.cpp \ Sources\Connector.cpp \ Sources\Cable.cpp \ Sources\VisualInspectionResult.cpp \ - Sources\TestReport.cpp debug\moc_MainWindow.cpp \ + Sources\TestReport.cpp \ + Sources\CableTestEngine.cpp \ + Sources\OptionsPage.cpp \ + Sources\CableTestBenchDefs.cpp \ + Sources\IOModulesInterface.cpp debug\moc_MainWindow.cpp \ debug\moc_MainPage.cpp \ debug\moc_CableTestBench.cpp \ debug\moc_VisualInspectionPage.cpp \ @@ -62,7 +66,8 @@ SOURCES = Sources\MainWindow.cpp \ debug\moc_CableTestPage.cpp \ debug\moc_ConnectorClickZoneWidget.cpp \ debug\moc_ONOFFStatusWidget.cpp \ - debug\moc_ConnectorTestVisualizationWidget.cpp + debug\moc_ConnectorTestVisualizationWidget.cpp \ + debug\moc_OptionsPage.cpp OBJECTS = debug/MainWindow.o \ debug/main.o \ debug/MainPage.o \ @@ -77,6 +82,10 @@ OBJECTS = debug/MainWindow.o \ debug/Cable.o \ debug/VisualInspectionResult.o \ debug/TestReport.o \ + debug/CableTestEngine.o \ + debug/OptionsPage.o \ + debug/CableTestBenchDefs.o \ + debug/IOModulesInterface.o \ debug/moc_MainWindow.o \ debug/moc_MainPage.o \ debug/moc_CableTestBench.o \ @@ -85,7 +94,8 @@ OBJECTS = debug/MainWindow.o \ debug/moc_CableTestPage.o \ debug/moc_ConnectorClickZoneWidget.o \ debug/moc_ONOFFStatusWidget.o \ - debug/moc_ConnectorTestVisualizationWidget.o + debug/moc_ConnectorTestVisualizationWidget.o \ + debug/moc_OptionsPage.o DIST = QMAKE_TARGET = CableTestBench DESTDIR = debug\ #avoid trailing-slash linebreak @@ -113,7 +123,7 @@ DESTDIR_TARGET = debug\CableTestBench.exe first: all all: Makefile.Debug $(DESTDIR_TARGET) -$(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h $(OBJECTS) +$(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h ui_OptionsPage.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.CableTestBench.Debug $(LIBS) qmake: FORCE @@ -123,7 +133,7 @@ dist: $(ZIP) CableTestBench.zip $(SOURCES) $(DIST) CableTestBench.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\MainWindow.o debug\main.o debug\MainPage.o debug\CableTestBench.o debug\VisualInspectionPage.o debug\ConnectorSelectWidget.o debug\CableTestPage.o debug\ConnectorClickZoneWidget.o debug\ONOFFStatusWidget.o debug\ConnectorTestVisualizationWidget.o debug\Connector.o debug\Cable.o debug\VisualInspectionResult.o debug\TestReport.o debug\moc_MainWindow.o debug\moc_MainPage.o debug\moc_CableTestBench.o debug\moc_VisualInspectionPage.o debug\moc_ConnectorSelectWidget.o debug\moc_CableTestPage.o debug\moc_ConnectorClickZoneWidget.o debug\moc_ONOFFStatusWidget.o debug\moc_ConnectorTestVisualizationWidget.o + -$(DEL_FILE) debug\MainWindow.o debug\main.o debug\MainPage.o debug\CableTestBench.o debug\VisualInspectionPage.o debug\ConnectorSelectWidget.o debug\CableTestPage.o debug\ConnectorClickZoneWidget.o debug\ONOFFStatusWidget.o debug\ConnectorTestVisualizationWidget.o debug\Connector.o debug\Cable.o debug\VisualInspectionResult.o debug\TestReport.o debug\CableTestEngine.o debug\OptionsPage.o debug\CableTestBenchDefs.o debug\IOModulesInterface.o debug\moc_MainWindow.o debug\moc_MainPage.o debug\moc_CableTestBench.o debug\moc_VisualInspectionPage.o debug\moc_ConnectorSelectWidget.o debug\moc_CableTestPage.o debug\moc_ConnectorClickZoneWidget.o debug\moc_ONOFFStatusWidget.o debug\moc_ConnectorTestVisualizationWidget.o debug\moc_OptionsPage.o distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -135,15 +145,16 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: debug/moc_MainWindow.cpp debug/moc_MainPage.cpp debug/moc_CableTestBench.cpp debug/moc_VisualInspectionPage.cpp debug/moc_ConnectorSelectWidget.cpp debug/moc_CableTestPage.cpp debug/moc_ConnectorClickZoneWidget.cpp debug/moc_ONOFFStatusWidget.cpp debug/moc_ConnectorTestVisualizationWidget.cpp +compiler_moc_header_make_all: debug/moc_MainWindow.cpp debug/moc_MainPage.cpp debug/moc_CableTestBench.cpp debug/moc_VisualInspectionPage.cpp debug/moc_ConnectorSelectWidget.cpp debug/moc_CableTestPage.cpp debug/moc_ConnectorClickZoneWidget.cpp debug/moc_ONOFFStatusWidget.cpp debug/moc_ConnectorTestVisualizationWidget.cpp debug/moc_OptionsPage.cpp compiler_moc_header_clean: - -$(DEL_FILE) debug\moc_MainWindow.cpp debug\moc_MainPage.cpp debug\moc_CableTestBench.cpp debug\moc_VisualInspectionPage.cpp debug\moc_ConnectorSelectWidget.cpp debug\moc_CableTestPage.cpp debug\moc_ConnectorClickZoneWidget.cpp debug\moc_ONOFFStatusWidget.cpp debug\moc_ConnectorTestVisualizationWidget.cpp + -$(DEL_FILE) debug\moc_MainWindow.cpp debug\moc_MainPage.cpp debug\moc_CableTestBench.cpp debug\moc_VisualInspectionPage.cpp debug\moc_ConnectorSelectWidget.cpp debug\moc_CableTestPage.cpp debug\moc_ConnectorClickZoneWidget.cpp debug\moc_ONOFFStatusWidget.cpp debug\moc_ConnectorTestVisualizationWidget.cpp debug\moc_OptionsPage.cpp debug/moc_MainWindow.cpp: Sources/MainPage.h \ Sources/VisualInspectionPage.h \ Sources/VisualInspectionResult.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/MainWindow.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\MainWindow.h -o debug\moc_MainWindow.cpp @@ -157,6 +168,7 @@ debug/moc_CableTestBench.cpp: Sources/MainWindow.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h \ @@ -186,6 +198,9 @@ debug/moc_ConnectorTestVisualizationWidget.cpp: Sources/Widgets/ONOFFStatusWidge Sources/Widgets/ConnectorTestVisualizationWidget.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\Widgets\ConnectorTestVisualizationWidget.h -o debug\moc_ConnectorTestVisualizationWidget.cpp +debug/moc_OptionsPage.cpp: Sources/OptionsPage.h + C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\OptionsPage.h -o debug\moc_OptionsPage.cpp + compiler_rcc_make_all: compiler_rcc_clean: compiler_image_collection_make_all: qmake_image_collection.cpp @@ -193,9 +208,9 @@ compiler_image_collection_clean: -$(DEL_FILE) qmake_image_collection.cpp compiler_moc_source_make_all: compiler_moc_source_clean: -compiler_uic_make_all: ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h +compiler_uic_make_all: ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h ui_OptionsPage.h compiler_uic_clean: - -$(DEL_FILE) ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h + -$(DEL_FILE) ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h ui_OptionsPage.h ui_CMainPage.h: Sources/CMainPage.ui c:\Qt\4.8.1\bin\uic.exe Sources\CMainPage.ui -o ui_CMainPage.h @@ -205,6 +220,9 @@ ui_VisualInspectionPage.h: Sources/VisualInspectionPage.ui ui_CableTestPage.h: Sources/CableTestPage.ui c:\Qt\4.8.1\bin\uic.exe Sources\CableTestPage.ui -o ui_CableTestPage.h +ui_OptionsPage.h: Sources/OptionsPage.ui + c:\Qt\4.8.1\bin\uic.exe Sources\OptionsPage.ui -o ui_OptionsPage.h + compiler_yacc_decl_make_all: compiler_yacc_decl_clean: compiler_yacc_impl_make_all: @@ -224,6 +242,7 @@ debug/MainWindow.o: Sources/MainWindow.cpp Sources/MainWindow.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/CableTestBench.h \ Sources/Connector.h \ Sources/Cable.h \ @@ -238,6 +257,7 @@ debug/main.o: Sources/main.cpp Sources/CableTestBench.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h @@ -255,6 +275,7 @@ debug/CableTestBench.o: Sources/CableTestBench.cpp Sources/CableTestBench.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h @@ -269,6 +290,7 @@ debug/VisualInspectionPage.o: Sources/VisualInspectionPage.cpp Sources/VisualIns Sources/MainPage.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h @@ -287,6 +309,7 @@ debug/CableTestPage.o: Sources/CableTestPage.cpp Sources/CableTestPage.h \ Sources/VisualInspectionPage.h \ Sources/VisualInspectionResult.h \ Sources/GlobalDefine.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h @@ -303,7 +326,8 @@ debug/ConnectorTestVisualizationWidget.o: Sources/Widgets/ConnectorTestVisualiza $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ConnectorTestVisualizationWidget.o Sources\Widgets\ConnectorTestVisualizationWidget.cpp debug/Connector.o: Sources/Connector.cpp Sources/Connector.h \ - Sources/CableTestBenchDefs.h + Sources/CableTestBenchDefs.h \ + Sources/GlobalDefine.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\Connector.o Sources\Connector.cpp debug/Cable.o: Sources/Cable.cpp Sources/Cable.h \ @@ -321,6 +345,23 @@ debug/TestReport.o: Sources/TestReport.cpp Sources/TestReport.h \ Sources/VisualInspectionResult.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\TestReport.o Sources\TestReport.cpp +debug/CableTestEngine.o: Sources/CableTestEngine.cpp Sources/CableTestEngine.h \ + Sources/Cable.h \ + Sources/CableTestBenchDefs.h \ + Sources/Connector.h \ + Sources/GlobalDefine.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\CableTestEngine.o Sources\CableTestEngine.cpp + +debug/OptionsPage.o: Sources/OptionsPage.cpp Sources/OptionsPage.h \ + ui_OptionsPage.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\OptionsPage.o Sources\OptionsPage.cpp + +debug/CableTestBenchDefs.o: Sources/CableTestBenchDefs.cpp Sources/CableTestBenchDefs.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\CableTestBenchDefs.o Sources\CableTestBenchDefs.cpp + +debug/IOModulesInterface.o: Sources/IOModulesInterface.cpp Sources/IOModulesInterface.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\IOModulesInterface.o Sources\IOModulesInterface.cpp + debug/moc_MainWindow.o: debug/moc_MainWindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_MainWindow.o debug\moc_MainWindow.cpp @@ -348,6 +389,9 @@ debug/moc_ONOFFStatusWidget.o: debug/moc_ONOFFStatusWidget.cpp debug/moc_ConnectorTestVisualizationWidget.o: debug/moc_ConnectorTestVisualizationWidget.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_ConnectorTestVisualizationWidget.o debug\moc_ConnectorTestVisualizationWidget.cpp +debug/moc_OptionsPage.o: debug/moc_OptionsPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_OptionsPage.o debug\moc_OptionsPage.cpp + ####### Install install: FORCE diff --git a/Makefile.Release b/Makefile.Release index 0abe6ad..d007d3b 100644 --- a/Makefile.Release +++ b/Makefile.Release @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: CableTestBench -# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu May 2 14:55:50 2019 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Fri May 3 13:12:37 2019 # Project: CableTestBench.pro # Template: app ############################################################################# @@ -54,7 +54,11 @@ SOURCES = Sources\MainWindow.cpp \ Sources\Connector.cpp \ Sources\Cable.cpp \ Sources\VisualInspectionResult.cpp \ - Sources\TestReport.cpp release\moc_MainWindow.cpp \ + Sources\TestReport.cpp \ + Sources\CableTestEngine.cpp \ + Sources\OptionsPage.cpp \ + Sources\CableTestBenchDefs.cpp \ + Sources\IOModulesInterface.cpp release\moc_MainWindow.cpp \ release\moc_MainPage.cpp \ release\moc_CableTestBench.cpp \ release\moc_VisualInspectionPage.cpp \ @@ -62,7 +66,8 @@ SOURCES = Sources\MainWindow.cpp \ release\moc_CableTestPage.cpp \ release\moc_ConnectorClickZoneWidget.cpp \ release\moc_ONOFFStatusWidget.cpp \ - release\moc_ConnectorTestVisualizationWidget.cpp + release\moc_ConnectorTestVisualizationWidget.cpp \ + release\moc_OptionsPage.cpp OBJECTS = release/MainWindow.o \ release/main.o \ release/MainPage.o \ @@ -77,6 +82,10 @@ OBJECTS = release/MainWindow.o \ release/Cable.o \ release/VisualInspectionResult.o \ release/TestReport.o \ + release/CableTestEngine.o \ + release/OptionsPage.o \ + release/CableTestBenchDefs.o \ + release/IOModulesInterface.o \ release/moc_MainWindow.o \ release/moc_MainPage.o \ release/moc_CableTestBench.o \ @@ -85,7 +94,8 @@ OBJECTS = release/MainWindow.o \ release/moc_CableTestPage.o \ release/moc_ConnectorClickZoneWidget.o \ release/moc_ONOFFStatusWidget.o \ - release/moc_ConnectorTestVisualizationWidget.o + release/moc_ConnectorTestVisualizationWidget.o \ + release/moc_OptionsPage.o DIST = QMAKE_TARGET = CableTestBench DESTDIR = release\ #avoid trailing-slash linebreak @@ -113,7 +123,7 @@ DESTDIR_TARGET = release\CableTestBench.exe first: all all: Makefile.Release $(DESTDIR_TARGET) -$(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h $(OBJECTS) +$(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h ui_OptionsPage.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.CableTestBench.Release $(LIBS) qmake: FORCE @@ -123,7 +133,7 @@ dist: $(ZIP) CableTestBench.zip $(SOURCES) $(DIST) CableTestBench.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\MainWindow.o release\main.o release\MainPage.o release\CableTestBench.o release\VisualInspectionPage.o release\ConnectorSelectWidget.o release\CableTestPage.o release\ConnectorClickZoneWidget.o release\ONOFFStatusWidget.o release\ConnectorTestVisualizationWidget.o release\Connector.o release\Cable.o release\VisualInspectionResult.o release\TestReport.o release\moc_MainWindow.o release\moc_MainPage.o release\moc_CableTestBench.o release\moc_VisualInspectionPage.o release\moc_ConnectorSelectWidget.o release\moc_CableTestPage.o release\moc_ConnectorClickZoneWidget.o release\moc_ONOFFStatusWidget.o release\moc_ConnectorTestVisualizationWidget.o + -$(DEL_FILE) release\MainWindow.o release\main.o release\MainPage.o release\CableTestBench.o release\VisualInspectionPage.o release\ConnectorSelectWidget.o release\CableTestPage.o release\ConnectorClickZoneWidget.o release\ONOFFStatusWidget.o release\ConnectorTestVisualizationWidget.o release\Connector.o release\Cable.o release\VisualInspectionResult.o release\TestReport.o release\CableTestEngine.o release\OptionsPage.o release\CableTestBenchDefs.o release\IOModulesInterface.o release\moc_MainWindow.o release\moc_MainPage.o release\moc_CableTestBench.o release\moc_VisualInspectionPage.o release\moc_ConnectorSelectWidget.o release\moc_CableTestPage.o release\moc_ConnectorClickZoneWidget.o release\moc_ONOFFStatusWidget.o release\moc_ConnectorTestVisualizationWidget.o release\moc_OptionsPage.o distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -135,15 +145,16 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: release/moc_MainWindow.cpp release/moc_MainPage.cpp release/moc_CableTestBench.cpp release/moc_VisualInspectionPage.cpp release/moc_ConnectorSelectWidget.cpp release/moc_CableTestPage.cpp release/moc_ConnectorClickZoneWidget.cpp release/moc_ONOFFStatusWidget.cpp release/moc_ConnectorTestVisualizationWidget.cpp +compiler_moc_header_make_all: release/moc_MainWindow.cpp release/moc_MainPage.cpp release/moc_CableTestBench.cpp release/moc_VisualInspectionPage.cpp release/moc_ConnectorSelectWidget.cpp release/moc_CableTestPage.cpp release/moc_ConnectorClickZoneWidget.cpp release/moc_ONOFFStatusWidget.cpp release/moc_ConnectorTestVisualizationWidget.cpp release/moc_OptionsPage.cpp compiler_moc_header_clean: - -$(DEL_FILE) release\moc_MainWindow.cpp release\moc_MainPage.cpp release\moc_CableTestBench.cpp release\moc_VisualInspectionPage.cpp release\moc_ConnectorSelectWidget.cpp release\moc_CableTestPage.cpp release\moc_ConnectorClickZoneWidget.cpp release\moc_ONOFFStatusWidget.cpp release\moc_ConnectorTestVisualizationWidget.cpp + -$(DEL_FILE) release\moc_MainWindow.cpp release\moc_MainPage.cpp release\moc_CableTestBench.cpp release\moc_VisualInspectionPage.cpp release\moc_ConnectorSelectWidget.cpp release\moc_CableTestPage.cpp release\moc_ConnectorClickZoneWidget.cpp release\moc_ONOFFStatusWidget.cpp release\moc_ConnectorTestVisualizationWidget.cpp release\moc_OptionsPage.cpp release/moc_MainWindow.cpp: Sources/MainPage.h \ Sources/VisualInspectionPage.h \ Sources/VisualInspectionResult.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/MainWindow.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\MainWindow.h -o release\moc_MainWindow.cpp @@ -157,6 +168,7 @@ release/moc_CableTestBench.cpp: Sources/MainWindow.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h \ @@ -186,6 +198,9 @@ release/moc_ConnectorTestVisualizationWidget.cpp: Sources/Widgets/ONOFFStatusWid Sources/Widgets/ConnectorTestVisualizationWidget.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\Widgets\ConnectorTestVisualizationWidget.h -o release\moc_ConnectorTestVisualizationWidget.cpp +release/moc_OptionsPage.cpp: Sources/OptionsPage.h + C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\OptionsPage.h -o release\moc_OptionsPage.cpp + compiler_rcc_make_all: compiler_rcc_clean: compiler_image_collection_make_all: qmake_image_collection.cpp @@ -193,9 +208,9 @@ compiler_image_collection_clean: -$(DEL_FILE) qmake_image_collection.cpp compiler_moc_source_make_all: compiler_moc_source_clean: -compiler_uic_make_all: ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h +compiler_uic_make_all: ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h ui_OptionsPage.h compiler_uic_clean: - -$(DEL_FILE) ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h + -$(DEL_FILE) ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h ui_OptionsPage.h ui_CMainPage.h: Sources/CMainPage.ui c:\Qt\4.8.1\bin\uic.exe Sources\CMainPage.ui -o ui_CMainPage.h @@ -205,6 +220,9 @@ ui_VisualInspectionPage.h: Sources/VisualInspectionPage.ui ui_CableTestPage.h: Sources/CableTestPage.ui c:\Qt\4.8.1\bin\uic.exe Sources\CableTestPage.ui -o ui_CableTestPage.h +ui_OptionsPage.h: Sources/OptionsPage.ui + c:\Qt\4.8.1\bin\uic.exe Sources\OptionsPage.ui -o ui_OptionsPage.h + compiler_yacc_decl_make_all: compiler_yacc_decl_clean: compiler_yacc_impl_make_all: @@ -224,6 +242,7 @@ release/MainWindow.o: Sources/MainWindow.cpp Sources/MainWindow.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/CableTestBench.h \ Sources/Connector.h \ Sources/Cable.h \ @@ -238,6 +257,7 @@ release/main.o: Sources/main.cpp Sources/CableTestBench.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h @@ -255,6 +275,7 @@ release/CableTestBench.o: Sources/CableTestBench.cpp Sources/CableTestBench.h \ Sources/GlobalDefine.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h @@ -269,6 +290,7 @@ release/VisualInspectionPage.o: Sources/VisualInspectionPage.cpp Sources/VisualI Sources/MainPage.h \ Sources/CableTestPage.h \ Sources/CableTestBenchDefs.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h @@ -287,6 +309,7 @@ release/CableTestPage.o: Sources/CableTestPage.cpp Sources/CableTestPage.h \ Sources/VisualInspectionPage.h \ Sources/VisualInspectionResult.h \ Sources/GlobalDefine.h \ + Sources/OptionsPage.h \ Sources/Connector.h \ Sources/Cable.h \ Sources/TestReport.h @@ -303,7 +326,8 @@ release/ConnectorTestVisualizationWidget.o: Sources/Widgets/ConnectorTestVisuali $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ConnectorTestVisualizationWidget.o Sources\Widgets\ConnectorTestVisualizationWidget.cpp release/Connector.o: Sources/Connector.cpp Sources/Connector.h \ - Sources/CableTestBenchDefs.h + Sources/CableTestBenchDefs.h \ + Sources/GlobalDefine.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\Connector.o Sources\Connector.cpp release/Cable.o: Sources/Cable.cpp Sources/Cable.h \ @@ -321,6 +345,23 @@ release/TestReport.o: Sources/TestReport.cpp Sources/TestReport.h \ Sources/VisualInspectionResult.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\TestReport.o Sources\TestReport.cpp +release/CableTestEngine.o: Sources/CableTestEngine.cpp Sources/CableTestEngine.h \ + Sources/Cable.h \ + Sources/CableTestBenchDefs.h \ + Sources/Connector.h \ + Sources/GlobalDefine.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\CableTestEngine.o Sources\CableTestEngine.cpp + +release/OptionsPage.o: Sources/OptionsPage.cpp Sources/OptionsPage.h \ + ui_OptionsPage.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\OptionsPage.o Sources\OptionsPage.cpp + +release/CableTestBenchDefs.o: Sources/CableTestBenchDefs.cpp Sources/CableTestBenchDefs.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\CableTestBenchDefs.o Sources\CableTestBenchDefs.cpp + +release/IOModulesInterface.o: Sources/IOModulesInterface.cpp Sources/IOModulesInterface.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\IOModulesInterface.o Sources\IOModulesInterface.cpp + release/moc_MainWindow.o: release/moc_MainWindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_MainWindow.o release\moc_MainWindow.cpp @@ -348,6 +389,9 @@ release/moc_ONOFFStatusWidget.o: release/moc_ONOFFStatusWidget.cpp release/moc_ConnectorTestVisualizationWidget.o: release/moc_ConnectorTestVisualizationWidget.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_ConnectorTestVisualizationWidget.o release\moc_ConnectorTestVisualizationWidget.cpp +release/moc_OptionsPage.o: release/moc_OptionsPage.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_OptionsPage.o release\moc_OptionsPage.cpp + ####### Install install: FORCE diff --git a/Sources/CableTestBench.cpp b/Sources/CableTestBench.cpp index 6a43398..d8daad5 100644 --- a/Sources/CableTestBench.cpp +++ b/Sources/CableTestBench.cpp @@ -11,6 +11,7 @@ CCableTestBench::CCableTestBench(QObject *parent) : CCableTestBench::~CCableTestBench() { delete w; + //mIOInterface.CloseIOModules(); } int CCableTestBench::Start() @@ -22,6 +23,8 @@ int CCableTestBench::Start() mVisualInspPageHandle = w->mVisualInspPage; mCableTestPageHandle = w->mCableTestPage; + mIOInterface.OpenIOModules(); + return 1; } @@ -86,4 +89,6 @@ int CCableTestBench::VisualInspectionQuitRequest() } w->ShowCableTestPage(); + + return RET_OK; } diff --git a/Sources/CableTestBench.h b/Sources/CableTestBench.h index e7d16a2..53dd39a 100644 --- a/Sources/CableTestBench.h +++ b/Sources/CableTestBench.h @@ -7,6 +7,7 @@ #include "Connector.h" #include "Cable.h" #include "TestReport.h" +#include "IOModulesInterface.h" class CMainPage; @@ -28,6 +29,8 @@ public: CCableTestPage *mCableTestPageHandle; CCable mActualCable; + CIOModulesInterface mIOInterface; + int ExecVisualInspectionRequest(); int VisualInspectionQuitRequest(); diff --git a/Sources/CableTestBenchDefs.cpp b/Sources/CableTestBenchDefs.cpp new file mode 100644 index 0000000..d71d07b --- /dev/null +++ b/Sources/CableTestBenchDefs.cpp @@ -0,0 +1,61 @@ +#include "CableTestBenchDefs.h" + +const int CConnectorDefs::ConnIOMapping[CConnectorDefs::NB_CONNECTOR_TYPE][2] = { + {0,0}, //Unknown + {97,102}, //in 6 pins + {91,104}, //in 14 pins + {73,96}, //in 24 pins + {1,72}, //in 72 pins + {1,90}, //in 90 pins + {1,108}, //in 108 pins + {1,108}, //in 120 pins + {97,102}, //out 6 pins + {91,104}, //out 14 pins + {73,96}, //out 24 pins + {1,72}, //out 72 pins + {1,108}, //out 108 pins + }; + +const int CConnectorDefs::ConnPinCount[NB_CONNECTOR_TYPE] = {0, 6, 14, 24, 72, 90, 108, 120, 6, 14, 24, 72, 108}; + + + +const int CConnectorDefs::GetPinCount(eConnectorType type) +{ + if(type < 0 || type >= NB_CONNECTOR_TYPE) + { + return 0; + } + + return ConnPinCount[type]; +} + +const int CConnectorDefs::GetConnectorIOMappingStart(eConnectorType type) +{ + if(type < 0 || type >= NB_CONNECTOR_TYPE) + { + return ConnIOMapping[UNKNOWN_CONNECTOR_TYPE][IO_MAPPING_START_INDEX]; + } + + return ConnIOMapping[type][IO_MAPPING_START_INDEX]; +} + +const int CConnectorDefs::GetConnectorIOMappingEnd(eConnectorType type) +{ + if(type < 0 || type >= NB_CONNECTOR_TYPE) + { + return ConnIOMapping[UNKNOWN_CONNECTOR_TYPE][IO_MAPPING_END_INDEX]; + } + + return ConnIOMapping[type][IO_MAPPING_END_INDEX]; +} + +const int * CConnectorDefs::GetConnectorIOMapping(eConnectorType type) +{ + if(type < 0 || type >= NB_CONNECTOR_TYPE) + { + return ConnIOMapping[UNKNOWN_CONNECTOR_TYPE]; + } + + return ConnIOMapping[type]; +} diff --git a/Sources/CableTestBenchDefs.h b/Sources/CableTestBenchDefs.h index 3156303..f4c9b04 100644 --- a/Sources/CableTestBenchDefs.h +++ b/Sources/CableTestBenchDefs.h @@ -5,6 +5,8 @@ class CConnectorDefs { #define MAX_CONNECTOR_PIN_COUNT 120 +#define IO_MAPPING_START_INDEX 0 +#define IO_MAPPING_END_INDEX 1 public: enum eConnectorType @@ -21,84 +23,19 @@ public: OUTPUT_14_PINS_CONNECTOR_TYPE, OUTPUT_24_PINS_CONNECTOR_TYPE, OUTPUT_72_PINS_CONNECTOR_TYPE, - OUTPUT_108_PINS_CONNECTOR_TYPE + OUTPUT_108_PINS_CONNECTOR_TYPE, + NB_CONNECTOR_TYPE }; - static int GetPinCount(eConnectorType type) - { - switch(type) - { - case INPUT_6_PINS_CONNECTOR_TYPE: - { - return 6; - break; - } - case INPUT_14_PINS_CONNECTOR_TYPE: - { - return 14; - break; - } - case INPUT_24_PINS_CONNECTOR_TYPE: - { - return 24; - break; - } - case INPUT_72_PINS_CONNECTOR_TYPE: - { - return 72; - break; - } - case INPUT_90_PINS_CONNECTOR_TYPE: - { - return 90; - break; - } - case INPUT_108_PINS_CONNECTOR_TYPE: - { - return 108; - break; - } - case INPUT_120_PINS_CONNECTOR_TYPE: - { - return 120; - break; - } - case OUTPUT_6_PINS_CONNECTOR_TYPE: - { - return 6; - break; - } - case OUTPUT_14_PINS_CONNECTOR_TYPE: - { - return 14; - break; - } - case OUTPUT_24_PINS_CONNECTOR_TYPE: - { - return 24; - break; - } - case OUTPUT_72_PINS_CONNECTOR_TYPE: - { - return 72; - break; - } - case OUTPUT_108_PINS_CONNECTOR_TYPE: - { - return 108; - break; - } - default: - { - return 0; - break; - } + static const int ConnIOMapping[NB_CONNECTOR_TYPE][2]; + static const int ConnPinCount[NB_CONNECTOR_TYPE]; + + static const int GetPinCount(eConnectorType type); + static const int GetConnectorIOMappingStart(eConnectorType type); + static const int GetConnectorIOMappingEnd(eConnectorType type); + static const int* GetConnectorIOMapping(eConnectorType type); - } - } }; - - #endif // CABLETESTBENCHDEFS_H diff --git a/Sources/CableTestEngine.h b/Sources/CableTestEngine.h index 8d96d0a..6258aa4 100644 --- a/Sources/CableTestEngine.h +++ b/Sources/CableTestEngine.h @@ -1,10 +1,18 @@ #ifndef CABLETESTENGINE_H #define CABLETESTENGINE_H +#include "Cable.h" class CCableTestEngine { public: CCableTestEngine(); + +private: + + CCable *mTestCable; + + + }; #endif // CABLETESTENGINE_H diff --git a/Sources/CableTestPage.ui b/Sources/CableTestPage.ui index da750b5..ba93990 100644 --- a/Sources/CableTestPage.ui +++ b/Sources/CableTestPage.ui @@ -455,7 +455,7 @@ - Contrôle du test + Contrôle du test électrique diff --git a/Sources/Connector.cpp b/Sources/Connector.cpp index 9ef9e60..a7567f2 100644 --- a/Sources/Connector.cpp +++ b/Sources/Connector.cpp @@ -1,8 +1,10 @@ #include "Connector.h" +#include "GlobalDefine.h" CConnector::CConnector() { mPinCount = 0; + mIOModuleRangeBegin = mIOModuleRangeEnd = 0; } int CConnector::GetPinCount() @@ -12,7 +14,12 @@ int CConnector::GetPinCount() int CConnector::SetConnectorType(CConnectorDefs::eConnectorType type) { - mPinCount = CConnectorDefs::GetPinCount(type); + mConnectorType = type; + mPinCount = CConnectorDefs::GetPinCount(type); + mIOModuleRangeBegin = CConnectorDefs::GetConnectorIOMappingStart(type); + mIOModuleRangeEnd = CConnectorDefs::GetConnectorIOMappingEnd(type); + + return RET_OK; } bool CConnector::IsConnectorDefined() diff --git a/Sources/Connector.h b/Sources/Connector.h index b89d263..05f1a6e 100644 --- a/Sources/Connector.h +++ b/Sources/Connector.h @@ -3,6 +3,7 @@ #include "CableTestBenchDefs.h" + class CConnector { public: @@ -16,6 +17,9 @@ private: int mPinCount; CConnectorDefs::eConnectorType mConnectorType; + int mIOModuleRangeBegin, mIOModuleRangeEnd; + + }; diff --git a/Sources/IOModulesInterface.cpp b/Sources/IOModulesInterface.cpp new file mode 100644 index 0000000..0c73a41 --- /dev/null +++ b/Sources/IOModulesInterface.cpp @@ -0,0 +1,37 @@ +#include "IOModulesInterface.h" + +#include "GlobalDefine.h" +#include + +CIOModulesInterface::CIOModulesInterface() +{ +} + + +int CIOModulesInterface::OpenIOModules() +{ + + int ret = SM_Open(&hndl,"192.168.0.52"); + if(ret < 0) + { + qDebug("Impossible d'ouvrir le module d'I/O, erreur %d",ret); + return RET_ERROR; + } + + qDebug("Module d'I/O ouvert avec succès"); + + return RET_OK; +} + +int CIOModulesInterface::CloseIOModules() +{ + int ret = SM_Close(&hndl); + if(ret < 0) + { + qDebug("Impossible de fermer le module d'I/O, erreur %d",ret); + return RET_ERROR; + } + + qDebug("Module d'I/O fermé avec succès"); + return RET_OK; +} diff --git a/Sources/IOModulesInterface.h b/Sources/IOModulesInterface.h new file mode 100644 index 0000000..cf2db9d --- /dev/null +++ b/Sources/IOModulesInterface.h @@ -0,0 +1,18 @@ +#ifndef IOMODULESINTERFACE_H +#define IOMODULESINTERFACE_H +#include "SeaMAX.h" + + +class CIOModulesInterface +{ +public: + CIOModulesInterface(); + + int OpenIOModules(); + int CloseIOModules(); + +private: + SM_HANDLE hndl; +}; + +#endif // IOMODULESINTERFACE_H diff --git a/Sources/MainPage.cpp b/Sources/MainPage.cpp index d3f7da5..15b9c3e 100644 --- a/Sources/MainPage.cpp +++ b/Sources/MainPage.cpp @@ -1,7 +1,7 @@ #include "MainPage.h" #include "ui_CMainPage.h" -#include "SeaMAX.h" +//#include "SeaMAX.h" CMainPage::CMainPage(QWidget *parent) : QWidget(parent), @@ -12,24 +12,11 @@ CMainPage::CMainPage(QWidget *parent) : QFont font; font.setPointSize(18); - // ui->mConnectorsImgLbl->setPixmap(QPixmap("./images/connecteurs.png").scaled(ui->mConnectorsImgLbl->size())); - - // mConnectorSelWidget = new CConnectorSelectWidget(); + ui->mMainTabWidget->clear(); - - - -// test = new QLabel(this); -// test->setObjectName("test"); -// test->setGeometry(QRect(580, 500, 491, 431)); -// test->setPixmap(QPixmap("./images/connecteurs.png")); -// test->show(); - - //connect(ui->mInspVisuelleBtn,SIGNAL(clicked()),this,SLOT(InspVisuelleBtnClicked())); - - SM_HANDLE hndl; - SM_Open(&hndl,"192.168.0.101"); +// SM_HANDLE hndl; +// SM_Open(&hndl,"192.168.0.101"); @@ -45,7 +32,12 @@ CMainPage::~CMainPage() int CMainPage::SetTestPageWidget(QWidget *PageHandle) { - ui->mMainTabWidget->addTab(PageHandle,QIcon(),QString("Câble")); + ui->mMainTabWidget->addTab(PageHandle,QIcon(),QString("Test câble")); return RET_OK; } +int CMainPage::SetOptionsPageWidget(QWidget *PageHandle) +{ + ui->mMainTabWidget->addTab(PageHandle,QIcon(),QString("Options")); + return RET_OK; +} diff --git a/Sources/MainPage.h b/Sources/MainPage.h index fcbdd65..1ab4793 100644 --- a/Sources/MainPage.h +++ b/Sources/MainPage.h @@ -25,6 +25,7 @@ public: // CConnectorSelectWidget *mConnectorSelWidget; int SetTestPageWidget(QWidget *PageHandle); + int SetOptionsPageWidget(QWidget *PageHandle); diff --git a/Sources/MainWindow.cpp b/Sources/MainWindow.cpp index bfd6299..edac233 100644 --- a/Sources/MainWindow.cpp +++ b/Sources/MainWindow.cpp @@ -8,17 +8,26 @@ MainWindow::MainWindow(QWidget *parent,CCableTestBench* ProgramHandle) { resize(1800,890); - mMainPage = new CMainPage(); +// mMainPage = new CMainPage(); +// mVisualInspPage = new CVisualInspectionPage(this); +// mVisualInspPage->hide(); +// mCableTestPage = new CCableTestPage(this); + + mMainPage = new CMainPage(this); mVisualInspPage = new CVisualInspectionPage(this); mVisualInspPage->hide(); - mCableTestPage = new CCableTestPage(this); + mCableTestPage = new CCableTestPage(); + mOptionsPage = new COptionsPage(); mMainPage->mProgramHandle = ProgramHandle; mVisualInspPage->mProgramHandle = ProgramHandle; mCableTestPage->mProgramHandle = ProgramHandle; + mOptionsPage->mProgramHandle = ProgramHandle; + + mMainPage->SetTestPageWidget(mCableTestPage); + mMainPage->SetOptionsPageWidget(mOptionsPage); - //mMainPage->SetTestPageWidget(mCableTestPage); //setCentralWidget(mVisualInspPage); diff --git a/Sources/MainWindow.h b/Sources/MainWindow.h index 08fa9a8..16926f9 100644 --- a/Sources/MainWindow.h +++ b/Sources/MainWindow.h @@ -10,6 +10,7 @@ #include "VisualInspectionPage.h" #include "CableTestPage.h" #include "VisualInspectionResult.h" +#include "OptionsPage.h" class CCableTestBench; @@ -25,6 +26,7 @@ public: CCableTestBench *mProgramHandle; CVisualInspectionPage *mVisualInspPage; CCableTestPage *mCableTestPage; + COptionsPage *mOptionsPage; int ShowInspectVisuellePage(); int ShowCableTestPage(); diff --git a/Sources/OptionsPage.cpp b/Sources/OptionsPage.cpp new file mode 100644 index 0000000..a4f54c6 --- /dev/null +++ b/Sources/OptionsPage.cpp @@ -0,0 +1,16 @@ +#include "OptionsPage.h" +#include "ui_OptionsPage.h" + +COptionsPage::COptionsPage(QWidget *parent) : + QWidget(parent), + ui(new Ui::COptionsPage) +{ + ui->setupUi(this); + + mProgramHandle = 0; +} + +COptionsPage::~COptionsPage() +{ + delete ui; +} diff --git a/Sources/OptionsPage.h b/Sources/OptionsPage.h new file mode 100644 index 0000000..d7dafc9 --- /dev/null +++ b/Sources/OptionsPage.h @@ -0,0 +1,26 @@ +#ifndef OPTIONSPAGE_H +#define OPTIONSPAGE_H + +#include + +namespace Ui { +class COptionsPage; +} + +class CCableTestBench; + +class COptionsPage : public QWidget +{ + Q_OBJECT + +public: + explicit COptionsPage(QWidget *parent = 0); + ~COptionsPage(); + + CCableTestBench *mProgramHandle; + +private: + Ui::COptionsPage *ui; +}; + +#endif // OPTIONSPAGE_H diff --git a/Sources/OptionsPage.ui b/Sources/OptionsPage.ui new file mode 100644 index 0000000..a940886 --- /dev/null +++ b/Sources/OptionsPage.ui @@ -0,0 +1,221 @@ + + + COptionsPage + + + + 0 + 0 + 1119 + 647 + + + + Form + + + + + 100 + 40 + 181 + 31 + + + + + 14 + + + + Valeurs par défaut + + + + + + 530 + 40 + 181 + 31 + + + + + 14 + + + + Paramètres de test + + + + + + 680 + 110 + 61 + 22 + + + + 100 + + + 5000 + + + 1000 + + + + + + 500 + 110 + 171 + 20 + + + + + 10 + + + + Temps de maintien haut (ms) + + + + + + 500 + 150 + 171 + 20 + + + + + 10 + + + + Temps de maintien bas (ms) + + + + + + 680 + 150 + 61 + 22 + + + + 1 + + + 5000 + + + 1 + + + + + + 510 + 340 + 42 + 22 + + + + 255 + + + 192 + + + + + + 560 + 340 + 42 + 22 + + + + 255 + + + 168 + + + + + + 610 + 340 + 42 + 22 + + + + 255 + + + + + + 660 + 340 + 42 + 22 + + + + 255 + + + 52 + + + + + + 510 + 310 + 171 + 20 + + + + + 10 + + + + Adresse IP module I/O + + + + + + 390 + 550 + 131 + 23 + + + + Appliquer && Sauvegarder + + + + + + diff --git a/Sources/Widgets/ConnectorSelectWidget.cpp b/Sources/Widgets/ConnectorSelectWidget.cpp index b9b1424..7825370 100644 --- a/Sources/Widgets/ConnectorSelectWidget.cpp +++ b/Sources/Widgets/ConnectorSelectWidget.cpp @@ -132,8 +132,9 @@ void CConnectorSelectWidget::InputConnectorZoneClicked(CConnectorClickZoneWidget if(ConClickZone->IsConSelected() == true) { - ClearAllConnectorsSelections(); - mCurSelConnector = CConnectorDefs::UNKNOWN_CONNECTOR_TYPE; + // ClearAllConnectorsSelections(); + // mCurSelConnector = CConnectorDefs::UNKNOWN_CONNECTOR_TYPE; + return; } else { @@ -225,6 +226,8 @@ int CConnectorSelectWidget::ClearAllConnectorsSelections() { ClearAllOutputConSelections(); ClearAllInputConSelections(); + + return RET_OK; } CConnectorClickZoneWidget* CConnectorSelectWidget::FindOutputSelectionZone(CConnectorDefs::eConnectorType type) diff --git a/object_script.CableTestBench.Debug b/object_script.CableTestBench.Debug index 47e67de..aff94f7 100644 --- a/object_script.CableTestBench.Debug +++ b/object_script.CableTestBench.Debug @@ -13,6 +13,10 @@ INPUT( ./debug\Cable.o ./debug\VisualInspectionResult.o ./debug\TestReport.o +./debug\CableTestEngine.o +./debug\OptionsPage.o +./debug\CableTestBenchDefs.o +./debug\IOModulesInterface.o ./debug\moc_MainWindow.o ./debug\moc_MainPage.o ./debug\moc_CableTestBench.o @@ -22,4 +26,5 @@ INPUT( ./debug\moc_ConnectorClickZoneWidget.o ./debug\moc_ONOFFStatusWidget.o ./debug\moc_ConnectorTestVisualizationWidget.o +./debug\moc_OptionsPage.o ); diff --git a/object_script.CableTestBench.Release b/object_script.CableTestBench.Release index 81ac902..df0ecc1 100644 --- a/object_script.CableTestBench.Release +++ b/object_script.CableTestBench.Release @@ -13,6 +13,10 @@ INPUT( ./release\Cable.o ./release\VisualInspectionResult.o ./release\TestReport.o +./release\CableTestEngine.o +./release\OptionsPage.o +./release\CableTestBenchDefs.o +./release\IOModulesInterface.o ./release\moc_MainWindow.o ./release\moc_MainPage.o ./release\moc_CableTestBench.o @@ -22,4 +26,5 @@ INPUT( ./release\moc_ConnectorClickZoneWidget.o ./release\moc_ONOFFStatusWidget.o ./release\moc_ConnectorTestVisualizationWidget.o +./release\moc_OptionsPage.o ); diff --git a/ui_CMainPage.h b/ui_CMainPage.h index d6b7342..e60d3eb 100644 --- a/ui_CMainPage.h +++ b/ui_CMainPage.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CMainPage.ui' ** -** Created: Thu May 2 15:47:48 2019 +** Created: Fri May 3 10:58:09 2019 ** by: Qt User Interface Compiler version 4.8.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/ui_CableTestPage.h b/ui_CableTestPage.h index c56ae0c..7b55f97 100644 --- a/ui_CableTestPage.h +++ b/ui_CableTestPage.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CableTestPage.ui' ** -** Created: Thu May 2 16:01:47 2019 +** Created: Fri May 3 10:58:09 2019 ** by: Qt User Interface Compiler version 4.8.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -258,7 +258,7 @@ public: #endif // QT_NO_TOOLTIP mVisualInspStepChkBx->setText(QApplication::translate("CCableTestPage", "2. Inspection visuelle", 0, QApplication::UnicodeUTF8)); mConSelStepChkBx->setText(QApplication::translate("CCableTestPage", "3. S\303\251lection du connecteur d'entr\303\251e", 0, QApplication::UnicodeUTF8)); - mInspVisuelleLabel_2->setText(QApplication::translate("CCableTestPage", "Contr\303\264le du test", 0, QApplication::UnicodeUTF8)); + mInspVisuelleLabel_2->setText(QApplication::translate("CCableTestPage", "Contr\303\264le du test \303\251lectrique", 0, QApplication::UnicodeUTF8)); } // retranslateUi }; diff --git a/ui_OptionsPage.h b/ui_OptionsPage.h new file mode 100644 index 0000000..e8fa8a8 --- /dev/null +++ b/ui_OptionsPage.h @@ -0,0 +1,129 @@ +/******************************************************************************** +** Form generated from reading UI file 'OptionsPage.ui' +** +** Created: Fri May 3 10:58:09 2019 +** by: Qt User Interface Compiler version 4.8.1 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_OPTIONSPAGE_H +#define UI_OPTIONSPAGE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_COptionsPage +{ +public: + QLabel *label; + QLabel *label_2; + QSpinBox *mTestHoldTimeHighSpinBx; + QLabel *label_3; + QLabel *label_4; + QSpinBox *mTestHoldTimeLowSpinBx; + QSpinBox *mIPAdd1SpinBox; + QSpinBox *mIPAdd2SpinBox; + QSpinBox *mIPAdd3SpinBox; + QSpinBox *mIPAdd4SpinBox; + QLabel *label_5; + QPushButton *mApplyAndSaveBtn; + + void setupUi(QWidget *COptionsPage) + { + if (COptionsPage->objectName().isEmpty()) + COptionsPage->setObjectName(QString::fromUtf8("COptionsPage")); + COptionsPage->resize(1119, 647); + label = new QLabel(COptionsPage); + label->setObjectName(QString::fromUtf8("label")); + label->setGeometry(QRect(100, 40, 181, 31)); + QFont font; + font.setPointSize(14); + label->setFont(font); + label_2 = new QLabel(COptionsPage); + label_2->setObjectName(QString::fromUtf8("label_2")); + label_2->setGeometry(QRect(530, 40, 181, 31)); + label_2->setFont(font); + mTestHoldTimeHighSpinBx = new QSpinBox(COptionsPage); + mTestHoldTimeHighSpinBx->setObjectName(QString::fromUtf8("mTestHoldTimeHighSpinBx")); + mTestHoldTimeHighSpinBx->setGeometry(QRect(680, 110, 61, 22)); + mTestHoldTimeHighSpinBx->setMinimum(100); + mTestHoldTimeHighSpinBx->setMaximum(5000); + mTestHoldTimeHighSpinBx->setValue(1000); + label_3 = new QLabel(COptionsPage); + label_3->setObjectName(QString::fromUtf8("label_3")); + label_3->setGeometry(QRect(500, 110, 171, 20)); + QFont font1; + font1.setPointSize(10); + label_3->setFont(font1); + label_4 = new QLabel(COptionsPage); + label_4->setObjectName(QString::fromUtf8("label_4")); + label_4->setGeometry(QRect(500, 150, 171, 20)); + label_4->setFont(font1); + mTestHoldTimeLowSpinBx = new QSpinBox(COptionsPage); + mTestHoldTimeLowSpinBx->setObjectName(QString::fromUtf8("mTestHoldTimeLowSpinBx")); + mTestHoldTimeLowSpinBx->setGeometry(QRect(680, 150, 61, 22)); + mTestHoldTimeLowSpinBx->setMinimum(1); + mTestHoldTimeLowSpinBx->setMaximum(5000); + mTestHoldTimeLowSpinBx->setValue(1); + mIPAdd1SpinBox = new QSpinBox(COptionsPage); + mIPAdd1SpinBox->setObjectName(QString::fromUtf8("mIPAdd1SpinBox")); + mIPAdd1SpinBox->setGeometry(QRect(510, 340, 42, 22)); + mIPAdd1SpinBox->setMaximum(255); + mIPAdd1SpinBox->setValue(192); + mIPAdd2SpinBox = new QSpinBox(COptionsPage); + mIPAdd2SpinBox->setObjectName(QString::fromUtf8("mIPAdd2SpinBox")); + mIPAdd2SpinBox->setGeometry(QRect(560, 340, 42, 22)); + mIPAdd2SpinBox->setMaximum(255); + mIPAdd2SpinBox->setValue(168); + mIPAdd3SpinBox = new QSpinBox(COptionsPage); + mIPAdd3SpinBox->setObjectName(QString::fromUtf8("mIPAdd3SpinBox")); + mIPAdd3SpinBox->setGeometry(QRect(610, 340, 42, 22)); + mIPAdd3SpinBox->setMaximum(255); + mIPAdd4SpinBox = new QSpinBox(COptionsPage); + mIPAdd4SpinBox->setObjectName(QString::fromUtf8("mIPAdd4SpinBox")); + mIPAdd4SpinBox->setGeometry(QRect(660, 340, 42, 22)); + mIPAdd4SpinBox->setMaximum(255); + mIPAdd4SpinBox->setValue(52); + label_5 = new QLabel(COptionsPage); + label_5->setObjectName(QString::fromUtf8("label_5")); + label_5->setGeometry(QRect(510, 310, 171, 20)); + label_5->setFont(font1); + mApplyAndSaveBtn = new QPushButton(COptionsPage); + mApplyAndSaveBtn->setObjectName(QString::fromUtf8("mApplyAndSaveBtn")); + mApplyAndSaveBtn->setGeometry(QRect(390, 550, 131, 23)); + + retranslateUi(COptionsPage); + + QMetaObject::connectSlotsByName(COptionsPage); + } // setupUi + + void retranslateUi(QWidget *COptionsPage) + { + COptionsPage->setWindowTitle(QApplication::translate("COptionsPage", "Form", 0, QApplication::UnicodeUTF8)); + label->setText(QApplication::translate("COptionsPage", "Valeurs par d\303\251faut", 0, QApplication::UnicodeUTF8)); + label_2->setText(QApplication::translate("COptionsPage", "Param\303\250tres de test", 0, QApplication::UnicodeUTF8)); + label_3->setText(QApplication::translate("COptionsPage", "Temps de maintien haut (ms)", 0, QApplication::UnicodeUTF8)); + label_4->setText(QApplication::translate("COptionsPage", "Temps de maintien bas (ms)", 0, QApplication::UnicodeUTF8)); + label_5->setText(QApplication::translate("COptionsPage", "Adresse IP module I/O", 0, QApplication::UnicodeUTF8)); + mApplyAndSaveBtn->setText(QApplication::translate("COptionsPage", "Appliquer && Sauvegarder", 0, QApplication::UnicodeUTF8)); + } // retranslateUi + +}; + +namespace Ui { + class COptionsPage: public Ui_COptionsPage {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_OPTIONSPAGE_H diff --git a/ui_VisualInspectionPage.h b/ui_VisualInspectionPage.h index 716eb8e..70fc72c 100644 --- a/ui_VisualInspectionPage.h +++ b/ui_VisualInspectionPage.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'VisualInspectionPage.ui' ** -** Created: Thu May 2 15:11:16 2019 +** Created: Fri May 3 10:58:09 2019 ** by: Qt User Interface Compiler version 4.8.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file!