diff --git a/.gitignore b/.gitignore
index a1005f8..cf9ac81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ HPPA类图.drawio
HPPA - 副本.ui
icon
ignore_*
+resources
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
diff --git a/HPPA/FocusDialog.ui b/HPPA/FocusDialog.ui
index eb0f76d..de6158b 100644
--- a/HPPA/FocusDialog.ui
+++ b/HPPA/FocusDialog.ui
@@ -13,10 +13,6 @@
调焦
-
-
- :/HPPA/HPPA.ico:/HPPA/HPPA.ico
-
QLineEdit {
background-color: #142D7F;
@@ -236,8 +232,8 @@ QSlider::handle:horizontal:pressed {
-
- icon/all/close.svgicon/all/close.svg
+
+ :/svg/resources/icons/svg/close.svg:/svg/resources/icons/svg/close.svg
diff --git a/HPPA/HPPA.cpp b/HPPA/HPPA.cpp
index ad1bf3c..3776121 100644
--- a/HPPA/HPPA.cpp
+++ b/HPPA/HPPA.cpp
@@ -148,63 +148,13 @@ HPPA::HPPA(QWidget* parent)
graphicsView_delete->setObjectName(QString::fromUtf8("graphicsView_delete"));
QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Preferred);
sizePolicy1.setHorizontalStretch(0);
-sizePolicy1.setVerticalStretch(0);
-sizePolicy1.setHeightForWidth(graphicsView_delete->sizePolicy().hasHeightForWidth());
+ sizePolicy1.setVerticalStretch(0);
+ sizePolicy1.setHeightForWidth(graphicsView_delete->sizePolicy().hasHeightForWidth());
graphicsView_delete->setSizePolicy(sizePolicy1);
graphicsView_delete->setFrameShape(QFrame::NoFrame);
graphicsView_delete->setFrameShadow(QFrame::Raised);
//gridLayout_toc->addWidget(graphicsView_delete, 0, 0, 1, 1);
- //2、没用,仅仅使用QTreeWidget实现的简略ui
- QTreeWidget* treeWidget = new QTreeWidget();
- treeWidget->setColumnCount(1);
- treeWidget->setIndentation(18);
- treeWidget->setRootIsDecorated(true);
- treeWidget->header()->hide();
- treeWidget->setStyleSheet(R"(
- QTreeWidget
- {
- color: #ACCDFF;
- }
- QTreeWidget::branch {
- background: transparent;
- }
-
- QTreeWidget::branch:has-children:!has-siblings:closed,
- QTreeWidget::branch:closed:has-children:has-siblings
- {
- border-image: none;
- image: url(D:/cpp_project_vs2022/HPPA/x64/Debug/3DModel/tree_tri_right.svg);
- }
- QTreeWidget::branch:open:has-children:!has-siblings,
- QTreeWidget::branch:open:has-children:has-siblings
- {
- border-image: none;
- image: url(D:/cpp_project_vs2022/HPPA/x64/Debug/3DModel/tree_tri_down.svg);
- }
- )");
-
- //QList items;
- //for (int i = 0; i < 3; ++i)
- // items.append(new QTreeWidgetItem((QTreeWidget*)0, QStringList(QString("tmp_image_%1").arg(i))));
- //treeWidget->insertTopLevelItems(0, items);
-
- QTreeWidgetItem* group1 = new QTreeWidgetItem(treeWidget);
- group1->setText(0, "Raster");
- group1->setExpanded(true); // 默认展开
-
- QTreeWidgetItem* group2 = new QTreeWidgetItem(treeWidget);
- group2->setText(0, "Vector");
- group2->setExpanded(true);
-
- QTreeWidgetItem* layerA = new QTreeWidgetItem(group1);
- layerA->setText(0, "tmp_image_1");
-
- QTreeWidgetItem* layerB = new QTreeWidgetItem(group1);
- layerB->setText(0, "tmp_image_2");
-
- //gridLayout_toc->addWidget(treeWidget, 0, 0, 1, 1);
-
//3、正经TOC
m_LayerTree = new LayerTree();
m_LayerTreeModel = new LayerTreeModel(m_LayerTree, this, true);
@@ -241,13 +191,13 @@ sizePolicy1.setHeightForWidth(graphicsView_delete->sizePolicy().hasHeightForWidt
QTreeView::branch:closed:has-children:has-siblings
{
border-image: none;
- image: url(D:/cpp_project_vs2022/HPPA/x64/Debug/3DModel/tree_tri_right.svg);
+ image: url(:/svg/resources/icons/svg/tree_tri_right.svg);
}
QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings
{
border-image: none;
- image: url(D:/cpp_project_vs2022/HPPA/x64/Debug/3DModel/tree_tri_down.svg);
+ image: url(:/svg/resources/icons/svg/tree_tri_down.svg);
}
)");
@@ -717,29 +667,29 @@ void HPPA::initMenubarToolbar()
sepWidget->setStyleSheet("background-color: #2C586C;"); // 调整颜色
}
- ui.action_connect_imager->setIcon(QIcon(".//icon//all//connect_imager.svg"));
- ui.action_auto_exposure->setIcon(QIcon(".//icon//all//exposure.svg"));
- ui.action_focus->setIcon(QIcon(".//icon//all//focus.svg"));
- ui.action_dark->setIcon(QIcon(".//icon//all//dark.svg"));
- ui.action_reference->setIcon(QIcon(".//icon//all//reference.svg"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record.svg"));
- ui.actionOpenDirectory->setIcon(QIcon(".//icon//all//openDirectory.svg"));
+ ui.action_connect_imager->setIcon(QIcon(":/svg/resources/icons/svg/connect_imager.svg"));
+ ui.action_auto_exposure->setIcon(QIcon(":/svg/resources/icons/svg/exposure.svg"));
+ ui.action_focus->setIcon(QIcon(":/svg/resources/icons/svg/focus.svg"));
+ ui.action_dark->setIcon(QIcon(":/svg/resources/icons/svg/dark.svg"));
+ ui.action_reference->setIcon(QIcon(":/svg/resources/icons/svg/reference.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record.svg"));
+ ui.actionOpenDirectory->setIcon(QIcon(":/svg/resources/icons/svg/openDirectory.svg"));
- ui.mActionPan->setIcon(QIcon(".//icon//all//pan.svg"));
- ui.mActionSpectral->setIcon(QIcon(".//icon//all//spectral.svg"));
+ ui.mActionPan->setIcon(QIcon(":/svg/resources/icons/svg/pan.svg"));
+ ui.mActionSpectral->setIcon(QIcon(":/svg/resources/icons/svg/spectral.svg"));
connect(ui.mActionPan, &QAction::toggled, this, [=](bool checked) {
if (checked)
- ui.mActionPan->setIcon(QIcon(".//icon//all//pan_done.svg"));
+ ui.mActionPan->setIcon(QIcon(":/svg/resources/icons/svg/pan_done.svg"));
else
- ui.mActionPan->setIcon(QIcon(".//icon//all//pan.svg"));
+ ui.mActionPan->setIcon(QIcon(":/svg/resources/icons/svg/pan.svg"));
});
connect(ui.mActionSpectral, &QAction::toggled, this, [=](bool checked) {
if (checked)
- ui.mActionSpectral->setIcon(QIcon(".//icon//all//spectral_done.svg"));
+ ui.mActionSpectral->setIcon(QIcon(":/svg/resources/icons/svg/spectral_done.svg"));
else
- ui.mActionSpectral->setIcon(QIcon(".//icon//all//spectral.svg"));
+ ui.mActionSpectral->setIcon(QIcon(":/svg/resources/icons/svg/spectral.svg"));
});
// 使用样式表设置透明背景
@@ -857,7 +807,7 @@ void HPPA::recordFromRobotArm(int fileCounter)
m_Imager->setRecordControlState(false);
ui.action_start_recording->setText(QString::fromLocal8Bit("采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_done.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_done.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
//qDebug() << "recordFromRobotArm: 1111111111111111111111";
@@ -874,7 +824,7 @@ void HPPA::recordFromRobotArm(int fileCounter)
emit StartRecordSignal();
ui.action_start_recording->setText(QString::fromLocal8Bit("采集中"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_ing.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_ing.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}");
//qDebug() << "recordFromRobotArm: 2222222222222222222222";
}
@@ -927,13 +877,13 @@ void HPPA::updateImagerPicture(const QString& actionName)
{
QString picPath;
if (actionName == "mActionPica_L")
- picPath = ".//icon//imagerPicture//L.png";
+ picPath = ":/imagerPicture/resources/icons/imagerPicture/L.png";
else if (actionName == "mActionPica_NIR")
- picPath = ".//icon//imagerPicture//IR.png";
+ picPath = ":/imagerPicture/resources/icons/imagerPicture/IR.png";
else if (actionName == "mActionPika_XC2")
- picPath = ".//icon//imagerPicture//XC2.png";
+ picPath = ":/imagerPicture/resources/icons/imagerPicture/XC2.png";
else if (actionName == "mActionCorning_410")
- picPath = ".//icon//imagerPicture//corning410.png";
+ picPath = ":/imagerPicture/resources/icons/imagerPicture/corning410.png";
if (!picPath.isEmpty())
{
@@ -941,7 +891,7 @@ void HPPA::updateImagerPicture(const QString& actionName)
if (!pixmap.isNull())
{
QImage img = pixmap.toImage().convertToFormat(QImage::Format_ARGB32);
- const int threshold = 220;
+ const int threshold = 240;
for (int y = 0; y < img.height(); ++y)
{
QRgb* line = reinterpret_cast(img.scanLine(y));
@@ -1363,7 +1313,7 @@ void HPPA::onStartRecordStep1()
emit StartRecordSignal();//发射开始采集信号
ui.action_start_recording->setText(QString::fromLocal8Bit("停止采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_ing.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_ing.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}");
}
else
@@ -1372,7 +1322,7 @@ void HPPA::onStartRecordStep1()
m_RecordState -= 1;
ui.action_start_recording->setText(QString::fromLocal8Bit("采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_done.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_done.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
}
return;
@@ -1387,7 +1337,7 @@ void HPPA::onStartRecordStep1()
removeAllLayersInRasterGroup();
ui.action_start_recording->setText(QString::fromLocal8Bit("停止采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_ing.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_ing.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}");
//应该先控制马达运动,当马达运动后,再开始光谱仪采集(发射开始采集信号)
@@ -1402,7 +1352,7 @@ void HPPA::onStartRecordStep1()
m_RecordState -= 1;
ui.action_start_recording->setText(QString::fromLocal8Bit("采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_done.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_done.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
}
return;
@@ -1423,7 +1373,7 @@ void HPPA::onStartRecordStep1()
m_tmc->run();
ui.action_start_recording->setText(QString::fromLocal8Bit("停止采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_ing.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_ing.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}");
}
else
@@ -1433,7 +1383,7 @@ void HPPA::onStartRecordStep1()
m_RecordState--;
ui.action_start_recording->setText(QString::fromLocal8Bit("采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_done.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_done.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
}
@@ -1831,7 +1781,7 @@ void HPPA::onconnect()
return;
}
- ui.action_connect_imager->setIcon(QIcon(".//icon//all//connect_imager_ing.svg"));
+ ui.action_connect_imager->setIcon(QIcon(":/svg/resources/icons/svg/connect_imager_ing.svg"));
m_Imager->moveToThread(m_RecordThread);
m_RecordThread->start();
@@ -1900,7 +1850,7 @@ void HPPA::onconnect()
}
catch (std::exception const& e)
{
- ui.action_connect_imager->setIcon(QIcon(".//icon//all//connect_imager.svg"));
+ ui.action_connect_imager->setIcon(QIcon(":/svg/resources/icons/svg/connect_imager.svg"));
std::cerr << "Error: " << e.what() << std::endl;
@@ -1918,18 +1868,18 @@ void HPPA::onconnect()
void HPPA::testImagerStatus()
{
- ui.action_connect_imager->setIcon(QIcon(".//icon//all//connect_imager_done.svg"));
+ ui.action_connect_imager->setIcon(QIcon(":/svg/resources/icons/svg/connect_imager_done.svg"));
//m_TestImagerStausThread->start();
}
void HPPA::autoExposureFinished()
{
- ui.action_auto_exposure->setIcon(QIcon(".//icon//all//exposure_done.svg"));
+ ui.action_auto_exposure->setIcon(QIcon(":/svg/resources/icons/svg/exposure_done.svg"));
}
void HPPA::onAutoExposure()
{
- ui.action_auto_exposure->setIcon(QIcon(".//icon//all//exposure_ing.svg"));
+ ui.action_auto_exposure->setIcon(QIcon(":/svg/resources/icons/svg/exposure_ing.svg"));
double ReturnedExposureTime = m_Imager->auto_exposure();
@@ -2010,7 +1960,7 @@ void HPPA::onDark()
msgBox.setText(QString::fromLocal8Bit("采集暗电流,请确保镜头盖盖上!"));
msgBox.exec();
- ui.action_dark->setIcon(QIcon(".//icon//all//dark_ing.svg"));
+ ui.action_dark->setIcon(QIcon(":/svg/resources/icons/svg/dark_ing.svg"));
QAction* checked = moveplatformActionGroup->checkedAction();
QString checkedName = checked->objectName();
@@ -2033,7 +1983,7 @@ void HPPA::onDark()
void HPPA::recordDarkFinish()
{
- ui.action_dark->setIcon(QIcon(".//icon//all//dark_done.svg"));
+ ui.action_dark->setIcon(QIcon(":/svg/resources/icons/svg/dark_done.svg"));
//ui.mainToolBar->widgetForAction(ui.action_dark)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
}
@@ -2043,7 +1993,7 @@ void HPPA::onReference()
msgBox.setText(QString::fromLocal8Bit("请确保白板放置正确!"));
msgBox.exec();
- ui.action_reference->setIcon(QIcon(".//icon//all//reference_ing.svg"));
+ ui.action_reference->setIcon(QIcon(":/svg/resources/icons/svg/reference_ing.svg"));
QAction* checked = moveplatformActionGroup->checkedAction();
QString checkedName = checked->objectName();
@@ -2066,7 +2016,7 @@ void HPPA::onReference()
void HPPA::recordWhiteFinish()
{
- ui.action_reference->setIcon(QIcon(".//icon//all//reference_done.svg"));
+ ui.action_reference->setIcon(QIcon(":/svg/resources/icons/svg/reference_done.svg"));
//ui.mainToolBar->widgetForAction(ui.action_reference)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
}
@@ -2212,7 +2162,7 @@ void HPPA::onRecordFinishedSignal_WhenFrameNumberMeet()
std::cout << "停止采集原因:帧数采集完了。" << std::endl;
ui.action_start_recording->setText(QString::fromLocal8Bit("采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_done.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_done.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
m_RecordState++;//当自动停止采集
@@ -2236,7 +2186,7 @@ void HPPA::onRecordFinishedSignal_WhenFrameNumberNotMeet()
std::cout << "停止采集原因:(1)帧数没有采集够时,马达到达最大位置;(2)手动停止采集。" << std::endl;
ui.action_start_recording->setText(QString::fromLocal8Bit("采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_done.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_done.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
m_RecordState++;
@@ -2245,7 +2195,7 @@ void HPPA::onRecordFinishedSignal_WhenFrameNumberNotMeet()
void HPPA::onsequenceComplete()
{
ui.action_start_recording->setText(QString::fromLocal8Bit("采集"));
- ui.action_start_recording->setIcon(QIcon(".//icon//all//record_done.svg"));
+ ui.action_start_recording->setIcon(QIcon(":/svg/resources/icons/svg/record_done.svg"));
//ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
m_RecordState++;
diff --git a/HPPA/HPPA.h b/HPPA/HPPA.h
index e988644..2492ed7 100644
--- a/HPPA/HPPA.h
+++ b/HPPA/HPPA.h
@@ -161,7 +161,7 @@ class WidgetWithBackgroundPicture : public QWidget
public:
explicit WidgetWithBackgroundPicture(QWidget* parent = nullptr)
: QWidget(parent),
- m_pixmap(".//icon//titile_bar_bgp.png") // 使用资源或绝对路径
+ m_pixmap(":/png/resources/icons/png/titile_bar_bgp.png") // 使用资源或绝对路径
{
// 可选:设置初始大小
resize(800, 600);
diff --git a/HPPA/HPPA.ico b/HPPA/HPPA.ico
deleted file mode 100644
index e76ecbc..0000000
Binary files a/HPPA/HPPA.ico and /dev/null differ
diff --git a/HPPA/HPPA.qrc b/HPPA/HPPA.qrc
index 5285ca9..d180d7a 100644
--- a/HPPA/HPPA.qrc
+++ b/HPPA/HPPA.qrc
@@ -1,5 +1,53 @@
-
- HPPA.ico
+
+ resources/icons/svg/arrow_down.svg
+ resources/icons/svg/arrow_up.svg
+ resources/icons/svg/close.svg
+ resources/icons/svg/connect_imager.svg
+ resources/icons/svg/connect_imager_done.svg
+ resources/icons/svg/connect_imager_ing.svg
+ resources/icons/svg/dark.svg
+ resources/icons/svg/dark_done.svg
+ resources/icons/svg/dark_ing.svg
+ resources/icons/svg/exposure.svg
+ resources/icons/svg/exposure_done.svg
+ resources/icons/svg/exposure_ing.svg
+ resources/icons/svg/focus.svg
+ resources/icons/svg/focus_done.svg
+ resources/icons/svg/focus_ing.svg
+ resources/icons/svg/openDirectory.svg
+ resources/icons/svg/openDirectory_done.svg
+ resources/icons/svg/pan.svg
+ resources/icons/svg/pan_done.svg
+ resources/icons/svg/record.svg
+ resources/icons/svg/record_done.svg
+ resources/icons/svg/record_ing.svg
+ resources/icons/svg/reference.svg
+ resources/icons/svg/reference_done.svg
+ resources/icons/svg/reference_ing.svg
+ resources/icons/svg/software_icon.svg
+ resources/icons/svg/software_icon_small.svg
+ resources/icons/svg/spectral.svg
+ resources/icons/svg/spectral_done.svg
+ resources/icons/svg/tree_tri_down.svg
+ resources/icons/svg/tree_tri_right.svg
+ resources/icons/svg/mIconRaster.svg
+
+
+ resources/icons/png/Spectral_Insight_27.png
+ resources/icons/png/Spectral_Insight_54.png
+ resources/icons/png/Spectral_Insight_170.png
+ resources/icons/png/Spectral_Insight_340.png
+ resources/icons/png/titile_bar_bgp.png
+ resources/icons/png/titile_bar_bgp2x.png
+
+
+ resources/icons/imagerPicture/corning410.png
+ resources/icons/imagerPicture/IR.png
+ resources/icons/imagerPicture/L.png
+ resources/icons/imagerPicture/XC2.png
+
+
+ resources/icons/ico/Spectral_Insight_128.ico
diff --git a/HPPA/HPPA.rc b/HPPA/HPPA.rc
index 510337b..e154492 100644
Binary files a/HPPA/HPPA.rc and b/HPPA/HPPA.rc differ
diff --git a/HPPA/HPPA.ui b/HPPA/HPPA.ui
index 1a913f6..48cffec 100644
--- a/HPPA/HPPA.ui
+++ b/HPPA/HPPA.ui
@@ -14,8 +14,8 @@
Spectral Insight
-
- icon/all/png/Group 356_slices/22.pngicon/all/png/Group 356_slices/22.png
+
+ :/ico/resources/icons/ico/Spectral_Insight_128.ico:/ico/resources/icons/ico/Spectral_Insight_128.ico
diff --git a/HPPA/HPPA.vcxproj b/HPPA/HPPA.vcxproj
index f4c8929..a41b3c4 100644
--- a/HPPA/HPPA.vcxproj
+++ b/HPPA/HPPA.vcxproj
@@ -249,7 +249,7 @@
-
+
diff --git a/HPPA/HPPA.vcxproj.filters b/HPPA/HPPA.vcxproj.filters
index a8444f3..198447c 100644
--- a/HPPA/HPPA.vcxproj.filters
+++ b/HPPA/HPPA.vcxproj.filters
@@ -413,7 +413,7 @@
-
+
Resource Files
diff --git a/HPPA/HyperImagerControl.cpp b/HPPA/HyperImagerControl.cpp
index 0028c32..1d2537d 100644
--- a/HPPA/HyperImagerControl.cpp
+++ b/HPPA/HyperImagerControl.cpp
@@ -49,13 +49,13 @@ HyperImagerControl::HyperImagerControl(QWidget* parent)
}
QDoubleSpinBox::up-arrow {
- image: url(D:/cpp_project_vs2022/HPPA/HPPA/icon/all/arrow_up.svg);
+ image: url(:/svg/resources/icons/svg/arrow_up.svg);
width: 10px;
height: 10px;
}
QDoubleSpinBox::down-arrow {
- image: url(D:/cpp_project_vs2022/HPPA/HPPA/icon/all/arrow_down.svg);
+ image: url(:/svg/resources/icons/svg/arrow_down.svg);
width: 10px;
height: 10px;
}
diff --git a/HPPA/LayerTreeModel.cpp b/HPPA/LayerTreeModel.cpp
index d0e5dda..740ff4f 100644
--- a/HPPA/LayerTreeModel.cpp
+++ b/HPPA/LayerTreeModel.cpp
@@ -64,7 +64,7 @@ QVariant LayerTreeModel::data(const QModelIndex& index, int role) const
else if (LayerTreeNode::isLayer(tmp))
{
QString basePath = QCoreApplication::applicationDirPath();
- return QIcon(basePath + "/icons/mIconRaster.svg");
+ return QIcon(":/svg/resources/icons/svg/mIconRaster.svg");
}
}
diff --git a/HPPA/about.ui b/HPPA/about.ui
index b4f050e..c27e823 100644
--- a/HPPA/about.ui
+++ b/HPPA/about.ui
@@ -16,10 +16,6 @@
Dialog
-
-
- C:/Users/73505/.designer/backup/HPPA.icoC:/Users/73505/.designer/backup/HPPA.ico
-
0
@@ -96,7 +92,7 @@
- icon/all/png/Group 356_slices/22.png
+ :/png/resources/icons/png/Spectral_Insight_27.png
@@ -173,8 +169,8 @@ QPushButton:pressed
-
- icon/all/close.svgicon/all/close.svg
+
+ :/svg/resources/icons/svg/close.svg:/svg/resources/icons/svg/close.svg
@@ -196,7 +192,7 @@ QPushButton:pressed
- icon/all/png/Group 356_slices/Group 356@2x.png
+ :/png/resources/icons/png/Spectral_Insight_170.png
@@ -305,6 +301,8 @@ QPushButton:pressed
-
+
+
+
diff --git a/HPPA/focusWindow.cpp b/HPPA/focusWindow.cpp
index 1acf6a9..471c884 100644
--- a/HPPA/focusWindow.cpp
+++ b/HPPA/focusWindow.cpp
@@ -10,7 +10,7 @@ focusWindow::focusWindow(QWidget *parent, ImagerOperationBase* imager)
setWindowFlags(Qt::FramelessWindowHint);
ui.titlebarWidget->installEventFilter(this);
- QSvgRenderer svgRenderer(QString(".//icon//all//focus.svg"));
+ QSvgRenderer svgRenderer(QString(":/svg/resources/icons/svg/focus.svg"));
QPixmap pixmap(24, 24);
pixmap.fill(Qt::transparent); // 背景透明
QPainter painter(&pixmap);
diff --git a/HPPA/imageControl.cpp b/HPPA/imageControl.cpp
index e2c95db..aa84d92 100644
--- a/HPPA/imageControl.cpp
+++ b/HPPA/imageControl.cpp
@@ -64,13 +64,13 @@ ImageControl::ImageControl(QWidget* parent)
}
QDoubleSpinBox::up-arrow {
- image: url(D:/cpp_project_vs2022/HPPA/HPPA/icon/all/arrow_up.svg);
+ image: url(:/svg/resources/icons/svg/arrow_up.svg);
width: 10px;
height: 10px;
}
QDoubleSpinBox::down-arrow {
- image: url(D:/cpp_project_vs2022/HPPA/HPPA/icon/all/arrow_down.svg);
+ image: url(:/svg/resources/icons/svg/arrow_down.svg);
width: 10px;
height: 10px;
}
diff --git a/HPPA/resource.h b/HPPA/resource.h
index 0cc8414..327f5b5 100644
--- a/HPPA/resource.h
+++ b/HPPA/resource.h
@@ -2,13 +2,13 @@
// Microsoft Visual C++ ɵİļ
// HPPA.rc ʹ
//
-#define IDI_ICON1 101
+#define IDI_ICON1 106
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_RESOURCE_VALUE 107
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101