[OpenWalnut-Dev] [OWci] r5523: [STYLE #42] renamed main view to be consistent with capitalization guidelines as it shows up in the GUI
Mario Hlawitschka
hlawitschka at informatik.uni-leipzig.de
Sun Dec 18 00:44:26 CET 2011
Danke Dir, das hatte ich bei mir schon einmal geändert aber noch nie geschafft, es sauber zu trennen um es einzuchecken.
Mario
Am 16.12.2011 um 23:37 schrieb Alexander Wiebel:
> *Branch default*
> [STYLE #42] renamed main view to be consistent with capitalization guidelines as it shows up in the GUI
>
> changeset 5523:2f0eaa222dbf in /srv/hg/ow (Fri Dec 16 23:36:57 2011 +0100):
>
> http://www.openwalnut.org/projects/openwalnut/repository/revisions/5523
>
> diffstat:
>
> src/core/graphicsEngine/WGEViewer.cpp | 2 +-
> src/core/graphicsEngine/WGraphicsEngine.cpp | 2 +-
> src/core/graphicsEngine/WPickHandler.cpp | 2 +-
> src/core/graphicsEngine/WROIBox.cpp | 2 +-
> src/core/graphicsEngine/WROISphere.cpp | 2 +-
> src/core/graphicsEngine/test/WROIBox_test.h | 2 +-
> src/core/kernel/WSelectionManager.cpp | 2 +-
> src/modules/hud/WMHud.cpp | 4 ++--
> src/modules/lineGuidedSlice/WMLineGuidedSlice.cpp | 2 +-
> src/modules/navigationSlices/WMNavigationSlices.cpp | 2 +-
> src/modules/sliceContext/WTransparentLinesDrawable.cpp | 2 +-
> src/qt4gui/qt4/WMainWindow.cpp | 14 +++++++-------
> 12 files changed, 19 insertions(+), 19 deletions(-)
>
> diffs (207 lines):
>
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/core/graphicsEngine/WGEViewer.cpp
> --- a/src/core/graphicsEngine/WGEViewer.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/core/graphicsEngine/WGEViewer.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -87,7 +87,7 @@
> case( WGECamera::ORTHOGRAPHIC ):
> m_pickHandler = new WPickHandler( name );
> m_View->addEventHandler( m_pickHandler );
> - if( name != std::string( "main" ) )
> + if( name != std::string( "Main View" ) )
> break;
> case( WGECamera::PERSPECTIVE ):
> // camera manipulator
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/core/graphicsEngine/WGraphicsEngine.cpp
> --- a/src/core/graphicsEngine/WGraphicsEngine.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/core/graphicsEngine/WGraphicsEngine.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -168,7 +168,7 @@
> boost::shared_ptr< WGEViewer > WGraphicsEngine::getViewer()
> {
> boost::mutex::scoped_lock lock( m_viewersLock );
> - return m_viewers[ "main" ];
> + return m_viewers[ "Main View" ];
> }
>
> bool WGraphicsEngine::isRunning()
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/core/graphicsEngine/WPickHandler.cpp
> --- a/src/core/graphicsEngine/WPickHandler.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/core/graphicsEngine/WPickHandler.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -185,7 +185,7 @@
> updatePickInfoModifierKeys( &pickInfo );
>
> // if we are in another viewer than the main view we just need the pixel position
> - if( m_viewerName != "" && m_viewerName != "main" )
> + if( m_viewerName != "" && m_viewerName != "Main View" )
> {
> pickInfo = WPickInfo( "", m_viewerName, m_startPick.getPickPosition(), std::make_pair( x, y ),
> m_startPick.getModifierKey(), m_mouseButton, m_startPick.getPickNormal() );
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/core/graphicsEngine/WROIBox.cpp
> --- a/src/core/graphicsEngine/WROIBox.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/core/graphicsEngine/WROIBox.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -124,7 +124,7 @@
>
> boost::shared_ptr< WGraphicsEngine > ge = WGraphicsEngine::getGraphicsEngine();
> assert( ge );
> - boost::shared_ptr< WGEViewer > viewer = ge->getViewerByName( "main" );
> + boost::shared_ptr< WGEViewer > viewer = ge->getViewerByName( "Main View" );
> assert( viewer );
> m_viewer = viewer;
> m_pickHandler = m_viewer->getPickHandler();
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/core/graphicsEngine/WROISphere.cpp
> --- a/src/core/graphicsEngine/WROISphere.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/core/graphicsEngine/WROISphere.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -56,7 +56,7 @@
> {
> boost::shared_ptr< WGraphicsEngine > ge = WGraphicsEngine::getGraphicsEngine();
> assert( ge );
> - boost::shared_ptr< WGEViewer > viewer = ge->getViewerByName( "main" );
> + boost::shared_ptr< WGEViewer > viewer = ge->getViewerByName( "Main View" );
> assert( viewer );
> m_viewer = viewer;
> m_pickHandler = m_viewer->getPickHandler();
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/core/graphicsEngine/test/WROIBox_test.h
> --- a/src/core/graphicsEngine/test/WROIBox_test.h Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/core/graphicsEngine/test/WROIBox_test.h Fri Dec 16 23:36:57 2011 +0100
> @@ -37,7 +37,7 @@
> public:
> /**
> * I would like to test instantiation here, but WROIBox needs nearly a complete
> - * running GUI and GE with the "main" viewer. This seemed to much effort for
> + * running GUI and GE with the "Main View" viewer. This seemed to much effort for
> * this small test to me.
> */
> void testInstantiation( void )
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/core/kernel/WSelectionManager.cpp
> --- a/src/core/kernel/WSelectionManager.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/core/kernel/WSelectionManager.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -87,7 +87,7 @@
> int WSelectionManager::getFrontSector()
> {
> boost::shared_ptr< WGEViewer > viewer;
> - viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "main" );
> + viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "Main View" );
> viewer->getCamera()->getViewMatrix();
> osg::Matrix rm = viewer->getCamera()->getViewMatrix();
>
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/modules/hud/WMHud.cpp
> --- a/src/modules/hud/WMHud.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/modules/hud/WMHud.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -92,7 +92,7 @@
> // NOTE: ALWAYS remove your osg nodes!
> WKernel::getRunningKernel()->getGraphicsEngine()->getScene()->remove( m_rootNode );
> // disconnect from picking
> - boost::shared_ptr< WGEViewer > viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "main" );
> + boost::shared_ptr< WGEViewer > viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "Main View" );
> if( viewer->getPickHandler() )
> {
> viewer->getPickHandler()->getPickSignal()->disconnect( boost::bind( &WMHud::updatePickText, this, _1 ) );
> @@ -207,7 +207,7 @@
> }
>
> // connect updateGFX with picking
> - boost::shared_ptr< WGEViewer > viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "main" );
> + boost::shared_ptr< WGEViewer > viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "Main View" );
> WAssert( viewer, "Requested viewer (main) not found." );
> if(viewer->getPickHandler() )
> {
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/modules/lineGuidedSlice/WMLineGuidedSlice.cpp
> --- a/src/modules/lineGuidedSlice/WMLineGuidedSlice.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/modules/lineGuidedSlice/WMLineGuidedSlice.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -100,7 +100,7 @@
> boost::shared_ptr< WGraphicsEngine > ge = WGraphicsEngine::getGraphicsEngine();
> assert( ge );
>
> - m_viewer = ge->getViewerByName( "main" );
> + m_viewer = ge->getViewerByName( "Main View" );
> assert( m_viewer );
> m_viewer->getPickHandler()->getPickSignal()->connect( boost::bind( &WMLineGuidedSlice::setSlicePosFromPick, this, _1 ) );
>
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/modules/navigationSlices/WMNavigationSlices.cpp
> --- a/src/modules/navigationSlices/WMNavigationSlices.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/modules/navigationSlices/WMNavigationSlices.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -289,7 +289,7 @@
> m_dir( negateDirection ? -1.0 : 1.0 )
> {
> boost::shared_ptr< WGraphicsEngine > ge = WGraphicsEngine::getGraphicsEngine();
> - boost::shared_ptr< WGEViewer > viewer = ge->getViewerByName( "main" );
> + boost::shared_ptr< WGEViewer > viewer = ge->getViewerByName( "Main View" );
> m_camera = viewer->getCamera();
> m_pickConnection = viewer->getPickHandler()->getPickSignal()->connect( boost::bind( &WMNavigationSlices::PickCallback::pick, this, _1 ) );
> node->getOrCreateStateSet()->addUniform( m_pickUniform );
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/modules/sliceContext/WTransparentLinesDrawable.cpp
> --- a/src/modules/sliceContext/WTransparentLinesDrawable.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/modules/sliceContext/WTransparentLinesDrawable.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -51,7 +51,7 @@
> {
> boost::shared_ptr< WGraphicsEngine > ge = WGraphicsEngine::getGraphicsEngine();
> boost::shared_ptr< WGEViewer > viewer; //!< Stores reference to the main viewer
> - viewer = ge->getViewerByName( "main" );
> + viewer = ge->getViewerByName( "Main View" );
> WPosition endPos = WPosition( wge::unprojectFromScreen( WPosition( 0.0, 0.0, 1.0 ), viewer->getCamera() ) );
> WPosition startPos = WPosition( wge::unprojectFromScreen( WPosition(), viewer->getCamera() ) );
> WPosition viewDir = normalize( endPos - startPos );
> diff -r 59af76a83ec3 -r 2f0eaa222dbf src/qt4gui/qt4/WMainWindow.cpp
> --- a/src/qt4gui/qt4/WMainWindow.cpp Fri Dec 16 19:13:49 2011 +0100
> +++ b/src/qt4gui/qt4/WMainWindow.cpp Fri Dec 16 23:36:57 2011 +0100
> @@ -232,7 +232,7 @@
> m_glDock->setDockOptions( QMainWindow::AnimatedDocks | QMainWindow::AllowNestedDocks | QMainWindow::AllowTabbedDocks );
> m_glDock->setDocumentMode( true );
> setCentralWidget( m_glDock );
> - WQtGLDockWidget* mainGLDock = new WQtGLDockWidget( "main", "3D View", m_glDock );
> + WQtGLDockWidget* mainGLDock = new WQtGLDockWidget( "Main View", "3D View", m_glDock );
> mainGLDock->getGLWidget()->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
> m_mainGLWidget = mainGLDock->getGLWidget();
> m_mainGLWidgetScreenCapture = m_mainGLWidget->getScreenCapture( this );
> @@ -772,7 +772,7 @@
> void WMainWindow::setPresetViewLeft()
> {
> boost::shared_ptr< WGEViewer > viewer;
> - viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "main" );
> + viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "Main View" );
> osg::ref_ptr<osgGA::TrackballManipulator> cm = osg::dynamic_pointer_cast<osgGA::TrackballManipulator>( viewer->getCameraManipulator() );
> osg::Quat q( 0.5, -0.5, -0.5, 0.5 );
> cm->setRotation( q );
> @@ -781,7 +781,7 @@
> void WMainWindow::setPresetViewRight()
> {
> boost::shared_ptr< WGEViewer > viewer;
> - viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "main" );
> + viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "Main View" );
> osg::ref_ptr<osgGA::TrackballManipulator> cm = osg::dynamic_pointer_cast<osgGA::TrackballManipulator>( viewer->getCameraManipulator() );
> osg::Quat q( -0.5, -0.5, -0.5, -0.5 );
> cm->setRotation( q );
> @@ -790,7 +790,7 @@
> void WMainWindow::setPresetViewSuperior()
> {
> boost::shared_ptr< WGEViewer > viewer;
> - viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "main" );
> + viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "Main View" );
> osg::ref_ptr<osgGA::TrackballManipulator> cm = osg::dynamic_pointer_cast<osgGA::TrackballManipulator>( viewer->getCameraManipulator() );
> osg::Quat q( 0., 0., 0., 1 );
> cm->setRotation( q );
> @@ -799,7 +799,7 @@
> void WMainWindow::setPresetViewInferior()
> {
> boost::shared_ptr< WGEViewer > viewer;
> - viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "main" );
> + viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "Main View" );
> osg::ref_ptr<osgGA::TrackballManipulator> cm = osg::dynamic_pointer_cast<osgGA::TrackballManipulator>( viewer->getCameraManipulator() );
> osg::Quat q( 0., -1., 0., 0. );
> cm->setRotation( q );
> @@ -808,7 +808,7 @@
> void WMainWindow::setPresetViewAnterior()
> {
> boost::shared_ptr< WGEViewer > viewer;
> - viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "main" );
> + viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "Main View" );
> osg::ref_ptr<osgGA::TrackballManipulator> cm = osg::dynamic_pointer_cast<osgGA::TrackballManipulator>( viewer->getCameraManipulator() );
> osg::Quat q( 0., -0.707107, -0.707107, 0. );
> cm->setRotation( q );
> @@ -817,7 +817,7 @@
> void WMainWindow::setPresetViewPosterior()
> {
> boost::shared_ptr< WGEViewer > viewer;
> - viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "main" );
> + viewer = WKernel::getRunningKernel()->getGraphicsEngine()->getViewerByName( "Main View" );
> osg::ref_ptr<osgGA::TrackballManipulator> cm = osg::dynamic_pointer_cast<osgGA::TrackballManipulator>( viewer->getCameraManipulator() );
> osg::Quat q( 0.707107, 0., 0., 0.707107 );
> cm->setRotation( q );
> _______________________________________________
> All-openwalnut-commits mailing list
> All-openwalnut-commits at lists.informatik.uni-leipzig.de
> http://lists.informatik.uni-leipzig.de/mailman/listinfo/all-openwalnut-commits
>
More information about the OpenWalnut-Dev
mailing list