Commit e82cc65b authored by Luis Peñaranda's avatar Luis Peñaranda
Browse files

added re-center button

parent a6a0b939

openglcanvas.cpp

+6 −0
Original line number Diff line number Diff line
@@ -129,6 +129,12 @@ void OpenGLCanvas::change_center_phi(double phi){ 


}



void OpenGLCanvas::re_center(){

    center_phi=.0f;

    center_lambda=.0f;

    updateGL();

}



void OpenGLCanvas::change_fov_scale_relation(QString name){



   fov_scale_relation = name;

openglcanvas.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public slots: 
//    void change_scale(double s);

    void change_center_lambda(double lambda);

    void change_center_phi(double phi);

    void re_center();

    void change_fov_scale_relation(QString name);

    void change_visualization(QString name);

    void change_input_image();

panowindow1.ui

+119 −159
Original line number Diff line number Diff line
@@ -14,52 +14,66 @@ 
   <string>PanoWindow1</string>

  </property>

  <layout class="QGridLayout" name="gridLayout">

   <item row="6" column="2">

    <widget class="QDoubleSpinBox" name="doubleSpinBox_4">

     <property name="maximumSize">

      <size>

       <width>61</width>

       <height>25</height>

      </size>

   <item row="14" column="1" colspan="2">

    <widget class="QPushButton" name="pushButton">

     <property name="text">

      <string>Close</string>

     </property>

     <property name="minimum">

      <double>-1.570000000000000</double>

    </widget>

   </item>

   <item row="1" column="1" colspan="2">

    <widget class="QComboBox" name="comboBox">

     <property name="editable">

      <bool>false</bool>

     </property>

     <property name="maximum">

      <double>1.570000000000000</double>

     <property name="modelColumn">

      <number>0</number>

     </property>

     <property name="singleStep">

      <double>0.010000000000000</double>

     <item>

      <property name="text">

       <string>Square Root</string>

      </property>

    </widget>

     </item>

   <item row="7" column="1" colspan="2">

    <widget class="QPushButton" name="chooseFile">

     <item>

      <property name="text">

      <string>Input Image</string>

       <string>Naive</string>

      </property>

    </widget>

     </item>

   <item row="8" column="2" alignment="Qt::AlignHCenter">

    <widget class="QSlider" name="changefov">

     <property name="minimum">

      <number>1</number>

     <item>

      <property name="text">

       <string>Linear</string>

      </property>

     <property name="maximum">

      <number>359</number>

     </item>

     <item>

      <property name="text">

       <string>Square Power</string>

      </property>

     <property name="value">

      <number>60</number>

     </item>

     <item>

      <property name="text">

       <string>Cubic Power</string>

      </property>

     <property name="orientation">

      <enum>Qt::Vertical</enum>

     </item>

     <item>

      <property name="text">

       <string>Logarithm</string>

      </property>

     </item>

    </widget>

   </item>

   <item row="2" column="1" colspan="2">

    <widget class="QLabel" name="label_3">

     <property name="text">

      <string>Visualization</string>

   <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>

     </property>

     <property name="baseSize">

      <size>

       <width>0</width>

       <height>0</height>

      </size>

     </property>

    </widget>

   </item>
@@ -82,25 +96,17 @@ 
     </item>

    </widget>

   </item>

   <item row="8" column="1" alignment="Qt::AlignHCenter">

    <widget class="QSlider" name="changefovmax">

     <property name="minimum">

      <number>10</number>

     </property>

     <property name="maximum">

      <number>180</number>

     </property>

     <property name="sliderPosition">

      <number>60</number>

     </property>

     <property name="orientation">

      <enum>Qt::Vertical</enum>

     </property>

     <property name="tickPosition">

      <enum>QSlider::NoTicks</enum>

   <item row="13" column="1" colspan="2">

    <widget class="QPushButton" name="chooseFile">

     <property name="text">

      <string>Input Image</string>

     </property>

     <property name="tickInterval">

      <number>10</number>

    </widget>

   </item>

   <item row="2" column="1" colspan="2">

    <widget class="QLabel" name="label_3">

     <property name="text">

      <string>Visualization</string>

     </property>

    </widget>

   </item>
@@ -111,93 +117,62 @@ 
     </property>

    </widget>

   </item>

   <item row="10" column="1" colspan="2">

    <widget class="QPushButton" name="pushButton">

   <item row="12" column="1" colspan="2">

    <widget class="QPushButton" name="reCenter">

     <property name="text">

      <string>Close</string>

      <string>Re-center</string>

     </property>

    </widget>

   </item>

   <item row="9" column="1" alignment="Qt::AlignHCenter">

   <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="9" column="2" alignment="Qt::AlignHCenter">

   <item row="11" column="2" alignment="Qt::AlignHCenter">

    <widget class="QLabel" name="label_6">

     <property name="text">

      <string>FOV</string>

     </property>

    </widget>

   </item>

   <item row="0" column="0" rowspan="11">

    <widget class="OpenGLCanvas" name="GLCanvas" native="true"/>

   </item>

   <item row="1" column="1" colspan="2">

    <widget class="QComboBox" name="comboBox">

     <property name="editable">

      <bool>false</bool>

     </property>

     <property name="modelColumn">

      <number>0</number>

     </property>

     <item>

      <property name="text">

       <string>Square Root</string>

      </property>

     </item>

     <item>

      <property name="text">

       <string>Naive</string>

      </property>

     </item>

     <item>

      <property name="text">

       <string>Linear</string>

      </property>

     </item>

     <item>

      <property name="text">

       <string>Square Power</string>

   <item row="9" column="2" rowspan="2" alignment="Qt::AlignHCenter">

    <widget class="QSlider" name="changefov">

     <property name="minimum">

      <number>1</number>

     </property>

     </item>

     <item>

      <property name="text">

       <string>Cubic Power</string>

     <property name="maximum">

      <number>359</number>

     </property>

     </item>

     <item>

      <property name="text">

       <string>Logarithm</string>

     <property name="value">

      <number>60</number>

     </property>

     </item>

    </widget>

   </item>

   <item row="4" column="1" colspan="2">

    <widget class="QLabel" name="label_4">

     <property name="text">

      <string>Center Point</string>

     <property name="orientation">

      <enum>Qt::Vertical</enum>

     </property>

    </widget>

   </item>

   <item row="6" column="1">

    <widget class="QDoubleSpinBox" name="doubleSpinBox_3">

     <property name="maximumSize">

      <size>

       <width>61</width>

       <height>25</height>

      </size>

     </property>

   <item row="10" column="1" alignment="Qt::AlignHCenter">

    <widget class="QSlider" name="changefovmax">

     <property name="minimum">

      <double>-3.140000000000000</double>

      <number>10</number>

     </property>

     <property name="maximum">

      <double>3.140000000000000</double>

      <number>180</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="singleStep">

      <double>0.010000000000000</double>

     <property name="tickInterval">

      <number>10</number>

     </property>

    </widget>

   </item>
@@ -221,6 +196,7 @@ 
    <slot>change_input_image()</slot>

    <slot>change_fov_max(int)</slot>

    <slot>change_fov(int)</slot>

    <slot>re_center()</slot>

   </slots>

  </customwidget>

 </customwidgets>
@@ -242,38 +218,6 @@ 
    </hint>

   </hints>

  </connection>

  <connection>

   <sender>doubleSpinBox_3</sender>

   <signal>valueChanged(double)</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_center_lambda(double)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>536</x>

     <y>230</y>

    </hint>

    <hint type="destinationlabel">

     <x>506</x>

     <y>297</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>doubleSpinBox_4</sender>

   <signal>valueChanged(double)</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_center_phi(double)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>605</x>

     <y>227</y>

    </hint>

    <hint type="destinationlabel">

     <x>506</x>

     <y>320</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>comboBox</sender>

   <signal>activated(QString)</signal>
@@ -322,22 +266,6 @@ 
    </hint>

   </hints>

  </connection>

  <connection>

   <sender>changefovmax</sender>

   <signal>sliderMoved(int)</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_fov_max(int)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>512</x>

     <y>363</y>

    </hint>

    <hint type="destinationlabel">

     <x>250</x>

     <y>249</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>changefov</sender>

   <signal>sliderMoved(int)</signal>
@@ -370,5 +298,37 @@ 
    </hint>

   </hints>

  </connection>

  <connection>

   <sender>reCenter</sender>

   <signal>clicked()</signal>

   <receiver>GLCanvas</receiver>

   <slot>re_center()</slot>

   <hints>

    <hint type="sourcelabel">

     <x>569</x>

     <y>444</y>

    </hint>

    <hint type="destinationlabel">

     <x>250</x>

     <y>249</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>changefovmax</sender>

   <signal>sliderMoved(int)</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_fov_max(int)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>512</x>

     <y>363</y>

    </hint>

    <hint type="destinationlabel">

     <x>250</x>

     <y>249</y>

    </hint>

   </hints>

  </connection>

 </connections>

</ui>