Développement et correction de bugs.

V1.2

Makefile

@@ -1,14 +1,14 @@
 #############################################################################
 # Makefile for building: CableTestBench
-# Generated by qmake (2.01a) (Qt 4.8.1) on: Tue May 14 11:42:47 2019
+# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu Sep 19 06:47:00 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
+# Command: c:\Qt\4.8.1\bin\qmake.exe -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile CableTestBench.pro
 #############################################################################
 
-first: debug
-install: debug-install
-uninstall: debug-uninstall
+first: release
+install: release-install
+uninstall: release-uninstall
 MAKEFILE      = Makefile
 QMAKE         = c:\Qt\4.8.1\bin\qmake.exe
 DEL_FILE      = del
@@ -27,25 +27,9 @@ MOVE          = move
 CHK_DIR_EXISTS= if not exist
 MKDIR         = mkdir
 SUBTARGETS    =  \
-		debug \
-		release
+		release \
+		debug
 
-debug: $(MAKEFILE).Debug FORCE
-	$(MAKE) -f $(MAKEFILE).Debug
-debug-make_default: $(MAKEFILE).Debug FORCE
-	$(MAKE) -f $(MAKEFILE).Debug 
-debug-make_first: $(MAKEFILE).Debug FORCE
-	$(MAKE) -f $(MAKEFILE).Debug first
-debug-all: $(MAKEFILE).Debug FORCE
-	$(MAKE) -f $(MAKEFILE).Debug all
-debug-clean: $(MAKEFILE).Debug FORCE
-	$(MAKE) -f $(MAKEFILE).Debug clean
-debug-distclean: $(MAKEFILE).Debug FORCE
-	$(MAKE) -f $(MAKEFILE).Debug distclean
-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
@@ -62,6 +46,22 @@ 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
+	$(MAKE) -f $(MAKEFILE).Debug 
+debug-make_first: $(MAKEFILE).Debug FORCE
+	$(MAKE) -f $(MAKEFILE).Debug first
+debug-all: $(MAKEFILE).Debug FORCE
+	$(MAKE) -f $(MAKEFILE).Debug all
+debug-clean: $(MAKEFILE).Debug FORCE
+	$(MAKE) -f $(MAKEFILE).Debug clean
+debug-distclean: $(MAKEFILE).Debug FORCE
+	$(MAKE) -f $(MAKEFILE).Debug distclean
+debug-install: $(MAKEFILE).Debug FORCE
+	$(MAKE) -f $(MAKEFILE).Debug install
+debug-uninstall: $(MAKEFILE).Debug FORCE
+	$(MAKE) -f $(MAKEFILE).Debug uninstall
 
 Makefile: CableTestBench.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,11 +70,10 @@ Makefile: CableTestBench.pro  ../../Qt/4.8.1/mkspecs/win32-g++/qmake.conf ../../
 		../../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/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/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 \
@@ -89,8 +88,8 @@ Makefile: CableTestBench.pro  ../../Qt/4.8.1/mkspecs/win32-g++/qmake.conf ../../
 		../../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) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=declarative_debug -o Makefile CableTestBench.pro
+		c:/Qt/4.8.1/lib/qtmain.prl
+	$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile 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:
@@ -98,11 +97,10 @@ Makefile: CableTestBench.pro  ../../Qt/4.8.1/mkspecs/win32-g++/qmake.conf ../../
 ..\..\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\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\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:
@@ -117,33 +115,33 @@ Makefile: CableTestBench.pro  ../../Qt/4.8.1/mkspecs/win32-g++/qmake.conf ../../
 ..\..\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:
+c:\Qt\4.8.1\lib\qtmain.prl:
 qmake: qmake_all FORCE
-	@$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=declarative_debug -o Makefile CableTestBench.pro
+	@$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile CableTestBench.pro
 
 qmake_all: 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
+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
 	-$(DEL_FILE) Makefile
 
 check: first
 
-debug-mocclean: $(MAKEFILE).Debug
-	$(MAKE) -f $(MAKEFILE).Debug mocclean
 release-mocclean: $(MAKEFILE).Release
 	$(MAKE) -f $(MAKEFILE).Release mocclean
-mocclean: debug-mocclean release-mocclean
+debug-mocclean: $(MAKEFILE).Debug
+	$(MAKE) -f $(MAKEFILE).Debug mocclean
+mocclean: release-mocclean debug-mocclean
 
-debug-mocables: $(MAKEFILE).Debug
-	$(MAKE) -f $(MAKEFILE).Debug mocables
 release-mocables: $(MAKEFILE).Release
 	$(MAKE) -f $(MAKEFILE).Release mocables
-mocables: debug-mocables release-mocables
+debug-mocables: $(MAKEFILE).Debug
+	$(MAKE) -f $(MAKEFILE).Debug mocables
+mocables: release-mocables debug-mocables
 FORCE:
 
-$(MAKEFILE).Debug: Makefile
 $(MAKEFILE).Release: Makefile
+$(MAKEFILE).Debug: Makefile

Makefile.Debug

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: CableTestBench
-# Generated by qmake (2.01a) (Qt 4.8.1) on: Tue May 14 11:42:47 2019
+# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu Sep 19 06:47:00 2019
 # Project:  CableTestBench.pro
 # Template: app
 #############################################################################
