diff --git a/openglcanvas.cpp b/openglcanvas.cpp index a2326e1628cc9259373e875530e48462ee078b67..47d5a0ebfe2724497840fe814733d53fa44f6d5d 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 3206d50c6c71e2a838760b45ac4404987cabe3c5..1e01796500622e8b26187c96ff26899422b86147 100644 --- a/panowindow1.ui +++ b/panowindow1.ui @@ -6,8 +6,8 @@ 0 0 - 650 - 500 + 1278 + 691 @@ -19,10 +19,23 @@ - - + + - Visualization + FOV + + + + + + + QFrame::NoFrame + + + 3 + + + QLCDNumber::Flat @@ -34,29 +47,13 @@ - + - FOV-Scale Relation - - - - - - - - 0 - 0 - - - - - 0 - 0 - + Visualization - + false @@ -66,7 +63,7 @@ - Naive + Simple @@ -96,6 +93,50 @@ + + + + + Moebius + + + + + 3D Sphere + + + + + Equi-Rectangular + + + + + Perspective + + + + + Stereographic + + + + + Orthographic + + + + + Mercator + + + + + Zorin-Barr + + + + @@ -118,27 +159,33 @@ - - + + + + true + + + + 0 + 0 + + - Input Image + Auto FOV max - - - - QFrame::NoFrame - - - 3 + + + + Shrink computation - - + + - Close + FOV max @@ -158,6 +205,13 @@ + + + + Input Image + + + @@ -166,86 +220,38 @@ 3 + + QLCDNumber::Flat + - - + + - FOV + Shrink all - - - - - Moebius - - - - - 3D Sphere - - - - - Equi-Rectangular - - - - - Perspective - - - - - Stereographic - - - - - Orthographic - - - - - Mercator - - - - - Zorin-Barr - - - - - - + + - FOV max + Close - - - - true - + + - + 0 0 - - Auto FOV max - - - - - - - Shrink all + + + 0 + 0 +