Salome HOME
23307: [EDF 7315] Improvement of DISTENE meshing plugins
authoreap <eap@opencascade.com>
Tue, 9 Aug 2016 16:41:01 +0000 (19:41 +0300)
committereap <eap@opencascade.com>
Tue, 9 Aug 2016 16:41:01 +0000 (19:41 +0300)
16 files changed:
doc/salome/gui/HexoticPLUGIN/images/hexotic_advanced_options.png [new file with mode: 0644]
doc/salome/gui/HexoticPLUGIN/images/hexotic_local_size_parameters.png
doc/salome/gui/HexoticPLUGIN/images/hexotic_parameters.png
doc/salome/gui/HexoticPLUGIN/images/hexotic_vl_parameters.png
doc/salome/gui/HexoticPLUGIN/input/hexotic_hypo.doc
idl/HexoticPlugin_Algorithm.idl
src/GUI/CMakeLists.txt
src/GUI/HexoticPluginGUI_HypothesisCreator.cxx
src/GUI/HexoticPluginGUI_HypothesisCreator.h
src/GUI/HexoticPluginGUI_StdWidget_QTD.ui
src/HexoticPlugin/HexoticPLUGINBuilder.py
src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx
src/HexoticPlugin/HexoticPlugin_Hypothesis.hxx
src/HexoticPlugin/HexoticPlugin_Hypothesis_i.cxx
src/HexoticPlugin/HexoticPlugin_Hypothesis_i.hxx

diff --git a/doc/salome/gui/HexoticPLUGIN/images/hexotic_advanced_options.png b/doc/salome/gui/HexoticPLUGIN/images/hexotic_advanced_options.png
new file mode 100644 (file)
index 0000000..79bd05b
Binary files /dev/null and b/doc/salome/gui/HexoticPLUGIN/images/hexotic_advanced_options.png differ
index 5cf1043ceacb30b83430e08111311c80721b9c67..84c2a056c820c27a225bcded14912b9ffc48a27e 100644 (file)
Binary files a/doc/salome/gui/HexoticPLUGIN/images/hexotic_local_size_parameters.png and b/doc/salome/gui/HexoticPLUGIN/images/hexotic_local_size_parameters.png differ
index 6f5e1263b3baffc0be090f40866ad7f635647405..1bd253955a8d8c9faf59cd6da5bcae8a2166b0ed 100644 (file)
Binary files a/doc/salome/gui/HexoticPLUGIN/images/hexotic_parameters.png and b/doc/salome/gui/HexoticPLUGIN/images/hexotic_parameters.png differ
index 16099a856fe58ede19c1efb067eaf8863fbd43e5..45574bf607a7d3e38845cd82125932d3fd778fa4 100644 (file)
Binary files a/doc/salome/gui/HexoticPLUGIN/images/hexotic_vl_parameters.png and b/doc/salome/gui/HexoticPLUGIN/images/hexotic_vl_parameters.png differ
index a5897f3b10b86bc9bb8efffb754febaa701b4f75..ab29eb8b07c3e7b4f763c8e87ac402fe4f73db4c 100644 (file)
@@ -51,9 +51,6 @@ Parameters by default).</li>
 <li>sd 4 : meshes non-manifold geometries as such and generates subdomains accordingly.</li>
 </ul>
 </li>
-
-<li><b>Options as text</b> - allows to input in the command line any text for MG-Hexa, for example, advanced options.
-</li>
 </ul>
 
 \note If MG-CADSurf is used as 2D algo, and if a GMF file is defined as output file (using SetGMFFile(my2Dmesh.mesh)), then MG-Hexa will use this file as input.
@@ -61,6 +58,15 @@ This allows to avoid the reconstruction of the GMF file from the SMESH structure
 
 <br><b>See Also</b> a sample TUI Script of the \ref tui_hexotic "creation of a MG-Hexa mesh"
 
