From ca16298793dbef11c6fbf0f38f5ac6f603ebb7d1 Mon Sep 17 00:00:00 2001
From: andrew <andrew>
Date: Thu, 11 Nov 2010 07:34:27 +0000
Subject: [PATCH] OP-138 Minor changes to UI layouts to scale better.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2104 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/plugins/config/ccpm.ui             | 78 +++++++++++++------
 .../src/plugins/config/configccpmwidget.cpp   | 27 +++++++
 ground/src/plugins/config/configccpmwidget.h  |  3 +
 3 files changed, 84 insertions(+), 24 deletions(-)

diff --git a/ground/src/plugins/config/ccpm.ui b/ground/src/plugins/config/ccpm.ui
index ec28c83ed..9d6fdc1ca 100644
--- a/ground/src/plugins/config/ccpm.ui
+++ b/ground/src/plugins/config/ccpm.ui
@@ -75,7 +75,7 @@
         </size>
        </property>
        <property name="currentIndex">
-        <number>1</number>
+        <number>0</number>
        </property>
        <widget class="QWidget" name="BasicTab">
         <attribute name="title">
@@ -95,7 +95,7 @@
              <item>
               <widget class="QGroupBox" name="SwashplateBox_2">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -213,7 +213,7 @@
              <item>
               <widget class="QGroupBox" name="SwashplateBox">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -504,7 +504,7 @@
              <item>
               <widget class="QGroupBox" name="SwashplateBox_3">
                <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
                  <horstretch>0</horstretch>
                  <verstretch>0</verstretch>
                 </sizepolicy>
@@ -1519,11 +1519,11 @@
            <item>
             <layout class="QHBoxLayout" name="horizontalLayout_7">
              <item>
-              <layout class="QVBoxLayout" name="verticalLayout_11">
+              <layout class="QVBoxLayout" name="verticalLayout_11" stretch="3,1">
                <item>
                 <widget class="QTableWidget" name="CurveSettings">
                  <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+                  <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
@@ -1531,7 +1531,7 @@
                  <property name="minimumSize">
                   <size>
                    <width>142</width>
-                   <height>173</height>
+                   <height>148</height>
                   </size>
                  </property>
                  <property name="maximumSize">
@@ -1552,7 +1552,7 @@
                   <enum>Qt::ScrollBarAsNeeded</enum>
                  </property>
                  <property name="autoScroll">
-                  <bool>false</bool>
+                  <bool>true</bool>
                  </property>
                  <property name="alternatingRowColors">
                   <bool>true</bool>
@@ -1813,12 +1813,12 @@
                 </widget>
                </item>
                <item>
-                <spacer name="verticalSpacer_5">
+                <spacer name="verticalSpacer_3">
                  <property name="orientation">
                   <enum>Qt::Vertical</enum>
                  </property>
                  <property name="sizeType">
-                  <enum>QSizePolicy::Minimum</enum>
+                  <enum>QSizePolicy::Preferred</enum>
                  </property>
                  <property name="sizeHint" stdset="0">
                   <size>
@@ -1838,8 +1838,8 @@
                   <widget class="QGroupBox" name="ThrottleCurveBox">
                    <property name="sizePolicy">
                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
+                     <horstretch>1</horstretch>
+                     <verstretch>1</verstretch>
                     </sizepolicy>
                    </property>
                    <property name="minimumSize">
@@ -1848,6 +1848,18 @@
                      <height>0</height>
                     </size>
                    </property>
+                   <property name="sizeIncrement">
+                    <size>
+                     <width>10</width>
+                     <height>10</height>
+                    </size>
+                   </property>
+                   <property name="baseSize">
+                    <size>
+                     <width>100</width>
+                     <height>100</height>
+                    </size>
+                   </property>
                    <property name="layoutDirection">
                     <enum>Qt::LeftToRight</enum>
                    </property>
@@ -1877,8 +1889,8 @@
                       </property>
                       <property name="minimumSize">
                        <size>
-                        <width>100</width>
-                        <height>100</height>
+                        <width>50</width>
+                        <height>50</height>
                        </size>
                       </property>
                       <property name="maximumSize">
@@ -1908,10 +1920,22 @@
                   <widget class="QGroupBox" name="PitchCurveBox">
                    <property name="sizePolicy">
                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
+                     <horstretch>1</horstretch>
+                     <verstretch>1</verstretch>
                     </sizepolicy>
                    </property>
+                   <property name="sizeIncrement">
+                    <size>
+                     <width>10</width>
+                     <height>10</height>
+                    </size>
+                   </property>
+                   <property name="baseSize">
+                    <size>
+                     <width>100</width>
+                     <height>100</height>
+                    </size>
+                   </property>
                    <property name="title">
                     <string>Pitch Curve</string>
                    </property>
