From 2fa755e2326b624487474de669fe75b551ab5788 Mon Sep 17 00:00:00 2001
From: Janine <ja.klein@fz-juelich.de>
Date: Tue, 5 Apr 2022 09:18:11 +0200
Subject: [PATCH 1/8] added possibility to edit chessboard properties

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 495a280ac..1c27a2f0a 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 495a280ac146cec7c9d5b77d81dfffd3dad458f7
+Subproject commit 1c27a2f0a20d2fd462e4df7826a33cb9b8634686
-- 
GitLab


From 2714f578e206c97267316852650c54c333541ee6 Mon Sep 17 00:00:00 2001
From: Janine <ja.klein@fz-juelich.de>
Date: Tue, 5 Apr 2022 12:57:05 +0200
Subject: [PATCH 2/8] added possibility to edit chessboard properties

---
 include/control.h |   6 +
 src/control.cpp   |  39 +++++++
 ui/control.ui     | 277 +++++++++++++++++++++++++++-------------------
 3 files changed, 211 insertions(+), 111 deletions(-)

diff --git a/include/control.h b/include/control.h
index 14ad1e412..659e3a43f 100644
--- a/include/control.h
+++ b/include/control.h
@@ -591,6 +591,12 @@ private slots:
     void setMoCapSize(int size);
     void toggleRecoROIButtons();
     void toggleTrackROIButtons();
+    void on_boardSizeX_valueChanged(int arg1);
+
+    void on_boardSizeY_valueChanged(int arg1);
+
+    void on_squareSize_valueChanged(double arg1);
+
 signals:
     void userChangedRecoMethod(reco::RecognitionMethod method);
 
diff --git a/src/control.cpp b/src/control.cpp
index 995a0c052..a14f82e2b 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -2504,6 +2504,37 @@ void Control::on_newModelCheckBox_stateChanged(int i)
     }
     intrError->setText(QString("invalid"));
 }
+
+void Control::on_boardSizeX_valueChanged(int x)
+{
+    mMainWindow->getAutoCalib()->setBoardSizeX(x);
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+    intrError->setText(QString("invalid"));
+}
+
+void Control::on_boardSizeY_valueChanged(int y)
+{
+    mMainWindow->getAutoCalib()->setBoardSizeY(y);
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+    intrError->setText(QString("invalid"));
+}
+
+void Control::on_squareSize_valueChanged(double s)
+{
+    mMainWindow->getAutoCalib()->setSquareSize(s);
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+    intrError->setText(QString("invalid"));
+}
+
 void Control::on_autoCalib_clicked()
 {
     mMainWindow->getAutoCalib()->autoCalib();
@@ -4832,3 +4863,11 @@ void Control::toggleTrackROIButtons()
 }
 
 #include "moc_control.cpp"
+
+
+
+
+
+
+
+
diff --git a/ui/control.ui b/ui/control.ui
index 16725d9e5..ab719e098 100644
--- a/ui/control.ui
+++ b/ui/control.ui
@@ -135,9 +135,9 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-187</y>
-            <width>476</width>
-            <height>1328</height>
+            <y>-324</y>
+            <width>465</width>
+            <height>1363</height>
            </rect>
           </property>
           <property name="sizePolicy">
@@ -1134,6 +1134,65 @@
                 </item>
                </layout>
               </item>
+              <item>
+               <layout class="QGridLayout" name="ChessboardPropertiesLayout">
+                <item row="4" column="1">
+                 <widget class="QLabel" name="squareSizeLabel">
+                  <property name="text">
+                   <string>square size:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="0">
+                 <widget class="QLabel" name="chessboardProperties">
+                  <property name="text">
+                   <string>chessboard properties:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="1">
+                 <widget class="QLabel" name="boardSizeXLabel">
+                  <property name="text">
+                   <string>board size: x:</string>
+                  </property>
+                 </widget>
+                </item>
+                <item row="4" column="2">
+                 <widget class="QDoubleSpinBox" name="squareSize">
+                  <property name="singleStep">
+                   <double>0.100000000000000</double>
+                  </property>
+                  <property name="value">
+                   <double>4.600000000000000</double>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="3">
+                 <widget class="QLabel" name="boardSizeYLabel">
+                  <property name="text">
+                   <string>y:</string>
+                  </property>
+                  <property name="alignment">
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="2">
+                 <widget class="QSpinBox" name="boardSizeX">
+                  <property name="value">
+                   <number>6</number>
+                  </property>
+                 </widget>
+                </item>
+                <item row="3" column="4">
+                 <widget class="QSpinBox" name="boardSizeY">
+                  <property name="value">
+                   <number>8</number>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
               <item>
                <layout class="QGridLayout">
                 <property name="leftMargin">