@@ -145,10 +145,10 @@ $(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h u
 	$(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.CableTestBench.Debug  $(LIBS)
 
 qmake:  FORCE
-	@$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=declarative_debug -o Makefile.Debug CableTestBench.pro
+	@$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile.Debug CableTestBench.pro
 
 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 
+	$(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\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\CableTestEngine.o debug\OptionsPage.o debug\CableTestBenchDefs.o debug\IOModulesInterface.o debug\InputConnector.o debug\OutputConnector.o debug\CableParametersData.o debug\AutomatedTestReport.o debug\TestBenchSettings.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_TestReport.o debug\moc_CableTestEngine.o debug\moc_OptionsPage.o debug\moc_IOModulesInterface.o debug\moc_AutomatedTestReport.o

Makefile.Release

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: CableTestBench
-# Generated by qmake (2.01a) (Qt 4.8.1) on: Tue May 14 11:42:47 2019
+# Generated by qmake (2.01a) (Qt 4.8.1) on: Thu Sep 19 06:47:00 2019
 # Project:  CableTestBench.pro
 # Template: app
 #############################################################################
@@ -145,10 +145,10 @@ $(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h u
 	$(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.CableTestBench.Release  $(LIBS)
 
 qmake:  FORCE
-	@$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=declarative_debug -o Makefile.Release CableTestBench.pro
+	@$(QMAKE) -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=release -o Makefile.Release CableTestBench.pro
 
 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 
+	$(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\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\CableTestEngine.o release\OptionsPage.o release\CableTestBenchDefs.o release\IOModulesInterface.o release\InputConnector.o release\OutputConnector.o release\CableParametersData.o release\AutomatedTestReport.o release\TestBenchSettings.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_TestReport.o release\moc_CableTestEngine.o release\moc_OptionsPage.o release\moc_IOModulesInterface.o release\moc_AutomatedTestReport.o

Sources/CableTestBench.cpp

@@ -137,10 +137,16 @@ int CCableTestBench::StartPauseAutomaticTestRequest()
 {
     if(mCableTestEngine.GetTestEngineCurrentMode() == CCableTestEngine::CABLE_TEST_STBY_MODE)
     {
+        int TestPinCount = mActualCable.GetOutputConnector()->GetPinCount();
+        if(mActualCable.GetInputConnector()->GetPinCount() < TestPinCount)
+        {
+           TestPinCount = mActualCable.GetInputConnector()->GetPinCount();
+        }
+
         mCableTestPageHandle->FillReportCableParametersData(mCableTestReport.GetReportCableParameters());
         mCableTestReport.GetReportCableParameters()->SetCableType(CConnectorDefs::GetConnectorDescription(mActualCable.GetInputConnector()->GetConnectorType()),
                                                                   CConnectorDefs::GetConnectorDescription(mActualCable.GetOutputConnector()->GetConnectorType()));
-        mCableTestReport.GetAutomatedTestReport()->SetPinCount(mActualCable.GetOutputConnector()->GetPinCount());
+        mCableTestReport.GetAutomatedTestReport()->SetPinCount(TestPinCount);
 
         mCableTestEngine.StartAutomatedTest();
         return RET_OK;

Sources/CableTestEngine.cpp

@@ -232,7 +232,12 @@ void CCableTestEngine::CableTestEngineStateMachine(int Event)
                         }
 
                         mCurPinUnderTest++;
-                        if(mCurPinUnderTest > (mTestOutputConnectorHandle->GetPinCount()))
+                        int TestPinCount = mTestOutputConnectorHandle->GetPinCount();
+                        if(mTestInputConnectorHandle->GetPinCount() < TestPinCount)
+                        {
+                            TestPinCount = mTestInputConnectorHandle->GetPinCount();
+                        }
+                        if(mCurPinUnderTest > TestPinCount)
                         {
                             //Test finished.
 

Sources/CableTestPage.cpp

@@ -67,7 +67,7 @@ CCableTestPage::CCableTestPage(QWidget *parent) :
     ui->mCableIdentStepLabel->setText("1. Identification du câble: À REMPLIR");
 
     ui->mConnectorSelStepLabel->setPalette(pal);
-    ui->mConnectorSelStepLabel->setText("3. Sélection du connecteur d'entrée: À SÉLECTIONNER");
+    ui->mConnectorSelStepLabel->setText("3. Sélection du connecteur d'entrée: À FAIRE");
 
 
 
@@ -90,7 +90,7 @@ int CCableTestPage::SetVisualInspectionDone(bool Done)
     if(Done)
     {
         ui->mInspectionDoneIcon->setPixmap(mInspectionDonePixmap);
-        ui->mExecInspVisuelleBtn->setText(QString("Réviser Inspection").toUtf8());
+        ui->mExecInspVisuelleBtn->setText(QString("Réviser\n Inspection").toUtf8());
 
         QPalette pal;
         pal.setColor(QPalette::WindowText,Qt::darkGreen);
@@ -100,7 +100,7 @@ int CCableTestPage::SetVisualInspectionDone(bool Done)
     else
     {
         ui->mInspectionDoneIcon->setPixmap(mInspectionNotDonePixmap);
-        ui->mExecInspVisuelleBtn->setText("Effectuer Inspection");
+        ui->mExecInspVisuelleBtn->setText("Effectuer\n Inspection");
 
         QPalette pal;
         pal.setColor(QPalette::WindowText,Qt::red);
@@ -124,7 +124,7 @@ int CCableTestPage::SetConnectorSelStep(bool done)
     {
         pal.setColor(QPalette::WindowText,Qt::red);
         ui->mConnectorSelStepLabel->setPalette(pal);
-        ui->mConnectorSelStepLabel->setText("3. Sélection du connecteur d'entrée: À SÉLECTIONNER");
+        ui->mConnectorSelStepLabel->setText("3. Sélection du connecteur d'entrée: À FAIRE");
     }
 
     return RET_OK;

Sources/CableTestPage.ui

@@ -22,14 +22,19 @@
      <height>537</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>11</pointsize>
+    </font>
+   </property>
   </widget>
   <widget class="QFrame" name="mCableConfigFrame">
    <property name="geometry">
     <rect>
      <x>50</x>
-     <y>50</y>
+     <y>40</y>
      <width>471</width>
-     <height>121</height>
+     <height>161</height>
     </rect>
    </property>
    <property name="frameShape">
@@ -46,9 +51,9 @@
    <property name="geometry">
     <rect>
      <x>60</x>
-     <y>60</y>
+     <y>50</y>
      <width>451</width>
-     <height>100</height>
+     <height>144</height>
     </rect>
    </property>
    <layout class="QGridLayout" name="gridLayout">
@@ -56,7 +61,7 @@
      <widget class="QLabel" name="mNomTesteurLabel">
       <property name="font">
        <font>
-        <pointsize>12</pointsize>
+        <pointsize>14</pointsize>
        </font>
       </property>
       <property name="text">
@@ -66,6 +71,11 @@
     </item>
     <item row="2" column="1" colspan="2">
      <widget class="QComboBox" name="mTypeCableCombo">
+      <property name="font">
+       <font>
+        <pointsize>14</pointsize>
+       </font>
+      </property>
       <item>
        <property name="text">
         <string>Permanent</string>
@@ -79,16 +89,28 @@
      </widget>
     </item>
     <item row="1" column="1" colspan="2">
-     <widget class="QLineEdit" name="mIdentCableEditBox"/>
+     <widget class="QLineEdit" name="mIdentCableEditBox">
+      <property name="font">
+       <font>
+        <pointsize>14</pointsize>
+       </font>
+      </property>
+     </widget>
     </item>
     <item row="0" column="1" colspan="2">
-     <widget class="QComboBox" name="mStationNameCombo"/>
+     <widget class="QComboBox" name="mStationNameCombo">
+      <property name="font">
+       <font>
+        <pointsize>14</pointsize>
+       </font>
+      </property>
+     </widget>
     </item>
     <item row="0" column="0" alignment="Qt::AlignRight">
      <widget class="QLabel" name="StationNameLabel">
       <property name="font">
        <font>
-        <pointsize>12</pointsize>
+        <pointsize>14</pointsize>
        </font>
       </property>
       <property name="text">
@@ -100,7 +122,7 @@
      <widget class="QLabel" name="mTypeCableLabel">
       <property name="font">
        <font>
-        <pointsize>12</pointsize>
+        <pointsize>14</pointsize>
        </font>
       </property>
       <property name="text">
@@ -112,7 +134,7 @@
      <widget class="QLabel" name="mIdentCableLabel">
       <property name="font">
        <font>
-        <pointsize>12</pointsize>
+        <pointsize>14</pointsize>
        </font>
       </property>
       <property name="text">
@@ -122,6 +144,11 @@
     </item>
     <item row="3" column="1" colspan="2">
      <widget class="QLineEdit" name="mNomTesteurEditBox">
+      <property name="font">
+       <font>
+        <pointsize>14</pointsize>
+       </font>
+      </property>
       <property name="text">
        <string/>
       </property>
@@ -133,14 +160,14 @@
    <property name="geometry">
     <rect>
      <x>60</x>
-     <y>20</y>
+     <y>10</y>
      <width>271</width>
      <height>20</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>12</pointsize>
+     <pointsize>16</pointsize>
     </font>
    </property>
    <property name="text">
@@ -187,13 +214,19 @@
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>50</y>
-      <width>121</width>
-      <height>23</height>
+      <y>30</y>
+      <width>101</width>
+      <height>51</height>
      </rect>
     </property>
+    <property name="font">
+     <font>
+      <pointsize>12</pointsize>
+     </font>
+    </property>
     <property name="text">
-     <string>Effectuer Inspection</string>
+     <string>Effectuer
+ Inspection</string>
     </property>
    </widget>
    <widget class="QLabel" name="mInspectionDoneIcon">
@@ -213,7 +246,7 @@
   <widget class="CConnectorTestVisualizationWidget" name="mInputTestVisualisationWidget" native="true">
    <property name="geometry">
     <rect>
-     <x>10</x>
+     <x>500</x>
      <y>410</y>
      <width>461</width>
      <height>351</height>
@@ -222,6 +255,8 @@
    <property name="autoFillBackground">
     <bool>false</bool>
    </property>
+   <zorder>mOutputContactsTextLabel</zorder>
+   <zorder>mOutputTestVisualisationWidget</zorder>
   </widget>
   <widget class="Line" name="line">
    <property name="geometry">
@@ -236,19 +271,6 @@
     <enum>Qt::Horizontal</enum>
    </property>
   </widget>
-  <widget class="CConnectorTestVisualizationWidget" name="mOutputTestVisualisationWidget" native="true">
-   <property name="geometry">
-    <rect>
-     <x>500</x>
-     <y>410</y>
-     <width>461</width>
-     <height>351</height>
-    </rect>
-   </property>
-   <property name="autoFillBackground">
-    <bool>false</bool>
-   </property>
-  </widget>
   <widget class="Line" name="line_2">
    <property name="geometry">
     <rect>
@@ -265,9 +287,9 @@
   <widget class="QLabel" name="mInputContactsTextLabel">
    <property name="geometry">
     <rect>
-     <x>130</x>
+     <x>620</x>
      <y>370</y>
-     <width>161</width>
+     <width>241</width>
      <height>41</height>
     </rect>
    </property>
@@ -280,33 +302,20 @@
     <string>Contacts entrée</string>
    </property>
   </widget>
-  <widget class="QLabel" name="mOutputContactsTextLabel">
+  <widget class="QPushButton" name="mNewCableBtn">
    <property name="geometry">
     <rect>
-     <x>670</x>
-     <y>370</y>
-     <width>161</width>
-     <height>41</height>
+     <x>400</x>
+     <y>10</y>
+     <width>121</width>
+     <height>23</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>16</pointsize>
+     <pointsize>12</pointsize>
     </font>
    </property>
-   <property name="text">
-    <string>Contacts sortie</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="mNewCableBtn">
-   <property name="geometry">
-    <rect>
-     <x>430</x>
-     <y>20</y>
-     <width>91</width>
-     <height>23</height>
-    </rect>
-   </property>
    <property name="text">
     <string>Nouveau Câble</string>
    </property>
@@ -316,8 +325,8 @@
     <rect>
      <x>50</x>
      <y>220</y>
-     <width>621</width>
-     <height>131</height>
+     <width>661</width>
+     <height>141</height>
     </rect>
    </property>
    <property name="frameShape">
@@ -329,9 +338,9 @@
    <widget class="QGroupBox" name="groupBox">
     <property name="geometry">
      <rect>
-      <x>310</x>
+      <x>360</x>
       <y>10</y>
-      <width>121</width>
+      <width>141</width>
       <height>91</height>
      </rect>
     </property>
@@ -343,10 +352,15 @@
       <rect>
        <x>20</x>
        <y>20</y>
-       <width>91</width>
+       <width>111</width>
        <height>23</height>
       </rect>
      </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
      <property name="text">
       <string>Démarrer test</string>
      </property>
@@ -356,10 +370,15 @@
       <rect>
        <x>20</x>
        <y>50</y>
-       <width>91</width>
+       <width>111</width>
        <height>23</height>
       </rect>
      </property>
+     <property name="font">
+      <font>
+       <pointsize>11</pointsize>
+      </font>
+     </property>
      <property name="text">
       <string>Réinitialiser test</string>
      </property>
@@ -368,7 +387,7 @@
    <widget class="QGroupBox" name="groupBox_2">
     <property name="geometry">
      <rect>
-      <x>480</x>
+      <x>530</x>
       <y>10</y>
       <width>111</width>
       <height>80</height>
@@ -386,6 +405,11 @@
        <height>23</height>
       </rect>
      </property>
+     <property name="font">
+      <font>
+       <pointsize>12</pointsize>
+      </font>
+     </property>
      <property name="text">
       <string>Exécuter</string>
      </property>
@@ -394,12 +418,17 @@
    <widget class="QPushButton" name="mSaveReportBtn">
     <property name="geometry">
      <rect>
-      <x>480</x>
-      <y>100</y>
-      <width>121</width>
-      <height>23</height>
+      <x>470</x>
+      <y>102</y>
+      <width>161</width>
+      <height>31</height>
      </rect>
     </property>
+    <property name="font">
+     <font>
+      <pointsize>12</pointsize>
+     </font>
+    </property>
     <property name="text">
      <string>Sauvegarder Rapport</string>
     </property>
@@ -408,11 +437,16 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>20</y>
-      <width>201</width>
+      <y>30</y>
+      <width>341</width>
       <height>16</height>
      </rect>
     </property>
+    <property name="font">
+     <font>
+      <pointsize>14</pointsize>
+     </font>
+    </property>
     <property name="text">
      <string>1. Identification du câble: À REMPLIR</string>
     </property>
@@ -421,11 +455,16 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>50</y>
-      <width>201</width>
+      <y>70</y>
+      <width>331</width>
       <height>16</height>
      </rect>
     </property>
+    <property name="font">
+     <font>
+      <pointsize>14</pointsize>
+     </font>
+    </property>
     <property name="text">
      <string>2. Inspection visuelle: À EXÉCUTER</string>
     </property>
@@ -434,13 +473,18 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>80</y>
-      <width>271</width>
+      <y>110</y>
+      <width>451</width>
       <height>16</height>
      </rect>
     </property>
+    <property name="font">
+     <font>
+      <pointsize>14</pointsize>
+     </font>
+    </property>
     <property name="text">
-     <string>3. Sélection du connecteur d'entrée: À SÉLECTIONNER</string>
+     <string>3. Sélection du connecteur d'entrée: À FAIRE</string>
     </property>
    </widget>
   </widget>
@@ -493,8 +537,8 @@
    <widget class="QLabel" name="mAutoTestResultLabel">
     <property name="geometry">
      <rect>
-      <x>30</x>
-      <y>40</y>
+      <x>20</x>
+      <y>30</y>
       <width>181</width>
       <height>41</height>
      </rect>
@@ -514,17 +558,53 @@
    <widget class="QPushButton" name="mOpenReportBtn">
     <property name="geometry">
      <rect>
-      <x>70</x>
-      <y>100</y>
-      <width>101</width>
-      <height>23</height>
+      <x>40</x>
+      <y>90</y>
+      <width>141</width>
+      <height>31</height>
      </rect>
     </property>
+    <property name="font">
+     <font>
+      <pointsize>12</pointsize>
+     </font>
+    </property>
     <property name="text">
      <string>Ouvrir Rapport</string>
     </property>
    </widget>
   </widget>
+  <widget class="CConnectorTestVisualizationWidget" name="mOutputTestVisualisationWidget" native="true">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>410</y>
+     <width>461</width>
+     <height>351</height>
+    </rect>
+   </property>
+   <property name="autoFillBackground">
+    <bool>false</bool>
+   </property>
+  </widget>
+  <widget class="QLabel" name="mOutputContactsTextLabel">
+   <property name="geometry">
+    <rect>
+     <x>190</x>
+     <y>370</y>
+     <width>221</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>16</pointsize>
+    </font>
+   </property>
+   <property name="text">
+    <string>Contacts sortie</string>
+   </property>
+  </widget>
  </widget>
  <customwidgets>
   <customwidget>

Sources/IOModulesInterface.cpp

@@ -11,6 +11,7 @@ CIOModulesInterface::CIOModulesInterface()
 //    mIOModulesQueryTimer->setInterval(IO_MODULES_REFRESH_INTERVAL);
 //    mIOModulesQueryTimer->setSingleShot(true);
 
+    hndl=0;
 
 
 
@@ -69,11 +70,15 @@ int CIOModulesInterface::OpenIOModules(QString IPAddress)
 
     ResetOutputs();
 
+
     return RET_OK;
 }
 
 int CIOModulesInterface::CloseIOModules()
 {
+    if(hndl == 0)
+        return RET_ERROR;
+
  //   mIOModulesQueryTimer->stop();
     int ret = SM_Close(&hndl);
 
@@ -93,6 +98,7 @@ int CIOModulesInterface::CloseIOModules()
 
 void CIOModulesInterface::IOModulesQueryTimerExpired()
 {
+
     DoAllIOTransactions();
  //   mIOModulesQueryTimer->start();
     qDebug("timerout");
@@ -100,6 +106,9 @@ void CIOModulesInterface::IOModulesQueryTimerExpired()
 
 int CIOModulesInterface::ReadInputModules()
 {
+    if(hndl == 0)
+        return RET_ERROR;
+
     unsigned char TempBuf[4];
 
     SM_SelectDevice(hndl,INPUTS_MODULE_1_SLAVE_ID);
@@ -123,6 +132,9 @@ int CIOModulesInterface::ReadInputModules()
 
 int CIOModulesInterface::WriteOutputModules()
 {
+    if(hndl == 0)
+        return RET_ERROR;
+
     SM_SelectDevice(hndl,OUTPUTS_MODULE_1_SLAVE_ID);
     SM_WriteDigitalOutputs(hndl,0,32,&mOutputsBuffer[0]);
 
@@ -140,6 +152,9 @@ int CIOModulesInterface::WriteOutputModules()
 
 int CIOModulesInterface::ReadOutputStates()
 {
+    if(hndl == 0)
+        return RET_ERROR;
+
     unsigned char TempBuf[4];
 
     SM_SelectDevice(hndl,OUTPUTS_MODULE_1_SLAVE_ID);

Sources/MainWindow.cpp

@@ -27,9 +27,6 @@ MainWindow::MainWindow(QWidget *parent,CCableTestBench* ProgramHandle)
 
     //setCentralWidget(mVisualInspPage);
 
-
-
-
 }
 
 MainWindow::~MainWindow()

Sources/OptionsPage.ui

@@ -18,7 +18,7 @@
     <rect>
      <x>170</x>
      <y>40</y>
-     <width>181</width>
+     <width>321</width>
      <height>31</height>
     </rect>
    </property>
@@ -53,15 +53,15 @@
   <widget class="QLabel" name="label_3">
    <property name="geometry">
     <rect>
-     <x>140</x>
+     <x>100</x>
      <y>110</y>
-     <width>171</width>
+     <width>211</width>
      <height>20</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>10</pointsize>
+     <pointsize>12</pointsize>
     </font>
    </property>
    <property name="text">
@@ -71,12 +71,17 @@
   <widget class="QSpinBox" name="mIPAdd1SpinBox">
    <property name="geometry">
     <rect>
-     <x>140</x>
+     <x>131</x>
      <y>361</y>
-     <width>42</width>
+     <width>51</width>
      <height>22</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>11</pointsize>
+    </font>
+   </property>
    <property name="maximum">
     <number>255</number>
    </property>
@@ -89,10 +94,15 @@
     <rect>
      <x>190</x>
      <y>361</y>
-     <width>42</width>
+     <width>51</width>
      <height>22</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>11</pointsize>
+    </font>
+   </property>
    <property name="maximum">
     <number>255</number>
    </property>
@@ -103,12 +113,17 @@
   <widget class="QSpinBox" name="mIPAdd3SpinBox">
    <property name="geometry">
     <rect>
-     <x>240</x>
-     <y>361</y>
-     <width>42</width>
+     <x>250</x>
+     <y>360</y>
+     <width>51</width>
      <height>22</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>11</pointsize>
+    </font>
+   </property>
    <property name="maximum">
     <number>255</number>
    </property>
@@ -116,12 +131,17 @@
   <widget class="QSpinBox" name="mIPAdd4SpinBox">
    <property name="geometry">
     <rect>
-     <x>290</x>
-     <y>361</y>
-     <width>42</width>
+     <x>300</x>
+     <y>360</y>
+     <width>51</width>
      <height>22</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>11</pointsize>
+    </font>
+   </property>
    <property name="maximum">
     <number>255</number>
    </property>
@@ -140,7 +160,7 @@
    </property>
    <property name="font">
     <font>
-     <pointsize>10</pointsize>
+     <pointsize>12</pointsize>
     </font>
    </property>
    <property name="text">
@@ -153,10 +173,15 @@
     <rect>
      <x>170</x>
      <y>470</y>
-     <width>131</width>
+     <width>181</width>
      <height>23</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>11</pointsize>
+    </font>
+   </property>
    <property name="text">
     <string>Appliquer &amp;&amp; Sauvegarder</string>
    </property>
@@ -166,10 +191,15 @@
     <rect>
      <x>140</x>
      <y>160</y>
-     <width>221</width>
-     <height>17</height>
+     <width>321</width>
+     <height>21</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
    <property name="text">
     <string>Ignorer l'inspection visuelle</string>
    </property>
@@ -179,10 +209,15 @@
     <rect>
      <x>140</x>
      <y>200</y>
-     <width>221</width>
+     <width>321</width>
      <height>17</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
    <property name="text">
     <string>Inclure LOG dans le rapport</string>
    </property>
@@ -192,10 +227,15 @@
     <rect>
      <x>140</x>
      <y>240</y>
-     <width>221</width>
+     <width>281</width>
      <height>17</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
    <property name="text">
     <string>Exécuter 2è passe de tests</string>
    </property>

Sources/TestBenchVersion.h

@@ -2,11 +2,18 @@
 #define TESTBENCHVERSION_H
 
 
-#define TEST_BENCH_VERSION "V1.0"
+#define TEST_BENCH_VERSION "V1.2"
 
 //LOG DES CHANGEMENTS
 
+//Version 1.1
+//- Correction d'un bug qui testait 108 points pour le
+//  connecteur 90 points, il manquait la partie du rapport...
 
+//Version 1.1
+//- Ajustements suite aux premiers essais à l'atelier
+//- Correction d'un bug qui testait 108 points pour le
+//  connecteur 90 points.
 
 //Version 0.10_ING_DEV
 //-Version de développement, pré-production

Sources/VisualInspectionPage.ui

@@ -17,9 +17,9 @@
    <property name="geometry">
     <rect>
      <x>230</x>
-     <y>30</y>
-     <width>611</width>
-     <height>81</height>
+     <y>10</y>
+     <width>771</width>
+     <height>101</height>
     </rect>
    </property>
    <property name="font">
@@ -38,13 +38,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
     <rect>
      <x>380</x>
      <y>230</y>
-     <width>261</width>
-     <height>16</height>
+     <width>411</width>
+     <height>21</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>12</pointsize>
+     <pointsize>14</pointsize>
     </font>
    </property>
    <property name="text">
@@ -56,13 +56,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
     <rect>
      <x>380</x>
      <y>280</y>
-     <width>311</width>
-     <height>16</height>
+     <width>441</width>
+     <height>31</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>12</pointsize>
+     <pointsize>14</pointsize>
     </font>
    </property>
    <property name="text">
@@ -74,13 +74,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
     <rect>
      <x>380</x>
      <y>330</y>
-     <width>311</width>
-     <height>16</height>
+     <width>511</width>
+     <height>21</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>12</pointsize>
+     <pointsize>14</pointsize>
     </font>
    </property>
    <property name="text">
@@ -92,13 +92,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
     <rect>
      <x>380</x>
      <y>380</y>
-     <width>471</width>
-     <height>16</height>
+     <width>611</width>
+     <height>21</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>12</pointsize>
+     <pointsize>14</pointsize>
     </font>
    </property>
    <property name="text">
@@ -110,13 +110,13 @@ ont été complétés (chaque câble doit être vérifié)</string>
     <rect>
      <x>380</x>
      <y>430</y>
-     <width>471</width>
-     <height>16</height>
+     <width>591</width>
+     <height>21</height>
     </rect>
    </property>
    <property name="font">
     <font>
-     <pointsize>12</pointsize>
+     <pointsize>14</pointsize>
     </font>
    </property>
    <property name="text">
@@ -128,7 +128,7 @@ ont été complétés (chaque câble doit être vérifié)</string>
     <rect>
      <x>120</x>
      <y>140</y>
-     <width>811</width>
+     <width>941</width>
      <height>20</height>
     </rect>
    </property>
@@ -146,8 +146,8 @@ ont été complétés (chaque câble doit être vérifié)</string>
     <rect>
      <x>330</x>
      <y>200</y>
-     <width>46</width>
-     <height>13</height>
+     <width>81</width>
+     <height>16</height>
     </rect>
    </property>
    <property name="text">
@@ -159,7 +159,7 @@ ont été complétés (chaque câble doit être vérifié)</string>
     <rect>
      <x>230</x>
      <y>200</y>
-     <width>71</width>
+     <width>91</width>
      <height>16</height>
     </rect>
    </property>
@@ -336,6 +336,11 @@ ont été complétés (chaque câble doit être vérifié)</string>
      <height>23</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
    <property name="text">
     <string>OK</string>
    </property>
@@ -349,6 +354,9 @@ ont été complétés (chaque câble doit être vérifié)</string>
      <height>141</height>
     </rect>
    </property>
+   <property name="frameShadow">
+    <enum>QFrame::Plain</enum>
+   </property>
   </widget>
   <widget class="QLabel" name="label_10">
    <property name="geometry">
@@ -373,10 +381,15 @@ ont été complétés (chaque câble doit être vérifié)</string>
     <rect>
      <x>790</x>
      <y>260</y>
-     <width>75</width>
+     <width>121</width>
      <height>23</height>
     </rect>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
    <property name="text">
     <string>Réinitialiser</string>
    </property>

Sources/Widgets/ConnectorSelectWidget.cpp

@@ -14,7 +14,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
 
     //6 pins
     InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_6_PINS_CONNECTOR_TYPE,this);
-    InputClickZoneHandle->setGeometry(7,149,53,54);
+    InputClickZoneHandle->setGeometry(316,152,53,54);
     InputClickZoneHandle->show();
     InputClickZoneHandle->raise();
     connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -22,7 +22,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
 
     //14 pins
     InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_14_PINS_CONNECTOR_TYPE,this);
-    InputClickZoneHandle->setGeometry(7,23,53,54);
+    InputClickZoneHandle->setGeometry(316,21,53,54);
     InputClickZoneHandle->show();
     InputClickZoneHandle->raise();
     connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -30,7 +30,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
 
     //24 pins
     InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_24_PINS_CONNECTOR_TYPE,this);
-    InputClickZoneHandle->setGeometry(92,23,48,86);
+    InputClickZoneHandle->setGeometry(236,23,48,86);
     InputClickZoneHandle->show();
     InputClickZoneHandle->raise();
     connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -38,7 +38,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
 
     //72 pins
     InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_72_PINS_CONNECTOR_TYPE,this);
-    InputClickZoneHandle->setGeometry(92,149,47,120);
+    InputClickZoneHandle->setGeometry(234,150,47,120);
     InputClickZoneHandle->show();
     InputClickZoneHandle->raise();
     connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -46,7 +46,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
 
     //90 pins
     InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_90_PINS_CONNECTOR_TYPE,this);
-    InputClickZoneHandle->setGeometry(17,286,33,73);
+    InputClickZoneHandle->setGeometry(320,306,33,73);
     InputClickZoneHandle->show();
     InputClickZoneHandle->raise();
     connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -54,7 +54,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
 
     //108 pins
     InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_108_PINS_CONNECTOR_TYPE,this);
-    InputClickZoneHandle->setGeometry(92,308,47,149);
+    InputClickZoneHandle->setGeometry(235,308,47,149);
     InputClickZoneHandle->show();
     InputClickZoneHandle->raise();
     connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -62,7 +62,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
 
     //120 pins
     InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_120_PINS_CONNECTOR_TYPE,this);
-    InputClickZoneHandle->setGeometry(13,382,42,74);
+    InputClickZoneHandle->setGeometry(316,403,42,74);
     InputClickZoneHandle->show();
     InputClickZoneHandle->raise();
     connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@@ -73,35 +73,35 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
 
     //6 pins
     OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_6_PINS_CONNECTOR_TYPE,this);
-    OutputSelectZoneHandle->setGeometry(329,149,38,38);
+    OutputSelectZoneHandle->setGeometry(12,148,38,38);
     OutputSelectZoneHandle->show();
     OutputSelectZoneHandle->raise();
     mOutputSelectZoneList.append(OutputSelectZoneHandle);
 
     //14 pins
     OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_14_PINS_CONNECTOR_TYPE,this);
-    OutputSelectZoneHandle->setGeometry(327,23,41,42);
+    OutputSelectZoneHandle->setGeometry(13,24,41,42);
     OutputSelectZoneHandle->show();
     OutputSelectZoneHandle->raise();
     mOutputSelectZoneList.append(OutputSelectZoneHandle);
 
     //24 pins
     OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_24_PINS_CONNECTOR_TYPE,this);
-    OutputSelectZoneHandle->setGeometry(235,23,48,86);
+    OutputSelectZoneHandle->setGeometry(91,23,48,86);
     OutputSelectZoneHandle->show();
     OutputSelectZoneHandle->raise();
     mOutputSelectZoneList.append(OutputSelectZoneHandle);
 
     //72 pins
     OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_72_PINS_CONNECTOR_TYPE,this);
-    OutputSelectZoneHandle->setGeometry(235,149,46,121);
+    OutputSelectZoneHandle->setGeometry(92,150,46,121);
     OutputSelectZoneHandle->show();
     OutputSelectZoneHandle->raise();
     mOutputSelectZoneList.append(OutputSelectZoneHandle);
 
     //108 pins
     OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_108_PINS_CONNECTOR_TYPE,this);
-    OutputSelectZoneHandle->setGeometry(235,308,47,148);
+    OutputSelectZoneHandle->setGeometry(92,308,47,148);
     OutputSelectZoneHandle->show();
     OutputSelectZoneHandle->raise();
     mOutputSelectZoneList.append(OutputSelectZoneHandle);

ui_CMainPage.h

@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'CMainPage.ui'
 **
-** Created: Tue May 14 11:42:48 2019
+** Created: Fri Dec 6 12:10:43 2019
 **      by: Qt User Interface Compiler version 4.8.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!

ui_CableTestPage.h

@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'CableTestPage.ui'
 **
-** Created: Tue May 14 11:42:48 2019
+** Created: Fri Dec 6 12:10:44 2019
 **      by: Qt User Interface Compiler version 4.8.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -51,10 +51,8 @@ public:
     QLabel *mInspectionDoneIcon;
     CConnectorTestVisualizationWidget *mInputTestVisualisationWidget;
     QFrame *line;
-    CConnectorTestVisualizationWidget *mOutputTestVisualisationWidget;
     QFrame *line_2;
     QLabel *mInputContactsTextLabel;
-    QLabel *mOutputContactsTextLabel;
     QPushButton *mNewCableBtn;
     QFrame *frame;
     QGroupBox *groupBox;
@@ -71,6 +69,8 @@ public:
     QGroupBox *groupBox_3;
     QLabel *mAutoTestResultLabel;
     QPushButton *mOpenReportBtn;
+    CConnectorTestVisualizationWidget *mOutputTestVisualisationWidget;
+    QLabel *mOutputContactsTextLabel;
 
     void setupUi(QWidget *CCableTestPage)
     {
@@ -80,72 +80,83 @@ public:
         mConnectorSelectWidget = new CConnectorSelectWidget(CCableTestPage);
         mConnectorSelectWidget->setObjectName(QString::fromUtf8("mConnectorSelectWidget"));
         mConnectorSelectWidget->setGeometry(QRect(970, 10, 376, 537));
+        QFont font;
+        font.setPointSize(11);
+        mConnectorSelectWidget->setFont(font);
         mCableConfigFrame = new QFrame(CCableTestPage);
         mCableConfigFrame->setObjectName(QString::fromUtf8("mCableConfigFrame"));
-        mCableConfigFrame->setGeometry(QRect(50, 50, 471, 121));
+        mCableConfigFrame->setGeometry(QRect(50, 40, 471, 161));
         mCableConfigFrame->setFrameShape(QFrame::WinPanel);
         mCableConfigFrame->setFrameShadow(QFrame::Raised);
         mCableConfigFrame->setLineWidth(3);
         layoutWidget = new QWidget(CCableTestPage);
         layoutWidget->setObjectName(QString::fromUtf8("layoutWidget"));
-        layoutWidget->setGeometry(QRect(60, 60, 451, 100));
+        layoutWidget->setGeometry(QRect(60, 50, 451, 144));
         gridLayout = new QGridLayout(layoutWidget);
         gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         gridLayout->setContentsMargins(0, 0, 0, 0);
         mNomTesteurLabel = new QLabel(layoutWidget);
         mNomTesteurLabel->setObjectName(QString::fromUtf8("mNomTesteurLabel"));
-        QFont font;
-        font.setPointSize(12);
-        mNomTesteurLabel->setFont(font);
+        QFont font1;
+        font1.setPointSize(14);
+        mNomTesteurLabel->setFont(font1);
 
         gridLayout->addWidget(mNomTesteurLabel, 3, 0, 1, 1, Qt::AlignRight);
 
         mTypeCableCombo = new QComboBox(layoutWidget);
         mTypeCableCombo->setObjectName(QString::fromUtf8("mTypeCableCombo"));
+        mTypeCableCombo->setFont(font1);
 
         gridLayout->addWidget(mTypeCableCombo, 2, 1, 1, 2);
 
         mIdentCableEditBox = new QLineEdit(layoutWidget);
         mIdentCableEditBox->setObjectName(QString::fromUtf8("mIdentCableEditBox"));
+        mIdentCableEditBox->setFont(font1);
 
         gridLayout->addWidget(mIdentCableEditBox, 1, 1, 1, 2);
 
         mStationNameCombo = new QComboBox(layoutWidget);
         mStationNameCombo->setObjectName(QString::fromUtf8("mStationNameCombo"));
+        mStationNameCombo->setFont(font1);
 
         gridLayout->addWidget(mStationNameCombo, 0, 1, 1, 2);
 
         StationNameLabel = new QLabel(layoutWidget);
         StationNameLabel->setObjectName(QString::fromUtf8("StationNameLabel"));
-        StationNameLabel->setFont(font);
+        StationNameLabel->setFont(font1);
 
         gridLayout->addWidget(StationNameLabel, 0, 0, 1, 1, Qt::AlignRight);
 
         mTypeCableLabel = new QLabel(layoutWidget);
         mTypeCableLabel->setObjectName(QString::fromUtf8("mTypeCableLabel"));
-        mTypeCableLabel->setFont(font);
+        mTypeCableLabel->setFont(font1);
 
         gridLayout->addWidget(mTypeCableLabel, 2, 0, 1, 1, Qt::AlignRight);
 
         mIdentCableLabel = new QLabel(layoutWidget);
         mIdentCableLabel->setObjectName(QString::fromUtf8("mIdentCableLabel"));
-        mIdentCableLabel->setFont(font);
+        mIdentCableLabel->setFont(font1);
 
         gridLayout->addWidget(mIdentCableLabel, 1, 0, 1, 1);
 
         mNomTesteurEditBox = new QLineEdit(layoutWidget);
         mNomTesteurEditBox->setObjectName(QString::fromUtf8("mNomTesteurEditBox"));
+        mNomTesteurEditBox->setFont(font1);
 
         gridLayout->addWidget(mNomTesteurEditBox, 3, 1, 1, 2);
 
         mCableConfigLabel = new QLabel(CCableTestPage);
         mCableConfigLabel->setObjectName(QString::fromUtf8("mCableConfigLabel"));
-        mCableConfigLabel->setGeometry(QRect(60, 20, 271, 20));
-        mCableConfigLabel->setFont(font);
+        mCableConfigLabel->setGeometry(QRect(60, 10, 271, 20));
+        QFont font2;
+        font2.setPointSize(16);
+        mCableConfigLabel->setFont(font2);
         mInspVisuelleLabel = new QLabel(CCableTestPage);
         mInspVisuelleLabel->setObjectName(QString::fromUtf8("mInspVisuelleLabel"));
         mInspVisuelleLabel->setGeometry(QRect(600, 20, 271, 20));
-        mInspVisuelleLabel->setFont(font);
+        QFont font3;
+        font3.setPointSize(12);
+        mInspVisuelleLabel->setFont(font3);
         mInspVisuelleFrame = new QFrame(CCableTestPage);
         mInspVisuelleFrame->setObjectName(QString::fromUtf8("mInspVisuelleFrame"));
         mInspVisuelleFrame->setGeometry(QRect(600, 40, 291, 121));
@@ -154,23 +165,20 @@ public:
         mInspVisuelleFrame->setLineWidth(3);
         mExecInspVisuelleBtn = new QPushButton(mInspVisuelleFrame);
         mExecInspVisuelleBtn->setObjectName(QString::fromUtf8("mExecInspVisuelleBtn"));
-        mExecInspVisuelleBtn->setGeometry(QRect(10, 50, 121, 23));
+        mExecInspVisuelleBtn->setGeometry(QRect(10, 30, 101, 51));
+        mExecInspVisuelleBtn->setFont(font3);
         mInspectionDoneIcon = new QLabel(mInspVisuelleFrame);
         mInspectionDoneIcon->setObjectName(QString::fromUtf8("mInspectionDoneIcon"));
         mInspectionDoneIcon->setGeometry(QRect(160, 20, 101, 91));
         mInputTestVisualisationWidget = new CConnectorTestVisualizationWidget(CCableTestPage);
         mInputTestVisualisationWidget->setObjectName(QString::fromUtf8("mInputTestVisualisationWidget"));
-        mInputTestVisualisationWidget->setGeometry(QRect(10, 410, 461, 351));
+        mInputTestVisualisationWidget->setGeometry(QRect(500, 410, 461, 351));
         mInputTestVisualisationWidget->setAutoFillBackground(false);
         line = new QFrame(CCableTestPage);
         line->setObjectName(QString::fromUtf8("line"));
         line->setGeometry(QRect(30, 360, 901, 20));
         line->setFrameShape(QFrame::HLine);
         line->setFrameShadow(QFrame::Sunken);
-        mOutputTestVisualisationWidget = new CConnectorTestVisualizationWidget(CCableTestPage);
-        mOutputTestVisualisationWidget->setObjectName(QString::fromUtf8("mOutputTestVisualisationWidget"));
-        mOutputTestVisualisationWidget->setGeometry(QRect(500, 410, 461, 351));
-        mOutputTestVisualisationWidget->setAutoFillBackground(false);
         line_2 = new QFrame(CCableTestPage);
         line_2->setObjectName(QString::fromUtf8("line_2"));
         line_2->setGeometry(QRect(480, 390, 20, 371));
@@ -178,53 +186,55 @@ public:
         line_2->setFrameShadow(QFrame::Sunken);
         mInputContactsTextLabel = new QLabel(CCableTestPage);
         mInputContactsTextLabel->setObjectName(QString::fromUtf8("mInputContactsTextLabel"));
-        mInputContactsTextLabel->setGeometry(QRect(130, 370, 161, 41));
-        QFont font1;
-        font1.setPointSize(16);
-        mInputContactsTextLabel->setFont(font1);
-        mOutputContactsTextLabel = new QLabel(CCableTestPage);
-        mOutputContactsTextLabel->setObjectName(QString::fromUtf8("mOutputContactsTextLabel"));
-        mOutputContactsTextLabel->setGeometry(QRect(670, 370, 161, 41));
-        mOutputContactsTextLabel->setFont(font1);
+        mInputContactsTextLabel->setGeometry(QRect(620, 370, 241, 41));
+        mInputContactsTextLabel->setFont(font2);
         mNewCableBtn = new QPushButton(CCableTestPage);
         mNewCableBtn->setObjectName(QString::fromUtf8("mNewCableBtn"));
-        mNewCableBtn->setGeometry(QRect(430, 20, 91, 23));
+        mNewCableBtn->setGeometry(QRect(400, 10, 121, 23));
+        mNewCableBtn->setFont(font3);
         frame = new QFrame(CCableTestPage);
         frame->setObjectName(QString::fromUtf8("frame"));
-        frame->setGeometry(QRect(50, 220, 621, 131));
+        frame->setGeometry(QRect(50, 220, 661, 141));
         frame->setFrameShape(QFrame::Box);
         frame->setFrameShadow(QFrame::Raised);
         groupBox = new QGroupBox(frame);
         groupBox->setObjectName(QString::fromUtf8("groupBox"));
-        groupBox->setGeometry(QRect(310, 10, 121, 91));
+        groupBox->setGeometry(QRect(360, 10, 141, 91));
         mStartTestBtn = new QPushButton(groupBox);
         mStartTestBtn->setObjectName(QString::fromUtf8("mStartTestBtn"));
-        mStartTestBtn->setGeometry(QRect(20, 20, 91, 23));
+        mStartTestBtn->setGeometry(QRect(20, 20, 111, 23));
+        mStartTestBtn->setFont(font);
         mReinitTestBtn = new QPushButton(groupBox);
         mReinitTestBtn->setObjectName(QString::fromUtf8("mReinitTestBtn"));
-        mReinitTestBtn->setGeometry(QRect(20, 50, 91, 23));
+        mReinitTestBtn->setGeometry(QRect(20, 50, 111, 23));
+        mReinitTestBtn->setFont(font);
         groupBox_2 = new QGroupBox(frame);
         groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
-        groupBox_2->setGeometry(QRect(480, 10, 111, 80));
+        groupBox_2->setGeometry(QRect(530, 10, 111, 80));
         mStartManualTestBtn = new QPushButton(groupBox_2);
         mStartManualTestBtn->setObjectName(QString::fromUtf8("mStartManualTestBtn"));
         mStartManualTestBtn->setGeometry(QRect(20, 30, 75, 23));
+        mStartManualTestBtn->setFont(font3);
         mSaveReportBtn = new QPushButton(frame);
         mSaveReportBtn->setObjectName(QString::fromUtf8("mSaveReportBtn"));
-        mSaveReportBtn->setGeometry(QRect(480, 100, 121, 23));
+        mSaveReportBtn->setGeometry(QRect(470, 102, 161, 31));
+        mSaveReportBtn->setFont(font3);
         mCableIdentStepLabel = new QLabel(frame);
         mCableIdentStepLabel->setObjectName(QString::fromUtf8("mCableIdentStepLabel"));
-        mCableIdentStepLabel->setGeometry(QRect(20, 20, 201, 16));
+        mCableIdentStepLabel->setGeometry(QRect(20, 30, 341, 16));
+        mCableIdentStepLabel->setFont(font1);
         mVisualInspectionStepLabel = new QLabel(frame);
         mVisualInspectionStepLabel->setObjectName(QString::fromUtf8("mVisualInspectionStepLabel"));
-        mVisualInspectionStepLabel->setGeometry(QRect(20, 50, 201, 16));
+        mVisualInspectionStepLabel->setGeometry(QRect(20, 70, 331, 16));
+        mVisualInspectionStepLabel->setFont(font1);
         mConnectorSelStepLabel = new QLabel(frame);
         mConnectorSelStepLabel->setObjectName(QString::fromUtf8("mConnectorSelStepLabel"));
-        mConnectorSelStepLabel->setGeometry(QRect(20, 80, 271, 16));
+        mConnectorSelStepLabel->setGeometry(QRect(20, 110, 451, 16));
+        mConnectorSelStepLabel->setFont(font1);
         mInspVisuelleLabel_2 = new QLabel(CCableTestPage);
         mInspVisuelleLabel_2->setObjectName(QString::fromUtf8("mInspVisuelleLabel_2"));
         mInspVisuelleLabel_2->setGeometry(QRect(50, 200, 221, 20));
-        mInspVisuelleLabel_2->setFont(font);
+        mInspVisuelleLabel_2->setFont(font3);
         mTestLogTextBox = new QTextBrowser(CCableTestPage);
         mTestLogTextBox->setObjectName(QString::fromUtf8("mTestLogTextBox"));
         mTestLogTextBox->setGeometry(QRect(970, 550, 381, 201));
@@ -235,14 +245,23 @@ public:
         groupBox_3->setGeometry(QRect(720, 220, 231, 131));
         mAutoTestResultLabel = new QLabel(groupBox_3);
         mAutoTestResultLabel->setObjectName(QString::fromUtf8("mAutoTestResultLabel"));
-        mAutoTestResultLabel->setGeometry(QRect(30, 40, 181, 41));
-        QFont font2;
-        font2.setPointSize(26);
-        mAutoTestResultLabel->setFont(font2);
+        mAutoTestResultLabel->setGeometry(QRect(20, 30, 181, 41));
+        QFont font4;
+        font4.setPointSize(26);
+        mAutoTestResultLabel->setFont(font4);
         mAutoTestResultLabel->setAlignment(Qt::AlignCenter);
         mOpenReportBtn = new QPushButton(groupBox_3);
         mOpenReportBtn->setObjectName(QString::fromUtf8("mOpenReportBtn"));
-        mOpenReportBtn->setGeometry(QRect(70, 100, 101, 23));
+        mOpenReportBtn->setGeometry(QRect(40, 90, 141, 31));
+        mOpenReportBtn->setFont(font3);
+        mOutputTestVisualisationWidget = new CConnectorTestVisualizationWidget(CCableTestPage);
+        mOutputTestVisualisationWidget->setObjectName(QString::fromUtf8("mOutputTestVisualisationWidget"));
+        mOutputTestVisualisationWidget->setGeometry(QRect(20, 410, 461, 351));
+        mOutputTestVisualisationWidget->setAutoFillBackground(false);
+        mOutputContactsTextLabel = new QLabel(CCableTestPage);
+        mOutputContactsTextLabel->setObjectName(QString::fromUtf8("mOutputContactsTextLabel"));
+        mOutputContactsTextLabel->setGeometry(QRect(190, 370, 221, 41));
+        mOutputContactsTextLabel->setFont(font2);
 
         retranslateUi(CCableTestPage);
 
@@ -264,10 +283,10 @@ public:
         mNomTesteurEditBox->setText(QString());
         mCableConfigLabel->setText(QApplication::translate("CCableTestPage", "Configuration du c\303\242ble", 0, QApplication::UnicodeUTF8));
         mInspVisuelleLabel->setText(QApplication::translate("CCableTestPage", "Inspection visuelle", 0, QApplication::UnicodeUTF8));
-        mExecInspVisuelleBtn->setText(QApplication::translate("CCableTestPage", "Effectuer Inspection", 0, QApplication::UnicodeUTF8));
+        mExecInspVisuelleBtn->setText(QApplication::translate("CCableTestPage", "Effectuer\n"
+" Inspection", 0, QApplication::UnicodeUTF8));
         mInspectionDoneIcon->setText(QApplication::translate("CCableTestPage", "TextLabel", 0, QApplication::UnicodeUTF8));
         mInputContactsTextLabel->setText(QApplication::translate("CCableTestPage", "Contacts entr\303\251e", 0, QApplication::UnicodeUTF8));
-        mOutputContactsTextLabel->setText(QApplication::translate("CCableTestPage", "Contacts sortie", 0, QApplication::UnicodeUTF8));
         mNewCableBtn->setText(QApplication::translate("CCableTestPage", "Nouveau C\303\242ble", 0, QApplication::UnicodeUTF8));
         groupBox->setTitle(QApplication::translate("CCableTestPage", "Test Automatique", 0, QApplication::UnicodeUTF8));
         mStartTestBtn->setText(QApplication::translate("CCableTestPage", "D\303\251marrer test", 0, QApplication::UnicodeUTF8));
@@ -277,11 +296,12 @@ public:
         mSaveReportBtn->setText(QApplication::translate("CCableTestPage", "Sauvegarder Rapport", 0, QApplication::UnicodeUTF8));
         mCableIdentStepLabel->setText(QApplication::translate("CCableTestPage", "1. Identification du c\303\242ble: \303\200 REMPLIR", 0, QApplication::UnicodeUTF8));
         mVisualInspectionStepLabel->setText(QApplication::translate("CCableTestPage", "2. Inspection visuelle: \303\200 EX\303\211CUTER", 0, QApplication::UnicodeUTF8));
-        mConnectorSelStepLabel->setText(QApplication::translate("CCableTestPage", "3. S\303\251lection du connecteur d'entr\303\251e: \303\200 S\303\211LECTIONNER", 0, QApplication::UnicodeUTF8));
+        mConnectorSelStepLabel->setText(QApplication::translate("CCableTestPage", "3. S\303\251lection du connecteur d'entr\303\251e: \303\200 FAIRE", 0, QApplication::UnicodeUTF8));
         mInspVisuelleLabel_2->setText(QApplication::translate("CCableTestPage", "Contr\303\264le du test \303\251lectrique", 0, QApplication::UnicodeUTF8));
         groupBox_3->setTitle(QApplication::translate("CCableTestPage", "R\303\251sultat du test", 0, QApplication::UnicodeUTF8));
         mAutoTestResultLabel->setText(QApplication::translate("CCableTestPage", "En cours...", 0, QApplication::UnicodeUTF8));
         mOpenReportBtn->setText(QApplication::translate("CCableTestPage", "Ouvrir Rapport", 0, QApplication::UnicodeUTF8));
+        mOutputContactsTextLabel->setText(QApplication::translate("CCableTestPage", "Contacts sortie", 0, QApplication::UnicodeUTF8));
     } // retranslateUi
 
 };

