fix

采集bug
消除状态栏中间的白色竖线
2026-03-31 16:55:21 +08:00 · 2026-03-31 13:56:38 +08:00 · 2026-03-25 10:51:00 +08:00 · 2026-03-24 14:54:48 +08:00 · 2026-03-24 14:03:12 +08:00 · 2026-03-20 15:33:25 +08:00
25 changed files with 966 additions and 563 deletions
--- 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.
--- a/HPPA/AspectRatioLabel.cpp
+++ b/HPPA/AspectRatioLabel.cpp
@ -0,0 +1,28 @@
+#include "stdafx.h"
+#include "AspectRatioLabel.h"
+
+AspectRatioLabel::AspectRatioLabel(QWidget* parent)
+	: QLabel(parent)
+{
+	setAlignment(Qt::AlignCenter);
+}
+
+void AspectRatioLabel::setOriginalPixmap(const QPixmap& pixmap)
+{
+	m_originalPixmap = pixmap;
+	updateScaledPixmap();
+}
+
+void AspectRatioLabel::resizeEvent(QResizeEvent* event)
+{
+	QLabel::resizeEvent(event);
+	updateScaledPixmap();
+}
+
+void AspectRatioLabel::updateScaledPixmap()
+{
+	if (m_originalPixmap.isNull())
+		return;
+
+	setPixmap(m_originalPixmap.scaled(size(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
+}
--- a/HPPA/AspectRatioLabel.h
+++ b/HPPA/AspectRatioLabel.h
@ -0,0 +1,22 @@
+#pragma once
+
+#include <QLabel>
+#include <QPixmap>
+#include <QResizeEvent>
+
+class AspectRatioLabel : public QLabel
+{
+	Q_OBJECT
+
+public:
+	explicit AspectRatioLabel(QWidget* parent = nullptr);
+
+	void setOriginalPixmap(const QPixmap& pixmap);
+
+protected:
+	void resizeEvent(QResizeEvent* event) override;
+
+private:
+	void updateScaledPixmap();
+	QPixmap m_originalPixmap;
+};
--- a/HPPA/FocusDialog.ui
+++ b/HPPA/FocusDialog.ui
@ -13,10 +13,6 @@
  <property name="windowTitle">
   <string>调焦</string>
  </property>
-  <property name="windowIcon">
-   <iconset resource="HPPA.qrc">
-    <normaloff>:/HPPA/HPPA.ico</normaloff>:/HPPA/HPPA.ico</iconset>
-  </property>
  <property name="styleSheet">
   <string notr="true">QLineEdit {
    background-color: #142D7F;
@ -236,8 +232,8 @@ QSlider::handle:horizontal:pressed {
            <string/>
           </property>
           <property name="icon">
-            <iconset>
-             <normaloff>icon/all/close.svg</normaloff>icon/all/close.svg</iconset>
+            <iconset resource="HPPA.qrc">
+             <normaloff>:/svg/resources/icons/svg/close.svg</normaloff>:/svg/resources/icons/svg/close.svg</iconset>
           </property>
          </widget>
         </item>
--- a/HPPA/HPPA.cpp
+++ b/HPPA/HPPA.cpp
@ -82,6 +82,8 @@ HPPA::HPPA(QWidget* parent)
    //ui.statusBar->addPermanentWidget(xmotor_state_label1);
    //ui.statusBar->addPermanentWidget(ymotor_state_label1);

+    m_recordFrameCounter = new recordFrameCounter(this);
+    ui.statusBar->addWidget(m_recordFrameCounter);

    connect(this->ui.action_exit, SIGNAL(triggered()), this, SLOT(onExit()));
    connect(this->ui.mActionOpenImg, SIGNAL(triggered()), this, SLOT(onOpenImg()));
@ -94,27 +96,6 @@ HPPA::HPPA(QWidget* parent)

    initMenubarToolbar();

-    //光谱仪操作
-    m_Imager = nullptr;
-    m_RecordState = 0;
-    connect(this->ui.action_connect_imager, SIGNAL(triggered()), this, SLOT(onconnect()));//信号与槽：连接相机，相机操作相关信号与槽绑定放在函数onconnect中
-
-    //设置相机可用帧率范围：这些设置必须在slider的信号和槽连接connect前，否则setMinimum会改变slider的值
-    ui.FramerateSlider->setMinimum(1);
-    ui.FramerateSlider->setMaximum(250);
-    ui.GainSlider->setMinimum(0);
-    ui.GainSlider->setMaximum(24);
-    //相机参数控件设置为不可用
-    frame_number->setEnabled(false);
-
-    ui.framerate_lineEdit->setEnabled(false);
-    ui.integratioin_time_lineEdit->setEnabled(false);
-    ui.gain_lineEdit->setEnabled(false);
-
-    ui.FramerateSlider->setEnabled(false);
-    ui.IntegratioinTimeSlider->setEnabled(false);
-    ui.GainSlider->setEnabled(false);
-
    startTimer(1000);

    widthScale = 1;
@ -174,56 +155,6 @@ sizePolicy1.setHeightForWidth(graphicsView_delete->sizePolicy().hasHeightForWidt
    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<QTreeWidgetItem*> 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);
@ -260,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);
 		}
 	)");

@ -486,7 +417,7 @@ sizePolicy1.setHeightForWidth(graphicsView_delete->sizePolicy().hasHeightForWidt
 	initControlTabwidget();
 	m_tabManager = new TabManager(ui.controlTabWidget, this);

-	ui.mDockWidgetSpectrometer->setWidget(tmp(ui.dockWidgetContents_4));
+	ui.mDockWidgetSpectrometer->setWidget(tmp(ui.controlContents));

 	//3D模型看板
 	ui.mDockWidgetSimulator->setTile(QString::fromLocal8Bit("3D模型"));
@ -572,7 +503,10 @@ sizePolicy1.setHeightForWidth(graphicsView_delete->sizePolicy().hasHeightForWidt
        }
 	)");

-
+	//光谱仪操作
+	m_Imager = nullptr;
+	m_RecordState = 0;
+	connect(this->ui.action_connect_imager, SIGNAL(triggered()), this, SLOT(onconnect()));//信号与槽：连接相机，相机操作相关信号与槽绑定放在函数onconnect中

 	createActionGroups();
 	connect(mImagerGroup, &QActionGroup::triggered, this, &HPPA::selectingImager);
@ -693,6 +627,7 @@ void HPPA::initMenubarToolbar()
 		}
 	)");
 	QAction* action = ui.mainToolBar->insertWidget(ui.action_start_recording, frame_number);
+	frame_number->setEnabled(false);

 	m_FilenameLineEdit = new QLineEdit(ui.mainToolBar);
 	m_FilenameLineEdit->setStyleSheet("QLineEdit{background-color:rgb(255,255,255);}");
@ -732,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"));
 		});

 	// 使用样式表设置透明背景
@ -801,6 +736,12 @@ QWidget* HPPA::tmp(QWidget* a)

 void HPPA::initControlTabwidget()
 {	
+	m_hic = new HyperImagerControl();
+	//ui.controlTabWidget->addTab(m_hic, QString::fromLocal8Bit("光谱仪"));
+	ui.controlTabWidget->insertTab(0, m_hic, QString::fromLocal8Bit("光谱仪"));
+	m_hic->setDisabled(true);
+	ui.controlTabWidget->setCurrentIndex(0);
+
 	//rgb相机
 	m_RgbCameraThread = new QThread();
 	m_RgbCamera = new RgbCameraOperation();
@ -866,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";

@ -883,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";
 }