@@ -1151,6 +1210,13 @@
                 <property name="spacing">
                  <number>4</number>
                 </property>
+                <item row="0" column="1">
+                 <widget class="QPushButton" name="calibFiles">
+                  <property name="text">
+                   <string>files</string>
+                  </property>
+                 </widget>
+                </item>
                 <item row="0" column="0">
                  <widget class="QPushButton" name="autoCalib">
                   <property name="enabled">
@@ -1161,13 +1227,6 @@
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="1">
-                 <widget class="QPushButton" name="calibFiles">
-                  <property name="text">
-                   <string>files</string>
-                  </property>
-                 </widget>
-                </item>
                </layout>
               </item>
              </layout>
@@ -1634,30 +1693,11 @@
                     <property name="spacing">
                      <number>4</number>
                     </property>
-                    <item row="0" column="0">
-                     <widget class="QLabel" name="label_54">
-                      <property name="toolTip">
-                       <string>Translate the coordinate system in x-direction.</string>
-                      </property>
-                      <property name="text">
-                       <string>translate [cm] x:</string>
-                      </property>
-                      <property name="alignment">
-                       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="0" column="1">
-                     <widget class="QScrollBar" name="coord3DTransX">
-                      <property name="sizePolicy">
-                       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                       </sizepolicy>
-                      </property>
+                    <item row="0" column="2">
+                     <widget class="QSpinBox" name="coord3DTransX_spin">
                       <property name="minimumSize">
                        <size>
-                        <width>50</width>
+                        <width>0</width>
                         <height>17</height>
                        </size>
                       </property>
@@ -1676,22 +1716,10 @@
                       <property name="maximum">
                        <number>10000</number>
                       </property>
-                      <property name="pageStep">
-                       <number>10</number>
-                      </property>
-                      <property name="value">
-                       <number>0</number>
-                      </property>
-                      <property name="sliderPosition">
-                       <number>0</number>
-                      </property>
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
                      </widget>
                     </item>
-                    <item row="0" column="2">
-                     <widget class="QSpinBox" name="coord3DTransX_spin">
+                    <item row="2" column="2">
+                     <widget class="QSpinBox" name="coord3DTransZ_spin">
                       <property name="minimumSize">
                        <size>
                         <width>0</width>
@@ -1705,7 +1733,7 @@
                        </size>
                       </property>
                       <property name="toolTip">
-                       <string>Translate the coordinate system in x-direction.</string>
+                       <string>2D: Rotate the coordinate system clockwise. 3D: Translate the coordinate system in z-direction.</string>
                       </property>
                       <property name="minimum">
                        <number>-10000</number>
@@ -1715,21 +1743,8 @@
                       </property>
                      </widget>
                     </item>
-                    <item row="1" column="0">
-                     <widget class="QLabel" name="label_55">
-                      <property name="toolTip">
-                       <string>Translate the coordinate system in y-direction.</string>
-                      </property>
-                      <property name="text">
-                       <string>y:</string>
-                      </property>
-                      <property name="alignment">
-                       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                      </property>
-                     </widget>
-                    </item>
-                    <item row="1" column="1">
-                     <widget class="QScrollBar" name="coord3DTransY">
+                    <item row="1" column="2">
+                     <widget class="QSpinBox" name="coord3DTransY_spin">
                       <property name="minimumSize">
                        <size>
                         <width>0</width>
@@ -1751,19 +1766,10 @@
                       <property name="maximum">
                        <number>10000</number>
                       </property>
-                      <property name="value">
-                       <number>0</number>
-                      </property>
-                      <property name="sliderPosition">
-                       <number>0</number>
-                      </property>
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
                      </widget>
                     </item>
