From 06e65631e8d92049637bbf8465fd1a5188fc1841 Mon Sep 17 00:00:00 2001 From: mpv Date: Tue, 7 Nov 2006 14:28:22 +0000 Subject: [PATCH] Autotools compilation --- src/LightApp/LightApp_Application.cxx | 110 +-- src/LightApp/LightApp_Application.h | 2 +- src/LightApp/Makefile.am | 242 +++++ src/LightApp/Makefile.in | 227 ----- src/LogWindow/{Makefile.in => Makefile.am} | 24 +- src/OBJECT/Makefile.am | 71 ++ src/OBJECT/Makefile.in | 73 -- src/OCCViewer/Makefile.am | 90 ++ src/OCCViewer/Makefile.in | 96 -- .../Makefile.in => ObjBrowser/Makefile.am} | 57 +- src/Plot2d/Makefile.am | 92 ++ src/Plot2d/Makefile.in | 96 -- src/Plot2d/resources/plot2d_rotate.png | Bin 511 -> 0 bytes src/Prs/{Makefile.in => Makefile.am} | 27 +- src/PyInterp/{Makefile.in => Makefile.am} | 34 +- .../{Makefile.in => Makefile.am} | 41 +- src/QDS/{Makefile.in => Makefile.am} | 41 +- src/Qtx/Makefile.am | 150 +++ src/Qtx/Makefile.in | 165 ---- .../{Makefile.in => Makefile.am} | 42 +- src/ResExporter/{Makefile.in => Makefile.am} | 27 +- src/SALOME_PYQT/{Makefile.in => Makefile.am} | 12 +- .../{Makefile.in => Makefile.am} | 81 +- src/SALOME_PYQT/SalomePyQt/Makefile.am | 127 +++ src/SALOME_PYQT/SalomePyQt/Makefile.in | 129 --- src/SALOME_SWIG/Makefile.am | 114 +++ src/SALOME_SWIG/Makefile.in | 57 -- src/SALOME_SWIG/supervisionexample.py | 103 -- src/SALOME_SWIG/supervisiongeomexample.py | 121 --- src/SALOME_SWIG/testattr.py | 109 --- src/SOCC/{Makefile.in => Makefile.am} | 45 +- src/SPlot2d/{Makefile.in => Makefile.am} | 52 +- src/SPlot2d/{ => resources}/SPlot2d_msg_en.po | 0 src/STD/Makefile.am | 79 ++ src/STD/Makefile.in | 86 -- src/SUIT/Makefile.am | 120 +++ src/SUIT/Makefile.in | 126 --- src/SUIT/utilities.h | 122 --- src/SUITApp/Makefile.am | 57 ++ src/SUPERVGraph/Makefile.am | 53 ++ src/SUPERVGraph/Makefile.in | 59 -- src/SVTK/{Makefile.in => Makefile.am} | 79 +- src/SalomeApp/Makefile.am | 101 ++ src/SalomeApp/Makefile.in | 98 -- src/SalomeApp/SalomeApp_Displayer.cxx | 210 ---- src/SalomeApp/SalomeApp_Displayer.h | 46 - .../Test/{Makefile.in => Makefile.am} | 40 +- src/Session/InquireServersQThread.cxx | 626 ------------ src/Session/InquireServersQThread.h | 133 --- src/Session/Makefile.am | 76 ++ src/Session/Makefile.in | 69 -- src/Session/runSession | 27 - .../Makefile.in => Style/Makefile.am} | 43 +- src/Style/Makefile.in | 79 -- src/TOOLSGUI/{Makefile.in => Makefile.am} | 60 +- src/VTKViewer/Makefile.am | 120 +++ src/VTKViewer/Makefile.in | 102 -- src/VTKViewer/VTKViewer.cxx | 2 - src/VTKViewer/VTKViewer_CellRectPicker.cxx | 443 --------- src/VTKViewer/VTKViewer_CellRectPicker.h | 98 -- src/VTKViewer/VTKViewer_RectPicker.cxx | 894 ------------------ src/VTKViewer/VTKViewer_RectPicker.h | 78 -- 62 files changed, 1827 insertions(+), 4956 deletions(-) create mode 100755 src/LightApp/Makefile.am delete mode 100755 src/LightApp/Makefile.in rename src/LogWindow/{Makefile.in => Makefile.am} (70%) create mode 100755 src/OBJECT/Makefile.am delete mode 100755 src/OBJECT/Makefile.in create mode 100755 src/OCCViewer/Makefile.am delete mode 100755 src/OCCViewer/Makefile.in rename src/{SUITApp/Makefile.in => ObjBrowser/Makefile.am} (58%) mode change 100644 => 100755 create mode 100755 src/Plot2d/Makefile.am delete mode 100755 src/Plot2d/Makefile.in delete mode 100755 src/Plot2d/resources/plot2d_rotate.png rename src/Prs/{Makefile.in => Makefile.am} (73%) rename src/PyInterp/{Makefile.in => Makefile.am} (68%) rename src/PythonConsole/{Makefile.in => Makefile.am} (60%) rename src/QDS/{Makefile.in => Makefile.am} (64%) create mode 100755 src/Qtx/Makefile.am delete mode 100755 src/Qtx/Makefile.in rename src/RegistryDisplay/{Makefile.in => Makefile.am} (63%) rename src/ResExporter/{Makefile.in => Makefile.am} (74%) rename src/SALOME_PYQT/{Makefile.in => Makefile.am} (88%) rename src/SALOME_PYQT/SALOME_PYQT_GUI/{Makefile.in => Makefile.am} (55%) create mode 100644 src/SALOME_PYQT/SalomePyQt/Makefile.am delete mode 100644 src/SALOME_PYQT/SalomePyQt/Makefile.in create mode 100755 src/SALOME_SWIG/Makefile.am delete mode 100755 src/SALOME_SWIG/Makefile.in delete mode 100755 src/SALOME_SWIG/supervisionexample.py delete mode 100755 src/SALOME_SWIG/supervisiongeomexample.py delete mode 100755 src/SALOME_SWIG/testattr.py rename src/SOCC/{Makefile.in => Makefile.am} (58%) rename src/SPlot2d/{Makefile.in => Makefile.am} (51%) rename src/SPlot2d/{ => resources}/SPlot2d_msg_en.po (100%) create mode 100755 src/STD/Makefile.am delete mode 100755 src/STD/Makefile.in create mode 100755 src/SUIT/Makefile.am delete mode 100755 src/SUIT/Makefile.in delete mode 100755 src/SUIT/utilities.h create mode 100644 src/SUITApp/Makefile.am create mode 100755 src/SUPERVGraph/Makefile.am delete mode 100755 src/SUPERVGraph/Makefile.in rename src/SVTK/{Makefile.in => Makefile.am} (62%) create mode 100755 src/SalomeApp/Makefile.am delete mode 100755 src/SalomeApp/Makefile.in delete mode 100644 src/SalomeApp/SalomeApp_Displayer.cxx delete mode 100644 src/SalomeApp/SalomeApp_Displayer.h rename src/SalomeApp/Test/{Makefile.in => Makefile.am} (65%) delete mode 100755 src/Session/InquireServersQThread.cxx delete mode 100755 src/Session/InquireServersQThread.h create mode 100755 src/Session/Makefile.am delete mode 100755 src/Session/Makefile.in delete mode 100755 src/Session/runSession rename src/{ObjBrowser/Makefile.in => Style/Makefile.am} (63%) mode change 100755 => 100644 delete mode 100644 src/Style/Makefile.in rename src/TOOLSGUI/{Makefile.in => Makefile.am} (52%) create mode 100755 src/VTKViewer/Makefile.am delete mode 100755 src/VTKViewer/Makefile.in delete mode 100755 src/VTKViewer/VTKViewer_CellRectPicker.cxx delete mode 100755 src/VTKViewer/VTKViewer_CellRectPicker.h delete mode 100755 src/VTKViewer/VTKViewer_RectPicker.cxx delete mode 100755 src/VTKViewer/VTKViewer_RectPicker.h diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index 1e53b1621..cd7e84b64 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -233,7 +233,7 @@ myPrefs( 0 ) myAccel->setActionKey( SUIT_Accel::RotateUp, ALT+Key_Up, VTKViewer_Viewer::Type() ); myAccel->setActionKey( SUIT_Accel::RotateDown, ALT+Key_Down, VTKViewer_Viewer::Type() ); #endif -#ifndef DISABLE_PLOT2DKVIEWER +#ifndef DISABLE_PLOT2DVIEWER myAccel->setActionKey( SUIT_Accel::PanLeft, CTRL+Key_Left, Plot2d_Viewer::Type() ); myAccel->setActionKey( SUIT_Accel::PanRight, CTRL+Key_Right, Plot2d_Viewer::Type() ); myAccel->setActionKey( SUIT_Accel::PanUp, CTRL+Key_Up, Plot2d_Viewer::Type() ); @@ -456,8 +456,8 @@ void LightApp_Application::createActions() QString root; QAction* a; if (dir = getenv("GUI_ROOT_DIR")) { - root = Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("doc") + Qtx::addSlash("salome") + - Qtx::addSlash("gui") + Qtx::addSlash("GUI") ); + root = Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("share") + Qtx::addSlash("doc") + + Qtx::addSlash("salome") + Qtx::addSlash("gui") + Qtx::addSlash("GUI") ); if ( QFileInfo( root + aFileName ).exists() ) { a = createAction( id, tr( QString("GUI Help") ), QIconSet(), tr( QString("GUI Help") ), @@ -492,8 +492,8 @@ void LightApp_Application::createActions() QString modName = moduleName( *it ); if (dir = getenv( modName + "_ROOT_DIR")) { - root = Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("doc") + Qtx::addSlash("salome") + - Qtx::addSlash("gui") + Qtx::addSlash(modName) ); + root = Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("share") + Qtx::addSlash("doc") + + Qtx::addSlash("salome") + Qtx::addSlash("gui") + Qtx::addSlash(modName) ); if ( QFileInfo( root + aFileName ).exists() ) { QAction* a = createAction( id, tr( moduleTitle(modName) + QString(" Help") ), QIconSet(), @@ -522,51 +522,53 @@ void LightApp_Application::createActions() if ( modIcon.isNull() ) modIcon = QPixmap( imageEmptyIcon ); - QToolBar* modTBar = new QtxToolBar( true, desk ); - modTBar->setLabel( tr( "INF_TOOLBAR_MODULES" ) ); + QStringList modList; + modules( modList, false ); - QActionGroup* modGroup = new QActionGroup( this ); - modGroup->setExclusive( true ); - modGroup->setUsesDropDown( true ); + if( modList.count()>1 ) + { + QToolBar* modTBar = new QtxToolBar( true, desk ); + modTBar->setLabel( tr( "INF_TOOLBAR_MODULES" ) ); - a = createAction( -1, tr( "APP_NAME" ), defIcon, tr( "APP_NAME" ), - tr( "PRP_APP_MODULE" ), 0, desk, true ); - modGroup->add( a ); - myActions.insert( QString(), a ); + QActionGroup* modGroup = new QActionGroup( this ); + modGroup->setExclusive( true ); + modGroup->setUsesDropDown( true ); - QMap iconMap; - moduleIconNames( iconMap ); + a = createAction( -1, tr( "APP_NAME" ), defIcon, tr( "APP_NAME" ), + tr( "PRP_APP_MODULE" ), 0, desk, true ); + modGroup->add( a ); + myActions.insert( QString(), a ); - const int iconSize = 20; + QMap iconMap; + moduleIconNames( iconMap ); - modGroup->addTo( modTBar ); - QObjectList *l = modTBar->queryList( "QComboBox" ); - QObjectListIt oit( *l ); - while ( QObject* obj = oit.current() ) { - QComboBox* cb = (QComboBox*)obj; - if ( cb ) cb->setFocusPolicy( QWidget::NoFocus ); + const int iconSize = 20; + + modGroup->addTo( modTBar ); + QObjectList *l = modTBar->queryList( "QComboBox" ); + QObjectListIt oit( *l ); + while ( QObject* obj = oit.current() ) { + QComboBox* cb = (QComboBox*)obj; + if ( cb ) cb->setFocusPolicy( QWidget::NoFocus ); ++oit; - } - delete l; + } + delete l; - modTBar->addSeparator(); + modTBar->addSeparator(); - QStringList modList; - modules( modList, false ); - - for ( it = modList.begin(); it != modList.end(); ++it ) - { - if ( !isLibExists( *it ) ) - continue; + for ( it = modList.begin(); it != modList.end(); ++it ) + { + if ( !isLibExists( *it ) ) + continue; - QString iconName; - if ( iconMap.contains( *it ) ) - iconName = iconMap[*it]; + QString iconName; + if ( iconMap.contains( *it ) ) + iconName = iconMap[*it]; - QString modName = moduleName( *it ); + QString modName = moduleName( *it ); - QPixmap icon = resMgr->loadPixmap( modName, iconName, false ); - if ( icon.isNull() ) + QPixmap icon = resMgr->loadPixmap( modName, iconName, false ); + if ( icon.isNull() ) { icon = modIcon; printf( "****************************************************************\n" ); @@ -574,16 +576,18 @@ void LightApp_Application::createActions() printf( "****************************************************************\n" ); } - icon.convertFromImage( icon.convertToImage().smoothScale( iconSize, iconSize, QImage::ScaleMin ) ); + icon.convertFromImage( icon.convertToImage().smoothScale( iconSize, iconSize, QImage::ScaleMin ) ); - QAction* a = createAction( -1, *it, icon, *it, tr( "PRP_MODULE" ).arg( *it ), 0, desk, true ); - a->addTo( modTBar ); - modGroup->add( a ); + QAction* a = createAction( -1, *it, icon, *it, tr( "PRP_MODULE" ).arg( *it ), 0, desk, true ); + a->addTo( modTBar ); + modGroup->add( a ); - myActions.insert( *it, a ); - } + myActions.insert( *it, a ); + } - SUIT_Tools::simplifySeparators( modTBar ); + SUIT_Tools::simplifySeparators( modTBar ); + connect( modGroup, SIGNAL( selected( QAction* ) ), this, SLOT( onModuleActivation( QAction* ) ) ); + } // New window int windowMenu = createMenu( tr( "MEN_DESK_WINDOW" ), -1, MenuWindowId, 100 ); @@ -609,8 +613,6 @@ void LightApp_Application::createActions() SHIFT+Key_R, desk, false, this, SLOT( onRenameWindow() ) ); createMenu( RenameId, windowMenu, -1 ); - connect( modGroup, SIGNAL( selected( QAction* ) ), this, SLOT( onModuleActivation( QAction* ) ) ); - int fileMenu = createMenu( tr( "MEN_DESK_FILE" ), -1 ); createMenu( PreferencesId, fileMenu, 15, -1 ); createMenu( separator(), fileMenu, -1, 15, -1 ); @@ -965,7 +967,7 @@ void LightApp_Application::onHelpContentsModule() QCString dir = getenv( aComponentName + "_ROOT_DIR"); QString homeDir = !aComponentName.compare(QString("KERNEL")) ? Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("share") + Qtx::addSlash("doc") + Qtx::addSlash("salome") ) : - Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("doc") + Qtx::addSlash("salome") + Qtx::addSlash("gui") + Qtx::addSlash(aComponentName) ); + Qtx::addSlash( Qtx::addSlash(dir) + Qtx::addSlash("share") + Qtx::addSlash("doc") + Qtx::addSlash("salome") + Qtx::addSlash("gui") + Qtx::addSlash(aComponentName) ); QString helpFile = QFileInfo( homeDir + (!aComponentName.compare(QString("KERNEL")) ? aFileNameKernel : aFileName) ).absFilePath(); SUIT_ResourceMgr* resMgr = resourceMgr(); @@ -990,7 +992,7 @@ void LightApp_Application::onHelpContentsModule() void LightApp_Application::onHelpContextModule(const QString& theComponentName, const QString& theFileName) { QCString dir = getenv( theComponentName + "_ROOT_DIR"); - QString homeDir = Qtx::addSlash(Qtx::addSlash(dir)+Qtx::addSlash("doc")+Qtx::addSlash("salome")+Qtx::addSlash("gui")+Qtx::addSlash(theComponentName)); + QString homeDir = Qtx::addSlash(Qtx::addSlash(dir)+Qtx::addSlash("share")+Qtx::addSlash("doc")+Qtx::addSlash("salome")+Qtx::addSlash("gui")+Qtx::addSlash(theComponentName)); QString helpFile = QFileInfo( homeDir + theFileName ).absFilePath(); SUIT_ResourceMgr* resMgr = resourceMgr(); @@ -1448,7 +1450,7 @@ void LightApp_Application::onStudySaved( SUIT_Study* ) } /*!Protected SLOT. On study closed.*/ -void LightApp_Application::onStudyClosed( SUIT_Study* ) +void LightApp_Application::onStudyClosed( SUIT_Study* s ) { emit studyClosed(); @@ -1457,7 +1459,8 @@ void LightApp_Application::onStudyClosed( SUIT_Study* ) activateModule( "" ); - saveWindowsGeometry(); + for ( WindowMap::ConstIterator itr = myWindows.begin(); s && itr != myWindows.end(); ++itr ) + removeWindow( itr.key(), s->id() ); } /*!Protected SLOT.On desktop activated.*/ @@ -1560,9 +1563,6 @@ void LightApp_Application::onMRUActivated( QString aName ) void LightApp_Application::beforeCloseDoc( SUIT_Study* s ) { CAM_Application::beforeCloseDoc( s ); - - for ( WindowMap::ConstIterator itr = myWindows.begin(); s && itr != myWindows.end(); ++itr ) - removeWindow( itr.key(), s->id() ); } /*!Update actions.*/ diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h index b7131da99..cec21a876 100644 --- a/src/LightApp/LightApp_Application.h +++ b/src/LightApp/LightApp_Application.h @@ -126,6 +126,7 @@ public: void updateActions(); SUIT_ViewManager* getViewManager( const QString&, const bool ); + virtual SUIT_ViewManager* createViewManager( const QString& vmType ); virtual void addViewManager( SUIT_ViewManager* ); virtual void removeViewManager( SUIT_ViewManager* ); QWidget* getWindow( const int, const int = -1 ); @@ -226,7 +227,6 @@ protected: QString defaultModule() const; void currentWindows( QMap& ) const; void currentViewManagers( QStringList& ) const; - virtual SUIT_ViewManager* createViewManager( const QString& vmType ); void moduleIconNames( QMap& ) const; void activateWindows(); diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am new file mode 100755 index 000000000..b15ed5e42 --- /dev/null +++ b/src/LightApp/Makefile.am @@ -0,0 +1,242 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : OCC team (OCN) +# Module : LightApp +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES = libLightApp.la + +salomeinclude_HEADERS= \ + LightApp.h \ + LightApp_AboutDlg.h \ + LightApp_Application.h \ + LightApp_DataModel.h \ + LightApp_DataObject.h \ + LightApp_DataOwner.h \ + LightApp_DataSubOwner.h \ + LightApp_Dialog.h \ + LightApp_Displayer.h \ + LightApp_Driver.h \ + LightApp_EventFilter.h \ + LightApp_HDFDriver.h \ + LightApp_Module.h \ + LightApp_ModuleDlg.h \ + LightApp_NameDlg.h \ + LightApp_OBFilter.h \ + LightApp_OBSelector.h \ + LightApp_Operation.h \ + LightApp_Selection.h \ + LightApp_SelectionMgr.h \ + LightApp_ShowHideOp.h \ + LightApp_Study.h \ + LightApp_SwitchOp.h \ + LightApp_Preferences.h \ + LightApp_PreferencesDlg.h \ + LightApp_RootObject.h \ + LightApp_UpdateFlags.h \ + LightApp_WidgetContainer.h + +if ENABLE_VTKVIEWER +if ENABLE_SALOMEOBJECT + salomeinclude_HEADERS+= LightApp_VTKSelector.h +endif +endif +if ENABLE_OCCVIEWER + salomeinclude_HEADERS+= LightApp_OCCSelector.h +endif +if ENABLE_GLVIEWER + salomeinclude_HEADERS+= LightApp_GLSelector.h +endif + +dist_libLightApp_la_SOURCES= \ + LightApp_AboutDlg.cxx \ + LightApp_Application.cxx \ + LightApp_DataModel.cxx \ + LightApp_DataObject.cxx \ + LightApp_DataOwner.cxx \ + LightApp_DataSubOwner.cxx \ + LightApp_Dialog.cxx \ + LightApp_Displayer.cxx \ + LightApp_Driver.cxx \ + LightApp_EventFilter.cxx \ + LightApp_HDFDriver.cxx \ + LightApp_Module.cxx \ + LightApp_ModuleDlg.cxx \ + LightApp_NameDlg.cxx \ + LightApp_OBFilter.cxx \ + LightApp_OBSelector.cxx \ + LightApp_Operation.cxx \ + LightApp_Selection.cxx \ + LightApp_SelectionMgr.cxx \ + LightApp_ShowHideOp.cxx \ + LightApp_Study.cxx \ + LightApp_SwitchOp.cxx \ + LightApp_Preferences.cxx \ + LightApp_PreferencesDlg.cxx \ + LightApp_WidgetContainer.cxx + +if ENABLE_VTKVIEWER +if ENABLE_SALOMEOBJECT + dist_libLightApp_la_SOURCES+= LightApp_VTKSelector.cxx +endif +endif +if ENABLE_OCCVIEWER + dist_libLightApp_la_SOURCES+= LightApp_OCCSelector.cxx +endif +if ENABLE_GLVIEWER + dist_libLightApp_la_SOURCES+= LightApp_GLSelector.cxx +endif + +MOC_FILES= \ + LightApp_AboutDlg_moc.cxx \ + LightApp_Application_moc.cxx \ + LightApp_DataModel_moc.cxx \ + LightApp_Dialog_moc.cxx \ + LightApp_OBSelector_moc.cxx \ + LightApp_Operation_moc.cxx \ + LightApp_Module_moc.cxx \ + LightApp_ModuleDlg_moc.cxx \ + LightApp_NameDlg_moc.cxx \ + LightApp_SelectionMgr_moc.cxx \ + LightApp_ShowHideOp_moc.cxx \ + LightApp_Study_moc.cxx \ + LightApp_SwitchOp_moc.cxx \ + LightApp_Preferences_moc.cxx \ + LightApp_PreferencesDlg_moc.cxx \ + LightApp_WidgetContainer_moc.cxx + +if ENABLE_VTKVIEWER +if ENABLE_SALOMEOBJECT + MOC_FILES+= LightApp_VTKSelector_moc.cxx +endif +endif +if ENABLE_OCCVIEWER + MOC_FILES+= LightApp_OCCSelector_moc.cxx +endif +if ENABLE_GLVIEWER + MOC_FILES+= LightApp_GLSelector_moc.cxx +endif +nodist_libLightApp_la_SOURCES= $(MOC_FILES) + +dist_salomeres_DATA= \ + resources/icon_about.png \ + resources/icon_applogo.png \ + resources/icon_default.png \ + resources/icon_module.png \ + resources/icon_module_big.png \ + resources/icon_select.png \ + resources/LightApp.ini \ + resources/LightApp.xml + +nodist_salomeres_DATA= \ + LightApp_images.qm \ + LightApp_msg_en.qm + +libLightApp_la_CPPFLAGS=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(CAS_CPPFLAGS) \ + $(HDF5_INCLUDES) @KERNEL_CXXFLAGS@ -I$(srcdir)/../SUIT -I$(srcdir)/../STD \ + -I$(srcdir)/../CAM -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LogWindow \ + -I$(srcdir)/../Prs -I$(srcdir)/../Qtx +libLightApp_la_LDFLAGS=$(QT_MT_LIBS) + +if ENABLE_VTKVIEWER + libLightApp_la_CPPFLAGS+= $(VTK_INCLUDES) -I$(srcdir)/../VTKViewer +else + libLightApp_la_CPPFLAGS+= -DDISABLE_VTKVIEWER +endif +if ENABLE_PLOT2DVIEWER + libLightApp_la_CPPFLAGS+= $(QWT_INCLUDES) -I$(srcdir)/../Plot2d +else + libLightApp_la_CPPFLAGS+= -DDISABLE_PLOT2DVIEWER +endif +if ENABLE_OCCVIEWER + libLightApp_la_CPPFLAGS+= -I$(srcdir)/../OCCViewer +else !ENABLE_OCCVIEWER + libLightApp_la_CPPFLAGS+= -DDISABLE_OCCVIEWER +endif +if ENABLE_PYCONSOLE + libLightApp_la_CPPFLAGS+= $(PYTHON_INCLUDES) -I$(srcdir)/../PythonConsole -I$(srcdir)/../PyInterp + libLightApp_la_LDFLAGS+= $(PYTHON_LIBS) +else !ENABLE_PYCONSOLE + libLightApp_la_CPPFLAGS+= -DDISABLE_PYCONSOLE +endif +if ENABLE_GLVIEWER + libLightApp_la_CPPFLAGS+= -I$(srcdir)/../GLViewer +else !ENABLE_GLVIEWER + libLightApp_la_CPPFLAGS+= -DDISABLE_GLVIEWER +endif +if ENABLE_SUPERVGRAPHVIEWER + libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SUPERVGraph +else !ENABLE_SUPERVGRAPHVIEWER + libLightApp_la_CPPFLAGS+= -DDISABLE_SUPERVGRAPHVIEWER +endif + +if ENABLE_SALOMEOBJECT + + libLightApp_la_CPPFLAGS+= -I$(srcdir)/../OBJECT +if ENABLE_PLOT2DVIEWER + libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SPlot2d +endif +if ENABLE_OCCVIEWER + libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SOCC +endif +if ENABLE_VTKVIEWER + libLightApp_la_CPPFLAGS+= -I$(srcdir)/../SVTK +endif +else !ENABLE_SALOMEOBJECT + libLightApp_la_CPPFLAGS+= -DDISABLE_SALOMEOBJECT + +endif + +libLightApp_la_LIBADD= ../SUIT/libsuit.la ../STD/libstd.la ../CAM/libCAM.la \ + ../ObjBrowser/libObjBrowser.la ../LogWindow/libLogWindow.la $(CAS_KERNEL) \ + ../Prs/libSalomePrs.la $(HDF5_LIBS) $(KERNEL_LDFLAGS) -lSalomeHDFPersist + +if ENABLE_SALOMEOBJECT + libLightApp_la_LIBADD+= ../OBJECT/libSalomeObject.la +endif +if ENABLE_VTKVIEWER + libLightApp_la_LIBADD+= ../VTKViewer/libVTKViewer.la +if ENABLE_SALOMEOBJECT + libLightApp_la_LIBADD+= ../SVTK/libSVTK.la +endif +endif +if ENABLE_OCCVIEWER + libLightApp_la_LIBADD+= ../OCCViewer/libOCCViewer.la +if ENABLE_SALOMEOBJECT + libLightApp_la_LIBADD+= ../SOCC/libSOCC.la +endif +endif +if ENABLE_GLVIEWER + libLightApp_la_LIBADD+= ../GLViewer/libGLViewer.la +endif +if ENABLE_PLOT2DVIEWER + libLightApp_la_LIBADD+= ../Plot2d/libPlot2d.la +if ENABLE_SALOMEOBJECT + libLightApp_la_LIBADD+= ../SPlot2d/libSPlot2d.la +endif +endif +if ENABLE_PYCONSOLE + libLightApp_la_LIBADD+= ../PyInterp/libPyInterp.la ../PythonConsole/libPythonConsole.la +endif +if ENABLE_SUPERVGRAPHVIEWER + libLightApp_la_LIBADD+= ../SUPERVGraph/libSUPERVGraph.la +endif diff --git a/src/LightApp/Makefile.in b/src/LightApp/Makefile.in deleted file mode 100755 index eb1cef66f..000000000 --- a/src/LightApp/Makefile.in +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : OCC team (OCN) -# Module : LightApp -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= LightApp.h \ - LightApp_AboutDlg.h \ - LightApp_Application.h \ - LightApp_DataModel.h \ - LightApp_DataObject.h \ - LightApp_DataOwner.h \ - LightApp_DataSubOwner.h \ - LightApp_Dialog.h \ - LightApp_Displayer.h \ - LightApp_Driver.h \ - LightApp_EventFilter.h \ - LightApp_HDFDriver.h \ - LightApp_Module.h \ - LightApp_ModuleDlg.h \ - LightApp_NameDlg.h \ - LightApp_OBFilter.h \ - LightApp_OBSelector.h \ - LightApp_Operation.h \ - LightApp_Selection.h \ - LightApp_SelectionMgr.h \ - LightApp_ShowHideOp.h \ - LightApp_Study.h \ - LightApp_SwitchOp.h \ - LightApp_Preferences.h \ - LightApp_PreferencesDlg.h \ - LightApp_RootObject.h \ - LightApp_UpdateFlags.h \ - LightApp_WidgetContainer.h - -ifneq ($(DISABLE_VTKVIEWER),yes) -ifneq ($(DISABLE_SALOMEOBJECT),yes) - EXPORT_HEADERS+= LightApp_VTKSelector.h -endif -endif -ifneq ($(DISABLE_OCCVIEWER),yes) - EXPORT_HEADERS+= LightApp_OCCSelector.h -endif -ifneq ($(DISABLE_GLVIEWER),yes) - EXPORT_HEADERS+= LightApp_GLSelector.h -endif - -# .po files to transform in .qm -PO_FILES = LightApp_images.po \ - LightApp_msg_en.po - -# Libraries targets -LIB = libLightApp.la - -LIB_SRC= LightApp_AboutDlg.cxx \ - LightApp_Application.cxx \ - LightApp_DataModel.cxx \ - LightApp_DataObject.cxx \ - LightApp_DataOwner.cxx \ - LightApp_DataSubOwner.cxx \ - LightApp_Dialog.cxx \ - LightApp_Displayer.cxx \ - LightApp_Driver.cxx \ - LightApp_EventFilter.cxx \ - LightApp_HDFDriver.cxx \ - LightApp_Module.cxx \ - LightApp_ModuleDlg.cxx \ - LightApp_NameDlg.cxx \ - LightApp_OBFilter.cxx \ - LightApp_OBSelector.cxx \ - LightApp_Operation.cxx \ - LightApp_Selection.cxx \ - LightApp_SelectionMgr.cxx \ - LightApp_ShowHideOp.cxx \ - LightApp_Study.cxx \ - LightApp_SwitchOp.cxx \ - LightApp_Preferences.cxx \ - LightApp_PreferencesDlg.cxx \ - LightApp_WidgetContainer.cxx - -ifneq ($(DISABLE_VTKVIEWER),yes) -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIB_SRC+= LightApp_VTKSelector.cxx -endif -endif -ifneq ($(DISABLE_OCCVIEWER),yes) - LIB_SRC+= LightApp_OCCSelector.cxx -endif -ifneq ($(DISABLE_GLVIEWER),yes) - LIB_SRC+= LightApp_GLSelector.cxx -endif - -LIB_MOC = LightApp_AboutDlg.h \ - LightApp_Application.h \ - LightApp_DataModel.h \ - LightApp_Dialog.h \ - LightApp_OBSelector.h \ - LightApp_Operation.h \ - LightApp_Module.h \ - LightApp_ModuleDlg.h \ - LightApp_NameDlg.h \ - LightApp_SelectionMgr.h \ - LightApp_ShowHideOp.h \ - LightApp_Study.h \ - LightApp_SwitchOp.h \ - LightApp_Preferences.h \ - LightApp_PreferencesDlg.h \ - LightApp_WidgetContainer.h - -ifneq ($(DISABLE_VTKVIEWER),yes) -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIB_MOC+= LightApp_VTKSelector.h -endif -endif -ifneq ($(DISABLE_OCCVIEWER),yes) - LIB_MOC+= LightApp_OCCSelector.h -endif -ifneq ($(DISABLE_GLVIEWER),yes) - LIB_MOC+= LightApp_GLSelector.h -endif - -RESOURCES_FILES = icon_about.png \ - icon_applogo.png \ - icon_default.png \ - icon_module.png \ - icon_module_big.png \ - icon_select.png \ - LightApp.ini \ - LightApp.xml - -CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(OCC_INCLUDES) \ - $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) - -ifneq ($(DISABLE_VTKVIEWER),yes) - CPPFLAGS+= $(VTK_INCLUDES) -else - CPPFLAGS+= -DDISABLE_VTKVIEWER -endif -ifneq ($(DISABLE_PLOT2DVIEWER),yes) - CPPFLAGS+= $(QWT_INCLUDES) -else - CPPFLAGS+= -DDISABLE_PLOT2DVIEWER -endif -ifeq ($(DISABLE_OCCVIEWER),yes) - CPPFLAGS+= -DDISABLE_OCCVIEWER -endif -ifneq ($(DISABLE_PYCONSOLE),yes) - CPPFLAGS+= $(PYTHON_INCLUDES) -else - CPPFLAGS+= -DDISABLE_PYCONSOLE -endif -ifeq ($(DISABLE_GLVIEWER),yes) - CPPFLAGS+= -DDISABLE_GLVIEWER -endif -ifeq ($(DISABLE_SUPERVGRAPHVIEWER),yes) - CPPFLAGS+= -DDISABLE_SUPERVGRAPHVIEWER -endif -ifeq ($(DISABLE_SALOMEOBJECT),yes) - CPPFLAGS+= -DDISABLE_SALOMEOBJECT -endif - -LDFLAGS+=$(QT_MT_LIBS) -ifneq ($(DISABLE_PYCONSOLE),yes) - LDFLAGS+= $(PYTHON_LIBS) -endif - -LIBS+= -lsuit -lstd -lCAM -lObjBrowser -lLogWindow $(CAS_KERNEL) -lSalomePrs \ - $(HDF5_LIBS) $(KERNEL_LDFLAGS) -lSalomeHDFPersist - -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIBS+= -lSalomeObject -endif -ifneq ($(DISABLE_VTKVIEWER),yes) - LIBS+= -lVTKViewer -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIBS+= -lSVTK -endif -endif -ifneq ($(DISABLE_OCCVIEWER),yes) - LIBS+= -lOCCViewer -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIBS+= -lSOCC -endif -endif -ifneq ($(DISABLE_GLVIEWER),yes) - LIBS+= -lGLViewer -endif -ifneq ($(DISABLE_PLOT2DVIEWER),yes) - LIBS+= -lPlot2d -ifneq ($(DISABLE_SALOMEOBJECT),yes) - LIBS+= -lSPlot2d -endif -endif -ifneq ($(DISABLE_PYCONSOLE),yes) - LIBS+= -lPyInterp -lPythonConsole -endif -ifneq ($(DISABLE_SUPERVGRAPHVIEWER),yes) - LIBS+= -lSUPERVGraph -endif - -@CONCLUDE@ diff --git a/src/LogWindow/Makefile.in b/src/LogWindow/Makefile.am similarity index 70% rename from src/LogWindow/Makefile.in rename to src/LogWindow/Makefile.am index d868371af..83dcacd43 100755 --- a/src/LogWindow/Makefile.in +++ b/src/LogWindow/Makefile.am @@ -21,27 +21,19 @@ # Module : LogWindow # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +lib_LTLIBRARIES = libLogWindow.la -# header files -EXPORT_HEADERS= LogWindow.h - -# Libraries targets -LIB = libLogWindow.la +salomeinclude_HEADERS= LogWindow.h -LIB_SRC= LogWindow.cxx - -LIB_MOC = LogWindow.h +dist_libLogWindow_la_SOURCES= LogWindow.cxx -CPPFLAGS+=$(QT_INCLUDES) +MOC_FILES= LogWindow_moc.cxx +nodist_libLogWindow_la_SOURCES = $(MOC_FILES) -LDFLAGS+=$(QT_MT_LIBS) +libLogWindow_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -@CONCLUDE@ +libLogWindow_la_LDFLAGS=$(QT_MT_LIBS) ../SUIT/libsuit.la ../Qtx/libqtx.la diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am new file mode 100755 index 000000000..106033a71 --- /dev/null +++ b/src/OBJECT/Makefile.am @@ -0,0 +1,71 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES = libSalomeObject.la + +salomeinclude_HEADERS= \ + SALOME_InteractiveObject.hxx \ + Handle_SALOME_InteractiveObject.hxx \ + SALOME_AISShape.hxx \ + Handle_SALOME_AISShape.hxx \ + SALOME_AISObject.hxx \ + Handle_SALOME_AISObject.hxx \ + SALOME_ListIO.hxx \ + SALOME_ListIteratorOfListIO.hxx \ + Handle_SALOME_ListNodeOfListIO.hxx \ + SALOME_ListNodeOfListIO.hxx \ + Handle_SALOME_Filter.hxx \ + SALOME_Filter.hxx \ + Handle_SALOME_TypeFilter.hxx \ + SALOME_TypeFilter.hxx \ + SALOME_DataMapOfIOMapOfInteger.hxx \ + SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx \ + Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx \ + SALOME_Selection.h + +dist_libSalomeObject_la_SOURCES= \ + SALOME_InteractiveObject.cxx \ + SALOME_AISShape.cxx\ + SALOME_AISObject.cxx\ + SALOME_ListIO_0.cxx \ + SALOME_ListIteratorOfListIO_0.cxx \ + SALOME_ListNodeOfListIO_0.cxx \ + SALOME_Filter.cxx \ + SALOME_TypeFilter.cxx \ + SALOME_DataMapOfIOMapOfInteger_0.cxx \ + SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx \ + SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx + +libSalomeObject_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) +libSalomeObject_la_LDFLAGS=$(QT_LIBS) $(CAS_LDPATH) -lTKV3d + +EXTRA_DIST+= \ + SALOME_AISObject.ixx \ + SALOME_AISObject.jxx \ + SALOME_AISShape.ixx \ + SALOME_AISShape.jxx \ + SALOME_Filter.ixx \ + SALOME_Filter.jxx \ + SALOME_InteractiveObject.ixx \ + SALOME_InteractiveObject.jxx \ + SALOME_TypeFilter.ixx \ + SALOME_TypeFilter.jxx \ + SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in deleted file mode 100755 index ad9e94ccc..000000000 --- a/src/OBJECT/Makefile.in +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = SALOME_InteractiveObject.hxx \ - Handle_SALOME_InteractiveObject.hxx \ - SALOME_AISShape.hxx \ - Handle_SALOME_AISShape.hxx \ - SALOME_AISObject.hxx \ - Handle_SALOME_AISObject.hxx \ - SALOME_ListIO.hxx \ - SALOME_ListIteratorOfListIO.hxx \ - Handle_SALOME_ListNodeOfListIO.hxx \ - SALOME_ListNodeOfListIO.hxx \ - Handle_SALOME_Filter.hxx \ - SALOME_Filter.hxx \ - Handle_SALOME_TypeFilter.hxx \ - SALOME_TypeFilter.hxx \ - SALOME_DataMapOfIOMapOfInteger.hxx \ - SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx \ - Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx \ - SALOME_Selection.h - - -# Libraries targets - -LIB = libSalomeObject.la -LIB_SRC = SALOME_InteractiveObject.cxx \ - SALOME_AISShape.cxx\ - SALOME_AISObject.cxx\ - SALOME_ListIO_0.cxx \ - SALOME_ListIteratorOfListIO_0.cxx \ - SALOME_ListNodeOfListIO_0.cxx \ - SALOME_Filter.cxx \ - SALOME_TypeFilter.cxx \ - SALOME_DataMapOfIOMapOfInteger_0.cxx \ - SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx \ - SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx - -LIB_CLIENT_IDL = - -# Executables targets -BIN = -BIN_SRC = - -CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) -LDFLAGS+= $(QT_LIBS) $(CAS_LDPATH) -lTKV3d - - -@CONCLUDE@ diff --git a/src/OCCViewer/Makefile.am b/src/OCCViewer/Makefile.am new file mode 100755 index 000000000..4299b7d24 --- /dev/null +++ b/src/OCCViewer/Makefile.am @@ -0,0 +1,90 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Vladimir Klyachin (OCN) +# Module : OCCViewer +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES = libOCCViewer.la + +salomeinclude_HEADERS= \ + OCCViewer_AISSelector.h \ + OCCViewer_ViewManager.h \ + OCCViewer_ViewModel.h \ + OCCViewer_ViewPort3d.h \ + OCCViewer_ViewPort.h \ + OCCViewer_ViewWindow.h \ + OCCViewer_VService.h \ + OCCViewer_CreateRestoreViewDlg.h \ + OCCViewer.h + +dist_libOCCViewer_la_SOURCES= \ + OCCViewer_AISSelector.cxx \ + OCCViewer_ViewManager.cxx \ + OCCViewer_ViewModel.cxx \ + OCCViewer_ViewPort3d.cxx \ + OCCViewer_ViewPort.cxx \ + OCCViewer_ViewWindow.cxx \ + OCCViewer_VService.cxx \ + OCCViewer_CreateRestoreViewDlg.cxx \ + OCCViewer_ClippingDlg.cxx + +MOC_FILES= \ + OCCViewer_AISSelector_moc.cxx \ + OCCViewer_ViewModel_moc.cxx \ + OCCViewer_ViewPort3d_moc.cxx \ + OCCViewer_ViewPort_moc.cxx \ + OCCViewer_ViewWindow_moc.cxx \ + OCCViewer_ViewManager_moc.cxx \ + OCCViewer_CreateRestoreViewDlg_moc.cxx \ + OCCViewer_ClippingDlg_moc.cxx +nodist_libOCCViewer_la_SOURCES= $(MOC_FILES) + +dist_salomeres_DATA = \ + resources/view_back.png \ + resources/view_bottom.png \ + resources/view_camera_dump.png \ + resources/view_clone.png \ + resources/view_clipping.png \ + resources/view_clipping_pressed.png \ + resources/view_fitall.png \ + resources/view_fitarea.png \ + resources/view_front.png \ + resources/view_glpan.png \ + resources/view_left.png \ + resources/view_pan.png \ + resources/view_presets.png \ + resources/view_reset.png \ + resources/view_right.png \ + resources/view_rotate.png \ + resources/view_shoot.png \ + resources/view_top.png \ + resources/view_triedre.png \ + resources/view_zoom.png + +nodist_salomeres_DATA = \ + OCCViewer_images.qm \ + OCCViewer_msg_en.qm + +libOCCViewer_la_CPPFLAGS=$(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) \ + -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx + +libOCCViewer_la_LDFLAGS=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) ../SUIT/libsuit.la diff --git a/src/OCCViewer/Makefile.in b/src/OCCViewer/Makefile.in deleted file mode 100755 index 842759ae3..000000000 --- a/src/OCCViewer/Makefile.in +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vladimir Klyachin (OCN) -# Module : OCCViewer -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= OCCViewer_AISSelector.h \ - OCCViewer_ViewManager.h \ - OCCViewer_ViewModel.h \ - OCCViewer_ViewPort3d.h \ - OCCViewer_ViewPort.h \ - OCCViewer_ViewWindow.h \ - OCCViewer_VService.h \ - OCCViewer_CreateRestoreViewDlg.h \ - OCCViewer.h - -# .po files to transform in .qm -PO_FILES = OCCViewer_images.po \ - OCCViewer_msg_en.po - -# Libraries targets -LIB = libOCCViewer.la -LIB_SRC= OCCViewer_AISSelector.cxx \ - OCCViewer_ViewManager.cxx \ - OCCViewer_ViewModel.cxx \ - OCCViewer_ViewPort3d.cxx \ - OCCViewer_ViewPort.cxx \ - OCCViewer_ViewWindow.cxx \ - OCCViewer_VService.cxx \ - OCCViewer_CreateRestoreViewDlg.cxx \ - OCCViewer_ClippingDlg.cxx - -LIB_MOC = OCCViewer_AISSelector.h \ - OCCViewer_ViewModel.h \ - OCCViewer_ViewPort3d.h \ - OCCViewer_ViewPort.h \ - OCCViewer_ViewWindow.h \ - OCCViewer_ViewManager.h \ - OCCViewer_CreateRestoreViewDlg.h \ - OCCViewer_ClippingDlg.h - -RESOURCES_FILES = \ -view_back.png \ -view_bottom.png \ -view_camera_dump.png \ -view_clone.png \ -view_clipping.png \ -view_clipping_pressed.png \ -view_fitall.png \ -view_fitarea.png \ -view_front.png \ -view_glpan.png \ -view_left.png \ -view_pan.png \ -view_presets.png \ -view_reset.png \ -view_right.png \ -view_rotate.png \ -view_shoot.png \ -view_top.png \ -view_triedre.png \ -view_zoom.png - -CPPFLAGS+=$(QT_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) - -LDFLAGS+=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) -lsuit - -@CONCLUDE@ - - diff --git a/src/SUITApp/Makefile.in b/src/ObjBrowser/Makefile.am old mode 100644 new mode 100755 similarity index 58% rename from src/SUITApp/Makefile.in rename to src/ObjBrowser/Makefile.am index 17601209e..ff1db50cb --- a/src/SUITApp/Makefile.in +++ b/src/ObjBrowser/Makefile.am @@ -18,45 +18,34 @@ # # File : Makefile.in # Author : Vladimir Klyachin (OCN) -# Module : suitApp -# $Header$ +# Module : ObjectBrowser +# $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources +include $(top_srcdir)/adm_local/unix/make_common_starter.am +lib_LTLIBRARIES = libObjBrowser.la -@COMMENCE@ +salomeinclude_HEADERS=\ + OB.h \ + OB_Browser.h \ + OB_ListItem.h \ + OB_ListView.h \ + OB_Filter.h -# header files -EXPORT_HEADERS= SUITApp_Application.h +dist_libObjBrowser_la_SOURCES= \ + OB_Browser.cxx \ + OB_ListItem.cxx \ + OB_ListView.cxx \ + OB_Filter.cxx -# .po files to transform in .qm -PO_FILES = SUITApp_msg_en.po +MOC_FILES= \ + OB_Browser_moc.cxx \ + OB_ListView_moc.cxx +nodist_libObjBrowser_la_SOURCES= $(MOC_FILES) -LIB_SRC= SUITApp.cxx \ - SUITApp_Application.cxx - -LIB_MOC = SUITApp_Application.h - -# Libraries targets -LIB = libSUITApp.la - -# Executables targets -BIN = SUITApp -BIN_SRC = - -CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) - -LDFLAGS+=$(QT_MT_LIBS) - -ifneq ($(DISABLE_PYCONSOLE),yes) -LIBS+= -Xlinker -export-dynamic $(PYTHON_LIBS) -endif -LIBS+= -lsuit -lqtx -LIBSFORBIN+= -lsuit -lqtx - -@CONCLUDE@ +nodist_salomeres_DATA = OB_msg_en.qm +libObjBrowser_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx +libObjBrowser_la_LDFLAGS=$(QT_MT_LIBS) +libObjBrowser_la_LIBADD= ../SUIT/libsuit.la ../Qtx/libqtx.la diff --git a/src/Plot2d/Makefile.am b/src/Plot2d/Makefile.am new file mode 100755 index 000000000..b2fd5cfbf --- /dev/null +++ b/src/Plot2d/Makefile.am @@ -0,0 +1,92 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Vladimir Klyachin (OCN) +# Module : Plot2d +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES= libPlot2d.la + +# header files +salomeinclude_HEADERS= \ + Plot2d.h \ + Plot2d_Curve.h \ + Plot2d_FitDataDlg.h \ + Plot2d_Prs.h \ + Plot2d_SetupViewDlg.h \ + Plot2d_ViewFrame.h \ + Plot2d_ViewManager.h \ + Plot2d_ViewModel.h \ + Plot2d_ViewWindow.h \ + Plot2d_SetupCurveDlg.h \ + Plot2d_ToolTip.h + +dist_libPlot2d_la_SOURCES= \ + Plot2d_Curve.cxx \ + Plot2d_FitDataDlg.cxx \ + Plot2d_Prs.cxx \ + Plot2d_SetupViewDlg.cxx \ + Plot2d_ViewFrame.cxx \ + Plot2d_ViewManager.cxx \ + Plot2d_ViewModel.cxx \ + Plot2d_ViewWindow.cxx \ + Plot2d_SetupCurveDlg.cxx \ + Plot2d_ToolTip.cxx + +MOC_FILES = \ + Plot2d_FitDataDlg_moc.cxx \ + Plot2d_SetupViewDlg_moc.cxx \ + Plot2d_ViewFrame_moc.cxx \ + Plot2d_ViewManager_moc.cxx \ + Plot2d_ViewModel_moc.cxx \ + Plot2d_ViewWindow_moc.cxx \ + Plot2d_SetupCurveDlg_moc.cxx \ + Plot2d_ToolTip_moc.cxx +nodist_libPlot2d_la_SOURCES= $(MOC_FILES) + +dist_salomeres_DATA = \ + resources/plot2d_clone.png \ + resources/plot2d_camera_dump.png \ + resources/plot2d_fitall.png \ + resources/plot2d_fitarea.png \ + resources/plot2d_glpan.png \ + resources/plot2d_legend.png \ + resources/plot2d_linear.png \ + resources/plot2d_linear_y.png \ + resources/plot2d_lines.png \ + resources/plot2d_log.png \ + resources/plot2d_log_y.png \ + resources/plot2d_pan.png \ + resources/plot2d_points.png \ + resources/plot2d_settings.png \ + resources/plot2d_splines.png \ + resources/plot2d_zoom.png + +nodist_salomeres_DATA= \ + Plot2d_images.qm \ + Plot2d_msg_en.qm + +libPlot2d_la_CPPFLAGS=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) \ + -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT + +libPlot2d_la_LDFLAGS=$(QWT_LIBS) $(QT_MT_LIBS) ../SUIT/libsuit.la + + diff --git a/src/Plot2d/Makefile.in b/src/Plot2d/Makefile.in deleted file mode 100755 index 73af7206c..000000000 --- a/src/Plot2d/Makefile.in +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vladimir Klyachin (OCN) -# Module : Plot2d -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= Plot2d.h \ - Plot2d_Curve.h \ - Plot2d_FitDataDlg.h \ - Plot2d_Prs.h \ - Plot2d_SetupViewDlg.h \ - Plot2d_ViewFrame.h \ - Plot2d_ViewManager.h \ - Plot2d_ViewModel.h \ - Plot2d_ViewWindow.h \ - Plot2d_SetupCurveDlg.h \ - Plot2d_ToolTip.h - -# .po files to transform in .qm -PO_FILES = Plot2d_images.po \ - Plot2d_msg_en.po - -# Libraries targets -LIB = libPlot2d.la -LIB_SRC= Plot2d_Curve.cxx \ - Plot2d_FitDataDlg.cxx \ - Plot2d_Prs.cxx \ - Plot2d_SetupViewDlg.cxx \ - Plot2d_ViewFrame.cxx \ - Plot2d_ViewManager.cxx \ - Plot2d_ViewModel.cxx \ - Plot2d_ViewWindow.cxx \ - Plot2d_SetupCurveDlg.cxx \ - Plot2d_ToolTip.cxx - -LIB_MOC = \ - Plot2d_FitDataDlg.h \ - Plot2d_SetupViewDlg.h \ - Plot2d_ViewFrame.h \ - Plot2d_ViewManager.h \ - Plot2d_ViewModel.h \ - Plot2d_ViewWindow.h \ - Plot2d_SetupCurveDlg.h \ - Plot2d_ToolTip.h - -RESOURCES_FILES = \ -plot2d_clone.png \ -plot2d_camera_dump.png \ -plot2d_fitall.png \ -plot2d_fitarea.png \ -plot2d_glpan.png \ -plot2d_legend.png \ -plot2d_linear.png \ -plot2d_linear_y.png \ -plot2d_lines.png \ -plot2d_log.png \ -plot2d_log_y.png \ -plot2d_pan.png \ -plot2d_points.png \ -plot2d_settings.png \ -plot2d_splines.png \ -plot2d_zoom.png - -CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) - -LDFLAGS+=$(QWT_LIBS) $(QT_MT_LIBS) -lsuit - -@CONCLUDE@ - - diff --git a/src/Plot2d/resources/plot2d_rotate.png b/src/Plot2d/resources/plot2d_rotate.png deleted file mode 100755 index 80926c5451f9a45ebd27cdf18888f483d797e739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 511 zcmVDGCWSsE#LQ@Z^Sznh8;9{<=)kqb9)3T>pEu_l_bNgM zF1*b$b*#=-tj<*$Gl>z1@}prmCi@hC%zQs#e?;)}PVk z>C+jm(`Pu{t7YrV>0a&r*F8SY`EtxbD60s0Qrxc<$~yff#A_=*44mV zj}qYK+YJDR>VUimaH3KSEEqoevu<=26A@-ILlPMh#)`4p^YNV4yAgP6;;3!Eg z*Q7XNcoAXl=lImevP?#V04VMX9-kiBx@|}36y3zSP2}HmEB}-{KRt8#;SzwWk5`dy zxme=8=i=Q(1RB{5Gd7OAgfmfcc`kcOeG0 z2?x}^BQczaAgM4*XOm*1DLZfj!mtI2#5AWa+rP`@-yqS`CtUyl002ovPDHLkV1oV= B^929^ diff --git a/src/Prs/Makefile.in b/src/Prs/Makefile.am similarity index 73% rename from src/Prs/Makefile.in rename to src/Prs/Makefile.am index 56c07d0b9..7f5d31a29 100755 --- a/src/Prs/Makefile.in +++ b/src/Prs/Makefile.am @@ -16,30 +16,11 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +lib_LTLIBRARIES = libSalomePrs.la -EXPORT_HEADERS = SALOME_Prs.h +salomeinclude_HEADERS = SALOME_Prs.h -# Libraries targets - -LIB = libSalomePrs.la -LIB_SRC = SALOME_Prs.cxx - -LIB_CLIENT_IDL = - -# Executables targets -BIN = -BIN_SRC = - -CPPFLAGS+= -LDFLAGS+= - - -@CONCLUDE@ +dist_libSalomePrs_la_SOURCES = SALOME_Prs.cxx diff --git a/src/PyInterp/Makefile.in b/src/PyInterp/Makefile.am similarity index 68% rename from src/PyInterp/Makefile.in rename to src/PyInterp/Makefile.am index d9af0dc9c..9a783f209 100755 --- a/src/PyInterp/Makefile.in +++ b/src/PyInterp/Makefile.am @@ -23,29 +23,21 @@ # File : Makefile.in # Module : SALOME -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am +lib_LTLIBRARIES = libPyInterp.la -@COMMENCE@ +salomeinclude_HEADERS= \ + PyInterp.h \ + PyInterp_base.h \ + PyInterp_Dispatcher.h -# header files -EXPORT_HEADERS= PyInterp.h \ - PyInterp_base.h \ - PyInterp_Dispatcher.h - -# Libraries targets -LIB = libPyInterp.la +dist_libPyInterp_la_SOURCES= \ + PyInterp_base.cxx \ + PyInterp_Dispatcher.cxx -LIB_SRC= PyInterp_base.cxx \ - PyInterp_Dispatcher.cxx +MOC_FILES= PyInterp_Watcher_moc.cxx +nodist_libPyInterp_la_SOURCES= $(MOC_FILES) -LIB_MOC = PyInterp_Watcher.h - -CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_INCLUDES) - -LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) - -@CONCLUDE@ +libPyInterp_la_CPPFLAGS= $(PYTHON_INCLUDES) $(QT_INCLUDES) +libPyInterp_la_LDFLAGS= $(PYTHON_LIBS) $(QT_MT_LIBS) diff --git a/src/PythonConsole/Makefile.in b/src/PythonConsole/Makefile.am similarity index 60% rename from src/PythonConsole/Makefile.in rename to src/PythonConsole/Makefile.am index 692b54b3b..8884cfa45 100755 --- a/src/PythonConsole/Makefile.in +++ b/src/PythonConsole/Makefile.am @@ -21,35 +21,30 @@ # Module : PythonConsole # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am +lib_LTLIBRARIES = libPythonConsole.la -@COMMENCE@ - -# header files -EXPORT_HEADERS= PythonConsole.h \ - PythonConsole_PyConsole.h \ - PythonConsole_PyEditor.h \ - PythonConsole_PyInterp.h - -# Libraries targets -LIB = libPythonConsole.la +salomeinclude_HEADERS= \ + PythonConsole.h \ + PythonConsole_PyConsole.h \ + PythonConsole_PyEditor.h \ + PythonConsole_PyInterp.h -LIB_SRC= PythonConsole_PyConsole.cxx \ - PythonConsole_PyEditor.cxx \ - PythonConsole_PyInterp.cxx +dist_libPythonConsole_la_SOURCES= \ + PythonConsole_PyConsole.cxx \ + PythonConsole_PyEditor.cxx \ + PythonConsole_PyInterp.cxx -LIB_MOC = \ - PythonConsole_PyEditor.h \ - PythonConsole_PyConsole.h +MOC_FILES= \ + PythonConsole_PyEditor_moc.cxx \ + PythonConsole_PyConsole_moc.cxx +nodist_libPythonConsole_la_SOURCES= $(MOC_FILES) -CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_INCLUDES) -LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) +libPythonConsole_la_CPPFLAGS= $(PYTHON_INCLUDES) $(QT_INCLUDES) \ + -I$(srcdir)/../PyInterp -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx -@CONCLUDE@ +libPythonConsole_la_LDFLAGS= $(PYTHON_LIBS) $(QT_MT_LIBS) diff --git a/src/QDS/Makefile.in b/src/QDS/Makefile.am similarity index 64% rename from src/QDS/Makefile.in rename to src/QDS/Makefile.am index 290054d45..03513ac3c 100755 --- a/src/QDS/Makefile.in +++ b/src/QDS/Makefile.am @@ -21,15 +21,12 @@ # Module : QDS # $Header: /home/server/cvs/GUI/GUI_SRC/src/QDS/Makefile.in -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +lib_LTLIBRARIES = libQDS.la # header files -EXPORT_HEADERS= QDS.h \ +salomeinclude_HEADERS= QDS.h \ QDS_CheckBox.h \ QDS_ComboBox.h \ QDS_Datum.h \ @@ -38,11 +35,9 @@ EXPORT_HEADERS= QDS.h \ QDS_SpinBoxDbl.h \ QDS_TextEdit.h \ QDS_Validator.h - -# Libraries targets -LIB = libQDS.la -LIB_SRC= QDS.cxx \ +dist_libQDS_la_SOURCES= \ + QDS.cxx \ QDS_CheckBox.cxx \ QDS_ComboBox.cxx \ QDS_Datum.cxx \ @@ -52,18 +47,22 @@ LIB_SRC= QDS.cxx \ QDS_TextEdit.cxx \ QDS_Validator.cxx -LIB_MOC = QDS_CheckBox.h \ - QDS_ComboBox.h \ - QDS_Datum.h \ - QDS_LineEdit.h \ - QDS_SpinBox.h \ - QDS_SpinBoxDbl.h \ - QDS_TextEdit.h - -CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) +MOC_FILES= \ + QDS_CheckBox_moc.cxx \ + QDS_ComboBox_moc.cxx \ + QDS_Datum_moc.cxx \ + QDS_LineEdit_moc.cxx \ + QDS_SpinBox_moc.cxx \ + QDS_SpinBoxDbl_moc.cxx \ + QDS_TextEdit_moc.cxx +nodist_libQDS_la_SOURCES= $(MOC_FILES) -LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) -lDDS -lqtx +# may be neccessary for the external projects or future improvements +EXTRA_DIST+= QDS_RadioBox.cxx QDS_RadioBox.h resources/QDS_msg_en.po -@CONCLUDE@ +libQDS_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) \ + -I$(srcdir)/../Qtx -I$(srcdir)/../DDS +libQDS_la_LDFLAGS=$(QT_MT_LIBS) $(CAS_KERNEL) +libQDS_la_LIBADD=../DDS/libDDS.la ../Qtx/libqtx.la diff --git a/src/Qtx/Makefile.am b/src/Qtx/Makefile.am new file mode 100755 index 000000000..b71936b9a --- /dev/null +++ b/src/Qtx/Makefile.am @@ -0,0 +1,150 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Vladimir Klyachin (OCN) +# Module : suit +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files + +salomeinclude_HEADERS= Qtx.h \ + QtxAction.h \ + QtxColorScale.h \ + QtxComboBox.h \ + QtxDblSpinBox.h \ + QtxDialog.h \ + QtxDockAction.h \ + QtxDockWindow.h \ + QtxGroupBox.h \ + QtxIntSpinBox.h \ + QtxListAction.h \ + QtxListBox.h \ + QtxListOfOperations.h \ + QtxLogoMgr.h \ + QtxMenuButton.h \ + QtxMRUAction.h \ + QtxOperations.h \ + QtxPathDialog.h \ + QtxPopupMgr.h \ + QtxResourceMgr.h \ + QtxStdOperations.h \ + QtxTable.h \ + QtxToolBar.h \ + QtxToolTip.h \ + QtxParser.h \ + QtxPopupMenu.h \ + QtxActionMgr.h \ + QtxActionMenuMgr.h \ + QtxActionToolMgr.h \ + QtxMainWindow.h \ + QtxWorkspaceAction.h \ + QtxWorkstackAction.h \ + QtxListResourceEdit.h \ + QtxWorkstack.h \ + QtxResourceEdit.h \ + QtxListView.h \ + QtxDirListEditor.h \ + QtxDblValidator.h \ + QtxSplash.h + +# Libraries targets + +lib_LTLIBRARIES= libqtx.la + +dist_libqtx_la_SOURCES= \ + Qtx.cxx \ + QtxAction.cxx \ + QtxColorScale.cxx \ + QtxComboBox.cxx \ + QtxDblSpinBox.cxx \ + QtxDialog.cxx \ + QtxDockAction.cxx \ + QtxDockWindow.cxx \ + QtxGroupBox.cxx \ + QtxIntSpinBox.cxx \ + QtxListAction.cxx \ + QtxListBox.cxx \ + QtxListOfOperations.cxx \ + QtxLogoMgr.cxx \ + QtxMenuButton.cxx \ + QtxMRUAction.cxx \ + QtxPathDialog.cxx \ + QtxPopupMgr.cxx \ + QtxResourceMgr.cxx \ + QtxStdOperations.cxx \ + QtxTable.cxx \ + QtxToolBar.cxx \ + QtxToolTip.cxx \ + QtxOperations.cxx \ + QtxParser.cxx \ + QtxPopupMenu.cxx \ + QtxActionMgr.cxx \ + QtxActionMenuMgr.cxx \ + QtxActionToolMgr.cxx \ + QtxMainWindow.cxx \ + QtxWorkspaceAction.cxx \ + QtxWorkstackAction.cxx \ + QtxListResourceEdit.cxx \ + QtxResourceEdit.cxx \ + QtxWorkstack.cxx \ + QtxListView.cxx \ + QtxDirListEditor.cxx \ + QtxDblValidator.cxx \ + QtxSplash.cxx + +MOC_FILES= \ + QtxAction_moc.cxx \ + QtxColorScale_moc.cxx \ + QtxComboBox_moc.cxx \ + QtxDblSpinBox_moc.cxx \ + QtxDialog_moc.cxx \ + QtxDockAction_moc.cxx \ + QtxDockWindow_moc.cxx \ + QtxGroupBox_moc.cxx \ + QtxIntSpinBox_moc.cxx \ + QtxListAction_moc.cxx \ + QtxListBox_moc.cxx \ + QtxLogoMgr_moc.cxx \ + QtxMenuButton_moc.cxx \ + QtxMRUAction_moc.cxx \ + QtxPathDialog_moc.cxx \ + QtxPopupMgr_moc.cxx \ + QtxPopupMenu_moc.cxx \ + QtxTable_moc.cxx \ + QtxToolBar_moc.cxx \ + QtxToolTip_moc.cxx \ + QtxActionMgr_moc.cxx \ + QtxActionMenuMgr_moc.cxx \ + QtxActionToolMgr_moc.cxx \ + QtxMainWindow_moc.cxx \ + QtxWorkspaceAction_moc.cxx \ + QtxWorkstackAction_moc.cxx \ + QtxWorkstack_moc.cxx \ + QtxListView_moc.cxx \ + QtxListResourceEdit_moc.cxx \ + QtxDirListEditor_moc.cxx \ + QtxDblValidator_moc.cxx \ + QtxSplash_moc.cxx +nodist_libqtx_la_SOURCES= $(MOC_FILES) + +libqtx_la_CPPFLAGS=$(QT_INCLUDES) + +libqtx_la_LDFLAGS=$(QT_MT_LIBS) diff --git a/src/Qtx/Makefile.in b/src/Qtx/Makefile.in deleted file mode 100755 index ea5bccbc6..000000000 --- a/src/Qtx/Makefile.in +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vladimir Klyachin (OCN) -# Module : suit -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ - -VPATH=.:@srcdir@:@srcdir@/resources - -@COMMENCE@ - -# header files - -EXPORT_HEADERS= Qtx.h \ - QtxAction.h \ - QtxColorScale.h \ - QtxComboBox.h \ - QtxDblSpinBox.h \ - QtxDialog.h \ - QtxDockAction.h \ - QtxDockWindow.h \ - QtxGroupBox.h \ - QtxIntSpinBox.h \ - QtxListAction.h \ - QtxListBox.h \ - QtxListOfOperations.h \ - QtxLogoMgr.h \ - QtxMenuButton.h \ - QtxMRUAction.h \ - QtxOperations.h \ - QtxPathDialog.h \ - QtxPopupMgr.h \ - QtxResourceMgr.h \ - QtxStdOperations.h \ - QtxTable.h \ - QtxToolBar.h \ - QtxToolTip.h \ - QtxParser.h \ - QtxPopupMenu.h \ - QtxActionMgr.h \ - QtxActionMenuMgr.h \ - QtxActionToolMgr.h \ - QtxMainWindow.h \ - QtxWorkspaceAction.h \ - QtxWorkstackAction.h \ - QtxListResourceEdit.h \ - QtxWorkstack.h \ - QtxResourceEdit.h \ - QtxListView.h \ - QtxDirListEditor.h \ - QtxDblValidator.h \ - QtxSplash.h - -# .po files to transform in .qm - -PO_FILES = \ - -# Libraries targets - -LIB = libqtx.la - -LIB_SRC= \ - Qtx.cxx \ - QtxAction.cxx \ - QtxColorScale.cxx \ - QtxComboBox.cxx \ - QtxDblSpinBox.cxx \ - QtxDialog.cxx \ - QtxDockAction.cxx \ - QtxDockWindow.cxx \ - QtxGroupBox.cxx \ - QtxIntSpinBox.cxx \ - QtxListAction.cxx \ - QtxListBox.cxx \ - QtxListOfOperations.cxx \ - QtxLogoMgr.cxx \ - QtxMenuButton.cxx \ - QtxMRUAction.cxx \ - QtxPathDialog.cxx \ - QtxPopupMgr.cxx \ - QtxResourceMgr.cxx \ - QtxStdOperations.cxx \ - QtxTable.cxx \ - QtxToolBar.cxx \ - QtxToolTip.cxx \ - QtxOperations.cxx \ - QtxParser.cxx \ - QtxPopupMenu.cxx \ - QtxActionMgr.cxx \ - QtxActionMenuMgr.cxx \ - QtxActionToolMgr.cxx \ - QtxMainWindow.cxx \ - QtxWorkspaceAction.cxx \ - QtxWorkstackAction.cxx \ - QtxListResourceEdit.cxx \ - QtxResourceEdit.cxx \ - QtxWorkstack.cxx \ - QtxListView.cxx \ - QtxDirListEditor.cxx \ - QtxDblValidator.cxx \ - QtxSplash.cxx - -LIB_MOC = \ - QtxAction.h \ - QtxColorScale.h \ - QtxComboBox.h \ - QtxDblSpinBox.h \ - QtxDialog.h \ - QtxDockAction.h \ - QtxDockWindow.h \ - QtxGroupBox.h \ - QtxIntSpinBox.h \ - QtxListAction.h \ - QtxListBox.h \ - QtxLogoMgr.h \ - QtxMenuButton.h \ - QtxMRUAction.h \ - QtxPathDialog.h \ - QtxPopupMgr.h \ - QtxPopupMenu.h \ - QtxTable.h \ - QtxToolBar.h \ - QtxToolTip.h \ - QtxActionMgr.h \ - QtxActionMenuMgr.h \ - QtxActionToolMgr.h \ - QtxMainWindow.h \ - QtxWorkspaceAction.h \ - QtxWorkstackAction.h \ - QtxWorkstack.h \ - QtxListView.h \ - QtxListResourceEdit.h \ - QtxDirListEditor.h \ - QtxDblValidator.h \ - QtxSplash.h - -RESOURCES_FILES = \ - -CPPFLAGS+=$(QT_INCLUDES) - -LDFLAGS+=$(QT_MT_LIBS) - -@CONCLUDE@ - - diff --git a/src/RegistryDisplay/Makefile.in b/src/RegistryDisplay/Makefile.am similarity index 63% rename from src/RegistryDisplay/Makefile.in rename to src/RegistryDisplay/Makefile.am index 46b60c25a..2034b5001 100755 --- a/src/RegistryDisplay/Makefile.in +++ b/src/RegistryDisplay/Makefile.am @@ -26,34 +26,24 @@ # Module : SALOME # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +lib_LTLIBRARIES = libRegistryDisplay.la -EXPORT_PYSCRIPTS = +salomeinclude_HEADERS= \ + HelpWindow.hxx \ + IntervalWindow.hxx \ + RegWidget.h -EXPORT_HEADERS= HelpWindow.hxx \ - IntervalWindow.hxx \ - RegWidget.h +dist_libRegistryDisplay_la_SOURCES= \ + HelpWindow.cxx \ + RegWidget.cxx \ + RegWidgetFactory.cxx \ + IntervalWindow.cxx -# Libraries targets +MOC_FILES = RegWidget_moc.cxx +nodist_libRegistryDisplay_la_SOURCES= $(MOC_FILES) -LIB = libRegistryDisplay.la - -LIB_SRC = HelpWindow.cxx \ - RegWidget.cxx \ - RegWidgetFactory.cxx \ - IntervalWindow.cxx - -LIB_MOC = RegWidget.h - -LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl - -CPPFLAGS+=$(QT_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS+=$(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil - - -@CONCLUDE@ +libRegistryDisplay_la_CPPFLAGS=$(QT_INCLUDES) @KERNEL_CXXFLAGS@ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@\ + -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl +libRegistryDisplay_la_LDFLAGS=$(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil -lSalomeIDLKernel diff --git a/src/ResExporter/Makefile.in b/src/ResExporter/Makefile.am similarity index 74% rename from src/ResExporter/Makefile.in rename to src/ResExporter/Makefile.am index e1838e26d..bc9d55ece 100755 --- a/src/ResExporter/Makefile.in +++ b/src/ResExporter/Makefile.am @@ -21,28 +21,13 @@ # Module : SalomeApp # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - - -BIN = ResourceExporter -BIN_SRC = - -CPPFLAGS += $(QT_INCLUDES) - -LDFLAGS += $(QT_MT_LIBS) -LIBS += -lsuit -lqtx - -LDFLAGSFORBIN = ${LDFLAGS} -LIBSFORBIN = $(LIBS) -@CONCLUDE@ - +include $(top_srcdir)/adm_local/unix/make_common_starter.am +bin_PROGRAMS= ResourceExporter +dist_ResourceExporter_SOURCES=ResourceExporter.cxx +ResourceExporter_CPPFLAGS= $(QT_INCLUDES) -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT +ResourceExporter_LDFLAGS= $(QT_MT_LIBS) +ResourceExporter_LDADD= ../SUIT/libsuit.la ../Qtx/libqtx.la diff --git a/src/SALOME_PYQT/Makefile.in b/src/SALOME_PYQT/Makefile.am similarity index 88% rename from src/SALOME_PYQT/Makefile.in rename to src/SALOME_PYQT/Makefile.am index f3b93eac7..a96896abb 100755 --- a/src/SALOME_PYQT/Makefile.in +++ b/src/SALOME_PYQT/Makefile.am @@ -24,14 +24,6 @@ # Module : SALOME # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -SUBDIRS = SALOME_PYQT_GUI SalomePyQt - -@MODULE@ +SUBDIRS = SALOME_PYQT_GUI SalomePyQt diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am similarity index 55% rename from src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in rename to src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am index 41276e5dc..9b263f281 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am @@ -20,66 +20,58 @@ # Author : Nicolas REJNERI # Module : SALOME -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # small trick for Mandrake-10.1: PyQt 3.13 does not support Qt 3.3.3 -ifeq ($(QT_VERS),Qt_3_3_3) -QT_VERS = Qt_3_3_0 +# Sip flags +if IS_QT_3_0_0 +SIP_FLAGS = -t WS_X11 -t Qt_3_0_0 $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) +else !IS_QT_3_0_0 +SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) endif -ifeq ($(QT_VERS),Qt_3_3_4) -QT_VERS = Qt_3_3_0 -endif -# Sip flags -SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) +###################### + +# Library target +lib_LTLIBRARIES= libSalomePyQtGUI.la + # Sip sources -ifeq ($(SIP_VERS),v4_old) +if IS_SIP_V4 SIP_SRC = sipSalomePyQtGUIcmodule.cc SIP_FILES = SALOME_PYQT_GUI.sip -else -ifeq ($(SIP_VERS),v4_new) -SIP_SRC = sipSalomePyQtGUIcmodule.cc -SIP_FILES = SALOME_PYQT_GUI.sip -else +else !IS_SIP_V4 SIP_SRC = SalomePyQtGUIcmodule.cc SIP_FILES = SALOME_PYQT_GUI.sip endif -endif -###################### +EXTRA_DIST+= $(SIP_FILES) -# headers -EXPORT_HEADERS = SALOME_PYQT_GUI.h \ - SALOME_PYQT_PyInterp.h \ - SALOME_PYQT_Module.h +salomeinclude_HEADERS = \ + SALOME_PYQT_GUI.h \ + SALOME_PYQT_PyInterp.h \ + SALOME_PYQT_Module.h -# Library target -LIB = libSalomePyQtGUI.la +dist_libSalomePyQtGUI_la_SOURCES= \ + SALOME_PYQT_PyInterp.cxx \ + SALOME_PYQT_Module.cxx -# library sources -LIB_SRC = SALOME_PYQT_PyInterp.cxx \ - SALOME_PYQT_Module.cxx \ - $(SIP_SRC) +dist_libSalomePyQtGUI_la_SOURCES: $(SIP_SRC) # moc pre-processing -LIB_MOC = SALOME_PYQT_Module.h - -LIB_CLIENT_IDL = SALOME_Exception.idl \ - SALOME_GenericObj.idl \ - SALOME_ContainerManager.idl \ - SALOME_Component.idl - -CPPFLAGS += $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H $(KERNEL_CXXFLAGS) -D__CALL_OLD_METHODS__ - -LIBS += $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -LDFLAGS += -lPyInterp -lSalomeApp +MOC_FILES= SALOME_PYQT_Module_moc.cxx +nodist_libSalomePyQtGUI_la_SOURCES= $(MOC_FILES) $(SIP_SRC) + +libSalomePyQtGUI_la_CPPFLAGS= $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \ + $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \ + -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -D__CALL_OLD_METHODS__ \ + -I$(srcdir)/../../PyInterp -I$(srcdir)/../../SalomeApp \ + -I$(srcdir)/../../SUIT -I$(srcdir)/../../Qtx -I$(srcdir)/../../LightApp \ + -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../CAM -I$(srcdir)/../../STD \ + -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ +libSalomePyQtGUI_la_LIBADD= $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) \ + $(OGL_LIBS) ../../PyInterp/libPyInterp.la ../../SalomeApp/libSalomeApp.la ################################## @@ -88,9 +80,4 @@ LDFLAGS += -lPyInterp -lSalomeApp $(SIP_SRC): $(SIP_FILES) $(SIP) $(SIP_FLAGS) $< -$(MOC_SRC): $(MOC_H) - $(MOC) $< -o $@ - ################################### - -@CONCLUDE@ diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.am b/src/SALOME_PYQT/SalomePyQt/Makefile.am new file mode 100644 index 000000000..7ea455c6a --- /dev/null +++ b/src/SALOME_PYQT/SalomePyQt/Makefile.am @@ -0,0 +1,127 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Nicolas REJNERI +# Module : SALOME + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# small trick for Mandrake-10.1: PyQt 3.13 does not support Qt 3.3.3 +# Sip flags +if IS_QT_3_0_0 +SIP_FLAGS = -t WS_X11 -t Qt_3_0_0 $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) +else !IS_QT_3_0_0 +SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) +endif + +# Sip common sources +SIP_SRC = sipSalomePyQtSalomePyQt.cc \ + sipSalomePyQtSALOME_Selection.cc \ + sipSalomePyQtQtxAction.cc + +# Sip version-specific sources +if IS_SIP_V4 +SIP_SRC += sipSalomePyQtcmodule.cc +else !IS_SIP_V4 +SIP_SRC += SalomePyQtcmodule.cc +endif + +# Sip/moc sources and Sip definition files +if IS_SIP_V4 +if IS_SIP_NEW +MOC_SRC = +MOC_H = +SIP_FILES = SalomePyQt_v4.sip +else !IS_SIP_NEW +MOC_SRC = sipSalomePyQtcmodule_moc.cxx +MOC_H = sipSalomePyQtcmodule.h +SIP_FILES = SalomePyQt_v4.sip +endif +else !IS_SIP_V4 +SIP_FILES = SalomePyQt.sip +if IS_SIP_NEW +MOC_SRC = SalomePyQtcmodule_moc.cxx +MOC_H = SalomePyQtcmodule.h +else !IS_SIP_NEW +MOC_SRC = sipSalomePyQtProxySalomePyQt_moc.cxx +MOC_H = sipSalomePyQtProxySalomePyQt.h +endif +endif + +EXTRA_DIST+= SalomePyQt.sip SalomePyQt_v4.sip + +# Libraries targets +MOC_FILES= SalomePyQt_moc.cxx + +COMMON_CPP_FLAGS=$(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \ + $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \ + -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -I$(top_builddir)/salomeadn/unix \ + -I$(top_builddir)/idl \ + -I$(srcdir)/../../SUIT -I$(srcdir)/../../CAM -I$(srcdir)/../../STD \ + -I$(srcdir)/../../Qtx -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../Event \ + -I$(srcdir)/../../SalomeSession -I$(srcdir)/../../LogWindow \ + -I$(srcdir)/../../VTKViewer -I$(srcdir)/../../TOOLSGUI \ + -I$(srcdir)/../SALOME_PYQT_GUI -I$(srcdir)/../../PyInterp \ + -I$(srcdir)/../../LightApp -I$(srcdir)/../../ObjBrowser \ + -I$(srcdir)/../../OBJECT \ + -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +COMMON_LIBS=$(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) \ + $(OGL_LIBS) ../../SUIT/libsuit.la ../../CAM/libCAM.la ../../STD/libstd.la \ + ../../Qtx/libqtx.la ../../SalomeApp/libSalomeApp.la ../../Event/libEvent.la \ + ../../Session/libSalomeSession.la ../../LogWindow/libLogWindow.la \ + ../../VTKViewer/libVTKViewer.la ../../TOOLSGUI/libToolsGUI.la \ + ../SALOME_PYQT_GUI/libSalomePyQtGUI.la + +if IS_SIP_V4 + +lib_LTLIBRARIES = libSalomePyQt.la +dist_libSalomePyQt_la_SOURCES= SalomePyQt.cxx +nodist_libSalomePyQt_la_SOURCES= $(MOC_FILES) $(SIP_SRC) $(MOC_SRC) +libSalomePyQt_la_CPPFLAGS = $(COMMON_CPP_FLAGS) +libSalomePyQt_la_LIBADD = $(COMMON_LIBS) + +else !IS_SIP_V4 + +lib_LTLIBRARIES = libSalomePyQtcmodule.la +dist_libSalomePyQtcmodule_la_SOURCES= SalomePyQt.cxx +nodist_libSalomePyQtcmodule_la_SOURCES= $(MOC_FILES) $(SIP_SRC) $(MOC_SRC) +libSalomePyQtcmodule_la_CPPFLAGS = $(MY_CPP_FLAGS) +libSalomePyQtcmodule_la_LIBADD = $(COMMON_LIBS) + +endif + +if IS_SIP_V4 +else +nodist_sharedpkgpython_PYTHON= SalomePyQt.py +endif + +# Custom build step: generate C++ wrapping according to $(SIP_FILES) +$(SIP_SRC): $(SIP_FILES) + $(SIP) $(SIP_FLAGS) $< + +if IS_SIP_V4 +install-exec-hook: $(libdir)/SalomePyQt.so +$(libdir)/SalomePyQt.so: + ln -s $(libdir)/libSalomePyQt.so $@ +else !IS_SIP_V4 +install-exec-hook: $(libdir)/SalomePyQtcmodule.so +$(libdir)/SalomePyQt.so: + ln -sf $(libdir)/libSalomePyQtcmodule.so $@ +endif diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.in b/src/SALOME_PYQT/SalomePyQt/Makefile.in deleted file mode 100644 index 31a845634..000000000 --- a/src/SALOME_PYQT/SalomePyQt/Makefile.in +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Nicolas REJNERI -# Module : SALOME - -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# small trick for Mandrake-10.1: PyQt 3.13 does not support Qt 3.3.3 -ifeq ($(QT_VERS),Qt_3_3_3) -QT_VERS = Qt_3_3_0 -endif -ifeq ($(QT_VERS),Qt_3_3_4) -QT_VERS = Qt_3_3_0 -endif - -# Sip flags -SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) - -# Sip common sources -SIP_SRC = sipSalomePyQtSalomePyQt.cc \ - sipSalomePyQtSALOME_Selection.cc \ - sipSalomePyQtQtxAction.cc - -# Sip version-specific sources -ifeq ($(SIP_VERS),v4_old) -SIP_SRC += sipSalomePyQtcmodule.cc -else -ifeq ($(SIP_VERS),v4_new) -SIP_SRC += sipSalomePyQtcmodule.cc -else -SIP_SRC += SalomePyQtcmodule.cc -endif -endif - -# Sip/moc sources -ifeq ($(SIP_VERS),v4_old) -MOC_SRC = sipSalomePyQtcmodule_moc.cxx -MOC_H = sipSalomePyQtcmodule.h -else -ifeq ($(SIP_VERS),v3_new) -MOC_SRC = SalomePyQtcmodule_moc.cxx -MOC_H = SalomePyQtcmodule.h -else -ifeq ($(SIP_VERS),v3_old) -MOC_SRC = sipSalomePyQtProxySalomePyQt_moc.cxx -MOC_H = sipSalomePyQtProxySalomePyQt.h -endif -endif -endif - -# Sip definition files -ifeq ($(SIP_VERS),v4_old) -SIP_FILES = SalomePyQt_v4.sip -else -ifeq ($(SIP_VERS),v4_new) -SIP_FILES = SalomePyQt_v4.sip -else -SIP_FILES = SalomePyQt.sip -endif -endif - -# Libraries targets -ifeq ($(SIP_VERS),v4_old) -LIB = SalomePyQt.so -else -ifeq ($(SIP_VERS),v4_new) -LIB = SalomePyQt.so -else -LIB = libSalomePyQtcmodule.la -endif -endif - -# Exported python scripts -ifeq ($(SIP_VERS),v3_old) -EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py -else -ifeq ($(SIP_VERS),v3_new) -EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py -endif -endif - -# Library sources -LIB_SRC = SalomePyQt.cxx \ - $(SIP_SRC) \ - $(MOC_SRC) - -# Library moc sources -LIB_MOC = SalomePyQt.h - -# Client IDL -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl - -# Compilation/linkage flags -CPPFLAGS += $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H $(KERNEL_CXXFLAGS) -LIBS += $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -LDFLAGS += -lsuit -lCAM -lstd -lqtx -lSalomeApp -lSalomeSession -lEvent -lLogWindow -lVTKViewer -lToolsGUI -lSalomePyQtGUI - - -# Custom build step: generate C++ wrapping according to $(SIP_FILES) -$(SIP_SRC): $(SIP_FILES) - $(SIP) $(SIP_FLAGS) $< - -$(MOC_SRC): $(MOC_H) - $(MOC) $< -o $@ - -@CONCLUDE@ diff --git a/src/SALOME_SWIG/Makefile.am b/src/SALOME_SWIG/Makefile.am new file mode 100755 index 000000000..38ef1c9ee --- /dev/null +++ b/src/SALOME_SWIG/Makefile.am @@ -0,0 +1,114 @@ +# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : Paul RASCLE, EDF +# Module : SALOME +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# =============================================================== +# Swig targets +# =============================================================== +# (cf. http://www.geocities.com/foetsch/python/swig_linux.htm) +# +# Step 1: build the wrapping source files with swig +# +# libSALOME_LifeCycleCORBA.i -- swig --> swig_wrap.cpp +# libSALOME_Swig.py +# +# Step 2: build the dynamic library from cpp built source files and +# dependant libraries. +# +# swig_wrap.cpp -- gcc --> swig_wrap.o |-- link --> _libSALOME_Swig.la +# + | +# dependant libs | +# +# The file libSALOME_Swigcmodule.py will be installed in +# /lib/python/site-package/salome. +# The library will be installed in the same place. +# + +# this option puts it to dist +#BUILT_SOURCES = swig_wrap.cpp + +SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) +SWIG_SOURCES = libSALOME_Swig.i + +nodist_pkgpython_DATA = libSALOME_Swig.py +libSALOME_Swig.py: swig_wrap.cpp + +# library +lib_LTLIBRARIES = libSALOME_Swigcmodule.la +libSALOME_Swigcmodule_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) SALOMEGUI_Swig.cxx +salomeinclude_HEADERS= SALOMEGUI_Swig.hxx SALOMEGUI_Swig.i + +libSALOME_Swigcmodule_la_CPPFLAGS =\ + $(QT_INCLUDES) $(PYTHON_INCLUDES) $(CAS_CPPFLAGS) $(VTK_INCLUDES) \ + $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ \ + -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \ + -I$(srcdir)/../SalomeApp -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT \ + -I$(srcdir)/../ObjBrowser -I$(srcdir)/../LightApp -I$(srcdir)/../SOCC \ + -I$(srcdir)/../SVTK -I$(srcdir)/../Event -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../CAM -I$(srcdir)/../STD -I$(srcdir)/../OCCViewer \ + -I$(srcdir)/../Prs -I$(srcdir)/../VTKViewer \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +libSALOME_Swigcmodule_la_LDFLAGS = -module +libSALOME_Swigcmodule_la_LIBADD = \ + ../SalomeApp/libSalomeApp.la \ + @PYTHON_LIBS@ + +swig_wrap.cpp : $(SWIG_SOURCES) + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +CLEANFILES = swig_wrap.cpp + +# +# =============================================================== +# Files to be installed +# =============================================================== +# + +# Scripts to be installed. +dist_salomescript_DATA= \ + examplevtk1.py \ + test_table.py \ + test_big_table.py \ + test_many_objects.py \ + test_remove_ref.py \ + libSALOME_Swig.py + +nodist_salomescript_DATA= \ + supervisionexample.py \ + supervisiongeomexample.py + +EXTRA_DIST+= \ + supervisionexample.py.in \ + supervisiongeomexample.py.in + +sharedpkgpython_PYTHON= SALOMEGUI_shared_modules.py + +install-exec-hook: $(libdir)/_libSALOME_Swig.so + +$(libdir)/_libSALOME_Swig.so: + ln -sf $(libdir)/libSALOME_Swigcmodule.so $@ diff --git a/src/SALOME_SWIG/Makefile.in b/src/SALOME_SWIG/Makefile.in deleted file mode 100755 index 80cc9daf3..000000000 --- a/src/SALOME_SWIG/Makefile.in +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= SALOMEGUI_Swig.hxx \ - SALOMEGUI_Swig.i - -# Libraries targets - -LIB = libSALOME_Swigcmodule.la -LIB_SRC = SALOMEGUI_Swig.cxx - -LIB_CLIENT_IDL = SALOMEDS.idl \ - SALOME_Exception.idl \ - SALOME_GenericObj.idl - -SWIG_DEF = libSALOME_Swig.i -EXPORT_PYSCRIPTS = libSALOME_Swig.py examplevtk1.py supervisionexample.py supervisiongeomexample.py test_table.py test_big_table.py test_many_objects.py test_remove_ref.py - -EXPORT_SHAREDPYSCRIPTS=SALOMEGUI_shared_modules.py - -CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H $(KERNEL_CXXFLAGS) -LIBS+= $(PYTHON_LIBS) -LDFLAGS+= -lSalomeApp - -@CONCLUDE@ diff --git a/src/SALOME_SWIG/supervisionexample.py b/src/SALOME_SWIG/supervisionexample.py deleted file mode 100755 index 7e7591262..000000000 --- a/src/SALOME_SWIG/supervisionexample.py +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -#============================================================================== -# File : supervisionexample.py -# Created : 23 nov 2001 -# Author : Jean Rahuel -# Project : SALOME -# Copyright : CEA -#============================================================================== - -from SuperV import * - - - -# load this object with Nodes, Links and Datas stored in GraphEssai.xml -# (GraphEssai.xml was created with python in SuperVisionTest and GraphEssai.py) -myGraph = Graph("@ROOT_BUILDDIR@/share/salome/resources/superv/GraphEssai.xml") - -#myGraph = Graph("/home/data/jr_HEAD/build/share/salome/resources/superv/GraphEssai.xml") -# This DataFlow is "valid" : no loop, correct links between Nodes etc... - -print myGraph.IsValid() - -# Get Nodes -myGraph.PrintNodes() -Add,Sub,Mul,Div = myGraph.Nodes() - -# Load Datas -Addx = Add.Input("x",3.) -Addy = Add.Input("y",4.5) -Subx = Sub.Input("x",1.5) - -# Get Output Port -Addz = Add.Port('z') -Subz = Sub.Port('z') -Mulz = Mul.Port('z') -Divz = Div.Port('z') - -# This DataFlow is "executable" : all pending Ports are defined with Datas -print myGraph.IsExecutable() - -# Starts only execution of that DataFlow and gets control immediatly -print myGraph.Run() - -# That DataFlow is running ==> 0 (false) -print myGraph.IsDone() - -# Events of execution : -aStatus,aNode,anEvent,aState = myGraph.Event() -while aStatus : - print aNode.Thread(),aNode.SubGraph(),aNode.Name(),anEvent,aState - aStatus,aNode,anEvent,aState = myGraph.Event() -print myGraph.IsDone() - -# Wait for Completion (but it is already done after event loop ...) -print "Done : ",myGraph.DoneW() - -# Get result -print "Result : ",Divz.ToString() - -# Intermediate results : -print "Intermediate Result Add\z : ",Addz.ToString() -print "Intermediate Result Sub\z : ",Subz.ToString() -print "Intermediate Result Mul\z : ",Mulz.ToString() - -print " " -print "Type : print myGraph.IsDone()" -print " If execution is finished ==> 1 (true)" -print " " -print "Type : print Divz.ToString()" -print " You will get the result" -print " " -print "Type : myGraph.PrintPorts()" -print " to see input and output values of the graph" -print " " -print "Type : Add.PrintPorts()" -print "Type : Sub.PrintPorts()" -print "Type : Mul.PrintPorts()" -print "Type : Div.PrintPorts()" -print " to see input and output values of nodes" - -# Export will create newsupervisionexample.xml and the corresponding .py file -print myGraph.Export("@ROOT_BUILDDIR@/share/salome/resources/superv/newsupervisionexample.xml") - -print " " -print "See file @ROOT_BUILDDIR@/share/salome/resources/superv/newsupervisionexample.xml" -print "See file @ROOT_BUILDDIR@/share/salome/resources/superv/newsupervisionexample.py" diff --git a/src/SALOME_SWIG/supervisiongeomexample.py b/src/SALOME_SWIG/supervisiongeomexample.py deleted file mode 100755 index bf9e5b746..000000000 --- a/src/SALOME_SWIG/supervisiongeomexample.py +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# Generated python file of Graph GraphGeom2Essai - -from SuperV import * - -import salome - -import geompy - - -geom = lcc.FindOrLoadComponent("FactoryServer", "Geometry") -geom.GetCurrentStudy(salome.myStudyId) - -myBuilder = salome.myStudy.NewBuilder() - -# Graph creation -GraphGeom2Essai = Graph( 'GraphGeom2Essai' ) -print GraphGeom2Essai.SetAuthor( '' ) -print GraphGeom2Essai.SetComment( '' ) -GraphGeom2Essai.Coords( 0 , 0 ) - -# Creation of Nodes -MakeSphere = GraphGeom2Essai.Node( 'Geometry' , 'Geometry' , 'MakeSphere' ) -print MakeSphere.SetAuthor( '' ) -print MakeSphere.SetContainer( 'FactoryServer' ) -print MakeSphere.SetComment( '' ) -MakeSphere.Coords( 26 , 13 ) -MakeCopy = GraphGeom2Essai.Node( 'Geometry' , 'Geometry' , 'MakeCopy' ) -print MakeCopy.SetAuthor( '' ) -print MakeCopy.SetContainer( 'FactoryServer' ) -print MakeCopy.SetComment( '' ) -MakeCopy.Coords( 219 , 12 ) -MakeTranslation = GraphGeom2Essai.Node( 'Geometry' , 'Geometry' , 'MakeTranslation' ) -print MakeTranslation.SetAuthor( '' ) -print MakeTranslation.SetContainer( 'FactoryServer' ) -print MakeTranslation.SetComment( '' ) -MakeTranslation.Coords( 219 , 159 ) -MakeFuse = GraphGeom2Essai.Node( 'Geometry' , 'Geometry' , 'MakeFuse' ) -print MakeFuse.SetAuthor( '' ) -print MakeFuse.SetContainer( 'FactoryServer' ) -print MakeFuse.SetComment( '' ) -MakeFuse.Coords( 465 , 106 ) - -# Creation of intermediate Output variables and of links -MakeSphereshape = MakeSphere.Port( 'shape' ) -MakeCopyshape1 = GraphGeom2Essai.Link( MakeSphereshape , MakeCopy.Port( 'shape1' ) ) -MakeTranslationshape1 = GraphGeom2Essai.Link( MakeSphereshape , MakeTranslation.Port( 'shape1' ) ) -MakeCopyshape = MakeCopy.Port( 'shape' ) -MakeFuseshape1 = GraphGeom2Essai.Link( MakeCopyshape , MakeFuse.Port( 'shape1' ) ) -MakeTranslationshape = MakeTranslation.Port( 'shape' ) -MakeFuseshape2 = GraphGeom2Essai.Link( MakeTranslationshape , MakeFuse.Port( 'shape2' ) ) - -# Creation of Input datas -MakeSpherex1 = MakeSphere.Input( 'x1' , 0) -MakeSpherey1 = MakeSphere.Input( 'y1' , 0) -MakeSpherez1 = MakeSphere.Input( 'z1' , 0) -MakeSphereradius = MakeSphere.Input( 'radius' , 50) -MakeTranslationx1 = MakeTranslation.Input( 'x1' , 80) -MakeTranslationy1 = MakeTranslation.Input( 'y1' , 0) -MakeTranslationz1 = MakeTranslation.Input( 'z1' , 0) - -# Missing Input datas : None - -# Creation of Output variables -MakeFuseshape = MakeFuse.Port( 'shape' ) - -# State of Ports of the Graph -GraphGeom2Essai.PrintPorts() - -# Start asynchronous run -print GraphGeom2Essai.Run() - -# Done ? -print GraphGeom2Essai.IsDone() - -# Events of execution : -aStatus,aNode,anEvent,aState = GraphGeom2Essai.Event() -while aStatus : - print aNode.Thread(),aNode.SubGraph(),aNode.Name(),anEvent,aState - aStatus,aNode,anEvent,aState = GraphGeom2Essai.Event() -print GraphGeom2Essai.IsDone() - -# Waiting end of execution : -print GraphGeom2Essai.DoneW() - -print " " -print "Type print GraphGeom2Essai.IsDone()" -print "1 <==> It's done" -print " " -print "Type print GraphGeom2Essai.DoneW()" -print "Wait until end of execution : 1(success)" -print " " -print "Type GraphGeom2Essai.PrintPorts()" -print " to see input and output values of the graph" -print " " -print "Type MakeSphere.PrintPorts()" -print "Type MakeCopy.PrintPorts()" -print "Type MakeTranslation.PrintPorts()" -print "Type MakeFuse.PrintPorts()" -print " to see input and output values of nodes" -print " " -print "Type print GraphGeom2Essai.Export('File-Name')" -print "You will get a .py and a .xml file of this graph" diff --git a/src/SALOME_SWIG/testattr.py b/src/SALOME_SWIG/testattr.py deleted file mode 100755 index 18f091546..000000000 --- a/src/SALOME_SWIG/testattr.py +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : testattr.py -# Module : SALOME - -import SALOMEDS -#import SALOMEDS_Attributes_idl -import geompy -import salome -# =============================================================== - -# creating new object =========================================== -obj = geompy.myBuilder.NewObject(geompy.father) - -# adding Name attribute ========================================= -A1 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeName") -name = A1._narrow(SALOMEDS.AttributeName) -name.SetValue("First Object") - -# adding Comment attribute ====================================== -A2 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeComment") -comment = A2._narrow(SALOMEDS.AttributeComment) -comment.SetValue("This is Comment attribute") - -# adding IOR attribute ========================================== -#A3 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeIOR") -# ... - -# adding integer attribute ====================================== -A4 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeInteger") -integer = A4._narrow(SALOMEDS.AttributeInteger) -integer.SetValue(12) - -# adding real attribute ========================================= -A5 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeReal") -real = A5._narrow(SALOMEDS.AttributeReal) -real.SetValue(0.25) - -# adding sequence of integer attribute ========================== -A6 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeSequenceOfInteger") -intseq = A6._narrow(SALOMEDS.AttributeSequenceOfInteger) -intseq.Add(1) -intseq.Add(2) -intseq.Add(3) - - -# adding sequence of real attribute ============================= -A7 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeSequenceOfReal") -realseq = A7._narrow(SALOMEDS.AttributeSequenceOfReal) -realseq.Add(0.001) -realseq.Add(0.002) -realseq.Add(0.003) - -# adding PersistentRef attribute ================================ -#A8 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributePersistentRef") -# ... - -# adding Drawable attribute ===================================== -A9 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeDrawable") -drawable = A9._narrow(SALOMEDS.AttributeDrawable) -drawable.SetDrawable(1) - -# adding Selectable attribute =================================== -#A10 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeSelectable") -# ... - -# adding Expandable attribute =================================== -#A11 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeExpandable") -# ... - -# adding Opened attribute ======================================= -#A12 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeOpened") -# ... - -# adding TextColor attribute ==================================== -A13 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeTextColor") -textcolor = A13._narrow(SALOMEDS.AttributeTextColor) - -# ... - -# adding TextHighlightColor of real attribute =================== -#A14 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributeTextHighlightColor") -# ... - -# adding PixMap of real attribute =============================== -#A15 = geompy.myBuilder.FindOrCreateAttribute(obj,"AttributePixMap") -# ... - -# opening OCAF Browser ========================================== -# result = salome.myStudy.OCAFBrowser() diff --git a/src/SOCC/Makefile.in b/src/SOCC/Makefile.am similarity index 58% rename from src/SOCC/Makefile.in rename to src/SOCC/Makefile.am index f1ad96778..25db60672 100755 --- a/src/SOCC/Makefile.in +++ b/src/SOCC/Makefile.am @@ -21,33 +21,30 @@ # Module : SOCC # $Header: /dn06/SALOME_CVS/GUI_SRC/src/SOCC/Makefile.in,v 1.1 -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am +lib_LTLIBRARIES=libSOCC.la -@COMMENCE@ +salomeinclude_HEADERS= \ + SOCC.h \ + SOCC_ViewModel.h \ + SOCC_Prs.h \ + SOCC_ViewWindow.h -# header files -EXPORT_HEADERS= SOCC.h \ - SOCC_ViewModel.h \ - SOCC_Prs.h \ - SOCC_ViewWindow.h +dist_libSOCC_la_SOURCES= \ + SOCC_ViewModel.cxx \ + SOCC_Prs.cxx \ + SOCC_ViewWindow.cxx -# Libraries targets -LIB = libSOCC.la +MOC_FILES= \ + SOCC_ViewModel_moc.cxx \ + SOCC_ViewWindow_moc.cxx +nodist_libSOCC_la_SOURCES= $(MOC_FILES) -LIB_SRC= SOCC_ViewModel.cxx \ - SOCC_Prs.cxx \ - SOCC_ViewWindow.cxx +libSOCC_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../SUIT -I$(srcdir)/../OBJECT -I$(srcdir)/../Prs \ + -I$(srcdir)/../OCCViewer -I$(srcdir)/../Qtx -LIB_MOC = SOCC_ViewModel.h \ - SOCC_ViewWindow.h - -CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) - -LDFLAGS+=$(QT_MT_LIBS) -LIBS+= -lsuit -lSalomeObject -lSalomePrs -lOCCViewer - -@CONCLUDE@ +libSOCC_la_LDFLAGS=$(QT_MT_LIBS) +libSOCC_la_LIBADD= ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \ + ../Prs/libSalomePrs.la ../OCCViewer/libOCCViewer.la diff --git a/src/SPlot2d/Makefile.in b/src/SPlot2d/Makefile.am similarity index 51% rename from src/SPlot2d/Makefile.in rename to src/SPlot2d/Makefile.am index 7e9240945..17dc25b37 100644 --- a/src/SPlot2d/Makefile.in +++ b/src/SPlot2d/Makefile.am @@ -16,43 +16,35 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +lib_LTLIBRARIES = libSPlot2d.la -EXPORT_HEADERS = \ - SPlot2d.h \ - SPlot2d_Curve.h \ - SPlot2d_Prs.h \ - SPlot2d_ViewModel.h \ - SPlot2d_ViewWindow.h +salomeinclude_HEADERS = \ + SPlot2d.h \ + SPlot2d_Curve.h \ + SPlot2d_Prs.h \ + SPlot2d_ViewModel.h \ + SPlot2d_ViewWindow.h -# .po files to transform in .qm -PO_FILES = SPlot2d_msg_en.po +dist_libSPlot2d_la_SOURCES = \ + SPlot2d_Curve.cxx \ + SPlot2d_Prs.cxx \ + SPlot2d_ViewModel.cxx \ + SPlot2d_ViewWindow.cxx -# Libraries targets +MOC_FILES = \ + SPlot2d_ViewModel_moc.cxx \ + SPlot2d_ViewWindow_moc.cxx +nodist_libSPlot2d_la_SOURCES = $(MOC_FILES) -LIB = libSPlot2d.la -LIB_SRC = \ - SPlot2d_Curve.cxx \ - SPlot2d_Prs.cxx \ - SPlot2d_ViewModel.cxx \ - SPlot2d_ViewWindow.cxx +nodist_salomeres_DATA = SPlot2d_msg_en.qm -LIB_MOC = \ - SPlot2d_ViewModel.h \ - SPlot2d_ViewWindow.h - -CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(QWT_INCLUDES) $(BOOST_CPPFLAGS) -LDFLAGS+=$(QT_MT_LIBS) $(QWT_LIBS) -lsuit -lPlot2d -lSalomePrs - - -@CONCLUDE@ +libSPlot2d_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(QWT_INCLUDES) $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Plot2d -I$(srcdir)/../Prs \ + -I$(srcdir)/../OBJECT +libSPlot2d_la_LDFLAGS=$(QT_MT_LIBS) $(QWT_LIBS) ../SUIT/libsuit.la ../Plot2d/libPlot2d.la ../Prs/libSalomePrs.la diff --git a/src/SPlot2d/SPlot2d_msg_en.po b/src/SPlot2d/resources/SPlot2d_msg_en.po similarity index 100% rename from src/SPlot2d/SPlot2d_msg_en.po rename to src/SPlot2d/resources/SPlot2d_msg_en.po diff --git a/src/STD/Makefile.am b/src/STD/Makefile.am new file mode 100755 index 000000000..9b5295002 --- /dev/null +++ b/src/STD/Makefile.am @@ -0,0 +1,79 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Vladimir Klyachin (OCN) +# Module : STD +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES = libstd.la + +salomeinclude_HEADERS= \ + STD_Application.h \ + STD.h \ + STD_MDIDesktop.h \ + STD_SDIDesktop.h \ + STD_TabDesktop.h \ + STD_CloseDlg.h \ + STD_LoadStudiesDlg.h + +dist_libstd_la_SOURCES=\ + STD_Application.cxx \ + STD_MDIDesktop.cxx \ + STD_SDIDesktop.cxx \ + STD_TabDesktop.cxx \ + STD_CloseDlg.cxx \ + STD_LoadStudiesDlg.cxx + +MOC_FILES= \ + STD_Application_moc.cxx \ + STD_MDIDesktop_moc.cxx \ + STD_SDIDesktop_moc.cxx \ + STD_TabDesktop_moc.cxx \ + STD_CloseDlg_moc.cxx \ + STD_LoadStudiesDlg_moc.cxx +nodist_libstd_la_SOURCES= $(MOC_FILES) + +dist_salomeres_DATA=\ + resources/config \ + resources/cut.png \ + resources/copy.png \ + resources/close.png \ + resources/cursor_rotate.png \ + resources/cursor_zoom.png \ + resources/help.png \ + resources/new.png \ + resources/open.png \ + resources/print.png \ + resources/paste.png \ + resources/redo.png \ + resources/reset.png \ + resources/save.png \ + resources/undo_arrow.png \ + resources/undo.png \ + resources/std.ini + +nodist_salomeres_DATA=\ + STD_images.qm \ + STD_msg_en.qm + +libstd_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx +libstd_la_LDFLAGS=$(QT_MT_LIBS) +libstd_la_LIBADD=../SUIT/libsuit.la diff --git a/src/STD/Makefile.in b/src/STD/Makefile.in deleted file mode 100755 index cfd6deca0..000000000 --- a/src/STD/Makefile.in +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vladimir Klyachin (OCN) -# Module : STD -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= STD_Application.h \ - STD.h \ - STD_MDIDesktop.h \ - STD_SDIDesktop.h \ - STD_TabDesktop.h \ - STD_CloseDlg.h \ - STD_LoadStudiesDlg.h - -# .po files to transform in .qm -PO_FILES = STD_images.po \ - STD_msg_en.po - -# Libraries targets -LIB = libstd.la - -LIB_SRC= STD_Application.cxx \ - STD_MDIDesktop.cxx \ - STD_SDIDesktop.cxx \ - STD_TabDesktop.cxx \ - STD_CloseDlg.cxx \ - STD_LoadStudiesDlg.cxx - -LIB_MOC = STD_Application.h \ - STD_MDIDesktop.h \ - STD_SDIDesktop.h \ - STD_TabDesktop.h \ - STD_CloseDlg.h \ - STD_LoadStudiesDlg.h - -RESOURCES_FILES = \ -config \ -cut.png \ -copy.png \ -close.png \ -cursor_rotate.png \ -cursor_zoom.png \ -help.png \ -new.png \ -open.png \ -print.png \ -paste.png \ -redo.png \ -reset.png \ -save.png \ -undo_arrow.png \ -undo.png \ -std.ini - -CPPFLAGS+=$(QT_INCLUDES) - -LDFLAGS+=$(QT_MT_LIBS) -LIBS+= -lsuit - -@CONCLUDE@ diff --git a/src/SUIT/Makefile.am b/src/SUIT/Makefile.am new file mode 100755 index 000000000..a87d39fae --- /dev/null +++ b/src/SUIT/Makefile.am @@ -0,0 +1,120 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Vladimir Klyachin (OCN) +# Module : suit +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES = libsuit.la + +salomeinclude_HEADERS= \ + SUIT.h \ + SUIT_ActionOperation.h \ + SUIT_Application.h \ + SUIT_Convertor.h \ + SUIT_DataObject.h \ + SUIT_DataObjectIterator.h \ + SUIT_DataObjectKey.h \ + SUIT_DataOwner.h \ + SUIT_Desktop.h \ + SUIT_ExceptionHandler.h \ + SUIT_FileDlg.h \ + SUIT_FileValidator.h \ + SUIT_MessageBox.h \ + SUIT_Operation.h \ + SUIT_OverrideCursor.h \ + SUIT_ParserSettings.h \ + SUIT_PopupClient.h \ + SUIT_ResourceMgr.h \ + SUIT_SelectionMgr.h \ + SUIT_Selector.h \ + SUIT_Session.h \ + SUIT_SmartPtr.h \ + SUIT_Study.h \ + SUIT_ToolButton.h \ + SUIT_Tools.h \ + SUIT_ViewManager.h \ + SUIT_ViewModel.h \ + SUIT_ViewWindow.h \ + SUIT_SelectionFilter.h \ + SUIT_Accel.h \ + SUIT_TreeSync.h + +dist_libsuit_la_SOURCES= \ + SUIT_ActionOperation.cxx \ + SUIT_Application.cxx \ + SUIT_DataObject.cxx \ + SUIT_DataObjectIterator.cxx \ + SUIT_DataObjectKey.cxx \ + SUIT_DataOwner.cxx \ + SUIT_Desktop.cxx \ + SUIT_ExceptionHandler.cxx \ + SUIT_FileDlg.cxx \ + SUIT_FileValidator.cxx \ + SUIT_MessageBox.cxx \ + SUIT_Operation.cxx \ + SUIT_OverrideCursor.cxx \ + SUIT_ParserSettings.cxx \ + SUIT_PopupClient.cxx \ + SUIT_ResourceMgr.cxx \ + SUIT_SelectionMgr.cxx \ + SUIT_Selector.cxx \ + SUIT_Session.cxx \ + SUIT_Study.cxx \ + SUIT_ToolButton.cxx \ + SUIT_Tools.cxx \ + SUIT_ViewManager.cxx \ + SUIT_ViewModel.cxx \ + SUIT_ViewWindow.cxx \ + SUIT_SelectionFilter.cxx \ + SUIT_Accel.cxx + +MOC_FILES= \ + SUIT_ActionOperation_moc.cxx \ + SUIT_Application_moc.cxx \ + SUIT_DataObject_moc.cxx \ + SUIT_Desktop_moc.cxx \ + SUIT_FileDlg_moc.cxx \ + SUIT_Operation_moc.cxx \ + SUIT_PopupClient_moc.cxx \ + SUIT_Session_moc.cxx \ + SUIT_Study_moc.cxx \ + SUIT_ToolButton_moc.cxx \ + SUIT_ViewModel_moc.cxx \ + SUIT_ViewWindow_moc.cxx \ + SUIT_ViewManager_moc.cxx \ + SUIT_SelectionMgr_moc.cxx \ + SUIT_Selector_moc.cxx \ + SUIT_Accel_moc.cxx +nodist_libsuit_la_SOURCES=$(MOC_FILES) + +dist_salomeres_DATA = \ + resources/cascade.png \ + resources/htile.png \ + resources/vtile.png + +nodist_salomeres_DATA = \ + SUIT_images.qm \ + SUIT_msg_en.qm + +libsuit_la_CPPFLAGS=$(QT_INCLUDES) -I$(srcdir)/../Qtx +libsuit_la_LDFLAGS=$(QT_MT_LIBS) +libsuit_la_LIBADD=../Qtx/libqtx.la diff --git a/src/SUIT/Makefile.in b/src/SUIT/Makefile.in deleted file mode 100755 index bc25b7132..000000000 --- a/src/SUIT/Makefile.in +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vladimir Klyachin (OCN) -# Module : suit -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= SUIT.h \ - SUIT_ActionOperation.h \ - SUIT_Application.h \ - SUIT_Convertor.h \ - SUIT_DataObject.h \ - SUIT_DataObjectIterator.h \ - SUIT_DataObjectKey.h \ - SUIT_DataOwner.h \ - SUIT_Desktop.h \ - SUIT_ExceptionHandler.h \ - SUIT_FileDlg.h \ - SUIT_FileValidator.h \ - SUIT_MessageBox.h \ - SUIT_Operation.h \ - SUIT_OverrideCursor.h \ - SUIT_ParserSettings.h \ - SUIT_PopupClient.h \ - SUIT_ResourceMgr.h \ - SUIT_SelectionMgr.h \ - SUIT_Selector.h \ - SUIT_Session.h \ - SUIT_SmartPtr.h \ - SUIT_Study.h \ - SUIT_ToolButton.h \ - SUIT_Tools.h \ - SUIT_ViewManager.h \ - SUIT_ViewModel.h \ - SUIT_ViewWindow.h \ - SUIT_SelectionFilter.h \ - SUIT_Accel.h \ - SUIT_TreeSync.h - -# .po files to transform in .qm -PO_FILES = SUIT_images.po \ - SUIT_msg_en.po - -# Libraries targets -LIB = libsuit.la - -LIB_SRC= SUIT_ActionOperation.cxx \ - SUIT_Application.cxx \ - SUIT_DataObject.cxx \ - SUIT_DataObjectIterator.cxx \ - SUIT_DataObjectKey.cxx \ - SUIT_DataOwner.cxx \ - SUIT_Desktop.cxx \ - SUIT_ExceptionHandler.cxx \ - SUIT_FileDlg.cxx \ - SUIT_FileValidator.cxx \ - SUIT_MessageBox.cxx \ - SUIT_Operation.cxx \ - SUIT_OverrideCursor.cxx \ - SUIT_ParserSettings.cxx \ - SUIT_PopupClient.cxx \ - SUIT_ResourceMgr.cxx \ - SUIT_SelectionMgr.cxx \ - SUIT_Selector.cxx \ - SUIT_Session.cxx \ - SUIT_Study.cxx \ - SUIT_ToolButton.cxx \ - SUIT_Tools.cxx \ - SUIT_ViewManager.cxx \ - SUIT_ViewModel.cxx \ - SUIT_ViewWindow.cxx \ - SUIT_SelectionFilter.cxx \ - SUIT_Accel.cxx - -LIB_MOC = SUIT_ActionOperation.h \ - SUIT_Application.h \ - SUIT_DataObject.h \ - SUIT_Desktop.h \ - SUIT_FileDlg.h \ - SUIT_Operation.h \ - SUIT_PopupClient.h \ - SUIT_Session.h \ - SUIT_Study.h \ - SUIT_ToolButton.h \ - SUIT_ViewModel.h \ - SUIT_ViewWindow.h \ - SUIT_ViewManager.h \ - SUIT_SelectionMgr.h \ - SUIT_Selector.h \ - SUIT_Accel.h - -RESOURCES_FILES = \ - cascade.png \ - htile.png \ - vtile.png - -CPPFLAGS+=$(QT_INCLUDES) - -LDFLAGS+=$(QT_MT_LIBS) -lqtx - -@CONCLUDE@ diff --git a/src/SUIT/utilities.h b/src/SUIT/utilities.h deleted file mode 100755 index a82d31726..000000000 --- a/src/SUIT/utilities.h +++ /dev/null @@ -1,122 +0,0 @@ -// SALOME Utils : general SALOME's definitions and tools -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : utilities.h -// Author : Antoine YESSAYAN, Paul RASCLE, EDF -// Module : SALOME -// $Header$ - -/*! --- Definition macros file to print informations if _DEBUG_ is defined --- */ - -#ifndef UTILITIES_H -#define UTILITIES_H - -#include -#include -#include - - -#include "LocalTraceBufferPool.hxx" - -/*! \file utilities.h - * For each message to put in the trace, a specific ostingstream object is \n - * created and destroyed automatically at the end of the message macro. \n - * The insert function of LocalTraceBufferPool class gets a buffer in a \n - * buffer pool (unique with the help of mutexes and semaphores) and copy the \n - * message in the buffer.\n - * This buffer is read later by a specific thread in charge of trace print.\n - * Order of trace entries is globally respected. Nevertheless, if there are \n - * several threads waiting for a free buffer to trace, the order of \n - * thread waken up is not garanteed (no fifo or priority rules in Linux Kernel) - */ - -#define MESS_INIT(deb) std::ostringstream os; os<insert(NORMAL_MESS, os.str().c_str()); -#define MESS_ABORT std::endl; LocalTraceBufferPool::instance()->insert(ABORT_MESS, os.str().c_str()); - -// --- Some macros are always defined (without _DEBUG_): for use with release version - -#define INFOS(msg) {MESS_BEGIN("- Trace ") << msg << MESS_END} -#define PYSCRIPT(msg) {MESS_INIT("---PYSCRIPT--- ") << msg << MESS_END} -#define INTERRUPTION(msg) {MESS_BEGIN("- INTERRUPTION: ")<< msg << MESS_ABORT} -#define IMMEDIATE_ABORT(code) {std::cout < - -#include -#include -#include -#include -#include - -#include - -/*! - Default constructor -*/ -SalomeApp_Displayer::SalomeApp_Displayer() -{ -} - -/*! - Destructor -*/ -SalomeApp_Displayer::~SalomeApp_Displayer() -{ -} - -/*! - Displays object in view - \param entry - object entry - \param updateViewer - is it necessary to update viewer - \param theViewFrame - view -*/ -void SalomeApp_Displayer::Display( const QString& entry, const bool updateViewer, SALOME_View* theViewFrame ) -{ - SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); - if ( vf ) - { - SALOME_Prs* prs = buildPresentation( entry, vf ); - - if ( prs ) - { - vf->BeforeDisplay( this ); - vf->Display( prs ); - vf->AfterDisplay( this ); - - if ( updateViewer ) - vf->Repaint(); - - delete prs; // delete presentation because displayer is its owner - } - } -} - -/*! - Redisplays object in view - \param entry - object entry - \param updateViewer - is it necessary to update viewer -*/ -void SalomeApp_Displayer::Redisplay( const QString& entry, const bool updateViewer ) -{ - // Remove the object permanently ( == true) - SUIT_Session* ses = SUIT_Session::session(); - SUIT_Application* app = ses->activeApplication(); - if ( app ) - { - SUIT_Desktop* desk = app->desktop(); - QPtrList wnds = desk->windows(); - SUIT_ViewWindow* wnd; - for ( wnd = wnds.first(); wnd; wnd = wnds.next() ) - { - SUIT_ViewManager* vman = wnd->getViewManager(); - if( !vman ) - continue; - - SUIT_ViewModel* vmodel = vman->getViewModel(); - if( !vmodel ) - continue; - - SALOME_View* view = dynamic_cast(vmodel); - if( view && ( IsDisplayed( entry, view ) || view == GetActiveView() ) ) - { - Erase( entry, true, false, view ); - Display( entry, updateViewer, view ); - } - } - } -} - -/*! - Erases object in view - \param entry - object entry - \param forced - deletes object from viewer (otherwise it will be erased, but cached) - \param updateViewer - is it necessary to update viewer - \param theViewFrame - view -*/ -void SalomeApp_Displayer::Erase( const QString& entry, const bool forced, - const bool updateViewer, SALOME_View* theViewFrame ) -{ - SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); - - if ( vf ) { - SALOME_Prs* prs = vf->CreatePrs( entry.latin1() ); - if ( prs ) { - vf->Erase( prs, forced ); - if ( updateViewer ) - vf->Repaint(); - delete prs; // delete presentation because displayer is its owner - } - } -} - -/*! - Erases all objects in view - \param forced - deletes objects from viewer - \param updateViewer - is it necessary to update viewer - \param theViewFrame - view -*/ -void SalomeApp_Displayer::EraseAll( const bool forced, const bool updateViewer, SALOME_View* theViewFrame ) const -{ - SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); - - if ( vf ) { - vf->EraseAll( forced ); - if ( updateViewer ) - vf->Repaint(); - } -} - -/*! - \return true if object is displayed in viewer - \param entry - object entry - \param theViewFrame - view -*/ -bool SalomeApp_Displayer::IsDisplayed( const QString& entry, SALOME_View* theViewFrame ) const -{ - SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); - if( vf ) - { - Handle( SALOME_InteractiveObject ) temp = new SALOME_InteractiveObject(); - temp->setEntry( entry.latin1() ); - return vf->isVisible( temp ); - } - else - return false; -} - -/*! - Updates active view -*/ -void SalomeApp_Displayer::UpdateViewer() const -{ - SALOME_View* vf = GetActiveView(); - if ( vf ) - vf->Repaint(); -} - -/*! - \return presentation of object, built with help of CreatePrs method - \param entry - object entry - \param theViewFrame - view - \sa CreatePrs() -*/ -SALOME_Prs* SalomeApp_Displayer::buildPresentation( const QString& entry, SALOME_View* theViewFrame ) -{ - SALOME_Prs* prs = 0; - - SALOME_View* vf = theViewFrame ? theViewFrame : GetActiveView(); - - if ( vf ) - prs = vf->CreatePrs( entry.latin1() ); - - return prs; -} - -/*! - \return active view -*/ -SALOME_View* SalomeApp_Displayer::GetActiveView() -{ - SUIT_Session* session = SUIT_Session::session(); - if ( SUIT_Application* app = session->activeApplication() ) { - if ( SalomeApp_Application* sApp = dynamic_cast( app ) ) { - if( SUIT_ViewManager* vman = sApp->activeViewManager() ) { - if ( SUIT_ViewModel* vmod = vman->getViewModel() ) - return dynamic_cast( vmod ); - } - } - } - return 0; -} diff --git a/src/SalomeApp/SalomeApp_Displayer.h b/src/SalomeApp/SalomeApp_Displayer.h deleted file mode 100644 index db5319392..000000000 --- a/src/SalomeApp/SalomeApp_Displayer.h +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// - -#ifndef SALOMEAPP_DISPLAYER_HEADER -#define SALOMEAPP_DISPLAYER_HEADER - -#include - -class QString; - -class SalomeApp_Displayer : public SALOME_Displayer -{ -public: - SalomeApp_Displayer(); - virtual ~SalomeApp_Displayer(); - - void Display( const QString&, const bool = true, SALOME_View* = 0 ); - void Redisplay( const QString&, const bool = true ); - void Erase( const QString&, const bool forced = false, const bool updateViewer = true, SALOME_View* = 0 ); - void EraseAll( const bool forced = false, const bool updateViewer = true, SALOME_View* = 0 ) const; - bool IsDisplayed( const QString&, SALOME_View* = 0 ) const; - void UpdateViewer() const; - - static SALOME_View* GetActiveView(); - -protected: - virtual SALOME_Prs* buildPresentation( const QString&, SALOME_View* = 0 ); -}; - -#endif diff --git a/src/SalomeApp/Test/Makefile.in b/src/SalomeApp/Test/Makefile.am similarity index 65% rename from src/SalomeApp/Test/Makefile.in rename to src/SalomeApp/Test/Makefile.am index 4754fe72a..3971f30d0 100644 --- a/src/SalomeApp/Test/Makefile.in +++ b/src/SalomeApp/Test/Makefile.am @@ -25,41 +25,23 @@ # Author : Sergey RUIN # Module : SALOME -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am +lib_LTLIBRARIES= libSalomeAppTest.la -@COMMENCE@ +salomeinclude_HEADERS= SalomeAppTest.hxx -# header files -EXPORT_HEADERS= SalomeAppTest.hxx +dist_libSalomeAppTest_la_SOURCES= SalomeAppTest.cxx -EXPORT_PYSCRIPTS = TestSalomeApp.py +libSalomeAppTest_la_CXXFLAGS= @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS) +libSalomeAppTest_la_LIBADD= @CPPUNIT_LIBS@ -# Libraries targets +bin_PROGRAMS= TestSalomeApp -LIB = libSalomeAppTest.la -LIB_SRC = SalomeAppTest.cxx -LIB_CLIENT_IDL = +TestSalomeApp_SOURCES= TestSalomeApp.cxx -# Executables targets - -BIN = TestSalomeApp -BIN_SRC = -BIN_CLIENT_IDL = - - -CXXFLAGS += $ @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS) -CPPFLAGS += $ @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS) - -LIBS= @LIBS@ @CPPUNIT_LIBS@ - -LDFLAGS+= - -LDFLAGSFORBIN+= $(LDFLAGS) -lSalomeAppTest +TestSalomeApp_CXXFLAGS= $(libSalomeAppTest_la_CXXFLAGS) +TestSalomeApp_LDADD= $(libSalomeAppTest_la_LIBADD) libSalomeAppTest.la +dist_salomescript_PYTHON = TestSalomeApp.py UNIT_TEST_PROG = TestSalomeApp - -@CONCLUDE@ diff --git a/src/Session/InquireServersQThread.cxx b/src/Session/InquireServersQThread.cxx deleted file mode 100755 index 61fdc3eff..000000000 --- a/src/Session/InquireServersQThread.cxx +++ /dev/null @@ -1,626 +0,0 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// File : InquireServersQThread.cxx -// Author : Vasily RUSYAEV -// Module : SALOME -// $Header$ - -#include "InquireServersQThread.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//VRV: porting on Qt 3.0.5 -#if QT_VERSION >= 0x030005 -#include -#endif -//VRV: porting on Qt 3.0.5 - -#include - -#include - -#include "Utils_ORB_INIT.hxx" -#include "Utils_SINGLETON.hxx" -#include "SALOME_NamingService.hxx" -#include "utilities.h" -#include "OpUtil.hxx" - -using namespace std; - -#include CORBA_CLIENT_HEADER(SALOME_Session) -#include CORBA_CLIENT_HEADER(SALOME_Registry) -#include CORBA_CLIENT_HEADER(SALOMEDS) -#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog) -#include CORBA_CLIENT_HEADER(SALOME_Component) - -#define MARGIN_SIZE 5 -#define SPACING_SIZE 3 - -/*! - Constructor -*/ -InquireServersGUI::InquireServersGUI() - : QVBox(0, "SFA splash", Qt::WDestructiveClose | Qt::WStyle_Customize | Qt::WStyle_NoBorder | WType_TopLevel | WStyle_StaysOnTop | WX11BypassWM ) -{ - // myGUI = false; - myThread = new InquireServersQThread( this ); - - // 1. Polish the appearance - setMargin( MARGIN_SIZE ); - setSpacing( SPACING_SIZE ); - setFrameStyle( QFrame::Plain | QFrame::Box ); - setLineWidth( 2 ); - setMinimumSize( 200, 150 ); - - // 2. Set palette - QPalette pal = palette(); - QColorGroup cg = pal.active(); - cg.setColor( QColorGroup::Foreground, Qt::darkBlue ); - cg.setColor( QColorGroup::Background, Qt::white ); - pal.setActive( cg ); pal.setInactive( cg ); pal.setDisabled( cg ); - setPalette( pal ); - - // 2. Splash image - mySplashFrame = new QFrame( this ); - mySplashFrame->setFrameStyle( QFrame::Box | QFrame::Raised ); - QHBoxLayout* frmLayout = new QHBoxLayout( mySplashFrame ); - frmLayout->setMargin( MARGIN_SIZE ); - mySplash = new QLabel( mySplashFrame, "splash" ); - frmLayout->addWidget( mySplash ); - - // setting pixmap - //QPixmap pix = SUIT_ResourceMgr( "SalomeApp" ).loadPixmap( "SalomeApp", tr( "ABOUT" ) ); - //splash->setPixmap( pix ); - - // 3. Progress bar - myPrgBar = new QProgressBar( this, "QProgressBar" ); - myPrgBar->setFixedWidth( 180 ); - //Sets the total number of steps . - myPrgBar->setPercentageVisible( false ); - myPrgBar->setIndicatorFollowsStyle( false ); - myPrgBar->setFixedHeight( 8 ); - myPrgBar->setFrameStyle( QFrame::Box | QFrame::Plain ); - myPrgBar->setMargin( 0 ); - pal = myPrgBar->palette(); cg = pal.active(); - cg.setColor( QColorGroup::Highlight, Qt::red ); - pal.setActive( cg ); pal.setInactive( cg ); pal.setDisabled( cg ); myPrgBar->setPalette( pal ); - myPrgBar->setTotalSteps ( myThread->getInquiredServers() ); - myPrgBar->setProgress( 0 ); - - // 4. Info label - QWidget* aWgt1 = new QWidget( this ); - QHBoxLayout* aHBoxLayout1 = new QHBoxLayout( aWgt1 ); - myLabel = new QLabel( tr( "Loading:" ), aWgt1 ); - myLabel->setFixedWidth( 180 ); - myLabel->setAlignment( AlignLeft ); - QFont theFont = myLabel->font(); - theFont.setBold(true); - myLabel->setFont( theFont ); - aHBoxLayout1->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); - aHBoxLayout1->addWidget( myLabel ); - aHBoxLayout1->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); - - // 5. button - QWidget* aWgt = new QWidget( this ); - QHBoxLayout* aHBoxLayout = new QHBoxLayout( aWgt ); - QPushButton* myCancelBtn = new QPushButton( tr( "Cancel" ), aWgt ); - connect( myCancelBtn, SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) ) ; - aHBoxLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); - aHBoxLayout->addWidget( myCancelBtn ); - aHBoxLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); - - //Center widget -#if QT_VERSION >= 0x030005 - QDesktopWidget *d = QApplication::desktop(); -#else - QWidget *d = QApplication::desktop(); -#endif -//VRV: porting on Qt 3.0.5 - - int w = d->width(); // returns desktop width - int h = d->height(); // returns desktop height - QSize mySize = sizeHint (); // returns widget size - int Xc = ( w - mySize.width() ) / 2; - int Yc = ( h - mySize.height() ) / 2; - move( Xc, Yc ); - - myThread->start(); -} - -/*! - Sets pixmap of splash screen - \param pix - new pixmap -*/ -void InquireServersGUI::setPixmap( QPixmap pix ) -{ - if ( !pix.isNull() ) - { - mySplash->setPixmap( pix ); - int w = mySplash->sizeHint().width() + MARGIN_SIZE*2; - myPrgBar->setFixedWidth( w ); - myLabel->setFixedWidth( w ); - } -} - -/*! - Destructor -*/ -InquireServersGUI::~InquireServersGUI() -{ - delete myThread; -} - -/*! - Gets parameters from qApp - \param _argc - variable to return number of arguments - \param _argv - variable to return array of arguments -*/ -void InquireServersGUI::getArgs( int& _argc, char *** _argv) -{ - _argc = qApp->argc(); - *_argv = qApp->argv(); -} - -/*! - Cancel loading of SALOME -*/ -void InquireServersGUI::ClickOnCancel() -{ - myThread->stop(); //it's necessary to stop asking servers - hide(); - qApp->exit( 1 ); -} - -/*! - Custom event filter -*/ -void InquireServersGUI::customEvent( QCustomEvent* pe ) -{ - switch( pe->type() ) - { - case InquireEvent::ProgressEvent: - { - int* value = ( int* )(( InquireEvent*)pe)->data(); - myPrgBar->setProgress( *value ); - break; - } - case InquireEvent::ProgressEventLabel: - { - QString* myString = ( QString* )(( InquireEvent*)pe)->data(); - myLabel->setText( *myString ); - break; - } - case InquireEvent::ProgressEventError: - { - QString* myErrDesc = ( QString* )(( InquireEvent*)pe)->data(); - QString appName = "SALOME Professional"; - QString error = "An internal error occurred.\n"+ *myErrDesc + "\n"; - QMessageBox myMsgBox(appName,error,QMessageBox::Critical,QMessageBox::Ok,QMessageBox::NoButton, - QMessageBox::NoButton,0,"MY",TRUE,WStyle_DialogBorder|WStyle_StaysOnTop); - myMsgBox.exec(); - ClickOnCancel(); - break; - } - default: - { - ; - } - } -} - -/*! - \return status of thread exit -*/ -int InquireServersGUI::getExitStatus() -{ - return myThread->getExitStatus(); -} - -/*! - Constructor -*/ -InquireServersQThread::InquireServersQThread( InquireServersGUI* r ) - : receiver(r), myExitStatus(0) -{ - char* cenv; - - IsChecking = true; - myServersCount = 5; - //how many times we should repeat attempts to get response from all needed for launching SALOME servers - myRepeat = 30; // default value, user can change it by setting CSF_RepeatServerRequest env.variable - cenv = getenv( "CSF_RepeatServerRequest" ); - if ( cenv ) { - int val = atoi( cenv ); - if ( val > 0 ) - myRepeat = val; - } - //define delay time between two attempts - myDelay = 1000000; // 1 second - QString str = "Loading: "; - myMessages[0] = "Checking naming service..."; - myMessages[1] = str + "SALOME_Registry_Server" + "..."; - myMessages[2] = str + "SALOMEDS_Server" + "..."; - myMessages[3] = str + "SALOME_ModuleCatalog_Server" + "..."; - myMessages[4] = str + "SALOME_Session_Server" + "..."; - myMessages[5] = ""; - myMessages[6] = ""; - myMessages[7] = ""; - - r->getArgs( _argc, &_argv); - - // NRI : Temporary solution for SuperVisionContainer - for ( int i=1; i<=(_argc-1); i++) { - if (strcmp(_argv[i],"CPP")==0) { - myMessages[5] = str + "SALOME_Container FactoryServer" + "..."; - myServersCount++; - } - if (strcmp(_argv[i],"PY")==0) { - myMessages[6] = str + "SALOME_ContainerPy.py FactoryServerPy" + "..."; - myServersCount++; - } - if (strcmp(_argv[i],"SUPERV")==0) { - myMessages[7] = str + "SALOME_Container SuperVisionContainer" + "..."; - myServersCount++; - } -// if (strcmp(_argv[i],"GUI")==0) { -// r->withGUI(true); -// } - } -} - -/*! - The main loop of this thread -*/ -void InquireServersQThread::run() -{ - while ( IsChecking && receiver ) - { - for (int i=1; i<=8; i++) - { - if ( myMessages[i-1].isEmpty() ) - { - if ( i==8 ) - { - IsChecking = false; - myExitStatus = 0; //myExitStatus should be 0 because all servers exist and work - sleep( 1 ); // sleep( 1 second ) in order to see 100%. in other case it closes on 85%.. - break; - } - else - continue; - } - QString *message = new QString(myMessages[i-1]); - QThread::postEvent( receiver, new InquireEvent( ( QEvent::Type )InquireEvent::ProgressEventLabel, message ) ); - QThread::usleep(200000); - QString *errMsg; - bool result = AskServer(i,&errMsg); - if (result) - { - QThread::postEvent( receiver, new InquireEvent( ( QEvent::Type )InquireEvent::ProgressEvent, new int( i ) ) ); - if ( i==8 ) - { - IsChecking = false; - myExitStatus = 0; //myExitStatus should be 0 because all servers exist and work - sleep( 1 ); // sleep( 1 second ) in order to see 100%. in other case it closes on 85%.. - break; - } - } - else - { - QThread::postEvent( receiver, new InquireEvent( ( QEvent::Type )InquireEvent::ProgressEventError, errMsg ) ); - stop(); - break; - } - } - } - - receiver->hide(); - qApp->exit( myExitStatus ); -} - -/*! - Stops this thread -*/ -void InquireServersQThread::stop() -{ - IsChecking = false; - myExitStatus = 1; -} - -/*! - Destructor -*/ -InquireServersQThread::~InquireServersQThread() -{ -} - -bool InquireServersQThread::AskServer(int iteration, QString ** errMessage) -{ - if ( iteration > myServersCount ) - return true; // we did not launch server with number iteration, so checking for it is not neccessary - - ASSERT(iteration<=myServersCount); - - //will be set true if we get response from server - bool IsPassed = false; - QString errDescription; -#ifdef WNT - int i; -#endif - switch (iteration) - { - case 1: - //First checking - existence of Naming Service -#ifndef WNT - for (int i = myRepeat; i ; i--) -#else - for (i = myRepeat; i ; i--) -#endif - { - try - { - CORBA::ORB_var orb = CORBA::ORB_init(_argc,_argv) ; - CORBA::Object_var obj = orb->resolve_initial_references("NameService"); - CosNaming::NamingContext_var _root_context = CosNaming::NamingContext::_narrow(obj); - if (CORBA::is_nil(_root_context)) - continue; - else - IsPassed = true; - break; - } - catch(CORBA::COMM_FAILURE&) - { - MESSAGE("CORBA::COMM_FAILURE: unable to contact the naming service"); - } - catch(...) - { - MESSAGE("Unknown Exception: unable to contact the naming service"); - } - QThread::usleep(myDelay); - } - if (!IsPassed) - *errMessage = new QString("unable to contact the naming service"); - break; - case 2: - //checking - existence of SALOME_Registry_Server - case 3: - //checking - existence of SALOMEDS_Server - case 4: - //checking - existence of SALOME_ModuleCatalog_Server - case 5: - //checking - existence of SALOME_Session_Server - case 6: - //checking - existence of SALOME_Container FactoryServer - case 7: - //checking - existence of SALOME_ContainerPy.py FactoryServerPy - case 8: - //checking - existence of SALOME_Container SuperVisionContainer - - - IsPassed = pingServer(iteration, errDescription); - if (!IsPassed) - *errMessage = new QString(errDescription); - break; - } -return IsPassed; -} - -bool InquireServersQThread::pingServer(int iteration, QString& errMessage) -{ - ASSERT(iteration<=myServersCount); - bool result = false; - QString errorDescr; - for (int i = myRepeat; i ; i--) - { - try - { - CORBA::ORB_var orb = CORBA::ORB_init(_argc,_argv) ; - SALOME_NamingService &NS = *SINGLETON_::Instance() ; - ASSERT(SINGLETON_::IsAlreadyExisting()) ; - NS.init_orb( orb ) ; - switch (iteration) - { - case 2: - { - CORBA::Object_var obj = NS.Resolve("/Registry"); - Registry::Components_var registry = Registry::Components::_narrow(obj) ; - if (!CORBA::is_nil(registry)) - { - MESSAGE("/Registry is found"); - registry->ping(); - result = true; - MESSAGE("Registry was activated"); - return result; - } - } - break; - case 3: - { - CORBA::Object_var obj = NS.Resolve("/myStudyManager"); - SALOMEDS::StudyManager_var studyManager = SALOMEDS::StudyManager::_narrow(obj) ; - if (!CORBA::is_nil(studyManager)) - - - - - - { - MESSAGE("/myStudyManager is found"); - studyManager->ping(); - result = true; - MESSAGE("StudyManager was activated"); - return result; - } - } - break; - case 4: - { - CORBA::Object_var obj = NS.Resolve("/Kernel/ModulCatalog"); - SALOME_ModuleCatalog::ModuleCatalog_var catalog = SALOME_ModuleCatalog::ModuleCatalog::_narrow(obj) ; - if (!CORBA::is_nil(catalog)) - { - MESSAGE("/Kernel/ModulCatalog is found"); - catalog->ping(); - result = true; - MESSAGE("ModuleCatalog was activated"); - return result; - } - } - break; - case 5: - { - CORBA::Object_var obj = NS.Resolve("/Kernel/Session"); - SALOME::Session_var session = SALOME::Session::_narrow(obj) ; - if (!CORBA::is_nil(session)) - { - MESSAGE("/Kernel/Session is found"); - session->ping(); - result = true; - MESSAGE("SALOME_Session was activated"); - return result; - } - } - break; - case 6: - { - string hostname = GetHostname(); - string containerName = "/Containers/"; - containerName += hostname; - containerName += "/FactoryServer"; - - CORBA::Object_var obj = NS.Resolve(containerName.c_str()); - Engines::Container_var FScontainer = Engines::Container::_narrow(obj) ; - if (!CORBA::is_nil(FScontainer)) - { - FScontainer->ping(); - result = true; - MESSAGE("FactoryServer container was activated"); - return result; - } - } - break; - case 7: - { - string hostname = GetHostname(); - string containerName = "/Containers/"; - containerName += hostname; - containerName += "/FactoryServerPy"; - - CORBA::Object_var obj = NS.Resolve(containerName.c_str()); - Engines::Container_var FSPcontainer = Engines::Container::_narrow(obj) ; - if (!CORBA::is_nil(FSPcontainer)) - { - FSPcontainer->ping(); - result = true; - MESSAGE("FactoryServerPy container was activated"); - return result; - } - } - break; - case 8: - { - string hostname = GetHostname(); - string containerName = "/Containers/"; - containerName += hostname; - containerName += "/SuperVisionContainer"; - - CORBA::Object_var obj = NS.Resolve(containerName.c_str()); - Engines::Container_var SVcontainer = Engines::Container::_narrow(obj) ; - if (!CORBA::is_nil(SVcontainer)) - { - SVcontainer->ping(); - - result = true; - MESSAGE("SuperVisionContainer container was activated"); - return result; - } - } - break; - } - } - catch (ServiceUnreachable&) - { - MESSAGE("Caught exception: Naming Service Unreachable"); - errorDescr = "Caught exception: Naming Service Unreachable"; - } - catch (CORBA::COMM_FAILURE&) - { - MESSAGE("Caught CORBA::SystemException CommFailure."); - errorDescr = "Caught CORBA::SystemException CommFailure"; - } - catch (CORBA::SystemException&) - { - MESSAGE("Caught CORBA::SystemException."); - errorDescr = "Caught CORBA::SystemException"; - } - catch (CORBA::Exception&) - { - MESSAGE("Caught CORBA::Exception."); - errorDescr = "Caught CORBA::Exception"; - } - catch (...) - { - MESSAGE("Caught unknown exception."); - errorDescr = "Caught unknown exception"; - } - QThread::usleep(myDelay); - } - if (!result) - { - QString serverName; - switch (iteration) - { - case 2: - serverName = "SALOME_Registry_Server is not loaded. "; - break; - case 3: - serverName = "SALOMEDS_Server is not loaded. "; - break; - case 4: - serverName = "SALOME_ModuleCatalog_Server is not loaded. "; - break; - case 5: - serverName = "SALOME_Session_Server is not loaded. "; - break; - case 6: - serverName = "SALOME_Container FactoryServer is not loaded. "; - break; - case 7: - serverName = "SALOME_ContainerPy.py FactoryServerPy is not loaded. "; - break; - case 8: - serverName = "SALOME_Container SuperVisionContainer is not loaded. "; - break; - } - errMessage = serverName + errorDescr; - } - return result; -} - diff --git a/src/Session/InquireServersQThread.h b/src/Session/InquireServersQThread.h deleted file mode 100755 index a49f2b7d9..000000000 --- a/src/Session/InquireServersQThread.h +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// File : InquireServersQThread.h -// Author : Vasily RUSYAEV -// Module : SALOME - -#include -#include -#include - -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif - -/*! - \class InquireEvent - Contains QCustomEvents for posting to InquireServersQThread -*/ -class SALOME_WNT_EXPORT InquireEvent : public QCustomEvent -{ -public: - - enum myCustomEvents{ ProgressEvent = QEvent::User + 10, ProgressEventLabel, ProgressEventError }; - - InquireEvent( QEvent::Type type , void* data = 0 ) - : QCustomEvent( type, data ) {} - ~InquireEvent() - { - type() == (QEvent::Type)ProgressEvent ? - delete ( int* )data() : delete ( QString* )data(); - } -}; - -class InquireServersGUI; - -class SALOME_WNT_EXPORT InquireServersQThread : public QThread -{ -public: - InquireServersQThread( InquireServersGUI* r ); - virtual ~InquireServersQThread(); - - //the main loop of this thread - virtual void run() ; - //stop to ask servers - void stop(); - //return exit status: 0 - OK, >0 - BAD (some servers doesn't exists or user click cancel button) - int getExitStatus() { return myExitStatus;} - //return count of inquired servers - int getInquiredServers() { return myServersCount; } - -private: - -//functions: - - bool AskServer(int iteration, QString ** message); - bool pingServer(int iteration, QString& errMessage); - -//variables: - - QGuardedPtr receiver; - int _argc ; - char ** _argv; - //this variable is true if we are checking servers - bool IsChecking; - //count of inquired servers - int myServersCount; - //how many times we should repeat attempt to get response from all needed for launching SALOME servers - int myRepeat; - //define delay time between two attempts in microseconds - int myDelay; - //this strings' array contains messages for each server (e.g. "Loading: SALOMEDS_Server") - QString myMessages[8]; - //exit status: 0 - OK, >0 - BAD (some servers doesn't exists or user click cancel button) - int myExitStatus; - -} ; - -class QLabel; -class QFrame; -class QProgressBar; -class SALOME_WNT_EXPORT InquireServersGUI : public QVBox -{ - Q_OBJECT - -public: - InquireServersGUI() ; - ~InquireServersGUI(); - - //returns arguments of QApplication - //they are needed for CORBA servers initialization - void getArgs( int& _argc, char *** _argv); - //return exit status: 0 - OK, >0 - BAD (some servers doesn't exists or user click cancel button) - int getExitStatus(); - //launch IAPP - // bool withGUI() { return myGUI; } - // void withGUI(bool gui) { myGUI = gui; } - - void setPixmap( QPixmap ); - -protected: - virtual void customEvent( QCustomEvent* ); - -private: - InquireServersQThread* myThread; - QProgressBar* myPrgBar; - //this string contains description of currently asked server - QLabel* myLabel; - QLabel* mySplash; - QFrame* mySplashFrame; - // bool myGUI; - -private slots: - - void ClickOnCancel(); -} ; diff --git a/src/Session/Makefile.am b/src/Session/Makefile.am new file mode 100755 index 000000000..fe7b6dc74 --- /dev/null +++ b/src/Session/Makefile.am @@ -0,0 +1,76 @@ +# SALOME Session : implementation of Session.idl +# +# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : Paul RASCLE, EDF +# Module : SALOME +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES = libSalomeSession.la + +salomeinclude_HEADERS= \ + Session_Session_i.hxx \ + Session_ServerLauncher.hxx \ + Session_ServerThread.hxx \ + Session_ServerCheck.hxx \ + SalomeApp_Engine_i.hxx + +# Libraries targets + +dist_libSalomeSession_la_SOURCES= \ + Session_Session_i.cxx \ + Session_ServerThread.cxx \ + Session_ServerLauncher.cxx \ + Session_ServerCheck.cxx \ + SalomeApp_Engine_i.cxx + +libSalomeSession_la_CPPFLAGS= $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) \ + $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ $(CAS_CPPFLAGS) \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ + -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \ + -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../Event + +libSalomeSession_la_LDFLAGS= $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS \ + -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSalomeCatalog \ + -lSalomeDSClient $(CAS_KERNEL) -lwith_loggerTraceCollector \ + ../SUIT/libsuit.la ../Event/libEvent.la + +# Executable +bin_PROGRAMS= SALOME_Session_Server + +dist_SALOME_Session_Server_SOURCES= SALOME_Session_Server.cxx + +SALOME_Session_Server_CPPFLAGS= $(libSalomeSession_la_CPPFLAGS) +SALOME_Session_Server_LDADD= $(libSalomeSession_la_LDFLAGS) $(OMNIORB_LIBS) \ + $(HDF5_LIBS) -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS \ + -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry \ + -lSalomeNotification -lSALOMEBasics ../Qtx/libqtx.la \ + $(top_builddir)/idl/libSalomeIDLGUI.la \ + libSalomeSession.la + +lib-hook: + ln -sf $(top_builddir)/bin/salome/styles styles + +# ../SalomeApp/libSalomeApp.la diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in deleted file mode 100755 index a02da3494..000000000 --- a/src/Session/Makefile.in +++ /dev/null @@ -1,69 +0,0 @@ -# SALOME Session : implementation of Session.idl -# -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS= Session_Session_i.hxx \ - Session_ServerLauncher.hxx \ - Session_ServerThread.hxx \ - Session_ServerCheck.hxx \ - SalomeApp_Engine_i.hxx - -# Libraries targets -LIB = libSalomeSession.la - -LIB_SRC=Session_Session_i.cxx \ - Session_ServerThread.cxx \ - Session_ServerLauncher.cxx \ - Session_ServerCheck.cxx \ - SalomeApp_Engine_i.cxx \ - -LIB_MOC = - -# Executables targets -BIN = SALOME_Session_Server -BIN_SRC = -LIB_SERVER_IDL = SALOME_Session.idl SalomeApp_Engine.idl -BIN_SERVER_IDL = -BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Registry.idl SALOME_ModuleCatalog.idl SALOME_Exception.idl SALOME_GenericObj.idl - -CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) -CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -LDFLAGS += $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lSalomeCatalog -lSalomeDSClient $(CAS_KERNEL) - -LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification -lSALOMEBasics - -@CONCLUDE@ - diff --git a/src/Session/runSession b/src/Session/runSession deleted file mode 100755 index cbb98a2da..000000000 --- a/src/Session/runSession +++ /dev/null @@ -1,27 +0,0 @@ -export SALOME_HOME_DIR=`pwd` -export ORB_HOME_DIR=${HOME}/public/omni - -# OCAF -export CSF_PluginDefaults=${SALOME_HOME_DIR}/../resources -export CSF_ResourcesDefaults=${SALOME_HOME_DIR}/../resources - -export CSF_SALOMEGUIResources=${SALOME_HOME_DIR}/../SALOME/resources -export CSF_SALOMEGUILanguage=en -export CSF_QADResources=${SALOME_HOME_DIR}/../SALOME/resources -export CSF_QADLanguage=en - -export CSF_CatalogueResources=${SALOME_HOME_DIR}/../resources - -export CSF_GeometryResources=${SALOME_HOME_DIR}/../GEOM/resources - -export CSF_MeshResources=${SALOME_HOME_DIR}/../MESH/resources - -export CSF_PATHComponents=${SALOME_HOME_DIR}/../lib - -export LD_LIBRARY_PATH=${SALOME_HOME_DIR}/../lib/:${LD_LIBRARY_PATH} - -runNS.sh -geom& -mesh& -SALOME_Session_Server - diff --git a/src/ObjBrowser/Makefile.in b/src/Style/Makefile.am old mode 100755 new mode 100644 similarity index 63% rename from src/ObjBrowser/Makefile.in rename to src/Style/Makefile.am index 71ff8fefd..8a9c807e2 --- a/src/ObjBrowser/Makefile.in +++ b/src/Style/Makefile.am @@ -18,43 +18,24 @@ # # File : Makefile.in # Author : Vladimir Klyachin (OCN) -# Module : ObjectBrowser -# $Header$ +# Module : SalomeApp -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -# header files -EXPORT_HEADERS= OB.h \ - OB_Browser.h \ - OB_ListItem.h \ - OB_ListView.h \ - OB_Filter.h - # Libraries targets -LIB = libObjBrowser.la - -LIB_SRC= OB_Browser.cxx \ - OB_ListItem.cxx \ - OB_ListView.cxx \ - OB_Filter.cxx - -LIB_MOC = OB_Browser.h \ - OB_ListView.h +lib_LTLIBRARIES = libSalomeStyle.la -# .po files to transform in .qm -PO_FILES = OB_msg_en.po +libSalomeStyle_la_SOURCES = SalomeStyle.cxx -CPPFLAGS+=$(QT_INCLUDES) +libSalomeStyle_la_CPPFLAGS=$(QT_INCLUDES) -LDFLAGS+=$(QT_MT_LIBS) -LIBS+= -lsuit +libSalomeStyle_la_LDFLAGS=$(QT_MT_LIBS) -@CONCLUDE@ +EXTRA_DIST+=SalomeStyle.h +install-exec-hook: + mkdir -p $(bindir)/styles + ln -sf $(libdir)/libSalomeStyle.so $(bindir)/styles +uninstall-hook: + rm -f $(bindir)/styles/libSalomeStyle.so diff --git a/src/Style/Makefile.in b/src/Style/Makefile.in deleted file mode 100644 index 6de6bc78d..000000000 --- a/src/Style/Makefile.in +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vladimir Klyachin (OCN) -# Module : SalomeApp - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -# .po files to transform in .qm -PO_FILES = - -# Libraries targets -LIB = libSalomeStyle.la - -LIB_SRC= SalomeStyle.cxx - -LIB_MOC = - -LIB_CLIENT_IDL = - -RESOURCES_FILES = - -CPPFLAGS+=$(QT_INCLUDES) - -LDFLAGS+=$(QT_MT_LIBS) -LIBS+= - -# create $(top_builddir)/src/Session/styles directory and copy libSalomeStyle.so there -LIB_PLUGINDIR = $(top_builddir)/src/Session/styles -LIB_PLUGINLIB = $(patsubst %.la, $(LIB_PLUGINDIR)/%.so, $(filter %.la, $(LIB))) - -lib: $(LIB) $(LIB_PLUGINDIR) $(LIB_PLUGINLIB) - -$(LIB_PLUGINDIR): - mkdir -p $@ - -$(LIB_PLUGINLIB): $(LIB_PLUGINDIR)/%.so: .libs/%.so - -$(RM) $@ - ln -sf $(CURDIR)/$< $@ || true - -# do the same in install step -INSTALL_PLUGINDIR = $(bindir)/styles -INSTALL_COPYLIB = $(patsubst %.la, $(INSTALL_PLUGINDIR)/%.so, $(filter %.la, $(LIB))) - -install: $(INSTALL_PLUGINDIR) $(INSTALL_COPYLIB) - -$(INSTALL_PLUGINDIR): - mkdir -p $@ - -$(INSTALL_COPYLIB): - (cd $(bindir)/styles; ln -sf $(patsubst %.la, ../../../lib@LIB_LOCATION_SUFFIX@/salome/%.so, $(filter %.la, $(LIB))) $@) || true - -@CONCLUDE@ - diff --git a/src/TOOLSGUI/Makefile.in b/src/TOOLSGUI/Makefile.am similarity index 52% rename from src/TOOLSGUI/Makefile.in rename to src/TOOLSGUI/Makefile.am index bec8e5a2b..3f718f41a 100755 --- a/src/TOOLSGUI/Makefile.in +++ b/src/TOOLSGUI/Makefile.am @@ -26,41 +26,37 @@ # Module : SALOME # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:@srcdir@/resources +include $(top_srcdir)/adm_local/unix/make_common_starter.am +lib_LTLIBRARIES = libToolsGUI.la -@COMMENCE@ +salomeinclude_HEADERS= \ + ToolsGUI.h \ + ToolsGUI_RegWidget.h \ + ToolsGUI_CatalogGeneratorDlg.h -# header files -EXPORT_HEADERS = ToolsGUI.h \ - ToolsGUI_RegWidget.h \ - ToolsGUI_CatalogGeneratorDlg.h +dist_libToolsGUI_la_SOURCES= \ + ToolsGUI_CatalogGeneratorDlg.cxx \ + ToolsGUI_HelpWindow.cxx \ + ToolsGUI_RegWidget.cxx \ + ToolsGUI_IntervalWindow.cxx \ + ToolsGUI.cxx -# .po files to transform in .qm -PO_FILES = ToolsGUI_icons.po \ - ToolsGUI_msg_en.po - -# Libraries targets -LIB = libToolsGUI.la - -LIB_SRC = ToolsGUI_CatalogGeneratorDlg.cxx \ - ToolsGUI_HelpWindow.cxx \ - ToolsGUI_RegWidget.cxx \ - ToolsGUI_IntervalWindow.cxx \ - ToolsGUI.cxx - -LIB_MOC = ToolsGUI_CatalogGeneratorDlg.h \ - ToolsGUI_RegWidget.h +EXTRA_DIST+= ToolsGUI_HelpWindow.h ToolsGUI_IntervalWindow.h -LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl - -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) - -LDFLAGS += $(QT_MT_LIBS) -lsuit $(CAS_KERNEL) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil - -@CONCLUDE@ +MOC_FILES= \ + ToolsGUI_CatalogGeneratorDlg_moc.cxx \ + ToolsGUI_RegWidget_moc.cxx +nodist_libToolsGUI_la_SOURCES= $(MOC_FILES) +# .po files to transform in .qm +nodist_salomeres_DATA= \ + ToolsGUI_icons.qm \ + ToolsGUI_msg_en.qm + +libToolsGUI_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \ + @KERNEL_CXXFLAGS@ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ + -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl \ + -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT +libToolsGUI_la_LDFLAGS = $(QT_MT_LIBS) ../SUIT/libsuit.la $(CAS_KERNEL) $(KERNEL_LDFLAGS) \ + -lSalomeNS -lOpUtil $(top_builddir)/idl/libSalomeIDLGUI.so diff --git a/src/VTKViewer/Makefile.am b/src/VTKViewer/Makefile.am new file mode 100755 index 000000000..f95942888 --- /dev/null +++ b/src/VTKViewer/Makefile.am @@ -0,0 +1,120 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Vladimir Klyachin (OCN) +# Module : VTKViewer +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES = libVTKViewer.la + +salomeinclude_HEADERS= \ + VTKViewer.h \ + VTKViewer_CellLocationsArray.h \ + VTKViewer_Actor.h \ + VTKViewer_ExtractUnstructuredGrid.h \ + VTKViewer_ConvexTool.h \ + VTKViewer_Filter.h \ + VTKViewer_GeometryFilter.h \ + VTKViewer_AppendFilter.h \ + VTKViewer_Algorithm.h \ + VTKViewer_InteractorStyle.h \ + VTKViewer_PassThroughFilter.h \ + VTKViewer_RenderWindow.h \ + VTKViewer_RenderWindowInteractor.h \ + VTKViewer_ShrinkFilter.h \ + VTKViewer_TransformFilter.h \ + VTKViewer_Transform.h \ + VTKViewer_Trihedron.h \ + VTKViewer_Utilities.h \ + VTKViewer_VectorText.h \ + VTKViewer_ViewManager.h \ + VTKViewer_ViewModel.h \ + VTKViewer_ViewWindow.h \ + VTKViewer_Functor.h + +dist_libVTKViewer_la_SOURCES= \ + VTKViewer_CellLocationsArray.cxx \ + VTKViewer_Actor.cxx \ + VTKViewer_ExtractUnstructuredGrid.cxx \ + VTKViewer_Filter.cxx \ + VTKViewer_GeometryFilter.cxx \ + VTKViewer_AppendFilter.cxx \ + VTKViewer_InteractorStyle.cxx \ + VTKViewer_PassThroughFilter.cxx \ + VTKViewer_RenderWindow.cxx \ + VTKViewer_RenderWindowInteractor.cxx \ + VTKViewer_ShrinkFilter.cxx \ + VTKViewer_Transform.cxx \ + VTKViewer_TransformFilter.cxx \ + VTKViewer_Trihedron.cxx \ + VTKViewer_Utilities.cxx \ + VTKViewer_VectorText.cxx \ + VTKViewer_ViewManager.cxx \ + VTKViewer_ViewModel.cxx \ + VTKViewer_ConvexTool.cxx \ + VTKViewer_ViewWindow.cxx + +MOC_FILES= \ + VTKViewer_RenderWindow_moc.cxx \ + VTKViewer_RenderWindowInteractor_moc.cxx \ + VTKViewer_ViewManager_moc.cxx \ + VTKViewer_ViewModel_moc.cxx \ + VTKViewer_ViewWindow_moc.cxx +nodist_libVTKViewer_la_SOURCES= $(MOC_FILES) + +dist_salomeres_DATA=\ + resources/view_back.png \ + resources/view_bottom.png \ + resources/view_camera_dump.png \ + resources/view_fitall.png \ + resources/view_fitarea.png \ + resources/view_front.png \ + resources/view_glpan.png \ + resources/view_graduated_axes.png \ + resources/view_left.png \ + resources/view_pan.png \ + resources/view_reset.png \ + resources/view_right.png \ + resources/view_rotate.png \ + resources/view_scaling.png \ + resources/view_top.png \ + resources/view_triedre.png \ + resources/view_update_rate.png \ + resources/view_zoom.png + +nodist_salomeres_DATA= \ + VTKViewer_images.qm \ + VTKViewer_msg_en.qm + +libVTKViewer_la_CPPFLAGS=$(QT_INCLUDES) $(VTK_INCLUDES) $(CAS_CPPFLAGS) \ + -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT +libVTKViewer_la_LDFLAGS=$(VTK_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) \ + ../Qtx/libqtx.la ../SUIT/libsuit.la + +# Executable + +bin_PROGRAMS = VTKViewer + +dist_VTKViewer_SOURCES=VTKViewer.cxx + +VTKViewer_CPPFLAGS=$(libVTKViewer_la_CPPFLAGS) +VTKViewer_LDADD=libVTKViewer.la $(libVTKViewer_la_LDFLAGS) + diff --git a/src/VTKViewer/Makefile.in b/src/VTKViewer/Makefile.in deleted file mode 100755 index 9fee23fb8..000000000 --- a/src/VTKViewer/Makefile.in +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vladimir Klyachin (OCN) -# Module : VTKViewer -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= \ - VTKViewer.h \ - VTKViewer_CellLocationsArray.h \ - VTKViewer_Actor.h \ - VTKViewer_ExtractUnstructuredGrid.h \ - VTKViewer_ConvexTool.h \ - VTKViewer_Filter.h \ - VTKViewer_GeometryFilter.h \ - VTKViewer_AppendFilter.h \ - VTKViewer_Algorithm.h \ - VTKViewer_InteractorStyle.h \ - VTKViewer_PassThroughFilter.h \ - VTKViewer_RenderWindow.h \ - VTKViewer_RenderWindowInteractor.h \ - VTKViewer_ShrinkFilter.h \ - VTKViewer_TransformFilter.h \ - VTKViewer_Transform.h \ - VTKViewer_Trihedron.h \ - VTKViewer_Utilities.h \ - VTKViewer_VectorText.h \ - VTKViewer_ViewManager.h \ - VTKViewer_ViewModel.h \ - VTKViewer_ViewWindow.h \ - VTKViewer_Functor.h - -PO_FILES = \ - VTKViewer_images.po \ - VTKViewer_msg_en.po - -# Libraries targets -LIB = libVTKViewer.la - -LIB_SRC= \ - VTKViewer_CellLocationsArray.cxx \ - VTKViewer_Actor.cxx \ - VTKViewer_ExtractUnstructuredGrid.cxx \ - VTKViewer_Filter.cxx \ - VTKViewer_GeometryFilter.cxx \ - VTKViewer_AppendFilter.cxx \ - VTKViewer_InteractorStyle.cxx \ - VTKViewer_PassThroughFilter.cxx \ - VTKViewer_RenderWindow.cxx \ - VTKViewer_RenderWindowInteractor.cxx \ - VTKViewer_ShrinkFilter.cxx \ - VTKViewer_Transform.cxx \ - VTKViewer_TransformFilter.cxx \ - VTKViewer_Trihedron.cxx \ - VTKViewer_Utilities.cxx \ - VTKViewer_VectorText.cxx \ - VTKViewer_ViewManager.cxx \ - VTKViewer_ViewModel.cxx \ - VTKViewer_ConvexTool.cxx \ - VTKViewer_ViewWindow.cxx - -LIB_MOC = \ - VTKViewer_RenderWindow.h \ - VTKViewer_RenderWindowInteractor.h \ - VTKViewer_ViewManager.h \ - VTKViewer_ViewModel.h \ - VTKViewer_ViewWindow.h - -BIN = VTKViewer - -CPPFLAGS+=$(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) - -LDFLAGS+=$(VTK_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) -lqtx -lsuit - -LDFLAGSFORBIN=$(LDFLAGS) - -@CONCLUDE@ \ No newline at end of file diff --git a/src/VTKViewer/VTKViewer.cxx b/src/VTKViewer/VTKViewer.cxx index 6a548f1df..8a35f8bc1 100644 --- a/src/VTKViewer/VTKViewer.cxx +++ b/src/VTKViewer/VTKViewer.cxx @@ -27,7 +27,6 @@ // $Header$ #include "VTKViewer_Actor.h" -#include "VTKViewer_CellRectPicker.h" #include "VTKViewer_ExtractUnstructuredGrid.h" #include "VTKViewer_ConvexTool.h" #include "VTKViewer_Filter.h" @@ -36,7 +35,6 @@ #include "VTKViewer_Algorithm.h" #include "VTKViewer_InteractorStyle.h" #include "VTKViewer_PassThroughFilter.h" -#include "VTKViewer_RectPicker.h" #include "VTKViewer_RenderWindow.h" #include "VTKViewer_RenderWindowInteractor.h" #include "VTKViewer_ShrinkFilter.h" diff --git a/src/VTKViewer/VTKViewer_CellRectPicker.cxx b/src/VTKViewer/VTKViewer_CellRectPicker.cxx deleted file mode 100755 index 016da1f75..000000000 --- a/src/VTKViewer/VTKViewer_CellRectPicker.cxx +++ /dev/null @@ -1,443 +0,0 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -#include - -#include "vtkGenericCell.h" -#include "vtkAssemblyNode.h" -#include "vtkAssemblyPath.h" -#include "vtkObjectFactory.h" -#include "vtkImageData.h" -#include "vtkMapper.h" -#include "vtkVolumeMapper.h" -#include "vtkMath.h" -#include "vtkLine.h" -#include "vtkQuad.h" -#include "vtkPoints.h" -#include "vtkPlane.h" -#include "vtkActor.h" - -vtkStandardNewMacro(VTKViewer_CellRectPicker); - -/*!Constructor.\n - * \li create instance of generic cell - * \li create two instances of Quad. - */ -VTKViewer_CellRectPicker::VTKViewer_CellRectPicker() -{ - this->Cell = vtkGenericCell::New(); - this->Quad1 = vtkQuad::New(); - this->Quad2 = vtkQuad::New(); -} - -/*!Destructor. - * \li Delete generic cell - * \li Delete two quads. - */ -VTKViewer_CellRectPicker::~VTKViewer_CellRectPicker() -{ - this->Cell->Delete(); - this->Quad1->Delete(); - this->Quad2->Delete(); -} - -/*!Clear \a ActorData and call VTKViewer_RectPicker::Initialize() method*/ -void VTKViewer_CellRectPicker::Initialize() -{ - ActorData.clear(); - this->VTKViewer_RectPicker::Initialize(); -} - -/*!*/ -float VTKViewer_CellRectPicker::IntersectWithHex(float p1[4][4], float p2[4][4], float tol, - vtkAssemblyPath *path, vtkProp3D *prop3D, - vtkAbstractMapper3D *m) -{ - vtkDataSet *input; - vtkMapper *mapper; - vtkVolumeMapper *volumeMapper; - - // Get the underlying dataset - if ( (mapper=vtkMapper::SafeDownCast(m)) != NULL ) { - input = mapper->GetInput(); - } - else if ( (volumeMapper=vtkVolumeMapper::SafeDownCast(m)) != NULL ) { - input = volumeMapper->GetInput(); - } - else { - return VTK_LARGE_FLOAT; - } - - vtkIdType numCells; - if ( (numCells = input->GetNumberOfCells()) < 1 ) { - return 2.0; - } - - int i, k, subId; - float bounds[6], center[3], cp1[3], cp2[3]; - float pcoord[3], weight[4], dist; - float t1[2], t2[2], x[3], t; - - for (k = 0; k < 4; k++) { - this->Quad1->PointIds->SetId(k, k); - this->Quad1->Points->SetPoint(k, p1[k]); - this->Quad2->PointIds->SetId(k, k); - this->Quad2->Points->SetPoint(k, p2[k]); - } - - /* - cout << "---> Selection area:" << endl; - for (k = 0; k < 4; k++) - cout << "\t(" << p1[k][0] << ", " << p1[k][1] << ", " << p1[k][2] << ")"; - cout << endl; - for (k = 0; k < 4; k++) - cout << "\t(" << p2[k][0] << ", " << p2[k][1] << ", " << p2[k][2] << ")"; - cout << endl; - */ - - vtkIdType cellId; - VTKViewer_CellData cellData; - VTKViewer_CellDataSet dataList; - - char inside; int n; float *point; - float tMin = VTK_LARGE_FLOAT, xMin[3]; - for (cellId = 0; cellId < numCells; cellId++) { - input->GetCell(cellId, this->Cell); - - this->Cell->GetBounds(bounds); - for (i = 0; i < 3; i++) - center[i] = (bounds[2*i]+bounds[2*i+1])/2; - - /* - if (!VTKViewer_RectPicker::PointInside(center, p1, p2, 0.01)) - continue; - */ - - inside = 1; - n = this->Cell->Points->GetNumberOfPoints(); - //cout << "---> Info cell " << cellId << " (" << n << "): " << endl; - for (k = 0; k < n; k++) { - point = this->Cell->Points->GetPoint(k); - //cout << " P (" << point[0] << ", " << point[1] << ", " << point[2] << ")"; - if (!VTKViewer_RectPicker::PointInside(point, p1, p2)) { - inside = 0; break; - } - } - //cout << endl; - if (!inside) continue; - - //cout << "---> Inside cell " << cellId << endl; - - this->Quad1->EvaluatePosition(center, 0, subId, pcoord, dist, weight); - t1[0] = pcoord[0]; t1[1] = pcoord[1]; - this->Quad2->EvaluatePosition(center, 0, subId, pcoord, dist, weight); - t2[0] = pcoord[0]; t2[1] = pcoord[1]; - - pcoord[0] = (t1[0]+t2[0])/2; pcoord[1] = (t1[1]+t2[1])/2; pcoord[2] = 0; - - this->Quad1->EvaluateLocation(subId, pcoord, cp1, weight); - this->Quad2->EvaluateLocation(subId, pcoord, cp2, weight); - - if (this->Cell->IntersectWithLine(cp1, cp2, tol, t, x, pcoord, subId)) { - cellData.cellId = cellId; - cellData.subId = subId; - cellData.depth = t; - for (i = 0; i < 3; i++) { - cellData.p1[i] = cp1[i]; - cellData.p2[i] = cp2[i]; - } - /* - cout << "---> Include cell " << cellId << ", depth = " << t << endl; - cout << " P1 = (" << cp1[0] << ", " << cp1[1] << ", " << cp1[2] << ")" << endl; - cout << " P2 = (" << cp2[0] << ", " << cp2[1] << ", " << cp2[2] << ")" << endl; - */ - IncludeCell(input, cellData, dataList); - if (t < tMin) { - tMin = t; - for (i = 0; i < 3; i++) - xMin[i] = x[i]; - } - } - } - - if (!dataList.empty()) { - // compare against other actors - IncludeActor(prop3D, input, dataList); - if (tMin < this->GlobalTMin) { - this->MarkPicked(path, prop3D, m, tMin, xMin); - } - } - - return tMin; -} - -/*!*/ -void VTKViewer_CellRectPicker::IncludeCell(vtkDataSet* input, - VTKViewer_CellData cellData, - VTKViewer_CellDataSet& dataList) -{ - vtkGenericCell* cell1 = vtkGenericCell::New(); - vtkGenericCell* cell2 = vtkGenericCell::New(); - vtkCell* sub1 = 0; - vtkCell* sub2 = 0; - - input->GetCell(cellData.cellId, cell1); - if (cell1->GetNumberOfFaces() > 0) - sub1 = cell1->GetFace(cellData.subId); - - int i, result; - float p1[3], p2[3], dir[3]; - char add = 1; - - VTKViewer_CellData curData; - VTKViewer_CellDataSet::iterator it; - for (it = dataList.begin(); it != dataList.end();) { - curData = *it; - for (i = 0; i < 3; i++) { - p1[i] = (cellData.p1[i]+curData.p1[i])/2; - p2[i] = (cellData.p2[i]+curData.p2[i])/2; - dir[i] = p2[i] - p1[i]; - } - - input->GetCell(curData.cellId, cell2); - sub2 = 0; - if (cell2->GetNumberOfFaces() > 0) - sub2 = cell2->GetFace(curData.subId); - - if (sub1) { - if (sub2) - result = IntersectCells(sub1, cellData.depth, - sub2, curData.depth, dir); - else - result = IntersectCells(sub1, cellData.depth, - cell2, curData.depth, dir); - } - else { - if (sub2) - result = IntersectCells(cell1, cellData.depth, - sub2, curData.depth, dir); - else - result = IntersectCells(cell1, cellData.depth, - cell2, curData.depth, dir); - } - /* - cout << " Direction = (" << dir[0] << ", " << dir[1] << ", " << dir[2] << ")"; - cout << " depth = " << cellData.depth << ", " << curData.depth << ", " << result << endl; - */ - if (result > 0) { - if (result == 1) { - it = dataList.erase(it); - continue; - } - else { - add = 0; - break; - } - } - ++it; - } - if (add) { - //cout << " add " << endl; - dataList.push_back(cellData); - } - - cell1->Delete(); - cell2->Delete(); -} - -/*!*/ -void VTKViewer_CellRectPicker::IncludeActor(vtkProp3D* prop, - vtkDataSet* input, - VTKViewer_CellDataSet& dataList) -{ - vtkGenericCell* cell1 = vtkGenericCell::New(); - vtkGenericCell* cell2 = vtkGenericCell::New(); - - int i, result; - float p1[3], p2[3], dir[3]; - char removed; - - VTKViewer_CellDataSet actorData; - VTKViewer_CellData curData, cellData; - VTKViewer_CellDataSet::iterator it1, it2; - VTKViewer_ActorDataMap::iterator it; - - for (it1 = dataList.begin(); it1 != dataList.end();) { - cellData = *it1; - input->GetCell(cellData.cellId, cell1); - removed = 0; - - for (it = ActorData.begin(); it != ActorData.end(); ++it) { - //vtkActor* actor = (*it).first; - actorData = (*it).second; - - for (it2 = actorData.begin(); it2 != actorData.end();) { - curData = *it2; - for (i = 0; i < 3; i++) { - p1[i] = (cellData.p1[i]+curData.p1[i])/2; - p2[i] = (cellData.p2[i]+curData.p2[i])/2; - dir[i] = p2[i] - p1[i]; - } - - input->GetCell(curData.cellId, cell2); - result = IntersectCells(cell1, cellData.depth, - cell2, curData.depth, dir); - if (result > 0) { - if (result == 1) { - it2 = actorData.erase(it2); - continue; - } - else { - removed = 1; - it1 = dataList.erase(it1); - break; - } - break; - } - ++it2; - } - if (removed) break; - } // by actors - if (!removed) ++it1; - } - - if (!dataList.empty()) { - vtkActor* actor; - if ((actor = vtkActor::SafeDownCast(prop)) != NULL) - ActorData[actor] = dataList; - } - - cell1->Delete(); - cell2->Delete(); -} - -/*! The method returns a non-zero value, if the cells intersect each other - * in the direction dir[3]. - * \param c1 - first vtkCell pointer - * \param d1 - - * \param c2 - second vtkCell pointer - * \param d2 - - * \param dir[3] - direction - * \retval integer - Returned value is 1 if the first cell is top of - * the second one according to direction and 2 if the second cell is top. - */ -int VTKViewer_CellRectPicker::IntersectCells(vtkCell* c1, float d1, vtkCell* c2, float d2, float dir[3]) -{ - int i, k; - float *orig, cp[3], bounds[6]; - vtkCell* cell = 0; - vtkCell* tcell = 0; - - // define the central point and cell for projection - if (fabs(d1-d2) < 1.e-7) return 0; - - if (d1 < d2) { - orig = c1->Points->GetPoint(0); - cell = c1; - tcell = c2; - c2->GetBounds(bounds); - for (i = 0; i < 3; i++) - cp[i] = (bounds[2*i] + bounds[2*i+1])/2; - } - else if (d1 > d2) { - orig = c2->Points->GetPoint(0); - cell = c2; - tcell = c1; - c1->GetBounds(bounds); - for (i = 0; i < 3; i++) - cp[i] = (bounds[2*i] + bounds[2*i+1])/2; - } - - float proj[3]; - vtkPlane::GeneralizedProjectPoint(cp, orig, dir, proj); - - float *p, pp[3]; - vtkPoints* aPoints = vtkPoints::New(); - for (k = 0; k < cell->Points->GetNumberOfPoints(); k++) { - p = cell->Points->GetPoint(k); - vtkPlane::GeneralizedProjectPoint(p, orig, dir, pp); - aPoints->InsertNextPoint(pp[0], pp[1], pp[2]); - } - - int result = 0; - if (PointInside(proj, aPoints)) { - result = (d1Points->GetNumberOfPoints(); k++) { - p = tcell->Points->GetPoint(k); - vtkPlane::GeneralizedProjectPoint(p, orig, dir, pp); - if (PointInside(pp, aPoints)) { - result = 1; break; - } - } - if (result && d2Delete(); - return result; -} - -/*! Check point position. - * \param point[3] - point - * \param list - point data set - * \retval 0 or 1 - The method returns a non-zero value, if the point is inlide point data set - */ -char VTKViewer_CellRectPicker::PointInside(float point[3], vtkPoints* list) -{ - int i, k, l, n; - float x[3], *a1, *a2, v[3], p[3], q[3]; - - n = list->GetNumberOfPoints(); - if (n < 3) return 0; - - for (k = 0; k < n; k++) { - l = k+1; if (l == n) l = 0; - a1 = list->GetPoint(k); - a2 = list->GetPoint(l); - - // compute vectors - for (i = 0; i < 3; i++) { - x[i] = point[i] - a1[i]; - v[i] = a2[i]-a1[i]; - } - - // check if point coincides with vertex - if (x[0]*x[0] + x[1]*x[1] + x[2]*x[2] < 1.e-7) return 0; - - // compute normal - vtkMath::Cross(x, v, p); - - // check if point lays on edge - if (p[0]*p[0] + p[1]*p[1] + p[2]*p[2] < 1.e-7) return 0; - - // check if normals are in the same direction - if (k > 0) { - if (vtkMath::Dot(p, q) < 0.0) return 0; - } - - // remember normal direction - for (i = 0; i < 3; i++) { - q[i] = p[i]; - } - } - - return 1; -} diff --git a/src/VTKViewer/VTKViewer_CellRectPicker.h b/src/VTKViewer/VTKViewer_CellRectPicker.h deleted file mode 100755 index f50636ab2..000000000 --- a/src/VTKViewer/VTKViewer_CellRectPicker.h +++ /dev/null @@ -1,98 +0,0 @@ -// SALOME VTKViewer : build VTK viewer into Salome desktop -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// File : VTKViewer_CellRectPicker.h -// Author : Natalia KOPNOVA -// Module : SALOME - - -#ifndef __VTKViewer_CellRectPicker_h -#define __VTKViewer_CellRectPicker_h - -#include "VTKViewer_RectPicker.h" -#include -#include - -/*! \brief Cell data structure*/ -typedef struct { - vtkIdType cellId; - int subId; - float depth; - float p1[3]; - float p2[3]; -} VTKViewer_CellData; - -typedef std::vector VTKViewer_CellDataSet; -typedef std::map VTKViewer_ActorDataMap; - -class vtkCell; -class vtkGenericCell; -class vtkQuad; -/*!Rectangular cell picker class.*/ -class VTK_EXPORT VTKViewer_CellRectPicker : public VTKViewer_RectPicker -{ -public: - /*!Create new instance of CellRectPicker class.*/ - static VTKViewer_CellRectPicker *New(); - - /*! \fn vtkTypeMacro(VTKViewer_CellRectPicker,VTKViewer_RectPicker); - * \brief VTK type macros. - */ - vtkTypeMacro(VTKViewer_CellRectPicker,VTKViewer_RectPicker); - - /*! \fn VTKViewer_CellDataSet GetCellData(vtkActor* actor) - * \brief Get the id of the picked cells. - * \brief (Notes: use GetActors() to get picked actors list) - * \param actor - vtkActor pointer - */ - VTKViewer_CellDataSet GetCellData(vtkActor* actor) - { return this->ActorData[actor]; } - - static int IntersectCells(vtkCell* c1, float d1, vtkCell* c2, float d2, float dir[3]); - - static char PointInside(float point[3], vtkPoints* list); - -protected: - - VTKViewer_CellRectPicker(); - ~VTKViewer_CellRectPicker(); - - VTKViewer_ActorDataMap ActorData; - - virtual float IntersectWithHex(float p1[4][4], float p2[4][4], float tol, - vtkAssemblyPath *path, vtkProp3D *p, - vtkAbstractMapper3D *m); - - void Initialize(); - - - void IncludeCell(vtkDataSet* input, VTKViewer_CellData cellData, VTKViewer_CellDataSet& dalaList); - void IncludeActor(vtkProp3D* prop, vtkDataSet* input, VTKViewer_CellDataSet& dataList); - -private: - vtkGenericCell *Cell; - vtkQuad* Quad1; - vtkQuad* Quad2; -}; - -#endif - - diff --git a/src/VTKViewer/VTKViewer_RectPicker.cxx b/src/VTKViewer/VTKViewer_RectPicker.cxx deleted file mode 100755 index 70dcad675..000000000 --- a/src/VTKViewer/VTKViewer_RectPicker.cxx +++ /dev/null @@ -1,894 +0,0 @@ -// SALOME VTKViewer : build VTK viewer into Salome desktop -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : VTKViewer_RectPicker.cxx -// Author : Natalia KOPNOVA -// Module : SALOME - -#include - -#include "vtkActor.h" -#include "vtkAssemblyNode.h" -#include "vtkAssemblyPath.h" -#include "vtkCamera.h" -#include "vtkCommand.h" -#include "vtkImageData.h" -#include "vtkLODProp3D.h" -#include "vtkMapper.h" -#include "vtkMath.h" -#include "vtkObjectFactory.h" -#include "vtkPoints.h" -#include "vtkProp3DCollection.h" -#include "vtkProperty.h" -#include "vtkRenderWindow.h" -#include "vtkRenderer.h" -#include "vtkTransform.h" -#include "vtkVertex.h" -#include "vtkVolume.h" -#include "vtkVolumeMapper.h" - -using namespace std; - - -vtkStandardNewMacro(VTKViewer_RectPicker); - - -/*!Constructor. Do nothing*/ -VTKViewer_RectPicker::VTKViewer_RectPicker() -{ -} - - -/*!Perform pick operation with selection rectangle provided. Normally the - * first two values for the selection top-left and right-bottom points are - * x-y pixel coordinate, and the third value is =0. - * \retval Return non-zero if something was successfully picked. - */ -int VTKViewer_RectPicker::Pick(float selectionX1, float selectionY1, float selectionZ1, - float selectionX2, float selectionY2, float selectionZ2, - vtkRenderer *renderer) -{ - int k, i; - vtkProp *prop; - vtkCamera *camera; - vtkAbstractMapper3D *mapper = NULL; - float p1World[4][4], p2World[4][4], p1Mapper[4][4], p2Mapper[4][4]; - float c1[3], c2[3]; - int picked=0; - int *winSize; - float x, y, t, p; - float *viewport; - float cameraPos[4], cameraFP[4]; - float *displayCoords, *worldCoords; - float pickPosition[4][3]; - double *clipRange; - float ray[4][3], rayLength[4]; - int pickable; - int LODId; - float windowLowerLeft[4], windowUpperRight[4]; - float bounds[6], tol; - float tF, tB; - float hitPosition[3]; - float cameraDOP[3]; - - // Initialize picking process - this->Initialize(); - this->Renderer = renderer; - - /* Selection point is not defined for the rectangle - this->SelectionPoint[0] = - this->SelectionPoint[1] = - this->SelectionPoint[2] = - */ - - // Invoke start pick method if defined - this->InvokeEvent(vtkCommand::StartPickEvent,NULL); - - if ( renderer == NULL ) - { - vtkErrorMacro(<<"Must specify renderer!"); - return 0; - } - - // Get camera focal point and position. Convert to display (screen) - // coordinates. We need a depth value for z-buffer. - // - camera = renderer->GetActiveCamera(); - camera->GetPosition((float *)cameraPos); cameraPos[3] = 1.0; - camera->GetFocalPoint((float *)cameraFP); cameraFP[3] = 1.0; - - renderer->SetWorldPoint(cameraFP); - renderer->WorldToDisplay(); - displayCoords = renderer->GetDisplayPoint(); - selectionZ1 = selectionZ2 = displayCoords[2]; - - // Convert the selection rectangle into world coordinates. - // - renderer->SetDisplayPoint(selectionX1, selectionY1, selectionZ1); - renderer->DisplayToWorld(); - worldCoords = renderer->GetWorldPoint(); - if ( worldCoords[3] == 0.0 ) - { - vtkErrorMacro(<<"Bad homogeneous coordinates"); - return 0; - } - for (i=0; i < 3; i++) - { - pickPosition[0][i] = worldCoords[i] / worldCoords[3]; - } - - renderer->SetDisplayPoint(selectionX1, selectionY2, (selectionZ1+selectionZ2)/2); - renderer->DisplayToWorld(); - worldCoords = renderer->GetWorldPoint(); - if ( worldCoords[3] == 0.0 ) - { - vtkErrorMacro(<<"Bad homogeneous coordinates"); - return 0; - } - for (i=0; i < 3; i++) - { - pickPosition[1][i] = worldCoords[i] / worldCoords[3]; - } - - renderer->SetDisplayPoint(selectionX2, selectionY2, selectionZ2); - renderer->DisplayToWorld(); - worldCoords = renderer->GetWorldPoint(); - if ( worldCoords[3] == 0.0 ) - { - vtkErrorMacro(<<"Bad homogeneous coordinates"); - return 0; - } - for (i=0; i < 3; i++) - { - pickPosition[2][i] = worldCoords[i] / worldCoords[3]; - } - - renderer->SetDisplayPoint(selectionX2, selectionY1, (selectionZ1+selectionZ2)/2); - renderer->DisplayToWorld(); - worldCoords = renderer->GetWorldPoint(); - if ( worldCoords[3] == 0.0 ) - { - vtkErrorMacro(<<"Bad homogeneous coordinates"); - return 0; - } - for (i=0; i < 3; i++) - { - pickPosition[3][i] = worldCoords[i] / worldCoords[3]; - } - - // Compute the ray endpoints. The ray is along the line running from - // the camera position to the selection point, starting where this line - // intersects the front clipping plane, and terminating where this - // line intersects the back clipping plane. - for (k=0; k < 4; k++) { - for (i=0; i<3; i++) - { - ray[k][i] = pickPosition[k][i] - cameraPos[i]; - } - } - for (i=0; i<3; i++) - { - cameraDOP[i] = cameraFP[i] - cameraPos[i]; - } - - vtkMath::Normalize(cameraDOP); - - for (k=0; k < 4; k++) { - if (( rayLength[k] = vtkMath::Dot(cameraDOP,ray[k])) == 0.0 ) - { - vtkWarningMacro("Cannot process points"); - return 0; - } - } - - clipRange = camera->GetClippingRange(); - - if ( camera->GetParallelProjection() ) - { - for (k=0; k < 4; k++) { - tF = clipRange[0] - rayLength[k]; - tB = clipRange[1] - rayLength[k]; - for (i=0; i<3; i++) - { - p1World[k][i] = pickPosition[k][i] + tF*cameraDOP[i]; - p2World[k][i] = pickPosition[k][i] + tB*cameraDOP[i]; - } - p1World[k][3] = p2World[k][3] = 1.0; - } - } - else - { - for (k=0; k < 4; k++) { - tF = clipRange[0] / rayLength[k]; - tB = clipRange[1] / rayLength[k]; - for (i=0; i<3; i++) - { - p1World[k][i] = cameraPos[i] + tF*ray[k][i]; - p2World[k][i] = cameraPos[i] + tB*ray[k][i]; - } - p1World[k][3] = p2World[k][3] = 1.0; - } - } - - // Compute the center points of ray rectangle - for (i=0; i<3; i++) { - c1[i] = c2[i] = 0; - for (k=0; k<4; k++) { - c1[i] += p1World[k][i]; - c2[i] += p2World[k][i]; - } - c1[i] = c1[i]/4; - c2[i] = c2[i]/4; - } - - // Compute the tolerance in world coordinates. Do this by - // determining the world coordinates of the diagonal points of the - // window, computing the width of the window in world coordinates, and - // multiplying by the tolerance. - // - viewport = renderer->GetViewport(); - winSize = renderer->GetRenderWindow()->GetSize(); - x = winSize[0] * viewport[0]; - y = winSize[1] * viewport[1]; - renderer->SetDisplayPoint(x, y, selectionZ1); - renderer->DisplayToWorld(); - renderer->GetWorldPoint(windowLowerLeft); - - x = winSize[0] * viewport[2]; - y = winSize[1] * viewport[3]; - renderer->SetDisplayPoint(x, y, selectionZ2); - renderer->DisplayToWorld(); - renderer->GetWorldPoint(windowUpperRight); - - for (tol=0.0,i=0; i<3; i++) - { - tol += (windowUpperRight[i] - windowLowerLeft[i]) * - (windowUpperRight[i] - windowLowerLeft[i]); - } - - tol = sqrt (tol) * this->Tolerance; - - // Loop over all props. Transform ray (defined from position of - // camera to selection point) into coordinates of mapper (not - // transformed to actors coordinates! Reduces overall computation!!!). - // Note that only vtkProp3D's can be picked by vtkPicker. - // - vtkPropCollection *props; - vtkProp *propCandidate; - if ( this->PickFromList ) - { - props = this->GetPickList(); - } - else - { - props = renderer->GetProps(); - } - - vtkActor *actor; - vtkLODProp3D *prop3D; - vtkVolume *volume; - vtkAssemblyPath *path; - vtkProperty *tempProperty; - this->Transform->PostMultiply(); - for ( props->InitTraversal(); (prop=props->GetNextProp()); ) - { - for ( prop->InitPathTraversal(); (path=prop->GetNextPath()); ) - { - pickable = 0; - actor = NULL; - propCandidate = path->GetLastNode()->GetProp(); - if ( propCandidate->GetPickable() && propCandidate->GetVisibility() ) - { - pickable = 1; - if ( (actor=vtkActor::SafeDownCast(propCandidate)) != NULL ) - { - mapper = actor->GetMapper(); - if ( actor->GetProperty()->GetOpacity() <= 0.0 ) - { - pickable = 0; - } - } - else if ( (prop3D=vtkLODProp3D::SafeDownCast(propCandidate)) != NULL ) - { - LODId = prop3D->GetPickLODID(); - mapper = prop3D->GetLODMapper(LODId); - - // if the mapper is a vtkMapper (as opposed to a vtkVolumeMapper), - // then check the transparency to see if the object is pickable - if ( vtkMapper::SafeDownCast(mapper) != NULL) - { - prop3D->GetLODProperty(LODId, &tempProperty); - if ( tempProperty->GetOpacity() <= 0.0 ) - { - pickable = 0; - } - } - } - else if ( (volume=vtkVolume::SafeDownCast(propCandidate)) != NULL ) - { - mapper = volume->GetMapper(); - } - else - { - pickable = 0; //only vtkProp3D's (actors and volumes) can be picked - } - } - // If actor can be picked, get its composite matrix, invert it, and - // use the inverted matrix to transform the ray points into mapper - // coordinates. - if ( pickable && mapper != NULL ) - { - vtkMatrix4x4 *LastMatrix = path->GetLastNode()->GetMatrix(); - if (LastMatrix == NULL) - { - vtkErrorMacro (<< "Pick: Null matrix."); - return 0; - } - this->Transform->SetMatrix(LastMatrix); - this->Transform->Push(); - this->Transform->Inverse(); - - for (k=0; k < 4; k++) { - this->Transform->TransformPoint(p1World[k],p1Mapper[k]); - this->Transform->TransformPoint(p2World[k],p2Mapper[k]); - - for (i=0; i<3; i++) - { - ray[k][i] = p2Mapper[k][i] - p1Mapper[k][i]; - } - } - - this->Transform->Pop(); - - // Have the ray endpoints in mapper space, now need to compare this - // with the mapper bounds to see whether intersection is possible. - // - // Get the bounding box of the modeller. Note that the tolerance is - // added to the bounding box to make sure things on the edge of the - // bounding box are picked correctly. - mapper->GetBounds(bounds); - bounds[0] -= tol; bounds[1] += tol; - bounds[2] -= tol; bounds[3] += tol; - bounds[4] -= tol; bounds[5] += tol; - if ( HitBBox(bounds, p1Mapper, ray) ) { - t = this->IntersectWithHex(p1Mapper, p2Mapper, tol, path, - (vtkProp3D *)propCandidate, mapper); - if ( t >= 0.0 && t <= 1.0 /*t < VTK_LARGE_FLOAT*/ ) { - picked = 1; - this->Prop3Ds->AddItem((vtkProp3D *)prop); - this->PickedPositions->InsertNextPoint - ((1.0 - t)*c1[0] + t*c2[0], - (1.0 - t)*c1[1] + t*c2[1], - (1.0 - t)*c1[2] + t*c2[2]); - - // backwards compatibility: also add to this->Actors - if (actor) { - this->Actors->AddItem(actor); - } - } - } - - }//if visible and pickable not transparent and has mapper - }//for all parts - }//for all actors - - // Invoke end pick method if defined - this->InvokeEvent(vtkCommand::EndPickEvent,NULL); - - return picked; -} - -#define SIDE_LEFT 0 -#define SIDE_RIGHT 1 -#define SIDE_MIDDLE 2 - -float GetParameterValue(float start, float end, float point) -{ - if (start == end) return -VTK_LARGE_FLOAT; - return (point-start)/(end-start); -} - -void GetPointCoord(const float start[3], const float end[3], float t, float point[3]) -{ - int i; - for (i = 0; i < 3; i++) { - point[i] = start[i] + t*(end[i]-start[i]); - } -} - -char GetIntersectionPoint(const float start[3], const float end[3], - const int& index, const float p, float point[3]) -{ - float t = GetParameterValue(start[index], end[index], p); - char result = 0; - if (t >= 0.0 && t <= 1.0) { - result = 1; - GetPointCoord(start, end, t, point); - } - return result; -} - - -/*! Bounding box intersection with hexahedron. Origin[4][4] starts the ray from corner points, - * dir[4][3] is the vector components of the ray in the x-y-z directions. - * (Notes: the intersection ray dir[4][3] is NOT normalized.) - * \retval The method returns a non-zero value, if the bounding box is hit. - */ -char VTKViewer_RectPicker::HitBBox (float bounds[6], float origin[4][4], float dir[4][3]) -{ - int i, j, k, n; - float endray[4][3]; - - for (k = 0; k < 4; k++) { - for (i = 0; i < 3; i++) { - endray[k][i] = origin[k][i] + dir[k][i]; - } - } - - // Compute hex bounding box, center point and center direction - float hbounds[6], center[3], ray[3]; - for (i = 0; i < 3; i++) { - hbounds[2*i] = hbounds[2*i+1] = origin[0][i]; - center[i] = ray[i] = 0; - for (k = 0; k < 4; k++) { - center[i] += origin[k][i]; - ray[i] += endray[k][i]; - if (origin[k][i] < hbounds[2*i]) { - hbounds[2*i] = origin[k][i]; - } - else if (origin[k][i] > hbounds[2*i+1]) - hbounds[2*i+1] = origin[k][i]; - if (endray[k][i] < hbounds[2*i]) - hbounds[2*i] = endray[k][i]; - else if (endray[k][i] > hbounds[2*i+1]) - hbounds[2*i+1] = endray[k][i]; - } - center[i] = center[i]/4; - ray[i] = ray[i]/4; - ray[i] = ray[i] - center[i]; - } - - // Check for intersection between bouning boxes - for (i = 0; i < 3; i++) { - if (bounds[2*i+1] < hbounds[2*i] || bounds[2*i] > hbounds[2*i+1]) - return 0; - } - - // Check if one of the origin point lays inside bbox - char inside; - for (k = 0; k < 4; k++) { - inside = 1; - for (i = 0; i < 3; i++) { - if (origin[k][i] < bounds[2*i] || origin[k][i] > bounds[2*i+1]) { - inside = 0; - break; - } - } - if (inside) return 1; - } - - // Find the closest coord plane for the center point - char side[3]; - float coordPlane[3]; - inside = 1; - for (i = 0; i < 3; i++) { - if (center[i] < bounds[2*i]) { - inside = 0; - coordPlane[i] = bounds[2*i]; - side[i] = SIDE_LEFT; - } - else if (center[i] > bounds[2*i+1]) { - inside = 0; - coordPlane[i] = bounds[2*i+1]; - side[i] = SIDE_RIGHT; - } - else { - coordPlane[i] = (ray[i]<0.0) ? bounds[2*i] : bounds[2*i+1]; - side[i] = SIDE_MIDDLE; - } - } - if (inside) return 1; - - // Calculate parametric distances to the planes and find the max - float maxT[3]; - int whichPlane = 0; - char defined = 0; - for (i = 0; i < 3; i++) { - if (side[i] != SIDE_MIDDLE && ray[i] != 0.0) { - maxT[i] = (coordPlane[i]-center[i])/ray[i]; - defined = 1; - } - else - maxT[i] = -1.0; - } - for (i = 0; i < 3; i++) { - if (maxT[whichPlane] < maxT[i]) - whichPlane = i; - } - - // Check for intersection along the center ray - float coord; - if (maxT[whichPlane] <= 1.0 && maxT[whichPlane] >= 0.0) { - inside = 1; - for (i = 0; i < 3; i++) { - if (i != whichPlane) { - coord = center[i] + maxT[whichPlane]*ray[i]; - if (coord < bounds[2*i] || coord > bounds[2*i+1]) - inside = 0; - } - } - if (inside) return 1; - } - - // Define the intersection plane - if (!defined) { - for (i = 0; i < 3; i++) { - if (ray[i] != 0.0) { - maxT[i] = (coordPlane[i]-center[i])/ray[i]; - } - else - maxT[i] = VTK_LARGE_FLOAT; - } - for (i = 0; i < 3; i++) { - if (maxT[whichPlane] > maxT[i]) - whichPlane = i; - } - } - - // Compute the intersection between hex and coord plane - float t[4]; - for (k = 0; k < 4; k++) { - if (dir[k][whichPlane] != 0.0) { - t[k] = (coordPlane[whichPlane]-origin[k][whichPlane])/dir[k][whichPlane]; - } - else { - t[k] = VTK_LARGE_FLOAT; - } - } - - vtkPoints* aPoints = vtkPoints::New(); - float p[3], q[3], t1; - for (k = 0; k < 4; k++) { - n = (k+1)%4; // next point - if (t[k] > 1.0) { - if (t[n] < 1.0) { - // find intersection point - t1 = GetParameterValue(endray[k][whichPlane], endray[n][whichPlane], coordPlane[whichPlane]); - if (t1 > 0.0 && t1 < 1.0) { - GetPointCoord(endray[k], endray[n], t1, p); - aPoints->InsertNextPoint(p[0], p[1], p[2]); - } - } - if (t[n] < 0.0) { - // find second intersection point - t1 = GetParameterValue(origin[k][whichPlane], origin[n][whichPlane], coordPlane[whichPlane]); - if (t1 > 0.0 && t1 < 1.0) { - GetPointCoord(origin[k], origin[n], t1, p); - aPoints->InsertNextPoint(p[0], p[1], p[2]); - } - } - } - else if (t[k] < 0.0) { - if (t[n] > 0.0) { - // find intersection point - t1 = GetParameterValue(origin[k][whichPlane], origin[n][whichPlane], coordPlane[whichPlane]); - if (t1 > 0.0 && t1 < 1.0) { - GetPointCoord(origin[k], origin[n], t1, p); - aPoints->InsertNextPoint(p[0], p[1], p[2]); - } - } - } - else { - // find intersection point - GetPointCoord(origin[k], endray[k], t[k], p); - aPoints->InsertNextPoint(p[0], p[1], p[2]); - - if (t[n] < 0.0) { - // find second intersection point - t1 = GetParameterValue(origin[k][whichPlane], origin[n][whichPlane], coordPlane[whichPlane]); - if (t1 > 0.0 && t1 < 1.0) { - GetPointCoord(origin[k], origin[n], t1, p); - aPoints->InsertNextPoint(p[0], p[1], p[2]); - } - } - else if (t[n] > 1.0) { - // find second intersection point - t1 = GetParameterValue(endray[k][whichPlane], endray[n][whichPlane], coordPlane[whichPlane]); - if (t1 > 0.0 && t1 < 1.0) { - GetPointCoord(endray[k], endray[n], t1, p); - aPoints->InsertNextPoint(p[0], p[1], p[2]); - } - } - } - } - n = aPoints->GetNumberOfPoints(); - if (n == 0) { - aPoints->Delete(); - return 0; - } - - if (n == 1) { - aPoints->GetPoint(0, p); - inside = 1; - for (i = 0; i < 3; i++) { - if (i != whichPlane) { - if (p[i] < bounds[2*i] || p[i] > bounds[2*i+1]) { - inside = 0; break; - } - } - } - aPoints->Delete(); - return inside; - } - - // Analize intersection - int nearPlane, boundPlane = -1; - float boundCoord, boundMin, boundMax; - char intersect = 0; - for (k = 0; k < n; k++) { - aPoints->GetPoint(k, p); - j = k+1; if (j == n) j = 0; - aPoints->GetPoint(j, q); - inside = 1; - nearPlane = 0; - // if the point is inside bbox - for (i = 0; i < 3; i++) { - if (i != whichPlane) { - if (p[i] < bounds[2*i]) { - side[i] = SIDE_LEFT; - maxT[i] = GetParameterValue(p[i], q[i], bounds[2*i]); - inside = 0; - } - else if (p[i] > bounds[2*i+1]) { - side[i] = SIDE_RIGHT; - maxT[i] = GetParameterValue(p[i], q[i], bounds[2*i+1]); - inside = 0; - } - else { - side[i] = SIDE_MIDDLE; - maxT[i] = -1.0; - } - } - else maxT[i] = -1.0; - if (maxT[i] > maxT[nearPlane]) nearPlane = i; - } - if (inside) break; - // if segment intersects bbox - if (maxT[nearPlane] >= 0.0 && maxT[nearPlane] <= 1.0) { - for (i = 0; i < 3; i++) { - if (i != whichPlane && i != nearPlane) { - coord = p[i] + maxT[nearPlane]*(q[i]-p[i]); - if (coord >= bounds[2*i] && coord <= bounds[2*i+1]) { - intersect = 1; break; - } - } - } - // intersect with boundPlane - if (boundPlane == -1) { - boundCoord = p[nearPlane] + maxT[nearPlane]*(q[nearPlane]-p[nearPlane]); - boundPlane = nearPlane; - for (i = 0; i < 3; i++) { - if (i != whichPlane && i != boundPlane) { - coord = p[i] + maxT[nearPlane]*(q[i]-p[i]); - boundMin = boundMax = coord; - } - } - } - else { - t1 = GetParameterValue(p[boundPlane], q[boundPlane], boundCoord); - if (t1 >= 0.0 && t1 <= 1.0) { - for (i = 0; i < 3; i++) { - if (i != whichPlane && i != boundPlane) { - coord = p[i] + t1*(q[i]-p[i]); - if (coord < boundMin) boundMin = coord; - if (coord > boundMax) boundMax = coord; - } - } - } - } - } - if (intersect) break; - } - aPoints->Delete(); - if (inside || intersect) { - return 1; - } - - inside = 1; - for (i = 0; i < 3; i++) { - if (i != whichPlane && i != boundPlane) { - if (boundMin > bounds[2*i+1] || boundMax < bounds[2*i]) - inside = 0; - } - } - - return inside; -} - -/*! Position of point relative to hexahedron. p1[4][4] is the corner points of top face, - * p2[4][4] is the corner points of bottom face. - * \retval The method returns a non-zero value, if the point is inside. - */ -char VTKViewer_RectPicker::PointInside (float p[3], float p1[4][4], float p2[4][4], float tol) -{ - int i, j, k; - float t, coord[3]; - - // Fix one coordinate (x, for example) and - // compute intersection with coordinate plane - vtkPoints* aPoints = vtkPoints::New(); - int mode = 0; - for (k = 0; k < 4; k++) { - j = k+1; if (j == 4) j = 0; - switch (mode) { - case 0: - if (GetIntersectionPoint(p1[k], p1[j], 0, p[0], coord)) { - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - mode = 0; - } - if (GetIntersectionPoint(p1[k], p2[k], 0, p[0], coord)) { - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - mode = 1; - } - if (GetIntersectionPoint(p2[k], p2[j], 0, p[0], coord)) { - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - mode = 2; - } - /* - if ((p1[k][0]-p[0])*(p2[k][0]-p[0]) <= 0) { - t = GetParameterValue(p1[k][0], p2[k][0], p[0]); - if (t >= 0.0 && t <= 1.0) { - GetPointCoord(p1[k], p2[k], t, coord); - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - } - } - */ - break; - case 1: - if (GetIntersectionPoint(p1[k], p2[k], 0, p[0], coord)) { - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - mode = 1; - } - if (GetIntersectionPoint(p2[k], p2[j], 0, p[0], coord)) { - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - mode = 2; - } - if (GetIntersectionPoint(p1[k], p1[j], 0, p[0], coord)) { - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - mode = 0; - } - /* - if ((p1[k][0]-p[0])*(p1[j][0]-p[0]) <= 0) { - t = GetParameterValue(p1[k][0], p1[j][0], p[0]); - if (t > 0.0 && t < 1.0) { - GetPointCoord(p1[k], p1[j], t, coord); - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - } - } - */ - break; - case 2: - if (GetIntersectionPoint(p2[k], p2[j], 0, p[0], coord)) { - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - mode = 2; - } - if (GetIntersectionPoint(p1[k], p2[k], 0, p[0], coord)) { - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - mode = 1; - } - if (GetIntersectionPoint(p1[k], p1[j], 0, p[0], coord)) { - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - mode = 0; - } - /* - if ((p2[k][0]-p[0])*(p2[j][0]-p[0]) <= 0) { - t = GetParameterValue(p2[k][0], p2[j][0], p[0]); - if (t > 0.0 && t < 1.0) { - GetPointCoord(p2[k], p2[j], t, coord); - aPoints->InsertNextPoint(coord[0], coord[1], coord[2]); - } - } - */ - break; - } - } - int n = aPoints->GetNumberOfPoints(); - //cout << "---> Points in X projection " << n << endl; - if (n == 0) { - aPoints->Delete(); - return 0; - } - - // Fix the second coord and define bounds - float zMin = VTK_LARGE_FLOAT, zMax = -VTK_LARGE_FLOAT, z, ncoord[3]; - char inside = 0; - for (k = 0; k < n; k++) { - aPoints->GetPoint(k, coord); - //cout << " P" << k << " (" << coord[0] << ", " << coord[1] << ", " << coord[2] << ")"; - j = k+1; if (j == n) j = 0; - if (j == k) { - if (p[1] == coord[1] && p[2] == coord[2]) { - inside = 1; - } - break; - } - aPoints->GetPoint(j, ncoord); - t = GetParameterValue(coord[1], ncoord[1], p[1]); - if (t >= 0.0 && t <= 1) { - z = coord[2] + t*(ncoord[2]-coord[2]); - if (z < zMin) zMin = z; - if (z > zMax) zMax = z; - } - } - //cout << endl << " Zmin = " << zMin << ", Zmax = " << zMax << endl; - if (!inside) { - if (p[2] <= (zMax+tol) && p[2] >= (zMin-tol)) - inside = 1; - } - - aPoints->Delete(); - return inside; -} - -float VTKViewer_RectPicker::IntersectWithHex(float p1[4][4], float p2[4][4], float tol, - vtkAssemblyPath *path, vtkProp3D *prop3D, - vtkAbstractMapper3D *mapper) -{ - int i, k; - float *center, p0[3], ray[3], rayFactor, t; - - // Get the data from the modeler - // - center = mapper->GetCenter(); - - if (!PointInside(center, p1, p2)) { - return 2.0; - } - - // Determine appropriate info - // - for (i = 0; i < 3; i++) { - p0[i] = ray[i] = 0; - for (k = 0; k < 4; k++) { - p0[i] += p1[k][i]; - ray[i] += p2[k][i]; - } - p0[i] = p0[i]/4; - ray[i] = ray[i]/4; - ray[i] = ray[i] - p0[i]; - } - if (( rayFactor = vtkMath::Dot(ray,ray)) == 0.0 ) { - vtkErrorMacro("Cannot process points"); - return 2.0; - } - - // Project the center point onto the ray and determine its parametric value - // - t = (ray[0]*(center[0]-p0[0]) + ray[1]*(center[1]-p0[1]) - + ray[2]*(center[2]-p0[2])) / rayFactor; - - if ( t >= 0.0 && t <= 1.0 && t < this->GlobalTMin ) { - this->MarkPicked(path, prop3D, mapper, t, center); - } - return t; -} diff --git a/src/VTKViewer/VTKViewer_RectPicker.h b/src/VTKViewer/VTKViewer_RectPicker.h deleted file mode 100755 index e20201630..000000000 --- a/src/VTKViewer/VTKViewer_RectPicker.h +++ /dev/null @@ -1,78 +0,0 @@ -// SALOME VTKViewer : build VTK viewer into Salome desktop -// -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// -// File : VTKViewer_RectPicker.h -// Author : Natalia KOPNOVA -// Module : SALOME - -#ifndef __VTKViewer_RectPicker_h -#define __VTKViewer_RectPicker_h - -#include - -/*! \class vtkPicker - * \brief For more information see VTK documentation - */ -/*! \class VTKViewer_RectPicker - * \brief Rectangular picker class. - */ -class VTK_EXPORT VTKViewer_RectPicker : public vtkPicker -{ -public: - /*!Create new instance of VTKViewer_RectPicker.*/ - static VTKViewer_RectPicker *New(); - vtkTypeMacro(VTKViewer_RectPicker,vtkPicker); - - virtual int Pick(float selectionX1, float selectionY1, float selectionZ1, - float selectionX2, float selectionY2, float selectionZ2, - vtkRenderer *renderer); - - /*! - * Perform pick operation with selection rectangle provided. Normally the first - * two values for the selection top-left and right-bottom points are x-y pixel - * coordinate, and the third value is =0. - * \retval Return non-zero if something was successfully picked. - */ - int Pick(float selectionPt1[3], float selectionPt2[3], vtkRenderer *ren) - {return this->Pick(selectionPt1[0], selectionPt1[1], selectionPt1[2], - selectionPt2[0], selectionPt2[1], selectionPt2[2], - ren);}; - - static char HitBBox(float bounds[6], float origin[4][4], float dir[4][3]); - - static char PointInside(float point[3], float p1[4][4], float p2[4][4], float tol=0); - -protected: - VTKViewer_RectPicker(); - ~VTKViewer_RectPicker() {}; - - virtual float IntersectWithHex(float p1[4][4], float p2[4][4], float tol, - vtkAssemblyPath *path, vtkProp3D *p, - vtkAbstractMapper3D *m); - -private: -}; - -#endif - - -- 2.39.2