@@ -1932,8 +1956,8 @@
                       </property>
                       <property name="minimumSize">
                        <size>
-                        <width>100</width>
-                        <height>100</height>
+                        <width>50</width>
+                        <height>50</height>
                        </size>
                       </property>
                       <property name="maximumSize">
@@ -1967,7 +1991,7 @@
                   <enum>Qt::Vertical</enum>
                  </property>
                  <property name="sizeType">
-                  <enum>QSizePolicy::Expanding</enum>
+                  <enum>QSizePolicy::Preferred</enum>
                  </property>
                  <property name="sizeHint" stdset="0">
                   <size>
@@ -1996,15 +2020,21 @@
          <item>
           <widget class="QTableWidget" name="ccpmAdvancedSettingsTable">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>200</height>
+            </size>
+           </property>
            <property name="maximumSize">
             <size>
-             <width>525</width>
-             <height>210</height>
+             <width>1000</width>
+             <height>203</height>
             </size>
            </property>
            <property name="verticalScrollBarPolicy">
@@ -2014,7 +2044,7 @@
             <enum>Qt::ScrollBarAlwaysOff</enum>
            </property>
            <property name="autoScroll">
-            <bool>false</bool>
+            <bool>true</bool>
            </property>
            <property name="alternatingRowColors">
             <bool>true</bool>
@@ -2396,7 +2426,7 @@
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeType">
-            <enum>QSizePolicy::Preferred</enum>
+            <enum>QSizePolicy::MinimumExpanding</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
diff --git a/ground/src/plugins/config/configccpmwidget.cpp b/ground/src/plugins/config/configccpmwidget.cpp
index 307205e29..005f02639 100644
--- a/ground/src/plugins/config/configccpmwidget.cpp
+++ b/ground/src/plugins/config/configccpmwidget.cpp
@@ -171,6 +171,7 @@ ConfigccpmWidget::ConfigccpmWidget(QWidget *parent) : ConfigTaskWidget(parent)
     connect(m_ccpm->ccpmType, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateType()));
     connect(m_ccpm->ccpmSingleServo, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateType()));
     connect(m_ccpm->CurveSettings, SIGNAL(cellChanged (int, int)), this, SLOT(UpdateCurveWidgets()));
+    connect(m_ccpm->TabObject, SIGNAL(currentChanged ( QWidget * )), this, SLOT(UpdateType()));
 
 
 
@@ -297,6 +298,11 @@ void ConfigccpmWidget::UpdateType()
         }
 
 
+        m_ccpm->ccpmAdvancedSettingsTable->resizeColumnsToContents();
+        for (int i=0;i<6;i++) {
+            m_ccpm->ccpmAdvancedSettingsTable->setColumnWidth(i,(m_ccpm->ccpmAdvancedSettingsTable->width()-
+                                                            m_ccpm->ccpmAdvancedSettingsTable->verticalHeader()->width())/6);
+        }
 
     //update UI
     ccpmSwashplateUpdate();
@@ -1134,3 +1140,24 @@ void ConfigccpmWidget::saveccpmUpdate()
     updateObjectPersistance(ObjectPersistence::OPERATION_SAVE, obj);
 }
 
+void ConfigccpmWidget::resizeEvent(QResizeEvent* event)
+{
+    Q_UNUSED(event);
+    // Make the custom table columns autostretch:
+    m_ccpm->ccpmAdvancedSettingsTable->resizeColumnsToContents();
+    for (int i=0;i<6;i++) {
+        m_ccpm->ccpmAdvancedSettingsTable->setColumnWidth(i,(m_ccpm->ccpmAdvancedSettingsTable->width()-
+                                                        m_ccpm->ccpmAdvancedSettingsTable->verticalHeader()->width())/6);
+    }
+
+}
+void ConfigccpmWidget::showEvent(QShowEvent *event)
+{
+    Q_UNUSED(event)
+    m_ccpm->ccpmAdvancedSettingsTable->resizeColumnsToContents();
+    for (int i=0;i<6;i++) {
+        m_ccpm->ccpmAdvancedSettingsTable->setColumnWidth(i,(m_ccpm->ccpmAdvancedSettingsTable->width()-
+                                                        m_ccpm->ccpmAdvancedSettingsTable->verticalHeader()->width())/6);
+    }
+}
+
diff --git a/ground/src/plugins/config/configccpmwidget.h b/ground/src/plugins/config/configccpmwidget.h
index 57d388086..01b429bc9 100644
--- a/ground/src/plugins/config/configccpmwidget.h
+++ b/ground/src/plugins/config/configccpmwidget.h
@@ -76,6 +76,9 @@ private:
         void requestccpmUpdate();
         void sendccpmUpdate();
         void saveccpmUpdate();
+protected:
+    void showEvent(QShowEvent *event);
+    void resizeEvent(QResizeEvent *event);
 
 };