From 43be995171080a57d755c6c14b19103d7f308f10 Mon Sep 17 00:00:00 2001 From: jfa Date: Wed, 28 Dec 2005 09:12:58 +0000 Subject: [PATCH] Join modifications from branch BR_3_1_0deb --- INSTALL | 6 +++--- bin/VERSION | 2 +- build_configure | 2 +- doc/salome/tui/GEOM/doxyfile | 2 +- doc/salome/tui/GEOM/doxyfile_py | 2 +- doc/salome/tui/GEOM/sources/static/tree.js | 2 +- resources/GEOMCatalog.xml | 4 ++-- src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx | 7 +++++-- src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx | 7 +++++-- src/GEOMGUI/GEOM_msg_en.po | 4 ++-- 10 files changed, 22 insertions(+), 16 deletions(-) diff --git a/INSTALL b/INSTALL index 727a8cbc2..3adf46d88 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -This is the version 3.1.0b1 of GEOM +This is the version 3.1.0 of GEOM Compatible with : - - KERNEL 3.1.0b1 - - GUI 3.1.0b1 + - KERNEL 3.1.0 + - GUI 3.1.0 diff --git a/bin/VERSION b/bin/VERSION index fe07c1fa5..2d918a5a9 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - GEOM VERSION: 3.1.0b1 +THIS IS SALOME - GEOM VERSION: 3.1.0 diff --git a/build_configure b/build_configure index 78b2ea635..6fdce3389 100755 --- a/build_configure +++ b/build_configure @@ -109,7 +109,7 @@ fi # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files echo "" >> configure.in_tmp1 -echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1 +echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 echo "" >> configure.in_tmp1 echo "AC_OUTPUT([ \\" >> configure.in_tmp1 diff --git a/doc/salome/tui/GEOM/doxyfile b/doc/salome/tui/GEOM/doxyfile index 92c502252..0ed451a70 100755 --- a/doc/salome/tui/GEOM/doxyfile +++ b/doc/salome/tui/GEOM/doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # General configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - GEOM - v.2.1.0" +PROJECT_NAME = "SALOME - GEOM - v.3.1.0" PROJECT_NUMBER = id#1.1 OUTPUT_DIRECTORY = ../ OUTPUT_LANGUAGE = English diff --git a/doc/salome/tui/GEOM/doxyfile_py b/doc/salome/tui/GEOM/doxyfile_py index a76886de1..2d28cceaa 100755 --- a/doc/salome/tui/GEOM/doxyfile_py +++ b/doc/salome/tui/GEOM/doxyfile_py @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # General configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - GEOM - v.2.1.0" +PROJECT_NAME = "SALOME - GEOM - v.3.1.0" PROJECT_NUMBER = id#1.1 OUTPUT_DIRECTORY = ../ OUTPUT_LANGUAGE = English diff --git a/doc/salome/tui/GEOM/sources/static/tree.js b/doc/salome/tui/GEOM/sources/static/tree.js index edeb48ce7..d1ca30e7b 100755 --- a/doc/salome/tui/GEOM/sources/static/tree.js +++ b/doc/salome/tui/GEOM/sources/static/tree.js @@ -1,4 +1,4 @@ -foldersTree = gFld("SALOME v.2.1.0 ", "", "") +foldersTree = gFld("SALOME v.3.1.0 ", "", "") insDoc(foldersTree, gLnk("Main Page", "", "main.html")) aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) diff --git a/resources/GEOMCatalog.xml b/resources/GEOMCatalog.xml index 980518708..c6931a556 100644 --- a/resources/GEOMCatalog.xml +++ b/resources/GEOMCatalog.xml @@ -16,7 +16,7 @@ Geometry Geom NRI - 3.1.0b1 + 3.1.0 Geometry component 1 ModuleGeom.png @@ -526,7 +526,7 @@ GEOM_Superv OTHER mkr - 3.1.0b1 + 3.1.0 Supervision wrapper for Geometry component 1 diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx index 6e8455412..5066277c1 100644 --- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx @@ -118,8 +118,11 @@ bool GEOM_SelectionFilter::getShape (const GEOM::GEOM_Object_ptr& theObject, if ( app ) { SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( app->namingService() ); - Engines::Component_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" ); - GEOM::GEOM_Gen_var geomGen = GEOM::GEOM_Gen::_narrow( comp ); + static GEOM::GEOM_Gen_var geomGen; + if(CORBA::is_nil( geomGen )) { + Engines::Component_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" ); + geomGen = GEOM::GEOM_Gen::_narrow( comp ); + } if ( !CORBA::is_nil( geomGen ) ) { TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( geomGen, theObject ); diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx index 5292daa07..f074982a9 100644 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx @@ -45,8 +45,11 @@ static bool getShape( const GEOM::GEOM_Object_ptr& theObject, TopoDS_Shape& theS { if ( !CORBA::is_nil( theObject ) ) { - Engines::Component_var comp = QAD_Application::getDesktop()->getEngine( "FactoryServer", "GEOM" ); - GEOM::GEOM_Gen_var myGeom = GEOM::GEOM_Gen::_narrow( comp ); + static GEOM::GEOM_Gen_var myGeom; + if(CORBA::is_nil(myGeom) { + Engines::Component_var comp = QAD_Application::getDesktop()->getEngine( "FactoryServer", "GEOM" ); + myGeom = GEOM::GEOM_Gen::_narrow( comp ); + } TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( myGeom, theObject ); if ( !aTopoDSShape.IsNull() ) diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po index a93ce5af3..4dcf34b03 100644 --- a/src/GEOMGUI/GEOM_msg_en.po +++ b/src/GEOMGUI/GEOM_msg_en.po @@ -2115,10 +2115,10 @@ msgid "STB_BOX" msgstr "Create a box" msgid "TOP_CYLINDER" -msgstr "Create a cyliner" +msgstr "Create a cylinder" msgid "MEN_CYLINDER" -msgstr "Cyliner" +msgstr "Cylinder" msgid "STB_CYLINDER" msgstr "Create a cylinder" -- 2.39.2