ui_OptionsPage.h

@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'OptionsPage.ui'
 **
-** Created: Tue May 14 11:42:48 2019
+** Created: Fri Dec 6 12:10:44 2019
 **      by: Qt User Interface Compiler version 4.8.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -46,7 +46,7 @@ public:
         COptionsPage->resize(564, 647);
         label_2 = new QLabel(COptionsPage);
         label_2->setObjectName(QString::fromUtf8("label_2"));
-        label_2->setGeometry(QRect(170, 40, 181, 31));
+        label_2->setGeometry(QRect(170, 40, 321, 31));
         QFont font;
         font.setPointSize(14);
         label_2->setFont(font);
@@ -58,27 +58,33 @@ public:
         mTestHoldTimeHighSpinBx->setValue(1000);
         label_3 = new QLabel(COptionsPage);
         label_3->setObjectName(QString::fromUtf8("label_3"));
-        label_3->setGeometry(QRect(140, 110, 171, 20));
+        label_3->setGeometry(QRect(100, 110, 211, 20));
         QFont font1;
-        font1.setPointSize(10);
+        font1.setPointSize(12);
         label_3->setFont(font1);
         mIPAdd1SpinBox = new QSpinBox(COptionsPage);
         mIPAdd1SpinBox->setObjectName(QString::fromUtf8("mIPAdd1SpinBox"));