-                    <item row="1" column="2">
-                     <widget class="QSpinBox" name="coord3DTransY_spin">
+                    <item row="2" column="1">
+                     <widget class="QScrollBar" name="coord3DTransZ">
                       <property name="minimumSize">
                        <size>
                         <width>0</width>
@@ -1777,7 +1783,7 @@
                        </size>
                       </property>
                       <property name="toolTip">
-                       <string>Translate the coordinate system in y-direction.</string>
+                       <string>2D: Rotate the coordinate system clockwise. 3D: Translate the coordinate system in z-direction.</string>
                       </property>
                       <property name="minimum">
                        <number>-10000</number>
@@ -1785,26 +1791,28 @@
                       <property name="maximum">
                        <number>10000</number>
                       </property>
-                     </widget>
-                    </item>
-                    <item row="2" column="0">
-                     <widget class="QLabel" name="label_57">
-                      <property name="toolTip">
-                       <string>2D: Rotate the coordinate system clockwise. 3D: Translate the coordinate system in z-direction.</string>
+                      <property name="pageStep">
+                       <number>10</number>
                       </property>
-                      <property name="text">
-                       <string>z:</string>
+                      <property name="sliderPosition">
+                       <number>0</number>
                       </property>
-                      <property name="alignment">
-                       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                      <property name="orientation">
+                       <enum>Qt::Horizontal</enum>
                       </property>
                      </widget>
                     </item>
-                    <item row="2" column="1">
-                     <widget class="QScrollBar" name="coord3DTransZ">
+                    <item row="0" column="1">
+                     <widget class="QScrollBar" name="coord3DTransX">
+                      <property name="sizePolicy">
+                       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                        <horstretch>0</horstretch>
+                        <verstretch>0</verstretch>
+                       </sizepolicy>
+                      </property>
                       <property name="minimumSize">
                        <size>
-                        <width>0</width>
+                        <width>50</width>
                         <height>17</height>
                        </size>
                       </property>
@@ -1815,7 +1823,7 @@
                        </size>
                       </property>
                       <property name="toolTip">
-                       <string>2D: Rotate the coordinate system clockwise. 3D: Translate the coordinate system in z-direction.</string>
+                       <string>Translate the coordinate system in x-direction.</string>
                       </property>
                       <property name="minimum">
                        <number>-10000</number>
@@ -1826,6 +1834,9 @@
                       <property name="pageStep">
                        <number>10</number>
                       </property>
+                      <property name="value">
+                       <number>0</number>
+                      </property>
                       <property name="sliderPosition">
                        <number>0</number>
                       </property>
@@ -1834,8 +1845,8 @@
                       </property>
                      </widget>
                     </item>
-                    <item row="2" column="2">
-                     <widget class="QSpinBox" name="coord3DTransZ_spin">
+                    <item row="1" column="1">
+                     <widget class="QScrollBar" name="coord3DTransY">
                       <property name="minimumSize">
                        <size>
                         <width>0</width>
@@ -1849,7 +1860,7 @@
                        </size>
                       </property>
                       <property name="toolTip">
-                       <string>2D: Rotate the coordinate system clockwise. 3D: Translate the coordinate system in z-direction.</string>
+                       <string>Translate the coordinate system in y-direction.</string>
                       </property>
                       <property name="minimum">
                        <number>-10000</number>
@@ -1857,6 +1868,28 @@
                       <property name="maximum">
                        <number>10000</number>
                       </property>
+                      <property name="value">
+                       <number>0</number>
+                      </property>
+                      <property name="sliderPosition">
+                       <number>0</number>
+                      </property>
+                      <property name="orientation">
+                       <enum>Qt::Horizontal</enum>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="2" column="0">
+                     <widget class="QLabel" name="label_57">
+                      <property name="toolTip">
+                       <string>2D: Rotate the coordinate system clockwise. 3D: Translate the coordinate system in z-direction.</string>
+                      </property>
+                      <property name="text">
+                       <string>z:</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                      </property>
                      </widget>
                     </item>
                     <item row="3" column="0">
@@ -1872,8 +1905,34 @@
                       </property>
                      </widget>
                     </item>
