From 40ef43e01f13d90d797b9baeeab8f0a3895b6510 Mon Sep 17 00:00:00 2001 From: smh Date: Tue, 14 Nov 2006 12:39:04 +0000 Subject: [PATCH] SMH: Lost file during MPV checkin --- src/SALOME_PY/Makefile.in | 757 ------------------------------------- src/SALOME_PY/SalomePy.cxx | 135 +++++-- 2 files changed, 98 insertions(+), 794 deletions(-) delete mode 100755 src/SALOME_PY/Makefile.in diff --git a/src/SALOME_PY/Makefile.in b/src/SALOME_PY/Makefile.in deleted file mode 100755 index cba1eee0a..000000000 --- a/src/SALOME_PY/Makefile.in +++ /dev/null @@ -1,757 +0,0 @@ -# Makefile.in generated by automake 1.9.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -# SALOME SALOME_PY : binding of VTK graphics and Python -# -# 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$ - -# -# ============================================================ -# This file defines the common definitions used in several -# Makefile. This file must be included, if needed, by the file -# Makefile.am. -# ============================================================ -# - -SOURCES = $(dist_libSalomePy_la_SOURCES) - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/adm_local/unix/make_common_starter.am -subdir = ./src/SALOME_PY -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_template_options.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_warnings.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_Kernel.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_cppunit.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/production.m4 \ - $(top_srcdir)/salome_adm/unix/config_files/python.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_GLViewer.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_OCCViewer.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_Plot2dViewer.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_PyConsole.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_SalomeObject.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_SupervGraphViewer.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_VTKViewer.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_disable_Corba.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_msg2qm.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_opengl.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_pyqt.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_qt.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_qwt.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_sip.m4 \ - $(top_srcdir)/adm_local/unix/config_files/check_vtk.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -libSalomePy_la_LIBADD = -dist_libSalomePy_la_OBJECTS = libSalomePy_la-SalomePy.lo -libSalomePy_la_OBJECTS = $(dist_libSalomePy_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -depcomp = $(SHELL) $(top_srcdir)/salome_adm/unix/config_files/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(dist_libSalomePy_la_SOURCES) -DIST_SOURCES = $(dist_libSalomePy_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ -BOOST_LIBS = @BOOST_LIBS@ -BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@ -CAS_CPPFLAGS = @CAS_CPPFLAGS@ -CAS_CXXFLAGS = @CAS_CXXFLAGS@ -CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@ -CAS_KERNEL = @CAS_KERNEL@ -CAS_LDFLAGS = @CAS_LDFLAGS@ -CAS_LDPATH = @CAS_LDPATH@ -CAS_MATH = @CAS_MATH@ -CAS_MODELER = @CAS_MODELER@ -CAS_OCAF = @CAS_OCAF@ -CAS_OCAFVIS = @CAS_OCAFVIS@ -CAS_STDPLUGIN = @CAS_STDPLUGIN@ -CAS_TKTopAlgo = @CAS_TKTopAlgo@ -CAS_VIEWER = @CAS_VIEWER@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CORBA_LIBS = @CORBA_LIBS@ -CORBA_ROOT = @CORBA_ROOT@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPUNIT_INCLUDES = @CPPUNIT_INCLUDES@ -CPPUNIT_IS_OK_FALSE = @CPPUNIT_IS_OK_FALSE@ -CPPUNIT_IS_OK_TRUE = @CPPUNIT_IS_OK_TRUE@ -CPPUNIT_LIBS = @CPPUNIT_LIBS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CXXTMPDPTHFLAGS = @CXXTMPDPTHFLAGS@ -CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ -CYGPATH_W = @CYGPATH_W@ -C_DEPEND_FLAG = @C_DEPEND_FLAG@ -DEFS = @DEFS@ -DEPCC = @DEPCC@ -DEPCXX = @DEPCXX@ -DEPCXXFLAGS = @DEPCXXFLAGS@ -DEPDIR = @DEPDIR@ -DISABLE_GLVIEWER = @DISABLE_GLVIEWER@ -DISABLE_OCCVIEWER = @DISABLE_OCCVIEWER@ -DISABLE_PLOT2DVIEWER = @DISABLE_PLOT2DVIEWER@ -DISABLE_PYCONSOLE = @DISABLE_PYCONSOLE@ -DISABLE_SALOMEOBJECT = @DISABLE_SALOMEOBJECT@ -DISABLE_SUPERVGRAPHVIEWER = @DISABLE_SUPERVGRAPHVIEWER@ -DISABLE_VTKVIEWER = @DISABLE_VTKVIEWER@ -DOT = @DOT@ -DOXYGEN = @DOXYGEN@ -DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@ -DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ -DVIPS = @DVIPS@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_GLVIEWER_FALSE = @ENABLE_GLVIEWER_FALSE@ -ENABLE_GLVIEWER_TRUE = @ENABLE_GLVIEWER_TRUE@ -ENABLE_OCCVIEWER_FALSE = @ENABLE_OCCVIEWER_FALSE@ -ENABLE_OCCVIEWER_TRUE = @ENABLE_OCCVIEWER_TRUE@ -ENABLE_PLOT2DVIEWER_FALSE = @ENABLE_PLOT2DVIEWER_FALSE@ -ENABLE_PLOT2DVIEWER_TRUE = @ENABLE_PLOT2DVIEWER_TRUE@ -ENABLE_PYCONSOLE_FALSE = @ENABLE_PYCONSOLE_FALSE@ -ENABLE_PYCONSOLE_TRUE = @ENABLE_PYCONSOLE_TRUE@ -ENABLE_SALOMEOBJECT_FALSE = @ENABLE_SALOMEOBJECT_FALSE@ -ENABLE_SALOMEOBJECT_TRUE = @ENABLE_SALOMEOBJECT_TRUE@ -ENABLE_SUPERVGRAPHVIEWER_FALSE = @ENABLE_SUPERVGRAPHVIEWER_FALSE@ -ENABLE_SUPERVGRAPHVIEWER_TRUE = @ENABLE_SUPERVGRAPHVIEWER_TRUE@ -ENABLE_VTKVIEWER_FALSE = @ENABLE_VTKVIEWER_FALSE@ -ENABLE_VTKVIEWER_TRUE = @ENABLE_VTKVIEWER_TRUE@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GUI_DISABLE_CORBA = @GUI_DISABLE_CORBA@ -GUI_ENABLE_CORBA_FALSE = @GUI_ENABLE_CORBA_FALSE@ -GUI_ENABLE_CORBA_TRUE = @GUI_ENABLE_CORBA_TRUE@ -HAVE_SSTREAM = @HAVE_SSTREAM@ -HDF5_INCLUDES = @HDF5_INCLUDES@ -HDF5_LIBS = @HDF5_LIBS@ -HDF5_MT_LIBS = @HDF5_MT_LIBS@ -IDL = @IDL@ -IDLCXXFLAGS = @IDLCXXFLAGS@ -IDLPYFLAGS = @IDLPYFLAGS@ -IDL_CLN_CXX = @IDL_CLN_CXX@ -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_OBJ = @IDL_CLN_OBJ@ -IDL_SRV_CXX = @IDL_SRV_CXX@ -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_OBJ = @IDL_SRV_OBJ@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -IS_QT_3_0_0_FALSE = @IS_QT_3_0_0_FALSE@ -IS_QT_3_0_0_TRUE = @IS_QT_3_0_0_TRUE@ -IS_SIP_NEW_FALSE = @IS_SIP_NEW_FALSE@ -IS_SIP_NEW_TRUE = @IS_SIP_NEW_TRUE@ -IS_SIP_V4_FALSE = @IS_SIP_V4_FALSE@ -IS_SIP_V4_TRUE = @IS_SIP_V4_TRUE@ -KERNEL_CXXFLAGS = @KERNEL_CXXFLAGS@ -KERNEL_LDFLAGS = @KERNEL_LDFLAGS@ -KERNEL_ROOT_DIR = @KERNEL_ROOT_DIR@ -KERNEL_SITE_DIR = @KERNEL_SITE_DIR@ -LATEX = @LATEX@ -LDEXPDYNFLAGS = @LDEXPDYNFLAGS@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIB_LOCATION_SUFFIX = @LIB_LOCATION_SUFFIX@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MACHINE = @MACHINE@ -MAKEINFO = @MAKEINFO@ -MOC = @MOC@ -MODULE_NAME = @MODULE_NAME@ -MSG2QM = @MSG2QM@ -OBJEXT = @OBJEXT@ -OGL_INCLUDES = @OGL_INCLUDES@ -OGL_LIBS = @OGL_LIBS@ -OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ -OMNIORB_IDL = @OMNIORB_IDL@ -OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ -OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ -OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ -OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ -OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ -OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ -OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@ -OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@ -OMNIORB_INCLUDES = @OMNIORB_INCLUDES@ -OMNIORB_LIBS = @OMNIORB_LIBS@ -OMNIORB_ROOT = @OMNIORB_ROOT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PDFLATEX = @PDFLATEX@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -PYQT_INCLUDES = @PYQT_INCLUDES@ -PYQT_LIBS = @PYQT_LIBS@ -PYQT_SIPFLAGS = @PYQT_SIPFLAGS@ -PYQT_SIPS = @PYQT_SIPS@ -PYTHON = @PYTHON@ -PYTHONHOME = @PYTHONHOME@ -PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ -PYTHON_INCLUDES = @PYTHON_INCLUDES@ -PYTHON_LIBS = @PYTHON_LIBS@ -PYTHON_PLATFORM = @PYTHON_PLATFORM@ -PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_SITE = @PYTHON_SITE@ -PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@ -PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ -PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@ -PYTHON_VERSION = @PYTHON_VERSION@ -PYUIC = @PYUIC@ -QTDIR = @QTDIR@ -QT_INCLUDES = @QT_INCLUDES@ -QT_LIBS = @QT_LIBS@ -QT_MT_INCLUDES = @QT_MT_INCLUDES@ -QT_MT_LIBS = @QT_MT_LIBS@ -QT_ROOT = @QT_ROOT@ -QT_VERS = @QT_VERS@ -QWT_INCLUDES = @QWT_INCLUDES@ -QWT_LIBS = @QWT_LIBS@ -RANLIB = @RANLIB@ -ROOT_BUILDDIR = @ROOT_BUILDDIR@ -ROOT_SRCDIR = @ROOT_SRCDIR@ -RST2HTML = @RST2HTML@ -RST2HTML_IS_OK_FALSE = @RST2HTML_IS_OK_FALSE@ -RST2HTML_IS_OK_TRUE = @RST2HTML_IS_OK_TRUE@ -SETX = @SETX@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SIP = @SIP@ -SIP_INCLUDES = @SIP_INCLUDES@ -SIP_LIBS = @SIP_LIBS@ -SIP_VERS = @SIP_VERS@ -STDLIB = @STDLIB@ -STRIP = @STRIP@ -SWIG = @SWIG@ -SWIG_FLAGS = @SWIG_FLAGS@ -TEMP = @TEMP@ -UIC = @UIC@ -VERSION = @VERSION@ -VTKPY_MODULES = @VTKPY_MODULES@ -VTK_INCLUDES = @VTK_INCLUDES@ -VTK_LIBS = @VTK_LIBS@ -XVERSION = @XVERSION@ -YACC = @YACC@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -acx_pthread_config = @acx_pthread_config@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = $(prefix)/bin/@PACKAGE@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -cppunit_ok = @cppunit_ok@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pkgpyexecdir = @pkgpyexecdir@ -pkgpythondir = @pkgpythondir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -pyexecdir = @pyexecdir@ -pythondir = @pythondir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ - -# Standard directory for installation -salomeincludedir = $(includedir)/@PACKAGE@ -salomescriptdir = $(bindir) - -# Directory for installing idl files -salomeidldir = $(prefix)/idl/@PACKAGE@ - -# Directory for installing resource files -salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ - -# Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files - -# Shared modules installation directory -sharedpkgpythondir = $(pkgpythondir)/shared_modules - -# Documentation directory -docdir = $(datadir)/doc/@PACKAGE@ -EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=resources/%.po) -lib_LTLIBRARIES = libSalomePy.la -dist_libSalomePy_la_SOURCES = SalomePy.cxx -libSalomePy_la_CPPFLAGS = $(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \ - $(OGL_INCLUDES) $(CAS_CXXFLAGS) $(BOOST_CPPFLAGS) @KERNEL_CXXFLAGS@ \ - -DHAVE_CONFIG_H -I$(srcdir)/../SalomeApp -I$(srcdir)/../LightApp \ - -I$(srcdir)/../Event -I$(srcdir)/../Session -I$(srcdir)/../SVTK \ - -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -I$(srcdir)/../CAM \ - -I$(srcdir)/../STD -I$(srcdir)/../VTKViewer -I$(srcdir)/../OBJECT \ - @CAS_CPPFLAGS@ \ - -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ - -libSalomePy_la_LDFLAGS = $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) \ - ../SalomeApp/libSalomeApp.la \ - -lvtkCommonPython -lvtkGraphicsPython -lvtkImagingPython - -all: all-am - -.SUFFIXES: -.SUFFIXES: .cxx .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/adm_local/unix/make_common_starter.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ./src/SALOME_PY/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu ./src/SALOME_PY/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libSalomePy.la: $(libSalomePy_la_OBJECTS) $(libSalomePy_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libSalomePy_la_LDFLAGS) $(libSalomePy_la_OBJECTS) $(libSalomePy_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSalomePy_la-SalomePy.Plo@am__quote@ - -.cxx.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cxx.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cxx.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -libSalomePy_la-SalomePy.lo: SalomePy.cxx -@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomePy_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libSalomePy_la-SalomePy.lo -MD -MP -MF "$(DEPDIR)/libSalomePy_la-SalomePy.Tpo" -c -o libSalomePy_la-SalomePy.lo `test -f 'SalomePy.cxx' || echo '$(srcdir)/'`SalomePy.cxx; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libSalomePy_la-SalomePy.Tpo" "$(DEPDIR)/libSalomePy_la-SalomePy.Plo"; else rm -f "$(DEPDIR)/libSalomePy_la-SalomePy.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='SalomePy.cxx' object='libSalomePy_la-SalomePy.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libSalomePy_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libSalomePy_la-SalomePy.lo `test -f 'SalomePy.cxx' || echo '$(srcdir)/'`SalomePy.cxx - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/../../adm_local/unix - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: install-libLTLIBRARIES - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool mostlyclean-local - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ - pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES - - -# common rules - -# moc-files generation -%_moc.cxx: %.h - $(MOC) $< -o $@ - -# qm-files generation -%.qm: resources/%.po - $(MSG2QM) $< $@ - -mostlyclean-local: - rm -f @builddir@/*_moc.cxx - rm -f @builddir@/*.qm - -# tests -tests: unittest - -unittest: $(UNIT_TEST_PROG) - @if test "x$(UNIT_TEST_PROG)" != "x"; then \ - $(UNIT_TEST_PROG); \ - fi; -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/SALOME_PY/SalomePy.cxx b/src/SALOME_PY/SalomePy.cxx index 30f556718..bfc24dbc0 100755 --- a/src/SALOME_PY/SalomePy.cxx +++ b/src/SALOME_PY/SalomePy.cxx @@ -51,8 +51,10 @@ using namespace std; - getRenderer() - getRenderWindow() - getRenderWindowInteractor() - These methods open new VTK viewer if there is no one opened. - In case of error methods return None object in Python. + - showTrihedron() + These methods (except showTrihedron() ) open new VTK viewer + if there is no one opened. + In case of error all methods return None object in Python. */ static PyObject* GetPyClass(const char* theClassName){ @@ -74,7 +76,9 @@ static PyObject* GetPyClass(const char* theClassName){ return aPyClass; } -static SVTK_ViewWindow* GetVTKViewWindow() { +enum { __Find, __FindOrCreate, __Create }; + +static SVTK_ViewWindow* GetVTKViewWindow( int toCreate = __FindOrCreate ) { SVTK_ViewWindow* aVW = NULL; if ( SUIT_Session::session() ) { // get application @@ -84,13 +88,27 @@ static SVTK_ViewWindow* GetVTKViewWindow() { SalomeApp_Study* aStudy = dynamic_cast( anApp->activeStudy() ); if ( aStudy ) { // find or create VTK view manager - SVTK_ViewManager* aVM = dynamic_cast( anApp->getViewManager( "VTKViewer", true ) ); - if ( aVM ) { - aVW = dynamic_cast( aVM->getActiveView() ); - // VSR : When new view window is created it can be not active yet at this moment, - // so the following is a some workaround - if ( !aVW && !aVM->getViews().isEmpty() ) - aVW = dynamic_cast( aVM->getViews()[ 0 ] ); + if ( toCreate == __Create ) { + SVTK_ViewManager* aVM = dynamic_cast( anApp->createViewManager( "VTKViewer" ) ); + if ( aVM ) { + aVW = dynamic_cast( aVM->getActiveView() ); + if ( !aVW ) + aVW = dynamic_cast( aVM->createViewWindow() ); + // VSR : When new view window is created it can be not active yet at this moment, + // so the following is a some workaround + if ( !aVW && !aVM->getViews().isEmpty() ) + aVW = dynamic_cast( aVM->getViews()[ 0 ] ); + } + } + else { + SVTK_ViewManager* aVM = dynamic_cast( anApp->getViewManager( "VTKViewer", toCreate == __FindOrCreate ) ); + if ( aVM ) { + aVW = dynamic_cast( aVM->getActiveView() ); + // VSR : When new view window is created it can be not active yet at this moment, + // so the following is a some workaround + if ( !aVW && !aVM->getViews().isEmpty() ) + aVW = dynamic_cast( aVM->getViews()[ 0 ] ); + } } } } @@ -99,15 +117,19 @@ static SVTK_ViewWindow* GetVTKViewWindow() { } /*! - Get VTK renderer (opens new VTK window if there is no one opened) + Get VTK renderer. + Always opens new VTK window if parameter is non zero. + Otherwise opens new VTK window only if there is no one opened. */ class TGetRendererEvent: public SALOME_Event { public: typedef PyObject* TResult; TResult myResult; - TGetRendererEvent() : myResult( Py_None ) {} + int myCreate; + TGetRendererEvent( bool toCreate ) + : myResult( Py_None ), myCreate( toCreate ) {} virtual void Execute() { - if( SVTK_ViewWindow* aVTKViewWindow = GetVTKViewWindow() ) { + if( SVTK_ViewWindow* aVTKViewWindow = GetVTKViewWindow( myCreate ? __Create : __FindOrCreate ) ) { PyObject* aPyClass = GetPyClass("vtkRenderer"); vtkRenderer* aVTKObject = aVTKViewWindow->getRenderer(); myResult = PyVTKObject_New(aPyClass,aVTKObject); @@ -116,24 +138,29 @@ public: }; extern "C" PyObject *libSalomePy_getRenderer(PyObject *self, PyObject *args) { - //return ProcessEvent( new TGetRendererEvent() ); - PyObject * aResult; - Py_BEGIN_ALLOW_THREADS // PAL12755 - aResult = ProcessEvent( new TGetRendererEvent() ); - Py_END_ALLOW_THREADS // PAL12755 + PyObject* aResult = Py_None; + int toCreate = 0; + if ( !PyArg_ParseTuple(args, "|i:getRenderer", &toCreate) ) + PyErr_Print(); + else + aResult = ProcessEvent( new TGetRendererEvent( toCreate ) ); return aResult; } /*! - Get VTK render window (opens new VTK window if there is no one opened) + Get VTK render window. + Always opens new VTK window if parameter is non zero. + Otherwise opens new VTK window only if there is no one opened. */ class TGetRenderWindowEvent: public SALOME_Event { public: typedef PyObject* TResult; TResult myResult; - TGetRenderWindowEvent() : myResult( Py_None ) {} + int myCreate; + TGetRenderWindowEvent( bool toCreate ) + : myResult( Py_None ), myCreate( toCreate ) {} virtual void Execute() { - if( SVTK_ViewWindow* aVTKViewWindow = GetVTKViewWindow() ) { + if( SVTK_ViewWindow* aVTKViewWindow = GetVTKViewWindow( myCreate ? __Create : __FindOrCreate ) ) { PyObject* aPyClass = GetPyClass("vtkRenderWindow"); vtkRenderWindow* aVTKObject = aVTKViewWindow->getRenderWindow(); myResult = PyVTKObject_New(aPyClass,aVTKObject); @@ -142,24 +169,29 @@ public: }; extern "C" PyObject *libSalomePy_getRenderWindow(PyObject *self, PyObject *args) { - //return ProcessEvent( new TGetRenderWindowEvent() ); - PyObject * aResult; - Py_BEGIN_ALLOW_THREADS // PAL12755 - aResult = ProcessEvent( new TGetRenderWindowEvent() ); - Py_END_ALLOW_THREADS // PAL12755 + PyObject* aResult = Py_None; + int toCreate = 0; + if ( !PyArg_ParseTuple(args, "|i:getRenderWindow", &toCreate) ) + PyErr_Print(); + else + aResult = ProcessEvent( new TGetRenderWindowEvent( toCreate ) ); return aResult; } /*! - Get VTK render window interactor (opens new VTK window if there is no one opened) + Get VTK render window interactor. + Always opens new VTK window if parameter is non zero. + Otherwise opens new VTK window only if there is no one opened. */ class TGetRenderWindowInteractorEvent: public SALOME_Event { public: typedef PyObject* TResult; TResult myResult; - TGetRenderWindowInteractorEvent() : myResult( Py_None ) {} + int myCreate; + TGetRenderWindowInteractorEvent( bool toCreate ) + : myResult( Py_None ), myCreate( toCreate ) {} virtual void Execute() { - if( SVTK_ViewWindow* aVTKViewWindow = GetVTKViewWindow() ) { + if( SVTK_ViewWindow* aVTKViewWindow = GetVTKViewWindow( myCreate ? __Create : __FindOrCreate ) ) { PyObject* aPyClass = GetPyClass("vtkRenderWindowInteractor"); vtkRenderWindowInteractor* aVTKObject = aVTKViewWindow->getInteractor(); myResult = PyVTKObject_New(aPyClass,aVTKObject); @@ -168,11 +200,39 @@ public: }; extern "C" PyObject *libSalomePy_getRenderWindowInteractor(PyObject *self, PyObject *args) { - //return ProcessEvent( new TGetRenderWindowInteractorEvent() ); - PyObject * aResult; - Py_BEGIN_ALLOW_THREADS // PAL12755 - aResult = ProcessEvent( new TGetRenderWindowInteractorEvent() ); - Py_END_ALLOW_THREADS // PAL12755 + PyObject* aResult = Py_None; + int toCreate = 0; + if ( !PyArg_ParseTuple(args, "|i:getRenderWindowInteractor", &toCreate) ) + PyErr_Print(); + else + aResult = ProcessEvent( new TGetRenderWindowInteractorEvent( toCreate ) ); + return aResult; +} + +/*! + Show/hide trihedron in the current VTK viewer (if there is one) +*/ +extern "C" PyObject *libSalomePy_showTrihedron(PyObject *self, PyObject *args) +{ + class TEvent: public SALOME_Event { + public: + int myShow; + TEvent( int bShow ) + : myShow( bShow ) {} + virtual void Execute() { + if( SVTK_ViewWindow* aVTKViewWindow = GetVTKViewWindow( __Find ) ) { + if ( aVTKViewWindow->isTrihedronDisplayed() != myShow ) + aVTKViewWindow->onViewTrihedron(); + } + } + }; + + PyObject* aResult = Py_None; + int bShow = 0; + if ( !PyArg_ParseTuple(args, "i:showTrihedron", &bShow) ) + PyErr_Print(); + else + ProcessVoidEvent( new TEvent( bShow ) ); return aResult; } @@ -181,9 +241,10 @@ extern "C" PyObject *libSalomePy_getRenderWindowInteractor(PyObject *self, PyObj */ static PyMethodDef Module_Methods[] = { - { "getRenderer", libSalomePy_getRenderer, METH_NOARGS }, - { "getRenderWindow", libSalomePy_getRenderWindow, METH_NOARGS }, - { "getRenderWindowInteractor", libSalomePy_getRenderWindow, METH_NOARGS }, + { "getRenderer", libSalomePy_getRenderer, METH_VARARGS }, + { "getRenderWindow", libSalomePy_getRenderWindow, METH_VARARGS }, + { "getRenderWindowInteractor", libSalomePy_getRenderWindowInteractor, METH_VARARGS }, + { "showTrihedron", libSalomePy_showTrihedron, METH_VARARGS }, { NULL, NULL } }; -- 2.39.2