X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Hypotheses.cxx;h=f0130520042656880c67722f36340307a52e11ec;hb=88141f757b048eaa5aae0be49faaf274448bbcaf;hp=b1f0e20faa9e2ea3b49b1ec29bca6b58c9ef6349;hpb=eef0bf5cc772a6bdacf6ae2a4d81fdcb9d3a7fdb;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index b1f0e20fa..f01305200 100644
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
@@ -94,7 +94,9 @@ void SMESHGUI_GenericHypothesisCreator::create( SMESH::SMESH_Hypothesis_ptr init
 
 void SMESHGUI_GenericHypothesisCreator::create( bool           isAlgo,
                                                 const QString& theHypName,
-                                                QWidget* theParent, QObject* obj, const QString& slot )
+                                                QWidget*       theParent,
+                                                QObject*       obj,
+                                                const QString& slot )
 {
   myIsCreate = true;
 
@@ -317,9 +319,8 @@ void SMESHGUI_GenericHypothesisCreator::onDialogFinished( int result )
         _PTR(SObject) meshSO = SMESH::FindSObject( aMesh );
         SMESH::ModifiedMesh( meshSO, false, aMesh->NbNodes()==0);
         SMESH_Actor* actor = SMESH::FindActorByEntry( meshSO->GetID().c_str() );
-        if( actor ) {
+        if( actor && actor->GetVisibility() )
           actor->Update();
-        }
       }
   }
   SMESHGUI::GetSMESHGUI()->updateObjBrowser( true, 0 );
@@ -582,53 +583,53 @@ QString SMESHGUI_GenericHypothesisCreator::helpPage() const
   QString aHypType = hypType();
   QString aHelpFileName = "";
   if ( aHypType == "LocalLength" )
-    aHelpFileName = "a1d_meshing_hypo_page.html#average_length_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#average-length-anchor";
   else if ( aHypType == "MaxLength" )
-    aHelpFileName = "a1d_meshing_hypo_page.html#max_length_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#max-length-anchor";
   else if ( aHypType == "Arithmetic1D")
-    aHelpFileName = "a1d_meshing_hypo_page.html#arithmetic_1d_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#arithmetic-1d-anchor";
   else if ( aHypType == "GeometricProgression")
-    aHelpFileName = "a1d_meshing_hypo_page.html#geometric_1d_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#geometric-1d-anchor";
   else if ( aHypType == "FixedPoints1D")
-    aHelpFileName = "a1d_meshing_hypo_page.html#fixed_points_1d_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#fixed-points-1d-anchor";
   else if ( aHypType == "MaxElementArea")
-    aHelpFileName = "a2d_meshing_hypo_page.html#max_element_area_anchor";
+    aHelpFileName = "2d_meshing_hypo.html#max-element-area-anchor";
   else if ( aHypType == "MaxElementVolume")
-    aHelpFileName = "max_element_volume_hypo_page.html";
+    aHelpFileName = "max_element_volume_hypo.html";
   else if ( aHypType == "StartEndLength")
-    aHelpFileName = "a1d_meshing_hypo_page.html#start_and_end_length_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#start-and-end-length-anchor";
   else if ( aHypType == "Deflection1D")
-    aHelpFileName = "a1d_meshing_hypo_page.html#deflection_1d_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#deflection-1d-anchor";
   else if ( aHypType == "Adaptive1D")
-    aHelpFileName = "a1d_meshing_hypo_page.html#adaptive_1d_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#adaptive-1d-anchor";
   else if ( aHypType == "AutomaticLength")
-    aHelpFileName = "a1d_meshing_hypo_page.html#automatic_length_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#automatic-length-anchor";
   else if ( aHypType == "NumberOfSegments")
-    aHelpFileName = "a1d_meshing_hypo_page.html#number_of_segments_anchor";
+    aHelpFileName = "1d_meshing_hypo.html#number-of-segments-anchor";
   else if ( aHypType == "ProjectionSource1D")
-    aHelpFileName = "projection_algos_page.html";
+    aHelpFileName = "projection_algos.html";
   else if ( aHypType == "ProjectionSource2D")
-    aHelpFileName = "projection_algos_page.html";
+    aHelpFileName = "projection_algos.html";
   else if ( aHypType == "ProjectionSource3D")
-    aHelpFileName = "projection_algos_page.html";
+    aHelpFileName = "projection_algos.html";
   else if ( aHypType == "NumberOfLayers")
-    aHelpFileName = "radial_prism_algo_page.html";
+    aHelpFileName = "radial_prism_algo.html";
   else if ( aHypType == "NumberOfLayers2D")
-    aHelpFileName = "radial_quadrangle_1D2D_algo_page.html";
+    aHelpFileName = "radial_quadrangle_1D2D_algo.html";
   else if ( aHypType == "LayerDistribution")
-    aHelpFileName = "radial_prism_algo_page.html";
+    aHelpFileName = "radial_prism_algo.html";
   else if ( aHypType == "LayerDistribution2D")
-    aHelpFileName = "radial_quadrangle_1D2D_algo_page.html";
+    aHelpFileName = "radial_quadrangle_1D2D_algo.html";
   else if ( aHypType == "SegmentLengthAroundVertex")
-    aHelpFileName = "segments_around_vertex_algo_page.html";
+    aHelpFileName = "segments_around_vertex_algo.html";
   else if ( aHypType == "QuadrangleParams")
-    aHelpFileName = "a2d_meshing_hypo_page.html#hypo_quad_params_anchor";
+    aHelpFileName = "2d_meshing_hypo.html#hypo-quad-params-anchor";
   else if ( aHypType == "ViscousLayers")
-    aHelpFileName = "additional_hypo_page.html#viscous_layers_anchor";
+    aHelpFileName = "additional_hypo.html#viscous-layers-anchor";
   else if ( aHypType == "ViscousLayers2D")
-    aHelpFileName = "additional_hypo_page.html#viscous_layers_anchor";
+    aHelpFileName = "additional_hypo.html#viscous-layers-anchor";
   else if ( aHypType == "ImportSource1D" || aHypType == "ImportSource2D")
-    aHelpFileName = "import_algos_page.html";
+    aHelpFileName = "use_existing_algos.html";
   return aHelpFileName;
 }
 
@@ -742,23 +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 int      theGroupID,
-                                const int      thePriority,
-                                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 ),
@@ -771,7 +772,7 @@ HypothesisData::HypothesisData( const QString& theTypeName,
     Dim( theDim ),
     IsAuxOrNeedHyp( theIsAuxOrNeedHyp ),
     IsNeedGeometry( theIsNeedGeometry ),
-    IsSupportSubmeshes( supportSub ),
+    IsSupportSubmeshes( theSupportSub ),
     BasicHypos( theBasicHypos ),
     OptionalHypos( theOptionalHypos ),
     InputTypes( theInputTypes ),