Dev

2019-05-03 13:46:54 -04:00
parent de3a417dd3
commit ea4c6769f4
29 changed files with 713 additions and 130 deletions
@@ -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