From: stv <stv@opencascade.com>
Date: Tue, 31 Mar 2015 10:06:33 +0000 (+0300)
Subject: Fit All after was added stream selection and displaying in embedded viewer.
X-Git-Tag: BR_hydro_v_1_0_5~11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=adf1c2cc49502c366a2637adfcda9c1c71b11887;p=modules%2Fhydro.git

Fit All after was added stream selection and displaying in embedded viewer.
---

diff --git a/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx
index 34fc43ce..4f328628 100644
--- a/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx
@@ -42,8 +42,9 @@
 #include <LightApp_UpdateFlags.h>
 
 #include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewManager.h>
+#include <OCCViewer_ViewPort3d.h>
 #include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewManager.h>
 #include <OCCViewer_AISSelector.h>
 
 #include <AIS_ListOfInteractive.hxx>
@@ -189,7 +190,7 @@ void HYDROGUI_ProfileInterpolateOp::updatePreview()
             {
                 myPreview = new AIS_Shape( aShape );
                 myPreview->SetColor( Quantity_NOC_RED );
-                aCtx->Display( myPreview, 0, -1, false );
+                aCtx->Display( myPreview, 1, -1, false );
             }
         }
     }
@@ -354,7 +355,22 @@ void HYDROGUI_ProfileInterpolateOp::onRiverChanged( const QString& theRiver )
                     Handle(AIS_Shape) aPrs = new AIS_Shape( aProfile->GetShape3D() );
                     aPrs->SetOwner( aProfile );
                     aPrs->SetColor( Quantity_NOC_BLACK );
-                    aCtx->Display( aPrs, 0, 0, false );
+                    aCtx->Display( aPrs, 1, 0, false );
+                }
+            }
+            OCCViewer_ViewManager* vm = aDlg->viewManager();
+            if ( vm )
+            {
+                QVector<SUIT_ViewWindow*> winList = vm->getViews();
+                for ( QVector<SUIT_ViewWindow*>::iterator it = winList.begin(); it != winList.end(); ++it )
+                {
+                    OCCViewer_ViewWindow* occWin = ::qobject_cast<OCCViewer_ViewWindow*>( *it );
+                    if ( occWin )
+                    {
+                        OCCViewer_ViewPort3d* vp = occWin->getViewPort();
+                        if ( vp )
+                            vp->fitAll();
+                    }
                 }
             }
         }
diff --git a/src/HYDROGUI/HYDROGUI_ViewerDlg.h b/src/HYDROGUI/HYDROGUI_ViewerDlg.h
index b806c520..e41b60e7 100644
--- a/src/HYDROGUI/HYDROGUI_ViewerDlg.h
+++ b/src/HYDROGUI/HYDROGUI_ViewerDlg.h
@@ -46,14 +46,14 @@ public:
 
   Handle(AIS_InteractiveContext) getAISContext();
 
-  virtual bool                   event( QEvent* );
-  virtual bool                   eventFilter( QObject*, QEvent* );
-
-protected:
   OCCViewer_Viewer*              viewer() const;
   OCCViewer_ViewManager*         viewManager() const;
   SUIT_SelectionMgr*             selectionMgr() const;
 
+  virtual bool                   event( QEvent* );
+  virtual bool                   eventFilter( QObject*, QEvent* );
+
+protected:
   virtual Handle(AIS_Trihedron)  trihedron();
 
 protected slots: