bos #24228 [CEA 24217][Windows] cannot compile SMESH: additional fix.

[modules/smesh.git] / idl / MG_ADAPT.idl

diff --git a/idl/MG_ADAPT.idl b/idl/MG_ADAPT.idl
index 6a4c7c98328b0dad7d85e224ca79dfb487b8aed9..d6da9656567d60ea93ce2b625f4e776539743d29 100644 (file)
--- a/idl/MG_ADAPT.idl
+++ b/idl/MG_ADAPT.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2020  CEA/DEN, EDF R&D
+// Copyright (C) 2020-2021  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -14,10 +14,9 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/
-//
-// File   : MG_ADAPT.hxx
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef MG_ADAPT_IDL
 #define MG_ADAPT_IDL
 
@@ -27,13 +26,12 @@
 #include "SALOMEDS.idl"
 #include "SMESH_Mesh.idl"
 
-module SMESH{
-
-  typedef sequence<string> str_array ;
+module SMESH
+{
   struct MgAdaptHypothesisData
   {
     string  myFileInDir, myMeshFileIn, myInMeshName, myMeshFileBackground, myOutMeshName,
-            myMeshFileOut,  myFileOutDir, myFileSizeMapDir, myFieldName;
+            myMeshFileOut, myFileOutDir, myFileSizeMapDir, myFieldName;
     boolean fromMedFile;
     boolean myPublish, myMeshOutMed;
     boolean myUseLocalMap, myUseBackgroundMap, myUseConstantValue;
@@ -45,13 +43,11 @@ module SMESH{
     long    myVerboseLevel;
   };
 
-
   interface MG_ADAPT : SALOME::GenericObj
   {
-    //MG_ADAPT CreateMG_ADAPT(in PortableServer::POA_var poa);
-    void setData( inout MgAdaptHypothesisData data);
+    void setData(inout MgAdaptHypothesisData data);
 
-    void setMedFileIn(in string MedFileIn );
+    void setMedFileIn(in string MedFileIn);
     string getMedFileIn();
 
     void setMedFileOut(in string MedFileOut);
@@ -73,7 +69,7 @@ module SMESH{
     string getSizeMapFieldName();
 
     void setTimeStep(in long s);
-    long getTimeStep() ;
+    long getTimeStep();
 
     void setTimeStepRank(in long s, in long f);
     long getRank();
@@ -102,7 +98,7 @@ module SMESH{
     boolean getUseConstantValue();
 
     void setConstantSize(in double f);
-    double getConstantSize() ;
+    double getConstantSize();
 
     void setSizeMapFile(in string f);
     string getSizeMapFile();
@@ -117,37 +113,36 @@ module SMESH{
     boolean getPrintLogInFile();
 
     void setWorkingDir(in string f);
-    string getWorkingDir() ;
+    string getWorkingDir();
 
     void setSizeMapType(in string f);
     boolean setAll();
-    string getCommandToRun() ;
-    //long compute(out string errStr);
-    long compute();
+    string getCommandToRun();
+    void compute() raises(SALOME::SALOME_Exception);
     string getErrMsg();
-    string getFileName() ;
+    string getFileName();
     string getExeName();
-    void copyMgAdaptHypothesisData(in MgAdaptHypothesisData f ) ;
+    void copyMgAdaptHypothesisData(in MgAdaptHypothesisData f);
 
-    //void checkDirPath(inout string  f);
+    //void checkDirPath(inout string f);
 
-    boolean hasOptionDefined( in string optionName ) ;
+    boolean hasOptionDefined(in string optionName);
     void setOptionValue(in string optionName, in string optionValue) raises (SALOME::SALOME_Exception);
     string getOptionValue(in string optionName, inout boolean isDefault) raises (SALOME::SALOME_Exception);
-    str_array getCustomOptionValuesStrVec() ;
-    str_array getOptionValuesStrVec() ;
+    SMESH::string_array getCustomOptionValuesStrVec();
+    SMESH::string_array getOptionValuesStrVec();
   };
 
   typedef MG_ADAPT MG_ADAPT_HYPOTHESIS;
   interface MG_ADAPT_OBJECT : SALOME::GenericObj
   {
-    void setMeshIn(in SMESH_Mesh theMesh )   raises (SALOME::SALOME_Exception);
+    void setMeshIn(in SMESH_Mesh theMesh)    raises (SALOME::SALOME_Exception);
     void setMEDFileIn(in string f)           raises (SALOME::SALOME_Exception);
     void setMEDFileOut(in string f)          raises (SALOME::SALOME_Exception);
     void setMEDFileBackground(in string f)   raises (SALOME::SALOME_Exception);
     void AddHypothesis(in MG_ADAPT mg)       raises (SALOME::SALOME_Exception);
     long Compute(in boolean Publish)         raises (SALOME::SALOME_Exception);
   };
-
 };
+
 #endif // MG_ADAPT_IDL