From dc0701ce9164c6496b85476b64f3033538d51e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Pe=C3=B1aranda?= <luisp@impa.br>
Date: Fri, 11 Oct 2013 14:27:43 -0300
Subject: [PATCH] improved look for the video

-resized interface, so as to have a 1280x720 window
-changed the word 'Naive' to 'Simple'
-swapped positions of the pop-down menus
-made LED digits more visible
---
 openglcanvas.cpp |   4 +-
 panowindow1.ui   | 212 ++++++++++++++++++++++++-----------------------
 2 files changed, 111 insertions(+), 105 deletions(-)

diff --git a/openglcanvas.cpp b/openglcanvas.cpp
index a2326e1..47d5a0e 100644
--- a/openglcanvas.cpp
+++ b/openglcanvas.cpp
@@ -37,7 +37,7 @@ OpenGLCanvas::OpenGLCanvas(QWidget *parent) :
     scale = 1.0f;
     center_lambda = 0.f;
     center_phi = 0.f;
-    fov_scale_relation = "Naive";
+    fov_scale_relation = "Simple";
     visualization = "Moebius";
     auto_fov_max=false;
     shrink_for_all=false;
@@ -606,7 +606,7 @@ void OpenGLCanvas::compute_scale(){
         //else if (fov>295.f)
         //    scale = 0.02f; // TODO: check this value wrt fov_max
         }else{
-            if(fov_scale_relation == "Naive")
+            if(fov_scale_relation == "Simple")
                 scale=fov_max/fov;
             else if(fov_scale_relation == "Square Root")
                 scale=sqrtf((360.f-fov_max-fov)/(360.f-2.f*fov_max));
diff --git a/panowindow1.ui b/panowindow1.ui
index 3206d50..1e01796 100644
--- a/panowindow1.ui
+++ b/panowindow1.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>650</width>
-    <height>500</height>
+    <width>1278</width>
+    <height>691</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,10 +19,23 @@
    </iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="1" colspan="2">
-    <widget class="QLabel" name="label_3">
+   <item row="15" column="2" alignment="Qt::AlignHCenter">
+    <widget class="QLabel" name="label_6">
      <property name="text">
-      <string>Visualization</string>
+      <string>FOV</string>
+     </property>
+    </widget>
+   </item>
+   <item row="16" column="1" alignment="Qt::AlignHCenter">
+    <widget class="QLCDNumber" name="fovmaxled">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="numDigits">
+      <number>3</number>
+     </property>
+     <property name="segmentStyle">
+      <enum>QLCDNumber::Flat</enum>
      </property>
     </widget>
    </item>
@@ -34,29 +47,13 @@
     </widget>
    </item>
    <item row="0" column="1" colspan="2">
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>FOV-Scale Relation</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" rowspan="21">
-    <widget class="OpenGLCanvas" name="GLCanvas" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="baseSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
+      <string>Visualization</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2">
+   <item row="3" column="1" colspan="2">
     <widget class="QComboBox" name="comboBox">
      <property name="editable">
       <bool>false</bool>
@@ -66,7 +63,7 @@
      </property>
      <item>
       <property name="text">
-       <string>Naive</string>
+       <string>Simple</string>
       </property>
      </item>
      <item>
@@ -96,6 +93,50 @@
      </item>
     </widget>
    </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QComboBox" name="comboBox_2">
+     <item>
+      <property name="text">
+       <string>Moebius</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>3D Sphere</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Equi-Rectangular</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Perspective</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Stereographic</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Orthographic</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Mercator</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Zorin-Barr</string>
+      </property>
+     </item>
+    </widget>
+   </item>
    <item row="17" column="1" alignment="Qt::AlignHCenter">
     <widget class="QSlider" name="changefovmax">
      <property name="minimum">
@@ -118,27 +159,33 @@
      </property>
     </widget>
    </item>
-   <item row="19" column="1" colspan="2">
-    <widget class="QPushButton" name="chooseFile">
+   <item row="14" column="1" colspan="2">
+    <widget class="QCheckBox" name="automax">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Ignored" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
-      <string>Input Image</string>
+      <string>Auto FOV max</string>
      </property>
     </widget>
    </item>
-   <item row="16" column="1" alignment="Qt::AlignHCenter">
-    <widget class="QLCDNumber" name="fovmaxled">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="numDigits">
-      <number>3</number>
+   <item row="2" column="1" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Shrink computation</string>
      </property>
     </widget>
    </item>
-   <item row="20" column="1" colspan="2">
-    <widget class="QPushButton" name="pushButton">
+   <item row="15" column="1">
+    <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>Close</string>
+      <string>FOV max</string>
      </property>
     </widget>
    </item>
@@ -158,6 +205,13 @@
      </property>
     </widget>
    </item>
+   <item row="19" column="1" colspan="2">
+    <widget class="QPushButton" name="chooseFile">
+     <property name="text">
+      <string>Input Image</string>
+     </property>
+    </widget>
+   </item>
    <item row="16" column="2" alignment="Qt::AlignHCenter">
     <widget class="QLCDNumber" name="fovled">
      <property name="frameShape">
@@ -166,86 +220,38 @@
      <property name="numDigits">
       <number>3</number>
      </property>
+     <property name="segmentStyle">
+      <enum>QLCDNumber::Flat</enum>
+     </property>
     </widget>
    </item>
-   <item row="15" column="2" alignment="Qt::AlignHCenter">
-    <widget class="QLabel" name="label_6">
+   <item row="13" column="1">
+    <widget class="QCheckBox" name="shrinkAll">
      <property name="text">
-      <string>FOV</string>
+      <string>Shrink all</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" colspan="2">
-    <widget class="QComboBox" name="comboBox_2">
-     <item>
-      <property name="text">
-       <string>Moebius</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>3D Sphere</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Equi-Rectangular</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Perspective</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Stereographic</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Orthographic</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Mercator</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Zorin-Barr</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="15" column="1">
-    <widget class="QLabel" name="label_5">
+   <item row="20" column="1" colspan="2">
+    <widget class="QPushButton" name="pushButton">
      <property name="text">
-      <string>FOV max</string>
+      <string>Close</string>
      </property>
     </widget>
    </item>
-   <item row="14" column="1" colspan="2">
-    <widget class="QCheckBox" name="automax">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
+   <item row="0" column="0" rowspan="21">
+    <widget class="OpenGLCanvas" name="GLCanvas" native="true">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Ignored" vsizetype="Minimum">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="text">
-      <string>Auto FOV max</string>
-     </property>
-    </widget>
-   </item>
-   <item row="13" column="1">
-    <widget class="QCheckBox" name="shrinkAll">
-     <property name="text">
-      <string>Shrink all</string>
+     <property name="baseSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
      </property>
     </widget>
    </item>
-- 
GitLab