From: gdd <gdd>
Date: Tue, 3 May 2011 13:16:36 +0000 (+0000)
Subject: Enforced meshes
X-Git-Tag: V6_3_0~25
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2f2de0f1462781ac6f8c078f155125c4cd7ae9ca;p=plugins%2Fhybridplugin.git

Enforced meshes
---

diff --git a/idl/GHS3DPlugin_Algorithm.idl b/idl/GHS3DPlugin_Algorithm.idl
index 20bcf33..99db25e 100644
--- a/idl/GHS3DPlugin_Algorithm.idl
+++ b/idl/GHS3DPlugin_Algorithm.idl
@@ -26,6 +26,7 @@
 
 #include "SALOME_Exception.idl"
 #include "SMESH_Hypothesis.idl"
+#include "SMESH_Mesh.idl"
 
 /*!
  * GHS3DPlugin: interfaces to GHS3D related hypotheses and algorithms
@@ -45,6 +46,7 @@ module GHS3DPlugin
    */
   interface GHS3DPlugin_GHS3D : SMESH::SMESH_3D_Algo
   {
+    boolean importGMFMesh(in string aGMFFileName);
   };
 
   /*!
@@ -134,6 +136,10 @@ module GHS3DPlugin
     void RemoveEnforcedVertex(in double x, in double y, in double z) raises (SALOME::SALOME_Exception);
     GHS3DEnforcedVertexList GetEnforcedVertices();
     void ClearEnforcedVertices();
+    
+    void SetEnforcedMesh(in SMESH::SMESH_IDSource theSource, in SMESH::ElementType elementType) raises (SALOME::SALOME_Exception);
+    void SetEnforcedMeshSize(in SMESH::SMESH_IDSource theSource, in SMESH::ElementType elementType, in double size) raises (SALOME::SALOME_Exception);
+    void ClearEnforcedMeshes();
   };
 };
 
diff --git a/idl/Makefile.am b/idl/Makefile.am
index 8e265df..2dc3697 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -47,12 +47,14 @@ libSalomeIDLGHS3DPLUGIN_la_CPPFLAGS = \
 	$(CORBA_INCLUDES) \
 	$(KERNEL_CXXFLAGS) \
 	$(GEOM_CXXFLAGS) \
+	$(MED_CXXFLAGS) \
 	$(SMESH_CXXFLAGS)
 
 libSalomeIDLGHS3DPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0
 libSalomeIDLGHS3DPLUGIN_la_LIBADD  = \
 	$(KERNEL_LDFLAGS) -lSalomeIDLKernel \
 	$(GEOM_LDFLAGS) -lSalomeIDLGEOM \
+	$(MED_LDFLAGS) -lSalomeIDLMED \
 	$(SMESH_LDFLAGS) -lSalomeIDLSMESH \
 	@CORBA_LIBS@
 
@@ -64,6 +66,7 @@ OMNIORB_IDLPYFLAGS  = \
 	-I$(top_builddir)/idl/salome \
 	-I$(KERNEL_ROOT_DIR)/idl/salome \
 	-I$(GEOM_ROOT_DIR)/idl/salome \
+	-I$(MED_ROOT_DIR)/idl/salome \
 	-I$(SMESH_ROOT_DIR)/idl/salome
 
 IDLCXXFLAGS = \
@@ -72,11 +75,13 @@ IDLCXXFLAGS = \
 	-I$(top_builddir)/idl/salome \
 	-I$(KERNEL_ROOT_DIR)/idl/salome \
 	-I$(GEOM_ROOT_DIR)/idl/salome \
+	-I$(MED_ROOT_DIR)/idl/salome \
 	-I$(SMESH_ROOT_DIR)/idl/salome
 IDLPYFLAGS  = \
 	@IDLPYFLAGS@ \
 	-I$(KERNEL_ROOT_DIR)/idl/salome \
 	-I$(GEOM_ROOT_DIR)/idl/salome \
+	-I$(MED_ROOT_DIR)/idl/salome \
 	-I$(SMESH_ROOT_DIR)/idl/salome
 
 # potential problem on parallel make on the following - multiple outputs
@@ -108,7 +113,7 @@ mostlyclean-local:
 	@for dep in $^ dummy; do \
 	  if [ $$dep != "dummy" ]; then \
 	    echo Building dependencies for $$dep; \
-	    $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
+	    $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
 	    sed 's/\.o/\SK.cc/' >>$@; \
 	  fi; \
 	done ;