@ -936,20 +877,34 @@ 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())
 	{
 		QPixmap pixmap(picPath);
 		if (!pixmap.isNull())
 		{
-			ui.imagerPictureLabel->setPixmap(pixmap);
+			QImage img = pixmap.toImage().convertToFormat(QImage::Format_ARGB32);
+			const int threshold = 240;
+			for (int y = 0; y < img.height(); ++y)
+			{
+				QRgb* line = reinterpret_cast<QRgb*>(img.scanLine(y));
+				for (int x = 0; x < img.width(); ++x)
+				{
+					if (qRed(line[x]) >= threshold && qGreen(line[x]) >= threshold && qBlue(line[x]) >= threshold)
+					{
+						line[x] = qRgba(qRed(line[x]), qGreen(line[x]), qBlue(line[x]), 0);
+					}
+				}
+			}
+			m_hic->imagerPictureLabel()->setAttribute(Qt::WA_TranslucentBackground);
+			m_hic->imagerPictureLabel()->setOriginalPixmap(QPixmap::fromImage(img));
 		}
 	}
 }
@ -1042,6 +997,10 @@ void HPPA::removeLayerByTreeIndex()
        const int tabIndex = m_imageViewerTabWidget->indexOf(layerWidget);
        if (tabIndex >= 0)
        {
+            if (m_recordFrameCounter)
+            {
+                m_recordFrameCounter->removeCounter(layerWidget);
+            }
            m_imageViewerTabWidget->removeTab(tabIndex);
        }
        layerWidget->deleteLater();
@ -1094,6 +1053,10 @@ void HPPA::removeAllLayersInRasterGroup()
            const int tabIndex = m_imageViewerTabWidget->indexOf(layerWidget);
            if (tabIndex >= 0)
            {
+                if (m_recordFrameCounter)
+                {
+                    m_recordFrameCounter->removeCounter(layerWidget);
+                }
                m_imageViewerTabWidget->removeTab(tabIndex);
            }
            layerWidget->deleteLater();
@ -1291,15 +1254,6 @@ void HPPA::createPlantPhenotypeScenario()

 }

-void HPPA::CalculateIntegratioinTimeRange()
-{
-	double range = 1 / m_Imager->getFramerate() * 1000;//毫秒
-
-	ui.IntegratioinTimeSlider->blockSignals(true);//因为setMaximum会触发valueChanged信号，所以调用setMaximum前需要阻断信号
-	ui.IntegratioinTimeSlider->setMaximum(range);
-	ui.IntegratioinTimeSlider->blockSignals(false);
-}
-
 void HPPA::onStartRecordStep1()
 {
 	QAction* checked = moveplatformActionGroup->checkedAction();
@ -1359,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
@ -1368,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;
@ -1383,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);}");

 			//应该先控制马达运动，当马达运动后，再开始光谱仪采集（发射开始采集信号）
@ -1398,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;
@ -1419,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
@ -1429,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);}");
 		}

@ -1459,6 +1413,11 @@ QWidget* HPPA::onCreateTab(QString tabName)

 	m_imageViewerTabWidget->setCurrentIndex(m_imageViewerTabWidget->count() - 1);

+	if (m_recordFrameCounter)
+	{
+		m_recordFrameCounter->addCounter(tabTmp);
+	}
+
 	return tabTmp;
 }

@ -1472,6 +1431,12 @@ void HPPA::onTabWidgetCurrentChanged(int index)//代码新建一个tab，会调
    //记录当前
    m_TabWidgetCurrentIndex = index;

+    if (m_recordFrameCounter)
+    {
+        QWidget* currentWidget = m_imageViewerTabWidget->widget(index);
+        m_recordFrameCounter->switchTo(currentWidget);
+    }
+
    //获取绘图控件
    QWidget* currentWidget = m_imageViewerTabWidget->widget(index);
    QList<Mapcavas*> currentImageViewer = currentWidget->findChildren<Mapcavas*>();
@ -1528,52 +1493,24 @@ void HPPA::onActionOpenDirectory()
 	string directory = fileOperation->getDirectoryFromString();

 	QDesktopServices::openUrl(QUrl::fromLocalFile(QString::fromStdString(directory)));
-
-
 }

-void HPPA::OnFramerateLineeditEditingFinished()
+void HPPA::onFramerateChanged(double framerate)
 {
-	std::cout << "Lineedit设置帧率------------------------------------------" << std::endl;
-	m_Imager->setFramerate(this->ui.framerate_lineEdit->text().toDouble());
-	ui.FramerateSlider->setValue(ui.framerate_lineEdit->text().toDouble());
-
-	CalculateIntegratioinTimeRange();
+	m_Imager->setFramerate(framerate);
+	m_hic->setFrameRate(m_Imager->getFramerate());
 }

-void HPPA::OnFramerateSliderChanged(double framerate)
+void HPPA::onIntegrationTimeChanged(double integrationTime)
 {
-	std::cout << "Slider设置帧率------------------------------------------" << std::endl;
-	m_Imager->setFramerate(this->ui.framerate_lineEdit->text().toDouble());
-	ui.framerate_lineEdit->setText(QString::number(framerate));
-
-	CalculateIntegratioinTimeRange();
+	m_Imager->setIntegrationTime(integrationTime);
+	m_hic->setIntegrationTime(m_Imager->getIntegrationTime());
 }

-void HPPA::OnIntegratioinTimeEditingFinished()
+void HPPA::onGainChanged(double gain)
 {
-	std::cout << "Lineedit设置积分时间------------------------------------------" << std::endl;
-	m_Imager->setIntegrationTime(this->ui.integratioin_time_lineEdit->text().toDouble());
-	ui.IntegratioinTimeSlider->setValue(ui.integratioin_time_lineEdit->text().toDouble());
-}
-
-void HPPA::OnIntegratioinTimeSliderChanged(double IntegratioinTime)
-{
-	std::cout << "Slider设置积分时间------------------------------------------" << std::endl;
-	m_Imager->setIntegrationTime(IntegratioinTime);
-	ui.integratioin_time_lineEdit->setText(QString::number(IntegratioinTime));
-}
-
-void HPPA::OnGainEditingFinished()
-{
-	m_Imager->setGain(this->ui.gain_lineEdit->text().toDouble());
-	ui.GainSlider->setValue(ui.gain_lineEdit->text().toDouble());
-}
-
-void HPPA::OnGainSliderChanged(double Gain)
-{
-	m_Imager->setGain(this->ui.gain_lineEdit->text().toDouble());
-	ui.gain_lineEdit->setText(QString::number(Gain));
+	m_Imager->setGain(gain);
+	m_hic->setGain(m_Imager->getGain());
 }

 void HPPA::onLeftMouseButtonPressed(int x, int y, QVector<double> wavelengths, QVector<double> spectrum)
@ -1844,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();
@ -1891,25 +1828,13 @@ void HPPA::onconnect()

 		connect(this->ui.actionOpenDirectory, SIGNAL(triggered()), this, SLOT(onActionOpenDirectory()));

-
-		connect(this->ui.framerate_lineEdit, SIGNAL(editingFinished()), this, SLOT(OnFramerateLineeditEditingFinished()));
-		connect(this->ui.FramerateSlider, SIGNAL(valueChanged(double)), this, SLOT(OnFramerateSliderChanged(double)));
-		connect(this->ui.integratioin_time_lineEdit, SIGNAL(editingFinished()), this, SLOT(OnIntegratioinTimeEditingFinished()));
-		connect(this->ui.IntegratioinTimeSlider, SIGNAL(valueChanged(double)), this, SLOT(OnIntegratioinTimeSliderChanged(double)));
-		connect(this->ui.gain_lineEdit, SIGNAL(editingFinished()), this, SLOT(OnGainEditingFinished()));
-		connect(this->ui.GainSlider, SIGNAL(valueChanged(double)), this, SLOT(OnGainSliderChanged(double)));
-
+		connect(m_hic, SIGNAL(framerateChanged(double)), this, SLOT(onFramerateChanged(double)));
+		connect(m_hic, SIGNAL(integrationTimeChanged(double)), this, SLOT(onIntegrationTimeChanged(double)));
+		connect(m_hic, SIGNAL(gainChanged(double)), this, SLOT(onGainChanged(double)));

 		//相机参数控件设置为可用 + 输入控制
 		frame_number->setEnabled(true);