-        mIPAdd1SpinBox->setGeometry(QRect(140, 361, 42, 22));
+        mIPAdd1SpinBox->setGeometry(QRect(131, 361, 51, 22));
+        QFont font2;
+        font2.setPointSize(11);
+        mIPAdd1SpinBox->setFont(font2);
         mIPAdd1SpinBox->setMaximum(255);
         mIPAdd1SpinBox->setValue(192);
         mIPAdd2SpinBox = new QSpinBox(COptionsPage);
         mIPAdd2SpinBox->setObjectName(QString::fromUtf8("mIPAdd2SpinBox"));
-        mIPAdd2SpinBox->setGeometry(QRect(190, 361, 42, 22));
+        mIPAdd2SpinBox->setGeometry(QRect(190, 361, 51, 22));
+        mIPAdd2SpinBox->setFont(font2);
         mIPAdd2SpinBox->setMaximum(255);
         mIPAdd2SpinBox->setValue(168);
         mIPAdd3SpinBox = new QSpinBox(COptionsPage);
         mIPAdd3SpinBox->setObjectName(QString::fromUtf8("mIPAdd3SpinBox"));
-        mIPAdd3SpinBox->setGeometry(QRect(240, 361, 42, 22));
+        mIPAdd3SpinBox->setGeometry(QRect(250, 360, 51, 22));
+        mIPAdd3SpinBox->setFont(font2);
         mIPAdd3SpinBox->setMaximum(255);
         mIPAdd4SpinBox = new QSpinBox(COptionsPage);
         mIPAdd4SpinBox->setObjectName(QString::fromUtf8("mIPAdd4SpinBox"));
