diff --git a/src/lpbdesigner/DrawTool.cpp b/src/lpbdesigner/DrawTool.cpp index a1ad482..598c4a9 100644 --- a/src/lpbdesigner/DrawTool.cpp +++ b/src/lpbdesigner/DrawTool.cpp @@ -42,7 +42,7 @@ static void setCursor(QGraphicsScene * scene, const QCursor & cursor) for (int i = 0; i < views.count(); i++) { QGraphicsView * view = views.at(i); - if (view && (int)view->userData(0) == 1) + if (view /*&& (int)view->userData(0) == 1*/) view->setCursor(cursor); } } diff --git a/src/lpbdesigner/DsgAlgoDlg.cpp b/src/lpbdesigner/DsgAlgoDlg.cpp index 678193d..0346b12 100644 --- a/src/lpbdesigner/DsgAlgoDlg.cpp +++ b/src/lpbdesigner/DsgAlgoDlg.cpp @@ -2,7 +2,7 @@ #include "ui_AlgoDlg.h" #include "qfiledialog.h" #include "QDesktopWidget" - +#pragma execution_character_set("utf-8") CDsgAlgoDlg::CDsgAlgoDlg(QWidget *parent) : QDialog(parent), ui(new Ui::AlgoDlg) { m_pDE = NULL; diff --git a/src/lpbdesigner/DsgParamDlg.cpp b/src/lpbdesigner/DsgParamDlg.cpp index b081dc9..7485bb8 100644 --- a/src/lpbdesigner/DsgParamDlg.cpp +++ b/src/lpbdesigner/DsgParamDlg.cpp @@ -1,6 +1,6 @@ #include "DsgParamDlg.h" #include "ui_ParamDlg.h" - +#pragma execution_character_set("utf-8") CDsgParamDlg::CDsgParamDlg(QWidget *parent) : QDialog(parent), m_valueCombox(this) { ui = new Ui::ParamDlg; @@ -144,6 +144,15 @@ bool CDsgParamDlg::OnShowRoiDlg() if (!m_pRoiDlg->Initialize(m_pDE, m_pAlgo, m_pTask)) return false; + + if (m_pTask->GetTaskInfo()->templateImg.data == NULL) + { + QMessageBox infobox(QMessageBox::Critical, tr("提示"), tr("请设置标定图再进行ROI标定!"), QMessageBox::Yes, this); + infobox.setWindowIcon(QIcon(":/image/leaper")); + infobox.setButtonText(QMessageBox::Yes, tr("确认")); + infobox.exec(); + return false; + } m_tRoiData.img = m_pTask->GetTaskInfo()->templateImg; m_pRoiDlg->setParent(this); m_pRoiDlg->setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint); diff --git a/src/lpbdesigner/DsgRoiDlg.cpp b/src/lpbdesigner/DsgRoiDlg.cpp index ea7daaf..94b499b 100644 --- a/src/lpbdesigner/DsgRoiDlg.cpp +++ b/src/lpbdesigner/DsgRoiDlg.cpp @@ -49,6 +49,32 @@ CDsgRoiDlg::CDsgRoiDlg(QWidget *parent) : QDialog(parent), ui(new Ui::RoiDlg) m_pRoiScene = new RoiScene(this); m_pRoiScene->SetGraphicsView(ui->graphicsView); m_pRoiScene->SetInfoLable(ui->label_pixel_info); + + connect(ui->m_pbUp, SIGNAL(clicked()), this, SLOT(OnMove())); + connect(ui->m_pbLeft, SIGNAL(clicked()), this, SLOT(OnMove())); + connect(ui->m_pbRight, SIGNAL(clicked()), this, SLOT(OnMove())); + connect(ui->m_pbDown, SIGNAL(clicked()), this, SLOT(OnMove())); + /*开启按钮长按功能*/ + ui->m_pbUp->setAutoRepeat(true); + ui->m_pbUp->setAutoRepeatDelay(400); + ui->m_pbUp->setAutoRepeatInterval(50); + + ui->m_pbLeft->setAutoRepeat(true); + ui->m_pbLeft->setAutoRepeatDelay(400); + ui->m_pbLeft->setAutoRepeatInterval(50); + + ui->m_pbRight->setAutoRepeat(true); + ui->m_pbRight->setAutoRepeatDelay(400); + ui->m_pbRight->setAutoRepeatInterval(50); + + ui->m_pbDown->setAutoRepeat(true); + ui->m_pbDown->setAutoRepeatDelay(400); + ui->m_pbDown->setAutoRepeatInterval(50); + + int slide = SystemStateInfo::setIni.value("sliderValue",1).toInt(); + ui->horizontalSlider->setValue(slide); + connect(ui->horizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(onSliderChange(int))); + } CDsgRoiDlg::~CDsgRoiDlg() @@ -113,7 +139,7 @@ bool CDsgRoiDlg::OnOk() int nItems = m_pRoiScene->getGraphItems(); if (nCount != nItems) { - int a = QMessageBox::warning(this, QObject::tr("警告"), QObject::tr("系统检测到有ROI未进行绑定，请绑定后继续！！！")); + QMessageBox::warning(this, QObject::tr("警告"), QObject::tr("系统检测到有ROI未进行绑定，请绑定后继续！！！")); return false; } QDialog::accept(); @@ -146,10 +172,8 @@ void CDsgRoiDlg::OnShowColorDlg() QColor color = QColorDialog::getColor(Qt::black,this,QString("select color")); if (color.rgb() == QColor(0, 0, 0).rgb()) return ; - QString strRGB = QString("(%1,%2,%3)").arg(QString::number(color.red()), QString::number(color.green()), QString::number(color.blue())); - ui->lineEdit_3->setText(strRGB); - QString strStyle = QString("background-color:rgba(%1,%2,%3,255);").arg(color.red()).arg(color.green()).arg(color.blue()); - ui->lineEdit_3->setStyleSheet(strStyle); + QString strStyle = QString("font:8px ;background-color:rgba(%1,%2,%3,255);").arg(color.red()).arg(color.green()).arg(color.blue()); + ui->label_Color->setStyleSheet(strStyle); SystemStateInfo::rgb = color.rgb(); return; } @@ -193,10 +217,9 @@ LP_DETECTOR_ROI_DATA CDsgRoiDlg::ShowRoiDlg(LP_DETECTOR_ROI_DATA roiData) if (SystemStateInfo::rgb == 0) SystemStateInfo::rgb = QColor(255, 0, 0).rgb(); QColor color(SystemStateInfo::rgb); - QString strRGB = QString("(%1,%2,%3)").arg(QString::number(color.red()), QString::number(color.green()), QString::number(color.blue())); - ui->lineEdit_3->setText(strRGB); + QString strStyle = QString("background-color:rgba(%1,%2,%3,255);").arg(color.red()).arg(color.green()).arg(color.blue()); - ui->lineEdit_3->setStyleSheet(strStyle); + ui->label_Color->setStyleSheet(strStyle); QDesktopWidget* desktop = QApplication::desktop(); move((desktop->width() - this->width()) / 2, (desktop->height() - this->height()) / 2); @@ -415,23 +438,24 @@ void CDsgRoiDlg::OnMove() { if (!m_pRoiScene) return; - if (sender()->objectName() == "pushButton_10") + + int step = ui->horizontalSlider->value(); + if (sender()->objectName() == "m_pbLeft") { - m_pRoiScene->MoveSelectedItem(LEFT); + m_pRoiScene->MoveSelectedItem(LEFT, step); } - else if (sender()->objectName() == "pushButton_11") + else if (sender()->objectName() == "m_pbUp") { - m_pRoiScene->MoveSelectedItem(UP); + m_pRoiScene->MoveSelectedItem(UP, step); } - else if (sender()->objectName() == "pushButton_12") + else if (sender()->objectName() == "m_pbRight") { - m_pRoiScene->MoveSelectedItem(RIGHT); + m_pRoiScene->MoveSelectedItem(RIGHT, step); } - else if (sender()->objectName() == "pushButton_13") + else if (sender()->objectName() == "m_pbDown") { - m_pRoiScene->MoveSelectedItem(DOWN); + m_pRoiScene->MoveSelectedItem(DOWN, step); } - } void CDsgRoiDlg::showEvent(QShowEvent *evt) @@ -456,3 +480,15 @@ void CDsgRoiDlg::OnZoomOut() m_pRoiScene->zoomImage(false); } +Q_SLOT void CDsgRoiDlg::onSliderChange(int value) +{ + SystemStateInfo::setIni.setValue(QStringLiteral("sliderValue"), value); +} + +void CDsgRoiDlg::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + ui->retranslateUi(this); + } +} diff --git a/src/lpbdesigner/DsgRoiDlg.h b/src/lpbdesigner/DsgRoiDlg.h index e86b3ad..86ced8e 100644 --- a/src/lpbdesigner/DsgRoiDlg.h +++ b/src/lpbdesigner/DsgRoiDlg.h @@ -24,6 +24,9 @@ public: virtual void OnManualTrigger(){} virtual void OnSetParam(IDetectorTask* pTask){} virtual void showEvent(QShowEvent *evt); + Q_SLOT void onSliderChange(int value); +protected: + virtual void changeEvent(QEvent *event); public slots : bool OnOk(); bool OnCancel(); @@ -34,6 +37,7 @@ public slots : void OnMove(); void OnZoomIn(); void OnZoomOut(); + void OnSelectImage(); void OnShowTenFlag(); private: diff --git a/src/lpbdesigner/MainFrame.cpp b/src/lpbdesigner/MainFrame.cpp index 0542230..f92b21e 100644 --- a/src/lpbdesigner/MainFrame.cpp +++ b/src/lpbdesigner/MainFrame.cpp @@ -117,26 +117,25 @@ CMainFrame::CMainFrame(QWidget *parent) ui->setupUi(this); setContextMenuPolicy(Qt::NoContextMenu); setWindowIcon(QIcon(":/img/resource/app.png")); + //task列表控件设置 connect(ui->treeWidget, SIGNAL(itemClicked(QTreeWidgetItem*, int)), this, SLOT(OnTreeItemClick())); ui->treeWidget->setStyleSheet("QTreeWidget::item{height:30px}"); - + + //算法列表控件初始化 ui->tableWidget_2->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->tableWidget_2, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OnParamPopMenu(const QPoint&))); connect(ui->tableWidget_2, SIGNAL(cellDoubleClicked(int, int)), this, SLOT(OnRunAlgo())); connect(ui->tableWidget_2, SIGNAL(cellClicked(int, int)), this, SLOT(OnInitCurrentAlgoParam())); - + + //算法参数列表控件初始化 ui->tableWidget->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->tableWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OnParamListPopMenu(const QPoint&))); connect(ui->tableWidget, SIGNAL(cellClicked(int, int)), this, SLOT(OnCellClicked(int, int))); + + //图像输入框 + ui->gv_input->setInfoLabel(ui->label_pixel_info); ui->gv_input->setContextMenuPolicy(Qt::CustomContextMenu); connect(ui->gv_input, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OnGvInputWidgetPopMenu(const QPoint&))); - - connect(ui->pushButton_5, SIGNAL(clicked()), this, SLOT(OnClearResult()));//清空打印信息 - connect(ui->m_pbLoadImage, SIGNAL(clicked()), this, SLOT(onLoadImage()));//加载图片 - connect(ui->m_pbSaveBtn, SIGNAL(clicked()), this, SLOT(OnTrigger()));//保存标定参数 - connect(this, SIGNAL(sgShowStatus(QString)), this, SLOT(OnShowStatus(QString))); - - ui->gv_input->setInfoLabel(ui->label_pixel_info); connect(ui->gv_input, SIGNAL(imgScaled(QTransform, QPointF)), ui->gv_output, SLOT(scaleImg(QTransform, QPointF))); connect(ui->gv_input, SIGNAL(imgMoved(QPointF)), ui->gv_output, SLOT(moveImg(QPointF))); connect(ui->gv_output, SIGNAL(imgScaled(QTransform, QPointF)), ui->gv_input, SLOT(scaleImg(QTransform, QPointF))); @@ -144,7 +143,12 @@ CMainFrame::CMainFrame(QWidget *parent) connect(ui->gv_output, SIGNAL(pixelSelected(QPoint)), ui->gv_input, SLOT(selectPixel(QPoint))); connect(this, SIGNAL(sgShowCameraImage(QImage)), this, SLOT(OnShowCameraImage(QImage))); - m_plablStatus = new QLabel(this); + connect(ui->pushButton_5, SIGNAL(clicked()), this, SLOT(OnClearResult()));//清空打印信息 + connect(ui->m_pbLoadImage, SIGNAL(clicked()), this, SLOT(onLoadImage()));//加载图片 + connect(ui->m_pbSaveBtn, SIGNAL(clicked()), this, SLOT(OnTrigger()));//保存标定参数 + connect(this, SIGNAL(sgShowStatus(QString)), this, SLOT(OnShowStatus(QString))); + + m_plablStatus = new QLabel(this);//菜单栏提示信息 ui->statusBar->addWidget(m_plablStatus); _pSaveStatus = ui->label_SaveStatus; } @@ -165,12 +169,10 @@ CMainFrame::~CMainFrame() bool CMainFrame::OnMainMenuTrigger(QAction* pAction) { - if (pAction) - { + if (pAction) { QString strName = pAction->objectName(); - if ("action_save" == strName) - { - if (_pOldTask){ + if ("action_save" == strName) { + if (_pOldTask) { if (!oldMat.empty()) _pOldTask->GetTaskInfo()->templateImg = oldMat; } @@ -374,7 +376,16 @@ bool CMainFrame::InitCurrentTask() std::string strPath = strImageName.toLocal8Bit().toStdString(); m_pCurrentTask->GetTaskInfo()->templateImg = cv::imread(strPath, CV_LOAD_IMAGE_GRAYSCALE); } - ColossusBase::showImage(m_pCurrentTask->GetTaskInfo()->templateImg, ui->gv_input); + if (m_pCurrentTask->GetTaskInfo()->templateImg.data == NULL) + { + QImage img(":/resource/no-img.png"); + ui->gv_input->setImg(img); + } + else + { + ColossusBase::showImage(m_pCurrentTask->GetTaskInfo()->templateImg, ui->gv_input); + } + } return true; diff --git a/src/lpbdesigner/MainFrame.ui b/src/lpbdesigner/MainFrame.ui index 1b16512..f5e67d2 100644 --- a/src/lpbdesigner/MainFrame.ui +++ b/src/lpbdesigner/MainFrame.ui @@ -9,8 +9,8 @@ 0 0 - 1050 - 755 + 1022 + 702 @@ -315,7 +315,7 @@ - 加载图像 + 加载标定图像 diff --git a/src/lpbdesigner/RoiDlg.ui b/src/lpbdesigner/RoiDlg.ui index 4e58253..50493b6 100644 --- a/src/lpbdesigner/RoiDlg.ui +++ b/src/lpbdesigner/RoiDlg.ui @@ -9,63 +9,79 @@ 0 0 - 896 - 587 + 925 + 623 ROI检测区域配置 - - 5 - - - 5 - - - 5 - - - 5 - - - - - Qt::Horizontal - - - - 649 - 27 - - - - - - - - - 0 - 30 - - + + 12 - - 确定 + + 绘图区域： + + + 2 + + + 6 + + + 6 + + + 6 + + + 6 + + + + + + 12 + + + + Pixel info: + + + + + + + + 12 + + + + background-color: rgb(212, 212, 212); + + + QGraphicsView::AnchorUnderMouse + + + QGraphicsView::AnchorUnderMouse + + + + - - - + + + - 0 - 30 + 140 + 16777215 @@ -73,211 +89,340 @@ 12 - - 取消 + + 工具 + + + + + + + + 0 + 0 + + + + + + + + + + + + 80 + 16777215 + + + + + 12 + + + + 颜色 + + + + + + + + + + 0 + 30 + + + + + 130 + 16777215 + + + + + 12 + + + + 圆 + + + + + + + + 0 + 30 + + + + + 12 + + + + 十字标定线 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + 步长 + + + + + + + 1 + + + 10 + + + 1 + + + Qt::Horizontal + + + false + + + false + + + QSlider::TicksAbove + + + 1 + + + + + + + + + 5 + + + 0 + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + ... + + + + :/resource/caret-up.png:/resource/caret-up.png + + + + 32 + 32 + + + + true + + + + + + + ... + + + + :/resource/caret-down.png:/resource/caret-down.png + + + + 32 + 32 + + + + true + + + + + + + ... + + + + :/resource/caret-right.png:/resource/caret-right.png + + + + 32 + 32 + + + + true + + + + + + + ... + + + + :/resource/caret-left.png:/resource/caret-left.png + + + + 32 + 32 + + + + true + + + + + + + false + + + ... + + + + :/resource/btn-close.png:/resource/btn-close.png + + + + 32 + 32 + + + + false + + + false + + + false + + + QToolButton::DelayedPopup + + + true + + + Qt::NoArrow + + + + + + - - - - Qt::Horizontal - - - - - 140 - 16777215 - - - - - 12 - - - - 工具 - - - - 2 + + + + + + Qt::Horizontal - - 2 + + + 649 + 27 + - - 2 + + + + + + + 0 + 30 + - - 2 + + + 12 + - - - - - - - 80 - 16777215 - - - - - 12 - - - - 颜色 - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 100 - 16777215 - - - - - 12 - - - - - - - - - - - 0 - 30 - - - - - 130 - 16777215 - - - - - 12 - - - - 圆 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 0 - 30 - - - - - 12 - - - - 十字标定线 - - - - - - - - - 12 - - - - 绘图区域： - - - - 2 + + 确定 - - 6 + + + + + + + 0 + 30 + - - 6 + + + 12 + - - 6 + + 取消 - - 6 - - - - - - 12 - - - - Pixel info: - - - - - - - - 12 - - - - background-color: rgb(212, 212, 212); - - - QGraphicsView::AnchorUnderMouse - - - QGraphicsView::AnchorUnderMouse - - - - - - + + + - + + + diff --git a/src/lpbdesigner/RoiItem.cpp b/src/lpbdesigner/RoiItem.cpp index 3e8b485..72fe188 100644 --- a/src/lpbdesigner/RoiItem.cpp +++ b/src/lpbdesigner/RoiItem.cpp @@ -5,7 +5,7 @@ #include #include #include -#define MinRECTWITH 20 +#define MinRECTWITH 32 static QPainterPath qt_graphicsItem_shapeFromPath(const QPainterPath &path, const QPen &pen) { const qreal penWidthZero = qreal(0.00000001); @@ -65,9 +65,9 @@ void GraphicsItemGroup::paint(QPainter *painter, const QStyleOptionGraphicsItem //绘制中心 painter->setPen(QPen(QColor(qRed(rgb), qGreen(rgb), qBlue(rgb)), 3, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin)); - painter->drawEllipse(-5, -5, 10, 10); - painter->drawLine(QLineF(QPointF(-10, 0), QPointF(10, 0))); - painter->drawLine(QLineF(QPointF(0, -10), QPointF(0, 10))); + painter->drawEllipse(-20, -20, 25, 25); + painter->drawLine(QLineF(QPointF(-15, 0), QPointF(15, 0))); + painter->drawLine(QLineF(QPointF(0, -15), QPointF(0, 15))); } } @@ -110,12 +110,8 @@ QRectF GraphicsItemGroup::boundingRect() const { rect = mapRectFromItem(m_vecItem[i], m_vecItem[i]->rect()); } - rects = rects.united(rect); - } - - return rects; } diff --git a/src/lpbdesigner/RoiScene.cpp b/src/lpbdesigner/RoiScene.cpp index 1a611ed..ca44b5c 100644 --- a/src/lpbdesigner/RoiScene.cpp +++ b/src/lpbdesigner/RoiScene.cpp @@ -233,7 +233,6 @@ bool RoiScene::InitRecord(Item_List record, int nIndex) itemPoint.setX(item.second.at(0)); itemPoint.setY(item.second.at(1)); graphicItem->setPos(itemPoint-mImgPosOffSet); - //m_graphItemMap[graphicItem]= maptoImgNewPos(graphicItem); tagROIParas tagItem; tagItem._model = ENUM_LOCKROI; tagItem.rectf = maptoImgNewPos(graphicItem); @@ -279,7 +278,6 @@ void RoiScene::mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent) DrawTool * tool = DrawTool::findTool(DrawTool::c_drawShape); if (tool) tool->mousePressEvent(mouseEvent, this); - } } @@ -337,7 +335,7 @@ void RoiScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) } -void RoiScene::MoveSelectedItem(DirType type) +void RoiScene::MoveSelectedItem(DirType type, int step) { QList items = this->selectedItems(); GraphicsItem *item = 0; @@ -351,22 +349,22 @@ void RoiScene::MoveSelectedItem(DirType type) { case LEFT: { - item->moveBy(-1, 0); + item->moveBy(-step, 0); break; } case RIGHT: { - item->moveBy(1, 0); + item->moveBy(step, 0); break; } case UP: { - item->moveBy(0, -1); + item->moveBy(0, -step); break; } case DOWN: { - item->moveBy(0, 1); + item->moveBy(0, step); break; } } @@ -480,6 +478,7 @@ void RoiScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { unCheckAction = menu.addAction(QObject::tr("解绑")); unCheckAction->setObjectName("unCheckAction"); + unCheckAction->setIcon(QIcon(":/resource/lock-open.png")); } else if (tmpModel == ENUM_BINDROI) { @@ -487,28 +486,34 @@ void RoiScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) { checkAction = menu.addAction(QObject::tr("绑定")); checkAction->setObjectName("checkAction"); + checkAction->setIcon(QIcon(":/resource/lock.png")); } unCheckAction = menu.addAction(QObject::tr("解除径向绑定")); unCheckAction->setObjectName("unCheckAction"); + unCheckAction->setIcon(QIcon(":/resource/lock.png")); } else if (tmpModel == ENUM_UNBINDROI) { radiusFixAction = menu.addAction(QObject::tr("径向解锁")); radiusFixAction->setObjectName("radiusUnfixAction"); + unCheckAction->setIcon(QIcon(":/resource/lock-open_green.png")); } else { if (items.size() > 0){ deleteAction = menu.addAction(QObject::tr("删除")); deleteAction->setObjectName("deleteAction"); + deleteAction->setIcon(QIcon(":/resource/btn-close.png")); } checkAction = menu.addAction(QObject::tr("绑定")); checkAction->setObjectName("checkAction"); + checkAction->setIcon(QIcon(":/resource/lock.png")); if (m_graphItemMapStruct.size() == 2){ if (tmpModel != ENUM_UNLOCKROI){ unCheckAction = menu.addAction(QObject::tr("解绑")); unCheckAction->setObjectName("unCheckAction"); + unCheckAction->setIcon(QIcon(":/resource/lock-open.png")); } GraphicsItem *pFirst = m_graphItemMapStruct.firstKey(); @@ -525,6 +530,7 @@ void RoiScene::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) if (pSmallItem == ptmpItem){ radiusFixAction = menu.addAction(QObject::tr("径向绑定")); radiusFixAction->setObjectName("radiusFixAction"); + radiusFixAction->setIcon(QIcon(":/resource/lock.png")); } } } @@ -767,7 +773,13 @@ void RoiScene::InitShowImage(cv::Mat img) if (!mpGraphicsView) return; if (img.empty()) + { + if (m_pImageItem) + { + m_pImageItem = nullptr; + } return; + } mpShowImage = ColossusBase::convMat2QImage(img); diff --git a/src/lpbdesigner/RoiScene.h b/src/lpbdesigner/RoiScene.h index ffbe4f0..df934da 100644 --- a/src/lpbdesigner/RoiScene.h +++ b/src/lpbdesigner/RoiScene.h @@ -53,7 +53,7 @@ public: bool InitRecord(Item_List record, int nIndex); void InitShowImage(cv::Mat img); void DisableMenu(bool bRet) { m_bDisableMenu = bRet; } - void MoveSelectedItem(DirType type); + void MoveSelectedItem(DirType type,int step = 1); void SetSelectedItem(QPoint pos, QRect size); void SetGraphicsView(QGraphicsView* ipGV){ mpGraphicsView = ipGV; } void SetInfoLable(QLabel* ipLable){ mpInfoLabel = ipLable; } diff --git a/src/lpbdesigner/SizeHandle.h b/src/lpbdesigner/SizeHandle.h index f651f9c..4368b6b 100644 --- a/src/lpbdesigner/SizeHandle.h +++ b/src/lpbdesigner/SizeHandle.h @@ -12,7 +12,7 @@ class QGraphicsSceneMouseEvent; QT_END_NAMESPACE -enum { SELECTION_HANDLE_SIZE = 10, SELECTION_MARGIN = 10 }; +enum { SELECTION_HANDLE_SIZE = 20, SELECTION_MARGIN = 20 }; enum SelectionHandleState { SelectionHandleOff, SelectionHandleInactive, SelectionHandleActive }; class SizeHandleRect :public QGraphicsRectItem diff --git a/src/lpbdesigner/image.qrc b/src/lpbdesigner/image.qrc index d31d58d..dc8c026 100644 --- a/src/lpbdesigner/image.qrc +++ b/src/lpbdesigner/image.qrc @@ -1,6 +1,21 @@ resource/app.png + resource/arrow.png + resource/arrow-down.png + resource/arrow-left.png + resource/arrow-right.png + resource/btn-close.png + resource/lock.png + resource/lock-open.png + resource/no-img.png + resource/caret-down.png + resource/caret-left.png + resource/caret-right.png + resource/caret-up.png + resource/interlines.png + resource/lock-open_green.png resource/save.png + resource/save-all.png diff --git a/src/lpbdesigner/resource/arrow-down.png b/src/lpbdesigner/resource/arrow-down.png new file mode 100644 index 0000000..29d1d44 Binary files /dev/null and b/src/lpbdesigner/resource/arrow-down.png differ diff --git a/src/lpbdesigner/resource/arrow-left.png b/src/lpbdesigner/resource/arrow-left.png new file mode 100644 index 0000000..a2ce452 Binary files /dev/null and b/src/lpbdesigner/resource/arrow-left.png differ diff --git a/src/lpbdesigner/resource/arrow-right.png b/src/lpbdesigner/resource/arrow-right.png new file mode 100644 index 0000000..7277382 Binary files /dev/null and b/src/lpbdesigner/resource/arrow-right.png differ diff --git a/src/lpbdesigner/resource/arrow.png b/src/lpbdesigner/resource/arrow.png new file mode 100644 index 0000000..e437312 Binary files /dev/null and b/src/lpbdesigner/resource/arrow.png differ diff --git a/src/lpbdesigner/resource/btn-close.png b/src/lpbdesigner/resource/btn-close.png new file mode 100644 index 0000000..6b3753e Binary files /dev/null and b/src/lpbdesigner/resource/btn-close.png differ diff --git a/src/lpbdesigner/resource/caret-down.png b/src/lpbdesigner/resource/caret-down.png new file mode 100644 index 0000000..9181a38 Binary files /dev/null and b/src/lpbdesigner/resource/caret-down.png differ diff --git a/src/lpbdesigner/resource/caret-left.png b/src/lpbdesigner/resource/caret-left.png new file mode 100644 index 0000000..5ee7421 Binary files /dev/null and b/src/lpbdesigner/resource/caret-left.png differ diff --git a/src/lpbdesigner/resource/caret-right.png b/src/lpbdesigner/resource/caret-right.png new file mode 100644 index 0000000..6a60867 Binary files /dev/null and b/src/lpbdesigner/resource/caret-right.png differ diff --git a/src/lpbdesigner/resource/caret-up.png b/src/lpbdesigner/resource/caret-up.png new file mode 100644 index 0000000..86ab43d Binary files /dev/null and b/src/lpbdesigner/resource/caret-up.png differ diff --git a/src/lpbdesigner/resource/down.png b/src/lpbdesigner/resource/down.png new file mode 100644 index 0000000..2f5dcbc Binary files /dev/null and b/src/lpbdesigner/resource/down.png differ diff --git a/src/lpbdesigner/resource/img.png b/src/lpbdesigner/resource/img.png new file mode 100644 index 0000000..ec4316a Binary files /dev/null and b/src/lpbdesigner/resource/img.png differ diff --git a/src/lpbdesigner/resource/interlines.png b/src/lpbdesigner/resource/interlines.png new file mode 100644 index 0000000..39edf5f Binary files /dev/null and b/src/lpbdesigner/resource/interlines.png differ diff --git a/src/lpbdesigner/resource/left_more.png b/src/lpbdesigner/resource/left_more.png new file mode 100644 index 0000000..255d50e Binary files /dev/null and b/src/lpbdesigner/resource/left_more.png differ diff --git a/src/lpbdesigner/resource/lock-open.png b/src/lpbdesigner/resource/lock-open.png new file mode 100644 index 0000000..c0a18bb Binary files /dev/null and b/src/lpbdesigner/resource/lock-open.png differ diff --git a/src/lpbdesigner/resource/lock-open_green.png b/src/lpbdesigner/resource/lock-open_green.png new file mode 100644 index 0000000..82e9299 Binary files /dev/null and b/src/lpbdesigner/resource/lock-open_green.png differ diff --git a/src/lpbdesigner/resource/lock.png b/src/lpbdesigner/resource/lock.png new file mode 100644 index 0000000..cafeeae Binary files /dev/null and b/src/lpbdesigner/resource/lock.png differ diff --git a/src/lpbdesigner/resource/no-img.png b/src/lpbdesigner/resource/no-img.png new file mode 100644 index 0000000..9d06a0d Binary files /dev/null and b/src/lpbdesigner/resource/no-img.png differ diff --git a/src/lpbdesigner/resource/right_more.png b/src/lpbdesigner/resource/right_more.png new file mode 100644 index 0000000..bfe5ed9 Binary files /dev/null and b/src/lpbdesigner/resource/right_more.png differ diff --git a/src/lpbdesigner/resource/save-all.png b/src/lpbdesigner/resource/save-all.png new file mode 100644 index 0000000..e3f43c4 Binary files /dev/null and b/src/lpbdesigner/resource/save-all.png differ diff --git a/src/lpbdesigner/resource/save.png b/src/lpbdesigner/resource/save.png index ce706e4..e67d6d4 100644 Binary files a/src/lpbdesigner/resource/save.png and b/src/lpbdesigner/resource/save.png differ diff --git a/src/lpbdesigner/resource/thumbtack.png b/src/lpbdesigner/resource/thumbtack.png new file mode 100644 index 0000000..24e09d8 Binary files /dev/null and b/src/lpbdesigner/resource/thumbtack.png differ diff --git a/src/lpbdesigner/resource/up.png b/src/lpbdesigner/resource/up.png new file mode 100644 index 0000000..01d2633 Binary files /dev/null and b/src/lpbdesigner/resource/up.png differ diff --git a/src/tpMain/Resource/no-img.png b/src/tpMain/Resource/no-img.png new file mode 100644 index 0000000..9d06a0d Binary files /dev/null and b/src/tpMain/Resource/no-img.png differ diff --git a/src/tpMain/hubDetect.qrc b/src/tpMain/hubDetect.qrc index 52f1e65..02730c7 100644 --- a/src/tpMain/hubDetect.qrc +++ b/src/tpMain/hubDetect.qrc @@ -7,6 +7,7 @@ Resource/windows3.png Resource/windows4.png none.jpg + Resource/no-img.png ToolBarpic/3d12.png diff --git a/src/tpMain/qaddmodel.cpp b/src/tpMain/qaddmodel.cpp index 00388d0..7747eb7 100644 --- a/src/tpMain/qaddmodel.cpp +++ b/src/tpMain/qaddmodel.cpp @@ -56,4 +56,11 @@ void QAddModel::SetClearData() ui.wf_model_edit_ply->setText(""); } +void QAddModel::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + ui.retranslateUi(this); + } +} diff --git a/src/tpMain/qaddmodel.h b/src/tpMain/qaddmodel.h index 9c75b99..530aeef 100644 --- a/src/tpMain/qaddmodel.h +++ b/src/tpMain/qaddmodel.h @@ -25,6 +25,8 @@ public: QMap getData(); void SetClearData(); +protected: + virtual void changeEvent(QEvent *event); }; #endif // QADDMODEL_H diff --git a/src/tpMain/qshowimg.cpp b/src/tpMain/qshowimg.cpp index 783e8aa..c069ed6 100644 --- a/src/tpMain/qshowimg.cpp +++ b/src/tpMain/qshowimg.cpp @@ -19,6 +19,14 @@ Q_SLOT void QShowImg::showImg() } +void QShowImg::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + ui.retranslateUi(this); + } +} + void QShowImg::setPicPath(QString m_filePath /*= QString()*/) { QPixmap m_pix(m_filePath); diff --git a/src/tpMain/qshowimg.h b/src/tpMain/qshowimg.h index f656a62..96244a8 100644 --- a/src/tpMain/qshowimg.h +++ b/src/tpMain/qshowimg.h @@ -15,6 +15,8 @@ public: Q_SLOT void showImg(); signals: void sgChangeImg(); +protected: + virtual void changeEvent(QEvent *event); private: Ui::QShowImg ui; }; diff --git a/src/tpMain/qworkItemdlg.cpp b/src/tpMain/qworkItemdlg.cpp index dc67f34..d5d16ee 100644 --- a/src/tpMain/qworkItemdlg.cpp +++ b/src/tpMain/qworkItemdlg.cpp @@ -50,3 +50,11 @@ Q_SLOT void QWorkItemDlg::onOk() QDialog::accept(); } +void QWorkItemDlg::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + ui.retranslateUi(this); + } +} + diff --git a/src/tpMain/qworkItemdlg.h b/src/tpMain/qworkItemdlg.h index 969faf7..ac061a8 100644 --- a/src/tpMain/qworkItemdlg.h +++ b/src/tpMain/qworkItemdlg.h @@ -19,7 +19,8 @@ public: }; private: Q_SLOT void onOk(); - +protected: + virtual void changeEvent(QEvent *event); private: Ui::QWorkItemUI ui; diff --git a/src/tpMain/qworkmgrui.cpp b/src/tpMain/qworkmgrui.cpp index 4a11cc8..fae68c6 100644 --- a/src/tpMain/qworkmgrui.cpp +++ b/src/tpMain/qworkmgrui.cpp @@ -17,7 +17,7 @@ #include "qworkItemdlg.h" #include #pragma execution_character_set("utf-8") - +#define MODEL_UI_ICON_NONE ":/image/no-img" QWorkMgrUI::QWorkMgrUI(QWorkMgrCtrl *pWork, IWheelCtrl *pCtrl) : m_pCtrl(pCtrl), m_pWorkCtrl(pWork), m_ptrModel(NULL), m_ptableModel(NULL) { @@ -492,7 +492,7 @@ void QWorkMgrUI::UpdateTab2(QStringList m_strList) QString strFilePath = pModel->getPicPath(); if (strFilePath.isEmpty()) { - strFilePath = ":/image/none.jpg"; + strFilePath = MODEL_UI_ICON_NONE; } else { @@ -501,7 +501,7 @@ void QWorkMgrUI::UpdateTab2(QStringList m_strList) QPixmap pix = QPixmap(strFilePath); if (pix.isNull()) - pix = QPixmap(":/image/none.jpg"); + pix = QPixmap(MODEL_UI_ICON_NONE); QIcon icon(pix.scaled(QSize(100, 100))); QListWidgetItem* pItem = new QListWidgetItem(icon, strName); @@ -599,6 +599,14 @@ void QWorkMgrUI::closeEvent(QCloseEvent *event) return; } +void QWorkMgrUI::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + ui.retranslateUi(this); + } +} + void QWorkMgrUI::setData2Show(QString str){ ui.state_lineEdit->setText(str); } diff --git a/src/tpMain/qworkmgrui.h b/src/tpMain/qworkmgrui.h index 1a24711..ec810e2 100644 --- a/src/tpMain/qworkmgrui.h +++ b/src/tpMain/qworkmgrui.h @@ -44,6 +44,7 @@ public: void UpdateTabView(QString strName, TypeSelect enTymodel); protected: virtual void closeEvent(QCloseEvent *event); + virtual void changeEvent(QEvent *event); signals: void sgShowMsg(QString str); void sgUpdatedefect(); diff --git a/tpvs17/tpMain/QAlgParamDlg.cpp b/tpvs17/tpMain/QAlgParamDlg.cpp index cb13c41..3454c5b 100644 --- a/tpvs17/tpMain/QAlgParamDlg.cpp +++ b/tpvs17/tpMain/QAlgParamDlg.cpp @@ -64,6 +64,14 @@ void QAlgParamDlg::timerEvent(QTimerEvent *event) } } +void QAlgParamDlg::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + ui.retranslateUi(this); + } +} + void QAlgParamDlg::setParam() { ui.checkBox->setChecked(lpGlobalConfig::instance()->algParam.m_UseBackground == 0 ? false : true); diff --git a/tpvs17/tpMain/QAlgParamDlg.h b/tpvs17/tpMain/QAlgParamDlg.h index 9f75a2c..dd989f7 100644 --- a/tpvs17/tpMain/QAlgParamDlg.h +++ b/tpvs17/tpMain/QAlgParamDlg.h @@ -12,14 +12,15 @@ public: QAlgParamDlg(QWidget *parent = Q_NULLPTR); ~QAlgParamDlg(); Q_SLOT void onButtonClicked(); + void setParam(); + void getParam(); + Q_SLOT void onChangeBG(); signals: void sgParamChange(); protected: virtual void showEvent(QShowEvent *event); virtual void timerEvent(QTimerEvent *event); - void setParam(); - void getParam(); - Q_SLOT void onChangeBG(); + virtual void changeEvent(QEvent *event); private: Ui::QAlgParamDlg ui; int m_timeID{ 0 }; diff --git a/tpvs17/tpMain/QCamSettingDlg.cpp b/tpvs17/tpMain/QCamSettingDlg.cpp index bda0e37..ce232eb 100644 --- a/tpvs17/tpMain/QCamSettingDlg.cpp +++ b/tpvs17/tpMain/QCamSettingDlg.cpp @@ -196,3 +196,11 @@ void QCamSettingDlg::EnableUI(bool b) ui.m_ImgHeight->setDisabled(!b); } +void QCamSettingDlg::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + ui.retranslateUi(this); + } +} + diff --git a/tpvs17/tpMain/QCamSettingDlg.h b/tpvs17/tpMain/QCamSettingDlg.h index be17a7c..3957519 100644 --- a/tpvs17/tpMain/QCamSettingDlg.h +++ b/tpvs17/tpMain/QCamSettingDlg.h @@ -22,6 +22,8 @@ public: void onShowVirtualDir(bool bShow); void EnableUI(bool b); +protected: + virtual void changeEvent(QEvent *event); private: Ui::QCamSettingDlg ui; ICoreCtrl* m_pCoreCtl{ nullptr }; diff --git a/tpvs17/tpMain/QDebugDlg.cpp b/tpvs17/tpMain/QDebugDlg.cpp index dcf0bf5..e82e9d7 100644 --- a/tpvs17/tpMain/QDebugDlg.cpp +++ b/tpvs17/tpMain/QDebugDlg.cpp @@ -111,3 +111,11 @@ Q_SLOT void QDebugDlg::onTimeOut() { emit sgTriggerCam(); } + +void QDebugDlg::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + ui.retranslateUi(this); + } +} diff --git a/tpvs17/tpMain/QDebugDlg.h b/tpvs17/tpMain/QDebugDlg.h index 34a2634..c8a2229 100644 --- a/tpvs17/tpMain/QDebugDlg.h +++ b/tpvs17/tpMain/QDebugDlg.h @@ -24,6 +24,8 @@ public: signals: void sgTriggerCam(); +protected: + virtual void changeEvent(QEvent *event); private: Ui::QDebugDlg ui; QTimer m_simuliter; diff --git a/tpvs17/tpMain/QModelMgrDlg.cpp b/tpvs17/tpMain/QModelMgrDlg.cpp index cb02d99..266b28c 100644 --- a/tpvs17/tpMain/QModelMgrDlg.cpp +++ b/tpvs17/tpMain/QModelMgrDlg.cpp @@ -16,7 +16,7 @@ #define WS_PICSIZE 129 //!>缩放大小 #define WS_PICSIZELIST_ITEM 100 -#define MODEL_UI_ICON_NONE ":/image/none.jpg" +#define MODEL_UI_ICON_NONE ":/image/no-img" #define MODEL_UI_ICON_LEAPER ":/image/leaper" enum EM_TYPE_PROCESSMODEL @@ -1011,3 +1011,11 @@ void QModelMgrDlg::closeEvent(QCloseEvent *event) } return; } + +void QModelMgrDlg::changeEvent(QEvent *event) +{ + if (event->type() == QEvent::LanguageChange) + { + ui.retranslateUi(this); + } +} diff --git a/tpvs17/tpMain/QModelMgrDlg.h b/tpvs17/tpMain/QModelMgrDlg.h index 3720c56..f69f736 100644 --- a/tpvs17/tpMain/QModelMgrDlg.h +++ b/tpvs17/tpMain/QModelMgrDlg.h @@ -63,8 +63,8 @@ private: protected: Q_SLOT void onButtonClicked(); virtual void showEvent(QShowEvent *event); - virtual void closeEvent(QCloseEvent *event); + virtual void changeEvent(QEvent *event); private: Ui::QModelMgrDlg ui; diff --git a/tpvs17/tpMain/QModelMgrDlg.ui b/tpvs17/tpMain/QModelMgrDlg.ui index cc2fd2f..b87d493 100644 --- a/tpvs17/tpMain/QModelMgrDlg.ui +++ b/tpvs17/tpMain/QModelMgrDlg.ui @@ -6,8 +6,8 @@ 0 0 - 985 - 691 + 1023 + 700 @@ -469,6 +469,12 @@ 129 + + + 129 + 129 + + true @@ -479,10 +485,10 @@ Qt::PlainText - :/image/none.jpg + :/image/no-img - false + true Qt::AlignCenter @@ -646,6 +652,8 @@ - + + + diff --git a/tpvs17/tpMain/QSettingDlg.cpp b/tpvs17/tpMain/QSettingDlg.cpp deleted file mode 100644 index d61a33e..0000000 --- a/tpvs17/tpMain/QSettingDlg.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "QSettingDlg.h" - -QSettingDlg::QSettingDlg(QWidget *parent) - : QWidget(parent) -{ - ui.setupUi(this); - setWindowIcon(QIcon(":/image/leaper")); -} - -QSettingDlg::~QSettingDlg() -{ -} diff --git a/tpvs17/tpMain/QSettingDlg.h b/tpvs17/tpMain/QSettingDlg.h deleted file mode 100644 index 2500d9f..0000000 --- a/tpvs17/tpMain/QSettingDlg.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef _H_QSETTINGDLG_H_ -#define _H_QSETTINGDLG_H_ - -#include -#include "ui_QSettingDlg.h" - -class QSettingDlg : public QWidget -{ - Q_OBJECT - -public: - QSettingDlg(QWidget *parent = Q_NULLPTR); - ~QSettingDlg(); - -private: - Ui::QSettingDlg ui; -}; - -#endif diff --git a/tpvs17/tpMain/QSettingDlg.ui b/tpvs17/tpMain/QSettingDlg.ui deleted file mode 100644 index ca46dba..0000000 --- a/tpvs17/tpMain/QSettingDlg.ui +++ /dev/null @@ -1,23 +0,0 @@ - - QSettingDlg - - - QSettingDlg - - - - 0 - 0 - 400 - 300 - - - - QSettingDlg - - - - - - - diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp index d65f052..4b8713f 100644 --- a/tpvs17/tpMain/lpMainWin.cpp +++ b/tpvs17/tpMain/lpMainWin.cpp @@ -22,12 +22,12 @@ #include "databasesql.h" #include "lpCryptokey.h" -#define VERSION_HUB "3.0.1.4" -#define VERSION_ALG "3.0.1.3" -#define UPDATE_TIME "2021-09-30" +#define VERSION_HUB "3.0.1.5" +#define VERSION_ALG "3.0.1.4" +#define UPDATE_TIME "2021-10-09" #pragma execution_character_set("utf-8") - +#define MODEL_UI_ICON_NONE ":/image/no-img" static QImage cvMat2QImage(const cv::Mat& mat) { if (mat.type() == CV_8UC1) { QImage image(mat.cols, mat.rows, QImage::Format_Indexed8); @@ -85,12 +85,6 @@ static cv::Mat QImageToMat(QImage image) { lpMainWin::lpMainWin(QWidget *parent) : QMainWindow(parent) { - {//加载语言设置 - QSettings languageSetting("hubdetect.ini", QSettings::IniFormat); - QString strLanguage = languageSetting.value("language", "Chinese").toString(); - SetLanguage(strLanguage); - } - this->setWindowIcon(QIcon(":/image/leaper")); qRegisterMetaType("TimeStruct"); onInitCoreCtrl();//初始化CoreCtrl模块 相机相关处理模块 @@ -98,7 +92,11 @@ lpMainWin::lpMainWin(QWidget *parent) ui.setupUi(this); onInitAbout(); setupTrayIcon(); - + {//加载语言设置 + QSettings languageSetting("hubdetect.ini", QSettings::IniFormat); + QString strLanguage = languageSetting.value("language", "Chinese").toString(); + SetLanguage(strLanguage); + } lpGlobalConfig::instance()->loadStandParam(); { QGridLayout *pLayout = new QGridLayout(ui.cam_win_1); @@ -130,11 +128,11 @@ lpMainWin::lpMainWin(QWidget *parent) ui.action_userManager->setVisible(false); QMenu *pToolMenu = new QMenu(this); + pToolMenu->addAction(ui.actioncamSetting); pToolMenu->addAction(ui.action_ImageCali);//图像标定 - pToolMenu->addAction(ui.action_debug); pToolMenu->addAction(ui.actionSystemSeting); - pToolMenu->addAction(ui.actioncamSetting); pToolMenu->addAction(ui.actionalgo); + pToolMenu->addAction(ui.action_debug); QToolButton* pbutton = new QToolButton(this); pbutton->setMenu(pToolMenu); @@ -1392,7 +1390,7 @@ void lpMainWin::onShowResult(Result2Ui* pRlt) scare = scareh; if (pRlt->m_strModel.isEmpty()) { lpGlobalConfig::instance()->totalUnDetectNum++; - QPixmap pix(":/image/none.jpg"); + QPixmap pix(MODEL_UI_ICON_NONE); ui.main_lb_res_model_pic->setPixmap(pix.scaled(scare - 15, scare - 15)); ui.main_lb_res_model_pic->setStyleSheet(QString("QLabel{border: 5px solid rgb(250,0,0,250);background-color: rgb(200, 200, 200);}")); diff --git a/tpvs17/tpMain/lpMainWin.ui b/tpvs17/tpMain/lpMainWin.ui index 24deb24..642c8ef 100644 --- a/tpvs17/tpMain/lpMainWin.ui +++ b/tpvs17/tpMain/lpMainWin.ui @@ -6,7 +6,7 @@ 0 0 - 1026 + 1025 704 diff --git a/tpvs17/tpMain/tpMain.vcxproj b/tpvs17/tpMain/tpMain.vcxproj index bc5051d..11fe0b3 100644 --- a/tpvs17/tpMain/tpMain.vcxproj +++ b/tpvs17/tpMain/tpMain.vcxproj @@ -162,9 +162,6 @@ true - - true - true @@ -297,9 +294,6 @@ true - - true - true @@ -336,7 +330,6 @@ - @@ -430,16 +423,6 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(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 -DQT_WEBSOCKETS_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$(QTDIR)\include\QtWebSockets" "-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.\..\..\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\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" "-I.\..\..\src\tpMain\cryptokey" "-I.\..\..\3part\RsaCrypto\include" "-I.\..\..\3part\openssl-1.0.2n\vs13\include" "-I.\..\..\3part\lp_libtcp\include" - - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -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_WINDOWS -DQT_WEBSOCKETS_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$(QTDIR)\include\QtWebSockets" "-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.\..\..\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\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" "-I.\..\..\src\tpMain\cryptokey" "-I.\..\..\3part\RsaCrypto\include" "-I.\..\..\3part\openssl-1.0.2n\vs13\include" "-I.\..\..\3part\lp_libtcp\include" - $(QTDIR)\bin\moc.exe;%(FullPath) - Moc%27ing %(Identity)... - .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp - "$(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 -DQT_WEBSOCKETS_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$(QTDIR)\include\QtWebSockets" "-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.\..\..\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\edcircle\include" "-I.\..\..\3part\lpCoreCtrl\include" "-I.\..\..\src\tpMain\algela" "-I.\..\..\src\ImageCompare" "-I.\..\..\src\interface" "-I.\lpRawTcp" "-I.\..\..\src\tpMain\cryptokey" "-I.\..\..\3part\RsaCrypto\include" "-I.\..\..\3part\openssl-1.0.2n\vs13\include" "-I.\..\..\3part\lp_libtcp\include" - $(QTDIR)\bin\moc.exe;%(FullPath) Moc%27ing %(Identity)... @@ -515,7 +498,6 @@ - @@ -1158,18 +1140,6 @@ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) - Uic%27ing %(Identity)... - .\GeneratedFiles\ui_%(Filename).h;%(Outputs) - "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)" - - $(QTDIR)\bin\uic.exe;%(AdditionalInputs) diff --git a/tpvs17/tpMain/tpMain.vcxproj.filters b/tpvs17/tpMain/tpMain.vcxproj.filters index 91d0331..fafb81b 100644 --- a/tpvs17/tpMain/tpMain.vcxproj.filters +++ b/tpvs17/tpMain/tpMain.vcxproj.filters @@ -358,9 +358,6 @@ Generated Files\Release - - Source Files - ImageCompare @@ -609,9 +606,6 @@ Generated Files - - Generated Files - ImageCompare @@ -782,12 +776,6 @@ lpMain - - Header Files - - - Form Files - BaseUILib\ImgView