fix assignation of a set of hypotheses

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index ca7b9efb2995d72af3ce8725e4112ee5c69f1087..896e7f80100ede653edb832fac55b96ccc81370a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -1114,13 +1114,16 @@ void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName )
   HypothesesSet* aHypoSet = SMESH::GetHypothesesSet(theSetName);
   if (!aHypoSet) return;
 
+  // clear all hyps
+  for (int dim = SMESH::DIM_1D; dim <= SMESH::DIM_3D; dim++) {
+    setCurrentHyp(dim, Algo, -1);
+    setCurrentHyp(dim, AddHyp, -1);
+    setCurrentHyp(dim, MainHyp, -1);
+  }
+
   for (int aHypType = Algo; aHypType < AddHyp; aHypType++) {
     bool isAlgo = (aHypType == Algo);
 
-    // clear all hyps
-    for (int dim = SMESH::DIM_1D; dim <= SMESH::DIM_3D; dim++)
-      setCurrentHyp(dim, aHypType, -1);
-
     // set hyps from the set
     QStringList* aHypoList = isAlgo ? &aHypoSet->AlgoList : &aHypoSet->HypoList;
     for (int i = 0, n = aHypoList->count(); i < n; i++) {
@@ -1132,9 +1135,13 @@ void SMESHGUI_MeshOp::onHypoSet( const QString& theSetName )
       int aDim = aHypData->Dim[0];
       // create or/and set
       if (isAlgo) {
-        QStringList tmp;
-        availableHyps( aDim, Algo, tmp, myAvailableHypData[aDim][Algo] );
         int index = myAvailableHypData[aDim][Algo].findIndex( aHypData );
+        if ( index < 0 ) {
+          QStringList anAvailable;
+          availableHyps( aDim, Algo, anAvailable, myAvailableHypData[aDim][Algo] );
+          myDlg->tab( aDim )->setAvailableHyps( Algo, anAvailable );
+          index = myAvailableHypData[aDim][Algo].findIndex( aHypData );
+        }
         setCurrentHyp( aDim, Algo, index );
         onAlgoSelected( index, aDim );
       }