-        mIPAdd4SpinBox->setGeometry(QRect(290, 361, 42, 22));
+        mIPAdd4SpinBox->setGeometry(QRect(300, 360, 51, 22));
+        mIPAdd4SpinBox->setFont(font2);
         mIPAdd4SpinBox->setMaximum(255);
         mIPAdd4SpinBox->setValue(52);
         label_5 = new QLabel(COptionsPage);
@@ -87,16 +93,20 @@ public:
         label_5->setFont(font1);
         mApplyAndSaveBtn = new QPushButton(COptionsPage);
         mApplyAndSaveBtn->setObjectName(QString::fromUtf8("mApplyAndSaveBtn"));
-        mApplyAndSaveBtn->setGeometry(QRect(170, 470, 131, 23));
+        mApplyAndSaveBtn->setGeometry(QRect(170, 470, 181, 23));
+        mApplyAndSaveBtn->setFont(font2);
         mIgnoreVisualInspChkBx = new QCheckBox(COptionsPage);
         mIgnoreVisualInspChkBx->setObjectName(QString::fromUtf8("mIgnoreVisualInspChkBx"));
-        mIgnoreVisualInspChkBx->setGeometry(QRect(140, 160, 221, 17));
+        mIgnoreVisualInspChkBx->setGeometry(QRect(140, 160, 321, 21));
+        mIgnoreVisualInspChkBx->setFont(font1);
         mIncludeLogInReportChkBx = new QCheckBox(COptionsPage);
         mIncludeLogInReportChkBx->setObjectName(QString::fromUtf8("mIncludeLogInReportChkBx"));