-                    <item row="3" column="1">
-                     <widget class="QScrollBar" name="coord3DAxeLen">
+                    <item row="1" column="0">
+                     <widget class="QLabel" name="label_55">
+                      <property name="toolTip">
+                       <string>Translate the coordinate system in y-direction.</string>
+                      </property>
+                      <property name="text">
+                       <string>y:</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="0" column="0">
+                     <widget class="QLabel" name="label_54">
+                      <property name="toolTip">
+                       <string>Translate the coordinate system in x-direction.</string>
+                      </property>
+                      <property name="text">
+                       <string>translate [cm] x:</string>
+                      </property>
+                      <property name="alignment">
+                       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                      </property>
+                     </widget>
+                    </item>
+                    <item row="3" column="2">
+                     <widget class="QSpinBox" name="coord3DAxeLen_spin">
                       <property name="minimumSize">
                        <size>
                         <width>0</width>
@@ -1889,6 +1948,9 @@
                       <property name="toolTip">
                        <string>Scale the coordinate system.</string>
                       </property>
+                      <property name="suffix">
+                       <string> cm</string>
+                      </property>
                       <property name="minimum">
                        <number>1</number>
                       </property>
@@ -1898,16 +1960,10 @@
                       <property name="value">
                        <number>200</number>
                       </property>
-                      <property name="sliderPosition">
-                       <number>200</number>
-                      </property>
-                      <property name="orientation">
-                       <enum>Qt::Horizontal</enum>
-                      </property>
                      </widget>
                     </item>
-                    <item row="3" column="2">
-                     <widget class="QSpinBox" name="coord3DAxeLen_spin">
+                    <item row="3" column="1">
+                     <widget class="QScrollBar" name="coord3DAxeLen">
                       <property name="minimumSize">
                        <size>
                         <width>0</width>
@@ -1923,9 +1979,6 @@
                       <property name="toolTip">
                        <string>Scale the coordinate system.</string>
                       </property>
-                      <property name="suffix">
-                       <string> cm</string>
-                      </property>
                       <property name="minimum">
                        <number>1</number>
                       </property>
@@ -1935,6 +1988,12 @@
                       <property name="value">
                        <number>200</number>
                       </property>
+                      <property name="sliderPosition">
+                       <number>200</number>
+                      </property>
+                      <property name="orientation">
+                       <enum>Qt::Horizontal</enum>
+                      </property>
                      </widget>
                     </item>
                    </layout>
@@ -3441,7 +3500,7 @@
             <x>0</x>
             <y>0</y>
             <width>465</width>
-            <height>991</height>
+            <height>974</height>
            </rect>
           </property>
           <property name="sizePolicy">
@@ -3581,7 +3640,6 @@
                 <widget class="QLabel" name="recoNumberNow">
                  <property name="font">
                   <font>
-                   <weight>75</weight>
                    <bold>true</bold>
                   </font>
                  </property>
@@ -4730,7 +4788,7 @@
             <x>0</x>
             <y>0</y>
             <width>465</width>
-            <height>1203</height>
+            <height>1170</height>
            </rect>
           </property>
           <property name="sizePolicy">
@@ -4923,7 +4981,6 @@
               <widget class="QLabel" name="trackNumberNow">
                <property name="font">
                 <font>
-                 <weight>75</weight>
                  <bold>true</bold>
                 </font>
                </property>
@@ -4964,7 +5021,6 @@
               <widget class="QLabel" name="trackNumberVisible">
                <property name="font">
                 <font>
-                 <weight>75</weight>
                  <bold>true</bold>
                 </font>
                </property>
@@ -4980,7 +5036,6 @@
               <widget class="QLabel" name="trackNumberAll">
                <property name="font">
                 <font>
-                 <weight>75</weight>
                  <bold>true</bold>
                 </font>
                </property>
@@ -7586,7 +7641,7 @@
             <x>0</x>
             <y>0</y>
             <width>479</width>
-            <height>553</height>
+            <height>554</height>
            </rect>
           </property>
           <property name="sizePolicy">
-- 
GitLab


From f07a8e0f5d0bc94a2f11af0e348e89a0fa8f3087 Mon Sep 17 00:00:00 2001
From: Janine <ja.klein@fz-juelich.de>
Date: Tue, 12 Apr 2022 07:08:27 +0200
Subject: [PATCH 3/8] layout has been changed

