From: dmv <dmv@opencascade.com>
Date: Tue, 14 Apr 2009 08:07:03 +0000 (+0000)
Subject: IPAL21035 It's impossible to hide scalar bar for gauss points
X-Git-Tag: V5_1_main_20090514~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c3e8aaf4087e547a247463f52069a8cf69686dbf;p=modules%2Fvisu.git

IPAL21035 It's impossible to hide scalar bar for gauss points
---

diff --git a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc
index 236082bf..a4a22329 100644
--- a/doc/salome/gui/VISU/input/viewing_3d_presentations.doc
+++ b/doc/salome/gui/VISU/input/viewing_3d_presentations.doc
@@ -19,6 +19,8 @@ options:
 visualization and NOT all properties can be set for a certain 3D
 presentation.
 
+\anchor filter_by_scalars_anchor
+
 <ul>
 <li><b>Hide all</b> - allows to hide all objects from the
 viewer.</li>
@@ -34,6 +36,8 @@ the minimum and the maximum values for the <b>Scalar Range</b></li>
 
 \image html viewing4.png 
 
+\anchor rename_anchor
+
 <li><b>Rename</b> - allows to rename the presentation.</li>
 <li><b>Copy</b> - allows to create a copy of the presentation in the
 same subfolder (time stamp) in the Object Browser.</li>
@@ -50,6 +54,8 @@ cells or nodes of a 3D presentation.
 \image html values_labeling.png
 </li>
 
+\anchor labeling_parameters_anchor
+
 <li><b>Labeling Parameters</b> allows to change such labeling parameters as font and color.
 
 \image html labeling_parameters.png
diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl
index f4027093..f2bd29f8 100644
--- a/idl/VISU_Gen.idl
+++ b/idl/VISU_Gen.idl
@@ -762,6 +762,16 @@ module VISU {
 
     //! Get value of the distance between global and local scalar bars.
     double GetSpacing();
+    
+    /*!
+     * Returns visibility state of scalar bar
+     */
+    boolean IsBarVisible();
+
+    /*!
+     * Sets visibility state of scalar bar
+     */
+    void SetBarVisible(in boolean theVisible);
 
     /*!  
      * Set the Multicolored mode.
@@ -886,6 +896,8 @@ module VISU {
 
     //! Defines how many faces of can be drawn in the Geometrical Sphere primitive mode
     long GetFaceLimit();
+    
+    
   };
 
 
diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index a26d58fb..5dd12bbd 100644
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -727,8 +727,8 @@ VISU_GaussPtsAct
   myPreHighlightActor->SetVisibility(false);
   myCursorPyramid->SetVisibility(false);  
 
-  if (!myBarVisibility)
-    return false;
+/*  if (!myBarVisibility)
+    return false;*/
 
 
   if(!theIsHighlight)
@@ -866,8 +866,8 @@ VISU_GaussPtsAct
     return true;
   }
   
-  if (!myBarVisibility)
-    return false;
+/*  if (!myBarVisibility)
+    return false;*/
 
 
   if(aSelectionMode == ActorSelection)
diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 78b6396b..76136ddc 100644
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -1414,7 +1414,6 @@ void
 VisuGUI
 ::SetScalarBarVisibility(bool theVisibility)
 {
-  printf ("\nOnHideScalarBar");
   LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this);
   SALOME_ListIO aListIO;
   aSelectionMgr->selectedObjects(aListIO);
@@ -1424,18 +1423,21 @@ VisuGUI
   bool update = false;
   for (; It.More(); It.Next()) {
     Handle(SALOME_InteractiveObject)& anIO = It.Value();
-    std::vector<VISU::Prs3d_i*> aPrsList = GetPrs3dList(this, anIO);
-    if (!aPrsList.empty()) {
+    std::vector<VISU::Prs3d_i*> aPrsList = GetPrs3dList(this, anIO, true);
+    if ( aPrsList.size()>0 ) {
       for (int i = 0, n = aPrsList.size(); i < n; i++) {
         VISU::Prs3d_i* aPrsObject = aPrsList[i];
         if (aPrsObject) {
-          VISU::ScalarMap_i* aScalar = dynamic_cast<VISU::ScalarMap_i*>(aPrsObject);
-          if (aScalar) {
+          if (VISU::ScalarMap_i* aScalar = dynamic_cast<VISU::ScalarMap_i*>(aPrsObject)) {
             aScalar->SetBarVisible( theVisibility );
             RecreateActor(this, aScalar);
             update = true;
-          }
-        }
+          } else if (VISU::GaussPoints_i* aGauss = dynamic_cast<VISU::GaussPoints_i*>(aPrsObject)) {
+            aGauss->SetBarVisible( theVisibility );
+            RecreateActor(this, aGauss);
+            update = true;
+	  }
+	}
       }
     }
   }
