fix

1、相机参数有效性控制bug；
2、相机看板图像大小调整；
3、工程的realease模式修复；

HPPA/HPPA.cpp

@@ -787,8 +787,10 @@ QWidget* HPPA::tmp(QWidget* a)
 void HPPA::initControlTabwidget()
 {	
 	m_hic = new HyperImagerControl();
-	ui.controlTabWidget->addTab(m_hic, QString::fromLocal8Bit("光谱仪"));
+	//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();

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>
+    <QtInstall>5.13.2_msvc2017_64</QtInstall>
-    <QtModules>core;network;gui;widgets;serialport;websockets;charts</QtModules>
+    <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>

HPPA/HyperImagerControl.cpp

@@ -1,4 +1,4 @@
-#include "HyperImagerControl.h"
+#include "HyperImagerControl.h"
 
 HyperImagerControl::HyperImagerControl(QWidget* parent)
 	: QDialog(parent)
@@ -17,15 +17,60 @@ HyperImagerControl::HyperImagerControl(QWidget* parent)
 	connect(ui.GainSlider, &QSlider::valueChanged, this, &HyperImagerControl::onGainSliderChanged);
 	connect(ui.GainSlider, &QSlider::sliderReleased, this, &HyperImagerControl::onGainSliderReleased);
 
-	ui.framerate_spinBox->setMinimum(1);
-	ui.framerate_spinBox->setMaximum(250);
-	ui.FramerateSlider->setMinimum(1);
-	ui.FramerateSlider->setMaximum(250);
-
-	ui.gain_spinBox->setMinimum(0);
-	ui.gain_spinBox->setMaximum(12);
-	ui.GainSlider->setMinimum(0);
 	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(D:/cpp_project_vs2022/HPPA/HPPA/icon/all/arrow_up.svg);
+			width: 10px;
+			height: 10px;
+		}
+
+		QDoubleSpinBox::down-arrow {
+			image: url(D:/cpp_project_vs2022/HPPA/HPPA/icon/all/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()
@@ -70,7 +115,7 @@ void HyperImagerControl::onFramerateSliderChanged(double framerate)
 
 void HyperImagerControl::onFramerateSliderReleased()
 {
-	double framerate = ui.framerate_spinBox->value();//<2F><><EFBFBD>ᴥ<EFBFBD><E1B4A5>QDoubleSpinBox::editingFinished<65>źţ<C5BA><C5A3>Ӷ<EFBFBD><D3B6><EFBFBD><EFBFBD><EFBFBD>onFramerateSpinBoxEditingFinished<65>ۺ<EFBFBD><DBBA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>շ<EFBFBD><D5B7><EFBFBD>framerateChanged<65>źš<C5BA>
+	double framerate = ui.framerate_spinBox->value();
 	emit framerateChanged(framerate);
 }
 
@@ -116,26 +161,35 @@ void HyperImagerControl::onGainSliderReleased()
 
 void HyperImagerControl::updateIntegrationTimeRange(double frameRate)
 {
-	double maxIntegrationTime = 1.0 / frameRate * 1000.0; // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	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); // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD>)ת֡<D7AA><D6A1>
+	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);
 }

HPPA/HyperImagerControl.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <QDialog>
 
@@ -41,6 +41,7 @@ private Q_SLOTS:
 private:
 	void updateIntegrationTimeRange(double frameRate);
 	void updateFramerateRange(double integrationTime);
+	double m_frameRateLimit = 150;//相机的最大帧率限制为250fps
 
 	Ui::HyperImagerControl ui;
 };

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);

HPPA/hyperImagerControl.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>462</width>
+    <width>437</width>
-    <height>385</height>
+    <height>372</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -117,7 +117,7 @@ QSlider::handle:horizontal:pressed {
     background: #1f4fff;
 }</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
+  <layout class="QGridLayout" name="gridLayout_2" rowstretch="3,2">
    <item row="0" column="0">
     <widget class="AspectRatioLabel" name="imagerPictureLabel">
      <property name="sizePolicy">
@@ -131,61 +131,16 @@ QSlider::handle:horizontal:pressed {
    <item row="1" column="0">
     <widget class="QWidget" name="widget_3" native="true">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <property name="leftMargin">
+      <property name="horizontalSpacing">
-       <number>0</number>
+       <number>16</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="QDoubleSpinBox" name="framerate_spinBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -198,7 +153,7 @@ QSlider::handle:horizontal:pressed {
         </property>
        </widget>
       </item>
-        <item>
+      <item row="0" column="2">
        <widget class="QDoubleSlider" name="FramerateSlider">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -211,63 +166,6 @@ QSlider::handle:horizontal:pressed {
         </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="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>
-         <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">
@@ -299,9 +197,32 @@ QSlider::handle:horizontal:pressed {
         </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">
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
        <widget class="QDoubleSpinBox" name="gain_spinBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -314,7 +235,7 @@ QSlider::handle:horizontal:pressed {
         </property>
        </widget>
       </item>
-        <item>
+      <item row="2" column="2">
        <widget class="QSlider" name="GainSlider">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -327,7 +248,76 @@ QSlider::handle:horizontal:pressed {
         </property>
        </widget>
       </item>
-       </layout>
+      <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>

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">