-
-		ui.framerate_lineEdit->setEnabled(true);
-		ui.integratioin_time_lineEdit->setEnabled(true);
-		ui.gain_lineEdit->setEnabled(true);
-
-		ui.FramerateSlider->setEnabled(true);
-		ui.IntegratioinTimeSlider->setEnabled(true);
-		ui.GainSlider->setEnabled(true);
+		m_hic->setDisabled(false);

 		/*QRegExp rx("\\d{0,3}[1-9]$");
 		ui.framerate_lineEdit->setValidator(new QRegExpValidator(rx));
@ -1919,19 +1844,13 @@ void HPPA::onconnect()
 		ui.gain_lineEdit->setValidator(new QRegExpValidator(rx));*/

 		//获取相机参数并显示到界面中
-		ui.framerate_lineEdit->setText(QString::number(m_Imager->getFramerate(), 10, 2));
-		ui.FramerateSlider->setValue(m_Imager->getFramerate(), true);
-		CalculateIntegratioinTimeRange();
-
-		ui.integratioin_time_lineEdit->setText(QString::number(m_Imager->getIntegrationTime(), 10, 2));
-		ui.IntegratioinTimeSlider->setValue(m_Imager->getIntegrationTime());
-
-		ui.gain_lineEdit->setText(QString::number(m_Imager->getGain(), 10, 2));
-		ui.GainSlider->setValue(m_Imager->getGain());
+		m_hic->setFrameRate(m_Imager->getFramerate());
+		m_hic->setIntegrationTime(m_Imager->getIntegrationTime());
+		m_hic->setGain(m_Imager->getGain());
 	}
 	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;

@ -1949,23 +1868,23 @@ 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();

 	//将自动曝光所得的值显示到界面
-	ui.IntegratioinTimeSlider->setValue(ReturnedExposureTime, false);
+	m_hic->setIntegrationTime(ReturnedExposureTime);

 	//ui.mainToolBar->widgetForAction(ui.action_auto_exposure)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
 }
@ -2041,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();
@ -2064,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);}");
 }

@ -2074,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();
@ -2097,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);}");
 }

@ -2119,6 +2038,11 @@ void HPPA::onPlotHyperspectralImageRgbImage(int fileNumber, int frameNumber, QSt
    QList<Mapcavas*> currentImageViewer = currentWidget->findChildren<Mapcavas*>();
    currentImageViewer[0]->DisplayFrameNumber(m_Imager->getFrameCounter());//界面中显示已经采集的帧数

+    if (m_recordFrameCounter)
+    {
+        m_recordFrameCounter->updateFrameCount(currentWidget, m_Imager->getFrameCounter());
+    }
+
    //创建需要显示的图像--opencv版本
    ImageProcessor imageProcessor;
    //cv::Mat rgbImage(*m_Imager->getRgbImage()->m_matRgbImage, cv::Range(0, m_Imager->getFrameCounter()), cv::Range::all());//2022.3.18重构的
@ -2235,10 +2159,15 @@ void HPPA::onRecordFinishedSignal_WhenFrameNumberMeet()
 	QAction* checked = moveplatformActionGroup->checkedAction();
 	QString checkedName = checked->objectName();

+	if (checkedName == "mAction_2AxisMotor_new")//会有多条采集线，中间的某条采集线完成后不代表整个采集过程完成
+	{
+		return;
+	}
+
 	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++;//当自动停止采集
@ -2262,7 +2191,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++;
@ -2271,7 +2200,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++;
--- a/HPPA/HPPA.h
+++ b/HPPA/HPPA.h
@ -67,6 +67,12 @@
 #include "MapToolSpectral.h"
 #include "MapTools.h"

+#include "AspectRatioLabel.h"
+
+#include "HyperImagerControl.h"
+
+#include "recordFrameCounter.h"
+
 #define PI 3.1415926

 QT_CHARTS_USE_NAMESPACE//QChartView 使用 需要加宏， 否则无法使用
@ -155,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);
@ -184,8 +190,6 @@ public:
 	static HPPA* instance();
 	LayerTreeNode* rasterGroupNode() const;

-	void CalculateIntegratioinTimeRange();//通过帧率计算积分时间范围，设置slider最大值
-
 	WorkerThread * m_TestImagerStausThread;//检测相机连接状态的线程

 private:
@ -265,6 +269,7 @@ private:

 	TabManager* m_tabManager;

+	HyperImagerControl* m_hic;
 	ImageControl* m_ic;
 	adjustTable* m_adt;
 	PowerControl* m_pc;
@ -289,6 +294,8 @@ private:

 	QWidget* m_focusTab=nullptr;

+	recordFrameCounter* m_recordFrameCounter = nullptr;
+	
 public Q_SLOTS:
 	void onPlotHyperspectralImageRgbImage(int fileNumber, int frameNumber, QString filePath);
 	void PlotSpectral(int state);
@ -315,13 +322,9 @@ public Q_SLOTS:
 	void onTabWidgetCurrentChanged(int index);
 	void onActionOpenDirectory();

-	void OnFramerateLineeditEditingFinished();//
-		void OnFramerateSliderChanged(double framerate);//
-
-		void OnIntegratioinTimeEditingFinished();//
-		void OnIntegratioinTimeSliderChanged(double IntegratioinTime);//
-		void OnGainEditingFinished();//
-		void OnGainSliderChanged(double Gain);//
+	void onFramerateChanged(double framerate);
+	void onIntegrationTimeChanged(double integrationTime);
+	void onGainChanged(double gain);

 	void onLeftMouseButtonPressed(int x, int y, QVector<double> wavelengths, QVector<double> spectrum);//点击影像像元显示光谱
 	void setAxis(QValueAxis* axisX, QValueAxis* axisY);
--- a/HPPA/HPPA.ico
+++ b/HPPA/HPPA.ico
--- a/HPPA/HPPA.qrc
+++ b/HPPA/HPPA.qrc
@ -1,5 +1,53 @@
 <RCC>