-        mIncludeLogInReportChkBx->setGeometry(QRect(140, 200, 221, 17));
+        mIncludeLogInReportChkBx->setGeometry(QRect(140, 200, 321, 17));
+        mIncludeLogInReportChkBx->setFont(font1);
         mExecSecondTestChkBx = new QCheckBox(COptionsPage);
         mExecSecondTestChkBx->setObjectName(QString::fromUtf8("mExecSecondTestChkBx"));
-        mExecSecondTestChkBx->setGeometry(QRect(140, 240, 221, 17));
+        mExecSecondTestChkBx->setGeometry(QRect(140, 240, 281, 17));
+        mExecSecondTestChkBx->setFont(font1);
 
         retranslateUi(COptionsPage);
 

ui_VisualInspectionPage.h

@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'VisualInspectionPage.ui'
 **
-** Created: Tue May 14 11:42:48 2019
+** Created: Fri Dec 6 12:10:44 2019
 **      by: Qt User Interface Compiler version 4.8.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
@@ -57,42 +57,42 @@ public:
         CVisualInspectionPage->resize(1103, 710);
         label = new QLabel(CVisualInspectionPage);
         label->setObjectName(QString::fromUtf8("label"));
-        label->setGeometry(QRect(230, 30, 611, 81));
+        label->setGeometry(QRect(230, 10, 771, 101));
         QFont font;
         font.setPointSize(14);
         label->setFont(font);
         label_2 = new QLabel(CVisualInspectionPage);
         label_2->setObjectName(QString::fromUtf8("label_2"));
