ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-12 13:17:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

Join modifications from branch BR_3_1_0deb

Browse Source
This commit is contained in:
jfa 2005-12-28 09:12:58 +00:00
parent 71e874ca8e
commit 43be995171
10 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL
View File

@ -1,4 +1,4 @@
This is the version 3.1.0b1 of GEOM This is the version 3.1.0 of GEOM
Compatible with : Compatible with :
- KERNEL 3.1.0b1 - KERNEL 3.1.0
- GUI 3.1.0b1 - GUI 3.1.0

2
bin/VERSION
View File

@ -1 +1 @@
THIS IS SALOME - GEOM VERSION: 3.1.0b1 THIS IS SALOME - GEOM VERSION: 3.1.0

2
build_configure
View File

@ -109,7 +109,7 @@ fi
# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
echo "" >> configure.in_tmp1 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 "" >> configure.in_tmp1
echo "AC_OUTPUT([ \\" >> configure.in_tmp1 echo "AC_OUTPUT([ \\" >> configure.in_tmp1

2
doc/salome/tui/GEOM/doxyfile
View File

@ -3,7 +3,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# General configuration options # General configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
PROJECT_NAME = "SALOME - GEOM - v.2.1.0" PROJECT_NAME = "SALOME - GEOM - v.3.1.0"
PROJECT_NUMBER = id#1.1 PROJECT_NUMBER = id#1.1
OUTPUT_DIRECTORY = ../ OUTPUT_DIRECTORY = ../
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English

2
doc/salome/tui/GEOM/doxyfile_py
View File

@ -3,7 +3,7 @@
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# General configuration options # General configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
PROJECT_NAME = "SALOME - GEOM - v.2.1.0" PROJECT_NAME = "SALOME - GEOM - v.3.1.0"
PROJECT_NUMBER = id#1.1 PROJECT_NUMBER = id#1.1
OUTPUT_DIRECTORY = ../ OUTPUT_DIRECTORY = ../
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English

2
doc/salome/tui/GEOM/sources/static/tree.js
View File

@ -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")) insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))

4
resources/GEOMCatalog.xml
View File

@ -16,7 +16,7 @@
<component-username>Geometry</component-username> <component-username>Geometry</component-username>
<component-type>Geom</component-type> <component-type>Geom</component-type>
<component-author>NRI</component-author> <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-comment>Geometry component</component-comment>
<component-multistudy>1</component-multistudy> <component-multistudy>1</component-multistudy>
<component-icone>ModuleGeom.png</component-icone> <component-icone>ModuleGeom.png</component-icone>
@ -526,7 +526,7 @@
<component-username>GEOM_Superv</component-username> <component-username>GEOM_Superv</component-username>
<component-type>OTHER</component-type> <component-type>OTHER</component-type>
<component-author>mkr</component-author> <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-comment>Supervision wrapper for Geometry component</component-comment>
<component-multistudy>1</component-multistudy> <component-multistudy>1</component-multistudy>
<component-icone></component-icone> <component-icone></component-icone>

7
src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
View File

@ -118,8 +118,11 @@ bool GEOM_SelectionFilter::getShape (const GEOM::GEOM_Object_ptr& theObject,
if ( app ) if ( app )
{ {
SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( app->namingService() ); SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( app->namingService() );
Engines::Component_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" ); static GEOM::GEOM_Gen_var geomGen;
GEOM::GEOM_Gen_var geomGen = GEOM::GEOM_Gen::_narrow( comp ); 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 ) ) if ( !CORBA::is_nil( geomGen ) )
{ {
TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( geomGen, theObject ); TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( geomGen, theObject );

7
src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx
View File

@ -45,8 +45,11 @@ static bool getShape( const GEOM::GEOM_Object_ptr& theObject, TopoDS_Shape& theS
{ {
if ( !CORBA::is_nil( theObject ) ) if ( !CORBA::is_nil( theObject ) )
{ {
Engines::Component_var comp = QAD_Application::getDesktop()->getEngine( "FactoryServer", "GEOM" ); static GEOM::GEOM_Gen_var myGeom;
GEOM::GEOM_Gen_var myGeom = GEOM::GEOM_Gen::_narrow( comp ); 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 ); TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( myGeom, theObject );
if ( !aTopoDSShape.IsNull() ) if ( !aTopoDSShape.IsNull() )

4
src/GEOMGUI/GEOM_msg_en.po
View File

@ -2115,10 +2115,10 @@ msgid "STB_BOX"
msgstr "Create a box" msgstr "Create a box"
msgid "TOP_CYLINDER" msgid "TOP_CYLINDER"
msgstr "Create a cyliner" msgstr "Create a cylinder"
msgid "MEN_CYLINDER" msgid "MEN_CYLINDER"
msgstr "Cyliner" msgstr "Cylinder"
msgid "STB_CYLINDER" msgid "STB_CYLINDER"
msgstr "Create a cylinder" msgstr "Create a cylinder"