From 1572a17edb487c7a1a3fd71f55bbae36c49e23b9 Mon Sep 17 00:00:00 2001 From: JF Date: Wed, 17 Apr 2019 01:01:32 -0400 Subject: [PATCH] Dev --- CableTestBench.pro | 5 +- CableTestBench.pro.user | 2 +- Makefile | 2 +- Makefile.Debug | 39 +++- Makefile.Release | 39 +++- Sources/CableTestBench.cpp | 3 +- Sources/CableTestBenchDefs.h | 30 +++ Sources/CableTestPage.ui | 6 +- Sources/Widgets/ConnectorClickZoneWidget.cpp | 74 ++++++ Sources/Widgets/ConnectorClickZoneWidget.h | 40 ++++ Sources/Widgets/ConnectorSelectWidget.cpp | 225 ++++++++++++++++++- Sources/Widgets/ConnectorSelectWidget.h | 18 ++ object_script.CableTestBench.Debug | 2 + object_script.CableTestBench.Release | 2 + ui_CMainPage.h | 2 +- ui_CableTestPage.h | 62 ++--- ui_VisualInspectionPage.h | 2 +- 17 files changed, 494 insertions(+), 59 deletions(-) create mode 100644 Sources/CableTestBenchDefs.h create mode 100644 Sources/Widgets/ConnectorClickZoneWidget.cpp create mode 100644 Sources/Widgets/ConnectorClickZoneWidget.h diff --git a/CableTestBench.pro b/CableTestBench.pro index d234428..394d160 100644 --- a/CableTestBench.pro +++ b/CableTestBench.pro @@ -22,7 +22,8 @@ SOURCES += \ Sources/CableTestBench.cpp \ Sources/VisualInspectionPage.cpp \ Sources/Widgets/ConnectorSelectWidget.cpp \ - Sources/CableTestPage.cpp + Sources/CableTestPage.cpp \ + Sources/Widgets/ConnectorClickZoneWidget.cpp HEADERS += \ Sources/MainWindow.h \ @@ -32,6 +33,8 @@ HEADERS += \ Sources/VisualInspectionPage.h \ Sources/Widgets/ConnectorSelectWidget.h \ Sources/CableTestPage.h \ + Sources/Widgets/ConnectorClickZoneWidget.h \ + Sources/CableTestBenchDefs.h FORMS += \ Sources/CMainPage.ui \ diff --git a/CableTestBench.pro.user b/CableTestBench.pro.user index 1076c61..69b7920 100644 --- a/CableTestBench.pro.user +++ b/CableTestBench.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/Makefile b/Makefile index 9bd7346..23afd6b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: CableTestBench -# Generated by qmake (2.01a) (Qt 4.8.1) on: Mon Apr 15 09:49:58 2019 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Tue Apr 16 11:09:51 2019 # Project: CableTestBench.pro # Template: app # Command: c:\Qt\4.8.1\bin\qmake.exe -spec ..\..\Qt\4.8.1\mkspecs\win32-g++ CONFIG+=declarative_debug -o Makefile CableTestBench.pro diff --git a/Makefile.Debug b/Makefile.Debug index 74ad0f5..107dfd9 100644 --- a/Makefile.Debug +++ b/Makefile.Debug @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: CableTestBench -# Generated by qmake (2.01a) (Qt 4.8.1) on: Mon Apr 15 09:49:58 2019 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Tue Apr 16 11:09:51 2019 # Project: CableTestBench.pro # Template: app ############################################################################# @@ -47,12 +47,14 @@ SOURCES = Sources\MainWindow.cpp \ Sources\CableTestBench.cpp \ Sources\VisualInspectionPage.cpp \ Sources\Widgets\ConnectorSelectWidget.cpp \ - Sources\CableTestPage.cpp debug\moc_MainWindow.cpp \ + Sources\CableTestPage.cpp \ + Sources\Widgets\ConnectorClickZoneWidget.cpp debug\moc_MainWindow.cpp \ debug\moc_MainPage.cpp \ debug\moc_CableTestBench.cpp \ debug\moc_VisualInspectionPage.cpp \ debug\moc_ConnectorSelectWidget.cpp \ - debug\moc_CableTestPage.cpp + debug\moc_CableTestPage.cpp \ + debug\moc_ConnectorClickZoneWidget.cpp OBJECTS = debug/MainWindow.o \ debug/main.o \ debug/MainPage.o \ @@ -60,12 +62,14 @@ OBJECTS = debug/MainWindow.o \ debug/VisualInspectionPage.o \ debug/ConnectorSelectWidget.o \ debug/CableTestPage.o \ + debug/ConnectorClickZoneWidget.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_CableTestPage.o \ + debug/moc_ConnectorClickZoneWidget.o DIST = QMAKE_TARGET = CableTestBench DESTDIR = debug\ #avoid trailing-slash linebreak @@ -103,7 +107,7 @@ dist: $(ZIP) CableTestBench.zip $(SOURCES) $(DIST) CableTestBench.pro ..\..\Qt\4.8.1\mkspecs\qconfig.pri ..\..\Qt\4.8.1\mkspecs\modules\qt_webkit_version.pri ..\..\Qt\4.8.1\mkspecs\features\qt_functions.prf ..\..\Qt\4.8.1\mkspecs\features\qt_config.prf ..\..\Qt\4.8.1\mkspecs\features\exclusive_builds.prf ..\..\Qt\4.8.1\mkspecs\features\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\debug.prf ..\..\Qt\4.8.1\mkspecs\features\debug_and_release.prf ..\..\Qt\4.8.1\mkspecs\features\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\build_pass.prf ..\..\Qt\4.8.1\mkspecs\features\declarative_debug.prf ..\..\Qt\4.8.1\mkspecs\features\win32\rtti.prf ..\..\Qt\4.8.1\mkspecs\features\win32\exceptions.prf ..\..\Qt\4.8.1\mkspecs\features\win32\stl.prf ..\..\Qt\4.8.1\mkspecs\features\shared.prf ..\..\Qt\4.8.1\mkspecs\features\warn_on.prf ..\..\Qt\4.8.1\mkspecs\features\qt.prf ..\..\Qt\4.8.1\mkspecs\features\win32\thread.prf ..\..\Qt\4.8.1\mkspecs\features\moc.prf ..\..\Qt\4.8.1\mkspecs\features\win32\windows.prf ..\..\Qt\4.8.1\mkspecs\features\resources.prf ..\..\Qt\4.8.1\mkspecs\features\uic.prf ..\..\Qt\4.8.1\mkspecs\features\yacc.prf ..\..\Qt\4.8.1\mkspecs\features\lex.prf ..\..\Qt\4.8.1\mkspecs\features\include_source_dir.prf c:\Qt\4.8.1\lib\qtmaind.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean - -$(DEL_FILE) debug\MainWindow.o debug\main.o debug\MainPage.o debug\CableTestBench.o debug\VisualInspectionPage.o debug\ConnectorSelectWidget.o debug\CableTestPage.o debug\moc_MainWindow.o debug\moc_MainPage.o debug\moc_CableTestBench.o debug\moc_VisualInspectionPage.o debug\moc_ConnectorSelectWidget.o debug\moc_CableTestPage.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\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 distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -115,9 +119,9 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: debug/moc_MainWindow.cpp debug/moc_MainPage.cpp debug/moc_CableTestBench.cpp debug/moc_VisualInspectionPage.cpp debug/moc_ConnectorSelectWidget.cpp debug/moc_CableTestPage.cpp +compiler_moc_header_make_all: debug/moc_MainWindow.cpp debug/moc_MainPage.cpp debug/moc_CableTestBench.cpp debug/moc_VisualInspectionPage.cpp debug/moc_ConnectorSelectWidget.cpp debug/moc_CableTestPage.cpp debug/moc_ConnectorClickZoneWidget.cpp compiler_moc_header_clean: - -$(DEL_FILE) debug\moc_MainWindow.cpp debug\moc_MainPage.cpp debug\moc_CableTestBench.cpp debug\moc_VisualInspectionPage.cpp debug\moc_ConnectorSelectWidget.cpp debug\moc_CableTestPage.cpp + -$(DEL_FILE) debug\moc_MainWindow.cpp debug\moc_MainPage.cpp debug\moc_CableTestBench.cpp debug\moc_VisualInspectionPage.cpp debug\moc_ConnectorSelectWidget.cpp debug\moc_CableTestPage.cpp debug\moc_ConnectorClickZoneWidget.cpp debug/moc_MainWindow.cpp: Sources/MainPage.h \ Sources/VisualInspectionPage.h \ Sources/CableTestPage.h \ @@ -137,12 +141,16 @@ debug/moc_CableTestBench.cpp: Sources/MainWindow.h \ debug/moc_VisualInspectionPage.cpp: Sources/VisualInspectionPage.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\VisualInspectionPage.h -o debug\moc_VisualInspectionPage.cpp -debug/moc_ConnectorSelectWidget.cpp: Sources/Widgets/ConnectorSelectWidget.h +debug/moc_ConnectorSelectWidget.cpp: Sources/Widgets/ConnectorClickZoneWidget.h \ + Sources/Widgets/ConnectorSelectWidget.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\Widgets\ConnectorSelectWidget.h -o debug\moc_ConnectorSelectWidget.cpp debug/moc_CableTestPage.cpp: Sources/CableTestPage.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\CableTestPage.h -o debug\moc_CableTestPage.cpp +debug/moc_ConnectorClickZoneWidget.cpp: Sources/Widgets/ConnectorClickZoneWidget.h + C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\Widgets\ConnectorClickZoneWidget.h -o debug\moc_ConnectorClickZoneWidget.cpp + compiler_rcc_make_all: compiler_rcc_clean: compiler_image_collection_make_all: qmake_image_collection.cpp @@ -203,13 +211,21 @@ debug/VisualInspectionPage.o: Sources/VisualInspectionPage.cpp Sources/VisualIns ui_VisualInspectionPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\VisualInspectionPage.o Sources\VisualInspectionPage.cpp -debug/ConnectorSelectWidget.o: Sources/Widgets/ConnectorSelectWidget.cpp Sources/Widgets/ConnectorSelectWidget.h +debug/ConnectorSelectWidget.o: Sources/Widgets/ConnectorSelectWidget.cpp Sources/Widgets/ConnectorSelectWidget.h \ + Sources/Widgets/ConnectorClickZoneWidget.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ConnectorSelectWidget.o Sources\Widgets\ConnectorSelectWidget.cpp debug/CableTestPage.o: Sources/CableTestPage.cpp Sources/CableTestPage.h \ - ui_CableTestPage.h + ui_CableTestPage.h \ + Sources/CableTestBench.h \ + Sources/MainWindow.h \ + Sources/MainPage.h \ + Sources/VisualInspectionPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\CableTestPage.o Sources\CableTestPage.cpp +debug/ConnectorClickZoneWidget.o: Sources/Widgets/ConnectorClickZoneWidget.cpp Sources/Widgets/ConnectorClickZoneWidget.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\ConnectorClickZoneWidget.o Sources\Widgets\ConnectorClickZoneWidget.cpp + debug/moc_MainWindow.o: debug/moc_MainWindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_MainWindow.o debug\moc_MainWindow.cpp @@ -228,6 +244,9 @@ debug/moc_ConnectorSelectWidget.o: debug/moc_ConnectorSelectWidget.cpp debug/moc_CableTestPage.o: debug/moc_CableTestPage.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_CableTestPage.o debug\moc_CableTestPage.cpp +debug/moc_ConnectorClickZoneWidget.o: debug/moc_ConnectorClickZoneWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_ConnectorClickZoneWidget.o debug\moc_ConnectorClickZoneWidget.cpp + ####### Install install: FORCE diff --git a/Makefile.Release b/Makefile.Release index ca27545..500d468 100644 --- a/Makefile.Release +++ b/Makefile.Release @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: CableTestBench -# Generated by qmake (2.01a) (Qt 4.8.1) on: Mon Apr 15 09:49:58 2019 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Tue Apr 16 11:09:51 2019 # Project: CableTestBench.pro # Template: app ############################################################################# @@ -47,12 +47,14 @@ SOURCES = Sources\MainWindow.cpp \ Sources\CableTestBench.cpp \ Sources\VisualInspectionPage.cpp \ Sources\Widgets\ConnectorSelectWidget.cpp \ - Sources\CableTestPage.cpp release\moc_MainWindow.cpp \ + Sources\CableTestPage.cpp \ + Sources\Widgets\ConnectorClickZoneWidget.cpp release\moc_MainWindow.cpp \ release\moc_MainPage.cpp \ release\moc_CableTestBench.cpp \ release\moc_VisualInspectionPage.cpp \ release\moc_ConnectorSelectWidget.cpp \ - release\moc_CableTestPage.cpp + release\moc_CableTestPage.cpp \ + release\moc_ConnectorClickZoneWidget.cpp OBJECTS = release/MainWindow.o \ release/main.o \ release/MainPage.o \ @@ -60,12 +62,14 @@ OBJECTS = release/MainWindow.o \ release/VisualInspectionPage.o \ release/ConnectorSelectWidget.o \ release/CableTestPage.o \ + release/ConnectorClickZoneWidget.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_CableTestPage.o \ + release/moc_ConnectorClickZoneWidget.o DIST = QMAKE_TARGET = CableTestBench DESTDIR = release\ #avoid trailing-slash linebreak @@ -103,7 +107,7 @@ dist: $(ZIP) CableTestBench.zip $(SOURCES) $(DIST) CableTestBench.pro ..\..\Qt\4.8.1\mkspecs\qconfig.pri ..\..\Qt\4.8.1\mkspecs\modules\qt_webkit_version.pri ..\..\Qt\4.8.1\mkspecs\features\qt_functions.prf ..\..\Qt\4.8.1\mkspecs\features\qt_config.prf ..\..\Qt\4.8.1\mkspecs\features\exclusive_builds.prf ..\..\Qt\4.8.1\mkspecs\features\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_pre.prf ..\..\Qt\4.8.1\mkspecs\features\release.prf ..\..\Qt\4.8.1\mkspecs\features\debug_and_release.prf ..\..\Qt\4.8.1\mkspecs\features\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\win32\default_post.prf ..\..\Qt\4.8.1\mkspecs\features\build_pass.prf ..\..\Qt\4.8.1\mkspecs\features\declarative_debug.prf ..\..\Qt\4.8.1\mkspecs\features\win32\rtti.prf ..\..\Qt\4.8.1\mkspecs\features\win32\exceptions.prf ..\..\Qt\4.8.1\mkspecs\features\win32\stl.prf ..\..\Qt\4.8.1\mkspecs\features\shared.prf ..\..\Qt\4.8.1\mkspecs\features\warn_on.prf ..\..\Qt\4.8.1\mkspecs\features\qt.prf ..\..\Qt\4.8.1\mkspecs\features\win32\thread.prf ..\..\Qt\4.8.1\mkspecs\features\moc.prf ..\..\Qt\4.8.1\mkspecs\features\win32\windows.prf ..\..\Qt\4.8.1\mkspecs\features\resources.prf ..\..\Qt\4.8.1\mkspecs\features\uic.prf ..\..\Qt\4.8.1\mkspecs\features\yacc.prf ..\..\Qt\4.8.1\mkspecs\features\lex.prf ..\..\Qt\4.8.1\mkspecs\features\include_source_dir.prf c:\Qt\4.8.1\lib\qtmain.prl HEADERS RESOURCES IMAGES SOURCES OBJECTIVE_SOURCES FORMS YACCSOURCES YACCSOURCES LEXSOURCES clean: compiler_clean - -$(DEL_FILE) release\MainWindow.o release\main.o release\MainPage.o release\CableTestBench.o release\VisualInspectionPage.o release\ConnectorSelectWidget.o release\CableTestPage.o release\moc_MainWindow.o release\moc_MainPage.o release\moc_CableTestBench.o release\moc_VisualInspectionPage.o release\moc_ConnectorSelectWidget.o release\moc_CableTestPage.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\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 distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -115,9 +119,9 @@ mocclean: compiler_moc_header_clean compiler_moc_source_clean mocables: compiler_moc_header_make_all compiler_moc_source_make_all -compiler_moc_header_make_all: release/moc_MainWindow.cpp release/moc_MainPage.cpp release/moc_CableTestBench.cpp release/moc_VisualInspectionPage.cpp release/moc_ConnectorSelectWidget.cpp release/moc_CableTestPage.cpp +compiler_moc_header_make_all: release/moc_MainWindow.cpp release/moc_MainPage.cpp release/moc_CableTestBench.cpp release/moc_VisualInspectionPage.cpp release/moc_ConnectorSelectWidget.cpp release/moc_CableTestPage.cpp release/moc_ConnectorClickZoneWidget.cpp compiler_moc_header_clean: - -$(DEL_FILE) release\moc_MainWindow.cpp release\moc_MainPage.cpp release\moc_CableTestBench.cpp release\moc_VisualInspectionPage.cpp release\moc_ConnectorSelectWidget.cpp release\moc_CableTestPage.cpp + -$(DEL_FILE) release\moc_MainWindow.cpp release\moc_MainPage.cpp release\moc_CableTestBench.cpp release\moc_VisualInspectionPage.cpp release\moc_ConnectorSelectWidget.cpp release\moc_CableTestPage.cpp release\moc_ConnectorClickZoneWidget.cpp release/moc_MainWindow.cpp: Sources/MainPage.h \ Sources/VisualInspectionPage.h \ Sources/CableTestPage.h \ @@ -137,12 +141,16 @@ release/moc_CableTestBench.cpp: Sources/MainWindow.h \ release/moc_VisualInspectionPage.cpp: Sources/VisualInspectionPage.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\VisualInspectionPage.h -o release\moc_VisualInspectionPage.cpp -release/moc_ConnectorSelectWidget.cpp: Sources/Widgets/ConnectorSelectWidget.h +release/moc_ConnectorSelectWidget.cpp: Sources/Widgets/ConnectorClickZoneWidget.h \ + Sources/Widgets/ConnectorSelectWidget.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\Widgets\ConnectorSelectWidget.h -o release\moc_ConnectorSelectWidget.cpp release/moc_CableTestPage.cpp: Sources/CableTestPage.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\CableTestPage.h -o release\moc_CableTestPage.cpp +release/moc_ConnectorClickZoneWidget.cpp: Sources/Widgets/ConnectorClickZoneWidget.h + C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\Widgets\ConnectorClickZoneWidget.h -o release\moc_ConnectorClickZoneWidget.cpp + compiler_rcc_make_all: compiler_rcc_clean: compiler_image_collection_make_all: qmake_image_collection.cpp @@ -203,13 +211,21 @@ release/VisualInspectionPage.o: Sources/VisualInspectionPage.cpp Sources/VisualI ui_VisualInspectionPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\VisualInspectionPage.o Sources\VisualInspectionPage.cpp -release/ConnectorSelectWidget.o: Sources/Widgets/ConnectorSelectWidget.cpp Sources/Widgets/ConnectorSelectWidget.h +release/ConnectorSelectWidget.o: Sources/Widgets/ConnectorSelectWidget.cpp Sources/Widgets/ConnectorSelectWidget.h \ + Sources/Widgets/ConnectorClickZoneWidget.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ConnectorSelectWidget.o Sources\Widgets\ConnectorSelectWidget.cpp release/CableTestPage.o: Sources/CableTestPage.cpp Sources/CableTestPage.h \ - ui_CableTestPage.h + ui_CableTestPage.h \ + Sources/CableTestBench.h \ + Sources/MainWindow.h \ + Sources/MainPage.h \ + Sources/VisualInspectionPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\CableTestPage.o Sources\CableTestPage.cpp +release/ConnectorClickZoneWidget.o: Sources/Widgets/ConnectorClickZoneWidget.cpp Sources/Widgets/ConnectorClickZoneWidget.h + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\ConnectorClickZoneWidget.o Sources\Widgets\ConnectorClickZoneWidget.cpp + release/moc_MainWindow.o: release/moc_MainWindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_MainWindow.o release\moc_MainWindow.cpp @@ -228,6 +244,9 @@ release/moc_ConnectorSelectWidget.o: release/moc_ConnectorSelectWidget.cpp release/moc_CableTestPage.o: release/moc_CableTestPage.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_CableTestPage.o release\moc_CableTestPage.cpp +release/moc_ConnectorClickZoneWidget.o: release/moc_ConnectorClickZoneWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_ConnectorClickZoneWidget.o release\moc_ConnectorClickZoneWidget.cpp + ####### Install install: FORCE diff --git a/Sources/CableTestBench.cpp b/Sources/CableTestBench.cpp index 53293b0..9e66d06 100644 --- a/Sources/CableTestBench.cpp +++ b/Sources/CableTestBench.cpp @@ -15,7 +15,8 @@ CCableTestBench::~CCableTestBench() int CCableTestBench::Start() { - w->showMaximized(); + // w->showMaximized(); + w->show(); mMainPageHandle = w->mMainPage; mVisualInspPageHandle = w->mVisualInspPage; diff --git a/Sources/CableTestBenchDefs.h b/Sources/CableTestBenchDefs.h new file mode 100644 index 0000000..cac92cb --- /dev/null +++ b/Sources/CableTestBenchDefs.h @@ -0,0 +1,30 @@ +#ifndef CABLETESTBENCHDEFS_H +#define CABLETESTBENCHDEFS_H + + +class CConnectorDefs +{ +public: + enum eConnectorType + { + UNKNOWN_CONNECTOR_TYPE, + INPUT_6_PINS_CONNECTOR_TYPE, + INPUT_14_PINS_CONNECTOR_TYPE, + INPUT_24_PINS_CONNECTOR_TYPE, + INPUT_72_PINS_CONNECTOR_TYPE, + INPUT_90_PINS_CONNECTOR_TYPE, + INPUT_108_PINS_CONNECTOR_TYPE, + INPUT_120_PINS_CONNECTOR_TYPE, + OUTPUT_6_PINS_CONNECTOR_TYPE, + OUTPUT_14_PINS_CONNECTOR_TYPE, + OUTPUT_24_PINS_CONNECTOR_TYPE, + OUTPUT_72_PINS_CONNECTOR_TYPE, + OUTPUT_108_PINS_CONNECTOR_TYPE + }; + + +}; + + + +#endif // CABLETESTBENCHDEFS_H diff --git a/Sources/CableTestPage.ui b/Sources/CableTestPage.ui index 3dd7557..a2dc786 100644 --- a/Sources/CableTestPage.ui +++ b/Sources/CableTestPage.ui @@ -18,8 +18,8 @@ 850 20 - 501 - 501 + 376 + 537 @@ -42,7 +42,7 @@ 3 - + 60 diff --git a/Sources/Widgets/ConnectorClickZoneWidget.cpp b/Sources/Widgets/ConnectorClickZoneWidget.cpp new file mode 100644 index 0000000..5a788b0 --- /dev/null +++ b/Sources/Widgets/ConnectorClickZoneWidget.cpp @@ -0,0 +1,74 @@ +#include "ConnectorClickZoneWidget.h" +#include +#include + +CConnectorClickZoneWidget::CConnectorClickZoneWidget(CConnectorDefs::eConnectorType ConType, QWidget *parent) : + QWidget(parent), + mConType(ConType) +{ + mConSelected = false; + mSelectionColor = Qt::red; +} + + + +void CConnectorClickZoneWidget::paintEvent(QPaintEvent *event) +{ + if(mConSelected == false) + { + return; + } + + QPainter painter(this); + QPen pen; + + pen.setStyle(Qt::SolidLine); + pen.setWidth(10); + pen.setBrush(mSelectionColor); + painter.setPen(pen); + + painter.drawRect(QRect(0,0,geometry().width(),geometry().height())); + +} + +void CConnectorClickZoneWidget::mouseReleaseEvent(QMouseEvent *event) +{ + +// if(mConSelected == false) +// { +// mConSelected = true; +// } +// else if(mConSelected == true) +// { +// mConSelected = false; +// } + +// repaint(); + emit ConnectorZoneClicked(this); +} + +void CConnectorClickZoneWidget::resizeEvent(QResizeEvent *) +{ +} + +void CConnectorClickZoneWidget::SelectConnector(bool Select, QColor color) +{ + mConSelected = Select; + mSelectionColor = color; + repaint(); +} + +void CConnectorClickZoneWidget::ClearConnectorSelection() +{ + SelectConnector(false); +} + +CConnectorDefs::eConnectorType CConnectorClickZoneWidget::GetConnectorType() +{ + return mConType; +} + +bool CConnectorClickZoneWidget::IsConSelected() +{ + return mConSelected; +} diff --git a/Sources/Widgets/ConnectorClickZoneWidget.h b/Sources/Widgets/ConnectorClickZoneWidget.h new file mode 100644 index 0000000..2cbf89e --- /dev/null +++ b/Sources/Widgets/ConnectorClickZoneWidget.h @@ -0,0 +1,40 @@ +#ifndef CONNECTORCLICKZONEWIDGET_H +#define CONNECTORCLICKZONEWIDGET_H + +#include +#include "CableTestBenchDefs.h" + + +class QColor; + +class CConnectorClickZoneWidget : public QWidget +{ + Q_OBJECT +public: + explicit CConnectorClickZoneWidget(CConnectorDefs::eConnectorType ConType, QWidget *parent = 0); + void paintEvent(QPaintEvent *); + void mouseReleaseEvent(QMouseEvent *); + void resizeEvent(QResizeEvent *); + + void SelectConnector(bool Select = true, QColor color = Qt::red); + void ClearConnectorSelection(); + + CConnectorDefs::eConnectorType GetConnectorType(); + bool IsConSelected(); + + + + + +private: + CConnectorDefs::eConnectorType mConType; + bool mConSelected; + QColor mSelectionColor; + +signals: + void ConnectorZoneClicked(CConnectorClickZoneWidget *ConType); +public slots: + +}; + +#endif // CONNECTORCLICKZONEWIDGET_H diff --git a/Sources/Widgets/ConnectorSelectWidget.cpp b/Sources/Widgets/ConnectorSelectWidget.cpp index 655437e..532244d 100644 --- a/Sources/Widgets/ConnectorSelectWidget.cpp +++ b/Sources/Widgets/ConnectorSelectWidget.cpp @@ -1,16 +1,237 @@ #include "ConnectorSelectWidget.h" #include +#include "CableTestBenchDefs.h" CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) : QWidget(parent) { mConnectorLayoutPixmap = new QPixmap("./images/connecteurs.png"); + mCurSelConnector = CConnectorDefs::UNKNOWN_CONNECTOR_TYPE; + + + //Create click zones for all input connectors + CConnectorClickZoneWidget *InputClickZoneHandle; + + //6 pins + InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_6_PINS_CONNECTOR_TYPE,this); + InputClickZoneHandle->setGeometry(7,149,53,54); + InputClickZoneHandle->show(); + InputClickZoneHandle->raise(); + connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); + mInputClickZoneList.append(InputClickZoneHandle); + + //14 pins + InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_14_PINS_CONNECTOR_TYPE,this); + InputClickZoneHandle->setGeometry(7,23,53,54); + InputClickZoneHandle->show(); + InputClickZoneHandle->raise(); + connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); + mInputClickZoneList.append(InputClickZoneHandle); + + //24 pins + InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_24_PINS_CONNECTOR_TYPE,this); + InputClickZoneHandle->setGeometry(92,23,48,86); + InputClickZoneHandle->show(); + InputClickZoneHandle->raise(); + connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); + mInputClickZoneList.append(InputClickZoneHandle); + + //72 pins + InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_72_PINS_CONNECTOR_TYPE,this); + InputClickZoneHandle->setGeometry(92,149,47,120); + InputClickZoneHandle->show(); + InputClickZoneHandle->raise(); + connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); + mInputClickZoneList.append(InputClickZoneHandle); + + //90 pins + InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_90_PINS_CONNECTOR_TYPE,this); + InputClickZoneHandle->setGeometry(17,286,33,73); + InputClickZoneHandle->show(); + InputClickZoneHandle->raise(); + connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); + mInputClickZoneList.append(InputClickZoneHandle); + + //108 pins + InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_108_PINS_CONNECTOR_TYPE,this); + InputClickZoneHandle->setGeometry(92,308,47,149); + InputClickZoneHandle->show(); + InputClickZoneHandle->raise(); + connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); + mInputClickZoneList.append(InputClickZoneHandle); + + //120 pins + InputClickZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::INPUT_120_PINS_CONNECTOR_TYPE,this); + InputClickZoneHandle->setGeometry(13,382,42,74); + InputClickZoneHandle->show(); + InputClickZoneHandle->raise(); + connect(InputClickZoneHandle,SIGNAL(ConnectorZoneClicked(CConnectorClickZoneWidget*)),this,SLOT(InputConnectorZoneClicked(CConnectorClickZoneWidget*))); + mInputClickZoneList.append(InputClickZoneHandle); + + //Create selection zones for all output connectors + CConnectorClickZoneWidget *OutputSelectZoneHandle; + + //6 pins + OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_6_PINS_CONNECTOR_TYPE,this); + OutputSelectZoneHandle->setGeometry(329,149,38,38); + OutputSelectZoneHandle->show(); + OutputSelectZoneHandle->raise(); + mOutputSelectZoneList.append(OutputSelectZoneHandle); + + //14 pins + OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_14_PINS_CONNECTOR_TYPE,this); + OutputSelectZoneHandle->setGeometry(327,23,41,42); + OutputSelectZoneHandle->show(); + OutputSelectZoneHandle->raise(); + mOutputSelectZoneList.append(OutputSelectZoneHandle); + + //24 pins + OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_24_PINS_CONNECTOR_TYPE,this); + OutputSelectZoneHandle->setGeometry(235,23,48,86); + OutputSelectZoneHandle->show(); + OutputSelectZoneHandle->raise(); + mOutputSelectZoneList.append(OutputSelectZoneHandle); + + //72 pins + OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_72_PINS_CONNECTOR_TYPE,this); + OutputSelectZoneHandle->setGeometry(235,149,46,121); + OutputSelectZoneHandle->show(); + OutputSelectZoneHandle->raise(); + mOutputSelectZoneList.append(OutputSelectZoneHandle); + + //108 pins + OutputSelectZoneHandle = new CConnectorClickZoneWidget(CConnectorDefs::OUTPUT_108_PINS_CONNECTOR_TYPE,this); + OutputSelectZoneHandle->setGeometry(235,308,47,148); + OutputSelectZoneHandle->show(); + OutputSelectZoneHandle->raise(); + mOutputSelectZoneList.append(OutputSelectZoneHandle); + } -void CConnectorSelectWidget::paintEvent(QPaintEvent *) +void CConnectorSelectWidget::paintEvent(QPaintEvent *event) { QPainter painter(this); - painter.drawPixmap(this->rect(),mConnectorLayoutPixmap->scaled(this->size())); + painter.drawPixmap(0,0,*mConnectorLayoutPixmap); + + QPen pen; + +// pen.setStyle(Qt::SolidLine); +// pen.setWidth(10); +// pen.setBrush(Qt::red); +// painter.setPen(pen); + + //painter.drawRect(this->geometry()); + // painter.drawRect(QRect(7,149,53,54)); + } +void CConnectorSelectWidget::InputConnectorZoneClicked(CConnectorClickZoneWidget *ConClickZone) +{ + qDebug("Connector zone clicked: %d",ConClickZone->GetConnectorType()); + + if(ConClickZone->IsConSelected() == true) + { + ClearAllConnectorsSelections(); + mCurSelConnector = CConnectorDefs::UNKNOWN_CONNECTOR_TYPE; + } + else + { + + CConnectorClickZoneWidget *OutputSelZone = 0; + switch(ConClickZone->GetConnectorType()) + { + case CConnectorDefs::INPUT_6_PINS_CONNECTOR_TYPE: + { + OutputSelZone = FindOutputSelectionZone(CConnectorDefs::OUTPUT_6_PINS_CONNECTOR_TYPE); + + break; + } + case CConnectorDefs::INPUT_14_PINS_CONNECTOR_TYPE: + { + OutputSelZone = FindOutputSelectionZone(CConnectorDefs::OUTPUT_14_PINS_CONNECTOR_TYPE); + break; + } + case CConnectorDefs::INPUT_24_PINS_CONNECTOR_TYPE: + { + OutputSelZone = FindOutputSelectionZone(CConnectorDefs::OUTPUT_24_PINS_CONNECTOR_TYPE); + break; + } + case CConnectorDefs::INPUT_72_PINS_CONNECTOR_TYPE: + { + OutputSelZone = FindOutputSelectionZone(CConnectorDefs::OUTPUT_72_PINS_CONNECTOR_TYPE); + break; + } + case CConnectorDefs::INPUT_90_PINS_CONNECTOR_TYPE: + case CConnectorDefs::INPUT_108_PINS_CONNECTOR_TYPE: + case CConnectorDefs::INPUT_120_PINS_CONNECTOR_TYPE: + { + OutputSelZone = FindOutputSelectionZone(CConnectorDefs::OUTPUT_108_PINS_CONNECTOR_TYPE); + break; + } + default: + { + break; + } + + } + + if(OutputSelZone != 0) + { + OutputSelZone->SelectConnector(true,Qt::darkGreen); + } + ConClickZone->SelectConnector(); + } +} + +CConnectorSelectWidget::~CConnectorSelectWidget() +{ + qDebug("Destroyed"); + for(int i = 0; i < mInputClickZoneList.size(); i++) + { + delete mInputClickZoneList.at(i); + } + mInputClickZoneList.clear(); + + for(int i = 0; i < mOutputSelectZoneList.size(); i++) + { + delete mOutputSelectZoneList.at(i); + } + mOutputSelectZoneList.clear(); +} + +int CConnectorSelectWidget::ClearAllOutputConSelections() +{ + for(int i = 0; i < mOutputSelectZoneList.size(); i++) + { + mOutputSelectZoneList.at(i)->ClearConnectorSelection(); + } + return RET_OK; +} + +int CConnectorSelectWidget::ClearAllInputConSelections() +{ + for(int i = 0; i < mInputClickZoneList.size(); i++) + { + mInputClickZoneList.at(i)->ClearConnectorSelection(); + } + return RET_OK; +} + +int CConnectorSelectWidget::ClearAllConnectorsSelections() +{ + ClearAllOutputConSelections(); + ClearAllInputConSelections(); +} + +CConnectorClickZoneWidget* CConnectorSelectWidget::FindOutputSelectionZone(CConnectorDefs::eConnectorType type) +{ + for(int i = 0; i < mOutputSelectZoneList.size(); i++) + { + if(mOutputSelectZoneList.at(i)->GetConnectorType() == type) + { + return mOutputSelectZoneList.at(i); + } + } + return 0; +} diff --git a/Sources/Widgets/ConnectorSelectWidget.h b/Sources/Widgets/ConnectorSelectWidget.h index dce2bfe..3080af7 100644 --- a/Sources/Widgets/ConnectorSelectWidget.h +++ b/Sources/Widgets/ConnectorSelectWidget.h @@ -2,20 +2,38 @@ #ifndef CCONNECTORSELECTWIDGET_H #define CCONNECTORSELECTWIDGET_H +#include "GlobalDefine.h" #include +#include "ConnectorClickZoneWidget.h" +#include class CConnectorSelectWidget : public QWidget { Q_OBJECT public: explicit CConnectorSelectWidget(QWidget *parent = 0); + virtual ~CConnectorSelectWidget(); void paintEvent(QPaintEvent *); QPixmap *mConnectorLayoutPixmap; + + QList mInputClickZoneList; + QList mOutputSelectZoneList; + + int ClearAllOutputConSelections(); + int ClearAllInputConSelections(); + int ClearAllConnectorsSelections(); + + CConnectorClickZoneWidget* FindOutputSelectionZone(CConnectorDefs::eConnectorType type); + +private: + CConnectorDefs::eConnectorType mCurSelConnector; signals: public slots: + + void InputConnectorZoneClicked(CConnectorClickZoneWidget *ConType); }; diff --git a/object_script.CableTestBench.Debug b/object_script.CableTestBench.Debug index 16a35a6..eb1b14e 100644 --- a/object_script.CableTestBench.Debug +++ b/object_script.CableTestBench.Debug @@ -6,10 +6,12 @@ INPUT( ./debug\VisualInspectionPage.o ./debug\ConnectorSelectWidget.o ./debug\CableTestPage.o +./debug\ConnectorClickZoneWidget.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 ); diff --git a/object_script.CableTestBench.Release b/object_script.CableTestBench.Release index 2685201..4c74553 100644 --- a/object_script.CableTestBench.Release +++ b/object_script.CableTestBench.Release @@ -6,10 +6,12 @@ INPUT( ./release\VisualInspectionPage.o ./release\ConnectorSelectWidget.o ./release\CableTestPage.o +./release\ConnectorClickZoneWidget.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 ); diff --git a/ui_CMainPage.h b/ui_CMainPage.h index f8bc1fd..6a14e1e 100644 --- a/ui_CMainPage.h +++ b/ui_CMainPage.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CMainPage.ui' ** -** Created: Mon Apr 15 10:13:31 2019 +** Created: Tue Apr 16 11:09:53 2019 ** by: Qt User Interface Compiler version 4.8.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! diff --git a/ui_CableTestPage.h b/ui_CableTestPage.h index ad2d0f0..297bd22 100644 --- a/ui_CableTestPage.h +++ b/ui_CableTestPage.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CableTestPage.ui' ** -** Created: Mon Apr 15 13:42:02 2019 +** Created: Tue Apr 16 11:09:53 2019 ** by: Qt User Interface Compiler version 4.8.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -30,7 +31,7 @@ class Ui_CCableTestPage public: CConnectorSelectWidget *mConnectorSelectWidget; QFrame *mCableConfigFrame; - QWidget *widget; + QWidget *layoutWidget; QGridLayout *gridLayout; QLabel *mNomTesteurLabel; QComboBox *mTypeCableCombo; @@ -40,9 +41,10 @@ public: QLabel *mTypeCableLabel; QLabel *mIdentCableLabel; QLineEdit *mNomTesteurEditBox; - QLabel *mNomTesteurLabel_2; - QLabel *mNomTesteurLabel_3; + QLabel *mCableConfigLabel; + QLabel *mInspVisuelleLabel; QFrame *mInspVisuelleFrame; + QPushButton *pushButton; void setupUi(QWidget *CCableTestPage) { @@ -51,20 +53,20 @@ public: CCableTestPage->resize(1800, 880); mConnectorSelectWidget = new CConnectorSelectWidget(CCableTestPage); mConnectorSelectWidget->setObjectName(QString::fromUtf8("mConnectorSelectWidget")); - mConnectorSelectWidget->setGeometry(QRect(850, 20, 501, 501)); + mConnectorSelectWidget->setGeometry(QRect(850, 20, 376, 537)); mCableConfigFrame = new QFrame(CCableTestPage); mCableConfigFrame->setObjectName(QString::fromUtf8("mCableConfigFrame")); mCableConfigFrame->setGeometry(QRect(50, 50, 471, 121)); mCableConfigFrame->setFrameShape(QFrame::WinPanel); mCableConfigFrame->setFrameShadow(QFrame::Raised); mCableConfigFrame->setLineWidth(3); - widget = new QWidget(CCableTestPage); - widget->setObjectName(QString::fromUtf8("widget")); - widget->setGeometry(QRect(60, 60, 451, 100)); - gridLayout = new QGridLayout(widget); + layoutWidget = new QWidget(CCableTestPage); + layoutWidget->setObjectName(QString::fromUtf8("layoutWidget")); + layoutWidget->setGeometry(QRect(60, 60, 451, 100)); + gridLayout = new QGridLayout(layoutWidget); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); gridLayout->setContentsMargins(0, 0, 0, 0); - mNomTesteurLabel = new QLabel(widget); + mNomTesteurLabel = new QLabel(layoutWidget); mNomTesteurLabel->setObjectName(QString::fromUtf8("mNomTesteurLabel")); QFont font; font.setPointSize(12); @@ -72,58 +74,61 @@ public: gridLayout->addWidget(mNomTesteurLabel, 3, 0, 1, 1, Qt::AlignRight); - mTypeCableCombo = new QComboBox(widget); + mTypeCableCombo = new QComboBox(layoutWidget); mTypeCableCombo->setObjectName(QString::fromUtf8("mTypeCableCombo")); gridLayout->addWidget(mTypeCableCombo, 2, 1, 1, 2); - mIdentCableEditBox = new QLineEdit(widget); + mIdentCableEditBox = new QLineEdit(layoutWidget); mIdentCableEditBox->setObjectName(QString::fromUtf8("mIdentCableEditBox")); gridLayout->addWidget(mIdentCableEditBox, 1, 1, 1, 2); - mStationNameCombo = new QComboBox(widget); + mStationNameCombo = new QComboBox(layoutWidget); mStationNameCombo->setObjectName(QString::fromUtf8("mStationNameCombo")); gridLayout->addWidget(mStationNameCombo, 0, 1, 1, 2); - StationNameLabel = new QLabel(widget); + StationNameLabel = new QLabel(layoutWidget); StationNameLabel->setObjectName(QString::fromUtf8("StationNameLabel")); StationNameLabel->setFont(font); gridLayout->addWidget(StationNameLabel, 0, 0, 1, 1, Qt::AlignRight); - mTypeCableLabel = new QLabel(widget); + mTypeCableLabel = new QLabel(layoutWidget); mTypeCableLabel->setObjectName(QString::fromUtf8("mTypeCableLabel")); mTypeCableLabel->setFont(font); gridLayout->addWidget(mTypeCableLabel, 2, 0, 1, 1, Qt::AlignRight); - mIdentCableLabel = new QLabel(widget); + mIdentCableLabel = new QLabel(layoutWidget); mIdentCableLabel->setObjectName(QString::fromUtf8("mIdentCableLabel")); mIdentCableLabel->setFont(font); gridLayout->addWidget(mIdentCableLabel, 1, 0, 1, 1); - mNomTesteurEditBox = new QLineEdit(widget); + mNomTesteurEditBox = new QLineEdit(layoutWidget); mNomTesteurEditBox->setObjectName(QString::fromUtf8("mNomTesteurEditBox")); gridLayout->addWidget(mNomTesteurEditBox, 3, 1, 1, 2); - mNomTesteurLabel_2 = new QLabel(CCableTestPage); - mNomTesteurLabel_2->setObjectName(QString::fromUtf8("mNomTesteurLabel_2")); - mNomTesteurLabel_2->setGeometry(QRect(50, 30, 271, 20)); - mNomTesteurLabel_2->setFont(font); - mNomTesteurLabel_3 = new QLabel(CCableTestPage); - mNomTesteurLabel_3->setObjectName(QString::fromUtf8("mNomTesteurLabel_3")); - mNomTesteurLabel_3->setGeometry(QRect(60, 230, 271, 20)); - mNomTesteurLabel_3->setFont(font); + mCableConfigLabel = new QLabel(CCableTestPage); + mCableConfigLabel->setObjectName(QString::fromUtf8("mCableConfigLabel")); + mCableConfigLabel->setGeometry(QRect(50, 30, 271, 20)); + mCableConfigLabel->setFont(font); + mInspVisuelleLabel = new QLabel(CCableTestPage); + mInspVisuelleLabel->setObjectName(QString::fromUtf8("mInspVisuelleLabel")); + mInspVisuelleLabel->setGeometry(QRect(70, 230, 271, 20)); + mInspVisuelleLabel->setFont(font); mInspVisuelleFrame = new QFrame(CCableTestPage); mInspVisuelleFrame->setObjectName(QString::fromUtf8("mInspVisuelleFrame")); - mInspVisuelleFrame->setGeometry(QRect(60, 250, 471, 121)); + mInspVisuelleFrame->setGeometry(QRect(60, 250, 391, 121)); mInspVisuelleFrame->setFrameShape(QFrame::StyledPanel); mInspVisuelleFrame->setFrameShadow(QFrame::Plain); mInspVisuelleFrame->setLineWidth(3); + pushButton = new QPushButton(mInspVisuelleFrame); + pushButton->setObjectName(QString::fromUtf8("pushButton")); + pushButton->setGeometry(QRect(10, 50, 121, 23)); retranslateUi(CCableTestPage); @@ -153,8 +158,9 @@ public: mTypeCableLabel->setText(QApplication::translate("CCableTestPage", "Type c\303\242ble", 0, QApplication::UnicodeUTF8)); mIdentCableLabel->setText(QApplication::translate("CCableTestPage", "Identification du c\303\242ble", 0, QApplication::UnicodeUTF8)); mNomTesteurEditBox->setText(QString()); - mNomTesteurLabel_2->setText(QApplication::translate("CCableTestPage", "Configuration du c\303\242ble", 0, QApplication::UnicodeUTF8)); - mNomTesteurLabel_3->setText(QApplication::translate("CCableTestPage", "Inspection visuelle", 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)); + pushButton->setText(QApplication::translate("CCableTestPage", "Ex\303\251cuter Inspection", 0, QApplication::UnicodeUTF8)); } // retranslateUi }; diff --git a/ui_VisualInspectionPage.h b/ui_VisualInspectionPage.h index c6c1075..9fcc74b 100644 --- a/ui_VisualInspectionPage.h +++ b/ui_VisualInspectionPage.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'VisualInspectionPage.ui' ** -** Created: Mon Apr 15 09:50:03 2019 +** Created: Tue Apr 16 11:09:53 2019 ** by: Qt User Interface Compiler version 4.8.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file!