From 2634067727046d48b9c01396fe8b95a138126b53 Mon Sep 17 00:00:00 2001
From: cranphin <cranphin>
Date: Thu, 9 Sep 2010 19:56:16 +0000
Subject: [PATCH] This should scale a bit better again, hopefully :) more
 coming!

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1571 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 .../plugins/gpsdisplay/gpsdisplaywidget.cpp   |   6 +-
 .../plugins/gpsdisplay/gpsdisplaywidget.ui    | 346 ++++++++++++++++--
 2 files changed, 321 insertions(+), 31 deletions(-)

diff --git a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp
index d13ccfde7..d7b4f6c9b 100644
--- a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp
+++ b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp
@@ -62,12 +62,8 @@ GpsDisplayWidget::~GpsDisplayWidget()
 void GpsDisplayWidget::setSpeedHeading(double speed, double heading)
 {
     QString str;
-    str.sprintf("%.02f m/s",speed);
-    speed_value->setText(str);
-    speed_value->adjustSize();
+    speed_value->setText(str.sprintf("%.02f m/s",speed));
     bear_value->setText(str.sprintf("%.02f deg",heading));
-    bear_value->adjustSize();
-
 }
 
 void GpsDisplayWidget::setDateTime(double date, double time)
diff --git a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.ui b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.ui
index 568c78fc0..c519bcbd0 100644
--- a/ground/src/plugins/gpsdisplay/gpsdisplaywidget.ui
+++ b/ground/src/plugins/gpsdisplay/gpsdisplaywidget.ui
@@ -27,9 +27,15 @@
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout1">
          <item>
-          <layout class="QVBoxLayout" name="infoVerticalLayout" stretch="0,0,0,0,0,0,0,1">
+          <layout class="QVBoxLayout" name="infoVerticalLayout" stretch="0,0,0,0,0,0,0,0,0,0,0,0,0,1">
+           <property name="spacing">
+            <number>0</number>
+           </property>
            <item>
-            <layout class="QHBoxLayout" name="infoHorizontalLayout1" stretch="0,1,1,1">
+            <layout class="QHBoxLayout" name="infoHorizontalLayout1" stretch="0,0,1,0,1,0,1">
+             <property name="spacing">
+              <number>0</number>
+             </property>
              <item>
               <widget class="QLabel" name="lat_label">
                <property name="text">
@@ -37,6 +43,22 @@
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_4">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="coord_value">
                <property name="text">
@@ -44,6 +66,22 @@
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_5">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="coord_value_2">
                <property name="text">
@@ -51,6 +89,22 @@
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_6">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="coord_value_3">
                <property name="text">
@@ -61,7 +115,26 @@
             </layout>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="infoHorizontalLayout2" stretch="0,1,0,1">
+            <spacer name="verticalSpacer_3">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Preferred</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>6</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="infoHorizontalLayout2" stretch="0,0,1,0,0,0,1">
+             <property name="spacing">
+              <number>0</number>
+             </property>
              <item>
               <widget class="QLabel" name="speed_label">
                <property name="text">
@@ -69,13 +142,48 @@
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_7">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="speed_value">
                <property name="text">
                 <string>Unknown</string>
                </property>
+               <property name="scaledContents">
+                <bool>true</bool>
+               </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_9">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="bear_label">
                <property name="text">
@@ -83,6 +191,22 @@
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_8">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="bear_value">
                <property name="text">
@@ -92,6 +216,22 @@
              </item>
             </layout>
            </item>
+           <item>
+            <spacer name="verticalSpacer_5">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Preferred</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>4</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
            <item>
             <widget class="Line" name="line1">
              <property name="orientation">
@@ -100,7 +240,23 @@
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="infoHorizontalLayout3" stretch="0,1">
+            <spacer name="verticalSpacer_6">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Preferred</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>4</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="infoHorizontalLayout3" stretch="0,0,1">
              <item>
               <widget class="QLabel" name="label">
                <property name="text">
@@ -108,6 +264,22 @@
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_13">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="dop_value">
                <property name="text">
@@ -117,6 +289,22 @@
              </item>
             </layout>
            </item>
+           <item>
+            <spacer name="verticalSpacer_8">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Preferred</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>4</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
            <item>
             <widget class="Line" name="line2">
              <property name="orientation">
@@ -125,7 +313,26 @@
             </widget>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="infoHorizontalLayout4" stretch="0,1">
+            <spacer name="verticalSpacer_7">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Preferred</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>4</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="infoHorizontalLayout4" stretch="0,0,1">
+             <property name="spacing">
+              <number>0</number>
+             </property>
              <item>
               <widget class="QLabel" name="status_label">
                <property name="text">
@@ -133,6 +340,22 @@
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_10">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="status_value">
                <property name="text">
@@ -143,7 +366,26 @@
             </layout>
            </item>
            <item>
-            <layout class="QHBoxLayout" name="infoHorizontalLayout5" stretch="0,1,0">
+            <spacer name="verticalSpacer_4">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Preferred</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>6</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item>
+            <layout class="QHBoxLayout" name="infoHorizontalLayout5" stretch="0,0,1,0,0">
+             <property name="spacing">
+              <number>0</number>
+             </property>
              <item>
               <widget class="QLabel" name="fix_label">
                <property name="text">
@@ -151,6 +393,22 @@
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_11">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="fix_value">
                <property name="text">
@@ -158,6 +416,22 @@
                </property>
               </widget>
              </item>
+             <item>
+              <spacer name="horizontalSpacer_12">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Minimum</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>6</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
              <item>
               <widget class="QLabel" name="time_value">
                <property name="text">
@@ -189,18 +463,6 @@
           <layout class="QVBoxLayout" name="verticalLayout_5" stretch="0,1">
            <item>
             <widget class="GpsConstellationWidget" name="gpsSky">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>64</width>
-               <height>64</height>
-              </size>
-             </property>
              <property name="maximumSize">
               <size>
                <width>250</width>
@@ -236,7 +498,26 @@
         </layout>
        </item>
        <item>
-        <layout class="QHBoxLayout" name="horizontalLayout2" stretch="0,1,0,0">
+        <layout class="QHBoxLayout" name="horizontalLayout2" stretch="0,0,1,0,0,0">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Preferred</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>6</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
          <item>
           <widget class="QFrame" name="frame">
            <property name="sizePolicy">
@@ -258,10 +539,7 @@
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout">
-            <property name="topMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
+            <property name="margin">
              <number>0</number>
             </property>
             <item>
@@ -282,16 +560,16 @@
           </widget>
          </item>
          <item>
-          <spacer name="horizontalSpacer">
+          <spacer name="horizontalSpacer_2">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
-            <enum>QSizePolicy::Ignored</enum>
+            <enum>QSizePolicy::Preferred</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>40</width>
+             <width>6</width>
              <height>20</height>
             </size>
            </property>
@@ -328,6 +606,22 @@
            </property>
           </widget>
          </item>
+         <item>
+          <spacer name="horizontalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>6</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
          <item>
           <widget class="QGraphicsView" name="graphicsView">
            <property name="sizePolicy">