diff --git a/CableTestBench.pro b/CableTestBench.pro index 575ed69..d234428 100644 --- a/CableTestBench.pro +++ b/CableTestBench.pro @@ -12,7 +12,8 @@ TARGET = CableTestBench TEMPLATE = app INCLUDEPATH += Sources/ \ - Sources/SeaMaxWin/Include + Sources/SeaMaxWin/Include \ + Sources/Widgets/ SOURCES += \ Sources/MainWindow.cpp \ @@ -20,7 +21,8 @@ SOURCES += \ Sources/MainPage.cpp \ Sources/CableTestBench.cpp \ Sources/VisualInspectionPage.cpp \ - Sources/Widgets/CConnectorSelectWidget.cpp + Sources/Widgets/ConnectorSelectWidget.cpp \ + Sources/CableTestPage.cpp HEADERS += \ Sources/MainWindow.h \ @@ -28,13 +30,13 @@ HEADERS += \ Sources/MainPage.h \ Sources/CableTestBench.h \ Sources/VisualInspectionPage.h \ - ui_VisualInspectionPage.h \ - ui_CMainPage.h \ - Sources/Widgets/CConnectorSelectWidget.h + Sources/Widgets/ConnectorSelectWidget.h \ + Sources/CableTestPage.h \ FORMS += \ Sources/CMainPage.ui \ - Sources/VisualInspectionPage.ui + Sources/VisualInspectionPage.ui \ + Sources/CableTestPage.ui win32:CONFIG(release, debug|release): LIBS += -L$$PWD/Sources/SeaMaxWin/Lib/ -lSeaMAX else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/Sources/SeaMaxWin/Lib/ -lSeaMAX diff --git a/CableTestBench.pro.user b/CableTestBench.pro.user index 18edbff..1076c61 100644 --- a/CableTestBench.pro.user +++ b/CableTestBench.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/Makefile b/Makefile index 9c45357..9bd7346 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: CableTestBench -# Generated by qmake (2.01a) (Qt 4.8.1) on: Fri Mar 29 07:33:12 2019 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Mon Apr 15 09:49:58 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 8c2290e..74ad0f5 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: Fri Mar 29 07:33:12 2019 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Mon Apr 15 09:49:58 2019 # Project: CableTestBench.pro # Template: app ############################################################################# @@ -12,7 +12,7 @@ CXX = g++ DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN CFLAGS = -g -Wall $(DEFINES) CXXFLAGS = -g -frtti -fexceptions -mthreads -Wall $(DEFINES) -INCPATH = -I"..\..\Qt\4.8.1\include\QtCore" -I"..\..\Qt\4.8.1\include\QtNetwork" -I"..\..\Qt\4.8.1\include\QtGui" -I"..\..\Qt\4.8.1\include" -I"Sources" -I"Sources\SeaMaxWin\Include" -I"Sources\SeaMaxWin\Lib" -I"..\..\Qt\4.8.1\include\ActiveQt" -I"debug" -I"." -I"..\..\Qt\4.8.1\mkspecs\win32-g++" +INCPATH = -I"..\..\Qt\4.8.1\include\QtCore" -I"..\..\Qt\4.8.1\include\QtNetwork" -I"..\..\Qt\4.8.1\include\QtGui" -I"..\..\Qt\4.8.1\include" -I"Sources" -I"Sources\SeaMaxWin\Include" -I"Sources\Widgets" -I"Sources\SeaMaxWin\Lib" -I"..\..\Qt\4.8.1\include\ActiveQt" -I"debug" -I"." -I"..\..\Qt\4.8.1\mkspecs\win32-g++" LINK = g++ LFLAGS = -mthreads -Wl,-subsystem,windows LIBS = -L"c:\Qt\4.8.1\lib" -lmingw32 -lqtmaind -LC:/ZoneTest/CableTestBench/Sources/SeaMaxWin/Lib/ -lSeaMAX -lQtGuid4 -lQtNetworkd4 -lQtCored4 @@ -46,22 +46,26 @@ SOURCES = Sources\MainWindow.cpp \ Sources\MainPage.cpp \ Sources\CableTestBench.cpp \ Sources\VisualInspectionPage.cpp \ - Sources\Widgets\CConnectorSelectWidget.cpp debug\moc_MainWindow.cpp \ + Sources\Widgets\ConnectorSelectWidget.cpp \ + Sources\CableTestPage.cpp debug\moc_MainWindow.cpp \ debug\moc_MainPage.cpp \ debug\moc_CableTestBench.cpp \ debug\moc_VisualInspectionPage.cpp \ - debug\moc_CConnectorSelectWidget.cpp + debug\moc_ConnectorSelectWidget.cpp \ + debug\moc_CableTestPage.cpp OBJECTS = debug/MainWindow.o \ debug/main.o \ debug/MainPage.o \ debug/CableTestBench.o \ debug/VisualInspectionPage.o \ - debug/CConnectorSelectWidget.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_CConnectorSelectWidget.o + debug/moc_ConnectorSelectWidget.o \ + debug/moc_CableTestPage.o DIST = QMAKE_TARGET = CableTestBench DESTDIR = debug\ #avoid trailing-slash linebreak @@ -89,7 +93,7 @@ DESTDIR_TARGET = debug\CableTestBench.exe first: all all: Makefile.Debug $(DESTDIR_TARGET) -$(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h $(OBJECTS) +$(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.CableTestBench.Debug $(LIBS) qmake: FORCE @@ -99,7 +103,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\CConnectorSelectWidget.o debug\moc_MainWindow.o debug\moc_MainPage.o debug\moc_CableTestBench.o debug\moc_VisualInspectionPage.o debug\moc_CConnectorSelectWidget.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\moc_MainWindow.o debug\moc_MainPage.o debug\moc_CableTestBench.o debug\moc_VisualInspectionPage.o debug\moc_ConnectorSelectWidget.o debug\moc_CableTestPage.o distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -111,11 +115,12 @@ 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_CConnectorSelectWidget.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 compiler_moc_header_clean: - -$(DEL_FILE) debug\moc_MainWindow.cpp debug\moc_MainPage.cpp debug\moc_CableTestBench.cpp debug\moc_VisualInspectionPage.cpp debug\moc_CConnectorSelectWidget.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_MainWindow.cpp: Sources/MainPage.h \ Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h \ Sources/MainWindow.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\MainWindow.h -o debug\moc_MainWindow.cpp @@ -125,14 +130,18 @@ debug/moc_MainPage.cpp: Sources/MainPage.h debug/moc_CableTestBench.cpp: Sources/MainWindow.h \ Sources/MainPage.h \ Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h \ Sources/CableTestBench.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\CableTestBench.h -o debug\moc_CableTestBench.cpp 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_CConnectorSelectWidget.cpp: Sources/Widgets/CConnectorSelectWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\Widgets\CConnectorSelectWidget.h -o debug\moc_CConnectorSelectWidget.cpp +debug/moc_ConnectorSelectWidget.cpp: 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 compiler_rcc_make_all: compiler_rcc_clean: @@ -141,15 +150,18 @@ compiler_image_collection_clean: -$(DEL_FILE) qmake_image_collection.cpp compiler_moc_source_make_all: compiler_moc_source_clean: -compiler_uic_make_all: ui_CMainPage.h ui_VisualInspectionPage.h +compiler_uic_make_all: ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h compiler_uic_clean: - -$(DEL_FILE) ui_CMainPage.h ui_VisualInspectionPage.h + -$(DEL_FILE) ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h ui_CMainPage.h: Sources/CMainPage.ui c:\Qt\4.8.1\bin\uic.exe Sources\CMainPage.ui -o ui_CMainPage.h ui_VisualInspectionPage.h: Sources/VisualInspectionPage.ui c:\Qt\4.8.1\bin\uic.exe Sources\VisualInspectionPage.ui -o ui_VisualInspectionPage.h +ui_CableTestPage.h: Sources/CableTestPage.ui + c:\Qt\4.8.1\bin\uic.exe Sources\CableTestPage.ui -o ui_CableTestPage.h + compiler_yacc_decl_make_all: compiler_yacc_decl_clean: compiler_yacc_impl_make_all: @@ -165,13 +177,15 @@ compiler_clean: compiler_moc_header_clean compiler_uic_clean debug/MainWindow.o: Sources/MainWindow.cpp Sources/MainWindow.h \ Sources/MainPage.h \ Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h \ Sources/CableTestBench.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\MainWindow.o Sources\MainWindow.cpp debug/main.o: Sources/main.cpp Sources/CableTestBench.h \ Sources/MainWindow.h \ Sources/MainPage.h \ - Sources/VisualInspectionPage.h + Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\main.o Sources\main.cpp debug/MainPage.o: Sources/MainPage.cpp Sources/MainPage.h \ @@ -181,15 +195,20 @@ debug/MainPage.o: Sources/MainPage.cpp Sources/MainPage.h \ debug/CableTestBench.o: Sources/CableTestBench.cpp Sources/CableTestBench.h \ Sources/MainWindow.h \ Sources/MainPage.h \ - Sources/VisualInspectionPage.h + Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\CableTestBench.o Sources\CableTestBench.cpp debug/VisualInspectionPage.o: Sources/VisualInspectionPage.cpp Sources/VisualInspectionPage.h \ ui_VisualInspectionPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\VisualInspectionPage.o Sources\VisualInspectionPage.cpp -debug/CConnectorSelectWidget.o: Sources/Widgets/CConnectorSelectWidget.cpp Sources/Widgets/CConnectorSelectWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\CConnectorSelectWidget.o Sources\Widgets\CConnectorSelectWidget.cpp +debug/ConnectorSelectWidget.o: Sources/Widgets/ConnectorSelectWidget.cpp Sources/Widgets/ConnectorSelectWidget.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 + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\CableTestPage.o Sources\CableTestPage.cpp debug/moc_MainWindow.o: debug/moc_MainWindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_MainWindow.o debug\moc_MainWindow.cpp @@ -203,8 +222,11 @@ debug/moc_CableTestBench.o: debug/moc_CableTestBench.cpp debug/moc_VisualInspectionPage.o: debug/moc_VisualInspectionPage.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_VisualInspectionPage.o debug\moc_VisualInspectionPage.cpp -debug/moc_CConnectorSelectWidget.o: debug/moc_CConnectorSelectWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\moc_CConnectorSelectWidget.o debug\moc_CConnectorSelectWidget.cpp +debug/moc_ConnectorSelectWidget.o: debug/moc_ConnectorSelectWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o 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 ####### Install diff --git a/Makefile.Release b/Makefile.Release index 4fb147f..ca27545 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: Fri Mar 29 07:33:12 2019 +# Generated by qmake (2.01a) (Qt 4.8.1) on: Mon Apr 15 09:49:58 2019 # Project: CableTestBench.pro # Template: app ############################################################################# @@ -12,7 +12,7 @@ CXX = g++ DEFINES = -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -DQT_NEEDS_QMAIN CFLAGS = -O2 -Wall $(DEFINES) CXXFLAGS = -O2 -frtti -fexceptions -mthreads -Wall $(DEFINES) -INCPATH = -I"..\..\Qt\4.8.1\include\QtCore" -I"..\..\Qt\4.8.1\include\QtNetwork" -I"..\..\Qt\4.8.1\include\QtGui" -I"..\..\Qt\4.8.1\include" -I"Sources" -I"Sources\SeaMaxWin\Include" -I"Sources\SeaMaxWin\Lib" -I"..\..\Qt\4.8.1\include\ActiveQt" -I"release" -I"." -I"..\..\Qt\4.8.1\mkspecs\win32-g++" +INCPATH = -I"..\..\Qt\4.8.1\include\QtCore" -I"..\..\Qt\4.8.1\include\QtNetwork" -I"..\..\Qt\4.8.1\include\QtGui" -I"..\..\Qt\4.8.1\include" -I"Sources" -I"Sources\SeaMaxWin\Include" -I"Sources\Widgets" -I"Sources\SeaMaxWin\Lib" -I"..\..\Qt\4.8.1\include\ActiveQt" -I"release" -I"." -I"..\..\Qt\4.8.1\mkspecs\win32-g++" LINK = g++ LFLAGS = -Wl,-s -mthreads -Wl,-subsystem,windows LIBS = -L"c:\Qt\4.8.1\lib" -lmingw32 -lqtmain -LC:/ZoneTest/CableTestBench/Sources/SeaMaxWin/Lib/ -lSeaMAX -lQtGui4 -lQtNetwork4 -lQtCore4 @@ -46,22 +46,26 @@ SOURCES = Sources\MainWindow.cpp \ Sources\MainPage.cpp \ Sources\CableTestBench.cpp \ Sources\VisualInspectionPage.cpp \ - Sources\Widgets\CConnectorSelectWidget.cpp release\moc_MainWindow.cpp \ + Sources\Widgets\ConnectorSelectWidget.cpp \ + Sources\CableTestPage.cpp release\moc_MainWindow.cpp \ release\moc_MainPage.cpp \ release\moc_CableTestBench.cpp \ release\moc_VisualInspectionPage.cpp \ - release\moc_CConnectorSelectWidget.cpp + release\moc_ConnectorSelectWidget.cpp \ + release\moc_CableTestPage.cpp OBJECTS = release/MainWindow.o \ release/main.o \ release/MainPage.o \ release/CableTestBench.o \ release/VisualInspectionPage.o \ - release/CConnectorSelectWidget.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_CConnectorSelectWidget.o + release/moc_ConnectorSelectWidget.o \ + release/moc_CableTestPage.o DIST = QMAKE_TARGET = CableTestBench DESTDIR = release\ #avoid trailing-slash linebreak @@ -89,7 +93,7 @@ DESTDIR_TARGET = release\CableTestBench.exe first: all all: Makefile.Release $(DESTDIR_TARGET) -$(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h $(OBJECTS) +$(DESTDIR_TARGET): ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(DESTDIR_TARGET) object_script.CableTestBench.Release $(LIBS) qmake: FORCE @@ -99,7 +103,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\CConnectorSelectWidget.o release\moc_MainWindow.o release\moc_MainPage.o release\moc_CableTestBench.o release\moc_VisualInspectionPage.o release\moc_CConnectorSelectWidget.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\moc_MainWindow.o release\moc_MainPage.o release\moc_CableTestBench.o release\moc_VisualInspectionPage.o release\moc_ConnectorSelectWidget.o release\moc_CableTestPage.o distclean: clean -$(DEL_FILE) $(DESTDIR_TARGET) @@ -111,11 +115,12 @@ 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_CConnectorSelectWidget.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 compiler_moc_header_clean: - -$(DEL_FILE) release\moc_MainWindow.cpp release\moc_MainPage.cpp release\moc_CableTestBench.cpp release\moc_VisualInspectionPage.cpp release\moc_CConnectorSelectWidget.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_MainWindow.cpp: Sources/MainPage.h \ Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h \ Sources/MainWindow.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\MainWindow.h -o release\moc_MainWindow.cpp @@ -125,14 +130,18 @@ release/moc_MainPage.cpp: Sources/MainPage.h release/moc_CableTestBench.cpp: Sources/MainWindow.h \ Sources/MainPage.h \ Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h \ Sources/CableTestBench.h C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\CableTestBench.h -o release\moc_CableTestBench.cpp 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_CConnectorSelectWidget.cpp: Sources/Widgets/CConnectorSelectWidget.h - C:\Qt\4.8.1\bin\moc.exe $(DEFINES) $(INCPATH) -D__GNUC__ -DWIN32 Sources\Widgets\CConnectorSelectWidget.h -o release\moc_CConnectorSelectWidget.cpp +release/moc_ConnectorSelectWidget.cpp: 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 compiler_rcc_make_all: compiler_rcc_clean: @@ -141,15 +150,18 @@ compiler_image_collection_clean: -$(DEL_FILE) qmake_image_collection.cpp compiler_moc_source_make_all: compiler_moc_source_clean: -compiler_uic_make_all: ui_CMainPage.h ui_VisualInspectionPage.h +compiler_uic_make_all: ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h compiler_uic_clean: - -$(DEL_FILE) ui_CMainPage.h ui_VisualInspectionPage.h + -$(DEL_FILE) ui_CMainPage.h ui_VisualInspectionPage.h ui_CableTestPage.h ui_CMainPage.h: Sources/CMainPage.ui c:\Qt\4.8.1\bin\uic.exe Sources\CMainPage.ui -o ui_CMainPage.h ui_VisualInspectionPage.h: Sources/VisualInspectionPage.ui c:\Qt\4.8.1\bin\uic.exe Sources\VisualInspectionPage.ui -o ui_VisualInspectionPage.h +ui_CableTestPage.h: Sources/CableTestPage.ui + c:\Qt\4.8.1\bin\uic.exe Sources\CableTestPage.ui -o ui_CableTestPage.h + compiler_yacc_decl_make_all: compiler_yacc_decl_clean: compiler_yacc_impl_make_all: @@ -165,13 +177,15 @@ compiler_clean: compiler_moc_header_clean compiler_uic_clean release/MainWindow.o: Sources/MainWindow.cpp Sources/MainWindow.h \ Sources/MainPage.h \ Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h \ Sources/CableTestBench.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\MainWindow.o Sources\MainWindow.cpp release/main.o: Sources/main.cpp Sources/CableTestBench.h \ Sources/MainWindow.h \ Sources/MainPage.h \ - Sources/VisualInspectionPage.h + Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\main.o Sources\main.cpp release/MainPage.o: Sources/MainPage.cpp Sources/MainPage.h \ @@ -181,15 +195,20 @@ release/MainPage.o: Sources/MainPage.cpp Sources/MainPage.h \ release/CableTestBench.o: Sources/CableTestBench.cpp Sources/CableTestBench.h \ Sources/MainWindow.h \ Sources/MainPage.h \ - Sources/VisualInspectionPage.h + Sources/VisualInspectionPage.h \ + Sources/CableTestPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\CableTestBench.o Sources\CableTestBench.cpp release/VisualInspectionPage.o: Sources/VisualInspectionPage.cpp Sources/VisualInspectionPage.h \ ui_VisualInspectionPage.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\VisualInspectionPage.o Sources\VisualInspectionPage.cpp -release/CConnectorSelectWidget.o: Sources/Widgets/CConnectorSelectWidget.cpp Sources/Widgets/CConnectorSelectWidget.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\CConnectorSelectWidget.o Sources\Widgets\CConnectorSelectWidget.cpp +release/ConnectorSelectWidget.o: Sources/Widgets/ConnectorSelectWidget.cpp Sources/Widgets/ConnectorSelectWidget.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 + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\CableTestPage.o Sources\CableTestPage.cpp release/moc_MainWindow.o: release/moc_MainWindow.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_MainWindow.o release\moc_MainWindow.cpp @@ -203,8 +222,11 @@ release/moc_CableTestBench.o: release/moc_CableTestBench.cpp release/moc_VisualInspectionPage.o: release/moc_VisualInspectionPage.cpp $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_VisualInspectionPage.o release\moc_VisualInspectionPage.cpp -release/moc_CConnectorSelectWidget.o: release/moc_CConnectorSelectWidget.cpp - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\moc_CConnectorSelectWidget.o release\moc_CConnectorSelectWidget.cpp +release/moc_ConnectorSelectWidget.o: release/moc_ConnectorSelectWidget.cpp + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o 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 ####### Install diff --git a/Sources/CMainPage.ui b/Sources/CMainPage.ui index 59819d2..0e32cd6 100644 --- a/Sources/CMainPage.ui +++ b/Sources/CMainPage.ui @@ -6,51 +6,45 @@ 0 0 - 1124 - 693 + 2048 + 1024 Form - + - 40 - 210 - 111 - 23 + 270 + 230 + 70 + 17 - Inspection Visuelle + CheckBox - + - 550 - 30 - 20 - 641 + 0 + 0 + 2051 + 1031 - - Qt::Vertical - - - - - - 580 - 30 - 491 - 431 - - - - TextLabel - + + + Tab 1 + + + + + Tab 2 + + diff --git a/Sources/CableTestBench.cpp b/Sources/CableTestBench.cpp index 2b9e8ac..53293b0 100644 --- a/Sources/CableTestBench.cpp +++ b/Sources/CableTestBench.cpp @@ -5,6 +5,7 @@ CCableTestBench::CCableTestBench(QObject *parent) : QObject(parent) { w = new MainWindow(0,this); + } CCableTestBench::~CCableTestBench() @@ -14,8 +15,7 @@ CCableTestBench::~CCableTestBench() int CCableTestBench::Start() { - w->resize(1024,768); - w->show(); + w->showMaximized(); mMainPageHandle = w->mMainPage; mVisualInspPageHandle = w->mVisualInspPage; diff --git a/Sources/CableTestPage.cpp b/Sources/CableTestPage.cpp new file mode 100644 index 0000000..19b473c --- /dev/null +++ b/Sources/CableTestPage.cpp @@ -0,0 +1,17 @@ +#include "CableTestPage.h" +#include "ui_CableTestPage.h" +#include "CableTestBench.h" + +CCableTestPage::CCableTestPage(QWidget *parent) : + QWidget(parent), + ui(new Ui::CCableTestPage) +{ + ui->setupUi(this); + mProgramHandle = 0; + +} + +CCableTestPage::~CCableTestPage() +{ + delete ui; +} diff --git a/Sources/CableTestPage.h b/Sources/CableTestPage.h new file mode 100644 index 0000000..37bc751 --- /dev/null +++ b/Sources/CableTestPage.h @@ -0,0 +1,26 @@ +#ifndef CABLETESTPAGE_H +#define CABLETESTPAGE_H + +#include + +class CCableTestBench; + +namespace Ui { +class CCableTestPage; +} + +class CCableTestPage : public QWidget +{ + Q_OBJECT + +public: + explicit CCableTestPage(QWidget *parent = 0); + ~CCableTestPage(); + + CCableTestBench *mProgramHandle; + +private: + Ui::CCableTestPage *ui; +}; + +#endif // CABLETESTPAGE_H diff --git a/Sources/CableTestPage.ui b/Sources/CableTestPage.ui new file mode 100644 index 0000000..3dd7557 --- /dev/null +++ b/Sources/CableTestPage.ui @@ -0,0 +1,247 @@ + + + CCableTestPage + + + + 0 + 0 + 1800 + 880 + + + + Form + + + + + 850 + 20 + 501 + 501 + + + + + + + 50 + 50 + 471 + 121 + + + + QFrame::WinPanel + + + QFrame::Raised + + + 3 + + + + + + 60 + 60 + 451 + 100 + + + + + + + + 12 + + + + Nom du testeur + + + + + + + + Permanent + + + + + Temporaire + + + + + + + + + + + + Frontenac + + + + + Côte-Vertu + + + + + Angrignon + + + + + Garage Angrignon + + + + + Atwater + + + + + Lionel-Groulx + + + + + Viau + + + + + + + + + 12 + + + + Station + + + + + + + + 12 + + + + Type câble + + + + + + + + 12 + + + + Identification du câble + + + + + + + + + + + + + + + + 50 + 30 + 271 + 20 + + + + + 12 + + + + Configuration du câble + + + + + + 70 + 230 + 271 + 20 + + + + + 12 + + + + Inspection visuelle + + + + + + 60 + 250 + 391 + 121 + + + + QFrame::StyledPanel + + + QFrame::Plain + + + 3 + + + + + 10 + 50 + 121 + 23 + + + + Exécuter Inspection + + + + + + + CConnectorSelectWidget + QWidget +
connectorselectwidget.h
+ 1 + + + + + diff --git a/Sources/MainPage.cpp b/Sources/MainPage.cpp index 190afef..b0d300f 100644 --- a/Sources/MainPage.cpp +++ b/Sources/MainPage.cpp @@ -12,7 +12,13 @@ CMainPage::CMainPage(QWidget *parent) : QFont font; font.setPointSize(18); - ui->mConnectorsImgLbl->setPixmap(QPixmap("./images/connecteurs.png").scaled(ui->mConnectorsImgLbl->size())); + // ui->mConnectorsImgLbl->setPixmap(QPixmap("./images/connecteurs.png").scaled(ui->mConnectorsImgLbl->size())); + + mConnectorSelWidget = new CConnectorSelectWidget(); + + + + // test = new QLabel(this); // test->setObjectName("test"); @@ -20,12 +26,14 @@ CMainPage::CMainPage(QWidget *parent) : // test->setPixmap(QPixmap("./images/connecteurs.png")); // test->show(); - connect(ui->mInspVisuelleBtn,SIGNAL(clicked()),this,SLOT(InspVisuelleBtnClicked())); + //connect(ui->mInspVisuelleBtn,SIGNAL(clicked()),this,SLOT(InspVisuelleBtnClicked())); SM_HANDLE hndl; SM_Open(&hndl,"192.168.0.101"); + + } CMainPage::~CMainPage() @@ -37,3 +45,8 @@ void CMainPage::InspVisuelleBtnClicked() { qDebug("clicked"); } + +int CMainPage::SetTestPageWidget(QWidget *PageHandle) +{ + ui->mMainTabWidget->addTab(PageHandle,QIcon(),QString("Câble")); +} diff --git a/Sources/MainPage.h b/Sources/MainPage.h index 296f8cc..07688f4 100644 --- a/Sources/MainPage.h +++ b/Sources/MainPage.h @@ -5,6 +5,8 @@ #include #include +#include "ConnectorSelectWidget.h" + class CCableTestBench; namespace Ui { @@ -21,6 +23,10 @@ public: CCableTestBench *mProgramHandle; QPixmap mLedONPixmap, mLedOFFPixmap; QLabel *test; + + CConnectorSelectWidget *mConnectorSelWidget; + + int SetTestPageWidget(QWidget *PageHandle); private: Ui::CMainPage *ui; diff --git a/Sources/MainWindow.cpp b/Sources/MainWindow.cpp index 32de9a4..9404af7 100644 --- a/Sources/MainWindow.cpp +++ b/Sources/MainWindow.cpp @@ -6,18 +6,24 @@ MainWindow::MainWindow(QWidget *parent,CCableTestBench* ProgramHandle) : QMainWindow(parent), mProgramHandle(ProgramHandle) { - resize(1024,768); + resize(1800,890); - mMainPage = new CMainPage(this); + mMainPage = new CMainPage(); mVisualInspPage = new CVisualInspectionPage(); + mCableTestPage = new CCableTestPage(this); + mMainPage->mProgramHandle = ProgramHandle; mVisualInspPage->mProgramHandle = ProgramHandle; + // mMainPage->SetTestPageWidget(mCableTestPage); + + //setCentralWidget(mVisualInspPage); + } MainWindow::~MainWindow() diff --git a/Sources/MainWindow.h b/Sources/MainWindow.h index d7e8ab1..8e17411 100644 --- a/Sources/MainWindow.h +++ b/Sources/MainWindow.h @@ -8,6 +8,7 @@ #include #include "MainPage.h" #include "VisualInspectionPage.h" +#include "CableTestPage.h" class CCableTestBench; @@ -22,6 +23,7 @@ public: CMainPage *mMainPage; CCableTestBench *mProgramHandle; CVisualInspectionPage *mVisualInspPage; + CCableTestPage *mCableTestPage; public slots: diff --git a/Sources/Widgets/CConnectorSelectWidget.cpp b/Sources/Widgets/CConnectorSelectWidget.cpp deleted file mode 100644 index 7f23949..0000000 --- a/Sources/Widgets/CConnectorSelectWidget.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "CConnectorSelectWidget.h" - -CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) : - QWidget(parent) -{ -} diff --git a/Sources/Widgets/CConnectorSelectWidget.h b/Sources/Widgets/CConnectorSelectWidget.h deleted file mode 100644 index cad19d9..0000000 --- a/Sources/Widgets/CConnectorSelectWidget.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef CCONNECTORSELECTWIDGET_H -#define CCONNECTORSELECTWIDGET_H - -#include - -class CConnectorSelectWidget : public QWidget -{ - Q_OBJECT -public: - explicit CConnectorSelectWidget(QWidget *parent = 0); - -signals: - -public slots: - -}; - -#endif // CCONNECTORSELECTWIDGET_H diff --git a/Sources/Widgets/ConnectorSelectWidget.cpp b/Sources/Widgets/ConnectorSelectWidget.cpp new file mode 100644 index 0000000..655437e --- /dev/null +++ b/Sources/Widgets/ConnectorSelectWidget.cpp @@ -0,0 +1,16 @@ +#include "ConnectorSelectWidget.h" +#include + +CConnectorSelectWidget::CConnectorSelectWidget(QWidget *parent) : + QWidget(parent) +{ + mConnectorLayoutPixmap = new QPixmap("./images/connecteurs.png"); +} + +void CConnectorSelectWidget::paintEvent(QPaintEvent *) +{ + QPainter painter(this); + + painter.drawPixmap(this->rect(),mConnectorLayoutPixmap->scaled(this->size())); +} + diff --git a/Sources/Widgets/CConnectorSelectWidget.h.autosave b/Sources/Widgets/ConnectorSelectWidget.h similarity index 79% rename from Sources/Widgets/CConnectorSelectWidget.h.autosave rename to Sources/Widgets/ConnectorSelectWidget.h index 2a80567..dce2bfe 100644 --- a/Sources/Widgets/CConnectorSelectWidget.h.autosave +++ b/Sources/Widgets/ConnectorSelectWidget.h @@ -9,6 +9,9 @@ class CConnectorSelectWidget : public QWidget Q_OBJECT public: explicit CConnectorSelectWidget(QWidget *parent = 0); + void paintEvent(QPaintEvent *); + + QPixmap *mConnectorLayoutPixmap; signals: diff --git a/object_script.CableTestBench.Debug b/object_script.CableTestBench.Debug index ec6638a..16a35a6 100644 --- a/object_script.CableTestBench.Debug +++ b/object_script.CableTestBench.Debug @@ -4,10 +4,12 @@ INPUT( ./debug\MainPage.o ./debug\CableTestBench.o ./debug\VisualInspectionPage.o -./debug\CConnectorSelectWidget.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_CConnectorSelectWidget.o +./debug\moc_ConnectorSelectWidget.o +./debug\moc_CableTestPage.o ); diff --git a/object_script.CableTestBench.Release b/object_script.CableTestBench.Release index 9a73ba7..2685201 100644 --- a/object_script.CableTestBench.Release +++ b/object_script.CableTestBench.Release @@ -4,10 +4,12 @@ INPUT( ./release\MainPage.o ./release\CableTestBench.o ./release\VisualInspectionPage.o -./release\CConnectorSelectWidget.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_CConnectorSelectWidget.o +./release\moc_ConnectorSelectWidget.o +./release\moc_CableTestPage.o ); diff --git a/ui_CMainPage.h b/ui_CMainPage.h index 8b9c903..f8bc1fd 100644 --- a/ui_CMainPage.h +++ b/ui_CMainPage.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'CMainPage.ui' ** -** Created: Wed Mar 27 11:28:49 2019 +** Created: Mon Apr 15 10:13:31 2019 ** by: Qt User Interface Compiler version 4.8.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -14,10 +14,9 @@ #include #include #include -#include +#include #include -#include -#include +#include #include QT_BEGIN_NAMESPACE @@ -25,26 +24,28 @@ QT_BEGIN_NAMESPACE class Ui_CMainPage { public: - QPushButton *mInspVisuelleBtn; - QFrame *line; - QLabel *mConnectorsImgLbl; + QCheckBox *checkBox; + QTabWidget *mMainTabWidget; + QWidget *Test; + QWidget *tab_2; void setupUi(QWidget *CMainPage) { if (CMainPage->objectName().isEmpty()) CMainPage->setObjectName(QString::fromUtf8("CMainPage")); - CMainPage->resize(1124, 693); - mInspVisuelleBtn = new QPushButton(CMainPage); - mInspVisuelleBtn->setObjectName(QString::fromUtf8("mInspVisuelleBtn")); - mInspVisuelleBtn->setGeometry(QRect(40, 210, 111, 23)); - line = new QFrame(CMainPage); - line->setObjectName(QString::fromUtf8("line")); - line->setGeometry(QRect(550, 30, 20, 641)); - line->setFrameShape(QFrame::VLine); - line->setFrameShadow(QFrame::Sunken); - mConnectorsImgLbl = new QLabel(CMainPage); - mConnectorsImgLbl->setObjectName(QString::fromUtf8("mConnectorsImgLbl")); - mConnectorsImgLbl->setGeometry(QRect(580, 30, 491, 431)); + CMainPage->resize(2048, 1024); + checkBox = new QCheckBox(CMainPage); + checkBox->setObjectName(QString::fromUtf8("checkBox")); + checkBox->setGeometry(QRect(270, 230, 70, 17)); + mMainTabWidget = new QTabWidget(CMainPage); + mMainTabWidget->setObjectName(QString::fromUtf8("mMainTabWidget")); + mMainTabWidget->setGeometry(QRect(0, 0, 2051, 1031)); + Test = new QWidget(); + Test->setObjectName(QString::fromUtf8("Test")); + mMainTabWidget->addTab(Test, QString()); + tab_2 = new QWidget(); + tab_2->setObjectName(QString::fromUtf8("tab_2")); + mMainTabWidget->addTab(tab_2, QString()); retranslateUi(CMainPage); @@ -54,8 +55,9 @@ public: void retranslateUi(QWidget *CMainPage) { CMainPage->setWindowTitle(QApplication::translate("CMainPage", "Form", 0, QApplication::UnicodeUTF8)); - mInspVisuelleBtn->setText(QApplication::translate("CMainPage", "Inspection Visuelle", 0, QApplication::UnicodeUTF8)); - mConnectorsImgLbl->setText(QApplication::translate("CMainPage", "TextLabel", 0, QApplication::UnicodeUTF8)); + checkBox->setText(QApplication::translate("CMainPage", "CheckBox", 0, QApplication::UnicodeUTF8)); + mMainTabWidget->setTabText(mMainTabWidget->indexOf(Test), QApplication::translate("CMainPage", "Tab 1", 0, QApplication::UnicodeUTF8)); + mMainTabWidget->setTabText(mMainTabWidget->indexOf(tab_2), QApplication::translate("CMainPage", "Tab 2", 0, QApplication::UnicodeUTF8)); } // retranslateUi }; diff --git a/ui_CableTestPage.h b/ui_CableTestPage.h new file mode 100644 index 0000000..ad2d0f0 --- /dev/null +++ b/ui_CableTestPage.h @@ -0,0 +1,168 @@ +/******************************************************************************** +** Form generated from reading UI file 'CableTestPage.ui' +** +** Created: Mon Apr 15 13:42:02 2019 +** by: Qt User Interface Compiler version 4.8.1 +** +** WARNING! All changes made in this file will be lost when recompiling UI file! +********************************************************************************/ + +#ifndef UI_CABLETESTPAGE_H +#define UI_CABLETESTPAGE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +class Ui_CCableTestPage +{ +public: + CConnectorSelectWidget *mConnectorSelectWidget; + QFrame *mCableConfigFrame; + QWidget *widget; + QGridLayout *gridLayout; + QLabel *mNomTesteurLabel; + QComboBox *mTypeCableCombo; + QLineEdit *mIdentCableEditBox; + QComboBox *mStationNameCombo; + QLabel *StationNameLabel; + QLabel *mTypeCableLabel; + QLabel *mIdentCableLabel; + QLineEdit *mNomTesteurEditBox; + QLabel *mNomTesteurLabel_2; + QLabel *mNomTesteurLabel_3; + QFrame *mInspVisuelleFrame; + + void setupUi(QWidget *CCableTestPage) + { + if (CCableTestPage->objectName().isEmpty()) + CCableTestPage->setObjectName(QString::fromUtf8("CCableTestPage")); + CCableTestPage->resize(1800, 880); + mConnectorSelectWidget = new CConnectorSelectWidget(CCableTestPage); + mConnectorSelectWidget->setObjectName(QString::fromUtf8("mConnectorSelectWidget")); + mConnectorSelectWidget->setGeometry(QRect(850, 20, 501, 501)); + 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); + gridLayout->setObjectName(QString::fromUtf8("gridLayout")); + gridLayout->setContentsMargins(0, 0, 0, 0); + mNomTesteurLabel = new QLabel(widget); + mNomTesteurLabel->setObjectName(QString::fromUtf8("mNomTesteurLabel")); + QFont font; + font.setPointSize(12); + mNomTesteurLabel->setFont(font); + + gridLayout->addWidget(mNomTesteurLabel, 3, 0, 1, 1, Qt::AlignRight); + + mTypeCableCombo = new QComboBox(widget); + mTypeCableCombo->setObjectName(QString::fromUtf8("mTypeCableCombo")); + + gridLayout->addWidget(mTypeCableCombo, 2, 1, 1, 2); + + mIdentCableEditBox = new QLineEdit(widget); + mIdentCableEditBox->setObjectName(QString::fromUtf8("mIdentCableEditBox")); + + gridLayout->addWidget(mIdentCableEditBox, 1, 1, 1, 2); + + mStationNameCombo = new QComboBox(widget); + mStationNameCombo->setObjectName(QString::fromUtf8("mStationNameCombo")); + + gridLayout->addWidget(mStationNameCombo, 0, 1, 1, 2); + + StationNameLabel = new QLabel(widget); + StationNameLabel->setObjectName(QString::fromUtf8("StationNameLabel")); + StationNameLabel->setFont(font); + + gridLayout->addWidget(StationNameLabel, 0, 0, 1, 1, Qt::AlignRight); + + mTypeCableLabel = new QLabel(widget); + mTypeCableLabel->setObjectName(QString::fromUtf8("mTypeCableLabel")); + mTypeCableLabel->setFont(font); + + gridLayout->addWidget(mTypeCableLabel, 2, 0, 1, 1, Qt::AlignRight); + + mIdentCableLabel = new QLabel(widget); + mIdentCableLabel->setObjectName(QString::fromUtf8("mIdentCableLabel")); + mIdentCableLabel->setFont(font); + + gridLayout->addWidget(mIdentCableLabel, 1, 0, 1, 1); + + mNomTesteurEditBox = new QLineEdit(widget); + 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); + mInspVisuelleFrame = new QFrame(CCableTestPage); + mInspVisuelleFrame->setObjectName(QString::fromUtf8("mInspVisuelleFrame")); + mInspVisuelleFrame->setGeometry(QRect(60, 250, 471, 121)); + mInspVisuelleFrame->setFrameShape(QFrame::StyledPanel); + mInspVisuelleFrame->setFrameShadow(QFrame::Plain); + mInspVisuelleFrame->setLineWidth(3); + + retranslateUi(CCableTestPage); + + QMetaObject::connectSlotsByName(CCableTestPage); + } // setupUi + + void retranslateUi(QWidget *CCableTestPage) + { + CCableTestPage->setWindowTitle(QApplication::translate("CCableTestPage", "Form", 0, QApplication::UnicodeUTF8)); + mNomTesteurLabel->setText(QApplication::translate("CCableTestPage", "Nom du testeur", 0, QApplication::UnicodeUTF8)); + mTypeCableCombo->clear(); + mTypeCableCombo->insertItems(0, QStringList() + << QApplication::translate("CCableTestPage", "Permanent", 0, QApplication::UnicodeUTF8) + << QApplication::translate("CCableTestPage", "Temporaire", 0, QApplication::UnicodeUTF8) + ); + mStationNameCombo->clear(); + mStationNameCombo->insertItems(0, QStringList() + << QApplication::translate("CCableTestPage", "Frontenac", 0, QApplication::UnicodeUTF8) + << QApplication::translate("CCableTestPage", "C\303\264te-Vertu", 0, QApplication::UnicodeUTF8) + << QApplication::translate("CCableTestPage", "Angrignon", 0, QApplication::UnicodeUTF8) + << QApplication::translate("CCableTestPage", "Garage Angrignon", 0, QApplication::UnicodeUTF8) + << QApplication::translate("CCableTestPage", "Atwater", 0, QApplication::UnicodeUTF8) + << QApplication::translate("CCableTestPage", "Lionel-Groulx", 0, QApplication::UnicodeUTF8) + << QApplication::translate("CCableTestPage", "Viau", 0, QApplication::UnicodeUTF8) + ); + StationNameLabel->setText(QApplication::translate("CCableTestPage", "Station", 0, QApplication::UnicodeUTF8)); + 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)); + } // retranslateUi + +}; + +namespace Ui { + class CCableTestPage: public Ui_CCableTestPage {}; +} // namespace Ui + +QT_END_NAMESPACE + +#endif // UI_CABLETESTPAGE_H diff --git a/ui_VisualInspectionPage.h b/ui_VisualInspectionPage.h index 74efc45..c6c1075 100644 --- a/ui_VisualInspectionPage.h +++ b/ui_VisualInspectionPage.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'VisualInspectionPage.ui' ** -** Created: Wed Mar 27 10:53:05 2019 +** Created: Mon Apr 15 09:50:03 2019 ** by: Qt User Interface Compiler version 4.8.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file!