Tooldrawer minor changes

Denvi · Sep 30, 2015 · eac6fb0 · eac6fb0
1 parent eaaa67a
commit eac6fb0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/frmsettings.ui b/frmsettings.ui
@@ -84,7 +84,7 @@ QGroupBox {
          <rect>
           <x>0</x>
           <y>-522</y>
-          <width>336</width>
+          <width>306</width>
           <height>963</height>
          </rect>
         </property>
@@ -1087,7 +1087,7 @@ padding-top: 3;</string>
                <bool>true</bool>
               </property>
               <property name="currentText">
-               <string>-1</string>
+               <string>8</string>
               </property>
               <property name="maxCount">
                <number>10</number>
@@ -1130,10 +1130,16 @@ padding-top: 3;</string>
              </widget>
             </item>
             <item>
-             <spacer name="horizontalSpacer_14">
+             <spacer name="horizontalSpacer_2">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
              </spacer>
             </item>
             <item>
@@ -1151,6 +1157,12 @@ padding-top: 3;</string>
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
              </spacer>
             </item>
            </layout>

diff --git a/readme.md b/readme.md
@@ -17,7 +17,7 @@ Downloads:
 In development:
 --------------
 * OpenGL ES 2.0 based visualizer: done.
-* Test build for embedded systems: Raspberry Pi to slow, waiting for Raspberry Pi 2 arrival.
+* ~~Test build for embedded systems: Raspberry Pi to slow, waiting for Raspberry Pi 2 arrival.~~ (postponed for a winter vacation)
 
 Version 0.5 release:
 --------------------

diff --git a/tooldrawer.cpp b/tooldrawer.cpp
@@ -47,6 +47,12 @@ bool ToolDrawer::updateData()
         m_lines.append(vertex);
         vertex.position = QVector3D(x, y, m_toolPosition.z() + m_toolLength);
         m_lines.append(vertex);
+
+        // Zero Z lines
+        vertex.position = QVector3D(m_toolPosition.x(), m_toolPosition.y(), 0);
+        m_lines.append(vertex);
+        vertex.position = QVector3D(x, y, 0);
+        m_lines.append(vertex);
     }
 
     // Draw circles
@@ -58,9 +64,11 @@ bool ToolDrawer::updateData()
     m_lines += createCircle(QVector3D(m_toolPosition.x(), m_toolPosition.y(), m_toolPosition.z() + m_toolLength),
                             m_toolDiameter / 2, 20, vertex.color);
 
-    // Zero Z point
-    vertex.position = QVector3D(m_toolPosition.x(), m_toolPosition.y(), 0);
-    m_points.append(vertex);
+    // Zero Z circle
+    if (m_endLength == 0) {
+        m_lines += createCircle(QVector3D(m_toolPosition.x(), m_toolPosition.y(), 0),
+                                m_toolDiameter / 2, 20, vertex.color);
+    }
 
     return true;
 }