1、添加仅采集影像，马达不运动的功能，可用于机械臂和影像采集测试；

2、使用 QSettings 记录 Action 的 isChecked 状态，并在打开软件时恢复；

HPPA/HPPA.cpp

@@ -294,6 +294,18 @@ HPPA::HPPA(QWidget *parent)
 
 	createActionGroups();
 	connect(mImagerGroup, &QActionGroup::triggered, this, &HPPA::selectingImager);
+
+	connect(this->ui.mAction_is_motor_enable, SIGNAL(triggered()), this, SLOT(onMotorSwitch()));
+	QSettings settings;
+	bool isMotorEnable = settings.value("isMotorEnable").toBool();
+	this->ui.mAction_is_motor_enable->setChecked(isMotorEnable);
+}
+
+void HPPA::onMotorSwitch()
+{
+	QSettings settings;
+	settings.setValue("isMotorEnable", this->ui.mAction_is_motor_enable->isChecked());
+	settings.sync();
 }
 
 void HPPA::createActionGroups()
@@ -400,24 +412,54 @@ void HPPA::CalculateIntegratioinTimeRange()
 
 void HPPA::onStartRecordStep1()
 {
-	////<2F><><EFBFBD>Դ<EFBFBD><D4B4>룬<EFBFBD><EBA3AC><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD><C9BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	bool isMotorEnable = this->ui.mAction_is_motor_enable->isChecked();
-	//m_RecordState += 1;
+	if (!isMotorEnable)//ͣ<><CDA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFA3AC><EFBFBD>ɼ<EFBFBD><C9BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	{
+		m_RecordState += 1;
 
-	//if (m_RecordState % 2 == 1)
+		if (m_RecordState % 2 == 1)
-	//{
+		{
-	//	onCreateTab(1);
+			//<EFBFBD>ж<EFBFBD><EFBFBD>Ƿ񸲸Ǵ<EFBFBD><EFBFBD>ڵ<EFBFBD><EFBFBD>ļ<EFBFBD>
-	//	m_numberOfRecording = 0;
+			FileOperation* fileOperation = new FileOperation();
-	//	m_Imager->setFileName2Save(m_FilenameLineEdit->text().toStdString());
+			string directory = fileOperation->getDirectoryFromString();
-	//	emit StartRecordSignal();//<2F><><EFBFBD>俪ʼ<E4BFAA>ɼ<EFBFBD><C9BC>ź<EFBFBD>
+			//string imgPath = directory + "\\tmp_image";
-	//}
+			string imgPath = directory + "\\" + m_FilenameLineEdit->text().toStdString() + "_" + std::to_string(1) + ".bil";
-	//else
+			int x = _access(imgPath.c_str(), 0);
-	//{
+			if (!x)//<2F><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD>ھ<EFBFBD>ִ<EFBFBD>д<EFBFBD>if<69>Ĵ<EFBFBD><C4B4><EFBFBD>
-	//	m_Imager->setRecordControlState(false);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹͣ<CDA3>ɼ<EFBFBD>
+			{
+				enum QMessageBox::StandardButton response = QMessageBox::question(this, QString::fromLocal8Bit("<EFBFBD><EFBFBD>ʾ"), QString::fromLocal8Bit("<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڣ<EFBFBD><EFBFBD>Ƿ񸲸ǣ<EFBFBD>"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);;
+				if (response == QMessageBox::Yes)//
+				{
+					//std::cout << "<22><><EFBFBD><EFBFBD>" << std::endl;
+				}
+				else
+				{
+					//std::cout << "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" << std::endl;
+					m_RecordState -= 1;//<2F><><EFBFBD><EFBFBD><EFBFBD>ǵĻ<C7B5><C4BB><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA>ԭ<EFBFBD><D4AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹͣ<CDA3>ɼ<EFBFBD>
+					return;
+				}
+			}
 
-	//	ui.action_start_recording->setText(QString::fromLocal8Bit("<22>ɼ<EFBFBD>"));
+			ui.ImageViewerTabWidget->clear();
-	//	ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
-	//}
 
+			onCreateTab(0);
+			m_numberOfRecording = 0;
+			m_Imager->setFrameNumber(this->frame_number->text().toInt());
+			m_Imager->setFileName2Save(imgPath);
+			emit StartRecordSignal();//<2F><><EFBFBD>俪ʼ<E4BFAA>ɼ<EFBFBD><C9BC>ź<EFBFBD>
+
+			ui.action_start_recording->setText(QString::fromLocal8Bit("ֹͣ<EFBFBD>ɼ<EFBFBD>"));
+			ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}");
+		}
+		else
+		{
+			m_Imager->setRecordControlState(false);//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֹͣ<CDA3>ɼ<EFBFBD>
+
+			ui.action_start_recording->setText(QString::fromLocal8Bit("<EFBFBD>ɼ<EFBFBD>"));
+			ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
+		}
+		return;
+	}
 
 	//ȷ<><C8B7>x<EFBFBD><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB> С<><D0A1> x<><78><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD><C9BC><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD><CEBB>
 	int validLineCount = 0;
