mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-27 16:54:15 +01:00
Reverted RC input config widget to using sliders to allow manual adjustment
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2919 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip
pip
parent
0210334aa8
commit
ffdfedfaa1
@ -111,14 +111,23 @@ ConfigServoWidget::ConfigServoWidget(QWidget *parent) : ConfigTaskWidget(parent)
|
||||
<< m_config->ch6Min
|
||||
<< m_config->ch7Min;
|
||||
|
||||
inWidgetBars << m_config->widgetBarCH0
|
||||
<< m_config->widgetBarCH1
|
||||
<< m_config->widgetBarCH2
|
||||
<< m_config->widgetBarCH3
|
||||
<< m_config->widgetBarCH4
|
||||
<< m_config->widgetBarCH5
|
||||
<< m_config->widgetBarCH6
|
||||
<< m_config->widgetBarCH7;
|
||||
inSliders << m_config->inSlider0
|
||||
<< m_config->inSlider1
|
||||
<< m_config->inSlider2
|
||||
<< m_config->inSlider3
|
||||
<< m_config->inSlider4
|
||||
<< m_config->inSlider5
|
||||
<< m_config->inSlider6
|
||||
<< m_config->inSlider7;
|
||||
|
||||
// inWidgetBars << m_config->widgetBarCH0
|
||||
// << m_config->widgetBarCH1
|
||||
// << m_config->widgetBarCH2
|
||||
// << m_config->widgetBarCH3
|
||||
// << m_config->widgetBarCH4
|
||||
// << m_config->widgetBarCH5
|
||||
// << m_config->widgetBarCH6
|
||||
// << m_config->widgetBarCH7;
|
||||
|
||||
// Now connect the widget to the ManualControlCommand / Channel UAVObject
|
||||
|
||||
@ -234,6 +243,15 @@ ConfigServoWidget::ConfigServoWidget(QWidget *parent) : ConfigTaskWidget(parent)
|
||||
connect(parent, SIGNAL(autopilotConnected()),this, SLOT(requestRCInputUpdate()));
|
||||
connect(parent, SIGNAL(autopilotConnected()),this, SLOT(requestRCOutputUpdate()));
|
||||
|
||||
connect(m_config->inSlider0, SIGNAL(valueChanged(int)),this, SLOT(onInSliderValueChanged0(int)));
|
||||
connect(m_config->inSlider1, SIGNAL(valueChanged(int)),this, SLOT(onInSliderValueChanged1(int)));
|
||||
connect(m_config->inSlider2, SIGNAL(valueChanged(int)),this, SLOT(onInSliderValueChanged2(int)));
|
||||
connect(m_config->inSlider3, SIGNAL(valueChanged(int)),this, SLOT(onInSliderValueChanged3(int)));
|
||||
connect(m_config->inSlider4, SIGNAL(valueChanged(int)),this, SLOT(onInSliderValueChanged4(int)));
|
||||
connect(m_config->inSlider5, SIGNAL(valueChanged(int)),this, SLOT(onInSliderValueChanged5(int)));
|
||||
connect(m_config->inSlider6, SIGNAL(valueChanged(int)),this, SLOT(onInSliderValueChanged6(int)));
|
||||
connect(m_config->inSlider7, SIGNAL(valueChanged(int)),this, SLOT(onInSliderValueChanged7(int)));
|
||||
|
||||
firstUpdate = true;
|
||||
|
||||
enableControls(false);
|
||||
@ -258,6 +276,50 @@ ConfigServoWidget::~ConfigServoWidget()
|
||||
}
|
||||
|
||||
// ************************************
|
||||
// slider value changed signals
|
||||
|
||||
void ConfigServoWidget::onInSliderValueChanged0(int value)
|
||||
{
|
||||
m_config->ch0Cur->setText(QString::number(value));
|
||||
}
|
||||
|
||||
void ConfigServoWidget::onInSliderValueChanged1(int value)
|
||||
{
|
||||
m_config->ch1Cur->setText(QString::number(value));
|
||||
}
|
||||
|
||||
void ConfigServoWidget::onInSliderValueChanged2(int value)
|
||||
{
|
||||
m_config->ch2Cur->setText(QString::number(value));
|
||||
}
|
||||
|
||||
void ConfigServoWidget::onInSliderValueChanged3(int value)
|
||||
{
|
||||
m_config->ch3Cur->setText(QString::number(value));
|
||||
}
|
||||
|
||||
void ConfigServoWidget::onInSliderValueChanged4(int value)
|
||||
{
|
||||
m_config->ch4Cur->setText(QString::number(value));
|
||||
}
|
||||
|
||||
void ConfigServoWidget::onInSliderValueChanged5(int value)
|
||||
{
|
||||
m_config->ch5Cur->setText(QString::number(value));
|
||||
}
|
||||
|
||||
void ConfigServoWidget::onInSliderValueChanged6(int value)
|
||||
{
|
||||
m_config->ch6Cur->setText(QString::number(value));
|
||||
}
|
||||
|
||||
void ConfigServoWidget::onInSliderValueChanged7(int value)
|
||||
{
|
||||
m_config->ch7Cur->setText(QString::number(value));
|
||||
}
|
||||
|
||||
// ************************************
|
||||
// telemetry start/stop connect/disconnect signals
|
||||
|
||||
void ConfigServoWidget::onTelemetryStart()
|
||||
{
|
||||
@ -275,7 +337,6 @@ void ConfigServoWidget::onTelemetryConnect()
|
||||
void ConfigServoWidget::onTelemetryDisconnect()
|
||||
{
|
||||
enableControls(false);
|
||||
|
||||
m_config->doRCInputCalibration->setChecked(false);
|
||||
}
|
||||
|
||||
@ -636,9 +697,12 @@ void ConfigServoWidget::requestRCInputUpdate()
|
||||
QVariant neutral = field_neu->getValue(i);
|
||||
inMaxLabels[i]->setText(max.toString());
|
||||
inMinLabels[i]->setText(min.toString());
|
||||
inWidgetBars[i]->setMaximum(max.toInt());
|
||||
inWidgetBars[i]->setMinimum(min.toInt());
|
||||
inWidgetBars[i]->setValue(neutral.toInt());
|
||||
inSliders[i]->setMaximum(max.toInt());
|
||||
inSliders[i]->setMinimum(min.toInt());
|
||||
inSliders[i]->setValue(neutral.toInt());
|
||||
// inWidgetBars[i]->setMaximum(max.toInt());
|
||||
// inWidgetBars[i]->setMinimum(min.toInt());
|
||||
// inWidgetBars[i]->setValue(neutral.toInt());
|
||||
}
|
||||
|
||||
// Update receiver type
|
||||
@ -714,7 +778,8 @@ void ConfigServoWidget::sendRCInputUpdate()
|
||||
fieldName = QString("ChannelNeutral");
|
||||
field = obj->getField(fieldName);
|
||||
for (int i = 0; i < 8; i++)
|
||||
field->setValue(inWidgetBars[i]->value(), i);
|
||||
field->setValue(inSliders[i]->value(), i);
|
||||
// field->setValue(inWidgetBars[i]->value(), i);
|
||||
|
||||
// Set RC Receiver type:
|
||||
fieldName = QString("InputMode");
|
||||
@ -929,7 +994,8 @@ void ConfigServoWidget::updateChannels(UAVObject* controlCommand)
|
||||
|
||||
field = controlCommand->getField(QString("Channel"));
|
||||
for (int i = 0; i < 8; i++)
|
||||
updateChannelWidgetBar(inWidgetBars[i], inMinLabels[i], inMaxLabels[i], reversals[i], field->getValue(i).toInt());
|
||||
updateChannelInSlider(inSliders[i], inMinLabels[i], inMaxLabels[i], reversals[i], field->getValue(i).toInt());
|
||||
// updateChannelWidgetBar(inWidgetBars[i], inMinLabels[i], inMaxLabels[i], reversals[i], field->getValue(i).toInt());
|
||||
|
||||
firstUpdate = false;
|
||||
}
|
||||
@ -959,9 +1025,13 @@ void ConfigServoWidget::updateChannels(UAVObject* controlCommand)
|
||||
if (chIndex < field->getOptions().length() - 1)
|
||||
{
|
||||
float valueScaled;
|
||||
int chMin = inWidgetBars[chIndex]->minimum();
|
||||
int chMax = inWidgetBars[chIndex]->maximum();
|
||||
int chNeutral = inWidgetBars[chIndex]->value();
|
||||
|
||||
int chMin = inSliders[chIndex]->minimum();
|
||||
int chMax = inSliders[chIndex]->maximum();
|
||||
int chNeutral = inSliders[chIndex]->value();
|
||||
// int chMin = inWidgetBars[chIndex]->minimum();
|
||||
// int chMax = inWidgetBars[chIndex]->maximum();
|
||||
// int chNeutral = inWidgetBars[chIndex]->value();
|
||||
|
||||
int value = controlCommand->getField("Channel")->getValue(chIndex).toInt();
|
||||
if ((chMax > chMin && value >= chNeutral) || (chMin > chMax && value <= chNeutral))
|
||||
@ -988,6 +1058,43 @@ void ConfigServoWidget::updateChannels(UAVObject* controlCommand)
|
||||
}
|
||||
}
|
||||
|
||||
void ConfigServoWidget::updateChannelInSlider(QSlider *slider, QLabel *min, QLabel *max, QCheckBox *rev, int value)
|
||||
{
|
||||
Q_UNUSED(rev);
|
||||
|
||||
// if (!slider || !min || !max || !rev)
|
||||
if (!slider || !min || !max)
|
||||
return;
|
||||
|
||||
if (firstUpdate)
|
||||
{ // Reset all the min/max values of the progress bar since we are starting the calibration.
|
||||
|
||||
slider->setMaximum(value);
|
||||
slider->setMinimum(value);
|
||||
slider->setValue(value);
|
||||
|
||||
max->setText(QString::number(value));
|
||||
min->setText(QString::number(value));
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (value > 0)
|
||||
{ // avoids glitches...
|
||||
if (value > slider->maximum())
|
||||
{
|
||||
slider->setMaximum(value);
|
||||
max->setText(QString::number(value));
|
||||
}
|
||||
if (value < slider->minimum())
|
||||
{
|
||||
slider->setMinimum(value);
|
||||
min->setText(QString::number(value));
|
||||
}
|
||||
slider->setValue(value);
|
||||
}
|
||||
}
|
||||
/*
|
||||
void ConfigServoWidget::updateChannelWidgetBar(WidgetBar *widget_bar, QLabel *min, QLabel *max, QCheckBox *rev, int value)
|
||||
{
|
||||
Q_UNUSED(rev);
|
||||
@ -1024,3 +1131,4 @@ void ConfigServoWidget::updateChannelWidgetBar(WidgetBar *widget_bar, QLabel *mi
|
||||
widget_bar->setValue(value);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
@ -52,12 +52,22 @@ public slots:
|
||||
void onTelemetryConnect();
|
||||
void onTelemetryDisconnect();
|
||||
|
||||
void onInSliderValueChanged0(int value);
|
||||
void onInSliderValueChanged1(int value);
|
||||
void onInSliderValueChanged2(int value);
|
||||
void onInSliderValueChanged3(int value);
|
||||
void onInSliderValueChanged4(int value);
|
||||
void onInSliderValueChanged5(int value);
|
||||
void onInSliderValueChanged6(int value);
|
||||
void onInSliderValueChanged7(int value);
|
||||
|
||||
private:
|
||||
Ui_SettingsWidget *m_config;
|
||||
|
||||
QList<QSlider> sliders;
|
||||
|
||||
void updateChannelWidgetBar(WidgetBar *widget_bar, QLabel *min, QLabel *max, QCheckBox *rev, int value);
|
||||
void updateChannelInSlider(QSlider *slider, QLabel *min, QLabel *max, QCheckBox *rev, int value);
|
||||
// void updateChannelWidgetBar(WidgetBar *widget_bar, QLabel *min, QLabel *max, QCheckBox *rev, int value);
|
||||
|
||||
void assignChannel(UAVDataObject *obj, QString str);
|
||||
void assignOutputChannel(UAVDataObject *obj, QString str);
|
||||
@ -72,6 +82,7 @@ private:
|
||||
QList<QCheckBox*> reversals;
|
||||
QList<QLabel*> outLabels;
|
||||
|
||||
QList<QSlider*> inSliders;
|
||||
QList<WidgetBar*> inWidgetBars;
|
||||
QList<QLabel*> inMaxLabels;
|
||||
QList<QLabel*> inMinLabels;
|
||||
|
||||
@ -53,9 +53,9 @@ p, li { white-space: pre-wrap; }
|
||||
<widget class="QLabel" name="ch0Cur">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>160</x>
|
||||
<x>150</x>
|
||||
<y>40</y>
|
||||
<width>31</width>
|
||||
<width>51</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -63,6 +63,8 @@ p, li { white-space: pre-wrap; }
|
||||
<font>
|
||||
<family>FreeSans</family>
|
||||
<pointsize>10</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
@ -139,9 +141,9 @@ p, li { white-space: pre-wrap; }
|
||||
<widget class="QLabel" name="ch7Cur">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>160</x>
|
||||
<x>150</x>
|
||||
<y>180</y>
|
||||
<width>31</width>
|
||||
<width>51</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -149,6 +151,8 @@ p, li { white-space: pre-wrap; }
|
||||
<font>
|
||||
<family>FreeSans</family>
|
||||
<pointsize>10</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
@ -366,9 +370,9 @@ Applies and Saves all settings to SD</string>
|
||||
<widget class="QLabel" name="ch4Cur">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>160</x>
|
||||
<x>150</x>
|
||||
<y>120</y>
|
||||
<width>31</width>
|
||||
<width>51</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -376,6 +380,8 @@ Applies and Saves all settings to SD</string>
|
||||
<font>
|
||||
<family>FreeSans</family>
|
||||
<pointsize>10</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
@ -441,7 +447,7 @@ Be sure to set the Neutral position on all sliders before sending!</string>
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>40</y>
|
||||
<width>131</width>
|
||||
<width>121</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -521,9 +527,9 @@ p, li { white-space: pre-wrap; }
|
||||
<widget class="QLabel" name="ch2Cur">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>160</x>
|
||||
<x>150</x>
|
||||
<y>80</y>
|
||||
<width>31</width>
|
||||
<width>51</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -531,6 +537,8 @@ p, li { white-space: pre-wrap; }
|
||||
<font>
|
||||
<family>FreeSans</family>
|
||||
<pointsize>10</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
@ -547,9 +555,9 @@ p, li { white-space: pre-wrap; }
|
||||
<widget class="QLabel" name="ch5Cur">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>160</x>
|
||||
<x>150</x>
|
||||
<y>140</y>
|
||||
<width>31</width>
|
||||
<width>51</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -557,6 +565,8 @@ p, li { white-space: pre-wrap; }
|
||||
<font>
|
||||
<family>FreeSans</family>
|
||||
<pointsize>10</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
@ -603,9 +613,9 @@ p, li { white-space: pre-wrap; }
|
||||
<widget class="QLabel" name="ch1Cur">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>160</x>
|
||||
<x>150</x>
|
||||
<y>60</y>
|
||||
<width>31</width>
|
||||
<width>51</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -613,6 +623,8 @@ p, li { white-space: pre-wrap; }
|
||||
<font>
|
||||
<family>FreeSans</family>
|
||||
<pointsize>10</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
@ -629,9 +641,9 @@ p, li { white-space: pre-wrap; }
|
||||
<widget class="QLabel" name="ch6Cur">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>160</x>
|
||||
<x>150</x>
|
||||
<y>160</y>
|
||||
<width>31</width>
|
||||
<width>51</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -639,6 +651,8 @@ p, li { white-space: pre-wrap; }
|
||||
<font>
|
||||
<family>FreeSans</family>
|
||||
<pointsize>10</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
@ -655,9 +669,9 @@ p, li { white-space: pre-wrap; }
|
||||
<widget class="QLabel" name="ch3Cur">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>160</x>
|
||||
<x>150</x>
|
||||
<y>100</y>
|
||||
<width>31</width>
|
||||
<width>51</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -665,6 +679,8 @@ p, li { white-space: pre-wrap; }
|
||||
<font>
|
||||
<family>FreeSans</family>
|
||||
<pointsize>10</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
@ -767,7 +783,7 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>60</y>
|
||||
<width>131</width>
|
||||
<width>121</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -783,7 +799,7 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>80</y>
|
||||
<width>131</width>
|
||||
<width>121</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -799,7 +815,7 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>100</y>
|
||||
<width>131</width>
|
||||
<width>121</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -815,7 +831,7 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>120</y>
|
||||
<width>131</width>
|
||||
<width>121</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -831,7 +847,7 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>140</y>
|
||||
<width>131</width>
|
||||
<width>121</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -847,7 +863,7 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>160</y>
|
||||
<width>131</width>
|
||||
<width>121</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -863,7 +879,7 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>180</y>
|
||||
<width>131</width>
|
||||
<width>121</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -967,224 +983,7 @@ p, li { white-space: pre-wrap; }
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; color:#ff0000;">when running calibration!</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="WidgetBar" name="widgetBarCH1" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>60</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>1</width>
|
||||
<height>1</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: rgb(165, 165, 165);</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="WidgetBar" name="widgetBarCH2" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>80</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>1</width>
|
||||
<height>1</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: rgb(165, 165, 165);</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="WidgetBar" name="widgetBarCH3" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>100</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>1</width>
|
||||
<height>1</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: rgb(165, 165, 165);</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="WidgetBar" name="widgetBarCH4" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>120</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>1</width>
|
||||
<height>1</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: rgb(165, 165, 165);</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="WidgetBar" name="widgetBarCH5" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>140</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>1</width>
|
||||
<height>1</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: rgb(165, 165, 165);</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="WidgetBar" name="widgetBarCH6" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>160</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>1</width>
|
||||
<height>1</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: rgb(165, 165, 165);</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="WidgetBar" name="widgetBarCH7" native="true">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>180</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>1</width>
|
||||
<height>1</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: rgb(165, 165, 165);</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="WidgetBar" name="widgetBarCH0" native="true">
|
||||
<widget class="QSlider" name="inSlider0">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
@ -1193,26 +992,195 @@ p, li { white-space: pre-wrap; }
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<property name="mouseTracking">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>1</width>
|
||||
<height>1</height>
|
||||
</size>
|
||||
<property name="minimum">
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>2000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>1500</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSlider" name="inSlider1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>60</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>false</bool>
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
<bool>false</bool>
|
||||
<property name="minimum">
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="styleSheet">
|
||||
<string notr="true">background-color: rgb(165, 165, 165);</string>
|
||||
<property name="maximum">
|
||||
<number>2000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>1500</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSlider" name="inSlider2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>80</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>2000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>1500</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSlider" name="inSlider3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>100</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>2000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>1500</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSlider" name="inSlider4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>120</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>2000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>1500</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSlider" name="inSlider5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>140</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>2000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>1500</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSlider" name="inSlider6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>160</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>2000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>1500</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QSlider" name="inSlider7">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<y>180</y>
|
||||
<width>271</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="mouseTracking">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>2000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>1500</number>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
@ -3034,13 +3002,6 @@ Applies and Saves all settings to SD</string>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>WidgetBar</class>
|
||||
<extends>QWidget</extends>
|
||||
<header location="global">widgetbar.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>ch0Assign</tabstop>
|
||||
<tabstop>ch1Assign</tabstop>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user