@@ -2945,8 +2947,8 @@ VisuGUI
   QString aTableOrContShow = "(($type in {'VISU::TTABLE' 'VISU::TPOINTMAP3D' 'VISU::TCONTAINER'}) and isPlot2dViewer and hasCurves and isThereAreHiddenCurves)";
   QString orCurveVisible   = "or (type='VISU::TCURVE' and isVisible)";
   QString orCurveInvisible = "or (type='VISU::TCURVE'" + andInvisible + ")";
-  QString aPrsVisible   = "(($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D'" + aPrsAll + "}) and isVisible and (not isPlot2dViewer))";
-  QString aPrsInvisible = "(($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D'" + aPrsAll + "})" + andInvisible + " and (not isPlot2dViewer))";
+  QString aPrsVisible   = "(($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D' 'VISU::TGAUSSPOINTS'" + aPrsAll + "}) and isVisible and (not isPlot2dViewer))";
+  QString aPrsInvisible = "(($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D' 'VISU::TGAUSSPOINTS'" + aPrsAll + "})" + andInvisible + " and (not isPlot2dViewer))";
   QString aComponent = "( selcount=1 and canBeDisplayed and isVisuComponent )";
 
   QString anEraseRule = "( selcount>0 and ({true} in $canBeDisplayed) and (" + aPrsVisible +
@@ -2955,12 +2957,12 @@ VisuGUI
   QString aDisplayRule = "( selcount>0 and ({true} in $canBeDisplayed) and (" + aPrsInvisible +
     " or (   (" + aTableOrContShow + orCurveInvisible + "))) ) or " + aComponent;
 
-  QString aDOnlyRule = "( selcount>0 and ({true} in $canBeDisplayed) and (($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D'" + aPrsAll + "})"
+  QString aDOnlyRule = "( selcount>0 and ({true} in $canBeDisplayed) and (($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D' 'VISU::TGAUSSPOINTS'" + aPrsAll + "})"
     " or (   ((type='VISU::TTABLE' and nbChildren>0) or"
     " ($type in {'VISU::TCURVE' 'VISU::TCONTAINER'})))) ) or" + aComponent;
 
-  QString aScalarBarHideRule = "( selcount>0 and ($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D'" + aPrsAll + "}) and isScalarMapAct=1 and " + aPrsVisible + " and isScalarBarVisible )";
-  QString aScalarBarShowRule = "( selcount>0 and ($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D'" + aPrsAll + "}) and isScalarMapAct=1 and " + aPrsVisible + " and (not isScalarBarVisible) )";
+  QString aScalarBarHideRule = "( selcount>0 and ($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D' 'VISU::TGAUSSPOINTS'" + aPrsAll + "}) and (isScalarMapAct=1  or isGaussPtsAct=1 ) and " + aPrsVisible + " and isScalarBarVisible )";
+  QString aScalarBarShowRule = "( selcount>0 and ($type in {'VISU::TMESH' 'VISU::TPOINTMAP3D' 'VISU::TGAUSSPOINTS'" + aPrsAll + "}) and ( isScalarMapAct=1 or isGaussPtsAct=1 ) and " + aPrsVisible + " and (not isScalarBarVisible) )";
 
   mgr->setRule( action( VISU_ERASE ), anEraseRule );
   mgr->setRule( action( VISU_DISPLAY ), aDisplayRule );
diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx
index ce511b71..31869571 100644
--- a/src/VISUGUI/VisuGUI_Module.cxx
+++ b/src/VISUGUI/VisuGUI_Module.cxx
@@ -323,7 +323,7 @@ void VisuGUI_Module::initialize( CAM_Application* theApp )
 
   aRule = "(selcount>0 and type='VISU::TGAUSSPOINTS')";
 
