NRI : Update according to naming rule.

This commit is contained in:
nri 2003-05-16 10:38:04 +00:00
parent 0c107c1f18
commit 3baf90a543
17 changed files with 18 additions and 18 deletions

View File

@ -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 =

View File

@ -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 =

View File

@ -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

View File

@ -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 =

View File

@ -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

View File

@ -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@

View File

@ -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.)

View File

@ -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")

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -13,7 +13,7 @@ from batchmode_salome import *
#--------------------------------------------------------------------------
geom = lcc.FindOrLoadComponent("FactoryServer", "Geometry")
geom = lcc.FindOrLoadComponent("FactoryServer", "GEOM")
geom.GetCurrentStudy(myStudyId)
myBuilder = myStudy.NewBuilder()

View File

@ -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" );

View File

@ -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 \

View File

@ -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 \

View File

@ -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