-        label_2->setGeometry(QRect(380, 230, 261, 16));
-        QFont font1;
-        font1.setPointSize(12);
-        label_2->setFont(font1);
+        label_2->setGeometry(QRect(380, 230, 411, 21));
+        label_2->setFont(font);
         label_3 = new QLabel(CVisualInspectionPage);
         label_3->setObjectName(QString::fromUtf8("label_3"));
-        label_3->setGeometry(QRect(380, 280, 311, 16));
-        label_3->setFont(font1);
+        label_3->setGeometry(QRect(380, 280, 441, 31));
+        label_3->setFont(font);
         label_4 = new QLabel(CVisualInspectionPage);
         label_4->setObjectName(QString::fromUtf8("label_4"));
-        label_4->setGeometry(QRect(380, 330, 311, 16));
-        label_4->setFont(font1);
+        label_4->setGeometry(QRect(380, 330, 511, 21));
+        label_4->setFont(font);
         label_5 = new QLabel(CVisualInspectionPage);
         label_5->setObjectName(QString::fromUtf8("label_5"));
-        label_5->setGeometry(QRect(380, 380, 471, 16));
-        label_5->setFont(font1);
+        label_5->setGeometry(QRect(380, 380, 611, 21));
+        label_5->setFont(font);
         label_6 = new QLabel(CVisualInspectionPage);
         label_6->setObjectName(QString::fromUtf8("label_6"));
