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

added controls for Zorin-Barr transformation 

Only when using the compilation flag PANO_EXTENDED_CONTROLS. It is not
yet working, it remains to implement in the vertex shader.
parent 032ed1ab

extended_controls.ui

0 → 100644
+606 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<ui version="4.0">

 <class>PanoWindow1</class>

 <widget class="QWidget" name="PanoWindow1">

  <property name="geometry">

   <rect>

    <x>0</x>

    <y>0</y>

    <width>1278</width>

    <height>691</height>

   </rect>

  </property>

  <property name="windowTitle">

   <string notr="true">Panoramic</string>

  </property>

  <property name="windowIcon">

   <iconset theme="view-fullscreen">

    <normaloff/>

   </iconset>

  </property>

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

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

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

     <property name="text">

      <string>Close</string>

     </property>

    </widget>

   </item>

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

    <widget class="QCheckBox" name="shrinkAll">

     <property name="text">

      <string>Shrink all</string>

     </property>

    </widget>

   </item>

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

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

     <property name="minimum">

      <number>1</number>

     </property>

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

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

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

     <property name="minimum">

      <number>1</number>

     </property>

     <property name="maximum">

      <number>359</number>

     </property>

     <property name="value">

      <number>60</number>

     </property>

     <property name="orientation">

      <enum>Qt::Vertical</enum>

     </property>

    </widget>

   </item>

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

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

     <property name="text">

      <string>Shrink computation</string>

     </property>

    </widget>

   </item>

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

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

     <property name="text">

      <string>FOV</string>

     </property>

    </widget>

   </item>

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

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

     <property name="text">

      <string>Visualization</string>

     </property>

    </widget>

   </item>

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

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

     <property name="text">

      <string>FOV max</string>

     </property>

    </widget>

   </item>

   <item row="6" 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>Simple</string>

      </property>

     </item>

     <item>

      <property name="text">

       <string>Square Root</string>

      </property>

     </item>

     <item>

      <property name="text">

       <string>Linear</string>

      </property>

     </item>

     <item>

      <property name="text">

       <string>Square Power</string>

      </property>

     </item>

     <item>

      <property name="text">

       <string>Cubic Power</string>

      </property>

     </item>

     <item>

      <property name="text">

       <string>Logarithm</string>

      </property>

     </item>

    </widget>

   </item>

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

    <widget class="QLCDNumber" name="fovled">

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

   <item row="19" 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>

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

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

     <property name="text">

      <string>Input Image</string>

     </property>

    </widget>

   </item>

   <item row="17" 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>Auto FOV max</string>

     </property>

    </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="9" column="1" colspan="2">

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

     <property name="sizePolicy">

      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

       <horstretch>0</horstretch>

       <verstretch>0</verstretch>

      </sizepolicy>

     </property>

     <property name="minimum">

      <number>1</number>

     </property>

     <property name="maximum">

      <number>1000</number>

     </property>

     <property name="pageStep">

      <number>100</number>

     </property>

     <property name="orientation">

      <enum>Qt::Horizontal</enum>

     </property>

    </widget>

   </item>

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

    <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="21" column="1" colspan="2">

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

     <property name="text">

      <string>Re-center</string>

     </property>

    </widget>

   </item>

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

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

     <property name="sizePolicy">

      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

       <horstretch>0</horstretch>

       <verstretch>0</verstretch>

      </sizepolicy>

     </property>

     <property name="minimum">

      <number>1</number>

     </property>

     <property name="maximum">

      <number>1000</number>

     </property>

     <property name="pageStep">

      <number>100</number>

     </property>

     <property name="orientation">

      <enum>Qt::Horizontal</enum>

     </property>

    </widget>

   </item>

  </layout>

 </widget>

 <layoutdefault spacing="6" margin="11"/>

 <customwidgets>

  <customwidget>

   <class>OpenGLCanvas</class>

   <extends>QWidget</extends>

   <header location="global">openglcanvas.h</header>

   <container>1</container>

   <slots>

    <signal>fov_changed(int)</signal>

    <signal>max_fov_changed(int)</signal>

    <slot>change_fov(double)</slot>

    <slot>change_scale(double)</slot>

    <slot>change_center_lambda(double)</slot>

    <slot>change_center_phi(double)</slot>

    <slot>change_fov_scale_relation(QString)</slot>

    <slot>change_visualization(QString)</slot>

    <slot>change_input_image()</slot>

    <slot>change_fov_max(int)</slot>

    <slot>change_fov(int)</slot>

    <slot>re_center()</slot>

    <slot>automaxbutton(bool)</slot>

    <slot>shrinkallbutton(bool)</slot>

    <slot>change_zb_lambda(int)</slot>

    <slot>change_zb_R(int)</slot>

   </slots>

  </customwidget>

 </customwidgets>

 <resources/>

 <connections>

  <connection>

   <sender>pushButton</sender>

   <signal>clicked()</signal>

   <receiver>PanoWindow1</receiver>

   <slot>close()</slot>

   <hints>

    <hint type="sourcelabel">

     <x>640</x>

     <y>490</y>

    </hint>

    <hint type="destinationlabel">

     <x>629</x>

     <y>364</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>comboBox</sender>

   <signal>activated(QString)</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_fov_scale_relation(QString)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>603</x>

     <y>50</y>

    </hint>

    <hint type="destinationlabel">

     <x>492</x>

     <y>77</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>comboBox_2</sender>

   <signal>activated(QString)</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_visualization(QString)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>554</x>

     <y>106</y>

    </hint>

    <hint type="destinationlabel">

     <x>492</x>

     <y>132</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>chooseFile</sender>

   <signal>clicked()</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_input_image()</slot>

   <hints>

    <hint type="sourcelabel">

     <x>640</x>

     <y>457</y>

    </hint>

    <hint type="destinationlabel">

     <x>247</x>

     <y>249</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>changefov</sender>

   <signal>sliderMoved(int)</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_fov(int)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>607</x>

     <y>352</y>

    </hint>

    <hint type="destinationlabel">

     <x>250</x>

     <y>249</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>GLCanvas</sender>

   <signal>fov_changed(int)</signal>

   <receiver>changefov</receiver>

   <slot>setValue(int)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>250</x>

     <y>249</y>

    </hint>

    <hint type="destinationlabel">

     <x>607</x>

     <y>324</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>reCenter</sender>

   <signal>clicked()</signal>

   <receiver>GLCanvas</receiver>

   <slot>re_center()</slot>

   <hints>

    <hint type="sourcelabel">

     <x>640</x>

     <y>424</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>546</x>

     <y>391</y>

    </hint>

    <hint type="destinationlabel">

     <x>250</x>

     <y>249</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>GLCanvas</sender>

   <signal>max_fov_changed(int)</signal>

   <receiver>changefovmax</receiver>

   <slot>setValue(int)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>250</x>

     <y>249</y>

    </hint>

    <hint type="destinationlabel">

     <x>532</x>

     <y>262</y>

    </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>629</x>

     <y>236</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>555</x>

     <y>236</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>629</x>

     <y>236</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>555</x>

     <y>236</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>automax</sender>

   <signal>toggled(bool)</signal>

   <receiver>GLCanvas</receiver>

   <slot>automaxbutton(bool)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>504</x>

     <y>174</y>

    </hint>

    <hint type="destinationlabel">

     <x>454</x>

     <y>172</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>shrinkAll</sender>

   <signal>toggled(bool)</signal>

   <receiver>GLCanvas</receiver>

   <slot>shrinkallbutton(bool)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>540</x>

     <y>185</y>

    </hint>

    <hint type="destinationlabel">

     <x>247</x>

     <y>249</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>changezblambda</sender>

   <signal>sliderMoved(int)</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_zb_lambda(int)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>1197</x>

     <y>165</y>

    </hint>

    <hint type="destinationlabel">

     <x>564</x>

     <y>345</y>

    </hint>

   </hints>

  </connection>

  <connection>

   <sender>changezbR</sender>

   <signal>sliderMoved(int)</signal>

   <receiver>GLCanvas</receiver>

   <slot>change_zb_R(int)</slot>

   <hints>

    <hint type="sourcelabel">

     <x>1197</x>

     <y>200</y>

    </hint>

    <hint type="destinationlabel">

     <x>564</x>

     <y>345</y>

    </hint>

   </hints>

  </connection>

 </connections>

