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

Développement et correction de bugs.

Browse Source 
V1.2
This commit is contained in:
JF 2019-12-06 12:25:23 -05:00
parent 90f0f33252
commit d27459602d
20 changed files with 460 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Cablotron.csf
View File

Binary file not shown.

84
Makefile
View File

@ -1,14 +1,14 @@
############################################################################# #############################################################################
# Makefile for building: CableTestBench # 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 # Project: CableTestBench.pro
# Template: app # 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 first: release
install: debug-install install: release-install
uninstall: debug-uninstall uninstall: release-uninstall
MAKEFILE = Makefile MAKEFILE = Makefile
QMAKE = c:\Qt\4.8.1\bin\qmake.exe QMAKE = c:\Qt\4.8.1\bin\qmake.exe
DEL_FILE = del DEL_FILE = del
@ -27,25 +27,9 @@ MOVE = move
CHK_DIR_EXISTS= if not exist CHK_DIR_EXISTS= if not exist
MKDIR = mkdir MKDIR = mkdir
SUBTARGETS = \ 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 release: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release $(MAKE) -f $(MAKEFILE).Release
release-make_default: $(MAKEFILE).Release FORCE release-make_default: $(MAKEFILE).Release FORCE
@ -62,6 +46,22 @@ release-install: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release install $(MAKE) -f $(MAKEFILE).Release install
release-uninstall: $(MAKEFILE).Release FORCE release-uninstall: $(MAKEFILE).Release FORCE
$(MAKE) -f $(MAKEFILE).Release uninstall $(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 \ 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 \ ../../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/exclusive_builds.prf \
../../Qt/4.8.1/mkspecs/features/default_pre.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/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/debug_and_release.prf \
../../Qt/4.8.1/mkspecs/features/default_post.prf \ ../../Qt/4.8.1/mkspecs/features/default_post.prf \
../../Qt/4.8.1/mkspecs/features/win32/default_post.prf \ ../../Qt/4.8.1/mkspecs/features/win32/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/rtti.prf \
../../Qt/4.8.1/mkspecs/features/win32/exceptions.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/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/yacc.prf \
../../Qt/4.8.1/mkspecs/features/lex.prf \ ../../Qt/4.8.1/mkspecs/features/lex.prf \
../../Qt/4.8.1/mkspecs/features/include_source_dir.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) -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
..\..\Qt\4.8.1\mkspecs\qconfig.pri: ..\..\Qt\4.8.1\mkspecs\qconfig.pri:
..\..\Qt\4.8.1\mkspecs\modules\qt_webkit_version.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_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\exclusive_builds.prf:
..\..\Qt\4.8.1\mkspecs\features\default_pre.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\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\debug_and_release.prf:
..\..\Qt\4.8.1\mkspecs\features\default_post.prf: ..\..\Qt\4.8.1\mkspecs\features\default_post.prf:
..\..\Qt\4.8.1\mkspecs\features\win32\default_post.prf: ..\..\Qt\4.8.1\mkspecs\features\win32\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\rtti.prf:
..\..\Qt\4.8.1\mkspecs\features\win32\exceptions.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\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\yacc.prf:
..\..\Qt\4.8.1\mkspecs\features\lex.prf: ..\..\Qt\4.8.1\mkspecs\features\lex.prf:
..\..\Qt\4.8.1\mkspecs\features\include_source_dir.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: 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 qmake_all: FORCE
make_default: debug-make_default release-make_default FORCE make_default: release-make_default debug-make_default FORCE
make_first: debug-make_first release-make_first FORCE make_first: release-make_first debug-make_first FORCE
all: debug-all release-all FORCE all: release-all debug-all FORCE
clean: debug-clean release-clean FORCE clean: release-clean debug-clean FORCE
distclean: debug-distclean release-distclean FORCE distclean: release-distclean debug-distclean FORCE
-$(DEL_FILE) Makefile -$(DEL_FILE) Makefile
check: first check: first
debug-mocclean: $(MAKEFILE).Debug
$(MAKE) -f $(MAKEFILE).Debug mocclean
release-mocclean: $(MAKEFILE).Release release-mocclean: $(MAKEFILE).Release
$(MAKE) -f $(MAKEFILE).Release mocclean $(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 release-mocables: $(MAKEFILE).Release
$(MAKE) -f $(MAKEFILE).Release mocables $(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: FORCE:
$(MAKEFILE).Debug: Makefile
$(MAKEFILE).Release: Makefile $(MAKEFILE).Release: Makefile
$(MAKEFILE).Debug: Makefile

6
Makefile.Debug
View File

@ -1,6 +1,6 @@
############################################################################# #############################################################################
# Makefile for building: CableTestBench # 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 # Project: CableTestBench.pro
# Template: app # 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) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.CableTestBench.Debug $(LIBS)
qmake: FORCE 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: 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 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 -$(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

6
Makefile.Release
View File

@ -1,6 +1,6 @@
############################################################################# #############################################################################
# Makefile for building: CableTestBench # 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 # Project: CableTestBench.pro
# Template: app # 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) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.CableTestBench.Release $(LIBS)
qmake: FORCE 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: 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 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 -$(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

8
Sources/CableTestBench.cpp
View File

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

7
Sources/CableTestEngine.cpp
View File

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

8
Sources/CableTestPage.cpp
View File

@ -67,7 +67,7 @@ CCableTestPage::CCableTestPage(QWidget *parent) :
ui->mCableIdentStepLabel->setText("1. Identification du câble: À REMPLIR"); ui->mCableIdentStepLabel->setText("1. Identification du câble: À REMPLIR");
ui->mConnectorSelStepLabel->setPalette(pal); 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) if(Done)
{ {
ui->mInspectionDoneIcon->setPixmap(mInspectionDonePixmap); ui->mInspectionDoneIcon->setPixmap(mInspectionDonePixmap);
ui->mExecInspVisuelleBtn->setText(QString("Réviser Inspection").toUtf8()); ui->mExecInspVisuelleBtn->setText(QString("Réviser\n Inspection").toUtf8());
QPalette pal; QPalette pal;
pal.setColor(QPalette::WindowText,Qt::darkGreen); pal.setColor(QPalette::WindowText,Qt::darkGreen);
@ -100,7 +100,7 @@ int CCableTestPage::SetVisualInspectionDone(bool Done)
else else
{ {
ui->mInspectionDoneIcon->setPixmap(mInspectionNotDonePixmap); ui->mInspectionDoneIcon->setPixmap(mInspectionNotDonePixmap);
ui->mExecInspVisuelleBtn->setText("Effectuer Inspection"); ui->mExecInspVisuelleBtn->setText("Effectuer\n Inspection");
QPalette pal; QPalette pal;
pal.setColor(QPalette::WindowText,Qt::red); pal.setColor(QPalette::WindowText,Qt::red);
@ -124,7 +124,7 @@ int CCableTestPage::SetConnectorSelStep(bool done)
{ {
pal.setColor(QPalette::WindowText,Qt::red); pal.setColor(QPalette::WindowText,Qt::red);
ui->mConnectorSelStepLabel->setPalette(pal); 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; return RET_OK;

230
Sources/CableTestPage.ui
View File

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

15
Sources/IOModulesInterface.cpp
View File

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

3
Sources/MainWindow.cpp
View File

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

78
Sources/OptionsPage.ui
View File

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

9
Sources/TestBenchVersion.h
View File

@ -2,11 +2,18 @@
#define TESTBENCHVERSION_H #define TESTBENCHVERSION_H
#define TEST_BENCH_VERSION "V1.0" #define TEST_BENCH_VERSION "V1.2"
//LOG DES CHANGEMENTS //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 0.10_ING_DEV
//-Version de développement, pré-production //-Version de développement, pré-production

59
Sources/VisualInspectionPage.ui
View File

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

24
Sources/Widgets/ConnectorSelectWidget.cpp
View File

@ -14,7 +14,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//6 pins //6 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_6_PINS_CONNECTOR_TYPE,this); 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->show();
InputClickZoneHandle->raise(); InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@ -22,7 +22,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//14 pins //14 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_14_PINS_CONNECTOR_TYPE,this); 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->show();
InputClickZoneHandle->raise(); InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@ -30,7 +30,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//24 pins //24 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_24_PINS_CONNECTOR_TYPE,this); 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->show();
InputClickZoneHandle->raise(); InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@ -38,7 +38,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//72 pins //72 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_72_PINS_CONNECTOR_TYPE,this); 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->show();
InputClickZoneHandle->raise(); InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@ -46,7 +46,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//90 pins //90 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_90_PINS_CONNECTOR_TYPE,this); 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->show();
InputClickZoneHandle->raise(); InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@ -54,7 +54,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//108 pins //108 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_108_PINS_CONNECTOR_TYPE,this); 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->show();
InputClickZoneHandle->raise(); InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@ -62,7 +62,7 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//120 pins //120 pins
InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_120_PINS_CONNECTOR_TYPE,this); 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->show();
InputClickZoneHandle->raise(); InputClickZoneHandle->raise();
connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*)));
@ -73,35 +73,35 @@ CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) :
//6 pins //6 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_6_PINS_CONNECTOR_TYPE,this); 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->show();
OutputSelectZoneHandle->raise(); OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle); mOutputSelectZoneList.append(OutputSelectZoneHandle);
//14 pins //14 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_14_PINS_CONNECTOR_TYPE,this); 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->show();
OutputSelectZoneHandle->raise(); OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle); mOutputSelectZoneList.append(OutputSelectZoneHandle);
//24 pins //24 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_24_PINS_CONNECTOR_TYPE,this); 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->show();
OutputSelectZoneHandle->raise(); OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle); mOutputSelectZoneList.append(OutputSelectZoneHandle);
//72 pins //72 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_72_PINS_CONNECTOR_TYPE,this); 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->show();
OutputSelectZoneHandle->raise(); OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle); mOutputSelectZoneList.append(OutputSelectZoneHandle);
//108 pins //108 pins
OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_108_PINS_CONNECTOR_TYPE,this); 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->show();
OutputSelectZoneHandle->raise(); OutputSelectZoneHandle->raise();
mOutputSelectZoneList.append(OutputSelectZoneHandle); mOutputSelectZoneList.append(OutputSelectZoneHandle);

