调整主界面菜单栏逻辑

src/tpMain/ChannelInfo.h

@@ -1,8 +1,10 @@
-#pragma once
+#ifndef _H_CHANNELINFO_H_
-#include "qstring.h"
+#define _H_CHANNELINFO_H_
-#include "qmap.h"
+
-#include "qobject.h"
+#include <QString>
-#include "qstringlist.h"
+#include <QMap>
+#include <QObject>
+#include <QStringList>
 #include "qmysplashscreen.h"
 
 struct ChannelInfo;
@@ -41,3 +43,5 @@ private:
 	int m_defaultChannel;
 };
 
+#endif
+

src/tpMain/ProgressView.cpp

@@ -5,6 +5,7 @@
 #include "qcoreapplication.h"
 
 #pragma execution_character_set("utf-8")
+/*进度条类*/
 ProgressView::ProgressView(QWidget* parent)
 {
 	nCancel = false;

src/tpMain/QPixmapListBar/qpixmapbar.cpp

@@ -1,5 +1,5 @@
 #include "qpixmapbar.h"
-
+/*图片预览控件 历史检测结果图像展示*/
 QPixmapListBar::QPixmapListBar(QWidget *parent) :
 QFrame(parent), mVertorSize(10)
 {

src/tpMain/QWorkMgrCtlr.cpp

@@ -10,7 +10,7 @@
 #define ITEMVALUE "value"
 #define ITEMABOUT  "about"
 #pragma execution_character_set("utf-8")
-
+/*工单管理*/
 QWorkMgrCtlr::QWorkMgrCtlr(IWheelCtrl *ptr,QObject *parent)
 	: QObject(parent), nDebugmodel(0)
 {

src/tpMain/WheelNet.cpp

@@ -133,9 +133,12 @@ bool CWheelNet::sendDataFrame(QString strData)
 	return true;
 }
 
-void CWheelNet::onShowIpDlg()
+void CWheelNet::onShowIpDlg(QWidget* parent)
 {
-	QIPConfigDlg ipdlg;
+	QIPConfigDlg ipdlg(parent);
+	ipdlg.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
+	ipdlg.setWindowModality(Qt::ApplicationModal);
+	ipdlg.setAttribute(Qt::WA_ShowModal, true);
 	ipdlg.setWindowTitle(tr("IP参数设置"));
 	ipdlg.setWindowIcon(QIcon(":/image/leaper"));
 	ipdlg.SetIPData(m_pIpConfig);

src/tpMain/WheelNet.h

@@ -74,7 +74,7 @@ signals:
 
 	void sgSendData2Dv(QString,QByteArray);
 public:
-	void onShowIpDlg();
+	void onShowIpDlg(QWidget* parent);
 	QString getIp(EM_NET_TYPE type) const;
 	QString getPort(EM_NET_TYPE type) const;
 private:

src/tpMain/algela/RoiImgViewer.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef _H_ROIIMGVIEWER_H_
+#define _H_ROIIMGVIEWER_H_
 
 #include "lpImgViewer.h"
 #include <QMouseEvent>
@@ -13,97 +14,99 @@ typedef struct tagLP_ROI_NODE {
 Q_DECLARE_METATYPE(LP_ROI_NODE*)
 
 
-    typedef QMap<int, QList<QGraphicsItem*> > RoiItemMap;
+typedef QMap<int, QList<QGraphicsItem*> > RoiItemMap;
 
-    class RoiImgViewer : public lpImgViewer
+class RoiImgViewer : public lpImgViewer
-    {
+{
-        Q_OBJECT
+	Q_OBJECT
 
-    public:
+public:
-        enum MouseCaptureStatus
+	enum MouseCaptureStatus
-        {
+	{
-            MouseCaptureLeft,
+		MouseCaptureLeft,
-            MouseCaptureRight,
+		MouseCaptureRight,
-            MouseCaptureTop,
+		MouseCaptureTop,
-            MouseCaptureBottom,
+		MouseCaptureBottom,
-            MouseCaptureNone
+		MouseCaptureNone
-        };
+	};
 
-        enum DrawStatus
+	enum DrawStatus
-        {
+	{
-            DrawLine,
+		DrawLine,
-            DrawRect,
+		DrawRect,
-            DrawNone
+		DrawNone
-        };
+	};
 
-    public:
+public:
-        RoiImgViewer(QWidget* parent = 0);
+	RoiImgViewer(QWidget* parent = 0);
-        ~RoiImgViewer() {};
+	~RoiImgViewer() {};
 
-        virtual void wheelEvent(QWheelEvent *evt);
+	virtual void wheelEvent(QWheelEvent *evt);
 
-        QGraphicsPixmapItem* setImg(QImage& img);
+	QGraphicsPixmapItem* setImg(QImage& img);
 
-        QGraphicsItem* firstSelectedItem();
+	QGraphicsItem* firstSelectedItem();
 
-        void setDrawStatus(DrawStatus s);
+	void setDrawStatus(DrawStatus s);
 
-        void clearRois(int type = -1);
+	void clearRois(int type = -1);
-        void clearExistRois();
+	void clearExistRois();
 
-        float getMouseCaptureDistance() const { return mMouseCaptureDistance; }
+	float getMouseCaptureDistance() const { return mMouseCaptureDistance; }
-        void setMouseCaptureDistance(float val) { mMouseCaptureDistance = val; }
+	void setMouseCaptureDistance(float val) { mMouseCaptureDistance = val; }
 
-        void addRoiRect(QRectF rect, qreal scale, QString channelName, QString id, bool isTemplate = true, QColor nonTmplColor = Qt::yellow);
+	void addRoiRect(QRectF rect, qreal scale, QString channelName, QString id, bool isTemplate = true, QColor nonTmplColor = Qt::yellow);
-        void addRoiRect(QRectF rect, qreal scale, QString id);
+	void addRoiRect(QRectF rect, qreal scale, QString id);
 
-        void addRoiLine(QLineF line, QString id);
+	void addRoiLine(QLineF line, QString id);
 
-        QList<LP_ROI_NODE> getRectROIs() const { return mRoiNodeList; }
+	QList<LP_ROI_NODE> getRectROIs() const { return mRoiNodeList; }
-        LP_ROI_NODE* lastRectRoi();
+	LP_ROI_NODE* lastRectRoi();
 
-    protected:
+protected:
-        void mousePressEvent(QMouseEvent *event);
+	void mousePressEvent(QMouseEvent *event);
-        void mouseMoveEvent(QMouseEvent *evt);
+	void mouseMoveEvent(QMouseEvent *evt);
-        void mouseReleaseEvent(QMouseEvent *event);
+	void mouseReleaseEvent(QMouseEvent *event);
-        void keyPressEvent(QKeyEvent *event);
+	void keyPressEvent(QKeyEvent *event);
 
-        MouseCaptureStatus decideMouseCaptureStatus(const QRectF r,
+	MouseCaptureStatus decideMouseCaptureStatus(const QRectF r,
-            QPointF p, float capDis = 10);
+		QPointF p, float capDis = 10);
-        MouseCaptureStatus decideMouseCaptureStatus(const QLineF l,
+	MouseCaptureStatus decideMouseCaptureStatus(const QLineF l,
-            QPointF p, float capDis = 10);
+		QPointF p, float capDis = 10);
 
-    protected slots:
+protected slots:
-        void updateSelectedRoiNode();
+	void updateSelectedRoiNode();
 
-    protected:
+protected:
-        float mMouseCaptureDistance;
+	float mMouseCaptureDistance;
 
-        MouseCaptureStatus mMouseCaptureStatus;
+	MouseCaptureStatus mMouseCaptureStatus;
 
-        DrawStatus mDrawStatus;
+	DrawStatus mDrawStatus;
-        QLineF mDrawingLine;
+	QLineF mDrawingLine;
-        QRectF mDrawingRect;
+	QRectF mDrawingRect;
-        QGraphicsLineItem* mpDrawingLineItem;
+	QGraphicsLineItem* mpDrawingLineItem;
-        QGraphicsRectItem* mpDrawingRectItem;
+	QGraphicsRectItem* mpDrawingRectItem;
-        void updateDrawingItem();
+	void updateDrawingItem();
-        void createDrawingItem();
+	void createDrawingItem();
-        void acceptDrawingItem();
+	void acceptDrawingItem();
-        void rejectDrawingItem();
+	void rejectDrawingItem();
-        void resetAllDrawingItems();
+	void resetAllDrawingItems();
 
-        void acceptRoiItem(QGraphicsItem* pItem);
+	void acceptRoiItem(QGraphicsItem* pItem);
-        LP_ROI_NODE* findRoiNode(QGraphicsItem* pItem);
+	LP_ROI_NODE* findRoiNode(QGraphicsItem* pItem);
-        RoiItemMap mRoiItemMap;
+	RoiItemMap mRoiItemMap;
-        QList<LP_ROI_NODE> mRoiNodeList;
+	QList<LP_ROI_NODE> mRoiNodeList;
-        LP_ROI_NODE* mpSelectedRoiNode;
+	LP_ROI_NODE* mpSelectedRoiNode;
 
-    signals:
+signals:
-        void roiChanged(QGraphicsItem* pItem);
+	void roiChanged(QGraphicsItem* pItem);
-        void roiAdded(QGraphicsItem* pItem);
+	void roiAdded(QGraphicsItem* pItem);
-        void roiSelectionChanged(LP_ROI_NODE* pSelectedRoiNode);
+	void roiSelectionChanged(LP_ROI_NODE* pSelectedRoiNode);
 
-    private:
+private:
 
-    };
+};
+
+#endif
 

src/tpMain/algela/lpImgViewer.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef _H_LPIMGVIEWER_H_
+#define _H_LPIMGVIEWER_H_
 
 #include <QGraphicsView>
 #include <QGraphicsItem>
@@ -79,3 +80,5 @@ protected:
 
     ImageScaleFun mImgScaleFunc;
 };
+
+#endif

src/tpMain/hubDetect.qrc

@@ -48,7 +48,7 @@
         <file>ToolBarpic/ruler2.png</file>
         <file>ToolBarpic/ruler3.png</file>
         <file>ToolBarpic/setting.png</file>
-        <file>ToolBarpic/settings38.png</file>
+        <file alias="ToolButon">ToolBarpic/settings38.png</file>
         <file>ToolBarpic/show2.png</file>
         <file>ToolBarpic/square.png</file>
         <file>ToolBarpic/stats.png</file>

src/tpMain/qpulpewidget.cpp

@@ -4,7 +4,7 @@
 #include "QLabel"
 #include "QBoxLayout"
 #pragma execution_character_set("utf-8")
-
+/*弹窗提示UI类*/
 QPulpewidget::QPulpewidget(QWidget *parent)
 	: QWidget(parent), lay(NULL), label(NULL)
 {

src/tpMain/splashScreen/qmysplashscreen.cpp

@@ -4,7 +4,7 @@
 #include "QTextEdit"
 
 #pragma execution_character_set("utf-8")
-
+/*启动动画界面*/
 QMySplashScreen::QMySplashScreen(const QPixmap & pixmap, int time) :QSplashScreen(pixmap), elapseTime(time)
 {
 	pEdit = new QTextEdit(this);

tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj

@@ -74,7 +74,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PreprocessorDefinitions>UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;TPALGORITHMQT_LIB;%(PreprocessorDefinitions);ALGORITHM_EXPORTS;QT_GUI_LIB</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;.\GeneratedFiles;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\..\..\..\lpOpenCV\openCV2.4.9\build\include;.\..\..\..\frogs\include\tpBase;.\..\..\..\Cyclops\include;.\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;..\..\3part\tadpole\include\tpBase;..\..\3part\opencv3.4.1\include;..\..\3part\opencv3.4.1\include\opencv;..\..\3part\opencv3.4.1\include\opencv2;..\..\3part\libzkq\include;..\..\3part\libzkq\include\syswin;..\..\3part\Cyclops\include;..\..\3part\edcircle\include;..\..\src\interface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>
       </DebugInformationFormat>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

tpvs17/tpMain/QChannelMgrDlg.cpp

@@ -1,5 +1,6 @@
 #include "QChannelMgrDlg.h"
 #pragma execution_character_set("utf-8")
+/*通道管理*/
 QChannelMgrDlg::QChannelMgrDlg(QWidget *parent)
 	: QWidget(parent)
 {

tpvs17/tpMain/QDebugDlg.cpp

@@ -2,7 +2,7 @@
 #include "IWheelModel.h"
 #include "QFile"
 #include "QTextStream"
-
+/*ｵ<>ﾔｴｰｿﾚ*/
 QDebugDlg::QDebugDlg(QWidget *parent)
 	: QWidget(parent)
 {

tpvs17/tpMain/QModelMgrDlg.cpp

@@ -29,7 +29,7 @@ enum EM_TYPE_PROCESSMODEL
 
 #pragma execution_character_set("utf-8")
 using namespace std;
-
+/*模板管理*/
 QTime m_ticktimer;
 QModelMgrDlg::QModelMgrDlg(IWheelCtrl *ptr, QWidget *parent)
 	: QWidget(parent),m_pCtrl(ptr)

tpvs17/tpMain/lpMainWin.cpp

@@ -1,7 +1,7 @@
 #include "lpMainWin.h"
 #include "quserinfo_global.h"
-#include "QDir"
+#include <QDir>
-#include "QFileInfo"
+#include <QFileInfo>
 #include "qmysplashscreen.h"
 #include "InfoFile.h"
 #include "WheelCtrl.h"
@@ -13,6 +13,8 @@
 #include "QMessageBox"
 #include "ChannelInfo.h"
 #include "HubBase.h"
+#include <QToolButton>
+#include <QMenu>
 
 #pragma execution_character_set("utf-8")
 lpMainWin::lpMainWin(QWidget *parent)
@@ -44,8 +46,33 @@ lpMainWin::lpMainWin(QWidget *parent)
 		connect(ui.action_checkdata, SIGNAL(triggered()), this, SLOT(onActionClicked()));
 		connect(ui.action_modelmgr, SIGNAL(triggered()), this, SLOT(onActionClicked()));
 
+		connect(ui.actionSystemSeting, SIGNAL(triggered()), this, SLOT(onActionClicked()));
+		connect(ui.actioncamSetting, SIGNAL(triggered()), this, SLOT(onActionClicked()));
+
 		connect(ui.btn_start_detect, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
 		connect(ui.btn_clear_data, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
+
+		QMenu *pToolMenu = new QMenu(this);
+// 		QFont font;
+// 		font.setPixelSize(24);
+// 		pToolMenu->setFont(font);
+		
+		pToolMenu->addAction(ui.action_cali_raster);
+		pToolMenu->addAction(ui.action_setting_ban);
+		pToolMenu->addAction(ui.action_setting_ip);
+		pToolMenu->addAction(ui.action_debug);
+		pToolMenu->addAction(ui.actionSystemSeting);
+		pToolMenu->addAction(ui.actioncamSetting);
+
+		QToolButton* pbutton = new QToolButton(this);
+		pbutton->setMenu(pToolMenu);
+		pbutton->setIcon(QIcon(":/ToolBarPic/ToolButon"));
+		pbutton->setText(tr("묏야"));
+		pbutton->setToolTip(tr("묏야"));
+		pbutton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+		pbutton->setPopupMode(QToolButton::InstantPopup);
+		ui.mainToolBar->addWidget(pbutton);
+		ui.mainToolBar->addAction(ui.action_about);
 	}
 	{//¼ÓÔØÓïÑÔÉèÖÃ
 		QSettings languageSetting("hubdetect.ini", QSettings::IniFormat);
@@ -613,7 +640,8 @@ Q_SLOT void lpMainWin::onActionClicked()
 		m_aboutDlg.show();
 	}
 	else if ("action_setting_ip" == strObj) {
-
+		if(m_pNet)
+			m_pNet->onShowIpDlg(this);
 	}
 	else if ("action_cali_raster" == strObj) {
 
@@ -640,7 +668,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 			m_pDebugDlg->show();
 		}
 	}
-	else if ("action_connect_mode" == strObj) {
+	else if ("action_connect_mode" == strObj) {//쇱꿎친겼뭅朞
 		if (m_pworkUI)
 		{
 			m_pworkUI->setParent(this);
@@ -654,7 +682,7 @@ Q_SLOT void lpMainWin::onActionClicked()
 	else if ("action_checkdata" == strObj) {
 
 	}
-	else if ("action_modelmgr" == strObj) {
+	else if ("action_modelmgr" == strObj) {//친겼밗잿
 		if (m_pModelMgrDlg)
 		{
 			m_pModelMgrDlg->setParent(this);
@@ -666,6 +694,12 @@ Q_SLOT void lpMainWin::onActionClicked()
 			m_pModelMgrDlg->show();
 		}
 	}
+	else if ("actionSystemSeting" == strObj) {
+
+	}
+	else if ("actioncamSetting" == strObj) {
+
+	}
 }
 
 Q_SLOT void lpMainWin::onButtonClicked()

tpvs17/tpMain/lpMainWin.ui

@@ -826,14 +826,29 @@ background-color: rgb(170, 170, 127);</string>
    </layout>
   </widget>
   <widget class="QToolBar" name="mainToolBar">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
    <property name="font">
     <font>
      <pointsize>11</pointsize>
     </font>
    </property>
+   <property name="contextMenuPolicy">
+    <enum>Qt::NoContextMenu</enum>
+   </property>
+   <property name="movable">
+    <bool>false</bool>
+   </property>
+   <property name="allowedAreas">
+    <set>Qt::NoToolBarArea</set>
+   </property>
    <property name="toolButtonStyle">
     <enum>Qt::ToolButtonTextUnderIcon</enum>
    </property>
+   <property name="floatable">
+    <bool>false</bool>
+   </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
@@ -845,14 +860,7 @@ background-color: rgb(170, 170, 127);</string>
    <addaction name="action_modelmgr"/>
    <addaction name="action_checkdata"/>
    <addaction name="action_connect_mode"/>
-   <addaction name="action_setting_ban"/>
-   <addaction name="action_setting_ip"/>
-   <addaction name="separator"/>
-   <addaction name="action_cali_raster"/>
-   <addaction name="separator"/>
-   <addaction name="action_debug"/>
    <addaction name="separator"/>
-   <addaction name="action_about"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="action_modelmgr">
@@ -863,6 +871,11 @@ background-color: rgb(170, 170, 127);</string>
    <property name="text">
     <string>模板管理</string>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
   </action>
   <action name="action_checkdata">
    <property name="icon">
@@ -872,6 +885,11 @@ background-color: rgb(170, 170, 127);</string>
    <property name="text">
     <string>数据查询</string>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
   </action>
   <action name="action_connect_mode">
    <property name="icon">
@@ -879,17 +897,27 @@ background-color: rgb(170, 170, 127);</string>
      <normaloff>:/ToolBarPic/ToolBarpic/clipboard109.png</normaloff>:/ToolBarPic/ToolBarpic/clipboard109.png</iconset>
    </property>
    <property name="text">
-    <string>检测模板勾选</string>
+    <string>模板勾选</string>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
    </property>
   </action>
   <action name="action_debug">
    <property name="icon">
     <iconset resource="../../src/tpMain/hubDetect.qrc">
-     <normaloff>:/ToolBarPic/ToolBarpic/settings38.png</normaloff>:/ToolBarPic/ToolBarpic/settings38.png</iconset>
+     <normaloff>:/ToolBarPic/ToolBarpic/setting.png</normaloff>:/ToolBarPic/ToolBarpic/setting.png</iconset>
    </property>
    <property name="text">
     <string>辅助工具</string>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
   </action>
   <action name="action_setting_ban">
    <property name="icon">
@@ -899,6 +927,11 @@ background-color: rgb(170, 170, 127);</string>
    <property name="text">
     <string>班次设置</string>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
   </action>
   <action name="action_cali_raster">
    <property name="icon">
@@ -908,6 +941,11 @@ background-color: rgb(170, 170, 127);</string>
    <property name="text">
     <string>光栅标定</string>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
   </action>
   <action name="action_setting_ip">
    <property name="icon">
@@ -917,6 +955,11 @@ background-color: rgb(170, 170, 127);</string>
    <property name="text">
     <string>IP设置</string>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
   </action>
   <action name="action_about">
    <property name="icon">
@@ -926,6 +969,11 @@ background-color: rgb(170, 170, 127);</string>
    <property name="text">
     <string>关于</string>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
   </action>
   <action name="action_Login">
    <property name="icon">
@@ -935,6 +983,11 @@ background-color: rgb(170, 170, 127);</string>
    <property name="text">
     <string>登录</string>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
   </action>
   <action name="action_userManager">
    <property name="icon">
@@ -944,6 +997,39 @@ background-color: rgb(170, 170, 127);</string>
    <property name="text">
     <string>用户管理</string>
    </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
+  </action>
+  <action name="actionSystemSeting">
+   <property name="icon">
+    <iconset resource="../../src/tpMain/hubDetect.qrc">
+     <normaloff>:/ToolBarPic/ToolBarpic/toolbox3.png</normaloff>:/ToolBarPic/ToolBarpic/toolbox3.png</iconset>
+   </property>
+   <property name="text">
+    <string>系统设置</string>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
+  </action>
+  <action name="actioncamSetting">
+   <property name="icon">
+    <iconset resource="../../src/tpMain/hubDetect.qrc">
+     <normaloff>:/ToolBarPic/ToolBarpic/fileexplorer.png</normaloff>:/ToolBarPic/ToolBarpic/fileexplorer.png</iconset>
+   </property>
+   <property name="text">
+    <string>相机配置</string>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>12</pointsize>
+    </font>
+   </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>

tpvs17/tpMain/tpMain.vcxproj

@@ -769,7 +769,6 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DTPMAIN_LIB -DTPMAIN_EXPORTS -DQT_GUI_LIB -DQT_WIDGETS_LIB -DQT_SQL_LIB -DQT_PRINTSUPPORT_LIB -DQT_NETWORK_LIB -DQT_SERIALPORT_LIB -D%(PreprocessorDefinitions)  "-I." "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\ActiveQt" "-I$(QTDIR)\include\QtSerialPort" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtPrintSupport" "-I$(QTDIR)\include\QtSql" "-I$(QTDIR)\include\QtNetwork" "-I.\..\..\src\algorithm" "-I.\..\..\src\tpMain" "-I.\..\..\src\tpMain\thread" "-I.\..\..\src\tpMain\splashScreen" "-I.\..\..\src\tpMain\LightBoxwidget" "-I.\..\..\src\tpMain\QDiskCleanThread" "-I.\..\..\src\tpMain\QPixmapListBar" "-I.\..\..\src\userCtrl" "-I.\..\..\src\NetWheel" "-I.\..\..\src\RasterSDG20" "-I.\..\..\src\ReportModel" "-I.\..\..\3part\libzkq\include" "-I.\..\..\3part\tadpole\include\tpBase" "-I.\..\..\3part\opencv3.4.1\include" "-I.\..\..\3part\opencv3.4.1\include\opencv" "-I.\..\..\3part\opencv3.4.1\include\opencv2" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface"</Command>
     </CustomBuild>
     <ClInclude Include="..\..\src\tpMain\sqlite\qsqlitemodeltemplate.h" />
-    <ClInclude Include="..\..\src\tpMain\thread\FastDelegate.h" />
     <CustomBuild Include="..\..\src\tpMain\thread\qmythread.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing qmythread.h...</Message>

tpvs17/tpMain/tpMain.vcxproj.filters

@@ -45,21 +45,9 @@
     <Filter Include="channel">
       <UniqueIdentifier>{f294c213-9a3f-4c3f-a74d-5dfc28bba3c3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Model">
-      <UniqueIdentifier>{2ebbabc3-5d96-4349-a29c-19d33c06f9f2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="UI">
-      <UniqueIdentifier>{bbdb447f-7f68-473d-b1a4-2d4b22ef2130}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="splashscreen">
-      <UniqueIdentifier>{cc96b449-fcff-4c3d-b464-89aef1da9b44}</UniqueIdentifier>
-    </Filter>
     <Filter Include="QDiskClean">
       <UniqueIdentifier>{9e52d532-ebd9-4a72-9d07-596e45df0ece}</UniqueIdentifier>
     </Filter>
-    <Filter Include="QPixmapBar">
-      <UniqueIdentifier>{c2c39a47-2d33-40d6-8fec-b19d02e02bcf}</UniqueIdentifier>
-    </Filter>
     <Filter Include="UIFile">
       <UniqueIdentifier>{1c912f7f-f95e-4887-9b55-19f143f30d2a}</UniqueIdentifier>
     </Filter>
@@ -69,15 +57,39 @@
     <Filter Include="lpMain\CoreCtrl">
       <UniqueIdentifier>{e391fcf8-d043-4a98-a8f8-4d6393c9db52}</UniqueIdentifier>
     </Filter>
-    <Filter Include="angle">
-      <UniqueIdentifier>{afc06e06-ac8c-46f5-9e09-18e15a8e72c0}</UniqueIdentifier>
-    </Filter>
     <Filter Include="newUI">
       <UniqueIdentifier>{09e67658-15bb-4f13-9016-5b6b1909df6d}</UniqueIdentifier>
     </Filter>
     <Filter Include="ImageCompare">
       <UniqueIdentifier>{19e648fe-9462-470f-ad5d-9434be239d4f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="BaseUILib">
+      <UniqueIdentifier>{afc06e06-ac8c-46f5-9e09-18e15a8e72c0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="BaseUILib\splashscreen">
+      <UniqueIdentifier>{cc96b449-fcff-4c3d-b464-89aef1da9b44}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="BaseUILib\ImgView">
+      <UniqueIdentifier>{d452c117-6cf6-44e7-b804-2397b524f6a0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="BaseUILib\QPixmapBar">
+      <UniqueIdentifier>{c2c39a47-2d33-40d6-8fec-b19d02e02bcf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="BaseUILib\progressView">
+      <UniqueIdentifier>{0b943849-5bff-43cb-b1ca-7dd9a18a71b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="BaseUILib\pulpewidget">
+      <UniqueIdentifier>{e1b50e51-3618-4ac6-a2f1-9bd69105122b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ToolLib">
+      <UniqueIdentifier>{c18cd373-aa9a-40f9-b311-780dcdfee81e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CustomUILib">
+      <UniqueIdentifier>{9e4e103a-8a97-4330-a5cd-552944505af4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="CustomUILib\Model">
+      <UniqueIdentifier>{2ebbabc3-5d96-4349-a29c-19d33c06f9f2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\tpMain\QDiskCleanThread\QDiskCleanThread.cpp">
@@ -90,7 +102,7 @@
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\tpMain\QPixmapListBar\qpixmapbar.cpp">
-      <Filter>QPixmapBar</Filter>
+      <Filter>BaseUILib\QPixmapBar</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_qpixmapbar.cpp">
       <Filter>Generated Files\Debug</Filter>
@@ -99,7 +111,7 @@
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\tpMain\splashScreen\qmysplashscreen.cpp">
-      <Filter>splashscreen</Filter>
+      <Filter>BaseUILib\splashscreen</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_qmysplashscreen.cpp">
       <Filter>Generated Files\Debug</Filter>
@@ -326,17 +338,11 @@
     <ClCompile Include="..\..\src\tpMain\qsaveimg.cpp">
       <Filter>Thread</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\tpMain\qpulpewidget.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\tpMain\ProgressView.cpp">
-      <Filter>UI</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\tpMain\customtableview.cpp">
-      <Filter>Model</Filter>
+      <Filter>CustomUILib\Model</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\tpMain\ModelTableView.cpp">
-      <Filter>Model</Filter>
+      <Filter>CustomUILib\Model</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\tpMain\modelmgrdb.cpp">
       <Filter>sql</Filter>
@@ -440,18 +446,12 @@
     <ClCompile Include="GeneratedFiles\Release\moc_QDebugDlg.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\tpMain\algela\lpImgViewer.cpp">
-      <Filter>angle</Filter>
-    </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_lpImgViewer.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_lpImgViewer.cpp">
       <Filter>Generated Files\Release</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\tpMain\algela\RoiImgViewer.cpp">
-      <Filter>angle</Filter>
-    </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_RoiImgViewer.cpp">
       <Filter>Generated Files\Debug</Filter>
     </ClCompile>
@@ -506,6 +506,18 @@
     <ClCompile Include="..\..\src\ImageCompare\TransSolver.cpp">
       <Filter>ImageCompare</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\tpMain\algela\lpImgViewer.cpp">
+      <Filter>BaseUILib\ImgView</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tpMain\algela\RoiImgViewer.cpp">
+      <Filter>BaseUILib\ImgView</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tpMain\ProgressView.cpp">
+      <Filter>BaseUILib\progressView</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tpMain\qpulpewidget.cpp">
+      <Filter>BaseUILib\pulpewidget</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\algorithm\ImageProcess.h">
@@ -517,9 +529,6 @@
     <ClInclude Include="..\..\src\tpMain\sqlite\qsqlitemodeltemplate.h">
       <Filter>sql</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\tpMain\thread\FastDelegate.h">
-      <Filter>Thread</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\tpMain\CamConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -655,10 +664,10 @@
       <Filter>QDiskClean</Filter>
     </CustomBuild>
     <CustomBuild Include="..\..\src\tpMain\QPixmapListBar\qpixmapbar.h">
-      <Filter>QPixmapBar</Filter>
+      <Filter>BaseUILib\QPixmapBar</Filter>
     </CustomBuild>
     <CustomBuild Include="..\..\src\tpMain\splashScreen\qmysplashscreen.h">
-      <Filter>splashscreen</Filter>
+      <Filter>BaseUILib\splashscreen</Filter>
     </CustomBuild>
     <CustomBuild Include="..\..\src\tpMain\thread\qmythread.h">
       <Filter>Thread</Filter>
@@ -690,20 +699,14 @@
     <CustomBuild Include="..\..\src\tpMain\qsaveimg.h">
       <Filter>Thread</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\src\tpMain\qpulpewidget.h">
-      <Filter>UI</Filter>
-    </CustomBuild>
     <CustomBuild Include="..\..\src\tpMain\qnettickthread.h">
       <Filter>Thread</Filter>
     </CustomBuild>
     <CustomBuild Include="..\..\src\tpMain\ModelTableView.h">
-      <Filter>Model</Filter>
+      <Filter>CustomUILib\Model</Filter>
     </CustomBuild>
     <CustomBuild Include="..\..\src\tpMain\customtableview.h">
-      <Filter>Model</Filter>
+      <Filter>CustomUILib\Model</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\src\tpMain\ProgressView.h">
-      <Filter>UI</Filter>
     </CustomBuild>
     <CustomBuild Include="..\..\src\tpMain\DetectDataDB.h">
       <Filter>sql</Filter>
@@ -783,12 +786,6 @@
     <CustomBuild Include="..\..\src\tpMain\qaddchanneldlg.h">
       <Filter>UIFile</Filter>
     </CustomBuild>
-    <CustomBuild Include="..\..\src\tpMain\algela\lpImgViewer.h">
-      <Filter>angle</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\src\tpMain\algela\RoiImgViewer.h">
-      <Filter>angle</Filter>
-    </CustomBuild>
     <CustomBuild Include="QTimeMgrDlg.h">
       <Filter>newUI</Filter>
     </CustomBuild>
@@ -825,6 +822,18 @@
     <CustomBuild Include="QSettingDlg.ui">
       <Filter>Form Files</Filter>
     </CustomBuild>
+    <CustomBuild Include="..\..\src\tpMain\algela\lpImgViewer.h">
+      <Filter>BaseUILib\ImgView</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\src\tpMain\algela\RoiImgViewer.h">
+      <Filter>BaseUILib\ImgView</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\src\tpMain\ProgressView.h">
+      <Filter>BaseUILib\progressView</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\src\tpMain\qpulpewidget.h">
+      <Filter>BaseUILib\pulpewidget</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\src\tpMain\none.jpg">