Join modifications from branch OCC_development_for_3_2_0a2

[modules/visu.git] / src / VISUGUI / VisuGUI_PopupTools.cxx

diff --git a/src/VISUGUI/VisuGUI_PopupTools.cxx b/src/VISUGUI/VisuGUI_PopupTools.cxx
index b4ca7c2079eda64b23b1b2c1fd0852084e1bacec..682997773b06824d0155f94a037d898b82bcc271 100644 (file)
--- a/src/VISUGUI/VisuGUI_PopupTools.cxx
+++ b/src/VISUGUI/VisuGUI_PopupTools.cxx
@@ -26,15 +26,17 @@
 //  Module : VISU
 
 #include "VisuGUI_PopupTools.h"
+
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_Tools.h"
-#include "SalomeApp_Study.h"
-#include "LightApp_Study.h"
+
+#include "VISU_Result_i.hh"
 
 #include "VISU_Actor.h"
 #include "VISU_ScalarMapAct.h"
-#include "VISU_Result_i.hh"
+
 #include "SalomeApp_Study.h"
+#include "LightApp_Study.h"
 
 using namespace VISU;
 
@@ -211,10 +213,10 @@ QString VisuGUI_Selection::representation( const int ind ) const
 {
   QString aResStr;
 
-  if ( SVTK_ViewWindow* aView = GetViewWindow( myModule ) ){
-    if ( VISU_Actor* anVISUActor = FindActor( aView, entry( ind ).latin1() ) ){
+  if (SVTK_ViewWindow* aView = GetActiveViewWindow<SVTK_ViewWindow>(myModule)) {
+    if (VISU_Actor* anVISUActor = FindActor(aView, entry(ind).latin1())) {
       int aRepresent = anVISUActor->GetRepresentation();
-      switch ( aRepresent ){
+      switch (aRepresent) {
        ENUM2STRING( aResStr, VISU::POINT );
        ENUM2STRING( aResStr, VISU::WIREFRAME );
        ENUM2STRING( aResStr, VISU::SHADED );
@@ -278,8 +280,8 @@ namespace
        const QString& theEntry)
     {
       typedef typename TViewer::TViewWindow TViewWindow;
-      if(TViewWindow* aViewWindow = GetViewWindow<TViewer>(theModule))
-       if(VISU_Actor* anActor = FindActor(aViewWindow,theEntry.latin1()))
+      if (TViewWindow* aViewWindow = GetActiveViewWindow<TViewWindow>(theModule))
+       if (VISU_Actor* anActor = FindActor(aViewWindow,theEntry.latin1()))
          return anActor->GetVisibility() ? "true" : "false";
 
       return QString();
@@ -315,7 +317,7 @@ QString VisuGUI_Selection::isShrunk( const int ind ) const
 {
   QString aResStr;
 
-  if ( SVTK_ViewWindow* aView = GetViewWindow( myModule ) )
+  if ( SVTK_ViewWindow* aView = GetActiveViewWindow<SVTK_ViewWindow>(myModule) )
     if ( VISU_Actor* anVISUActor = FindActor( aView, entry( ind ).latin1() ) )
       if ( anVISUActor->IsShrunkable() )
        aResStr = anVISUActor->IsShrunk() ? "1" : "0";
@@ -332,7 +334,7 @@ QString VisuGUI_Selection::isShading( const int ind ) const
 {
   QString aResStr;
   
-  if ( SVTK_ViewWindow* aView = GetViewWindow( myModule ) )
+  if ( SVTK_ViewWindow* aView = GetActiveViewWindow<SVTK_ViewWindow>(myModule) )
     if ( VISU_Actor* anVISUActor = FindActor( aView, entry( ind ).latin1() ) )
       if ( VISU_ScalarMapAct* anActor = dynamic_cast<VISU_ScalarMapAct*>(anVISUActor) )
        aResStr = anActor->IsShading() ? "1" : "0";
@@ -344,12 +346,12 @@ QString VisuGUI_Selection::isScalarMapAct( const int ind ) const
 {
   QString aResStr;
 
-  if ( SVTK_ViewWindow* aView = GetViewWindow( myModule ) )
+  if ( SVTK_ViewWindow* aView = GetActiveViewWindow<SVTK_ViewWindow>(myModule) )
     if ( VISU_Actor* anVISUActor = FindActor( aView, entry( ind ).latin1() ) )
-      {
-       VISU_ScalarMapAct* anActor = dynamic_cast<VISU_ScalarMapAct*>(anVISUActor);
-       aResStr = anActor ? "1" : "0";
-      }
-  
+    {
+      VISU_ScalarMapAct* anActor = dynamic_cast<VISU_ScalarMapAct*>(anVISUActor);
+      aResStr = anActor ? "1" : "0";
+    }
+
   return aResStr;
 }