</ui>

openglcanvas.cpp

+12 −0
Original line number Diff line number Diff line
@@ -96,6 +96,18 @@ void OpenGLCanvas::change_fov_max(int new_fov_max){ 
    updateGL();

}



void OpenGLCanvas::change_zb_lambda(int new_zb_lambda){

    zblambda=(float)new_zb_lambda/1000;

    fprintf(stderr,"zb_lambda=%f\n",zblambda);

    updateGL();

}



void OpenGLCanvas::change_zb_R(int new_zb_R){

    zbR=(float)new_zb_R/1000;

    fprintf(stderr,"zb_R=%f\n",zbR);

    updateGL();

}



//void OpenGLCanvas::change_scale(double s){



//    if (scale!=s && s>=0.0 && s<=1.0) scale = s;

openglcanvas.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ public slots: 
    void change_fov(double f);

    void change_fov(int new_fov);

    void change_fov_max(int new_fov_max);

    void change_zb_lambda(int new_zb_lambda);

    void change_zb_R(int new_zb_R);

//    void change_scale(double s);

    void change_center_lambda(double lambda);

    void change_center_phi(double phi);

pano_interface_1.pro

+5 −1
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 


QT       += core gui opengl



# uncomment to show in the main window controls for other methods

DEFINES += PANO_EXTENDED_CONTROLS



# compiler specific settings

darwin-g++*|macx-g++*|linux-g++*|win32-g++*|cygwin-g++* {

QMAKE_CXXFLAGS += -ansi -pedantic -Wno-long-long
@@ -75,7 +78,8 @@ HEADERS += panowindow1.h \ 
    image_read.h \

    files.h



FORMS    += panowindow1.ui

FORMS    += panowindow1.ui \

    extended_controls.ui



OTHER_FILES += \

    shaders/fragment_shader.frag \

panowindow1.cpp

+4 −0
Original line number Diff line number Diff line 
#include "panowindow1.h"

#ifdef PANO_EXTENDED_CONTROLS

#include "ui_extended_controls.h"

#else

#include "ui_panowindow1.h"

#endif



PanoWindow1::PanoWindow1(QWidget *parent) :

    QWidget(parent),