@@ -454,7 +496,7 @@ void HPPA::onStartRecordStep1()
 		FileOperation * fileOperation = new FileOperation();
 		string directory = fileOperation->getDirectoryFromString();
 		//string imgPath = directory + "\\tmp_image";
-		string imgPath = directory + "\\" + m_FilenameLineEdit->text().toStdString() + "_" + std::to_string(1);
+		string imgPath = directory + "\\" + m_FilenameLineEdit->text().toStdString();
 		int x = _access(imgPath.c_str(), 0);
 		if (!x)//<2F><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD>ھ<EFBFBD>ִ<EFBFBD>д<EFBFBD>if<69>Ĵ<EFBFBD><C4B4><EFBFBD>
 		{
@@ -476,13 +518,13 @@ void HPPA::onStartRecordStep1()
 		operateWidget = QObject::sender()->objectName();
 
 		//<2F><><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-		m_Imager->setFileName2Save(m_FilenameLineEdit->text().toStdString());
+		m_Imager->setFileName2Save(imgPath);
 
 		//ɾ<><C9BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>tab
 		ui.ImageViewerTabWidget->clear();
 
 		//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼x<C2BC><78><EFBFBD><EFBFBD>λ<EFBFBD>õ<EFBFBD><C3B5>ļ<EFBFBD>
-		string x_location = directory + "\\" + m_FilenameLineEdit->text().toStdString() + "x_location.pos";
+		string x_location = removeFileExtension(imgPath) + "x_location.pos";
 		m_hTimesFile = fopen(x_location.c_str(), "w+");
 
 		//<2F><>ʼѭ<CABC><D1AD>
@@ -542,7 +584,6 @@ void HPPA::onStartRecordStep2(int lineNumber)
 	else if (lineNumber == -1)
 	{
 		std::cout << "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD>ֹ<EFBFBD>ɼ<EFBFBD><EFBFBD><EFBFBD>" << std::endl;
-		m_RecordState++;
 
 		ui.action_start_recording->setText(QString::fromLocal8Bit("<EFBFBD>ɼ<EFBFBD>"));
 		ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
@@ -700,7 +741,7 @@ void HPPA::onLeftMouseButtonPressed(int x, int y)
 
 		FileOperation * fileOperation = new FileOperation();
 		string directory = fileOperation->getDirectoryFromString();
-		string imgPath = directory + "\\" + m_FilenameLineEdit->text().toStdString() + "_" + std::to_string(m_TabWidgetCurrentIndex + 1);
+		string imgPath = directory + "\\" + m_FilenameLineEdit->text().toStdString() + "_" + std::to_string(m_TabWidgetCurrentIndex + 1) + ".bil";
 
 		ImageReaderWriter *ImageReader = new ImageReaderWriter(imgPath.c_str());
 
@@ -1862,6 +1903,9 @@ void HPPA::onReference()
 	msgBox.setText(QString::fromLocal8Bit("<EFBFBD><EFBFBD>ȷ<EFBFBD><EFBFBD><EFBFBD>װ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȷ<EFBFBD><EFBFBD>"));
 	msgBox.exec();
 
+	bool isMotorEnable = this->ui.mAction_is_motor_enable->isChecked();
+	if (isMotorEnable)
+	{
 		//<2F>ƶ<EFBFBD>x<EFBFBD><78><EFBFBD><EFBFBD>
 		if (!isMotorConnected(m_xMotor))
 		{
@@ -1872,6 +1916,7 @@ void HPPA::onReference()
 
 			m_xMotor->MoveMotar(true);
 		}
+	}
 	
 	emit RecordWhiteSignal();	
 }
@@ -1880,6 +1925,9 @@ void HPPA::recordWhiteFinish()
 {
 	ui.mainToolBar->widgetForAction(ui.action_reference)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
 
+	bool isMotorEnable = this->ui.mAction_is_motor_enable->isChecked();
+	if (isMotorEnable)
+	{
 		//<2F>ƶ<EFBFBD>x<EFBFBD><78><EFBFBD><EFBFBD>
 		if (!isMotorConnected(m_xMotor))
 		{
@@ -1888,6 +1936,7 @@ void HPPA::recordWhiteFinish()
 			m_xMotor->MoveToLocation(m_lXmotorLocationOfStartRecord);
 		}
 	}
+}
 
 void HPPA::onPlotHyperspectralImageRgbImage()
 {
@@ -2004,11 +2053,19 @@ void HPPA::PlotSpectral(int state)
 void HPPA::onRecordFinishedSignal_WhenFrameNumberMeet()
 {
 	std::cout << "ֹͣ<EFBFBD>ɼ<EFBFBD>ԭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>֡<EFBFBD><EFBFBD><EFBFBD>ɼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ˡ<EFBFBD>" << std::endl;
+
+	ui.action_start_recording->setText(QString::fromLocal8Bit("<EFBFBD>ɼ<EFBFBD>"));
+	ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
+
+	m_RecordState++;//<2F><><EFBFBD>Զ<EFBFBD>ֹͣ<CDA3>ɼ<EFBFBD>
 }
 
 void HPPA::onRecordFinishedSignal_WhenFrameNumberNotMeet()
 {
 	std::cout << "ֹͣ<EFBFBD>ɼ<EFBFBD>ԭ<EFBFBD>򣺣<EFBFBD>1<EFBFBD><EFBFBD>֡<EFBFBD><EFBFBD>û<EFBFBD>вɼ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ﵽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>λ<EFBFBD>ã<EFBFBD><EFBFBD><EFBFBD>2<EFBFBD><EFBFBD><EFBFBD>ֶ<EFBFBD>ֹͣ<EFBFBD>ɼ<EFBFBD><EFBFBD><EFBFBD>" << std::endl;
+
+	ui.action_start_recording->setText(QString::fromLocal8Bit("<EFBFBD>ɼ<EFBFBD>"));
+	ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}");
 }
 
 ForLoopControl::ForLoopControl()

HPPA/HPPA.h

@@ -236,7 +236,6 @@ private:
 	void getRequest(QString str);
 
 	QActionGroup* mImagerGroup = nullptr;
-	QString imagerSelected;
 	void createActionGroups();
 	void selectingImager(QAction* selectedAction);
 
@@ -322,6 +321,8 @@ public Q_SLOTS:
 	void ontimerMoveXmotor();
 	void ontimerMoveYmotor();
 
+	void onMotorSwitch();
+
 	//
 	void onimagerSimulatorMove(int x, int y);
 	void OnSendLogToCallClass(QString str);

HPPA/HPPA.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1078</width>
+    <width>1120</width>
-    <height>623</height>
+    <height>675</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -84,7 +84,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1078</width>
+     <width>1120</width>
      <height>30</height>
     </rect>
    </property>
@@ -162,8 +162,15 @@ color:white;
      <string>窗口</string>
     </property>
    </widget>
+   <widget class="QMenu" name="menu_2">
+    <property name="title">
+     <string>扫描平台</string>
+    </property>
+    <addaction name="mAction_is_motor_enable"/>
+   </widget>
    <addaction name="file"/>
    <addaction name="menuspectrometer"/>
+   <addaction name="menu_2"/>
    <addaction name="mWindowsMenu"/>
    <addaction name="menuhelp"/>
   </widget>
@@ -1535,6 +1542,28 @@ QDockWidget::title {
     <string>工具栏</string>
    </property>
   </action>
+  <action name="action_2">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>马达</string>
+   </property>
+  </action>
+  <action name="mAction_is_motor_enable">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>开启</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

HPPA/ImagerOperationBase.cpp

@@ -204,16 +204,13 @@ void ImagerOperationBase::start_record()
 		exit(EXIT_FAILURE);
 	}
 
-	FileOperation* fileOperation = new FileOperation();
+	m_FileName2Save2 = m_FileName2Save + "_" + std::to_string(m_FileSavedCounter) + ".bil";
-	string directory = fileOperation->getDirectoryFromString();
+	FILE* m_fImage = fopen(m_FileName2Save2.c_str(), "w+b");
-	string imgPath = directory + "\\" + m_FileName2Save + "_" + std::to_string(m_FileSavedCounter);
-
-	FILE* m_fImage = fopen((imgPath + ".bil").c_str(), "w+b");
 
 	size_t x;
 	double pixelValueTmp;
 
-	string timesFile = imgPath + ".times";
+	string timesFile = removeFileExtension(m_FileName2Save2) + ".times";
 	FILE* hTimesFile = fopen(timesFile.c_str(), "w+");
 
 	imagerStartCollect();
@@ -404,11 +401,7 @@ void ImagerOperationBase::WriteHdr()
 	//write an ENVI compatible header file
 	using namespace std;
 
-
+	string hdrPath = removeFileExtension(m_FileName2Save2) + ".hdr";
-	FileOperation* fileOperation = new FileOperation();
-	string directory = fileOperation->getDirectoryFromString();
-
-	string hdrPath = directory + "\\" + m_FileName2Save + "_" + std::to_string(m_FileSavedCounter) + ".hdr";
 
 	std::ofstream outfile(hdrPath.c_str());
 	outfile << "ENVI\n";

HPPA/ImagerOperationBase.h

@@ -66,6 +66,7 @@ protected:
 
     //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD><DAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӱ<EFBFBD><D3B0><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD><EFBFBD>
     string m_FileName2Save;//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӱ<EFBFBD><D3B0><EFBFBD>ļ<EFBFBD><C4BC><EFBFBD>
+    string m_FileName2Save2;
     int m_FileSavedCounter;//<2F><><EFBFBD><EFBFBD><EFBFBD>˼<EFBFBD><CBBC><EFBFBD>Ӱ<EFBFBD><D3B0><EFBFBD>ļ<EFBFBD>
 
     bool m_HasDark;//<2F><><EFBFBD>ɼ<EFBFBD><C9BC>˰<EFBFBD><CBB0><EFBFBD><EFBFBD><EFBFBD>֮<EFBFBD><D6AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊtrue

HPPA/ResononNirImager.cpp

@@ -285,16 +285,13 @@ void ResononNirImager::start_record()
 		exit(EXIT_FAILURE);
 	}
 
