add more options to BLSURF

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
index 018bc62047e62e97a8e9d6614461a160b16465f8..d65f0668ae58554aa27d37a6bc01d2f10a9b10b0 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
@@ -479,13 +479,13 @@ double BLSURFPlugin_Hypothesis::GetDefaultPhySize()
 //======================================================================
 double BLSURFPlugin_Hypothesis::GetDefaultMaxSize()
 {
-  return 1e+4;
+  return undefinedDouble(); // 1e+4;
 }
 
 //======================================================================
 double BLSURFPlugin_Hypothesis::GetDefaultMinSize()
 {
-  return 1e-4;
+  return undefinedDouble(); //1e-4;
 }
 
 //======================================================================

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
index b7d4931df5be1edac4ddfed9f73e701b120ff198..8fe8788777782d85282bce296693d4563e1a6cff 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx
@@ -159,8 +159,10 @@ CORBA::Double BLSURFPlugin_Hypothesis_i::GetPhySize()
 void BLSURFPlugin_Hypothesis_i::SetPhyMin(CORBA::Double theMinSize)
 {
   ASSERT(myBaseImpl);
-  this->GetImpl()->SetPhyMin(theMinSize);
-  SMESH::TPythonDump() << _this() << ".SetPhyMin( " << theMinSize << " )";
+  if ( GetPhyMin() != theMinSize ) {
+    this->GetImpl()->SetPhyMin(theMinSize);
+    SMESH::TPythonDump() << _this() << ".SetPhyMin( " << theMinSize << " )";
+  }
 }
 
 //=============================================================================
@@ -175,8 +177,10 @@ CORBA::Double BLSURFPlugin_Hypothesis_i::GetPhyMin()
 void BLSURFPlugin_Hypothesis_i::SetPhyMax(CORBA::Double theMaxSize)
 {
   ASSERT(myBaseImpl);
-  this->GetImpl()->SetPhyMax(theMaxSize);
-  SMESH::TPythonDump() << _this() << ".SetPhyMax( " << theMaxSize << " )";
+  if ( GetPhyMax() != theMaxSize ) {
+    this->GetImpl()->SetPhyMax(theMaxSize);
+    SMESH::TPythonDump() << _this() << ".SetPhyMax( " << theMaxSize << " )";
+  }
 }
 
 //=============================================================================
@@ -264,8 +268,11 @@ CORBA::Double BLSURFPlugin_Hypothesis_i::GetAngleMeshC()
 //=============================================================================
 void BLSURFPlugin_Hypothesis_i::SetGeoMin(CORBA::Double theMinSize)
 {
-  this->GetImpl()->SetGeoMin(theMinSize);
-  SMESH::TPythonDump() << _this() << ".SetGeoMin( " << theMinSize << " )";
+  ASSERT(myBaseImpl);
+  if ( GetGeoMin() != theMinSize ) {
+    this->GetImpl()->SetGeoMin(theMinSize);
+    SMESH::TPythonDump() << _this() << ".SetGeoMin( " << theMinSize << " )";
+  }
 }
 
 //=============================================================================
@@ -278,8 +285,11 @@ CORBA::Double BLSURFPlugin_Hypothesis_i::GetGeoMin()
 //=============================================================================
 void BLSURFPlugin_Hypothesis_i::SetGeoMax(CORBA::Double theMaxSize)
 {
-  this->GetImpl()->SetGeoMax(theMaxSize);
-  SMESH::TPythonDump() << _this() << ".SetGeoMax( " << theMaxSize << " )";
+  ASSERT(myBaseImpl);
+  if ( GetGeoMax() != theMaxSize ) {
+    this->GetImpl()->SetGeoMax(theMaxSize);
+    SMESH::TPythonDump() << _this() << ".SetGeoMax( " << theMaxSize << " )";
+  }
 }
 
 //=============================================================================

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index b1f8ecc43a0cb9e330a9026d44807a20d01cb13e..3ecd9a9c4637785806a8146356da4a964cf10bf8 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -97,13 +97,37 @@ BLSURFPluginGUI_HypothesisCreator::~BLSURFPluginGUI_HypothesisCreator()
     delete myPopup;
 }
 
