From: nri Date: Fri, 16 May 2003 10:38:04 +0000 (+0000) Subject: NRI : Update according to naming rule. X-Git-Tag: Start-v1_1a~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3baf90a543aa425d45298fd7ee389fb584628c8c;p=modules%2Fgeom.git NRI : Update according to naming rule. --- diff --git a/src/ARCHIMEDE/Makefile.in b/src/ARCHIMEDE/Makefile.in index 465d4cb14..d23c6791c 100644 --- a/src/ARCHIMEDE/Makefile.in +++ b/src/ARCHIMEDE/Makefile.in @@ -16,7 +16,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl # Libraries targets -LIB = libGeometryArchimede.la +LIB = libGEOMArchimede.la LIB_SRC = Archimede_VolumeSection.cxx LIB_CLIENT_IDL = diff --git a/src/GEOM/Makefile.in b/src/GEOM/Makefile.in index 8a4c26cd6..1a01df836 100644 --- a/src/GEOM/Makefile.in +++ b/src/GEOM/Makefile.in @@ -30,7 +30,7 @@ EXPORT_HEADERS = # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_LIBS) -lGeometryDS -lSalomeDS -lSalomeNS -lSalomeContainer -lGeometryPartition -lGeometryArchimede -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_LIBS) -lGEOMDS -lSalomeDS -lSalomeNS -lSalomeContainer -lGEOMPartition -lGEOMArchimede -L${KERNEL_ROOT_DIR}/lib/salome # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOMClient/Makefile.in b/src/GEOMClient/Makefile.in index 47cd81639..cc65ff70e 100644 --- a/src/GEOMClient/Makefile.in +++ b/src/GEOMClient/Makefile.in @@ -20,7 +20,7 @@ EXPORT_HEADERS = \ # Libraries targets -LIB = libGeometryClient.la +LIB = libGEOMClient.la LIB_SRC = GEOM_Client.cxx LIB_SERVER_IDL = SALOME_Component.idl SALOMEDS.idl SALOME_Exception.idl GEOM_Shape.idl GEOM_Gen.idl diff --git a/src/GEOMDS/Makefile.in b/src/GEOMDS/Makefile.in index 095106538..30e8fdc5c 100644 --- a/src/GEOMDS/Makefile.in +++ b/src/GEOMDS/Makefile.in @@ -16,7 +16,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl # Libraries targets -LIB = libGeometryDS.la +LIB = libGEOMDS.la LIB_SRC = GEOMDS_Application.cxx \ GEOMDS_Commands.cxx \ GEOMDS_Explorer.cxx \ @@ -43,7 +43,7 @@ EXPORT_HEADERS= GEOMDS_Application.hxx \ # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_LIBS) # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOMFiltersSelection/Makefile.in b/src/GEOMFiltersSelection/Makefile.in index 1e0a90fdc..954d25e43 100644 --- a/src/GEOMFiltersSelection/Makefile.in +++ b/src/GEOMFiltersSelection/Makefile.in @@ -16,7 +16,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl # Libraries targets -LIB = libGeometryFiltersSelection.la +LIB = libGEOMFiltersSelection.la LIB_SRC = GEOM_ShapeTypeFilter.cxx \ GEOM_FaceFilter.cxx \ GEOM_EdgeFilter.cxx diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in index 59655d0b8..dbbef4314 100644 --- a/src/GEOMGUI/Makefile.in +++ b/src/GEOMGUI/Makefile.in @@ -149,6 +149,6 @@ LIB_SERVER_IDL = CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGeometryClient -lGeometryObject -lGeometryFiltersSelection -lGeometrySketcher $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome @CONCLUDE@ diff --git a/src/GEOM_SWIG/GEOM_example2.py b/src/GEOM_SWIG/GEOM_example2.py index 61c1e2bb9..cb016efad 100644 --- a/src/GEOM_SWIG/GEOM_example2.py +++ b/src/GEOM_SWIG/GEOM_example2.py @@ -11,7 +11,7 @@ import salome import geompy import math -geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry") +geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") myBuilder = salome.myStudy.NewBuilder() point0 = geom.MakePointStruct(0.,0.,0.) diff --git a/src/GEOM_SWIG/GEOM_example3.py b/src/GEOM_SWIG/GEOM_example3.py index a66a4fa57..70130a7aa 100644 --- a/src/GEOM_SWIG/GEOM_example3.py +++ b/src/GEOM_SWIG/GEOM_example3.py @@ -12,7 +12,7 @@ import geompy import math from time import sleep -geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry") +geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") myBuilder = salome.myStudy.NewBuilder() gg = salome.ImportComponentGUI("Geometry") diff --git a/src/GEOM_SWIG/GEOM_example4.py b/src/GEOM_SWIG/GEOM_example4.py index a78cd9d01..3ec10fa07 100755 --- a/src/GEOM_SWIG/GEOM_example4.py +++ b/src/GEOM_SWIG/GEOM_example4.py @@ -7,7 +7,7 @@ import math import geompy -geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry") +geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") myBuilder = salome.myStudy.NewBuilder() from geompy import gg diff --git a/src/GEOM_SWIG/GEOM_moteur.py b/src/GEOM_SWIG/GEOM_moteur.py index 2f6b4341b..3c879fd83 100644 --- a/src/GEOM_SWIG/GEOM_moteur.py +++ b/src/GEOM_SWIG/GEOM_moteur.py @@ -11,7 +11,7 @@ import salome import geompy import math -geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry") +geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") myBuilder = salome.myStudy.NewBuilder() #Variables modifiables diff --git a/src/GEOM_SWIG/GEOM_usinggeom.py b/src/GEOM_SWIG/GEOM_usinggeom.py index aa315c2db..97674648e 100644 --- a/src/GEOM_SWIG/GEOM_usinggeom.py +++ b/src/GEOM_SWIG/GEOM_usinggeom.py @@ -11,7 +11,7 @@ import salome import geompy import math -geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry") +geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") myBuilder = salome.myStudy.NewBuilder() from geompy import gg diff --git a/src/GEOM_SWIG/Makefile.in b/src/GEOM_SWIG/Makefile.in index 106306572..0790ec2bd 100644 --- a/src/GEOM_SWIG/Makefile.in +++ b/src/GEOM_SWIG/Makefile.in @@ -17,7 +17,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl # Libraries targets -LIB = libGeometry_Swigcmodule.la +LIB = libGEOM_Swigcmodule.la LIB_SRC = SWIG_DEF = libGeometry_Swig.i diff --git a/src/GEOM_SWIG/batchmode_geompy.py b/src/GEOM_SWIG/batchmode_geompy.py index ce01529b8..6601dc6e3 100644 --- a/src/GEOM_SWIG/batchmode_geompy.py +++ b/src/GEOM_SWIG/batchmode_geompy.py @@ -13,7 +13,7 @@ from batchmode_salome import * #-------------------------------------------------------------------------- -geom = lcc.FindOrLoadComponent("FactoryServer", "Geometry") +geom = lcc.FindOrLoadComponent("FactoryServer", "GEOM") geom.GetCurrentStudy(myStudyId) myBuilder = myStudy.NewBuilder() diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py index 6d20eb004..2805bcf38 100644 --- a/src/GEOM_SWIG/geompy.py +++ b/src/GEOM_SWIG/geompy.py @@ -24,7 +24,7 @@ if father is None: father = myBuilder.NewComponent("GEOM") A1 = myBuilder.FindOrCreateAttribute(father, "AttributeName"); FName = A1._narrow(SALOMEDS.AttributeName) - FName.SetValue("Geometry") + FName.SetValue( salome.sg.getComponentUserName("GEOM") ) A2 = myBuilder.FindOrCreateAttribute(father, "AttributePixMap"); aPixmap = A2._narrow(SALOMEDS.AttributePixMap); aPixmap.SetPixMap( "ICON_OBJBROWSER_Geometry" ); diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index be5adc735..2b6f422eb 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -17,7 +17,7 @@ EXPORT_HEADERS = GEOM_Actor.h \ # Libraries targets -LIB = libGeometryObject.la +LIB = libGEOMObject.la LIB_SRC = GEOM_Actor.cxx \ GEOM_OCCReader.cxx \ GEOM_AssemblyBuilder.cxx \ diff --git a/src/PARTITION/Makefile.in b/src/PARTITION/Makefile.in index 909a07325..c5038bf8b 100644 --- a/src/PARTITION/Makefile.in +++ b/src/PARTITION/Makefile.in @@ -15,7 +15,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl @COMMENCE@ # Libraries targets -LIB = libGeometryPartition.la +LIB = libGEOMPartition.la LIB_SRC = Partition_Inter2d.cxx \ Partition_Inter3d.cxx \ Partition_Loop2d.cxx \ diff --git a/src/SKETCHER/Makefile.in b/src/SKETCHER/Makefile.in index ba4dccfd7..1c5d1225e 100644 --- a/src/SKETCHER/Makefile.in +++ b/src/SKETCHER/Makefile.in @@ -15,7 +15,7 @@ VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl # Libraries targets -LIB = libGeometrySketcher.la +LIB = libGEOMSketcher.la LIB_SRC = GEOM_Sketcher.cxx LIB_CLIENT_IDL = SALOME_Component.idl SALOMEDS.idl SALOME_Exception.idl GEOM_Shape.idl GEOM_Gen.idl