BIN
images/connecteurs.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
images/green-led-off-md.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 22 KiB

2
ui_CMainPage.h
View File

@ -1,7 +1,7 @@
/******************************************************************************** /********************************************************************************
** Form generated from reading UI file 'CMainPage.ui' ** 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 ** by: Qt User Interface Compiler version 4.8.1
** **
** WARNING! All changes made in this file will be lost when recompiling UI file! ** WARNING! All changes made in this file will be lost when recompiling UI file!

114
ui_CableTestPage.h
View File

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

34
ui_OptionsPage.h
View File

@ -1,7 +1,7 @@
/******************************************************************************** /********************************************************************************
** Form generated from reading UI file 'OptionsPage.ui' ** 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 ** by: Qt User Interface Compiler version 4.8.1
** **
** WARNING! All changes made in this file will be lost when recompiling UI file! ** WARNING! All changes made in this file will be lost when recompiling UI file!
@ -46,7 +46,7 @@ public:
COptionsPage->resize(564, 647); COptionsPage->resize(564, 647);
label_2 = new QLabel(COptionsPage); label_2 = new QLabel(COptionsPage);
label_2->setObjectName(QString::fromUtf8("label_2")); 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; QFont font;
font.setPointSize(14); font.setPointSize(14);
label_2->setFont(font); label_2->setFont(font);
@ -58,27 +58,33 @@ public:
mTestHoldTimeHighSpinBx->setValue(1000); mTestHoldTimeHighSpinBx->setValue(1000);
label_3 = new QLabel(COptionsPage); label_3 = new QLabel(COptionsPage);
label_3->setObjectName(QString::fromUtf8("label_3")); 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; QFont font1;
font1.setPointSize(10); font1.setPointSize(12);
label_3->setFont(font1); label_3->setFont(font1);
mIPAdd1SpinBox = new QSpinBox(COptionsPage); mIPAdd1SpinBox = new QSpinBox(COptionsPage);
mIPAdd1SpinBox->setObjectName(QString::fromUtf8("mIPAdd1SpinBox")); 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->setMaximum(255);
mIPAdd1SpinBox->setValue(192); mIPAdd1SpinBox->setValue(192);
mIPAdd2SpinBox = new QSpinBox(COptionsPage); mIPAdd2SpinBox = new QSpinBox(COptionsPage);
mIPAdd2SpinBox->setObjectName(QString::fromUtf8("mIPAdd2SpinBox")); 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->setMaximum(255);
mIPAdd2SpinBox->setValue(168); mIPAdd2SpinBox->setValue(168);
mIPAdd3SpinBox = new QSpinBox(COptionsPage); mIPAdd3SpinBox = new QSpinBox(COptionsPage);
mIPAdd3SpinBox->setObjectName(QString::fromUtf8("mIPAdd3SpinBox")); 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); mIPAdd3SpinBox->setMaximum(255);
mIPAdd4SpinBox = new QSpinBox(COptionsPage); mIPAdd4SpinBox = new QSpinBox(COptionsPage);
mIPAdd4SpinBox->setObjectName(QString::fromUtf8("mIPAdd4SpinBox")); 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->setMaximum(255);
mIPAdd4SpinBox->setValue(52); mIPAdd4SpinBox->setValue(52);
label_5 = new QLabel(COptionsPage); label_5 = new QLabel(COptionsPage);
@ -87,16 +93,20 @@ public:
label_5->setFont(font1); label_5->setFont(font1);
mApplyAndSaveBtn = new QPushButton(COptionsPage); mApplyAndSaveBtn = new QPushButton(COptionsPage);
mApplyAndSaveBtn->setObjectName(QString::fromUtf8("mApplyAndSaveBtn")); 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 = new QCheckBox(COptionsPage);
mIgnoreVisualInspChkBx->setObjectName(QString::fromUtf8("mIgnoreVisualInspChkBx")); 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 = new QCheckBox(COptionsPage);
mIncludeLogInReportChkBx->setObjectName(QString::fromUtf8("mIncludeLogInReportChkBx")); 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 = new QCheckBox(COptionsPage);
mExecSecondTestChkBx->setObjectName(QString::fromUtf8("mExecSecondTestChkBx")); mExecSecondTestChkBx->setObjectName(QString::fromUtf8("mExecSecondTestChkBx"));
mExecSecondTestChkBx->setGeometry(QRect(140, 240, 221, 17)); mExecSecondTestChkBx->setGeometry(QRect(140, 240, 281, 17));
mExecSecondTestChkBx->setFont(font1);
retranslateUi(COptionsPage); retranslateUi(COptionsPage);

39
ui_VisualInspectionPage.h
View File

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