+namespace {
+  inline bool isDouble( const QString& theText, const bool emptyOK=false ) {
+    QString str = theText.stripWhiteSpace();
+    bool isOk = true;
+    if ( !str.isEmpty() )
+      str.toDouble(&isOk);
+    else
+      isOk = emptyOK;
+    return isOk;
+  }
+}
+
 bool BLSURFPluginGUI_HypothesisCreator::checkParams() const
 {
-//   BlsurfHypothesisData data_old, data_new;
-//   readParamsFromHypo( data_old );
-//   readParamsFromWidgets( data_new );
-//   bool res = storeParamsToHypo( data_new );
-//   return res;
+  if ( !isDouble( myPhyMin->text(), true )) {
+    myPhyMin->selectAll();
+    return false;
+  }
+  if ( !isDouble( myPhyMax->text(), true )) {
+    myPhyMax->selectAll();
+    return false;
+  }
+  if ( !isDouble( myGeoMin->text(), true )) {
+    myGeoMin->selectAll();
+    return false;
+  }
+  if ( !isDouble( myGeoMin->text(), true )) {
+    myGeoMin->selectAll();
+    return false;
+  }
+
   return true;
 }
 
@@ -147,16 +171,18 @@ QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
 
 #ifdef WITH_SIZE_BOUNDARIES
   new QLabel( tr( "BLSURF_HPHYMIN" ), myStdGroup );
-  myPhyMin = new QtxDblSpinBox( myStdGroup );
-  myPhyMin->setMinValue( 1e-06 );
-  myPhyMin->setMaxValue( 1e+04 );
-  myPhyMin->setLineStep( 1 );
+  myPhyMin = new QLineEdit( myStdGroup );
+//   myPhyMin = new QtxDblSpinBox( myStdGroup );
+//   myPhyMin->setMinValue( 1e-06 );
+//   myPhyMin->setMaxValue( 1e+04 );
+//   myPhyMin->setLineStep( 1 );
 
   new QLabel( tr( "BLSURF_HPHYMAX" ), myStdGroup );
-  myPhyMax = new QtxDblSpinBox( myStdGroup );
-  myPhyMax->setMinValue( 1e-04 );
-  myPhyMax->setMaxValue( 1e+06 );
-  myPhyMax->setLineStep( 1 );
+  myPhyMax = new QLineEdit( myStdGroup );
+//   myPhyMax = new QtxDblSpinBox( myStdGroup );
+//   myPhyMax->setMinValue( 1e-04 );
+//   myPhyMax->setMaxValue( 1e+06 );
+//   myPhyMax->setLineStep( 1 );
 #endif
 
   new QLabel( tr( "BLSURF_GEOM_MESH" ), myStdGroup );
@@ -178,26 +204,28 @@ QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
   myAngleMeshC->setMaxValue( 16 );
   myAngleMeshC->setLineStep( 0.5 );
   
-#ifdef WITH_SIZE_BOUNDARIES
-  new QLabel( tr( "BLSURF_HGEOMIN" ), myStdGroup );
-  myGeoMin = new QtxDblSpinBox( myStdGroup );
-  myGeoMin->setMinValue( 1e-06 );
-  myGeoMin->setMaxValue( 1e+04 );
-  myGeoMin->setLineStep( 1 );
-
-  new QLabel( tr( "BLSURF_HGEOMAX" ), myStdGroup );
-  myGeoMax = new QtxDblSpinBox( myStdGroup );
-  myGeoMax->setMinValue( 1e-04 );
-  myGeoMax->setMaxValue( 1e+06 );
-  myGeoMax->setLineStep( 1 );
-#endif
-
   new QLabel( tr( "BLSURF_GRADATION" ), myStdGroup );
   myGradation = new QtxDblSpinBox( myStdGroup );
   myGradation->setMinValue( 1.1 );
   myGradation->setMaxValue( 2.5 );
   myGradation->setLineStep( 0.1 );
 
