From: nri Date: Thu, 10 Jul 2003 08:29:22 +0000 (+0000) Subject: NRI : Merge from V1_2. X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4155ca3265ef3752722a3a6d7e86c3aba8bcf542;p=modules%2Fyacs.git NRI : Merge from V1_2. --- diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in index 40a5b019c..fe43d0e54 100644 --- a/salome_adm/unix/make_conclude.in +++ b/salome_adm/unix/make_conclude.in @@ -59,7 +59,7 @@ $(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la $(patsubst %.la, %.so, $@).0 || true if ! test -z $(LIB_SWIG) ; then \ - ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/_$(LIB_SWIG) || true;\ + ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\ fi; $(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a diff --git a/salome_adm/unix/make_omniorb.in b/salome_adm/unix/make_omniorb.in index 723b4f84b..c92e682e6 100644 --- a/salome_adm/unix/make_omniorb.in +++ b/salome_adm/unix/make_omniorb.in @@ -16,7 +16,7 @@ #IDLOBJ=$(IDLSRC:%.idl=%$(IDL_CLN_OBJ)) # dependancies between idl and it's generated files -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/share/salome/idl/%.idl +%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/idl/%.idl $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< # dependncies between idl files diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in index ee5063df1..fdf28da44 100644 --- a/src/Container/Makefile.in +++ b/src/Container/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/DataTypeCatalog/Makefile.in b/src/DataTypeCatalog/Makefile.in index 83ec2a9c0..1017cafe0 100644 --- a/src/DataTypeCatalog/Makefile.in +++ b/src/DataTypeCatalog/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/HDFPersist/Makefile.in b/src/HDFPersist/Makefile.in index b00d8b2c9..3baa03bd9 100644 --- a/src/HDFPersist/Makefile.in +++ b/src/HDFPersist/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/LifeCycleCORBA/Makefile.in b/src/LifeCycleCORBA/Makefile.in index 788d83ef2..6f4a461ea 100644 --- a/src/LifeCycleCORBA/Makefile.in +++ b/src/LifeCycleCORBA/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/Loader/SALOME_Session_Loader.cxx b/src/Loader/SALOME_Session_Loader.cxx index e5a6c219d..825fd0457 100644 --- a/src/Loader/SALOME_Session_Loader.cxx +++ b/src/Loader/SALOME_Session_Loader.cxx @@ -1,13 +1,13 @@ -using namespace std; -//============================================================================= -// File : SALOME_Session_Loader.cxx -// Created : jeu jun 21 07:37:59 CEST 2001 -// Author : Paul RASCLE, EDF -// Project : SALOME -// Copyright : EDF 2001 -// $Header$ -//============================================================================= +// Copyright (C) 2003 CEA/DEN, EDF R&D +// +// +// +// File : SALOME_Session_loader.cxx +// Author : Paul RASCLE, EDF +// Module : SALOME +// $Header$ +using namespace std; /*! \file SALOME_Session_loader.cxx */ @@ -39,52 +39,50 @@ int main(int argc, char **argv) if (myIS.getExitStatus()) exit(1); -//VRVcd: T2.4 - Trace management improvement - if (myIS.withGUI()) { - try - { - CORBA::ORB_ptr orb = CORBA::ORB_init(argc,argv) ; - - SALOME_NamingService &NS = *SINGLETON_::Instance() ; - ASSERT(SINGLETON_::IsAlreadyExisting()) ; - NS.init_orb( orb ) ; - - CORBA::Object_var obj = NS.Resolve("/Kernel/Session"); - - SALOME::Session_var session = SALOME::Session::_narrow(obj) ; - ASSERT(! CORBA::is_nil(session)); - MESSAGE("SALOME::Session::_narrow(obj)"); - INFOS("Corba initialisation, Distant server"); - - // ------------------------------------------------------------- - - session->GetInterface() ; - - // ------------------------------------------------------------- - - orb->destroy() ; - } - catch (ServiceUnreachable&) - { - INFOS("Caught exception: Naming Service Unreachable"); - } - catch (CORBA::COMM_FAILURE&) - { - INFOS("Caught CORBA::SystemException CommFailure."); - } - catch (CORBA::SystemException&) - { - INFOS("Caught CORBA::SystemException."); - } - catch (CORBA::Exception&) - { - INFOS("Caught CORBA::Exception."); - } - catch (...) - { - INFOS("Caught unknown exception."); - } - } +//VRV: T2.4 - Trace management improvement + try + { + CORBA::ORB_ptr orb = CORBA::ORB_init(argc,argv) ; + + SALOME_NamingService &NS = *SINGLETON_::Instance() ; + ASSERT(SINGLETON_::IsAlreadyExisting()) ; + NS.init_orb( orb ) ; + + CORBA::Object_var obj = NS.Resolve("/Kernel/Session"); + + SALOME::Session_var session = SALOME::Session::_narrow(obj) ; + ASSERT(! CORBA::is_nil(session)); + MESSAGE("SALOME::Session::_narrow(obj)"); + INFOS("Corba initialisation, Distant server"); + + // ------------------------------------------------------------- + + session->GetInterface() ; + + // ------------------------------------------------------------- + + orb->destroy() ; + } + catch (ServiceUnreachable&) + { + INFOS("Caught exception: Naming Service Unreachable"); + } + catch (CORBA::COMM_FAILURE&) + { + INFOS("Caught CORBA::SystemException CommFailure."); + } + catch (CORBA::SystemException&) + { + INFOS("Caught CORBA::SystemException."); + } + catch (CORBA::Exception&) + { + INFOS("Caught CORBA::Exception."); + } + catch (...) + { + INFOS("Caught unknown exception."); + } return 0 ; } diff --git a/src/Loader/SALOME_Session_loader.cxx b/src/Loader/SALOME_Session_loader.cxx deleted file mode 100644 index 825fd0457..000000000 --- a/src/Loader/SALOME_Session_loader.cxx +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright (C) 2003 CEA/DEN, EDF R&D -// -// -// -// File : SALOME_Session_loader.cxx -// Author : Paul RASCLE, EDF -// Module : SALOME -// $Header$ - -using namespace std; -/*! \file SALOME_Session_loader.cxx - */ - -#include -#include CORBA_CLIENT_HEADER(SALOME_Session) - -#include "Utils_ORB_INIT.hxx" -#include "Utils_SINGLETON.hxx" -#include "SALOME_NamingService.hxx" -#include "utilities.h" - -//! CORBA client for SALOME Session server : launch GUI -/*! - * SALOME_Session Loader launches a SALOME GUI on the SALOME session servant process - */ - -#include -#include "InquireServersQThread.h" - -int main(int argc, char **argv) -{ -//VRV: T2.4 - Trace management improvement - QApplication myQApp(argc, argv) ; - InquireServersGUI myIS; - myQApp.setMainWidget(&myIS); - ASSERT(QObject::connect(&myQApp, SIGNAL(lastWindowClosed()), &myQApp, SLOT(quit()) ) ); - myIS.show(); - myQApp.exec(); - - if (myIS.getExitStatus()) - exit(1); -//VRV: T2.4 - Trace management improvement - try - { - CORBA::ORB_ptr orb = CORBA::ORB_init(argc,argv) ; - - SALOME_NamingService &NS = *SINGLETON_::Instance() ; - ASSERT(SINGLETON_::IsAlreadyExisting()) ; - NS.init_orb( orb ) ; - - CORBA::Object_var obj = NS.Resolve("/Kernel/Session"); - - SALOME::Session_var session = SALOME::Session::_narrow(obj) ; - ASSERT(! CORBA::is_nil(session)); - MESSAGE("SALOME::Session::_narrow(obj)"); - INFOS("Corba initialisation, Distant server"); - - // ------------------------------------------------------------- - - session->GetInterface() ; - - // ------------------------------------------------------------- - - orb->destroy() ; - } - catch (ServiceUnreachable&) - { - INFOS("Caught exception: Naming Service Unreachable"); - } - catch (CORBA::COMM_FAILURE&) - { - INFOS("Caught CORBA::SystemException CommFailure."); - } - catch (CORBA::SystemException&) - { - INFOS("Caught CORBA::SystemException."); - } - catch (CORBA::Exception&) - { - INFOS("Caught CORBA::Exception."); - } - catch (...) - { - INFOS("Caught unknown exception."); - } - return 0 ; -} - - diff --git a/src/Logger/Makefile.in b/src/Logger/Makefile.in index 1d51437b8..f03c9adde 100644 --- a/src/Logger/Makefile.in +++ b/src/Logger/Makefile.in @@ -10,7 +10,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/MPIContainer/Makefile.in b/src/MPIContainer/Makefile.in index 229107d91..da4e295d9 100644 --- a/src/MPIContainer/Makefile.in +++ b/src/MPIContainer/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/MSG2QM/Makefile.in b/src/MSG2QM/Makefile.in index 544bfb6b0..0cf36702e 100644 --- a/src/MSG2QM/Makefile.in +++ b/src/MSG2QM/Makefile.in @@ -25,7 +25,7 @@ # Module : SALOME top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/ModuleCatalog/Makefile.in b/src/ModuleCatalog/Makefile.in index 18b89b3fc..c61ad8487 100644 --- a/src/ModuleCatalog/Makefile.in +++ b/src/ModuleCatalog/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/ModuleGenerator/Makefile.in b/src/ModuleGenerator/Makefile.in index 9944da580..5abeb5270 100644 --- a/src/ModuleGenerator/Makefile.in +++ b/src/ModuleGenerator/Makefile.in @@ -25,7 +25,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/NOTIFICATION_SWIG/Makefile.in b/src/NOTIFICATION_SWIG/Makefile.in index 4be86c5cc..c6d707116 100644 --- a/src/NOTIFICATION_SWIG/Makefile.in +++ b/src/NOTIFICATION_SWIG/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/NamingService/Makefile.in b/src/NamingService/Makefile.in index 5aae16804..395e92922 100644 --- a/src/NamingService/Makefile.in +++ b/src/NamingService/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/Notification/Makefile.in b/src/Notification/Makefile.in index 42c5ac12e..0da007a70 100644 --- a/src/Notification/Makefile.in +++ b/src/Notification/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index b0327f022..301ade4e1 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -10,16 +10,20 @@ VPATH=.:@srcdir@:@top_srcdir@/idl EXPORT_HEADERS = SALOME_InteractiveObject.hxx \ Handle_SALOME_InteractiveObject.hxx \ SALOME_Actor.h \ + SALOME_Transform.h \ SALOME_AISShape.hxx \ Handle_SALOME_AISShape.hxx \ SALOME_AISObject.hxx \ - Handle_SALOME_AISObject.hxx + Handle_SALOME_AISObject.hxx \ + VTKViewer_Common.h + # Libraries targets LIB = libSalomeObject.la LIB_SRC = SALOME_InteractiveObject.cxx \ SALOME_Actor.cxx \ + SALOME_Transform.cxx \ SALOME_AISShape.cxx\ SALOME_AISObject.cxx diff --git a/src/PatchQt/Makefile.in b/src/PatchQt/Makefile.in index 6fa7f5dd4..81078aa9f 100644 --- a/src/PatchQt/Makefile.in +++ b/src/PatchQt/Makefile.in @@ -25,7 +25,7 @@ # Module : SALOME top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/Plot2d/Makefile.in b/src/Plot2d/Makefile.in index 40e448053..23079dfd4 100644 --- a/src/Plot2d/Makefile.in +++ b/src/Plot2d/Makefile.in @@ -13,8 +13,9 @@ EXPORT_HEADERS = \ Plot2d_CurveContainer.h \ Plot2d_ViewFrame.h \ Plot2d_SetupViewDlg.h \ - Plot2d_SetupPlot2dDlg.h - + Plot2d_SetupPlot2dDlg.h \ + Plot2d_FitDataDlg.h + # .po files to transform in .qm #PO_FILES = \ @@ -27,13 +28,15 @@ LIB_SRC = \ Plot2d_CurveContainer.cxx \ Plot2d_ViewFrame.cxx \ Plot2d_SetupViewDlg.cxx \ - Plot2d_SetupPlot2dDlg.cxx + Plot2d_SetupPlot2dDlg.cxx \ + Plot2d_FitDataDlg.cxx LIB_MOC = \ Plot2d.h \ Plot2d_ViewFrame.h \ Plot2d_SetupViewDlg.h \ - Plot2d_SetupPlot2dDlg.h + Plot2d_SetupPlot2dDlg.h \ + Plot2d_FitDataDlg.h LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ diff --git a/src/Registry/Makefile.in b/src/Registry/Makefile.in index 84293466e..823ac6241 100644 --- a/src/Registry/Makefile.in +++ b/src/Registry/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/RegistryDisplay/Makefile.in b/src/RegistryDisplay/Makefile.in index bc6e2ee58..1c6fd6a1a 100644 --- a/src/RegistryDisplay/Makefile.in +++ b/src/RegistryDisplay/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/RessourcesCatalog/Makefile.in b/src/RessourcesCatalog/Makefile.in index 78694d0d0..a98eab8bf 100644 --- a/src/RessourcesCatalog/Makefile.in +++ b/src/RessourcesCatalog/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in index 429bf63e5..dcb0778c0 100644 --- a/src/SALOMEDS/Makefile.in +++ b/src/SALOMEDS/Makefile.in @@ -107,9 +107,7 @@ BIN_CLIENT_IDL = CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) -LDFLAGS+=$(CAS_KERNEL) $(CAS_OCAF) $(CAS_VIEWER) $(CAS_MODELER) $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSalomeLoggerServer -# -L/opt/ccmalloc/lib -lccmalloc -ldl -# -L/opt/efence/lib -lefence +LDFLAGS+=$(OCC_KERNEL_LIBS) $(OCC_OCAF_LIBS) $(OCC_VIEWER_LIBS) $(OCC_MODELER_LIBS) $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSalomeLoggerServer @CONCLUDE@ diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in index c6a7ffbe0..cfeaf5945 100644 --- a/src/Session/Makefile.in +++ b/src/Session/Makefile.in @@ -51,7 +51,7 @@ BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOM CPPFLAGS+=$(QT_MT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) -LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_OCAF) $(CAS_VIEWER) $(CAS_MODELER) -lSalomeNS -lSalomeGUI -lSalomeObject -lSalomeLifeCycleCORBA -lqsplitterP -lOpUtil -lSalomeLoggerServer -lPlot2d +LDFLAGS+=$(QT_MT_LIBS) $(OCC_KERNEL_LIBS) $(OCC_OCAF_LIBS) $(OCC_VIEWER_LIBS) $(OCC_MODELER_LIBS) -lSalomeNS -lSalomeGUI -lSalomeObject -lSalomeLifeCycleCORBA -lqsplitterP -lOpUtil -lSalomeLoggerServer -lPlot2d @CONCLUDE@ diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx index 570187199..a53193848 100644 --- a/src/Session/SALOME_Session_Server.cxx +++ b/src/Session/SALOME_Session_Server.cxx @@ -33,9 +33,6 @@ #include using namespace std; -// #include -// #include "Qtappl_example.hxx" - #include #include CORBA_SERVER_HEADER(SALOME_Session) @@ -65,25 +62,19 @@ int main(int argc, char **argv) CORBA::ORB_var &orb = init( argc , argv ) ; CORBA::Object_var obj =orb->resolve_initial_references("RootPOA") ; - //MESSAGE("orb->resolve_initial_references('Root_POA')") PortableServer::POA_var poa = PortableServer::POA::_narrow(obj) ; - //MESSAGE("POA::_narrow(obj)") // servant - SALOME_Session_i * mySALOME_Session = new SALOME_Session_i(argc, argv, orb, poa) ; PortableServer::ObjectId_var mySALOME_Sessionid = poa->activate_object(mySALOME_Session) ; MESSAGE("poa->activate_object(mySALOME_Session)") obj = mySALOME_Session->_this() ; CORBA::String_var sior(orb->object_to_string(obj)) ; - // MESSAGE("sior(orb->object-to-string(obj))") - // cerr << "'" << (char*) sior << "'" << endl ; mySALOME_Session->NSregister(); mySALOME_Session->_remove_ref() ; - //MESSAGE("mySALOME_Session->_remove_ref()") PortableServer::POAManager_var pman = poa->the_POAManager() ; pman->activate() ; diff --git a/src/Session/SALOME_Session_i.cxx b/src/Session/SALOME_Session_i.cxx index 41b68e818..4e2e5b5ef 100644 --- a/src/Session/SALOME_Session_i.cxx +++ b/src/Session/SALOME_Session_i.cxx @@ -59,17 +59,12 @@ SALOME_Session_i::SALOME_Session_i(int argc, char ** argv, CORBA::ORB_ptr orb, P _poa = PortableServer::POA::_duplicate(poa) ; MESSAGE("constructor end"); } - -Engines::Component_ptr SALOME_Session_i::GetVisuGen(){ - typedef Engines::Component_ptr VisuGen(CORBA::ORB_ptr, PortableServer::POA_ptr, - SALOME_NamingService*, QMutex*); - MESSAGE("SALOME_Session_i::GetVisuGen"); - OSD_SharedLibrary visuSharedLibrary("libVisuEngine.so"); - if(visuSharedLibrary.DlOpen(OSD_RTLD_LAZY)) - if(OSD_Function osdFun = visuSharedLibrary.DlSymb("GetVisuGen")) - return ((VisuGen (*)) osdFun)(_orb,_poa,_NS,&_GUIMutex); - return Engines::Component::_nil(); -} + +//============================================================================= +/*! GetVisuComponent + * returns Visu component + */ +//============================================================================= Engines::Component_ptr SALOME_Session_i::GetVisuComponent() { MESSAGE("SALOME_Session_i::GetVisuGen"); diff --git a/src/Session/SALOME_Session_i.hxx b/src/Session/SALOME_Session_i.hxx index 93d1f77cf..0d52f118e 100644 --- a/src/Session/SALOME_Session_i.hxx +++ b/src/Session/SALOME_Session_i.hxx @@ -33,7 +33,6 @@ #include #include CORBA_SERVER_HEADER(SALOME_Component) -//***//#include CORBA_SERVER_HEADER(VISU_Gen) #include CORBA_SERVER_HEADER(SALOME_Session) class SALOME_NamingService; class SALOME_Session_QThread; @@ -47,7 +46,8 @@ public: //! Launch Graphical User Interface void GetInterface(); - //***//VISU::VISU_Gen_ptr GetVisuGen(); + + //! Return VISU component Engines::Component_ptr GetVisuComponent(); //! Stop the Session (must be idle): kill servant & server diff --git a/src/TOOLSDS/Makefile.in b/src/TOOLSDS/Makefile.in index fe5211407..666688ba9 100644 --- a/src/TOOLSDS/Makefile.in +++ b/src/TOOLSDS/Makefile.in @@ -29,9 +29,7 @@ BIN_CLIENT_IDL = CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) -LDFLAGS+=$(CAS_KERNEL) -lOpUtil -lSalomeLoggerServer -# -L/opt/ccmalloc/lib -lccmalloc -ldl -# -L/opt/efence/lib -lefence +LDFLAGS+=$(OCC_KERNEL_LIBS) -lOpUtil -lSalomeLoggerServer @CONCLUDE@ diff --git a/src/TestContainer/Makefile.in b/src/TestContainer/Makefile.in index c6ec6b8c0..8d2709d60 100644 --- a/src/TestContainer/Makefile.in +++ b/src/TestContainer/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/Utils/Makefile.in b/src/Utils/Makefile.in index 0ccfe041f..aec4b20ab 100644 --- a/src/Utils/Makefile.in +++ b/src/Utils/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:@top_srcdir@/idl diff --git a/src/VTKViewer/Makefile.in b/src/VTKViewer/Makefile.in index eef9d3fd7..15e620896 100644 --- a/src/VTKViewer/Makefile.in +++ b/src/VTKViewer/Makefile.in @@ -27,7 +27,7 @@ # $Header$ top_srcdir=@top_srcdir@ -top_builddir=../../.. +top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@:$(top_builddir)/inc:$(top_builddir)/idl diff --git a/src/VTKViewer/VTKViewer_NonIsometricTransform.cxx b/src/VTKViewer/VTKViewer_NonIsometricTransform.cxx deleted file mode 100644 index a77a0337c..000000000 --- a/src/VTKViewer/VTKViewer_NonIsometricTransform.cxx +++ /dev/null @@ -1,149 +0,0 @@ -using namespace std; -// File : VTKViewer_NonIsometricTransform.cxx -// Created : Thu Jan 30 15:21:07 2003 -// Project : SALOME PRO -// Author : Vasily RUSYAEV (vrv) -// Copyright : Open CASCADE 2003 -// $Header: - -#include "VTKViewer_NonIsometricTransform.h" - -double ident(double in, double coeff) { return in; } -double dident(double in, double coeff) { return 1.0; } - -double Exponent(double in, double coeff){ return exp(in)-coeff;} -double dExponent(double in, double coeff){ return exp(in);} -double Log(double in, double coeff){ return log(in+coeff);} -double dLog(double in, double coeff){ return 1.0/(in+coeff);} - -double Scl(double in, double coeff){ return coeff*in;} -double dScl(double in, double coeff){ return coeff;} -double IScl(double in, double coeff){ return in/coeff;} -double dIScl(double in, double coeff){ return 1.0/coeff;} - - -AxisFunction::AxisFunction(Axis A) - : m_axis(A), fFun(&ident), dfFun(&dident), iFun(&ident), diFun(&dident) -{ -} -AxisFunction::AxisFunction() - : m_axis(XAxis), fFun(&ident), dfFun(&dident), iFun(&ident), diFun(&dident) -{ -} - -inline void AxisFunction::forward(const double in, const double coeff, double& out, double der[3]) const -{ - init_der(der); - der[m_axis] = (*dfFun)( in, coeff); - forward(in, coeff, out); -} - -inline void AxisFunction::inverse(const double in, const double coeff, double& out, double der[3]) const -{ - init_der(der); - der[m_axis] = (*diFun)( in, coeff ); - inverse(in, coeff , out); -} - -inline MFun AxisFunction::getfFun() -{ - return fFun; -} - -VTKViewer_NonIsometricTransform::VTKViewer_NonIsometricTransform () -{ - m_coeff[0] = m_coeff[1] = m_coeff[2] = 1.0; - m_axisFunctions[0] = AxisFunction ( AxisFunction::XAxis ); - m_axisFunctions[1] = AxisFunction ( AxisFunction::YAxis ); - m_axisFunctions[2] = AxisFunction ( AxisFunction::ZAxis ); -} - -void VTKViewer_NonIsometricTransform::ForwardTransformPoint(const float in[3], float out[3]) -{ - //TODO - //ForwardTransformPoint( in, out ); -} -inline void VTKViewer_NonIsometricTransform::ForwardTransformPoint(const double in[3], double out[3]) -{ - for(int i = 0; i < 3; i++) - m_axisFunctions[i].forward(in[i], m_coeff[i], out[i]); -} -inline void VTKViewer_NonIsometricTransform::ForwardTransformDerivative(const double in[3], - double out[3], double der[3][3]) -{ - for(int i = 0; i < 3; i++) - m_axisFunctions[i].forward(in[i], m_coeff[i], out[i], der[i]); -} -void VTKViewer_NonIsometricTransform::ForwardTransformDerivative(const float in[3], float out[3], float der[3][3]) -{ - //TODO - //ForwardTransformDerivative(in,out,der); -} -inline void VTKViewer_NonIsometricTransform::InverseTransformDerivative(const double in[3], - double out[3], double der[3][3]) -{ - for(int i = 0; i < 3; i++) - m_axisFunctions[i].inverse(in[i], m_coeff[i], out[i], der[i]); -} -inline void VTKViewer_NonIsometricTransform::InverseTransformPoint(const double in[3], double out[3]) -{ - for(int i = 0; i < 3; i++) - m_axisFunctions[i].inverse(in[i], m_coeff[i], out[i]); -} -void VTKViewer_NonIsometricTransform::InverseTransformPoint(const float in[3], float out[3]) -{ - //TODO - //InverseTransformPoint(in,out); -} - - -void VTKViewer_NonIsometricTransform::SetFunction(const AxisFunction::Axis axis, - const Function aFunction, const double coeff) -{ - m_coeff[axis] = coeff; - switch (aFunction) - { - case Identical: - m_axisFunctions[axis] = AxisFunction( axis ); - break; - case Linear: - m_axisFunctions[axis] = AxisFunction( axis, &Scl,&dScl,&IScl,&dIScl); - break; - case Logarithmic: - m_axisFunctions[axis] = AxisFunction( axis, &Log, &dLog, &Exponent, &dExponent ); - break; - } -} - -inline void VTKViewer_NonIsometricTransform::SetFunction(const AxisFunction AF) -{ - m_axisFunctions[AF.getAxis()] = AF; -} - -VTKViewer_NonIsometricTransform* VTKViewer_NonIsometricTransform::New() -{ - // First try to create the object from the vtkObjectFactory - vtkObject* ret = vtkObjectFactory::CreateInstance("VTKViewer_NonIsometricTransform"); - if(ret) - return (VTKViewer_NonIsometricTransform*)ret; - // If the factory was unable to create the object, then create it here. - return new VTKViewer_NonIsometricTransform; -} - -VTKViewer_NonIsometricTransform::Function VTKViewer_NonIsometricTransform::GetFunctionType(const AxisFunction::Axis axis) -{ - if ( m_axisFunctions[axis].getfFun() == &ident) { - return Identical; - } - if ( m_axisFunctions[axis].getfFun() == &Scl ) { - return Linear; - } - if ( m_axisFunctions[axis].getfFun() == &Log ) { - return Logarithmic; - } -} - -double VTKViewer_NonIsometricTransform::GetCoeff (const AxisFunction::Axis axis) -{ - return m_coeff[axis]; -} diff --git a/src/VTKViewer/VTKViewer_NonIsometricTransform.h b/src/VTKViewer/VTKViewer_NonIsometricTransform.h deleted file mode 100644 index f215741a1..000000000 --- a/src/VTKViewer/VTKViewer_NonIsometricTransform.h +++ /dev/null @@ -1,97 +0,0 @@ -#ifndef __VTKViewer_NonIsometricTransform_h -#define __VTKViewer_NonIsometricTransform_h - - -#include -//#include -//#include - -#include -#include - -//second parameter is coefficient ( e.g y = ky, second parameter is k ) -typedef double (*MFun)(double,double); - -class AxisFunction -{ - public: - enum Axis {XAxis=0, YAxis, ZAxis}; - private: - - void init_der(double der[3]) const - { - der[XAxis] = der[YAxis] = der[ZAxis] = 0.0; - } - - public: - AxisFunction(Axis A, MFun fF, MFun dfF, MFun iF, MFun diF) - : m_axis(A), fFun(fF), dfFun(dfF), iFun(iF), diFun(diF) {}; - AxisFunction(Axis A); - AxisFunction(); - - const Axis getAxis() const{ return m_axis; } - void setAxis(const Axis axis) { m_axis = axis; } - - void forward(const double in, const double coeff, double& out) const - { - out = (*fFun)( in, coeff ); - } - - void forward(const double in, const double coeff, double& out, double der[3]) const; - - void inverse(const double in, const double coeff, double& out) const - { - out = (*iFun)( in, coeff ); - } - void inverse(const double in, const double coeff, double& out, double der[3]) const; - - MFun getfFun() ; - - private: - Axis m_axis; - MFun fFun, dfFun, iFun, diFun; -}; - - -class VTK_EXPORT VTKViewer_NonIsometricTransform : public vtkWarpTransform -{ - public: - enum Function { Identical = 0, Linear, Logarithmic }; - protected: - - void ForwardTransformPoint(const float in[3], float out[3]); - void ForwardTransformPoint(const double in[3], double out[3]); - void ForwardTransformDerivative(const double in[3], double out[3], double der[3][3]); - void ForwardTransformDerivative(const float in[3], float out[3], float der[3][3]); - void InverseTransformDerivative(const double in[3], double out[3], double der[3][3]); - void InverseTransformPoint(const double in[3], double out[3]); - void InverseTransformPoint(const float in[3], float out[3]); - - VTKViewer_NonIsometricTransform(); - - void SetFunction(const AxisFunction AF); - - public: - - vtkTypeMacro(VTKViewer_NonIsometricTransform,vtkWarpTransform); - static VTKViewer_NonIsometricTransform *New(); - - vtkAbstractTransform* MakeTransform() - { - return VTKViewer_NonIsometricTransform::New(); - } - virtual void PrintSelf(ostream& os, vtkIndent indent) - { - vtkWarpTransform::PrintSelf(os,indent); - } - void SetFunction(const AxisFunction::Axis axis, const Function aFunction, const double coeff); - - Function GetFunctionType(const AxisFunction::Axis axis); - double GetCoeff (const AxisFunction::Axis axis); - - private: - AxisFunction m_axisFunctions[3]; - double m_coeff[3]; -}; - -#endif