---
 ui/control.ui | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/control.ui b/ui/control.ui
index ab719e098..285a3113a 100644
--- a/ui/control.ui
+++ b/ui/control.ui
@@ -135,7 +135,7 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-324</y>
+            <y>-367</y>
             <width>465</width>
             <height>1363</height>
            </rect>
@@ -1141,6 +1141,9 @@
                   <property name="text">
                    <string>square size:</string>
                   </property>
+                  <property name="alignment">
+                   <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                  </property>
                  </widget>
                 </item>
                 <item row="3" column="0">
@@ -1155,6 +1158,9 @@
                   <property name="text">
                    <string>board size: x:</string>
                   </property>
+                  <property name="alignment">
+                   <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                  </property>
                  </widget>
                 </item>
                 <item row="4" column="2">
-- 
GitLab


From 9bbb4f970beea4579637c87f06098742e66296d0 Mon Sep 17 00:00:00 2001
From: Janine <ja.klein@fz-juelich.de>
Date: Fri, 22 Apr 2022 10:35:50 +0200
Subject: [PATCH 4/8] update 3rdparty

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 1c27a2f0a..495a280ac 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 1c27a2f0a20d2fd462e4df7826a33cb9b8634686
+Subproject commit 495a280ac146cec7c9d5b77d81dfffd3dad458f7
-- 
GitLab


From b95739973c8c9e899d01a0ef2351c9cd25e5c2da Mon Sep 17 00:00:00 2001
From: Janine <ja.klein@fz-juelich.de>
Date: Fri, 22 Apr 2022 10:58:42 +0200
Subject: [PATCH 5/8] Edited layout

---
 src/control.cpp | 15 ---------------
 ui/control.ui   | 10 ++++++++--
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/control.cpp b/src/control.cpp
index a14f82e2b..9fd1eac86 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -2508,31 +2508,16 @@ void Control::on_newModelCheckBox_stateChanged(int i)
 void Control::on_boardSizeX_valueChanged(int x)
 {
     mMainWindow->getAutoCalib()->setBoardSizeX(x);
-    if(!mMainWindow->isLoading())
-    {
-        mMainWindow->updateImage();
-    }
-    intrError->setText(QString("invalid"));
 }
 
 void Control::on_boardSizeY_valueChanged(int y)
 {
     mMainWindow->getAutoCalib()->setBoardSizeY(y);
-    if(!mMainWindow->isLoading())
-    {
-        mMainWindow->updateImage();
-    }
-    intrError->setText(QString("invalid"));
 }
 
 void Control::on_squareSize_valueChanged(double s)
 {
     mMainWindow->getAutoCalib()->setSquareSize(s);
-    if(!mMainWindow->isLoading())
-    {
-        mMainWindow->updateImage();
-    }
-    intrError->setText(QString("invalid"));
 }
 
 void Control::on_autoCalib_clicked()
diff --git a/ui/control.ui b/ui/control.ui
index 285a3113a..66c73a9bc 100644
--- a/ui/control.ui
+++ b/ui/control.ui
@@ -135,7 +135,7 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-367</y>
+            <y>-520</y>
             <width>465</width>
             <height>1363</height>
            </rect>
@@ -1139,7 +1139,7 @@
                 <item row="4" column="1">
                  <widget class="QLabel" name="squareSizeLabel">
                   <property name="text">
-                   <string>square size:</string>
+                   <string>square size [cm]:</string>
                   </property>
                   <property name="alignment">
                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@@ -1185,6 +1185,9 @@
                 </item>
                 <item row="3" column="2">
                  <widget class="QSpinBox" name="boardSizeX">
+                  <property name="toolTip">
+                   <string>Number of squares in a row</string>
+                  </property>
                   <property name="value">
                    <number>6</number>
                   </property>
@@ -1192,6 +1195,9 @@
                 </item>
                 <item row="3" column="4">
                  <widget class="QSpinBox" name="boardSizeY">
+                  <property name="toolTip">
+                   <string>Number of squares in a column</string>
+                  </property>
                   <property name="value">
                    <number>8</number>
                   </property>
-- 
GitLab