-  createAction( GAUSS_ERASE_PRS, VisuGUI::tr("MEN_HIDE"), QIcon(),
+/*  createAction( GAUSS_ERASE_PRS, VisuGUI::tr("MEN_HIDE"), QIcon(),
                 VisuGUI::tr("MEN_HIDE"), "", 0, this, false,
                 this, SLOT(OnErasePrs()));
   mgr->insert( action( GAUSS_ERASE_PRS ), -1, -1, -1 ); // erase
@@ -342,7 +342,7 @@ void VisuGUI_Module::initialize( CAM_Application* theApp )
                 this, SLOT(OnDisplayOnlyPrs()));
   mgr->insert( action( GAUSS_DISPLAY_ONLY_PRS ), -1, -1, -1 ); // display only
   mgr->setRule( action( GAUSS_DISPLAY_ONLY_PRS ),
-    aRule + " and ({true} in $canBeDisplayed)" );
+    aRule + " and ({true} in $canBeDisplayed)" );*/
 
   createAction( GAUSS_RENAME_CONFIGURATION, VisuGUI::tr("MEN_RENAME"), QIcon(),
 		VisuGUI::tr("MEN_RENAME"), "", 0, this, false,
diff --git a/src/VISUGUI/VisuGUI_Selection.cxx b/src/VISUGUI/VisuGUI_Selection.cxx
index 398f1744..38b56d3b 100644
--- a/src/VISUGUI/VisuGUI_Selection.cxx
+++ b/src/VISUGUI/VisuGUI_Selection.cxx
@@ -34,6 +34,7 @@
 
 #include "VISU_Actor.h"
 #include "VISU_ScalarMapAct.h"
+#include "VISU_GaussPtsAct.h"
 
 #include "SalomeApp_Study.h"
 #include "LightApp_Study.h"
@@ -64,6 +65,7 @@ QVariant VisuGUI_Selection::parameter( const int ind, const QString& p ) const
     else if ( p == "hasActor"       ) val = QVariant( hasActor( ind ) );
     else if ( p == "isShading"      ) val = QVariant( isShading( ind ) );
     else if ( p == "isScalarMapAct" ) val = QVariant( isScalarMapAct( ind ) );
+    else if ( p == "isGaussPtsAct" ) val = QVariant( isGaussPtsAct( ind ) );
     else if ( p == "isVisuComponent") val = QVariant( isVisuComponent( ind ) );
     else if ( p == "fullResolution"   ) val = QVariant( fullResolution( ind ) );
     else if ( p == "mediumResolution"   ) val = QVariant( mediumResolution( ind ) );
@@ -607,6 +609,25 @@ QString VisuGUI_Selection::isScalarMapAct( const int ind ) const
   return TPopupDispatcher<TIsScalarMapActFunctor>()(myModule, entry(ind));
 }
 
+//----------------------------------------------------------------------------
+struct TIsGaussPtsActFunctor: TViewFunctor
+{
+  QString
+  virtual
+  get(VISU::Prs3d_i* thePrs3d,
+      SVTK_ViewWindow* theViewWindow,
+      VISU_Actor* theActor)
+  {
+    return dynamic_cast<VISU_GaussPtsAct*>(theActor)? "1" : "0";
+  }
+};
+
+
+//---------------------------------------------------------------
+QString VisuGUI_Selection::isGaussPtsAct( const int ind ) const
+{
+  return TPopupDispatcher<TIsGaussPtsActFunctor>()(myModule, entry(ind));
+}
 
 //----------------------------------------------------------------------------
 bool VisuGUI_Selection::isVisuComponent( const int ind ) const
@@ -734,6 +755,8 @@ struct TIsScalarBarVisibleFunctor: TViewFunctor
   {
     if(VISU_ScalarMapAct* anActor = dynamic_cast<VISU_ScalarMapAct*>(theActor))
       return anActor->GetBarVisibility() ? "true" : "false";
+    else if ( VISU_GaussPtsAct* anActor = dynamic_cast<VISU_GaussPtsAct*>(theActor))
+      return anActor->GetBarVisibility() ? "true" : "false";
     return QString();
   }
 };
diff --git a/src/VISUGUI/VisuGUI_Selection.h b/src/VISUGUI/VisuGUI_Selection.h
index dede2e8f..5026d72b 100644
--- a/src/VISUGUI/VisuGUI_Selection.h
+++ b/src/VISUGUI/VisuGUI_Selection.h
@@ -59,6 +59,7 @@ private:
   bool             hasActor( const int ) const;
   QString          isShading( const int ) const;
   QString          isScalarMapAct( const int ) const;
+  QString          isGaussPtsAct( const int ) const;
   bool             isScalarBarVisible( const int ) const;
   bool             isVisuComponent( const int ) const;
   QString          isValuesLabeled( const int ) const;
diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx
index ae7155c1..97eabc84 100644
--- a/src/VISUGUI/VisuGUI_Tools.cxx
+++ b/src/VISUGUI/VisuGUI_Tools.cxx
@@ -1281,19 +1281,21 @@ namespace VISU
   // GetPrs3dList: find list of presentations for the given object
   // ========================================================================================
   std::vector<VISU::Prs3d_i*> GetPrs3dList (const SalomeApp_Module* theModule,
-                                            const Handle(SALOME_InteractiveObject)& theIO)
+                                            const Handle(SALOME_InteractiveObject)& theIO,
+					    bool theGP)
   {
     std::vector<VISU::Prs3d_i*> aList;
     if (!theIO.IsNull() && theIO->hasEntry()) {
       _PTR(Study) aCStudy = GetCStudy(GetAppStudy(theModule));
       _PTR(SObject) aSObject = aCStudy->FindObjectID(theIO->getEntry());
-      aList = GetPrs3dList(theModule, aSObject);
+      aList = GetPrs3dList(theModule, aSObject, theGP);
     }
     return aList;
   }
 
   std::vector<VISU::Prs3d_i*> GetPrs3dList (const SalomeApp_Module* theModule,
-                                            _PTR(SObject) theObject)
+                                            _PTR(SObject) theObject,
+					    bool theGP)
   {
     std::vector<VISU::Prs3d_i*> aList; int k = 0;
     if (!theObject)
@@ -1307,6 +1309,8 @@ namespace VISU
       if (!CORBA::is_nil(aVisuObj)) {
         VISU::VISUType aType = aVisuObj->GetType();
         switch (aType) {
+	case VISU::TGAUSSPOINTS:
+	  if ( !theGP ) break;
 	case VISU::TSCALARMAP:
         case VISU::TISOSURFACES:
         case VISU::TDEFORMEDSHAPE:
diff --git a/src/VISUGUI/VisuGUI_Tools.h b/src/VISUGUI/VisuGUI_Tools.h
index 1faa3d7d..4ad92fab 100644
--- a/src/VISUGUI/VisuGUI_Tools.h
+++ b/src/VISUGUI/VisuGUI_Tools.h
@@ -230,9 +230,11 @@ namespace VISU
   
   // Others
   std::vector<VISU::Prs3d_i*> GetPrs3dList (const SalomeApp_Module* theModule,
-					    const Handle(SALOME_InteractiveObject)& theIO);
+					    const Handle(SALOME_InteractiveObject)& theIO,
+					    bool theGP = false);
   std::vector<VISU::Prs3d_i*> GetPrs3dList (const SalomeApp_Module* theModule,
-					    _PTR(SObject) theObject);
+					    _PTR(SObject) theObject,
+					    bool theGP = false);
   
   int GetFreePositionOfDefaultScalarBar(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow);
   void AddScalarBarPosition(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow,
diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc
index c91a9c01..04ff5006 100644
--- a/src/VISU_I/VISU_DumpPython.cc
+++ b/src/VISU_I/VISU_DumpPython.cc
@@ -408,6 +408,9 @@ namespace VISU
 
     theStr<<thePrefix<<theName<<".SetMagnification("<<theServant->GetMagnification()<<")"<<endl;
     theStr<<thePrefix<<theName<<".SetMagnificationIncrement("<<theServant->GetMagnificationIncrement()<<")"<<endl;
+    
+    std::string aVisible = theServant->IsBarVisible()? "True" : "False";
+    theStr<<thePrefix<<theName<<".SetBarVisible("<<aVisible<<")"<<endl;
 
     return thePrefix;
   }
diff --git a/src/VISU_I/VISU_GaussPoints_i.cc b/src/VISU_I/VISU_GaussPoints_i.cc
index 6c5efd3f..04d52a8b 100644
--- a/src/VISU_I/VISU_GaussPoints_i.cc
+++ b/src/VISU_I/VISU_GaussPoints_i.cc
@@ -139,7 +139,8 @@ VISU::GaussPoints_i
   myIsActiveLocalScalarBar(true),
   myIsDispGlobalScalarBar(true),
   mySpacing(0.01),
-  myFaceLimit(50000)
+  myFaceLimit(50000),
+  myShowBar(true)
 {
   if(MYDEBUG) MESSAGE("GaussPoints_i::GaussPoints_i - this = "<<this);
 }
@@ -215,6 +216,8 @@ VISU::GaussPoints_i
   anAlphaTexture = aResourceMgr->stringValue( "VISU", "point_sprite_alpha_texture", anAlphaTexture );
 
   SetTextures( aMainTexture.toLatin1().data(), anAlphaTexture.toLatin1().data() );
+  
+  myShowBar = true;
 
   return this;
 }
@@ -239,6 +242,8 @@ VISU::GaussPoints_i
 
     SetColor(anOrigin->GetColor());
 
