From e6fa883b9433a4807bc07e50274421fbfd20128f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Pe=C3=B1aranda?= <luis.penaranda@gmx.com>
Date: Fri, 25 Jan 2013 15:49:07 -0200
Subject: [PATCH] display for fov and fov_max

---
 openglcanvas.cpp |   6 +-
 panowindow1.ui   | 204 +++++++++++++++++++++++++++++++++--------------
 2 files changed, 148 insertions(+), 62 deletions(-)

diff --git a/openglcanvas.cpp b/openglcanvas.cpp
index b05e166..6fa0b0b 100644
--- a/openglcanvas.cpp
+++ b/openglcanvas.cpp
@@ -218,6 +218,8 @@ void OpenGLCanvas::read_config_file(){
         }
         fclose(rcfile);
     }
+    emit fov_changed((int)fov);
+    emit max_fov_changed((int)fov_max);
 }
 
 void OpenGLCanvas::load_image(const char *new_image){
@@ -732,8 +734,8 @@ void OpenGLCanvas::paintGL(){
             time_fps = time_frames/dt;
             time_frames = 0;
             time_time.reset();
-            //emit fps(QString("%1 fps").arg((int)(time_fps+0.5)));
-            printf("fps = %d ", (int)(time_fps+0.5));
+            emit fps(QString("%1 fps").arg((int)(time_fps+0.5)));
+            //printf("fps = %d ", (int)(time_fps+0.5));
 //        }
 //    }
 
diff --git a/panowindow1.ui b/panowindow1.ui
index 9f8ba6e..fabd3c6 100644
--- a/panowindow1.ui
+++ b/panowindow1.ui
@@ -14,10 +14,47 @@
    <string>PanoWindow1</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="2" column="1" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Visualization</string>
+     </property>
+    </widget>
+   </item>
    <item row="14" column="1" colspan="2">
-    <widget class="QPushButton" name="pushButton">
+    <widget class="QPushButton" name="reCenter">
      <property name="text">
-      <string>Close</string>
+      <string>Re-center</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>FOV-Scale Relation</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" rowspan="17">
+    <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>
+     </property>
+    </widget>
+   </item>
+   <item row="11" column="1" alignment="Qt::AlignHCenter">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>FOV max</string>
      </property>
     </widget>
    </item>
@@ -61,19 +98,25 @@
      </item>
     </widget>
    </item>
-   <item row="0" column="0" rowspan="15">
-    <widget class="OpenGLCanvas" name="GLCanvas" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+   <item row="13" column="1" alignment="Qt::AlignHCenter">
+    <widget class="QSlider" name="changefovmax">
+     <property name="minimum">
+      <number>1</number>
      </property>
-     <property name="baseSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
+     <property name="maximum">
+      <number>359</number>
+     </property>
+     <property name="sliderPosition">
+      <number>60</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="tickPosition">
+      <enum>QSlider::NoTicks</enum>
+     </property>
+     <property name="tickInterval">
+      <number>10</number>
      </property>
     </widget>
    </item>
@@ -96,49 +139,31 @@
      </item>
     </widget>
    </item>
-   <item row="13" column="1" colspan="2">
+   <item row="15" column="1" colspan="2">
     <widget class="QPushButton" name="chooseFile">
      <property name="text">
       <string>Input Image</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Visualization</string>
+   <item row="12" column="1" alignment="Qt::AlignHCenter">
+    <widget class="QLCDNumber" name="fovmaxled">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
      </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>FOV-Scale Relation</string>
+     <property name="numDigits">
+      <number>3</number>
      </property>
     </widget>
    </item>
-   <item row="12" column="1" colspan="2">
-    <widget class="QPushButton" name="reCenter">
-     <property name="text">
-      <string>Re-center</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="1" alignment="Qt::AlignHCenter">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>FOV max</string>
-     </property>
-    </widget>
-   </item>
-   <item row="11" column="2" alignment="Qt::AlignHCenter">
-    <widget class="QLabel" name="label_6">
+   <item row="16" column="1" colspan="2">
+    <widget class="QPushButton" name="pushButton">
      <property name="text">
-      <string>FOV</string>
+      <string>Close</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="2" rowspan="2" alignment="Qt::AlignHCenter">
+   <item row="13" column="2" alignment="Qt::AlignHCenter">
     <widget class="QSlider" name="changefov">
      <property name="minimum">
       <number>1</number>
@@ -154,25 +179,20 @@
      </property>
     </widget>
    </item>
-   <item row="10" column="1" alignment="Qt::AlignHCenter">
-    <widget class="QSlider" name="changefovmax">
-     <property name="minimum">
-      <number>1</number>
+   <item row="12" column="2" alignment="Qt::AlignHCenter">
+    <widget class="QLCDNumber" name="fovled">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="maximum">
-      <number>359</number>
+     <property name="numDigits">
+      <number>3</number>
      </property>
-     <property name="sliderPosition">
-      <number>60</number>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="tickPosition">
-      <enum>QSlider::NoTicks</enum>
-     </property>
-     <property name="tickInterval">
-      <number>10</number>
+    </widget>
+   </item>
+   <item row="11" column="2" alignment="Qt::AlignHCenter">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>FOV</string>
      </property>
     </widget>
    </item>
@@ -347,5 +367,69 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>changefov</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>fovled</receiver>
+   <slot>display(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>606</x>
+     <y>245</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>606</x>
+     <y>380</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>changefovmax</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>fovmaxled</receiver>
+   <slot>display(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>532</x>
+     <y>248</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>532</x>
+     <y>380</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>GLCanvas</sender>
+   <signal>fov_changed(int)</signal>
+   <receiver>fovled</receiver>
+   <slot>display(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>250</x>
+     <y>249</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>606</x>
+     <y>197</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>GLCanvas</sender>
+   <signal>max_fov_changed(int)</signal>
+   <receiver>fovmaxled</receiver>
+   <slot>display(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>250</x>
+     <y>249</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>532</x>
+     <y>197</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
-- 
GitLab