From ada22a482e426d6d2444bbea604e2ee9c378b943 Mon Sep 17 00:00:00 2001
From: Janine <ja.klein@fz-juelich.de>
Date: Fri, 22 Apr 2022 14:44:48 +0200
Subject: [PATCH 6/8] little change in control.cpp

---
 src/control.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/control.cpp b/src/control.cpp
index 9fd1eac86..377c87a8c 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -4848,11 +4848,3 @@ void Control::toggleTrackROIButtons()
 }
 
 #include "moc_control.cpp"
-
-
-
-
-
-
-
-
-- 
GitLab


From c81fdfc9079a63b7e680d7743a35330304f51b83 Mon Sep 17 00:00:00 2001
From: Janine <ja.klein@fz-juelich.de>
Date: Fri, 29 Apr 2022 10:58:11 +0200
Subject: [PATCH 7/8] Fix change values when loading the pet file

---
 src/control.cpp | 8 +++-----
 ui/control.ui   | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/control.cpp b/src/control.cpp
index 377c87a8c..2834cc421 100644
--- a/src/control.cpp
+++ b/src/control.cpp
@@ -3486,17 +3486,15 @@ void Control::getXml(QDomElement &elem)
                 {
                     if(subSubElem.hasAttribute("BOARD_SIZE_X"))
                     {
-                        mMainWindow->getAutoCalib()->setBoardSizeX(subSubElem.attribute("BOARD_SIZE_X").toInt()); // 6
+                        boardSizeX->setValue(subSubElem.attribute("BOARD_SIZE_X").toInt());
                     }
                     if(subSubElem.hasAttribute("BOARD_SIZE_Y"))
                     {
-                        mMainWindow->getAutoCalib()->setBoardSizeY(
-                            subSubElem.attribute("BOARD_SIZE_Y").toInt()); // 8 oder 9
+                        boardSizeY->setValue(subSubElem.attribute("BOARD_SIZE_Y").toInt());
                     }
                     if(subSubElem.hasAttribute("SQUARE_SIZE"))
                     {
-                        mMainWindow->getAutoCalib()->setSquareSize(
-                            subSubElem.attribute("SQUARE_SIZE").toDouble()); // in cm
+                        squareSize->setValue(subSubElem.attribute("SQUARE_SIZE").toDouble());
                     }
                 }
                 else if(subSubElem.tagName() == "INTRINSIC_PARAMETERS")
diff --git a/ui/control.ui b/ui/control.ui
index 66c73a9bc..5f81096f6 100644
--- a/ui/control.ui
+++ b/ui/control.ui
@@ -135,7 +135,7 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-520</y>
+            <y>-341</y>
             <width>465</width>
             <height>1363</height>
            </rect>
@@ -1142,7 +1142,7 @@
                    <string>square size [cm]:</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                   </property>
                  </widget>
                 </item>
@@ -1159,7 +1159,7 @@
                    <string>board size: x:</string>
                   </property>
                   <property name="alignment">
-                   <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                   <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
                   </property>
                  </widget>
                 </item>
-- 
GitLab


From b852756acb24c317bee15d66d1e9d3d420f40098 Mon Sep 17 00:00:00 2001
From: Janine <ja.klein@fz-juelich.de>
Date: Tue, 3 May 2022 09:39:44 +0200
Subject: [PATCH 8/8] changed tab order for intrinsic calibration

---
 ui/control.ui | 149 +++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 118 insertions(+), 31 deletions(-)

diff --git a/ui/control.ui b/ui/control.ui
index 5f81096f6..02ca61b6e 100644
--- a/ui/control.ui
+++ b/ui/control.ui
@@ -135,7 +135,7 @@
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>-341</y>
+            <y>-411</y>
             <width>465</width>
             <height>1363</height>
            </rect>