+#ifdef WITH_SIZE_BOUNDARIES
+  new QLabel( tr( "BLSURF_HGEOMIN" ), myStdGroup );
+  myGeoMin = new QLineEdit( myStdGroup );
+//   myGeoMin = new QtxDblSpinBox( myStdGroup );
+//   myGeoMin->setMinValue( 1e-06 );
+//   myGeoMin->setMaxValue( 1e+04 );
+//   myGeoMin->setLineStep( 1 );
+
+  new QLabel( tr( "BLSURF_HGEOMAX" ), myStdGroup );
+  myGeoMax = new QLineEdit( myStdGroup );
+//   myGeoMax = new QtxDblSpinBox( myStdGroup );
+//   myGeoMax->setMinValue( 1e-04 );
+//   myGeoMax->setMaxValue( 1e+06 );
+//   myGeoMax->setLineStep( 1 );
+#endif
+
   myAllowQuadrangles = new QCheckBox( tr( "BLSURF_ALLOW_QUADRANGLES" ), myStdGroup );
   myStdGroup->addSpace(0);
 
@@ -280,10 +308,14 @@ void BLSURFPluginGUI_HypothesisCreator::retrieveParams() const
   myPhysicalMesh    ->setCurrentItem( data.myPhysicalMesh );
   myPhySize         ->setValue      ( data.myPhySize );
 #ifdef WITH_SIZE_BOUNDARIES
-  myPhyMin          ->setValue      ( data.myPhyMin );
-  myPhyMax          ->setValue      ( data.myPhyMax );
-  myGeoMin          ->setValue      ( data.myGeoMin );
-  myGeoMax          ->setValue      ( data.myGeoMax );
+  myPhyMin          ->setText       ( data.myPhyMin );
+  myPhyMax          ->setText       ( data.myPhyMax );
+  myGeoMin          ->setText       ( data.myGeoMin );
+  myGeoMax          ->setText       ( data.myGeoMax );
+//   myPhyMin          ->setValue      ( data.myPhyMin );
+//   myPhyMax          ->setValue      ( data.myPhyMax );
+//   myGeoMin          ->setValue      ( data.myGeoMin );
+//   myGeoMax          ->setValue      ( data.myGeoMax );
 #endif
   myGeometricMesh   ->setCurrentItem( data.myGeometricMesh );
   myAngleMeshS      ->setValue      ( data.myAngleMeshS);
