From da15569f61e6a1406376047094a75e36337aa317 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 5 Dec 2011 11:52:22 +0000 Subject: [PATCH] Merge from V6_4_BR 05/12/2011 --- configure.ac | 2 +- src/GUI/GHS3DPluginGUI.cxx | 10 +------ src/GUI/GHS3DPluginGUI_Enums.h | 2 +- src/GUI/GHS3DPluginGUI_HypothesisCreator.h | 2 +- src/GUI/Makefile.am | 35 +++++++++++----------- 5 files changed, 22 insertions(+), 29 deletions(-) diff --git a/configure.ac b/configure.ac index d6c654e..9288aad 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ # Modified by : Marc Tajchman (CEA) # Created from configure.in.base # -AC_INIT([Salome2 Project GHS3DPLUGIN module],[6.3.1], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN]) +AC_INIT([Salome2 Project GHS3DPLUGIN module],[6.4.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/src/GUI/GHS3DPluginGUI.cxx b/src/GUI/GHS3DPluginGUI.cxx index 9007c1a..8811e36 100644 --- a/src/GUI/GHS3DPluginGUI.cxx +++ b/src/GUI/GHS3DPluginGUI.cxx @@ -22,14 +22,6 @@ // Authors : Gilles DAVID (Euriware) // --- // -#ifdef WNT -// E.A. : On windows with python 2.6, there is a conflict -// E.A. : between pymath.h and Standard_math.h which define -// E.A. : some same symbols : acosh, asinh, ... -#include -#include -#endif - #include "GHS3DPluginGUI_HypothesisCreator.h" //============================================================================= @@ -47,4 +39,4 @@ extern "C" aCreator = new GHS3DPluginGUI_HypothesisCreator( aHypType ); return aCreator; } -} \ No newline at end of file +} diff --git a/src/GUI/GHS3DPluginGUI_Enums.h b/src/GUI/GHS3DPluginGUI_Enums.h index 0ba8945..793507b 100644 --- a/src/GUI/GHS3DPluginGUI_Enums.h +++ b/src/GUI/GHS3DPluginGUI_Enums.h @@ -81,4 +81,4 @@ enum { }; -#endif \ No newline at end of file +#endif diff --git a/src/GUI/GHS3DPluginGUI_HypothesisCreator.h b/src/GUI/GHS3DPluginGUI_HypothesisCreator.h index a71f6c2..2052404 100644 --- a/src/GUI/GHS3DPluginGUI_HypothesisCreator.h +++ b/src/GUI/GHS3DPluginGUI_HypothesisCreator.h @@ -191,7 +191,7 @@ protected slots: void addEnforcedMesh(std::string name, std::string entry, int elementType, double size = 0, std::string groupName = ""); void onAddEnforcedMesh(); void onRemoveEnforcedMesh(); - void synchronizeEnforcedMesh(); + //void synchronizeEnforcedMesh(); void checkEnfMeshIsDefined(); signals: diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am index 3c3f4a0..f5ce8b5 100644 --- a/src/GUI/Makefile.am +++ b/src/GUI/Makefile.am @@ -26,15 +26,15 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = \ - GHS3DPluginGUI_HypothesisCreator.h \ +salomeinclude_HEADERS = \ + GHS3DPluginGUI_HypothesisCreator.h \ GHS3DPluginGUI_Enums.h # Libraries targets lib_LTLIBRARIES = libGHS3DPluginGUI.la -dist_libGHS3DPluginGUI_la_SOURCES = \ - GHS3DPluginGUI.cxx \ +dist_libGHS3DPluginGUI_la_SOURCES = \ + GHS3DPluginGUI.cxx \ GHS3DPluginGUI_HypothesisCreator.cxx MOC_FILES = \ @@ -43,18 +43,18 @@ MOC_FILES = \ nodist_libGHS3DPluginGUI_la_SOURCES= \ $(MOC_FILES) -libGHS3DPluginGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(SMESH_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GHS3DPlugin \ +libGHS3DPluginGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(GEOM_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(SMESH_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GHS3DPlugin \ -I$(top_builddir)/idl libGHS3DPluginGUI_la_LDFLAGS = \ @@ -62,7 +62,8 @@ libGHS3DPluginGUI_la_LDFLAGS = \ $(QT_LIBS) \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ $(MED_LDFLAGS) -lSalomeIDLMED \ - $(SMESH_LDFLAGS) -lSMESH -lGeomSelectionTools -lStdMeshersGUI\ + $(GEOM_LDFLAGS) -lGEOM \ + $(SMESH_LDFLAGS) -lSMESH -lGeomSelectionTools -lStdMeshersGUI -lSMESHFiltersSelection \ $(GUI_LDFLAGS) -lsuit -lqtx -lSalomeApp \ $(CAS_KERNEL) -- 2.39.2