-    <qresource prefix="/HPPA">
-        <file>HPPA.ico</file>
+    <qresource prefix="/svg">
+        <file>resources/icons/svg/arrow_down.svg</file>
+        <file>resources/icons/svg/arrow_up.svg</file>
+        <file>resources/icons/svg/close.svg</file>
+        <file>resources/icons/svg/connect_imager.svg</file>
+        <file>resources/icons/svg/connect_imager_done.svg</file>
+        <file>resources/icons/svg/connect_imager_ing.svg</file>
+        <file>resources/icons/svg/dark.svg</file>
+        <file>resources/icons/svg/dark_done.svg</file>
+        <file>resources/icons/svg/dark_ing.svg</file>
+        <file>resources/icons/svg/exposure.svg</file>
+        <file>resources/icons/svg/exposure_done.svg</file>
+        <file>resources/icons/svg/exposure_ing.svg</file>
+        <file>resources/icons/svg/focus.svg</file>
+        <file>resources/icons/svg/focus_done.svg</file>
+        <file>resources/icons/svg/focus_ing.svg</file>
+        <file>resources/icons/svg/openDirectory.svg</file>
+        <file>resources/icons/svg/openDirectory_done.svg</file>
+        <file>resources/icons/svg/pan.svg</file>
+        <file>resources/icons/svg/pan_done.svg</file>
+        <file>resources/icons/svg/record.svg</file>
+        <file>resources/icons/svg/record_done.svg</file>
+        <file>resources/icons/svg/record_ing.svg</file>
+        <file>resources/icons/svg/reference.svg</file>
+        <file>resources/icons/svg/reference_done.svg</file>
+        <file>resources/icons/svg/reference_ing.svg</file>
+        <file>resources/icons/svg/software_icon.svg</file>
+        <file>resources/icons/svg/software_icon_small.svg</file>
+        <file>resources/icons/svg/spectral.svg</file>
+        <file>resources/icons/svg/spectral_done.svg</file>
+        <file>resources/icons/svg/tree_tri_down.svg</file>
+        <file>resources/icons/svg/tree_tri_right.svg</file>
+        <file>resources/icons/svg/mIconRaster.svg</file>
+    </qresource>
+    <qresource prefix="/png">
+        <file>resources/icons/png/Spectral_Insight_27.png</file>
+        <file>resources/icons/png/Spectral_Insight_54.png</file>
+        <file>resources/icons/png/Spectral_Insight_170.png</file>
+        <file>resources/icons/png/Spectral_Insight_340.png</file>
+        <file>resources/icons/png/titile_bar_bgp.png</file>
+        <file>resources/icons/png/titile_bar_bgp2x.png</file>
+    </qresource>
+    <qresource prefix="/imagerPicture">
+        <file>resources/icons/imagerPicture/corning410.png</file>
+        <file>resources/icons/imagerPicture/IR.png</file>
+        <file>resources/icons/imagerPicture/L.png</file>
+        <file>resources/icons/imagerPicture/XC2.png</file>
+    </qresource>
+    <qresource prefix="/ico">
+        <file>resources/icons/ico/Spectral_Insight_128.ico</file>
    </qresource>
 </RCC>
--- a/HPPA/HPPA.rc
+++ b/HPPA/HPPA.rc
--- a/HPPA/HPPA.ui
+++ b/HPPA/HPPA.ui
@ -14,8 +14,8 @@
   <string>Spectral Insight</string>
  </property>
  <property name="windowIcon">
-   <iconset>
-    <normaloff>icon/all/png/Group 356_slices/22.png</normaloff>icon/all/png/Group 356_slices/22.png</iconset>
+   <iconset resource="HPPA.qrc">
+    <normaloff>:/ico/resources/icons/ico/Spectral_Insight_128.ico</normaloff>:/ico/resources/icons/ico/Spectral_Insight_128.ico</iconset>
  </property>
  <property name="styleSheet">
   <string notr="true"/>