-        label_6->setGeometry(QRect(380, 430, 471, 16));
-        label_6->setFont(font1);
+        label_6->setGeometry(QRect(380, 430, 591, 21));
+        label_6->setFont(font);
         label_7 = new QLabel(CVisualInspectionPage);
         label_7->setObjectName(QString::fromUtf8("label_7"));
-        label_7->setGeometry(QRect(120, 140, 811, 20));
+        label_7->setGeometry(QRect(120, 140, 941, 20));
+        QFont font1;
+        font1.setPointSize(12);
         label_7->setFont(font1);
         label_8 = new QLabel(CVisualInspectionPage);
         label_8->setObjectName(QString::fromUtf8("label_8"));
-        label_8->setGeometry(QRect(330, 200, 46, 13));
+        label_8->setGeometry(QRect(330, 200, 81, 16));
         label_9 = new QLabel(CVisualInspectionPage);
         label_9->setObjectName(QString::fromUtf8("label_9"));
-        label_9->setGeometry(QRect(230, 200, 71, 16));
+        label_9->setGeometry(QRect(230, 200, 91, 16));
         mVerif52DoneChkBx = new QCheckBox(CVisualInspectionPage);
         mVerif52DoneChkBx->setObjectName(QString::fromUtf8("mVerif52DoneChkBx"));
         mVerif52DoneChkBx->setGeometry(QRect(340, 230, 21, 17));
@@ -136,16 +136,19 @@ public:
         mOKBtn = new QPushButton(CVisualInspectionPage);
         mOKBtn->setObjectName(QString::fromUtf8("mOKBtn"));
         mOKBtn->setGeometry(QRect(110, 580, 75, 23));
+        mOKBtn->setFont(font1);
         mNotesTextEditBx = new QTextEdit(CVisualInspectionPage);
         mNotesTextEditBx->setObjectName(QString::fromUtf8("mNotesTextEditBx"));
         mNotesTextEditBx->setGeometry(QRect(260, 530, 611, 141));
+        mNotesTextEditBx->setFrameShadow(QFrame::Plain);
         label_10 = new QLabel(CVisualInspectionPage);
         label_10->setObjectName(QString::fromUtf8("label_10"));
         label_10->setGeometry(QRect(260, 500, 811, 20));
         label_10->setFont(font1);
         mResetInspectionFormBtn = new QPushButton(CVisualInspectionPage);
         mResetInspectionFormBtn->setObjectName(QString::fromUtf8("mResetInspectionFormBtn"));
-        mResetInspectionFormBtn->setGeometry(QRect(790, 260, 75, 23));
+        mResetInspectionFormBtn->setGeometry(QRect(790, 260, 121, 23));
+        mResetInspectionFormBtn->setFont(font1);
 
         retranslateUi(CVisualInspectionPage);