@@ -342,12 +374,6 @@ bool BLSURFPluginGUI_HypothesisCreator::readParamsFromHypo( BlsurfHypothesisData
   h_data.myTopology         = (int) h->GetTopology();
   h_data.myPhysicalMesh     = (int) h->GetPhysicalMesh();
   h_data.myPhySize          = h->GetPhySize();
-#ifdef WITH_SIZE_BOUNDARIES
-  h_data.myPhyMin           = h->GetPhyMin();
-  h_data.myPhyMax           = h->GetPhyMax();
-  h_data.myGeoMin           = h->GetGeoMin();
-  h_data.myGeoMax           = h->GetGeoMax();
-#endif
   h_data.myGeometricMesh    = (int) h->GetGeometricMesh();
   h_data.myAngleMeshS       = h->GetAngleMeshS();
   h_data.myAngleMeshC       = h->GetAngleMeshC();
@@ -356,6 +382,22 @@ bool BLSURFPluginGUI_HypothesisCreator::readParamsFromHypo( BlsurfHypothesisData
   h_data.myDecimesh         = h->GetDecimesh();
   h_data.myVerbosity        = h->GetVerbosity();
 
+#ifdef WITH_SIZE_BOUNDARIES
+  double PhyMin = h->GetPhyMin();
+  double PhyMax = h->GetPhyMax();
+  double GeoMin = h->GetGeoMin();
+  double GeoMax = h->GetGeoMax();
+  if ( PhyMin > 0 )
+  h_data.myPhyMin = PhyMin > 0 ? QString::number( h->GetPhyMin() ) : QString("");
+  h_data.myPhyMax = PhyMax > 0 ? QString::number( h->GetPhyMax() ) : QString("");
+  h_data.myGeoMin = GeoMin > 0 ? QString::number( h->GetGeoMin() ) : QString("");
+  h_data.myGeoMax = GeoMax > 0 ? QString::number( h->GetGeoMax() ) : QString("");
+//   h_data.myPhyMin           = h->GetPhyMin();
+//   h_data.myPhyMax           = h->GetPhyMax();
+//   h_data.myGeoMin           = h->GetGeoMin();
+//   h_data.myGeoMax           = h->GetGeoMax();
+#endif
+
   BLSURFPluginGUI_HypothesisCreator* that = (BLSURFPluginGUI_HypothesisCreator*)this;
   that->myOptions = h->GetOptionValues();
 
@@ -401,14 +443,30 @@ bool BLSURFPluginGUI_HypothesisCreator::storeParamsToHypo( const BlsurfHypothesi
         h->SetAngleMeshC( h_data.myAngleMeshC );
     }
 #ifdef WITH_SIZE_BOUNDARIES
-      if ( h->GetPhyMin() != h_data.myPhyMin )
-        h->SetPhyMin( h_data.myPhyMin );
-      if ( h->GetPhyMax() != h_data.myPhyMax )
-        h->SetPhyMax( h_data.myPhyMax );
-      if ( h->GetGeoMin() != h_data.myGeoMin )
-        h->SetGeoMin( h_data.myGeoMin );
-      if ( h->GetGeoMax() != h_data.myGeoMax )
-        h->SetGeoMax( h_data.myGeoMax );
+    if ( !isDouble( h_data.myPhyMin ))
+      h->SetPhyMin( -1 );
+    else if ( h->GetPhyMin() != h_data.myPhyMin.toDouble() )
+      h->SetPhyMin( h_data.myPhyMin.toDouble() );
+    if ( !isDouble( h_data.myPhyMax ))
+      h->SetPhyMax( -1 );
+    else if ( h->GetPhyMax() != h_data.myPhyMax.toDouble() )
+      h->SetPhyMax( h_data.myPhyMax.toDouble() );
+    if ( !isDouble( h_data.myGeoMin ))
+      h->SetGeoMin( -1 );
+    else if ( h->GetGeoMin() != h_data.myGeoMin.toDouble() )
+      h->SetGeoMin( h_data.myGeoMin.toDouble() );
+    if ( !isDouble( h_data.myGeoMax ))
+      h->SetGeoMax( -1 );
+    else if ( h->GetGeoMax() != h_data.myGeoMax.toDouble() )
+      h->SetGeoMax( h_data.myGeoMax.toDouble() );
+//       if ( h->GetPhyMin() != h_data.myPhyMin )
+//         h->SetPhyMin( h_data.myPhyMin );
+//       if ( h->GetPhyMax() != h_data.myPhyMax )
+//         h->SetPhyMax( h_data.myPhyMax );
+//       if ( h->GetGeoMin() != h_data.myGeoMin )
+//         h->SetGeoMin( h_data.myGeoMin );
+//       if ( h->GetGeoMax() != h_data.myGeoMax )
+//         h->SetGeoMax( h_data.myGeoMax );
 #endif
 
     h->SetOptionValues( myOptions );
@@ -428,10 +486,14 @@ QString BLSURFPluginGUI_HypothesisCreator::readParamsFromWidgets( BlsurfHypothes
   h_data.myPhysicalMesh     = myPhysicalMesh->currentItem();
   h_data.myPhySize          = myPhySize->value();
 #ifdef WITH_SIZE_BOUNDARIES
-  h_data.myPhyMin           = myPhyMin->value();
-  h_data.myPhyMax           = myPhyMax->value();
-  h_data.myGeoMin           = myGeoMin->value();
-  h_data.myGeoMax           = myGeoMax->value();
+  h_data.myPhyMin           = myPhyMin->text();
+  h_data.myPhyMax           = myPhyMax->text();
+  h_data.myGeoMin           = myGeoMin->text();
+  h_data.myGeoMax           = myGeoMax->text();
+//   h_data.myPhyMin           = myPhyMin->value();
+//   h_data.myPhyMax           = myPhyMax->value();
+//   h_data.myGeoMin           = myGeoMin->value();
+//   h_data.myGeoMax           = myGeoMax->value();
 #endif
   h_data.myGeometricMesh    = myGeometricMesh->currentItem();
   h_data.myAngleMeshS       = myAngleMeshS->value();
@@ -451,10 +513,10 @@ QString BLSURFPluginGUI_HypothesisCreator::readParamsFromWidgets( BlsurfHypothes
   guiHyp += tr("BLSURF_ALLOW_QUADRANGLES") + " = " + QString(h_data.myAllowQuadrangles ? "yes" : "no") + "; ";
   guiHyp += tr("BLSURF_DECIMESH") + " = " + QString(h_data.myDecimesh ? "yes" : "no") + "; ";
 #ifdef WITH_SIZE_BOUNDARIES
-  guiHyp += "hphymin = " + QString::number( h_data.myPhyMin ) + "; ";
-  guiHyp += "hphymax = " + QString::number( h_data.myPhyMax ) + "; ";
-  guiHyp += "hgeomin = " + QString::number( h_data.myGeoMin ) + "; ";
-  guiHyp += "hgeomax = " + QString::number( h_data.myGeoMax ) + "; ";
+  if ( isDouble( h_data.myPhyMin )) guiHyp += "hphymin = " + h_data.myPhyMin + "; ";
+  if ( isDouble( h_data.myPhyMax )) guiHyp += "hphymax = " + h_data.myPhyMax + "; ";
+  if ( isDouble( h_data.myGeoMin )) guiHyp += "hgeomin = " + h_data.myGeoMin + "; ";
+  if ( isDouble( h_data.myGeoMax )) guiHyp += "hgeomax = " + h_data.myGeoMax + "; ";
 #endif
 
   BLSURFPluginGUI_HypothesisCreator* that = (BLSURFPluginGUI_HypothesisCreator*)this;

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
index 9ee08afef6941fc46387ff34e4e3123e6a06970a..62ea8787c521eea3071fa6e13f2b0b08b4bd24ab 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
@@ -44,8 +44,9 @@ typedef struct
 {
   int     myTopology, myVerbosity;
   int     myPhysicalMesh, myGeometricMesh;
-  double  myPhySize, myPhyMin, myPhyMax, myAngleMeshS, myAngleMeshC, myGradation;
-  double  myGeoMin, myGeoMax;
+  double  myPhySize, myAngleMeshS, myAngleMeshC, myGradation;
+  QString myGeoMin, myGeoMax, myPhyMin, myPhyMax;
+//   double  myGeoMin, myGeoMax, myPhyMin, myPhyMax;
   bool    myAllowQuadrangles, myDecimesh;
   QString myName;
 
@@ -96,13 +97,17 @@ private:
   QLineEdit*       myName;
   QtxComboBox*     myPhysicalMesh;
   QtxDblSpinBox*   myPhySize;
-  QtxDblSpinBox*   myPhyMin;
-  QtxDblSpinBox*   myPhyMax;
+//   QtxDblSpinBox*   myPhyMin;
+//   QtxDblSpinBox*   myPhyMax;
+  QLineEdit*       myPhyMin;
+  QLineEdit*       myPhyMax;
   QtxComboBox*     myGeometricMesh;
   QtxDblSpinBox*   myAngleMeshS;
   QtxDblSpinBox*   myAngleMeshC;
-  QtxDblSpinBox*   myGeoMin;
-  QtxDblSpinBox*   myGeoMax;
+  QLineEdit*       myGeoMin;
+  QLineEdit*       myGeoMax;
+//   QtxDblSpinBox*   myGeoMin;
+//   QtxDblSpinBox*   myGeoMax;
   QtxDblSpinBox*   myGradation;
   QCheckBox*       myAllowQuadrangles;
   QCheckBox*       myDecimesh;