#168 Zoom All improved to handle parallel projection

This commit is contained in:
Jacob Støren
2016-08-15 08:52:55 +02:00
parent 742ee46f78
commit 79a025e06f
5 changed files with 9553 additions and 1 deletions

View File

@@ -566,7 +566,10 @@ void caf::Viewer::zoomAll()
cvf::Vec3d eye, vrp, up;
m_mainCamera->toLookAt(&eye, &vrp, &up);
m_mainCamera->fitView(bb, vrp-eye, up);
cvf::Vec3d newEye = m_mainCamera->computeFitViewEyePosition(bb, vrp-eye, up, 0.9, m_cameraFieldOfViewYDeg, m_mainCamera->viewport()->aspectRatio());
m_mainCamera->setFromLookAt(newEye, bb.center(), up);
updateParallelProjectionHeightFromMoveZoom(bb.center());
navigationPolicyUpdate();
}

2
ResInsight_HOST.config Normal file
View File

@@ -0,0 +1,2 @@
// Add predefined macros for your project here. For example:
// #define THE_ANSWER 42

1
ResInsight_HOST.creator Normal file
View File

@@ -0,0 +1 @@
[General]

9407
ResInsight_HOST.files Normal file

File diff suppressed because it is too large Load Diff

139
ResInsight_HOST.includes Normal file
View File