-	FileOperation* fileOperation = new FileOperation();
+	m_FileName2Save2 = m_FileName2Save + "_" + std::to_string(m_FileSavedCounter) + ".bil";
-	string directory = fileOperation->getDirectoryFromString();
+	FILE* m_fImage = fopen(m_FileName2Save2.c_str(), "w+b");
-	string imgPath = directory + "\\" + m_FileName2Save + "_" + std::to_string(m_FileSavedCounter);
-
-	FILE* m_fImage = fopen((imgPath + ".bil").c_str(), "w+b");
 
 	size_t x;
 	double pixelValueTmp;
 
-	string timesFile = imgPath + ".times";
+	string timesFile = removeFileExtension(m_FileName2Save2) + ".times";
 	FILE* hTimesFile = fopen(timesFile.c_str(), "w+");
 
 	reConnectImage();//nir<69>ڶ<EFBFBD><DAB6>βɼ<CEB2>ʱ<EFBFBD><CAB1>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>imagerStartCollect()<29>ᱨ<EFBFBD><E1B1A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -395,11 +392,7 @@ void ResononNirImager::WriteHdr()
 	//write an ENVI compatible header file
 	using namespace std;
 
-
+	string hdrPath = removeFileExtension(m_FileName2Save2) + ".hdr";
-	FileOperation* fileOperation = new FileOperation();
-	string directory = fileOperation->getDirectoryFromString();
-
-	string hdrPath = directory + "\\" + m_FileName2Save + "_" + std::to_string(m_FileSavedCounter) + ".hdr";
 
 	std::ofstream outfile(hdrPath.c_str());
 	outfile << "ENVI\n";