+    SetBarVisible(anOrigin->IsBarVisible());
+
     SetTextures(anOrigin->GetMainTexture(), anOrigin->GetAlphaTexture());
   }
 }
@@ -270,6 +275,9 @@ VISU::GaussPoints_i
   CORBA::String_var aPixMapName = aPixmap->GetPixMap();
   if(strcmp(GetIconName(), aPixMapName.in()) != 0)
     aPixmap->SetPixMap(GetIconName());
+    
+  QString aVal = VISU::Storable::FindValue(theMap,"myShowBar", "1");
+  SetBarVisible((aVal.toInt() == 1)? true : false);
 
   SetIsActiveLocalScalarBar(Storable::FindValue(theMap,"myIsActiveLocalScalarBar").toInt());
   SetIsDispGlobalScalarBar(Storable::FindValue(theMap,"myIsDispGlobalScalarBar").toInt());
@@ -345,6 +353,7 @@ VISU::GaussPoints_i
   Storable::DataToStream( theStr, "myAlphaTexture", GetQAlphaTexture() );
 
   Storable::DataToStream( theStr, "myResolution", GetResolution() );
+  Storable::DataToStream( theStr, "myShowBar",    (IsBarVisible()? 1:0) );
 }
 
 
@@ -787,7 +796,15 @@ VISU::GaussPoints_i
   return IsPossible(GetCResult(),GetCMeshName(),GetEntity(),GetCFieldName(),GetTimeStampNumber(),true);
 }
 
-
+void VISU::GaussPoints_i::SetBarVisible(CORBA::Boolean theVisible) 
+{ 
+  if (myShowBar == theVisible)
+    return;
+  VISU::TSetModified aModified(this);
+  myShowBar = theVisible; 
+  myParamsTime.Modified();
+}
+      
 //----------------------------------------------------------------------------
 void
 VISU::GaussPoints_i
@@ -856,6 +873,7 @@ VISU::GaussPoints_i
 ::CreateActor() 
 {
   VISU_GaussPtsAct* anActor = VISU_GaussPtsAct::New();
+  anActor->SetBarVisibility(myShowBar);
   if(OnCreateActor(anActor))
     return anActor;
   return NULL;
@@ -928,7 +946,6 @@ VISU::GaussPoints_i
   if(VISU_GaussPtsAct* anActor = dynamic_cast<VISU_GaussPtsAct*>(theActor)){
     VISU_ScalarBarCtrl *aScalarBarCtrl = anActor->GetScalarBarCtrl();
     if(GetIsColored()){
-      anActor->SetBarVisibility(true);
       GetPipeLine()->GetMapper()->SetScalarVisibility(1);
 
       if(IsRangeFixed()){
@@ -988,14 +1005,14 @@ VISU::GaussPoints_i
 
       aScalarBarCtrl->Update();
     }else{
-      anActor->SetBarVisibility(false);
-
       GetPipeLine()->GetMapper()->SetScalarVisibility(0);
 
       anActor->GetProperty()->SetColor(myColor.red() / 255.0,
 				       myColor.green() / 255.0,
 				       myColor.blue() / 255.0);
     }
+    
+    anActor->SetBarVisibility(myShowBar); 
 
     if( GetSpecificPL()->GetPrimitiveType() != VISU_OpenGLPointSpriteMapper::GeomSphere )
       theActor->SetRepresentation( VTK_POINTS );
diff --git a/src/VISU_I/VISU_GaussPoints_i.hh b/src/VISU_I/VISU_GaussPoints_i.hh
index 5d623de2..740cd61f 100644
--- a/src/VISU_I/VISU_GaussPoints_i.hh
+++ b/src/VISU_I/VISU_GaussPoints_i.hh
@@ -120,7 +120,7 @@ namespace VISU
     //! Get path to the image using for Main Point Sprite texture.
     QString
     GetQMainTexture();
-
+    
     char*
     GetMainTexture();
 
@@ -271,6 +271,10 @@ namespace VISU
     { 
       return myGaussPointsPL; 
     }
+    
+    virtual CORBA::Boolean IsBarVisible() { return myShowBar; }
+       
+    virtual void SetBarVisible(CORBA::Boolean theVisible);
 
     //----------------------------------------------------------------------------
     //! Sets initial source geometry
@@ -400,6 +404,9 @@ namespace VISU
     virtual 
     void
     UpdateFromActor(VISU_GaussPtsAct* theActor);
+    
+    private:
+      bool myShowBar;
   };
 }