@@ -0,0 +1,139 @@
ApplicationCode/Adm
ApplicationCode/Application
ApplicationCode/Commands
ApplicationCode/Commands/CrossSectionCommands
ApplicationCode/Commands/OctaveScriptCommands
ApplicationCode/Commands/OperationsUsingObjReferences
ApplicationCode/Commands/SummaryPlotCommands
ApplicationCode/Commands/ToggleCommands
ApplicationCode/Commands/ViewLink
ApplicationCode/Commands/WellLogCommands
ApplicationCode/Commands/WellPathCommands
ApplicationCode/FileInterface
ApplicationCode/GeoMech/GeoMechDataModel
ApplicationCode/GeoMech/GeoMechVisualization
ApplicationCode/GeoMech/OdbReader
ApplicationCode/ModelVisualization
ApplicationCode/ModelVisualization/GridBox
ApplicationCode/ProjectDataModel
ApplicationCode/ReservoirDataModel
ApplicationCode/ResultStatisticsCache
ApplicationCode/SocketInterface
ApplicationCode/UserInterface
ApplicationCode/WellPathImportSsihub
ApplicationCode/WellPathImportSsihubTestApp
Fwk/AppFwk/cafAnimControl
Fwk/AppFwk/cafCommand
Fwk/AppFwk/cafCommand/defaultfeatures
Fwk/AppFwk/cafPdmCvf
Fwk/AppFwk/cafPdmCvf/cafPdmCvf_UnitTests/gtest
Fwk/AppFwk/cafProjectDataModel
Fwk/AppFwk/cafProjectDataModel/cafPdmCore
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/gtest
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore
Fwk/AppFwk/cafProjectDataModel/cafPdmXml
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/gtest
Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests
Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/gtest
Fwk/AppFwk/cafTensor
Fwk/AppFwk/cafTests/cafTestApplication
Fwk/AppFwk/cafTests/cafTestCvfApplication
Fwk/AppFwk/cafUserInterface
Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/gtest
Fwk/AppFwk/cafViewer
Fwk/AppFwk/cafVizExtensions
Fwk/AppFwk/CommonCode
Fwk/VizFwk/LibCore
Fwk/VizFwk/LibFreeType
Fwk/VizFwk/LibGeometry
Fwk/VizFwk/LibGuiQt
Fwk/VizFwk/LibIo
Fwk/VizFwk/LibRegGrid2D
Fwk/VizFwk/LibRender
Fwk/VizFwk/LibRender/glew/GL
Fwk/VizFwk/LibStructGrid
Fwk/VizFwk/LibUtilities
Fwk/VizFwk/LibViewing
Fwk/VizFwk/ThirdParty/FreeType/builds/amiga/include/freetype/config
Fwk/VizFwk/ThirdParty/FreeType/builds/atari
Fwk/VizFwk/ThirdParty/FreeType/builds/unix
Fwk/VizFwk/ThirdParty/FreeType/builds/vms
Fwk/VizFwk/ThirdParty/FreeType/devel
Fwk/VizFwk/ThirdParty/FreeType/include
Fwk/VizFwk/ThirdParty/FreeType/include/freetype
Fwk/VizFwk/ThirdParty/FreeType/include/freetype/config
Fwk/VizFwk/ThirdParty/FreeType/include/freetype/internal
Fwk/VizFwk/ThirdParty/FreeType/include/freetype/internal/services
Fwk/VizFwk/ThirdParty/FreeType/src/autofit
Fwk/VizFwk/ThirdParty/FreeType/src/base
Fwk/VizFwk/ThirdParty/FreeType/src/bdf
Fwk/VizFwk/ThirdParty/FreeType/src/cache
Fwk/VizFwk/ThirdParty/FreeType/src/cff
Fwk/VizFwk/ThirdParty/FreeType/src/cid
Fwk/VizFwk/ThirdParty/FreeType/src/gxvalid
Fwk/VizFwk/ThirdParty/FreeType/src/gzip
Fwk/VizFwk/ThirdParty/FreeType/src/lzw
Fwk/VizFwk/ThirdParty/FreeType/src/otvalid
Fwk/VizFwk/ThirdParty/FreeType/src/pcf
Fwk/VizFwk/ThirdParty/FreeType/src/pfr
Fwk/VizFwk/ThirdParty/FreeType/src/psaux
Fwk/VizFwk/ThirdParty/FreeType/src/pshinter
Fwk/VizFwk/ThirdParty/FreeType/src/psnames
Fwk/VizFwk/ThirdParty/FreeType/src/raster
Fwk/VizFwk/ThirdParty/FreeType/src/sfnt
Fwk/VizFwk/ThirdParty/FreeType/src/smooth
Fwk/VizFwk/ThirdParty/FreeType/src/truetype
Fwk/VizFwk/ThirdParty/FreeType/src/type1
Fwk/VizFwk/ThirdParty/FreeType/src/type42
Fwk/VizFwk/ThirdParty/FreeType/src/winfonts
Fwk/VizFwk/ThirdParty/gtest
Fwk/VizFwk/Tools/Glsl2Include/src
OctavePlugin
ThirdParty/custom-opm-common/opm-common/opm/common/utility/platform_dependent
ThirdParty/custom-opm-parser/opm-parser/opm/json/cjson
ThirdParty/Ert/devel/libanalysis/include/ert/analysis
ThirdParty/Ert/devel/libanalysis/modules
ThirdParty/Ert/devel/libconfig/include/ert/config
ThirdParty/Ert/devel/libecl/include/ert/ecl
ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well
ThirdParty/Ert/devel/libenkf/applications/ert_tui
ThirdParty/Ert/devel/libenkf/include/ert/enkf
ThirdParty/Ert/devel/libert_util/include/ert/util
ThirdParty/Ert/devel/libgeometry/include/ert/geometry
ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue
ThirdParty/Ert/devel/librms/include/ert/rms
ThirdParty/Ert/devel/libsched/applications/perturb_history
ThirdParty/Ert/devel/libsched/include/ert/sched
ThirdParty/Ert/devel/VisualStudio
ThirdParty/gtest
ThirdParty/Qwt/designer
ThirdParty/Qwt/examples/animation
ThirdParty/Qwt/examples/barchart
ThirdParty/Qwt/examples/bode
ThirdParty/Qwt/examples/controls
ThirdParty/Qwt/examples/cpuplot
ThirdParty/Qwt/examples/dials
ThirdParty/Qwt/examples/distrowatch
ThirdParty/Qwt/examples/event_filter
ThirdParty/Qwt/examples/friedberg
ThirdParty/Qwt/examples/itemeditor
ThirdParty/Qwt/examples/legends
ThirdParty/Qwt/examples/oscilloscope
ThirdParty/Qwt/examples/radio
ThirdParty/Qwt/examples/rasterview
ThirdParty/Qwt/examples/realtime
ThirdParty/Qwt/examples/refreshtest
ThirdParty/Qwt/examples/scatterplot
ThirdParty/Qwt/examples/spectrogram
ThirdParty/Qwt/examples/stockchart
ThirdParty/Qwt/examples/tvplot
ThirdParty/Qwt/playground/curvetracker
ThirdParty/Qwt/playground/graphicscale
ThirdParty/Qwt/playground/plotmatrix
ThirdParty/Qwt/playground/rescaler
ThirdParty/Qwt/playground/scaleengine
ThirdParty/Qwt/playground/svgmap
ThirdParty/Qwt/playground/timescale
ThirdParty/Qwt/src
ThirdParty/Qwt/textengines/mathml