diff options
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/mapping-window.cpp | 13 | ||||
| -rw-r--r-- | gui/mapping-window.ui | 114 |
2 files changed, 122 insertions, 5 deletions
diff --git a/gui/mapping-window.cpp b/gui/mapping-window.cpp index 7e5ad6e3..05ccddda 100644 --- a/gui/mapping-window.cpp +++ b/gui/mapping-window.cpp @@ -55,12 +55,15 @@ void MapWidget::load() { nullptr, Yaw, nullptr, false } }; + using a = axis_opts::max_clamp; + for (QComboBox* x : { ui.max_yaw_rotation, ui.max_pitch_rotation, ui.max_roll_rotation }) - { - using a = axis_opts::max_rotation; - for (a y : { a::r180, a::r90, a::r60, a::r45, a::r30, a::r20 }) + for (a y : { a::r180, a::r90, a::r60, a::r45, a::r30, a::r25, a::r20, a::r15, a::r10 }) x->addItem(QString::number(y) + "°", y); - } + + for (QComboBox* x : { ui.max_x_translation, ui.max_y_translation, ui.max_z_translation }) + for (a y : { a::t30, a::t20, a::t15, a::t10 }) + x->addItem(QStringLiteral("%1 mm").arg(int(y)), y); for (int i = 0; qfcs[i].qfc; i++) { @@ -76,7 +79,7 @@ void MapWidget::load() static_cast<void(base_value::*)(bool) const>(&base_value::valueChanged), this, [&](bool f) -> void {qfc.setEnabled(f); qfc.force_redraw();}); - qfc.setEnabled(qfcs[i].checkbox->isChecked()); + qfc.setEnabled(axis.opts.altp); qfc.force_redraw(); } diff --git a/gui/mapping-window.ui b/gui/mapping-window.ui index dc43ab8a..befa0194 100644 --- a/gui/mapping-window.ui +++ b/gui/mapping-window.ui @@ -315,6 +315,44 @@ </attribute> <layout class="QVBoxLayout" name="verticalLayout_5"> <item> + <widget class="QFrame" name="frame444"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout444"> + <item> + <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Max translation</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="max_x_translation"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="spline_widget" name="txconfig" native="true"> <property name="colorBezier" stdset="0"> <color> @@ -365,6 +403,44 @@ </attribute> <layout class="QVBoxLayout" name="verticalLayout_6"> <item> + <widget class="QFrame" name="frame555"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout555"> + <item> + <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Max translation</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="max_y_translation"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="spline_widget" name="tyconfig" native="true"> <property name="colorBezier" stdset="0"> <color> @@ -415,6 +491,44 @@ </attribute> <layout class="QVBoxLayout" name="verticalLayout_7"> <item> + <widget class="QFrame" name="frame666"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout666"> + <item> + <widget class="QLabel" name="label"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>Max translation</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="max_z_translation"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="spline_widget" name="tzconfig" native="true"> <property name="colorBezier" stdset="0"> <color> |