@@ -7838,48 +7838,48 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>fx</tabstop>
-  <tabstop>fy</tabstop>
-  <tabstop>cx</tabstop>
-  <tabstop>cy</tabstop>
-  <tabstop>r2</tabstop>
-  <tabstop>r4</tabstop>
-  <tabstop>tx</tabstop>
-  <tabstop>ty</tabstop>
-  <tabstop>gridTransY_spin</tabstop>
-  <tabstop>gridScale_spin</tabstop>
-  <tabstop>gridTransX_spin</tabstop>
-  <tabstop>gridRot_spin</tabstop>
-  <tabstop>coordTransY_spin</tabstop>
-  <tabstop>coordScale_spin</tabstop>
-  <tabstop>coordTransX_spin</tabstop>
-  <tabstop>coordRotate_spin</tabstop>
-  <tabstop>coordAltitude</tabstop>
-  <tabstop>coordUnit</tabstop>
-  <tabstop>coordUseIntrinsic</tabstop>
   <tabstop>filterBrightContrast</tabstop>
   <tabstop>filterBorder</tabstop>
   <tabstop>filterBorderParamCol</tabstop>
+  <tabstop>filterBgShow</tabstop>
+  <tabstop>filterBgUpdate</tabstop>
   <tabstop>filterBg</tabstop>
   <tabstop>filterBgReset</tabstop>
   <tabstop>filterBgLoad</tabstop>
   <tabstop>filterBgSave</tabstop>
+  <tabstop>filterBgDeleteTrj</tabstop>
+  <tabstop>filterBgDeleteNumber</tabstop>
   <tabstop>filterSwap</tabstop>
   <tabstop>filterSwapH</tabstop>
   <tabstop>filterSwapV</tabstop>
-  <tabstop>autoCalib</tabstop>
-  <tabstop>calibFiles</tabstop>
-  <tabstop>fixCenter</tabstop>
+  <tabstop>apply</tabstop>
+  <tabstop>fx</tabstop>
+  <tabstop>fy</tabstop>
+  <tabstop>cx</tabstop>
+  <tabstop>cy</tabstop>
+  <tabstop>r2</tabstop>
+  <tabstop>r4</tabstop>
+  <tabstop>r6</tabstop>
+  <tabstop>tx</tabstop>
+  <tabstop>ty</tabstop>
+  <tabstop>k4</tabstop>
+  <tabstop>k5</tabstop>
+  <tabstop>k6</tabstop>
+  <tabstop>s1</tabstop>
+  <tabstop>s2</tabstop>
+  <tabstop>s3</tabstop>
+  <tabstop>s4</tabstop>
+  <tabstop>taux</tabstop>
+  <tabstop>tauy</tabstop>
   <tabstop>quadAspectRatio</tabstop>
+  <tabstop>fixCenter</tabstop>
   <tabstop>tangDist</tabstop>
-  <tabstop>markerIgnoreWithout</tabstop>
-  <tabstop>roiShow</tabstop>
-  <tabstop>roiFix</tabstop>
-  <tabstop>recoShowColor</tabstop>
-  <tabstop>recoOptimizeColor</tabstop>
-  <tabstop>recoColorModel</tabstop>
-  <tabstop>recoAutoWB</tabstop>
-  <tabstop>recoColorX</tabstop>
+  <tabstop>newModelCheckBox</tabstop>
+  <tabstop>boardSizeX</tabstop>
+  <tabstop>boardSizeY</tabstop>
+  <tabstop>squareSize</tabstop>
+  <tabstop>autoCalib</tabstop>
+  <tabstop>calibFiles</tabstop>
   <tabstop>recoColorY</tabstop>
   <tabstop>mapNr</tabstop>
   <tabstop>mapColor</tabstop>
@@ -7946,6 +7946,93 @@
   <tabstop>anaConsiderY</tabstop>
   <tabstop>anaConsiderAbs</tabstop>
   <tabstop>anaConsiderRev</tabstop>
