tangchao0503/HPPA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: tangchao0503:dev
Branches Tags
tangchao0503:master tangchao0503:dev
tangchao0503:3.0.0 tangchao0503:T2.1.2 tangchao0503:T2.1 tangchao0503:2.0 tangchao0503:1.9.0 tangchao0503:1.8.8 tangchao0503:1.8.7 tangchao0503:1.8.6 tangchao0503:1.8.5 tangchao0503:1.8.4 tangchao0503:1.8.2 tangchao0503:1.8 tangchao0503:1.7 tangchao0503:1.5 tangchao0503:1.6
...
compare: tangchao0503:T2.1.2
Branches Tags
tangchao0503:dev tangchao0503:master
tangchao0503:3.0.0 tangchao0503:T2.1.2 tangchao0503:T2.1 tangchao0503:2.0 tangchao0503:1.9.0 tangchao0503:1.8.8 tangchao0503:1.8.7 tangchao0503:1.8.6 tangchao0503:1.8.5 tangchao0503:1.8.4 tangchao0503:1.8.2 tangchao0503:1.8 tangchao0503:1.7 tangchao0503:1.5 tangchao0503:1.6

2 Commits
dev ... T2.1.2

Author SHA1 Message Date
tangchao0503
07f3268efc 1、修复“2轴控制”中，按钮在不同分辨率下显示补全的问题； 
2、删掉“2轴控制”中，运行按钮；
 2026-01-08 19:10:10 +08:00
tangchao0503
2322bf09cf fix： 
调焦时曲线显示bug
 2025-11-13 15:59:23 +08:00
4 changed files with 58 additions and 51 deletions
Expand all files Collapse all files

5
HPPA/HPPA.cpp
View File

@ -1182,12 +1182,15 @@ void HPPA::PlotSpectral(int state)
QLineSeries *series = new QLineSeries();
//series->clear();//////////////////////////////
int sampleCount = m_Imager->getSampleCount();
int bandCount = m_Imager->getBandCount();
int tmp = int(bandCount / 2);
//std::cout << tmp << std::endl;
for (size_t i = 0; i < sampleCount; i++)
{
//malloc<6F><63><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڴ<EFBFBD><DAB4>÷<EFBFBD>1<EFBFBD><31><EFBFBD><EFBFBD><EFBFBD>Ե<EFBFBD><D4B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
//series->append(i, m_Imager->buffer[i + 5 * 900]);
//series->append(i, m_Imager->buffer[900 * 150 + i]);
series->append(i, m_Imager->buffer[1368 * 150 + i]);
series->append(i, m_Imager->buffer[sampleCount * tmp + i]);
}
QChart *chart = new QChart();

3
HPPA/TwoMotorControl.cpp
View File

@ -20,9 +20,6 @@ TwoMotorControl::TwoMotorControl(QWidget* parent) : QDialog(parent)
connect(ui.deleteRecordLine_btn, SIGNAL(clicked()), this, SLOT(onDeleteRecordLine_btn()));
connect(ui.saveRecordLine2File_btn, SIGNAL(clicked()), this, SLOT(onSaveRecordLine2File_btn()));
connect(ui.readRecordLineFile_btn, SIGNAL(clicked()), this, SLOT(onReadRecordLineFile_btn()));
connect(ui.run_btn, SIGNAL(clicked()), this, SLOT(run()));
connect(ui.stop_btn, SIGNAL(clicked()), this, SLOT(stop()));
}
void TwoMotorControl::setImager(ImagerOperationBase* imager)

2
HPPA/about.ui
View File

@ -70,7 +70,7 @@
</rect>
</property>
<property name="text">
<string>版本：2.0</string>
<string>版本：T2.1.2</string>
</property>
</widget>
<widget class="QLabel" name="label_4">

99
HPPA/twoMotorControl.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>684</width>
<height>799</height>
<width>1062</width>
<height>1356</height>
</rect>
</property>
<property name="windowTitle">
@ -42,15 +42,15 @@
<rect>
<x>0</x>
<y>0</y>
<width>684</width>
<height>799</height>
<width>1062</width>
<height>1356</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -58,7 +58,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>150</height>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
@ -83,9 +83,43 @@
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QWidget" name="widget" 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>0</number>
</property>
@ -105,7 +139,7 @@
<item row="0" column="1">
<widget class="QPushButton" name="ymotor_forward_btn">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -170,7 +204,7 @@
<item row="1" column="2">
<widget class="QPushButton" name="xmotor_right_btn">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -235,7 +269,7 @@
<item row="2" column="3">
<widget class="QPushButton" name="rangeMeasurement_btn">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -248,36 +282,6 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="run_btn">
<property name="text">
<string>运行</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="stop_btn">
<property name="text">
<string>停止</string>
</property>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
@ -292,7 +296,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>127</height>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
@ -323,7 +327,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -497,7 +501,7 @@
<item>
<widget class="QPushButton" name="move2loc_x_pushButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -510,7 +514,7 @@
</property>
<property name="maximumSize">
<size>
<width>50</width>
<width>78</width>
<height>16777215</height>
</size>
</property>
@ -566,7 +570,7 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>125</height>
<height>16777215</height>
</size>
</property>
<property name="styleSheet">
@ -669,7 +673,7 @@
</property>
<property name="maximumSize">
<size>
<width>50</width>
<width>78</width>
<height>16777215</height>
</size>
</property>
@ -719,6 +723,9 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
@ -778,7 +785,7 @@
</property>
<property name="maximumSize">
<size>
<width>50</width>
<width>78</width>
<height>16777215</height>
</size>
</property>