diff --git a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default.qss b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default.qss index 86bef4bbe..75ceca382 100644 --- a/ground/openpilotgcs/share/openpilotgcs/stylesheets/default.qss +++ b/ground/openpilotgcs/share/openpilotgcs/stylesheets/default.qss @@ -7,7 +7,7 @@ MyListWidget { Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255)); } -/* + QSlider::groove:horizontal { border: 1px solid rgb(196, 196, 196); background: white; @@ -15,7 +15,6 @@ QSlider::groove:horizontal { border-radius: 2px; margin 10px 10px; } -*/ QSlider::add-page:horizontal { background: #fff; diff --git a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp index 8985f72c7..af3433766 100644 --- a/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configinputwidget.cpp @@ -96,7 +96,7 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) : Q_ASSERT(index < ManualControlSettings::CHANNELGROUPS_NUMELEM); InputChannelForm *form = new InputChannelForm(index, this); form->setName(name); - + form->moveTo(*(ui->channelLayout)); // The order of the following binding calls is important. Since the values will be populated @@ -1587,9 +1587,9 @@ void ConfigInputWidget::simpleCalibration(bool enable) for (unsigned int i = 0; i < ManualControlCommand::CHANNEL_NUMELEM; i++) { reverse[i] = manualSettingsData.ChannelMax[i] < manualSettingsData.ChannelMin[i]; - manualSettingsData.ChannelMin[i] = manualCommandData.Channel[i]; - manualSettingsData.ChannelNeutral[i] = manualCommandData.Channel[i]; - manualSettingsData.ChannelMax[i] = manualCommandData.Channel[i]; + manualSettingsData.ChannelMin[i] = manualCommandData.Channel[i]; + manualSettingsData.ChannelNeutral[i] = manualCommandData.Channel[i]; + manualSettingsData.ChannelMax[i] = manualCommandData.Channel[i]; } fastMdataSingle(manualCommandObj, &manualControlMdata); @@ -1640,6 +1640,4 @@ bool ConfigInputWidget::shouldObjectBeSaved(UAVObject *object) { // ManualControlCommand no need to be saved return dynamic_cast(object) == 0; - } - diff --git a/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp b/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp index 212cb05b2..8d5ff8c7f 100644 --- a/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp +++ b/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp @@ -58,15 +58,6 @@ void InputChannelForm::minMaxUpdated() void InputChannelForm::neutralUpdated() { int neutralValue = ui->neutralValue->value(); - int min = ui->channelMin->value(); - int max = ui->channelMax->value(); - - int tickSpacing = abs((max-min) / 2); - if (ui->channelName->text() == "FlightMode") { - tickSpacing = abs((max-min) / 5); - } - ui->channelNeutral->setTickPosition(QSlider::TicksBothSides); - ui->channelNeutral->setTickInterval(tickSpacing); if (ui->channelRev->isChecked()) { if (neutralValue > ui->channelMin->value()) {