+\section hexotic_adv_options Advanced parameters
+
+\image html hexotic_advanced_options.png
+
+In \b Advanced tab page you can specify advanced options of MG-Hexa not exposed in other pages.
+
+<b>Add option</b> adds a line to the table where you can type an option and its value as text.
+A check box in the first column activates/deactivates the option of the current row. A deactivated option will be erased upon pressing \a Ok.
+
 \section hexotic_local_size_parameters Local size
 
 The local size allows you to drive locally the density of the 3D mesh. 
index 3a2ea2975e979d32d3d0ae4ae0d968dd891cd94d..c2b112750b79eb35881b11e818358d1ee17175ce 100644 (file)
@@ -92,7 +92,9 @@ module HexoticPlugin
     void SetHexoticMaxMemory(in long value);
     long GetHexoticMaxMemory();
     
-    void SetTextOptions(in string option);
+    void SetAdvancedOption(in string option);
+    string GetAdvancedOption();
+    void SetTextOptions(in string option);// obsolete
     string GetTextOptions();
 
     void SetSizeMapEntry(in string entry, 
index d1eb1036fccc4778b3b044f574d36cb33cc7d02f..c9d56b371daaa4ba81d9c4b098990e2ce8e92ff5 100644 (file)
@@ -51,6 +51,7 @@ ADD_DEFINITIONS(
 SET(_link_LIBRARIES
   ${SMESH_SMESH}
   ${SMESH_StdMeshersGUI}
+  ${SMESH_PluginUtils}
   ${CAS_KERNEL}
   ${GUI_suit}
   ${GUI_qtx}
index 9dbc46521f8b034828e4d18d9873e4e0fbf9357c..be6ab02145adf8a2f80d9feb34d3820b8f13310d 100644 (file)
@@ -27,7 +27,8 @@
 
 #include <SMESHGUI_Utils.h>
 #include <SMESHGUI_HypothesesUtils.h>
-#include "SMESH_NumberFilter.hxx"
+#include <SMESH_NumberFilter.hxx>
+#include <SMESH_AdvOptionsWdg.h>
 
 #include "utilities.h"
 
@@ -58,6 +59,7 @@
 // Main widget tabs identification
 enum {
   STD_TAB = 0,
+  ADV_TAB,
   SMP_TAB,
   VL_TAB
 };
@@ -202,6 +204,7 @@ QFrame* HexoticPluginGUI_HypothesisCreator::buildFrame()
   l->addWidget( myStdWidget, row++, 0, 1, 3 );
   myStdWidget->onSdModeSelected(SD_MODE_4);
 
+  myAdvWidget = new SMESH_AdvOptionsWdg( aTabWidget );
   
   // SIZE MAPS TAB
   QWidget* aSmpGroup = new QWidget();
@@ -277,9 +280,10 @@ QFrame* HexoticPluginGUI_HypothesisCreator::buildFrame()
 
 //  resizeEvent();
   
-  aTabWidget->insertTab( STD_TAB, aStdGroup, tr( "SMESH_ARGUMENTS" ) );
-  aTabWidget->insertTab( SMP_TAB, aSmpGroup, tr( "LOCAL_SIZE" ) );
-  aTabWidget->insertTab( VL_TAB, aVLGroup, tr( "Hexotic_VISCOUS_LAYERS") );
+  aTabWidget->insertTab( STD_TAB, aStdGroup, tr( "SMESH_ARGUMENTS" ));
+  aTabWidget->insertTab( ADV_TAB, myAdvWidget, tr( "SMESH_ADVANCED" ));
+  aTabWidget->insertTab( SMP_TAB, aSmpGroup, tr( "LOCAL_SIZE" ));
+  aTabWidget->insertTab( VL_TAB, aVLGroup, tr( "Hexotic_VISCOUS_LAYERS"));
   
   myIs3D = true;
   
@@ -452,7 +456,7 @@ void HexoticPluginGUI_HypothesisCreator::retrieveParams() const
 
   myStdWidget->myHexoticSdMode->setCurrentIndex(data.myHexoticSdMode);
   
-  myStdWidget->myTextOptions->setText(data.myTextOptions);
+  myAdvWidget->SetCustomOptions(data.myTextOptions);
 
   HexoticPlugin_Hypothesis::THexoticSizeMaps::const_iterator it = data.mySizeMaps.begin();
   for ( int row = 0; it != data.mySizeMaps.end(); it++, row++ )
@@ -577,7 +581,7 @@ bool HexoticPluginGUI_HypothesisCreator::readParamsFromHypo( HexoticHypothesisDa
   h_data.myHexoticVerbosity = h->GetHexoticVerbosity();
   h_data.myHexoticMaxMemory = h->GetHexoticMaxMemory();
   h_data.myHexoticSdMode = h->GetHexoticSdMode()-1;
-  h_data.myTextOptions = h->GetTextOptions();
+  h_data.myTextOptions = h->GetAdvancedOption();
   
   // Size maps
   HexoticPlugin::HexoticPluginSizeMapsList_var sizeMaps = h->GetSizeMaps();
@@ -629,7 +633,7 @@ bool HexoticPluginGUI_HypothesisCreator::storeParamsToHypo( const HexoticHypothe
     h->SetHexoticVerbosity( h_data.myHexoticVerbosity );
     h->SetHexoticMaxMemory( h_data.myHexoticMaxMemory );
     h->SetHexoticSdMode( h_data.myHexoticSdMode+1 );
-    h->SetTextOptions( h_data.myTextOptions.toLatin1().constData() );
+    h->SetAdvancedOption( h_data.myTextOptions.toLatin1().constData() );
     
     HexoticPlugin_Hypothesis::THexoticSizeMaps::const_iterator it;
     
@@ -685,7 +689,7 @@ bool HexoticPluginGUI_HypothesisCreator::readParamsFromWidgets( HexoticHypothesi
   h_data.myHexoticVerbosity = myStdWidget->myHexoticVerbosity->value();
   h_data.myHexoticMaxMemory = myStdWidget->myHexoticMaxMemory->value();
   h_data.myHexoticSdMode = myStdWidget->myHexoticSdMode->currentIndex();
-  h_data.myTextOptions = myStdWidget->myTextOptions->text();
+  h_data.myTextOptions = myAdvWidget->GetCustomOptions();
 
   h_data.myMinSize = myStdWidget->myMinSize->text().isEmpty() ? 0.0 : myStdWidget->myMinSize->value();
   h_data.myMaxSize = myStdWidget->myMaxSize->text().isEmpty() ? 0.0 : myStdWidget->myMaxSize->value();
index b94bcd622ed6e4dd7c5d088d0d595529d5cf9240..f8164e50441803284558080485b5cc1258028a2c 100644 (file)
@@ -41,6 +41,7 @@ class QTableWidgetItem;
 class HexoticPluginGUI_StdWidget;
 class HexoticPluginGUI_SizeMapsWidget;
 class HexoticPluginGUI_ViscousLayersWidget;
+class SMESH_AdvOptionsWdg;
 
 typedef struct
 {
@@ -101,9 +102,10 @@ private:
 
 private:
 
-//  QWidget*           myStdGroup;
-  QLineEdit*   myName;
-  HexoticPluginGUI_StdWidget*           myStdWidget;
+//  QWidget*            myStdGroup;
+  QLineEdit*    myName;
+  HexoticPluginGUI_StdWidget*            myStdWidget;
+  SMESH_AdvOptionsWdg*                   myAdvWidget;
   HexoticPluginGUI_SizeMapsWidget*       mySmpWidget;
   HexoticPluginGUI_ViscousLayersWidget*  myVLWidget;
   StdMeshersGUI_ObjectReferenceParamWdg* myGeomSelWdg;
index e6c40b99a5a0fd51df713274432e37e787a9d49d..2ee4018fefcee1240be372cd95514e4c3bf785ad 100644 (file)
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
+   <property name="leftMargin">
     <number>0</number>
    </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item row="3" column="0" colspan="2">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Hexotic_SHARP_ANGLE_THRESHOLD</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="3">
+    <widget class="QSpinBox" name="myHexoticMaxMemory">
+     <property name="maximum">
+      <number>99999</number>
+     </property>
+     <property name="singleStep">
+      <number>128</number>
+     </property>
+     <property name="value">
+      <number>2048</number>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" colspan="2">
     <widget class="QGroupBox" name="hexoticInputSize">
      <property name="title">
      </layout>
     </widget>
    </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="label_9">
+     <property name="text">
+      <string>Hexotic_MAX_MEMORY</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>Hexotic_WORKING_DIR</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" colspan="2">
+    <widget class="QPushButton" name="dirBtn">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Hexotic_SELECT_DIR</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" colspan="2">
+    <widget class="QCheckBox" name="myHexoticInvalidElements">
+     <property name="text">
+      <string>Hexotic_INVALID_ELEMENTS</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="3">
+    <widget class="QSpinBox" name="myHexoticVerbosity">
+     <property name="maximum">
+      <number>2</number>
+     </property>
+     <property name="value">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="2" colspan="2">
     <widget class="QGroupBox" name="hexoticInputLevel">
      <property name="title">
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QCheckBox" name="myHexoticIgnoreRidges">
-     <property name="text">
-      <string>Hexotic_IGNORE_RIDGES</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QLabel" name="label_5">
-     <property name="text">
-      <string>Hexotic_SHARP_ANGLE_THRESHOLD</string>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="3">
     <widget class="SalomeApp_DoubleSpinBox" name="myHexoticSharpAngleThreshold"/>
    </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_6">
-     <property name="text">
-      <string>Hexotic_NB_PROC</string>
-     </property>
-    </widget>
-   </item>
    <item row="4" column="3">
     <widget class="SalomeApp_IntSpinBox" name="myHexoticNbProc"/>
    </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="label_7">
+   <item row="1" column="0" colspan="2">
+    <widget class="QCheckBox" name="myHexoticIgnoreRidges">
      <property name="text">
-      <string>Hexotic_WORKING_DIR</string>
+      <string>Hexotic_IGNORE_RIDGES</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1" colspan="2">
-    <widget class="QPushButton" name="dirBtn">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_6">
      <property name="text">
-      <string>Hexotic_SELECT_DIR</string>
+      <string>Hexotic_NB_PROC</string>
      </property>
     </widget>
    </item>
    <item row="5" column="3">
     <widget class="QLineEdit" name="myHexoticWorkingDir"/>
    </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="label_8">
-     <property name="text">
-      <string>Hexotic_VERBOSITY</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="3">
-    <widget class="QSpinBox" name="myHexoticVerbosity">
-     <property name="maximum">
-      <number>2</number>
-     </property>
-     <property name="value">
-      <number>1</number>
-     </property>
-    </widget>
-   </item>
    <item row="8" column="0" colspan="4">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
      </layout>
     </widget>
    </item>
-   <item row="9" column="0" colspan="4">
-    <widget class="QGroupBox" name="groupBoxAdvanced">
-     <property name="title">
-      <string>Hexotic_ADVANCED</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="margin">
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="label_10">
-        <property name="text">
-         <string>Hexotic_TEXT_OPTIONS</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="myTextOptions"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="1" column="2" colspan="2">
-    <widget class="QCheckBox" name="myHexoticInvalidElements">
-     <property name="text">
-      <string>Hexotic_INVALID_ELEMENTS</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="label_9">
+   <item row="7" column="0">
+    <widget class="QLabel" name="label_8">
      <property name="text">
-      <string>Hexotic_MAX_MEMORY</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="3">
-    <widget class="QSpinBox" name="myHexoticMaxMemory">
-     <property name="maximum">
-      <number>99999</number>
-     </property>
-     <property name="singleStep">
-      <number>128</number>
-     </property>
-     <property name="value">
-      <number>2048</number>
+      <string>Hexotic_VERBOSITY</string>
      </property>
     </widget>
    </item>
index 8794c8d38d4630c9fc805747ea232103ff7212f9..7fd42cead0a8bb5f027e9851159de80cd5c30a1a 100644 (file)
@@ -112,6 +112,13 @@ class Hexotic_Algorithm(Mesh_Algorithm):
         self.Parameters().UnsetSizeMap(theObject)
         return self.Parameters()
 
+    ## Set values of advanced options
+    #  @param theOptions string in a form "option_1 v1 option_2 v2"
+    def SetAdvancedOption(self, theOptions):
+        self.Parameters().SetAdvancedOption(theOptions)
+    def GetAdvancedOption(self):
+        return self.Parameters().GetAdvancedOption()
+
     ## (OBSOLETE) Defines "MinMaxQuad" hypothesis to give three MG-Hexa parameters
     #  @param min minimal level of recursive partitioning on the initial octree cube
     #  @param max maximal level of recursive partitioning on the initial octree cube
index 111ef226434147cc6c253a5837b0167e1aaf9c26..96a09d0530a008155f94098a47108b220b82fe06 100644 (file)
@@ -513,9 +513,9 @@ static bool readResult(std::string         theFile,
             case 4: { // "Edges"
               nodeDim = 2;
               aHexoticElement = theMesh->AddEdge( node[0], node[1] );
-              int iNode = 1;
-              if ( nodeAssigne[ nodeID[0] ] == 0 || nodeAssigne[ nodeID[0] ] == 2 )
-                iNode = 0;
+              // int iNode = 1;
+              // if ( nodeAssigne[ nodeID[0] ] == 0 || nodeAssigne[ nodeID[0] ] == 2 )
+              //   iNode = 0;
               shapeID = dummy;
               break;
             }
@@ -795,7 +795,7 @@ void HexoticPlugin_Hexotic::SetParameters(const HexoticPlugin_Hypothesis* hyp) {
     _hexoticVerbosity = hyp->GetHexoticVerbosity();
     _hexoticMaxMemory = hyp->GetHexoticMaxMemory();
     _hexoticSdMode = hyp->GetHexoticSdMode();
-    _textOptions = hyp->GetTextOptions();
+    _textOptions = hyp->GetAdvancedOption();
     _sizeMaps = hyp->GetSizeMaps();
     _nbLayers = hyp->GetNbLayers();
     _firstLayerSize = hyp->GetFirstLayerSize();
index 1842d64d9ca416e423e7bc35a5b413791f6bdaac..2891afdd040cdb072ffdae03071f5e2989ab1227 100644 (file)
@@ -162,6 +162,13 @@ void HexoticPlugin_Hypothesis::SetHexoticMaxMemory(int theVal) {
   }
 }
 
+void HexoticPlugin_Hypothesis::SetAdvancedOption(const std::string& theOptions)
+{
+  if (_textOptions != theOptions ) {
+    _textOptions = theOptions;
+    NotifySubMeshesHypothesisModification();
+  }
+}
 void HexoticPlugin_Hypothesis::SetTextOptions(const std::string& theOptions)
 {
   if (_textOptions != theOptions ) {
@@ -278,8 +285,9 @@ std::ostream& HexoticPlugin_Hypothesis::SaveTo(std::ostream& save)
   save<<"hexoticSdMode="<<_hexoticSdMode<<";";
   save<<"hexoticVerbosity="<<_hexoticVerbosity<<";";
   save<<"hexoticMaxMemory="<<_hexoticMaxMemory<<";";
-  replace(_textOptions.begin(), _textOptions.end(), ' ', '*');
-  save<<"textOptions="<<_textOptions<<";";
+  std::string textOptions = _textOptions; // save _textOptions
+  replace(textOptions.begin(), textOptions.end(), ' ', '*');
+  save<<"textOptions="<<textOptions<<";";
   THexoticSizeMaps::iterator it = _sizeMaps.begin();
   if ( it != _sizeMaps.end() )
   {
index 8137cc2e2457868dfd5cf9b8fe6b0c8f151d18a7..3c70d9efeb46adf308626b7f1c9e3496252a7e06 100644 (file)
@@ -91,7 +91,9 @@ public:
   void SetHexoticMaxMemory(int theVal);
   int GetHexoticMaxMemory() const { return _hexoticMaxMemory; }
   
-  void SetTextOptions(const std::string& theOptions);
+  void SetAdvancedOption(const std::string& theOptions);
+  std::string GetAdvancedOption() const { return _textOptions; }
+  void SetTextOptions(const std::string& theOptions); // obsolete
   std::string GetTextOptions() const { return _textOptions; }
 
   // Size Maps
index bababeb560de87cb5c6ddb5d9339961760453e10..48ac1b3e73b700a9c9b957a40e1fd14c804090b6 100644 (file)
@@ -226,10 +226,20 @@ void HexoticPlugin_Hypothesis_i::SetTextOptions(const char* theOptions)
 {
   // MESSAGE("HexoticPlugin_Hypothesis_i::SetTextOptions");
   ASSERT(myBaseImpl);
-  std::string oldValue(GetTextOptions());
-  this->GetImpl()->SetTextOptions(theOptions);
+  std::string oldValue(GetAdvancedOption());
+  this->GetImpl()->SetAdvancedOption(theOptions);
   if (theOptions != oldValue)
-    SMESH::TPythonDump() << _this() << ".SetTextOptions( '" << theOptions << "' )";
+    SMESH::TPythonDump() << _this() << ".SetAdvancedOption( '" << theOptions << "' )";
+}
+
+void HexoticPlugin_Hypothesis_i::SetAdvancedOption(const char* theOptions)
+{
+  // MESSAGE("HexoticPlugin_Hypothesis_i::SetAdvancedOption");
+  ASSERT(myBaseImpl);
+  std::string oldValue(GetAdvancedOption());
+  this->GetImpl()->SetAdvancedOption(theOptions);
+  if (theOptions != oldValue)
+    SMESH::TPythonDump() << _this() << ".SetAdvancedOption( '" << theOptions << "' )";
 }
 
 HexoticPlugin::HexoticPluginSizeMapsList* HexoticPlugin_Hypothesis_i::GetSizeMaps ()
@@ -454,11 +464,17 @@ CORBA::Long HexoticPlugin_Hypothesis_i::GetHexoticMaxMemory()
   return this->GetImpl()->GetHexoticMaxMemory();
 }
 
+char* HexoticPlugin_Hypothesis_i::GetAdvancedOption()
+{
+  // MESSAGE("HexoticPlugin_Hypothesis_i::GetAdvancedOption");
+  ASSERT(myBaseImpl);
+  return CORBA::string_dup( this->GetImpl()->GetAdvancedOption().c_str() );
+}
 char* HexoticPlugin_Hypothesis_i::GetTextOptions()
 {
   // MESSAGE("HexoticPlugin_Hypothesis_i::GetTextOptions");
   ASSERT(myBaseImpl);
-  return CORBA::string_dup( this->GetImpl()->GetTextOptions().c_str() );
+  return CORBA::string_dup( this->GetImpl()->GetAdvancedOption().c_str() );
 }
 
 CORBA::Long HexoticPlugin_Hypothesis_i::GetNbLayers()
index 0b8f4125da3813a0a011ac6a73e03370cc36f985..cd625583992277ce1b8103ef38c9287f5c88c51e 100644 (file)
@@ -84,7 +84,9 @@ class HEXOTICPLUGIN_EXPORT HexoticPlugin_Hypothesis_i:
   void SetHexoticMaxMemory(CORBA::Long theVal);
   CORBA::Long GetHexoticMaxMemory();
   
-  void SetTextOptions(const char* theOptions);
+  void SetAdvancedOption(const char* theOptions);
+  char* GetAdvancedOption();
+  void SetTextOptions(const char* theOptions); // obsolete
   char* GetTextOptions();
 
   void SetSizeMapEntry(const char* theEntry, CORBA::Double theSize);