@ -202,10 +202,16 @@ QToolBar QToolButton:hover {
  </widget>
  <widget class="QStatusBar" name="statusBar">
   <property name="styleSheet">
-    <string notr="true">QStatusBar {
+    <string notr="true">QStatusBar
+{
 	background-color: #0D1233;
+	color: white;
 }
-</string>
+
+QStatusBar::item
+{
+    border: none;
+}</string>
   </property>
  </widget>
  <widget class="CustomDockWidgetBase" name="mDockWidgetSimulator">
@ -251,9 +257,9 @@ QToolBar QToolButton:hover {
   <attribute name="dockWidgetArea">
    <number>2</number>
   </attribute>
-   <widget class="QWidget" name="dockWidgetContents_4">
+   <widget class="QWidget" name="controlContents">
    <property name="styleSheet">
-     <string notr="true">QWidget #dockWidgetContents_4
+     <string notr="true">QWidget #controlContents
 {
 	background-color: #0E1C4C;
 	
@ -327,327 +333,6 @@ QTabWidget::pane {
       <property name="elideMode">
        <enum>Qt::ElideNone</enum>
       </property>
-       <widget class="QWidget" name="tab">
-        <property name="styleSheet">
-         <string notr="true">
-QLineEdit {
-    background-color: #142D7F;
-    color: #e6eeff;
-    border: 1px solid #2f6bff;
-    border-radius: 6px;
-    padding: 4px 8px;
-    min-width: 70px;
-    min-height: 20px;
-    font-size: 13px;
-}
-QLineEdit:hover {
-    border: 1px solid #4d8dff;
-}
-
-QLineEdit:focus {
-    border: 1px solid #6aa2ff;
-    background-color: #23345c;
-}
-
-
-
-
-
-
-QSlider::groove:horizontal {
-    height: 10px;
-    background: #1e2a44;
-    border-radius: 3px;
-}
-
-/* 已滑过：渐变蓝 */
-QSlider::sub-page:horizontal {
-    background: qlineargradient(
-        x1:0, y1:0, x2:1, y2:0,
-        stop:0   #1f4fff,
-        stop:0.5 #2f6bff,
-        stop:1   #5fa0ff
-    );
-    border-radius: 3px;
-}
-
-/* 未滑过 */
-QSlider::add-page:horizontal {
-	height: 10px;
-    background: #2a3550;
-    border-radius: 3px;
-}
-
-/* ===== 滑块按钮 ===== */
-QSlider::handle:horizontal {
-    width: 15px;
-    height: 10px;
-
-    /* 蓝色实心 */
-    background: #2f6bff;
-
-    /* 白色外圈 */
-    border: 2px solid #ffffff;
-    border-radius: 5px;
-
-    /* 垂直居中 */
-    margin: -5px 0;
-}
-
-/* 悬停 */
-QSlider::handle:horizontal:hover {
-    background: #4d8dff;
-}
-
-/* 按下 */
-QSlider::handle:horizontal:pressed {
-    background: #1f4fff;
-}</string>
-        </property>
-        <attribute name="title">
-         <string>光谱仪</string>
-        </attribute>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <property name="leftMargin">
-          <number>10</number>
-         </property>
-         <property name="topMargin">
-          <number>10</number>
-         </property>
-         <property name="rightMargin">
-          <number>10</number>
-         </property>
-         <property name="bottomMargin">
-          <number>10</number>
-         </property>
-         <property name="spacing">
-          <number>10</number>
-         </property>
-         <item row="0" column="0">
-          <widget class="QLabel" name="imagerPictureLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="scaledContents">
-            <bool>true</bool>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QWidget" name="widget_3" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QGridLayout" name="gridLayout">
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>0</number>
-            </property>
-            <property name="spacing">
-             <number>10</number>
-            </property>
-            <item row="0" column="0">
-             <widget class="QLabel" name="label">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="styleSheet">
-               <string notr="true">color: rgb(255, 255, 255);</string>
-              </property>
-              <property name="text">
-               <string>帧率</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout">
-              <item>
-               <widget class="QLineEdit" name="framerate_lineEdit">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="styleSheet">
-                 <string notr="true"/>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QDoubleSlider" name="FramerateSlider">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_2">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="styleSheet">
-               <string notr="true">color: rgb(255, 255, 255);</string>
-              </property>
-              <property name="text">
-               <string>积分时间</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_2">
-              <item>
-               <widget class="QLineEdit" name="integratioin_time_lineEdit">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="styleSheet">
-                 <string notr="true"/>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QDoubleSlider" name="IntegratioinTimeSlider">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_3">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimumSize">
-               <size>
-                <width>0</width>
-                <height>0</height>
-               </size>
-              </property>
-              <property name="maximumSize">
-               <size>
-                <width>16777215</width>
-                <height>16777215</height>
-               </size>
-              </property>
-              <property name="styleSheet">
-               <string notr="true">color: rgb(255, 255, 255);</string>
-              </property>
-              <property name="text">
-               <string>gain</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <layout class="QHBoxLayout" name="horizontalLayout_3">
-              <item>
-               <widget class="QLineEdit" name="gain_lineEdit">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="styleSheet">
-                 <string notr="true"/>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QDoubleSlider" name="GainSlider">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="orientation">
-                 <enum>Qt::Horizontal</enum>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>
       <widget class="QWidget" name="rgbCameraWidget">
        <property name="styleSheet">
         <string notr="true">QGroupBox
@ -1156,11 +841,6 @@ QPushButton:pressed
 </widget>
 <layoutdefault spacing="6" margin="11"/>
 <customwidgets>
-  <customwidget>
-   <class>QDoubleSlider</class>
-   <extends>QSlider</extends>
-   <header>qdoubleslider.h</header>
-  </customwidget>
  <customwidget>
   <class>CustomDockWidgetBase</class>
   <extends>QDockWidget</extends>
--- a/HPPA/HPPA.vcxproj
+++ b/HPPA/HPPA.vcxproj
@ -36,8 +36,8 @@
    <QtBuildConfig>debug</QtBuildConfig>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" Label="QtSettings">
-    <QtInstall>5.9_msvc2017_64</QtInstall>
-    <QtModules>core;network;gui;widgets;serialport;websockets;charts</QtModules>
+    <QtInstall>5.13.2_msvc2017_64</QtInstall>
+    <QtModules>core;network;gui;svg;widgets;serialport;websockets;3dcore;3danimation;3dextras;3dinput;3dlogic;3drender;3dquick;charts</QtModules>
    <QtBuildConfig>release</QtBuildConfig>
  </PropertyGroup>
  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
@ -57,10 +57,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    <IncludePath>D:\cpp_library\gdal2.2.3_vs2017\include;C:\Program Files\ResononAPI\include;D:\cpp_library\opencv3.4.11\opencv\build\include;D:\cpp_library\opencv3.4.11\opencv\build\include\opencv;D:\cpp_library\opencv3.4.11\opencv\build\include\opencv2;D:\cpp_project_vs2022\AutoFocus_InspireLinearMotor_DLL\AutoFocus_InspireLinearMotor_DLL\SDKs\PCOMM\Include;D:\cpp_project_vs2022\AutoFocus_InspireLinearMotor_DLL\AutoFocus_InspireLinearMotor_DLL\SDKs\PortControl;D:\cpp_project_vs2022\AutoFocus_InspireLinearMotor_DLL\AutoFocus_InspireLinearMotor_DLL;D:\cpp_project_vs2022\HPPA\HPPA;D:\cpp_library\libconfig-1.7.3\lib;D:\cpp_project_vs2022\HPPA\vincecontrol;D:\cpp_library\vincecontrol_vs2017;C:\XIMEA\API\xiAPI;D:\cpp_project_vs2022\HPPA\IrisMultiMotorController\IrisMultiMotorController;D:\cpp_library\eigen-3.4-rc1;$(IncludePath)</IncludePath>
    <LibraryPath>D:\cpp_library\opencv3.4.11\opencv\build\x64\vc15\lib;D:\cpp_library\gdal2.2.3_vs2017\lib;C:\Program Files\ResononAPI\lib64;D:\cpp_project_vs2022\AutoFocus_InspireLinearMotor_DLL\x64\Debug;D:\cpp_library\libconfig-1.7.3\build\x64;D:\cpp_project_vs2022\HPPA\x64\Debug;C:\XIMEA\API\xiAPI;D:\cpp_project_vs2022\HPPA\IrisMultiMotorController\x64\Debug;$(LibraryPath)</LibraryPath>
+    <TargetName>Spectral Insight</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    <IncludePath>D:\cpp_library\gdal2.2.3_vs2017\include;C:\Program Files\ResononAPI\include;D:\cpp_library\opencv3.4.11\opencv\build\include;D:\cpp_library\opencv3.4.11\opencv\build\include\opencv;D:\cpp_library\opencv3.4.11\opencv\build\include\opencv2;D:\cpp_project_vs2022\AutoFocus_InspireLinearMotor_DLL\AutoFocus_InspireLinearMotor_DLL\SDKs\PCOMM\Include;D:\cpp_project_vs2022\AutoFocus_InspireLinearMotor_DLL\AutoFocus_InspireLinearMotor_DLL\SDKs\PortControl;D:\cpp_project_vs2022\AutoFocus_InspireLinearMotor_DLL\AutoFocus_InspireLinearMotor_DLL;D:\cpp_project_vs2022\HPPA\HPPA;D:\cpp_library\libconfig-1.7.3\lib;D:\cpp_project_vs2022\HPPA\vincecontrol;C:\XIMEA\API\xiAPI;D:\cpp_project_vs2022\HPPA\IrisMultiMotorController\IrisMultiMotorController;D:\cpp_library\eigen-3.4-rc1;$(IncludePath)</IncludePath>
    <LibraryPath>D:\cpp_library\opencv3.4.11\opencv\build\x64\vc15\lib;D:\cpp_library\vincecontrol_vs2017_release;D:\cpp_library\gdal2.2.3_vs2017\lib;C:\Program Files\ResononAPI\lib64;D:\cpp_project_vs2022\AutoFocus_InspireLinearMotor_DLL\x64\Release;D:\cpp_library\libconfig-1.7.3\build\x64;D:\cpp_project_vs2022\IrisMultiMotorController\x64\Release;C:\XIMEA\API\xiAPI;$(LibraryPath)</LibraryPath>
+    <TargetName>Spectral Insight</TargetName>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Link>
@ -106,11 +108,13 @@
  <ItemGroup>
    <ClCompile Include="aboutWindow.cpp" />
    <ClCompile Include="adjustTable.cpp" />
+    <ClCompile Include="AspectRatioLabel.cpp" />
    <ClCompile Include="CaptureCoordinator.cpp" />
    <ClCompile Include="Carousel.cpp" />
    <ClCompile Include="Corning410Imager.cpp" />
    <ClCompile Include="CustomDockWidgetBase.cpp" />
    <ClCompile Include="hppaConfigFile.cpp" />
+    <ClCompile Include="HyperImagerControl.cpp" />
    <ClCompile Include="imageControl.cpp" />
    <ClCompile Include="ImagerOperationBase.cpp" />
    <ClCompile Include="imager_base.cpp" />
@ -136,6 +140,7 @@
    <ClCompile Include="RasterDataProvider.cpp" />
    <ClCompile Include="RasterLayer.cpp" />
    <ClCompile Include="RasterRenderer.cpp" />
+    <ClCompile Include="recordFrameCounter.cpp" />
    <ClCompile Include="resononImager.cpp" />
    <ClCompile Include="ResononNirImager.cpp" />
    <ClCompile Include="RgbCameraOperation.cpp" />
@ -165,6 +170,7 @@
    <ClCompile Include="imagerSimulatioin.cpp" />
    <ClCompile Include="ImageViewer.cpp" />
    <ClCompile Include="main.cpp" />
+    <QtUic Include="hyperImagerControl.ui" />
    <QtUic Include="imgControl.ui" />
    <QtUic Include="oneMotorControl.ui" />
    <QtUic Include="PathPlan.ui" />
@ -194,6 +200,8 @@
    <QtMoc Include="CustomDockWidgetBase.h" />
    <QtMoc Include="Carousel.h" />
    <QtMoc Include="imageControl.h" />
+    <QtMoc Include="AspectRatioLabel.h" />
+    <QtMoc Include="HyperImagerControl.h" />
    <ClInclude Include="imager_base.h" />
    <ClInclude Include="irisximeaimager.h" />
    <QtMoc Include="OneMotorControl.h" />
@ -215,6 +223,7 @@
    <QtMoc Include="MapTools.h" />
    <ClInclude Include="RasterDataProvider.h" />
    <ClInclude Include="RasterRenderer.h" />
+    <QtMoc Include="recordFrameCounter.h" />
    <ClInclude Include="utility_tc.h" />
    <QtMoc Include="aboutWindow.h" />
    <ClInclude Include="hppaConfigFile.h" />
@ -240,7 +249,7 @@
    <ResourceCompile Include="HPPA.rc" />
  </ItemGroup>
  <ItemGroup>
-    <Image Include="HPPA.ico" />
+    <Image Include="resources\icons\ico\Spectral_Insight_128.ico" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
--- a/HPPA/HPPA.vcxproj.filters
+++ b/HPPA/HPPA.vcxproj.filters
@ -190,6 +190,15 @@
    <ClCompile Include="MapTools.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="AspectRatioLabel.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="HyperImagerControl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="recordFrameCounter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <QtMoc Include="fileOperation.h">
@ -306,6 +315,15 @@
    <QtMoc Include="MapTools.h">
      <Filter>Header Files</Filter>
    </QtMoc>
+    <QtMoc Include="AspectRatioLabel.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="HyperImagerControl.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="recordFrameCounter.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="imageProcessor.h">
@ -382,6 +400,9 @@
    <QtUic Include="imgControl.ui">
      <Filter>Form Files</Filter>
    </QtUic>
+    <QtUic Include="hyperImagerControl.ui">
+      <Filter>Form Files</Filter>
+    </QtUic>
  </ItemGroup>
  <ItemGroup>
    <None Include="cpp.hint" />
@ -392,7 +413,7 @@
    </ResourceCompile>
  </ItemGroup>
  <ItemGroup>
-    <Image Include="HPPA.ico">
+    <Image Include="resources\icons\ico\Spectral_Insight_128.ico">
      <Filter>Resource Files</Filter>
    </Image>
  </ItemGroup>
--- a/HPPA/HyperImagerControl.cpp
+++ b/HPPA/HyperImagerControl.cpp
@ -0,0 +1,195 @@
+#include "HyperImagerControl.h"
+
+HyperImagerControl::HyperImagerControl(QWidget* parent)
+	: QDialog(parent)
+{
+	ui.setupUi(this);
+
+	connect(ui.framerate_spinBox, &QDoubleSpinBox::editingFinished, this, &HyperImagerControl::onFramerateSpinBoxEditingFinished);
+	connect(ui.FramerateSlider, &QDoubleSlider::valueChanged, this, &HyperImagerControl::onFramerateSliderChanged);
+	connect(ui.FramerateSlider, &QDoubleSlider::sliderReleased, this, &HyperImagerControl::onFramerateSliderReleased);
+
+	connect(ui.integratioin_time_spinBox, &QDoubleSpinBox::editingFinished, this, &HyperImagerControl::onIntegrationTimeSpinBoxEditingFinished);
+	connect(ui.IntegratioinTimeSlider, &QDoubleSlider::valueChanged, this, &HyperImagerControl::onIntegrationTimeSliderChanged);
+	connect(ui.IntegratioinTimeSlider, &QDoubleSlider::sliderReleased, this, &HyperImagerControl::onIntegrationTimeSliderReleased);
+
+	connect(ui.gain_spinBox, &QDoubleSpinBox::editingFinished, this, &HyperImagerControl::onGainSpinBoxEditingFinished);
+	connect(ui.GainSlider, &QSlider::valueChanged, this, &HyperImagerControl::onGainSliderChanged);
+	connect(ui.GainSlider, &QSlider::sliderReleased, this, &HyperImagerControl::onGainSliderReleased);
+
+	ui.GainSlider->setMaximum(12);
+	ui.GainSlider->setMinimum(0);
+
+	ui.gain_spinBox->setMaximum(12);
+	ui.gain_spinBox->setMinimum(0);
+
+	ui.widget_3->setStyleSheet(R"(
+		QDoubleSpinBox {
+			border: 1px solid #999;
+			border-radius: 4px;
+			padding: 2px 20px 2px 6px;  /* 右侧留空间给按钮 */
+			background: #0e1c4c;
+			selection-background-color: #0078d7;
+			font-size: 12px;
+			color:#ACCDFF ;
+		}
+
+		QDoubleSpinBox::up-button {
+			subcontrol-origin: border;
+			subcontrol-position: top right;
+			width: 16px;
+			border-left: 1px solid #ccc;
+		}
+
+		QDoubleSpinBox::down-button {
+			subcontrol-origin: border;
+			subcontrol-position: bottom right;
+			width: 16px;
+			border-left: 1px solid #ccc;
+		}
+
+		QDoubleSpinBox::up-arrow {
+			image: url(:/svg/resources/icons/svg/arrow_up.svg);
+			width: 10px;
+			height: 10px;
+		}
+
+		QDoubleSpinBox::down-arrow {
+			image: url(:/svg/resources/icons/svg/arrow_down.svg);
+			width: 10px;
+			height: 10px;
+		}
+
+		QDoubleSpinBox::up-button:hover,
+		QDoubleSpinBox::down-button:hover {
+			background: #e6f2ff;
+		}
+
+		QDoubleSpinBox::up-button:pressed,
+		QDoubleSpinBox::down-button:pressed {
+			background: #cce4ff;
+		}
+	)");
+
+}
+
+HyperImagerControl::~HyperImagerControl()
+{
+}
+
+void HyperImagerControl::setFrameRate(double frameRate)
+{
+	ui.framerate_spinBox->setValue(frameRate);
+	ui.FramerateSlider->setValue(frameRate);
+
+	updateIntegrationTimeRange(frameRate);
+}
+
+void HyperImagerControl::setIntegrationTime(double integrationTime)
+{
+	ui.integratioin_time_spinBox->setValue(integrationTime);
+	ui.IntegratioinTimeSlider->setValue(integrationTime);
+
+	updateFramerateRange(integrationTime);
+}
+
+void HyperImagerControl::setGain(double gain)
+{
+	ui.gain_spinBox->setValue(gain);
+	ui.GainSlider->setValue(gain);
+}
+
+void HyperImagerControl::onFramerateSpinBoxEditingFinished()
+{
+	double framerate = ui.framerate_spinBox->value();
+	ui.FramerateSlider->setValue(framerate);
+	emit framerateChanged(framerate);
+}
+
+void HyperImagerControl::onFramerateSliderChanged(double framerate)
+{
+	ui.framerate_spinBox->blockSignals(true);
+	ui.framerate_spinBox->setValue(framerate);
+	ui.framerate_spinBox->blockSignals(false);
+}
+
+void HyperImagerControl::onFramerateSliderReleased()
+{
+	double framerate = ui.framerate_spinBox->value();
+	emit framerateChanged(framerate);
+}
+
+void HyperImagerControl::onIntegrationTimeSpinBoxEditingFinished()
+{
+	double integrationTime = ui.integratioin_time_spinBox->value();
+	ui.IntegratioinTimeSlider->setValue(integrationTime);
+	emit integrationTimeChanged(integrationTime);
+}
+
+void HyperImagerControl::onIntegrationTimeSliderChanged(double integrationTime)
+{
+	ui.integratioin_time_spinBox->blockSignals(true);
+	ui.integratioin_time_spinBox->setValue(integrationTime);
+	ui.integratioin_time_spinBox->blockSignals(false);
+}
+
+void HyperImagerControl::onIntegrationTimeSliderReleased()
+{
+	double integrationTime = ui.integratioin_time_spinBox->value();
+	emit integrationTimeChanged(integrationTime);
+}
+
+void HyperImagerControl::onGainSpinBoxEditingFinished()
+{
+	double gain = ui.gain_spinBox->value();
+	ui.GainSlider->setValue(gain);
+	emit gainChanged(gain);
+}
+
+void HyperImagerControl::onGainSliderChanged(double gain)
+{
+	ui.gain_spinBox->blockSignals(true);
+	ui.gain_spinBox->setValue(gain);
+	ui.gain_spinBox->blockSignals(false);
+}
+
+void HyperImagerControl::onGainSliderReleased()
+{
+	double gain = ui.gain_spinBox->value();
+	emit gainChanged(gain);
+}
+
+void HyperImagerControl::updateIntegrationTimeRange(double frameRate)
+{
+	double maxIntegrationTime = 1.0 / frameRate * 1000.0; // 毫秒
+
+	ui.IntegratioinTimeSlider->blockSignals(true);
+	ui.IntegratioinTimeSlider->setMaximum(maxIntegrationTime);
+	ui.IntegratioinTimeSlider->setMinimum(1);
+	ui.IntegratioinTimeSlider->blockSignals(false);
+
+	ui.integratioin_time_spinBox->blockSignals(true);
+	ui.integratioin_time_spinBox->setMaximum(maxIntegrationTime);
+	ui.integratioin_time_spinBox->setMinimum(1);
+	ui.integratioin_time_spinBox->blockSignals(false);
+}
+
+void HyperImagerControl::updateFramerateRange(double integrationTime)
+{
+	double maxFramerate = 1.0 / (integrationTime / 1000.0); // 积分时间(毫秒)转帧率
+
+	if(maxFramerate > m_frameRateLimit)
+	{
+		maxFramerate = m_frameRateLimit;
+	}
+
+	ui.FramerateSlider->blockSignals(true);
+	ui.FramerateSlider->setMaximum(maxFramerate);
+	ui.FramerateSlider->setMinimum(1);
+	ui.FramerateSlider->blockSignals(false);
+
+	ui.framerate_spinBox->blockSignals(true);
+	ui.framerate_spinBox->setMaximum(maxFramerate);
+	ui.framerate_spinBox->setMinimum(1);
+	ui.framerate_spinBox->blockSignals(false);
+}
--- a/HPPA/HyperImagerControl.h
+++ b/HPPA/HyperImagerControl.h
@ -0,0 +1,47 @@
+#pragma once
+
+#include <QDialog>
+
+#include "ui_hyperImagerControl.h"
+
+#include "AspectRatioLabel.h"
+
+class QDoubleSlider;
+
+class HyperImagerControl : public QDialog
+{
+	Q_OBJECT
+
+public:
+	HyperImagerControl(QWidget* parent = nullptr);
+	~HyperImagerControl();
+
+	AspectRatioLabel* imagerPictureLabel() const { return ui.imagerPictureLabel; }
+
+	void setFrameRate(double frameRate);
+	void setIntegrationTime(double integrationTime);
+	void setGain(double gain);
+
+signals:
+	void framerateChanged(double framerate);
+	void integrationTimeChanged(double integrationTime);
+	void gainChanged(double gain);
+
+private Q_SLOTS:
+	void onFramerateSpinBoxEditingFinished();
+	void onFramerateSliderChanged(double framerate);
+	void onFramerateSliderReleased();
+	void onIntegrationTimeSpinBoxEditingFinished();
+	void onIntegrationTimeSliderChanged(double integrationTime);
+	void onIntegrationTimeSliderReleased();
+	void onGainSpinBoxEditingFinished();
+	void onGainSliderChanged(double gain);
+	void onGainSliderReleased();
+
+private:
+	void updateIntegrationTimeRange(double frameRate);
+	void updateFramerateRange(double integrationTime);
+	double m_frameRateLimit = 150;//相机的最大帧率限制为250fps
+
+	Ui::HyperImagerControl ui;
+};
--- 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");
        }
    }

--- a/HPPA/QDoubleSlider.cpp
+++ b/HPPA/QDoubleSlider.cpp
@ -7,6 +7,7 @@ m_Multiplier(100.0)
 	connect(this, SIGNAL(valueChanged(int)), this, SLOT(notifyValueChanged(int)));

 	setSingleStep(1);
+	setRange(1, 500);

 	setOrientation(Qt::Horizontal);
 	setFocusPolicy(Qt::NoFocus);
--- a/HPPA/QDoubleSlider.h
+++ b/HPPA/QDoubleSlider.h
@ -23,8 +23,8 @@ public:
 	private slots:

 signals :
-	void valueChanged(double Value);
-	void rangeChanged(double Min, double Max);
+	void valueChanged(double Value);//QSlider<65><72>valueChanged<65>źŵĲ<C5B5><C4B2><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>
+	void rangeChanged(double Min, double Max);//QSlider<65><72>rangeChanged<65>źŵĲ<C5B5><C4B2><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>

 private:
 	double	m_Multiplier;
--- a/HPPA/about.ui
+++ b/HPPA/about.ui
@ -16,10 +16,6 @@
  <property name="windowTitle">
   <string>Dialog</string>
  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>C:/Users/73505/.designer/backup/HPPA.ico</normaloff>C:/Users/73505/.designer/backup/HPPA.ico</iconset>
-  </property>
  <layout class="QGridLayout" name="gridLayout">
   <property name="leftMargin">
    <number>0</number>
@ -96,7 +92,7 @@
            <string/>
           </property>
           <property name="pixmap">
-            <pixmap>icon/all/png/Group 356_slices/22.png</pixmap>
+            <pixmap resource="HPPA.qrc">:/png/resources/icons/png/Spectral_Insight_27.png</pixmap>
           </property>
          </widget>
         </item>
@ -173,8 +169,8 @@ QPushButton:pressed
            <string/>
           </property>
           <property name="icon">
-            <iconset>
-             <normaloff>icon/all/close.svg</normaloff>icon/all/close.svg</iconset>
+            <iconset resource="HPPA.qrc">
+             <normaloff>:/svg/resources/icons/svg/close.svg</normaloff>:/svg/resources/icons/svg/close.svg</iconset>
           </property>
          </widget>
         </item>
@ -196,7 +192,7 @@ QPushButton:pressed
          <string/>
         </property>
         <property name="pixmap">
-          <pixmap>C:/Users/73505/.designer/backup/icon/all/png/Group 356_slices/Group 356.png</pixmap>
+          <pixmap resource="HPPA.qrc">:/png/resources/icons/png/Spectral_Insight_170.png</pixmap>
         </property>
        </widget>
        <widget class="QWidget" name="widget_2" native="true">
@ -292,7 +288,7 @@ QPushButton:pressed
 }</string>
            </property>
            <property name="text">
-             <string>版本：3.0</string>
+             <string>版本：3.0.0</string>
            </property>
           </widget>
          </item>
@ -305,6 +301,8 @@ QPushButton:pressed
   </item>
  </layout>
 </widget>
- <resources/>
+ <resources>
+  <include location="HPPA.qrc"/>
+ </resources>
 <connections/>
 </ui>
--- 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);
--- a/HPPA/hyperImagerControl.ui
+++ b/HPPA/hyperImagerControl.ui
@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>HyperImagerControl</class>
+ <widget class="QWidget" name="HyperImagerControl">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>437</width>
+    <height>372</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Color Adjust</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">QGroupBox
+{
+	border: 12px solid transparent;
+	/*border-top: 12px solid transparent;
+    border-right: 0px solid transparent;
+    border-bottom: 0px solid transparent;
+    border-left: 0px solid transparent;*/
+	color: #ACCDFF;
+}
+
+QPushButton
+{
+	/*width: 172px;
+	height: 56px;*/
+	font: 10pt &quot;新宋体&quot;;
+	background-color: qlineargradient(
+        spread:pad, 
+        x1:0.5, y1:0, x2:0.5, y2:1, 
+        stop:0 #283D86, 
+        stop:1 #0F1A40
+    );
+	color: white;
+    border: none;
+    padding: 8px 8px;
+    border-radius: 4px;
+}
+QPushButton:hover
+{
+    background-color: qlineargradient(
+        spread:pad, 
+        x1:0, y1:0, x2:1, y2:0, 
+        stop:0 #3A4875, 
+        stop:1 #5F6B91
+    );
+}
+/* 按下时的效果 */
+QPushButton:pressed
+{
+    background-color: qlineargradient(
+        spread:pad, 
+        x1:0, y1:0, x2:1, y2:0, 
+        stop:0 #1A254F, 
+        stop:1 #3A466B
+    );
+    /* 可选：添加下压效果 */
+    padding-top: 9px;
+    padding-bottom: 7px;
+}
+
+QLabel {
+    color: rgb(255, 255, 255);
+}
+
+QSlider::groove:horizontal {
+    height: 10px;
+    background: #1e2a44;
+    border-radius: 3px;
+}
+
+/* 已滑过：渐变蓝 */
+QSlider::sub-page:horizontal {
+    background: qlineargradient(
+        x1:0, y1:0, x2:1, y2:0,
+        stop:0   #1f4fff,
+        stop:0.5 #2f6bff,
+        stop:1   #5fa0ff
+    );
+    border-radius: 3px;
+}
+
+/* 未滑过 */
+QSlider::add-page:horizontal {
+	height: 10px;
+    background: #2a3550;
+    border-radius: 3px;
+}
+
+/* ===== 滑块按钮 ===== */
+QSlider::handle:horizontal {
+    width: 15px;
+    height: 10px;
+
+    /* 蓝色实心 */
+    background: #2f6bff;
+
+    /* 白色外圈 */
+    border: 2px solid #ffffff;
+    border-radius: 5px;
+
+    /* 垂直居中 */
+    margin: -5px 0;
+}
+
+/* 悬停 */
+QSlider::handle:horizontal:hover {
+    background: #4d8dff;
+}
+
+/* 按下 */
+QSlider::handle:horizontal:pressed {
+    background: #1f4fff;
+}</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2" rowstretch="3,2">
+   <item row="0" column="0">
+    <widget class="AspectRatioLabel" name="imagerPictureLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QWidget" name="widget_3" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="horizontalSpacing">
+       <number>16</number>
+      </property>
+      <item row="0" column="1">
+       <widget class="QDoubleSpinBox" name="framerate_spinBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="decimals">
+         <number>2</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QDoubleSlider" name="FramerateSlider">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">color: rgb(255, 255, 255);</string>
+        </property>
+        <property name="text">
+         <string>gain</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">color: rgb(255, 255, 255);</string>
+        </property>
+        <property name="text">
+         <string>积分时间</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QDoubleSpinBox" name="gain_spinBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="decimals">
+         <number>2</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QSlider" name="GainSlider">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QDoubleSpinBox" name="integratioin_time_spinBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="decimals">
+         <number>2</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QDoubleSlider" name="IntegratioinTimeSlider">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">color: rgb(255, 255, 255);</string>
+        </property>
+        <property name="text">
+         <string>帧率</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>hz</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>ms</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AspectRatioLabel</class>
+   <extends>QLabel</extends>
+   <header>AspectRatioLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QDoubleSlider</class>
+   <extends>QSlider</extends>
+   <header location="global">qdoubleslider.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
--- 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;
 		}
