X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Hypotheses.cxx;h=f313c8ce2cba016f685848be11629ca21aec2226;hb=651e7566c8d9c267c71320c63d3742a92426aa3e;hp=504607da543b8e70bdf7004f2e04a889f38568c1;hpb=5482b99d07dd144fd5be299e722f39a81de3b5be;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index 504607da5..f313c8ce2 100644
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -29,6 +29,8 @@
 #include "SMESHGUI_HypothesesUtils.h"
 #include "SMESHGUI_Utils.h"
 #include "SMESHGUI_SpinBox.h"
+#include "SMESHGUI_VTKUtils.h"
+#include "SMESH_Actor.h"
 
 // SALOME KERNEL includes
 #include <SALOMEDSClient_Study.hxx>
@@ -42,6 +44,7 @@
 #include <SUIT_Session.h>
 #include <SalomeApp_IntSpinBox.h>
 #include <SalomeApp_Tools.h>
+#include <SVTK_ViewWindow.h>
 
 // Qt includes
 #include <QFrame>
@@ -85,17 +88,16 @@ void SMESHGUI_GenericHypothesisCreator::create( SMESH::SMESH_Hypothesis_ptr init
                                                 const QString& theHypName,
                                                 QWidget* parent, QObject* obj, const QString& slot )
 {
-  MESSAGE( "Creation of hypothesis with initial params" );
   setInitParamsHypothesis( initParamsHyp );
   create( false, theHypName, parent, obj, slot );
 }
 
 void SMESHGUI_GenericHypothesisCreator::create( bool           isAlgo,
                                                 const QString& theHypName,
-                                                QWidget* theParent, QObject* obj, const QString& slot )
+                                                QWidget*       theParent,
+                                                QObject*       obj,
+                                                const QString& slot )
 {
-  MESSAGE( "Creation of hypothesis" );
-
   myIsCreate = true;
 
   // Create hypothesis/algorithm
@@ -316,6 +318,9 @@ void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result )
           aMesh = aSubMesh->GetFather();
         _PTR(SObject) meshSO = SMESH::FindSObject( aMesh );
         SMESH::ModifiedMesh( meshSO, false, aMesh->NbNodes()==0);
+        SMESH_Actor* actor = SMESH::FindActorByEntry( meshSO->GetID().c_str() );
+        if( actor && actor->GetVisibility() )
+          actor->Update();
       }
   }
   SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 );
@@ -327,6 +332,9 @@ void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result )
   myDlg->close();
   //delete myDlg; since WA_DeleteOnClose==true
   myDlg = 0;
+  if (SVTK_ViewWindow* vf = SMESH::GetCurrentVtkView()) {
+    vf->Repaint();
+  }
   emit finished( result );
 }
 
@@ -735,21 +743,23 @@ void SMESHGUI_HypothesisDlg::setType( const QString& t )
   myTypeLabel->setText( t );
 }
 
-HypothesisData::HypothesisData( const QString& theTypeName,
-                                const QString& thePluginName,
-                                const QString& theServerLibName,
-                                const QString& theClientLibName,
-                                const QString& theLabel,
-                                const QString& theIconId,
-                                const QString& theContext,
-                                const QList<int>& theDim,
-                                const bool theIsAuxOrNeedHyp,
+HypothesisData::HypothesisData( const QString&     theTypeName,
+                                const QString&     thePluginName,
+                                const QString&     theServerLibName,
+                                const QString&     theClientLibName,
+                                const QString&     theLabel,
+                                const QString&     theIconId,
+                                const QString&     theContext,
+                                const int          theGroupID,
+                                const int          thePriority,
+                                const QList<int>&  theDim,
+                                const bool         theIsAuxOrNeedHyp,
                                 const QStringList& theBasicHypos,
                                 const QStringList& theOptionalHypos,
                                 const QStringList& theInputTypes,
                                 const QStringList& theOutputTypes,
-                                const bool theIsNeedGeometry,
-                                const bool supportSub)
+                                const int          theIsNeedGeometry,
+                                const bool         theSupportSub)
   : TypeName( theTypeName ),
     PluginName( thePluginName ),
     ServerLibName( theServerLibName ),
@@ -757,10 +767,12 @@ HypothesisData::HypothesisData( const QString& theTypeName,
     Label( theLabel ),
     IconId( theIconId ),
     Context( theContext ),
+    GroupID( theGroupID ),
+    Priority( thePriority ),
     Dim( theDim ),
     IsAuxOrNeedHyp( theIsAuxOrNeedHyp ),
     IsNeedGeometry( theIsNeedGeometry ),
-    IsSupportSubmeshes( supportSub ),
+    IsSupportSubmeshes( theSupportSub ),
     BasicHypos( theBasicHypos ),
     OptionalHypos( theOptionalHypos ),
     InputTypes( theInputTypes ),