Browse Source

Widget update

Johannes Kreutz 2 years ago
parent
commit
1845ea0ac9
3 changed files with 374 additions and 10 deletions
  1. 358 4
      trackpoint-app/gui/EditWidget.ui
  2. 2 2
      trackpoint-app/gui/MainWindow.ui
  3. 14 4
      trackpoint-app/gui/NoMeshWidget.ui

+ 358 - 4
trackpoint-app/gui/EditWidget.ui

@@ -7,13 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>508</width>
-    <height>1164</height>
+    <height>980</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_4">
    <property name="spacing">
     <number>0</number>
    </property>
@@ -29,8 +29,79 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
+   <item>
+    <widget class="QGroupBox" name="toolSelection">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>13</pointsize>
+      </font>
+     </property>
+     <property name="title">
+      <string>SELECT TOOL</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <property name="bottomMargin">
+       <number>12</number>
+      </property>
+      <item>
+       <widget class="QToolButton" name="insertionToolButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Insertion Tool</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QToolButton" name="selectionToolButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Selection Tool</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="spacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>10</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item>
     <widget class="QTabWidget" name="tabWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="currentIndex">
       <number>0</number>
      </property>
@@ -46,12 +117,247 @@
         <number>3</number>
        </property>
        <item>
-        <widget class="QPushButton" name="optiTrackExport">
+        <widget class="QLabel" name="optiTrackCount">
          <property name="text">
-          <string>Export for use with OptiTrack</string>
+          <string>TRACKPOINTS SET: 0</string>
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QGroupBox" name="optiTrackProperties">
+         <property name="font">
+          <font>
+           <pointsize>13</pointsize>
+          </font>
+         </property>
+         <property name="title">
+          <string>PROPERTIES</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <item>
+           <layout class="QGridLayout" name="gridLayout">
+            <item row="0" column="1">
+             <widget class="QDoubleSpinBox" name="optiTrackLength"/>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="optiTrackRadiusLabel">
+              <property name="text">
+               <string>Radius</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QDoubleSpinBox" name="optiTrackRadius"/>
+            </item>
+            <item row="0" column="0">
+             <widget class="QLabel" name="optiTrackLengthLabel">
+              <property name="text">
+               <string>Length</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QPushButton" name="pushButton">
+            <property name="text">
+             <string>Load defaults</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="optiTrackPositions">
+         <property name="font">
+          <font>
+           <pointsize>13</pointsize>
+          </font>
+         </property>
+         <property name="title">
+          <string>POSITIONS</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_2">
+          <item row="4" column="0">
+           <widget class="QLabel" name="optiTrackNormalLabel">
+            <property name="text">
+             <string>Normal vector</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="optiTrackAnchorXLabel">
+            <property name="text">
+             <string>X:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="optiTrackAnchorZLabel">
+            <property name="text">
+             <string>Z:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="optiTrackNormalXLabel">
+            <property name="text">
+             <string>X:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="optiTrackNormalYLabel">
+            <property name="text">
+             <string>Y:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="optiTrackAnchorLabel">
+            <property name="text">
+             <string>Anchor point</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="optiTrackAnchorYLabel">
+            <property name="text">
+             <string>Y:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="optiTrackNormalZLabel">
+            <property name="text">
+             <string>Z:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLabel" name="optiTrackAnchorX">
+            <property name="text">
+             <string>0,00</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="optiTrackAnchorY">
+            <property name="text">
+             <string>0,00</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLabel" name="optiTrackAnchorZ">
+            <property name="text">
+             <string>0,00</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLabel" name="optiTrackNormalX">
+            <property name="text">
+             <string>0,00</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLabel" name="optiTrackNormalY">
+            <property name="text">
+             <string>0,00</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLabel" name="optiTrackNormalZ">
+            <property name="text">
+             <string>0,00</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="optiTrackModifier">
+         <property name="font">
+          <font>
+           <pointsize>13</pointsize>
+          </font>
+         </property>
+         <property name="title">
+          <string>MODIFIER</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_6">
+          <item>
+           <layout class="QGridLayout" name="gridLayout_3">
+            <property name="spacing">
+             <number>-1</number>
+            </property>
+            <item row="0" column="0">
+             <widget class="QLabel" name="optiTrackNormalModLabel">
+              <property name="text">
+               <string>Normal vector</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="optiTrackNormalModLabelY">
+              <property name="text">
+               <string>Y:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QDoubleSpinBox" name="optiTrackNormalModX"/>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="optiTrackNormalModLabelX">
+              <property name="text">
+               <string>X:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="optiTrackNormalModLabelZ">
+              <property name="text">
+               <string>Z:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QDoubleSpinBox" name="optiTrackNormalModY"/>
+            </item>
+            <item row="3" column="1">
+             <widget class="QDoubleSpinBox" name="optiTrackNormalModZ"/>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QPushButton" name="optiTrackModifierReset">
+            <property name="text">
+             <string>Reset</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="emfTrack">
@@ -109,6 +415,54 @@
      </widget>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="export_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <pointsize>13</pointsize>
+      </font>
+     </property>
+     <property name="title">
+      <string>EXPORT</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QCheckBox" name="optiTrackCkeckbox">
+        <property name="text">
+         <string>OptiTrack</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="emfTrackCheckbox">
+        <property name="text">
+         <string>EMF Tracking</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="steamVrCheckbox">
+        <property name="text">
+         <string>Steam VR Tracking</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="exportButton">
+        <property name="text">
+         <string>Export</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

+ 2 - 2
trackpoint-app/gui/MainWindow.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>TrackpointApp</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
@@ -60,7 +60,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>30</height>
+     <height>24</height>
     </rect>
    </property>
   </widget>

+ 14 - 4
trackpoint-app/gui/NoMeshWidget.ui

@@ -40,22 +40,25 @@
       </font>
      </property>
      <property name="text">
-      <string>No Mesh loaded.</string>
+      <string>Nothing loaded.</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
+     <property name="margin">
+      <number>5</number>
+     </property>
     </widget>
    </item>
    <item>
     <widget class="QLabel" name="noMeshExplanation">
      <property name="font">
       <font>
-       <pointsize>10</pointsize>
+       <pointsize>12</pointsize>
       </font>
      </property>
      <property name="text">
-      <string>You can load a .3mf or a .stl file to use the mesh as basis for this trackpoint project.</string>
+      <string>You can load an existing project or start a new one by opening a mesh file (.3mf or .stl).</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -65,7 +68,14 @@
    <item>
     <widget class="QPushButton" name="noMeshButton">
      <property name="text">
-      <string>Load Mesh file</string>
+      <string>Start new project</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="loadProjectButton">
+     <property name="text">
+      <string>Load existing project</string>
      </property>
     </widget>
    </item>