--- a/HPPA/imgControl.ui
+++ b/HPPA/imgControl.ui
@ -132,6 +132,9 @@ QSlider::handle:horizontal:pressed {
      <string>调整</string>
     </property>
     <layout class="QGridLayout" name="gridLayout">
+      <property name="horizontalSpacing">
+       <number>16</number>
+      </property>
      <item row="0" column="0">
       <widget class="QLabel" name="labelRed">
        <property name="text">
--- a/HPPA/recordFrameCounter.cpp
+++ b/HPPA/recordFrameCounter.cpp
@ -0,0 +1,57 @@
+#include "stdafx.h"
+#include "recordFrameCounter.h"
+
+recordFrameCounter::recordFrameCounter(QWidget* parent)
+	: QWidget(parent)
+{
+	m_stackedWidget = new QStackedWidget();
+	m_stackedWidget->setContentsMargins(0, 0, 0, 0);
+
+	QHBoxLayout* layout = new QHBoxLayout(this);
+	layout->setContentsMargins(0, 0, 0, 0);
+
+	QLabel* titleLabel = new QLabel(QString::fromLocal8Bit("帧数: "));
+	titleLabel->setStyleSheet("color: white;");
+	layout->addWidget(titleLabel);
+	layout->addWidget(m_stackedWidget);
+}
+
+void recordFrameCounter::addCounter(QWidget* tabWidget)
+{
+	QLabel* label = new QLabel("0");
+	label->setStyleSheet("color: white;");
+	label->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
+	m_labelMap.insert(tabWidget, label);
+	m_stackedWidget->addWidget(label);
+	m_stackedWidget->setCurrentWidget(label);
+}
+
+void recordFrameCounter::removeCounter(QWidget* tabWidget)
+{
+	auto it = m_labelMap.find(tabWidget);
+	if (it != m_labelMap.end())
+	{
+		QLabel* label = it.value();
+		m_stackedWidget->removeWidget(label);
+		delete label;
+		m_labelMap.erase(it);
+	}
+}
+
+void recordFrameCounter::switchTo(QWidget* tabWidget)
+{
+	auto it = m_labelMap.find(tabWidget);
+	if (it != m_labelMap.end())
+	{
+		m_stackedWidget->setCurrentWidget(it.value());
+	}
+}
+
+void recordFrameCounter::updateFrameCount(QWidget* tabWidget, int frameCount)
+{
+	auto it = m_labelMap.find(tabWidget);
+	if (it != m_labelMap.end())
+	{
+		it.value()->setText(QString::number(frameCount));
+	}
+}
--- a/HPPA/recordFrameCounter.h
+++ b/HPPA/recordFrameCounter.h
@ -0,0 +1,24 @@
+#pragma once
+
+#include <QWidget>
+#include <QStackedWidget>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QMap>
+
+class recordFrameCounter : public QWidget
+{
+	Q_OBJECT
+public:
+	explicit recordFrameCounter(QWidget* parent = nullptr);
+
+	void addCounter(QWidget* tabWidget);
+	void removeCounter(QWidget* tabWidget);
+	void switchTo(QWidget* tabWidget);
+	void updateFrameCount(QWidget* tabWidget, int frameCount);
+
+private:
+	QStackedWidget* m_stackedWidget = nullptr;
+	QMap<QWidget*, QLabel*> m_labelMap;
+};
+
--- a/HPPA/resource.h
+++ b/HPPA/resource.h
@ -2,13 +2,13 @@
 // Microsoft Visual C++ <20><><EFBFBD>ɵİ<C9B5><C4B0><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>
 // <20><> HPPA.rc ʹ<><CAB9>
 //
-#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
Author	SHA1	Message	Date
tangchao0503	7e119fbf91	fix 采集bug	2026-03-31 16:55:21 +08:00
tangchao0503	e3f882d77b	消除状态栏中间的白色竖线	2026-03-31 13:56:38 +08:00
tangchao0503	dac922eb29	打包使用qrc和rc文件（exe文件图标）管理svg、png等资源	2026-03-25 10:51:00 +08:00
tangchao0503	ae07b9c19e	fix 1、相机参数有效性控制bug； 2、相机看板图像大小调整； 3、工程的realease模式修复；	2026-03-24 14:54:48 +08:00
tangchao0503	2cf86df608	通过自定义控件实现功能：状态栏显示采集帧数；	2026-03-24 14:03:12 +08:00
tangchao0503	d358989579	fix：相机参数有效性控制3	2026-03-20 15:33:25 +08:00
tangchao0503	0fb81ab3e8	相机参数有效性控制2	2026-03-20 11:52:32 +08:00
tangchao0503	8bbe402a63	图像等比例缩放	2026-03-19 16:52:48 +08:00