From: gdd <gdd>
Date: Thu, 4 Oct 2012 09:34:33 +0000 (+0000)
Subject: Test on version of GHS3D is now obsolete
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=02cb3e9870601a15e99fe10fa93691baa1f8e89b;p=plugins%2Fghs3dplugin.git

Test on version of GHS3D is now obsolete
TODO: Use GMF format for case with and w/o geometry
---

diff --git a/idl/GHS3DPlugin_Algorithm.idl b/idl/GHS3DPlugin_Algorithm.idl
index 0a4fbf2..7a44669 100644
--- a/idl/GHS3DPlugin_Algorithm.idl
+++ b/idl/GHS3DPlugin_Algorithm.idl
@@ -173,6 +173,7 @@ module GHS3DPlugin
     
     GHS3DEnforcedMeshList GetEnforcedMeshes();
     void ClearEnforcedMeshes();
+
    /*!
     * Set/get/unset an enforced vertex (private method for GUI)
     */
diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx
index 2c3b9ca..c1922ad 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx
@@ -811,16 +811,16 @@ GHS3DPlugin::GHS3DEnforcedMeshList* GHS3DPlugin_Hypothesis_i::GetEnforcedMeshes(
 bool GHS3DPlugin_Hypothesis_i::SetEnforcedMeshWithGroup(SMESH::SMESH_IDSource_ptr theSource, SMESH::ElementType theType, const char* theGroupName)
   throw (SALOME::SALOME_Exception)
 {
-#if GHS3D_VERSION >= 42
+// #if GHS3D_VERSION >= 42
   return p_SetEnforcedMesh(theSource, theType, "", theGroupName);
-#else
-  SALOME::ExceptionStruct ExDescription;
-  ExDescription.text = "Bad version of GHS3D. It must >= 4.2.";
-  ExDescription.type = SALOME::BAD_PARAM;
-  ExDescription.sourceFile = "GHS3DPlugin_Hypothesis_i.cxx";
-  ExDescription.lineNumber = 719;
-  throw SALOME::SALOME_Exception(ExDescription);
-#endif
+// #else
+//   SALOME::ExceptionStruct ExDescription;
+//   ExDescription.text = "Bad version of GHS3D. It must >= 4.2.";
+//   ExDescription.type = SALOME::BAD_PARAM;
+//   ExDescription.sourceFile = "GHS3DPlugin_Hypothesis_i.cxx";
+//   ExDescription.lineNumber = 719;
+//   throw SALOME::SALOME_Exception(ExDescription);
+// #endif
 }
 
 /*!
@@ -830,16 +830,16 @@ bool GHS3DPlugin_Hypothesis_i::SetEnforcedMesh(SMESH::SMESH_IDSource_ptr theSour
   throw (SALOME::SALOME_Exception)
 {
 //   MESSAGE("GHS3DPlugin_Hypothesis_i::SetEnforcedMesh");
-#if GHS3D_VERSION >= 42
+// #if GHS3D_VERSION >= 42
   return p_SetEnforcedMesh(theSource, theType);
-#else
-  SALOME::ExceptionStruct ExDescription;
-  ExDescription.text = "Bad version of GHS3D. It must >= 4.2.";
-  ExDescription.type = SALOME::BAD_PARAM;
-  ExDescription.sourceFile = "GHS3DPlugin_Hypothesis_i.cxx";
-  ExDescription.lineNumber = 750;
-  throw SALOME::SALOME_Exception(ExDescription);
-#endif
+// #else
+//   SALOME::ExceptionStruct ExDescription;
+//   ExDescription.text = "Bad version of GHS3D. It must >= 4.2.";
+//   ExDescription.type = SALOME::BAD_PARAM;
+//   ExDescription.sourceFile = "GHS3DPlugin_Hypothesis_i.cxx";
+//   ExDescription.lineNumber = 750;
+//   throw SALOME::SALOME_Exception(ExDescription);
+// #endif
 }
 
 /*!
@@ -848,16 +848,16 @@ bool GHS3DPlugin_Hypothesis_i::SetEnforcedMesh(SMESH::SMESH_IDSource_ptr theSour
 bool GHS3DPlugin_Hypothesis_i::SetEnforcedMeshSizeWithGroup(SMESH::SMESH_IDSource_ptr theSource, SMESH::ElementType theType, double theSize, const char* theGroupName)
   throw (SALOME::SALOME_Exception)
 {
-#if GHS3D_VERSION >= 42
+// #if GHS3D_VERSION >= 42
   return p_SetEnforcedMesh(theSource, theType, "", theGroupName);
-#else
-  SALOME::ExceptionStruct ExDescription;
-  ExDescription.text = "Bad version of GHS3D. It must >= 4.2.";
-  ExDescription.type = SALOME::BAD_PARAM;
-  ExDescription.sourceFile = "GHS3DPlugin_Hypothesis_i.cxx";
-  ExDescription.lineNumber = 750;
-  throw SALOME::SALOME_Exception(ExDescription);
-#endif
+// #else
+//   SALOME::ExceptionStruct ExDescription;
+//   ExDescription.text = "Bad version of GHS3D. It must >= 4.2.";
+//   ExDescription.type = SALOME::BAD_PARAM;
+//   ExDescription.sourceFile = "GHS3DPlugin_Hypothesis_i.cxx";
+//   ExDescription.lineNumber = 750;
+//   throw SALOME::SALOME_Exception(ExDescription);
+// #endif
 }
 
 /*!
@@ -866,16 +866,16 @@ bool GHS3DPlugin_Hypothesis_i::SetEnforcedMeshSizeWithGroup(SMESH::SMESH_IDSourc
 bool GHS3DPlugin_Hypothesis_i::SetEnforcedMeshSize(SMESH::SMESH_IDSource_ptr theSource, SMESH::ElementType theType, double theSize)
   throw (SALOME::SALOME_Exception)
 {
-#if GHS3D_VERSION >= 42
+// #if GHS3D_VERSION >= 42
   return p_SetEnforcedMesh(theSource, theType);
-#else
-  SALOME::ExceptionStruct ExDescription;
-  ExDescription.text = "Bad version of GHS3D. It must >= 4.2.";
-  ExDescription.type = SALOME::BAD_PARAM;
-  ExDescription.sourceFile = "GHS3DPlugin_Hypothesis_i.cxx";
-  ExDescription.lineNumber = 750;
-  throw SALOME::SALOME_Exception(ExDescription);
-#endif
+// #else
+//   SALOME::ExceptionStruct ExDescription;
+//   ExDescription.text = "Bad version of GHS3D. It must >= 4.2.";
+//   ExDescription.type = SALOME::BAD_PARAM;
+//   ExDescription.sourceFile = "GHS3DPlugin_Hypothesis_i.cxx";
+//   ExDescription.lineNumber = 750;
+//   throw SALOME::SALOME_Exception(ExDescription);
+// #endif
 }
 
 bool GHS3DPlugin_Hypothesis_i::p_SetEnforcedMesh(SMESH::SMESH_IDSource_ptr theSource, SMESH::ElementType theType, const char* theName, const char* theGroupName)