From: vsv <vsv@opencascade.com>
Date: Mon, 9 Dec 2019 13:15:39 +0000 (+0300)
Subject: Modification according to SMESH_Gen changes
X-Git-Tag: V9_5_0a1^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Focc%2Fshaper2smesh;p=plugins%2Fghs3dplugin.git

Modification according to SMESH_Gen changes
---

diff --git a/src/GHS3DPlugin/CMakeLists.txt b/src/GHS3DPlugin/CMakeLists.txt
index e44ead3..9115767 100644
--- a/src/GHS3DPlugin/CMakeLists.txt
+++ b/src/GHS3DPlugin/CMakeLists.txt
@@ -102,7 +102,7 @@ SET(_bin_SCRIPTS
 
 # --- rules ---
 
-ADD_LIBRARY(GHS3DEngine ${GHS3DEngine_SOURCES})
+ADD_LIBRARY(GHS3DEngine ${GHS3DEngine_SOURCES} ${GHS3DEngine_HEADERS})
 TARGET_LINK_LIBRARIES(GHS3DEngine ${_link_LIBRARIES} )
 INSTALL(TARGETS GHS3DEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
diff --git a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx
index 38babcd..4584421 100644
--- a/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx
+++ b/src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx
@@ -838,7 +838,7 @@ bool GHS3DPlugin_Hypothesis_i::SetEnforcedVertexGeom(GEOM::GEOM_Object_ptr theVe
   string theVertexEntry = theVertex->GetStudyEntry();
   CORBA::Double x = 0, y = 0, z = 0;
   CORBA::Boolean isCompound = false;
-  GEOM::GEOM_Gen_ptr geomGen = SMESH_Gen_i::GetGeomEngine();
+  GEOM::GEOM_Gen_ptr geomGen = SMESH_Gen_i::GetGeomEngine( theVertex );
   if (theVertexEntry.empty()) {
     string aName;
     if (theVertex->GetShapeType() == GEOM::VERTEX) {
@@ -880,7 +880,7 @@ bool GHS3DPlugin_Hypothesis_i::SetEnforcedVertexGeomWithGroup(GEOM::GEOM_Object_
   string theVertexEntry = theVertex->GetStudyEntry();
   CORBA::Double x = 0, y = 0, z = 0;
   CORBA::Boolean isCompound = false;
-  GEOM::GEOM_Gen_ptr geomGen = SMESH_Gen_i::GetGeomEngine();
+  GEOM::GEOM_Gen_ptr geomGen = SMESH_Gen_i::GetGeomEngine( theVertex );
   if (theVertexEntry.empty()) {
     string aName;
     if (theVertex->GetShapeType() == GEOM::VERTEX) {
@@ -1013,7 +1013,7 @@ CORBA::Double GHS3DPlugin_Hypothesis_i::GetEnforcedVertexGeom(GEOM::GEOM_Object_
   
   string theVertexEntry = theVertex->GetStudyEntry();
   if (theVertexEntry.empty()) {
-    GEOM::GEOM_Gen_ptr geomGen = SMESH_Gen_i::GetGeomEngine();
+    GEOM::GEOM_Gen_ptr geomGen = SMESH_Gen_i::GetGeomEngine( theVertex );
     string aName;
     if (theVertex->GetShapeType() == GEOM::VERTEX)
       aName = "Vertex_";
@@ -1116,7 +1116,7 @@ bool GHS3DPlugin_Hypothesis_i::RemoveEnforcedVertexGeom(GEOM::GEOM_Object_ptr th
   
   string theVertexEntry = theVertex->GetStudyEntry();
   if (theVertexEntry.empty()) {
-    GEOM::GEOM_Gen_ptr geomGen = SMESH_Gen_i::GetGeomEngine();
+    GEOM::GEOM_Gen_ptr geomGen = SMESH_Gen_i::GetGeomEngine( theVertex );
     string aName;
     if (theVertex->GetShapeType() == GEOM::VERTEX)
       aName = "Vertex_";
diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index e381f5f..4bf2c00 100644
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -58,6 +58,7 @@ SET(_link_LIBRARIES
   ${GUI_SalomeApp}
   ${OpenCASCADE_FoundationClasses_LIBRARIES}
   SalomeIDLGHS3DPLUGIN
+  GHS3DEngine
 )
 
 # --- headers ---
diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
index 2183f96..2775a8a 100644
--- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
@@ -45,6 +45,8 @@
 #include <SalomeApp_Tools.h>
 #include <SalomeApp_TypeFilter.h>
 
+#include "GHS3DPlugin_Hypothesis.hxx"
+
 #include <QCheckBox>
 #include <QComboBox>
 #include <QFileInfo>