+  <tabstop>tabs</tabstop>
+  <tabstop>scrollArea</tabstop>
+  <tabstop>coordUseIntrinsic</tabstop>
+  <tabstop>coordRotate_spin</tabstop>
+  <tabstop>gridScale_spin</tabstop>
+  <tabstop>gridTransX_spin</tabstop>
+  <tabstop>coordTransX_spin</tabstop>
+  <tabstop>recoColorX</tabstop>
+  <tabstop>coordScale_spin</tabstop>
+  <tabstop>recoAutoWB</tabstop>
+  <tabstop>gridRot_spin</tabstop>
+  <tabstop>coordTransY_spin</tabstop>
+  <tabstop>gridTransY_spin</tabstop>
+  <tabstop>coordAltitude</tabstop>
+  <tabstop>coordUnit</tabstop>
+  <tabstop>markerIgnoreWithout</tabstop>
+  <tabstop>roiShow</tabstop>
+  <tabstop>roiFix</tabstop>
+  <tabstop>recoColorModel</tabstop>
+  <tabstop>recoShowColor</tabstop>
+  <tabstop>recoOptimizeColor</tabstop>
+  <tabstop>trans1</tabstop>
+  <tabstop>rot1</tabstop>
+  <tabstop>trans2</tabstop>
+  <tabstop>trans3</tabstop>
+  <tabstop>rot3</tabstop>
+  <tabstop>rot2</tabstop>
+  <tabstop>coordLoad3DCalibPoints</tabstop>
+  <tabstop>extrCalibFetch</tabstop>
+  <tabstop>extrCalibSave</tabstop>
+  <tabstop>extrCalibShowPoints</tabstop>
+  <tabstop>extrCalibShowError</tabstop>
+  <tabstop>coordShow</tabstop>
+  <tabstop>coordFix</tabstop>
+  <tabstop>coordTab</tabstop>
+  <tabstop>coord3DTransX_spin</tabstop>
+  <tabstop>coord3DTransZ_spin</tabstop>
+  <tabstop>coord3DTransY_spin</tabstop>
+  <tabstop>coord3DAxeLen_spin</tabstop>
+  <tabstop>coord3DSwapX</tabstop>
+  <tabstop>coord3DSwapY</tabstop>
+  <tabstop>coord3DSwapZ</tabstop>
+  <tabstop>extCalibPointsShow</tabstop>
+  <tabstop>extVanishPointsShow</tabstop>
+  <tabstop>gridShow</tabstop>
+  <tabstop>gridFix</tabstop>
+  <tabstop>gridTab</tabstop>
+  <tabstop>grid3DTransX_spin</tabstop>
+  <tabstop>grid3DTransY_spin</tabstop>
+  <tabstop>grid3DTransZ_spin</tabstop>
+  <tabstop>grid3DResolution_spin</tabstop>
+  <tabstop>scrollArea_2</tabstop>
+  <tabstop>recoRoiToFullImageSize</tabstop>
+  <tabstop>recoRoiAdjustAutomatically</tabstop>
+  <tabstop>mapColorRange</tabstop>
+  <tabstop>colorPickerButton</tabstop>
+  <tabstop>mapReadHeights</tabstop>
+  <tabstop>mapReadMarkerID</tabstop>
+  <tabstop>scrollArea_3</tabstop>
+  <tabstop>trackRoiShow</tabstop>
+  <tabstop>trackRoiFix</tabstop>
+  <tabstop>trackRoiToFullImageSize</tabstop>
+  <tabstop>trackRoiAdjustAutomatically</tabstop>
+  <tabstop>exportViewDir</tabstop>
+  <tabstop>exportAngleOfView</tabstop>
+  <tabstop>exportUseM</tabstop>
+  <tabstop>exportComment</tabstop>
+  <tabstop>exportMarkerID</tabstop>
+  <tabstop>trackShowSearchSize</tabstop>
+  <tabstop>adaptiveLevel</tabstop>
+  <tabstop>trackShowOnlyNr</tabstop>
+  <tabstop>trackGotoStartNr</tabstop>
+  <tabstop>trackGotoEndNr</tabstop>
+  <tabstop>trackShowOnlyList</tabstop>
+  <tabstop>trackShowOnlyNrList</tabstop>
+  <tabstop>trackShowOnlyListButton</tabstop>
+  <tabstop>trackPathColorButton</tabstop>
+  <tabstop>trackShowGroundPosition</tabstop>
+  <tabstop>trackGroundPositionSize</tabstop>
+  <tabstop>trackShowGroundPath</tabstop>
+  <tabstop>trackGroundPathSize</tabstop>
+  <tabstop>trackGroundPathColorButton</tabstop>
+  <tabstop>showMoCap</tabstop>
+  <tabstop>moCapSize</tabstop>
+  <tabstop>moCapColorButton</tabstop>
+  <tabstop>scrollArea_4</tabstop>
+  <tabstop>showVoronoiCells</tabstop>
  </tabstops>
  <resources/>
  <connections>
-- 
GitLab