X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Hypotheses.cxx;h=e636ea8d6d7fe7cbc08d31cc82caff9ffa13a172;hb=ea772b0267fd60b9577b47c6dd5a75f3e33d0081;hp=8ca61f49fd0876129aa798574a258fe0377360c6;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index 8ca61f49f..e636ea8d6 100644
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
@@ -164,11 +164,12 @@ bool SMESHGUI_GenericHypothesisCreator::editHypothesis( SMESH::SMESH_Hypothesis_
     myEventLoop->exec(); // make myDlg not modal
     res = myDlg->result();
     if( res ) {
-      QString paramValues = storeParams();
-      if ( !paramValues.isEmpty() ) {
-        if ( _PTR(SObject) SHyp = SMESH::FindSObject( myHypo ))
-          SMESH::SetValue( SHyp, paramValues );
-      }
+      /*QString paramValues = */storeParams();
+      // No longer needed since NoteBook appears and "Value" OB field shows names of variable
+//       if ( !paramValues.isEmpty() ) {
+//         if ( _PTR(SObject) SHyp = SMESH::FindSObject( myHypo ))
+//           SMESH::SetValue( SHyp, paramValues );
+//       }
     }
   }
   delete Dlg; myDlg = 0;
@@ -243,7 +244,7 @@ QFrame* SMESHGUI_GenericHypothesisCreator::buildStdFrame()
               w = sb;
             }
             else if(aStudy->IsReal(aVar.toLatin1().constData())){
-              SalomeApp_DoubleSpinBox* sb = new SalomeApp_DoubleSpinBox( GroupC1 );
+              SalomeApp_DoubleSpinBox* sb = new SMESHGUI_SpinBox( GroupC1 );
               sb->setObjectName( (*anIt).myName );
               attuneStdWidget( sb, i );
               sb->setText( aVar );
@@ -339,12 +340,8 @@ QStringList SMESHGUI_GenericHypothesisCreator::getVariablesFromDlg() const
   QStringList aResult;
   ListOfWidgets::const_iterator anIt = widgets().begin(), aLast = widgets().end();
   for( ; anIt!=aLast; anIt++ ) {
-    if( (*anIt)->inherits( "SalomeApp_IntSpinBox" ) ) {
-      SalomeApp_IntSpinBox* sb = ( SalomeApp_IntSpinBox* )( *anIt );
-      aResult.append(sb->text());
-    } 
-    else if( (*anIt)->inherits( "QtxDoubleSpinBox" ) ) {
-      QtxDoubleSpinBox* sb = ( QtxDoubleSpinBox* )( *anIt );
+    if( (*anIt)->inherits( "QAbstractSpinBox" ) ) {
+      QAbstractSpinBox* sb = ( QAbstractSpinBox* )( *anIt );
       aResult.append(sb->text());
     } 
   }
@@ -498,6 +495,8 @@ QString SMESHGUI_GenericHypothesisCreator::helpPage() const
   QString aHelpFileName;
   if ( aHypType == "LocalLength" )
     aHelpFileName = "a1d_meshing_hypo_page.html#average_length_anchor";
+  if ( aHypType == "MaxLength" )
+    aHelpFileName = "a1d_meshing_hypo_page.html#max_length_anchor";
   else if ( aHypType == "Arithmetic1D")
     aHelpFileName = "a1d_meshing_hypo_page.html#arithmetic_1d_anchor";
   else if ( aHypType == "MaxElementArea")