diff --git a/HPPA/HPPA.cpp b/HPPA/HPPA.cpp index 61d299f..f0be0cc 100644 --- a/HPPA/HPPA.cpp +++ b/HPPA/HPPA.cpp @@ -762,7 +762,8 @@ void HPPA::recordFromRobotArm(int fileCounter) if (fileCounter - 1 == 0) { - m_imageViewerTabWidget->clear(); + //m_imageViewerTabWidget->clear(); + removeAllLayersInRasterGroup(); } onCreateTab("img"); @@ -1144,6 +1145,7 @@ void HPPA::onStartRecordStep1() if (m_RecordState % 2 == 1) { //m_imageViewerTabWidget->clear(); + removeAllLayersInRasterGroup(); m_Imager->setFileName2Save(imgPath); m_Imager->setFrameNumber(this->frame_number->text().toInt()); @@ -1158,7 +1160,7 @@ void HPPA::onStartRecordStep1() m_RecordState -= 1; ui.action_start_recording->setText(QString::fromLocal8Bit("采集")); - ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}"); + ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}"); } return; } @@ -1169,9 +1171,10 @@ void HPPA::onStartRecordStep1() if (m_RecordState % 2 == 1) { //m_imageViewerTabWidget->clear(); + removeAllLayersInRasterGroup(); ui.action_start_recording->setText(QString::fromLocal8Bit("停止采集")); - ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}"); + ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}"); //应该先控制马达运动,当马达运动后,再开始光谱仪采集(发射开始采集信号) m_Imager->setFileName2Save(imgPath); @@ -1185,7 +1188,7 @@ void HPPA::onStartRecordStep1() m_RecordState -= 1; ui.action_start_recording->setText(QString::fromLocal8Bit("采集")); - ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}"); + ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}"); } return; } @@ -1196,6 +1199,7 @@ void HPPA::onStartRecordStep1() if (m_RecordState % 2 == 1) { //m_imageViewerTabWidget->clear(); + removeAllLayersInRasterGroup(); m_Imager->setFileName2Save(imgPath); m_Imager->setFrameNumber(this->frame_number->text().toInt()); @@ -1204,16 +1208,16 @@ void HPPA::onStartRecordStep1() m_tmc->run(); ui.action_start_recording->setText(QString::fromLocal8Bit("停止采集")); - ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}"); + ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(255,0,0);}"); } else { - m_tmc->stop(); + m_tmc->stop(); - m_RecordState--; + m_RecordState--; - ui.action_start_recording->setText(QString::fromLocal8Bit("采集")); - ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}"); + ui.action_start_recording->setText(QString::fromLocal8Bit("采集")); + ui.mainToolBar->widgetForAction(ui.action_start_recording)->setStyleSheet("QWidget{background-color:rgb(0,255,0);}"); } return;