diff --git a/src/tpMain/ChannelInfo.h b/src/tpMain/ChannelInfo.h index 156e59a..752dc35 100644 --- a/src/tpMain/ChannelInfo.h +++ b/src/tpMain/ChannelInfo.h @@ -1,8 +1,10 @@ -#pragma once -#include "qstring.h" -#include "qmap.h" -#include "qobject.h" -#include "qstringlist.h" +#ifndef _H_CHANNELINFO_H_ +#define _H_CHANNELINFO_H_ + +#include +#include +#include +#include #include "qmysplashscreen.h" struct ChannelInfo; @@ -41,3 +43,5 @@ private: int m_defaultChannel; }; +#endif + diff --git a/src/tpMain/ProgressView.cpp b/src/tpMain/ProgressView.cpp index e91d94f..b1ec8e5 100644 --- a/src/tpMain/ProgressView.cpp +++ b/src/tpMain/ProgressView.cpp @@ -5,6 +5,7 @@ #include "qcoreapplication.h" #pragma execution_character_set("utf-8") +/*进度条类*/ ProgressView::ProgressView(QWidget* parent) { nCancel = false; diff --git a/src/tpMain/QPixmapListBar/qpixmapbar.cpp b/src/tpMain/QPixmapListBar/qpixmapbar.cpp index 52e0db5..3f7fa44 100644 --- a/src/tpMain/QPixmapListBar/qpixmapbar.cpp +++ b/src/tpMain/QPixmapListBar/qpixmapbar.cpp @@ -1,5 +1,5 @@ #include "qpixmapbar.h" - +/*ͼƬԤؼ ʷͼչʾ*/ QPixmapListBar::QPixmapListBar(QWidget *parent) : QFrame(parent), mVertorSize(10) { diff --git a/src/tpMain/QWorkMgrCtlr.cpp b/src/tpMain/QWorkMgrCtlr.cpp index 09969d5..0f87d0a 100644 --- a/src/tpMain/QWorkMgrCtlr.cpp +++ b/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) { diff --git a/src/tpMain/WheelNet.cpp b/src/tpMain/WheelNet.cpp index 85d179f..306ffe8 100644 --- a/src/tpMain/WheelNet.cpp +++ b/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); diff --git a/src/tpMain/WheelNet.h b/src/tpMain/WheelNet.h index 4e26a72..5eba4ab 100644 --- a/src/tpMain/WheelNet.h +++ b/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: diff --git a/src/tpMain/algela/RoiImgViewer.h b/src/tpMain/algela/RoiImgViewer.h index c21ddca..28a5260 100644 --- a/src/tpMain/algela/RoiImgViewer.h +++ b/src/tpMain/algela/RoiImgViewer.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _H_ROIIMGVIEWER_H_ +#define _H_ROIIMGVIEWER_H_ #include "lpImgViewer.h" #include @@ -13,97 +14,99 @@ typedef struct tagLP_ROI_NODE { Q_DECLARE_METATYPE(LP_ROI_NODE*) - typedef QMap > RoiItemMap; +typedef QMap > RoiItemMap; - class RoiImgViewer : public lpImgViewer - { - Q_OBJECT +class RoiImgViewer : public lpImgViewer +{ + Q_OBJECT - public: - enum MouseCaptureStatus - { - MouseCaptureLeft, - MouseCaptureRight, - MouseCaptureTop, - MouseCaptureBottom, - MouseCaptureNone - }; +public: + enum MouseCaptureStatus + { + MouseCaptureLeft, + MouseCaptureRight, + MouseCaptureTop, + MouseCaptureBottom, + MouseCaptureNone + }; - enum DrawStatus - { - DrawLine, - DrawRect, - DrawNone - }; + enum DrawStatus + { + DrawLine, + DrawRect, + DrawNone + }; - public: - RoiImgViewer(QWidget* parent = 0); - ~RoiImgViewer() {}; +public: + RoiImgViewer(QWidget* parent = 0); + ~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 clearExistRois(); + void clearRois(int type = -1); + void clearExistRois(); - float getMouseCaptureDistance() const { return mMouseCaptureDistance; } - void setMouseCaptureDistance(float val) { mMouseCaptureDistance = val; } + float getMouseCaptureDistance() const { return mMouseCaptureDistance; } + 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 id); + 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 addRoiLine(QLineF line, QString id); + void addRoiLine(QLineF line, QString id); - QList getRectROIs() const { return mRoiNodeList; } - LP_ROI_NODE* lastRectRoi(); + QList getRectROIs() const { return mRoiNodeList; } + LP_ROI_NODE* lastRectRoi(); - protected: - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *evt); - void mouseReleaseEvent(QMouseEvent *event); - void keyPressEvent(QKeyEvent *event); +protected: + void mousePressEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *evt); + void mouseReleaseEvent(QMouseEvent *event); + void keyPressEvent(QKeyEvent *event); - MouseCaptureStatus decideMouseCaptureStatus(const QRectF r, - QPointF p, float capDis = 10); - MouseCaptureStatus decideMouseCaptureStatus(const QLineF l, - QPointF p, float capDis = 10); + MouseCaptureStatus decideMouseCaptureStatus(const QRectF r, + QPointF p, float capDis = 10); + MouseCaptureStatus decideMouseCaptureStatus(const QLineF l, + QPointF p, float capDis = 10); - protected slots: - void updateSelectedRoiNode(); +protected slots: + void updateSelectedRoiNode(); - protected: - float mMouseCaptureDistance; +protected: + float mMouseCaptureDistance; - MouseCaptureStatus mMouseCaptureStatus; + MouseCaptureStatus mMouseCaptureStatus; - DrawStatus mDrawStatus; - QLineF mDrawingLine; - QRectF mDrawingRect; - QGraphicsLineItem* mpDrawingLineItem; - QGraphicsRectItem* mpDrawingRectItem; - void updateDrawingItem(); - void createDrawingItem(); - void acceptDrawingItem(); - void rejectDrawingItem(); - void resetAllDrawingItems(); + DrawStatus mDrawStatus; + QLineF mDrawingLine; + QRectF mDrawingRect; + QGraphicsLineItem* mpDrawingLineItem; + QGraphicsRectItem* mpDrawingRectItem; + void updateDrawingItem(); + void createDrawingItem(); + void acceptDrawingItem(); + void rejectDrawingItem(); + void resetAllDrawingItems(); - void acceptRoiItem(QGraphicsItem* pItem); - LP_ROI_NODE* findRoiNode(QGraphicsItem* pItem); - RoiItemMap mRoiItemMap; - QList mRoiNodeList; - LP_ROI_NODE* mpSelectedRoiNode; + void acceptRoiItem(QGraphicsItem* pItem); + LP_ROI_NODE* findRoiNode(QGraphicsItem* pItem); + RoiItemMap mRoiItemMap; + QList mRoiNodeList; + LP_ROI_NODE* mpSelectedRoiNode; - signals: - void roiChanged(QGraphicsItem* pItem); - void roiAdded(QGraphicsItem* pItem); - void roiSelectionChanged(LP_ROI_NODE* pSelectedRoiNode); +signals: + void roiChanged(QGraphicsItem* pItem); + void roiAdded(QGraphicsItem* pItem); + void roiSelectionChanged(LP_ROI_NODE* pSelectedRoiNode); - private: +private: - }; +}; + +#endif diff --git a/src/tpMain/algela/lpImgViewer.h b/src/tpMain/algela/lpImgViewer.h index ab63cec..c05cffd 100644 --- a/src/tpMain/algela/lpImgViewer.h +++ b/src/tpMain/algela/lpImgViewer.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _H_LPIMGVIEWER_H_ +#define _H_LPIMGVIEWER_H_ #include #include @@ -79,3 +80,5 @@ protected: ImageScaleFun mImgScaleFunc; }; + +#endif diff --git a/src/tpMain/hubDetect.qrc b/src/tpMain/hubDetect.qrc index 00723d6..52f1e65 100644 --- a/src/tpMain/hubDetect.qrc +++ b/src/tpMain/hubDetect.qrc @@ -48,7 +48,7 @@ ToolBarpic/ruler2.png ToolBarpic/ruler3.png ToolBarpic/setting.png - ToolBarpic/settings38.png + ToolBarpic/settings38.png ToolBarpic/show2.png ToolBarpic/square.png ToolBarpic/stats.png diff --git a/src/tpMain/qpulpewidget.cpp b/src/tpMain/qpulpewidget.cpp index eb8bea8..fa1becb 100644 --- a/src/tpMain/qpulpewidget.cpp +++ b/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) { diff --git a/src/tpMain/splashScreen/qmysplashscreen.cpp b/src/tpMain/splashScreen/qmysplashscreen.cpp index d792f29..c70d9b0 100644 --- a/src/tpMain/splashScreen/qmysplashscreen.cpp +++ b/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); diff --git a/tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj b/tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj index 0d49f62..462a12c 100644 --- a/tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj +++ b/tpvs17/tpAlgorithmQt/tpAlgorithmQt.vcxproj @@ -74,7 +74,7 @@ UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;TPALGORITHMQT_LIB;%(PreprocessorDefinitions);ALGORITHM_EXPORTS;QT_GUI_LIB - .;.\GeneratedFiles;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include;$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;.\..\..\..\lpOpenCV\openCV2.4.9\build\include;.\..\..\..\frogs\include\tpBase;.\..\..\..\Cyclops\include;.\..\..\include;%(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) MultiThreadedDLL diff --git a/tpvs17/tpMain/QChannelMgrDlg.cpp b/tpvs17/tpMain/QChannelMgrDlg.cpp index a29c162..bd129c6 100644 --- a/tpvs17/tpMain/QChannelMgrDlg.cpp +++ b/tpvs17/tpMain/QChannelMgrDlg.cpp @@ -1,5 +1,6 @@ #include "QChannelMgrDlg.h" #pragma execution_character_set("utf-8") +/*ͨ*/ QChannelMgrDlg::QChannelMgrDlg(QWidget *parent) : QWidget(parent) { diff --git a/tpvs17/tpMain/QDebugDlg.cpp b/tpvs17/tpMain/QDebugDlg.cpp index 04312ab..79fc98d 100644 --- a/tpvs17/tpMain/QDebugDlg.cpp +++ b/tpvs17/tpMain/QDebugDlg.cpp @@ -2,7 +2,7 @@ #include "IWheelModel.h" #include "QFile" #include "QTextStream" - +/*Դ*/ QDebugDlg::QDebugDlg(QWidget *parent) : QWidget(parent) { diff --git a/tpvs17/tpMain/QModelMgrDlg.cpp b/tpvs17/tpMain/QModelMgrDlg.cpp index 380ba9d..bcc1967 100644 --- a/tpvs17/tpMain/QModelMgrDlg.cpp +++ b/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) diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp index 6377ad4..3546808 100644 --- a/tpvs17/tpMain/lpMainWin.cpp +++ b/tpvs17/tpMain/lpMainWin.cpp @@ -1,7 +1,7 @@ #include "lpMainWin.h" #include "quserinfo_global.h" -#include "QDir" -#include "QFileInfo" +#include +#include #include "qmysplashscreen.h" #include "InfoFile.h" #include "WheelCtrl.h" @@ -13,6 +13,8 @@ #include "QMessageBox" #include "ChannelInfo.h" #include "HubBase.h" +#include +#include #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() diff --git a/tpvs17/tpMain/lpMainWin.ui b/tpvs17/tpMain/lpMainWin.ui index 7fbd447..e6bf188 100644 --- a/tpvs17/tpMain/lpMainWin.ui +++ b/tpvs17/tpMain/lpMainWin.ui @@ -826,14 +826,29 @@ background-color: rgb(170, 170, 127); + + true + 11 + + Qt::NoContextMenu + + + false + + + Qt::NoToolBarArea + Qt::ToolButtonTextUnderIcon + + false + TopToolBarArea @@ -845,14 +860,7 @@ background-color: rgb(170, 170, 127); - - - - - - - @@ -863,6 +871,11 @@ background-color: rgb(170, 170, 127); 模板管理 + + + 12 + + @@ -872,6 +885,11 @@ background-color: rgb(170, 170, 127); 数据查询 + + + 12 + + @@ -879,17 +897,27 @@ background-color: rgb(170, 170, 127); :/ToolBarPic/ToolBarpic/clipboard109.png:/ToolBarPic/ToolBarpic/clipboard109.png - 检测模板勾选 + 模板勾选 + + + + 12 + - :/ToolBarPic/ToolBarpic/settings38.png:/ToolBarPic/ToolBarpic/settings38.png + :/ToolBarPic/ToolBarpic/setting.png:/ToolBarPic/ToolBarpic/setting.png 辅助工具 + + + 12 + + @@ -899,6 +927,11 @@ background-color: rgb(170, 170, 127); 班次设置 + + + 12 + + @@ -908,6 +941,11 @@ background-color: rgb(170, 170, 127); 光栅标定 + + + 12 + + @@ -917,6 +955,11 @@ background-color: rgb(170, 170, 127); IP设置 + + + 12 + + @@ -926,6 +969,11 @@ background-color: rgb(170, 170, 127); 关于 + + + 12 + + @@ -935,6 +983,11 @@ background-color: rgb(170, 170, 127); 登录 + + + 12 + + @@ -944,6 +997,39 @@ background-color: rgb(170, 170, 127); 用户管理 + + + 12 + + + + + + + :/ToolBarPic/ToolBarpic/toolbox3.png:/ToolBarPic/ToolBarpic/toolbox3.png + + + 系统设置 + + + + 12 + + + + + + + :/ToolBarPic/ToolBarpic/fileexplorer.png:/ToolBarPic/ToolBarpic/fileexplorer.png + + + 相机配置 + + + + 12 + + diff --git a/tpvs17/tpMain/tpMain.vcxproj b/tpvs17/tpMain/tpMain.vcxproj index 2156772..afacdbe 100644 --- a/tpvs17/tpMain/tpMain.vcxproj +++ b/tpvs17/tpMain/tpMain.vcxproj @@ -769,7 +769,6 @@ "$(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" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing qmythread.h... diff --git a/tpvs17/tpMain/tpMain.vcxproj.filters b/tpvs17/tpMain/tpMain.vcxproj.filters index bbbb9ec..5e6e3f6 100644 --- a/tpvs17/tpMain/tpMain.vcxproj.filters +++ b/tpvs17/tpMain/tpMain.vcxproj.filters @@ -45,21 +45,9 @@ {f294c213-9a3f-4c3f-a74d-5dfc28bba3c3} - - {2ebbabc3-5d96-4349-a29c-19d33c06f9f2} - - - {bbdb447f-7f68-473d-b1a4-2d4b22ef2130} - - - {cc96b449-fcff-4c3d-b464-89aef1da9b44} - {9e52d532-ebd9-4a72-9d07-596e45df0ece} - - {c2c39a47-2d33-40d6-8fec-b19d02e02bcf} - {1c912f7f-f95e-4887-9b55-19f143f30d2a} @@ -69,15 +57,39 @@ {e391fcf8-d043-4a98-a8f8-4d6393c9db52} - - {afc06e06-ac8c-46f5-9e09-18e15a8e72c0} - {09e67658-15bb-4f13-9016-5b6b1909df6d} {19e648fe-9462-470f-ad5d-9434be239d4f} + + {afc06e06-ac8c-46f5-9e09-18e15a8e72c0} + + + {cc96b449-fcff-4c3d-b464-89aef1da9b44} + + + {d452c117-6cf6-44e7-b804-2397b524f6a0} + + + {c2c39a47-2d33-40d6-8fec-b19d02e02bcf} + + + {0b943849-5bff-43cb-b1ca-7dd9a18a71b9} + + + {e1b50e51-3618-4ac6-a2f1-9bd69105122b} + + + {c18cd373-aa9a-40f9-b311-780dcdfee81e} + + + {9e4e103a-8a97-4330-a5cd-552944505af4} + + + {2ebbabc3-5d96-4349-a29c-19d33c06f9f2} + @@ -90,7 +102,7 @@ Generated Files\Release - QPixmapBar + BaseUILib\QPixmapBar Generated Files\Debug @@ -99,7 +111,7 @@ Generated Files\Release - splashscreen + BaseUILib\splashscreen Generated Files\Debug @@ -326,17 +338,11 @@ Thread - - UI - - - UI - - Model + CustomUILib\Model - Model + CustomUILib\Model sql @@ -440,18 +446,12 @@ Generated Files\Release - - angle - Generated Files\Debug Generated Files\Release - - angle - Generated Files\Debug @@ -506,6 +506,18 @@ ImageCompare + + BaseUILib\ImgView + + + BaseUILib\ImgView + + + BaseUILib\progressView + + + BaseUILib\pulpewidget + @@ -517,9 +529,6 @@ sql - - Thread - Header Files @@ -655,10 +664,10 @@ QDiskClean - QPixmapBar + BaseUILib\QPixmapBar - splashscreen + BaseUILib\splashscreen Thread @@ -690,20 +699,14 @@ Thread - - UI - Thread - Model + CustomUILib\Model - Model - - - UI + CustomUILib\Model sql @@ -783,12 +786,6 @@ UIFile - - angle - - - angle - newUI @@ -825,6 +822,18 @@ Form Files + + BaseUILib\ImgView + + + BaseUILib\ImgView + + + BaseUILib\progressView + + + BaseUILib\pulpewidget +