HPPA/ResononNirImager.h

@@ -7,6 +7,7 @@
 #include "resonon_imager_allied.h"
 #include "image2display.h"
 #include "fileOperation.h"
+#include "utility_tc.h"
 
 class ResononNirImager :public ImagerOperationBase
 {

HPPA/about.ui

@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>523</width>
+    <width>629</width>
     <height>463</height>
    </rect>
   </property>
@@ -25,7 +25,7 @@
     <rect>
      <x>90</x>
      <y>250</y>
-     <width>341</width>
+     <width>434</width>
      <height>134</height>
     </rect>
    </property>
@@ -70,7 +70,7 @@
     </rect>
    </property>
    <property name="text">
-    <string>版本：1.8.6</string>
+    <string>版本：1.8.7</string>
    </property>
   </widget>
   <widget class="QLabel" name="label_4">

HPPA/utility_tc.cpp

@@ -101,6 +101,17 @@ bool createDir(QString fullPath)
     }
 }
 
+std::string removeFileExtension(std::string filename)
+{
+    size_t lastDot = filename.find_last_of(".");
+    if (lastDot == std::string::npos) {
+        // 如果没有找到后缀，返回原字符串
+        return filename;
+    }
+    return filename.substr(0, lastDot);
+
+}
+
 QList<QString> getFileInfo(QString file)
 {
     QFileInfo fileInfo = QFileInfo(file);

HPPA/utility_tc.h

@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include <ctime>
+#include <string>
 
 #include <QString>
 #include <QDebug>
@@ -18,6 +19,7 @@ void bubbleSort(unsigned short * a, int n);
 void swap(unsigned short * a, unsigned short * b);
 
 bool createDir(QString fullPath);
+std::string removeFileExtension(std::string filename);
 
 QList<QString> getFileInfo(QString file);