Skip to content

Commit

Permalink
enh: show Axes in fitting tab only in developer mode (close #21)
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulmueller
paulmueller committed Jan 7, 2022
1 parent b31967b commit 9940d84
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 91 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
0.13.1
- feat: allow to specify the geometrical correction factor for
non-single-contact experiments (#16)
- enh: add expert mode which is just a parital developer mode (#22)
- fix: export fitting method and method kwargs with initial
parameters
- enh: add expert mode which is just a parital developer mode (#22)
- enh: add links to docs in two places (#19)
- enh: show "Axes" in fitting tab only in developer mode (#21)
- setup: bump nanite from 3.4.0 to 3.5.0 (#16)
0.12.1
- build: fixed testing pipeline
Expand Down
4 changes: 4 additions & 0 deletions pyjibe/fd/tab_fit.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ def __init__(self, *args, **kwargs):
# i.e. `self.cb_delta_select.currentIndex == 1`)
self.cb_right_individ.setVisible(False)

# Show axes selection only in developer mode
for wid in [self.label_axes, self.widget_axes]:
wid.setVisible(dev_mode)

# signals
self.cb_segment.currentIndexChanged.connect(self.on_params_init)
self.cb_xaxis.currentIndexChanged.connect(self.on_params_init)
Expand Down
188 changes: 98 additions & 90 deletions pyjibe/fd/tab_fit.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<x>0</x>
<y>0</y>
<width>573</width>
<height>724</height>
<height>722</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -148,56 +148,6 @@
</property>
</widget>
</item>
<item row="1" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>5</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
<item>
<widget class="QLabel" name="label_14">
<property name="text">
<string>X</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cb_xaxis">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string> Y</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cb_yaxis">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
Expand All @@ -211,6 +161,64 @@
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QWidget" name="widget_axes" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<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>
<item>
<widget class="QLabel" name="label_14">
<property name="text">
<string>X</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cb_xaxis">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string> Y</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cb_yaxis">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="6" column="2">
<layout class="QGridLayout" name="gridLayout_2">
<property name="sizeConstraint">
Expand Down Expand Up @@ -297,7 +305,7 @@
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel" name="label_axes">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand All @@ -309,6 +317,31 @@
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QDoubleSpinBox" name="sp_gcfk">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>0.001000000000000</double>
</property>
<property name="maximum">
<double>5.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QComboBox" name="cb_segment">
<property name="enabled">
Expand Down Expand Up @@ -357,26 +390,6 @@
</item>
</widget>
</item>
<item row="4" column="2">
<widget class="QComboBox" name="cb_range_type">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>absolute</string>
</property>
</item>
<item>
<property name="text">
<string>relative to contact point fit (4pass)</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_10">
<property name="toolTip">
Expand All @@ -390,29 +403,24 @@
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QDoubleSpinBox" name="sp_gcfk">
<item row="4" column="2">
<widget class="QComboBox" name="cb_range_type">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>0.001000000000000</double>
</property>
<property name="maximum">
<double>5.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
<item>
<property name="text">
<string>absolute</string>
</property>
</item>
<item>
<property name="text">
<string>relative to contact point fit (4pass)</string>
</property>
</item>
</widget>
</item>
</layout>
Expand Down

0 comments on commit 9940d84

Please sign in to comment.