lot 10 - warnings for DTM - untested

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ViewerDlg.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx b/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
index 3c51c10097e55f8b6aa3137cd94d3d4164f3a94a..a2b58bc1f4bdbb6428f2bd5d02902fc837ea8e61 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_ViewerDlg.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -47,16 +43,19 @@
 #include <QLineEdit>
 #include <QMouseEvent>
 
-HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QString& theTitle )
-: HYDROGUI_InputPanel( theModule, theTitle )
+HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QString& theTitle, bool isSplitter, bool dispTrihedron )
+: HYDROGUI_InputPanel( theModule, theTitle, true, isSplitter )
 {
-  QWidget* viewMain = new QWidget( mainFrame() );
-  QVBoxLayout* viewBase = new QVBoxLayout( viewMain );
-  viewBase->setMargin( 0 );
-
   SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-  myViewManager = new OCCViewer_ViewManager( theModule->getApp()->activeStudy(), 0 );
-  OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( true );
+#ifndef TEST_MODE
+  SUIT_Study* aStudy = theModule ? theModule->application()->activeStudy() : 0;
+#else
+  SUIT_Study* aStudy = 0;
+#endif
+  myViewManager = new OCCViewer_ViewManager( aStudy, 0 );
+  bool IsChainedPan = aResMgr->booleanValue( "HYDRO", "chained_panning" );
+  myViewManager->setChainedOperations(IsChainedPan);
+  OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( dispTrihedron );
 
   aViewer->setBackground( OCCViewer_ViewFrame::TOP_LEFT,
                           aResMgr->backgroundValue( "OCCViewer", "xz_background", aViewer->background(OCCViewer_ViewFrame::TOP_LEFT) ) );
@@ -76,7 +75,7 @@ HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QStrin
 
   myViewManager->setViewModel( aViewer );// custom view model, which extends SALOME_View interface
 
-  aViewer->enableMultiselection( false );
+  //aViewer->enableMultiselection( false );
 
   SUIT_ViewWindow* aViewWin = myViewManager->createViewWindow();
   aViewer->setStaticTrihedronDisplayed( false );
@@ -90,7 +89,7 @@ HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QStrin
     anAISContext->Deactivate( aTrihedron );
   }
   */
-  viewBase->addWidget( aViewWin );
+  addWidget( aViewWin, 1 );
 
   // Coordinates
   connect( myViewManager, SIGNAL( mouseMove( SUIT_ViewWindow*, QMouseEvent* ) ),
@@ -103,8 +102,8 @@ HYDROGUI_ViewerDlg::HYDROGUI_ViewerDlg( HYDROGUI_Module* theModule, const QStrin
       aViewFrame->getViewPort()->installEventFilter( this );
   }
 
-  myCoordLabel = new QLabel( viewMain );
-  viewBase->addWidget( myCoordLabel );
+  myCoordLabel = new QLabel( mainFrame() );
+  addWidget( myCoordLabel, 0 );
 }
 
 HYDROGUI_ViewerDlg::~HYDROGUI_ViewerDlg()
@@ -117,14 +116,14 @@ bool HYDROGUI_ViewerDlg::event( QEvent* e )
 {
     if ( e->type() == QEvent::Polish )
     {
-        addWidget( myCoordLabel->parentWidget(), 4 );
+        //addWidget( myCoordLabel->parentWidget(), 4 );
 
         Handle(AIS_Trihedron) aTrihedron = trihedron();
         Handle(AIS_InteractiveContext) anAISContext = getAISContext();
         if ( !anAISContext.IsNull() && !aTrihedron.IsNull() )
         {
             viewer()->setTrihedronShown( false );
-            anAISContext->Display( aTrihedron );
+            anAISContext->Display( aTrihedron, true );
             anAISContext->Deactivate( aTrihedron );
         }
     }
@@ -150,6 +149,10 @@ OCCViewer_ViewManager* HYDROGUI_ViewerDlg::viewManager() const
 
 SUIT_SelectionMgr* HYDROGUI_ViewerDlg::selectionMgr() const
 {
+#ifdef TEST_MODE
+  static SUIT_SelectionMgr* mgr = new SUIT_SelectionMgr();
+  return mgr;
+#else
     SUIT_SelectionMgr* aSelMgr = 0;
     if ( module() )
     {
@@ -158,6 +161,7 @@ SUIT_SelectionMgr* HYDROGUI_ViewerDlg::selectionMgr() const
             aSelMgr = app->selectionMgr();
     }
     return aSelMgr;
+#endif
 }
 
 void HYDROGUI_ViewerDlg::onMouseMove( SUIT_ViewWindow* theViewWindow, QMouseEvent* theEvent )