Join modifications from branch BR_3_1_0deb

diff --git a/INSTALL b/INSTALL
index 727a8cbc2954fdff7d6b484ba5ef789f36b56ebc..3adf46d880f90c82d95723a98484dccec6fb4be2 100644 (file)
--- 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 fe07c1fa5b95e8b222e41f3e0e057ec67edcc709..2d918a5a921c6cac37c8f9a5a279e02e51c3c7c1 100755 (executable)
--- 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 78b2ea635379c5df9986b3f0192bb6fa5f58ec44..6fdce3389e156129d5a49b8398b91fd9263ccba9 100755 (executable)
--- 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 92c5022526de35867f3b02c569a201b925fb1db3..0ed451a70b266171e8d5d3329564f2f59735f66b 100755 (executable)
--- 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 a76886de19fe871d12efd3a7d2e2825c635794c9..2d28cceaa4b7307f95d879f61db9cc00e31e0417 100755 (executable)
--- 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 edeb48ce75a0c6ea5fcc459c870dd5772c1d6a5f..d1ca30e7bb5c074a5cd67a6bf07361d2cd27e076 100755 (executable)
--- a/doc/salome/tui/GEOM/sources/static/tree.js
+++ b/doc/salome/tui/GEOM/sources/static/tree.js
@@ -1,4 +1,4 @@
-foldersTree = gFld("<b>SALOME v.2.1.0 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.3.1.0 </b>", "", "")
      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 980518708d9c262bbc462bff9e36874225a654c6..c6931a556fd87da24f6ba038574e2bd95b2927d3 100644 (file)
--- a/resources/GEOMCatalog.xml
+++ b/resources/GEOMCatalog.xml
@@ -16,7 +16,7 @@
         <component-username>Geometry</component-username>
         <component-type>Geom</component-type>
         <component-author>NRI</component-author>
-        <component-version>3.1.0b1</component-version>
+        <component-version>3.1.0</component-version>
         <component-comment>Geometry component</component-comment>
         <component-multistudy>1</component-multistudy>
         <component-icone>ModuleGeom.png</component-icone>
@@ -526,7 +526,7 @@
             <component-username>GEOM_Superv</component-username>
             <component-type>OTHER</component-type>
             <component-author>mkr</component-author>
-            <component-version>3.1.0b1</component-version>
+            <component-version>3.1.0</component-version>
             <component-comment>Supervision wrapper for Geometry component</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-icone></component-icone>

diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
index 6e84554125febcf1c2d0c136cdbc3d31ad4b8785..5066277c17f26edd0cc198dd8b12c5ba41e7621f 100644 (file)
--- 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 5292daa070cc222639abcb5a0314cf605e40d9bb..f074982a9ee196ddd82719e15a5b09a50e924061 100644 (file)
--- 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 a93ce5af3a3ae122e30f2db0b76b609a80700bd1..4dcf34b0327077d78780a321a0fe4ab06d488752 100644 (file)
--- 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"