From c98e309f66a2f30a6bc8bd2f00f3605b11e7351d Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 16 May 2003 14:22:05 +0000 Subject: [PATCH] This commit was generated by cvs2git to create branch 'IMPORT'. Sprout from master 2003-05-16 14:22:04 UTC nri 'NRI : First integration.' Delete: Makefile.in build_configure configure.in.base idl/Makefile.in src/VISUGUI/VISU_icons.po src/VISUGUI/VISU_msg_en.po src/VISU_I/VISU_LookupTable.cxx src/VISU_I/VISU_LookupTable.hxx src/VISU_I/VISU_ScalarBarActor.cxx src/VISU_I/VISU_ScalarBarActor.hxx --- Makefile.in | 112 ------ build_configure | 206 ---------- configure.in.base | 366 ------------------ idl/Makefile.in | 74 ---- src/VISUGUI/VISU_icons.po | 32 -- src/VISUGUI/VISU_msg_en.po | 252 ------------ src/VISU_I/VISU_LookupTable.cxx | 79 ---- src/VISU_I/VISU_LookupTable.hxx | 41 -- src/VISU_I/VISU_ScalarBarActor.cxx | 600 ----------------------------- src/VISU_I/VISU_ScalarBarActor.hxx | 116 ------ 10 files changed, 1878 deletions(-) delete mode 100644 Makefile.in delete mode 100755 build_configure delete mode 100644 configure.in.base delete mode 100644 idl/Makefile.in delete mode 100644 src/VISUGUI/VISU_icons.po delete mode 100644 src/VISUGUI/VISU_msg_en.po delete mode 100644 src/VISU_I/VISU_LookupTable.cxx delete mode 100644 src/VISU_I/VISU_LookupTable.hxx delete mode 100644 src/VISU_I/VISU_ScalarBarActor.cxx delete mode 100644 src/VISU_I/VISU_ScalarBarActor.hxx diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 8e496240..00000000 --- a/Makefile.in +++ /dev/null @@ -1,112 +0,0 @@ -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# $Header$ -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl:${KERNEL_ROOT_DIR}/idl/salome - - -@COMMENCE@ - -SUBDIRS = idl src - -RESOURCES_FILES = \ -ModuleVisu.png \ -Visu_anim.png \ -Visu_cutplane.png \ -Visu_deformed.png \ -Visu_deformed_anim.png \ -Visu_eraseall.png \ -Visu_isosurfaces.png \ -Visu_plot2d.png \ -Visu_plot3d.png \ -Visu_points.png \ -Visu_sameas.png \ -Visu_scalars.png \ -Visu_scalars_anim.png \ -Visu_selectall.png \ -Visu_selectionactor.png \ -Visu_selectioncell.png \ -Visu_selectionedge.png \ -Visu_selectionpoint.png \ -Visu_selectonly.png \ -Visu_surface.png \ -Visu_vectors.png \ -Visu_wireframe.png \ -Visu_scaling.png \ -VISU_en.xml \ -VISU_fr.xml \ -Visu_tree_visu.png \ -Visu_streamlines.png - -BIN_SCRIPT= - - -# copy header files in common directory -ifeq ($(HAVE_SSTREAM),yes) - include_list=include/salome/SALOMEconfig.h -else - include_list=include/salome/SALOMEconfig.h include/salome/sstream -endif - -inc: idl $(include_list) - -include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.h - -$(RM) $@ - $(LN_S) ../../$< $@ - -include/salome/sstream: salome_adm/unix/sstream - -$(RM) $@ - $(LN_S) ../../$< $@ - -depend: depend_idl - -depend_idl: - (cd idl ; $(MAKE) $@) || exit 1 - -# doc is already build : if you want to had documents, go manually to doc and run 'make doc' -#doc: -# (cd doc && $(MAKE) $@) || exit 1 - -install-end: -# finish libtool install -# @$(LT) --mode=finish $(libdir) - -install-include: $(include_list) - $(INSTALL) -d $(includedir) - @for f in X $(include_list); do \ - if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(includedir)/. || exit 1); \ - fi; \ - done - -# install script in $(bindir) : -install-bin: $(BIN_SCRIPT) - $(INSTALL) -d $(bindir) - if test $(BIN_SCRIPT)X != X; then \ - $(INSTALL_PROGRAM) $^ $(bindir); \ - fi - -uninstall: uninstall-idl - -uninstall-idl: - $(RM) $(idldir)/*.idl - -distclean: distclean-other - -distclean-other: - -$(RM) salome_adm/unix/*~ salome_adm/unix/*% salome_adm/unix/*.bak salome_adm/unix/*.new salome_adm/unix/*.old - -$(RM) salome_adm/unix/make_* - -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h - -$(RM) config.cache config.log config.status - -@MODULE@ - -install: install-bin install-include install-end - diff --git a/build_configure b/build_configure deleted file mode 100755 index 4edf6f44..00000000 --- a/build_configure +++ /dev/null @@ -1,206 +0,0 @@ -#!/bin/bash - -# -# Tool for updating list of .in file for the SALOME project -# and regenerating configure script -# -# Author : Marc Tajchman - CEA -# Date : 10/10/2002 -# $Header$ -# - -ORIG_DIR=`pwd` -CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` - -######################################################################## -# Test if the KERNEL_ROOT_DIR is set correctly - -if test ! -d "${KERNEL_ROOT_DIR}"; then - echo "failed : KERNEL_ROOT_DIR variable is not correct !" - exit -fi - -# Test if the KERNEL_SRC is set correctly - -#if test ! -d "${KERNEL_SRC}"; then -# echo "failed : KERNEL_SRC variable is not correct !" -# exit -#fi -######################################################################## -# find_in - utility function -# -# usage : -# find_in directory filename -# -# Finds files following the *.in pattern, recursively in the -# directory (first argument). -# Results are appended into the file (second argument) -# -# Difference from the standard unix find is that files are tested -# before directories -# - -find_in() -{ - local i - local f=$2 - -# if the first argument is not a directory, returns - - if [ ! -d "$1" ] ; then - return - fi - -# dont look in the CVS directories - - case $1 in - */CVS) return ;; - *) ;; - esac - -# for each regular file contained in the directory -# test if it's a .in file - - for i in "$1"/* - do - if [ -f "$i" ] ; then - case $i in - *.in) echo " "$i" \\" >> $f;; - *) ;; - esac - fi - done - -# for each subdirectory of the first argument, proceeds recursively - - for i in "$1"/* - do - if [ -d "$i" ] ; then - find_in "$i" "$f" - fi - done -} - - -####################################################################### -# Generate list of .in files (Makefile.in, config.h.in, etc) -# appending it in file configure.in - -cd ${CONF_DIR} -ABS_CONF_DIR=`pwd` - -# -# Common part of the configure.in file -# -chmod u+w configure.in.base -if ! \cp -f configure.in.base configure.in_tmp1 -then - echo - echo "error : can't create files in" ${CONF_DIR} - echo "aborting ..." - chmod u-w configure.in.base - exit -fi -chmod u-w configure.in.base - -# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files -echo "" >> configure.in_tmp1 -echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1 - -echo "" >> configure.in_tmp1 -echo "AC_OUTPUT([ \\" >> configure.in_tmp1 - -# -# List of .in files in the adm/unix directory -# These files MUST be on top of AC_OUTPUT list so we -# put them "manually" -# - -echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/make_omniorb \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/make_commence \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 - -\rm -f configure.in_tmp2 configure.in_tmp3 -touch configure.in_tmp2 -find_in . configure.in_tmp2 -sed '/^.*salome_adm/d' configure.in_tmp2 > configure.in_tmp3 -sed '/configure.in/d' configure.in_tmp3 > configure.in_tmp2 -sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1 - -echo "])" >> configure.in_tmp1 - -# delete the link created for AC_OUTPUT -#echo "" >> configure.in_tmp1 -#echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1 -\mv configure.in_tmp1 configure.in_new -\rm -f configure.in_tmp2 configure.in_tmp3 - - -######################################################################## -# Create new (or replace old) configure.in file -# Print a message if the file is write protected -# - -echo -if test ! -f configure.in -then - echo -n "Creating new file 'configure.in' ... " - if \mv configure.in_new configure.in >& /dev/null - then - echo "done" - else - echo "error, check your file permissions" - fi -else - echo -n "Updating 'configure.in' file ... " - if ! \cp configure.in configure.in_old >& /dev/null - then - echo - echo - echo "Can't backup previous configure.in" - echo -n "Continue (you will not be able to revert) - (Y/N) ? " - read R - case "x$R" in - xn*) exit;; - xN*) exit;; - esac - echo - echo -n " " - fi - if \cp configure.in_new configure.in >& /dev/null - then - echo "done" - else - echo - echo "error, can't update previous configure.in" - fi -fi - -######################################################################## -# Use autoconf to rebuild the configure script -# - -if test -f configure -then - echo -n "Updating 'configure' script ... " -else - echo -n "Creating 'configure' script ... " -fi - -aclocal --acdir=${KERNEL_ROOT_DIR}/salome_adm/unix/config_files -if autoconf -then - echo "done" -else - echo "failed (check file permissions and/or user quotas ...)" -fi - -cd ${ORIG_DIR} - -echo diff --git a/configure.in.base b/configure.in.base deleted file mode 100644 index b363a0b3..00000000 --- a/configure.in.base +++ /dev/null @@ -1,366 +0,0 @@ -# -# PLEASE DO NOT MODIFY configure.in FILE -# -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND -# -# CHANGES MUST BE MADE IN configure.in.base FILE -# -# -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# -# Created from configure.in.base -# - -AC_INIT(src) -AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files) -AC_CANONICAL_HOST - -PACKAGE=salome -AC_SUBST(PACKAGE) - -VERSION=0.0.1 -AC_SUBST(VERSION) - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -if test -z "$AR"; then - AC_CHECK_PROGS(AR,ar xar,:,$PATH) -fi -AC_SUBST(AR) - -dnl Export the AR macro so that it will be placed in the libtool file -dnl correctly. -export AR - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -dnl -dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! - -AC_ENABLE_DEBUG(yes) -AC_DISABLE_PRODUCTION - -echo --------------------------------------------- -echo testing libtool -echo --------------------------------------------- - -dnl first, we set static to no! -dnl if we want it, use --enable-static -AC_ENABLE_STATIC(no) - -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - -dnl Fix up the INSTALL macro if it s a relative path. We want the -dnl full-path to the binary instead. -case "$INSTALL" in - *install-sh*) - INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -dnl -dnl Well we use sstream which is not in gcc pre-2.95.3 -dnl We must test if it exists. If not, add it in include ! -dnl - -AC_CXX_HAVE_SSTREAM - -dnl -dnl --------------------------------------------- -dnl testing MPICH -dnl --------------------------------------------- -dnl - -CHECK_MPICH - -echo -echo --------------------------------------------- -echo testing LEX \& YACC -echo --------------------------------------------- -echo - -lex_yacc_ok=no -AC_PROG_YACC -AC_PROG_LEX -lex_yacc_ok=yes - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -echo -echo --------------------------------------------- -echo testing java -echo --------------------------------------------- -echo - -CHECK_JAVA - -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -CHECK_SWIG - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -echo -echo --------------------------------------------- -echo testing omniORB -echo --------------------------------------------- -echo - -CHECK_OMNIORB - -echo -echo --------------------------------------------- -echo testing mico -echo --------------------------------------------- -echo - -CHECK_MICO - -echo -echo --------------------------------------------- -echo default ORB : omniORB -echo --------------------------------------------- -echo - -DEFAULT_ORB=omniORB -CHECK_CORBA - -AC_SUBST_FILE(CORBA) -corba=make_$ORB -CORBA=salome_adm/unix/$corba - -echo -echo --------------------------------------------- -echo testing openGL -echo --------------------------------------------- -echo - -CHECK_OPENGL - -echo -echo --------------------------------------------- -echo testing QT -echo --------------------------------------------- -echo - -CHECK_QT - -echo -echo --------------------------------------------- -echo testing VTK -echo --------------------------------------------- -echo - -CHECK_VTK - -echo -echo --------------------------------------------- -echo testing HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -echo -echo --------------------------------------------- -echo testing MED2 -echo --------------------------------------------- -echo - -CHECK_MED2 - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - -echo -echo --------------------------------------------- -echo Testing qwt -echo --------------------------------------------- -echo - -CHECK_QWT - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -variables="cc_ok lex_yacc_ok python_ok java_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok mico_ok occ_ok qwt_ok Kernel_ok" - -for var in $variables -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - -echo -echo "Default ORB : $DEFAULT_ORB" -echo - -dnl generals files which could be included in every makefile - -AC_SUBST_FILE(COMMENCE) COMMENCE=salome_adm/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude -AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module - -dnl les dependences -AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend - -dnl We don t need to say when we re entering directories if we re using -dnl GNU make becuase make does it for us. -if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" -else - AC_SUBST(SETX) SETX="set -x" -fi - -# make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl -do -# if test ! -d $rep ; then -# eval mkdir $rep -# fi - $INSTALL -d $rep -done - -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy resources directories - -#for i in `find $ROOT_SRCDIR -name 'resources' -print` -#do -# local_res=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -# local_res_dir=`echo $local_res | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -# mkdir -p $local_res_dir -# cd $local_res_dir -# ln -fs $i -# echo $local_res -# cd $ROOT_BUILDDIR -#done - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -cd bin -for i in $ROOT_SRCDIR/bin/* -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` - case "$local_bin" in - *.in | *~) ;; - ./bin/CVS) ;; - *) ln -fs $i; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - -AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript - -dnl copy xml files to the build tree (lib directory) -dnl pourquoi ???? - -#cd lib -#for i in `find $ROOT_SRCDIR -name "*.xml" -print` -#do -# ln -fs $i -# echo `echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -#done -#cd $ROOT_BUILDDIR - - -echo -echo --------------------------------------------- -echo generating Makefiles and configure files -echo --------------------------------------------- -echo - -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/* \ -]) - -## do not delete this line diff --git a/idl/Makefile.in b/idl/Makefile.in deleted file mode 100644 index 98f8e070..00000000 --- a/idl/Makefile.in +++ /dev/null @@ -1,74 +0,0 @@ -# -# generate dependencies for idl file : -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:$(srcdir):${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome - -@COMMENCE@ - -IDL_FILES = \ - SALOME_Component.idl \ - SALOMEDS.idl \ - SALOMEDS_Attributes.idl \ - SALOME_Exception.idl \ - Logger.idl \ - SALOME_ModuleCatalog.idl \ - SALOME_Session.idl \ - VISU_Gen.idl \ - MED.idl \ - Med_Gen.idl - -PY_CLIENT_IDL = $(IDL_FILES) - -# we copy all idl file in $(top_builddir)/idl -inc: $(IDL_FILES:%=$(top_builddir)/idl/%) - -$(IDL_FILES:%=$(top_builddir)/idl/%):$(top_builddir)/idl/%:% -# $(CP) $< $@ - cp -f $< $@ - - -lib: pyidl - -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ - -pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) - -$(PYTHON_BUILD_SITE): - $(INSTALL) -d $@ - -$(PYTHON_BUILD_SITE)/%_idl.py: %.idl - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $< - - -# install python client (generated from idl file -install: install-pyidl install-idl - -# create directory $(idldir) and copy idl files into it -install-idl: $(IDL_FILES) - $(INSTALL) -d $(idldir) - $(INSTALL_DATA) $^ $(idldir) - - -install-pyidl: $(IDL_FILES) - $(INSTALL) -d $(PYTHON_SITE_INSTALL) - @for file in $^ dummy; do \ - if [ $$file != "dummy" ]; then \ - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ - fi ; \ - done ; - -#@ CONCLUDE @ - -cleandep: - -$(RM) .dep* - -distclean: - -$(RM) *.py - -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/%) - -$(RM) Makefile - diff --git a/src/VISUGUI/VISU_icons.po b/src/VISUGUI/VISU_icons.po deleted file mode 100644 index 926d6c6f..00000000 --- a/src/VISUGUI/VISU_icons.po +++ /dev/null @@ -1,32 +0,0 @@ -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. "Foo::Bar" -# would be translated to "Pub", not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2002-05-28 10:57:43 AM CEST\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - - -msgid "ICON_OBJBROWSER_Visu" -msgstr "Visu_tree_visu.png" - -msgid "ICON_SCALAR_MAP" -msgstr "Visu_scalars.png" - -msgid "ICON_DEFORMED_SHAPE" -msgstr "Visu_deformed.png" - -msgid "ICON_VECTORS" -msgstr "Visu_vectors.png" - -msgid "ICON_ISO_SURFACES" -msgstr "Visu_isosurfaces.png" - -msgid "ICON_CUT_PLANES" -msgstr "Visu_cutplane.png" - -msgid "ICON_STREAM_LINES" -msgstr "Visu_streamlines.png" diff --git a/src/VISUGUI/VISU_msg_en.po b/src/VISUGUI/VISU_msg_en.po deleted file mode 100644 index 8df1a336..00000000 --- a/src/VISUGUI/VISU_msg_en.po +++ /dev/null @@ -1,252 +0,0 @@ -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. translating -# from French to English, "Foo::Bar" would be translated to "Pub", -# not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2002-02-22 16:56:46 CET\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - -msgid "VISU_BUT_OK" -msgstr "OK" - -msgid "VISU_WARNING" -msgstr "Visu Warning" - -#: isodlg.cxx:20 -msgid "::VISU_MEN_ISOSURFDLG" -msgstr "Iso Surface" - -#: VisuGUI.cxx:1351 -msgid "VisuGUI::BT" -msgstr "Bad Type for Selected Item" - -#: VisuGUI.cxx:1263 -msgid "VisuGUI::II" -msgstr "Input Information not selected" - -#: VisuGUI.cxx:1636 -msgid "VisuGUI::ND" -msgstr "No Data in file selected" - -#: VisuGUI.cxx:1290 -msgid "VisuGUI::NI" -msgstr "No Data in file selected" - -#: VisuGUI.cxx:1644 -msgid "VisuGUI::NO" -msgstr "Nil Objetc" - -#: VisuGUI.cxx:1164 -msgid "VisuGUI::NR" -msgstr "No Results in file selected" - -#: VisuGUI_CursorDlg.cxx:43 -msgid "VisuGUI_CursorDlg::&Cancel" -msgstr "Cancel" - -#: VisuGUI_CursorDlg.cxx:30 -msgid "VisuGUI_CursorDlg::&Help" -msgstr "Help" - -#: VisuGUI_CursorDlg.cxx:37 -msgid "VisuGUI_CursorDlg::&OK" -msgstr "OK" - -#: VisuGUI_CursorDlg.cxx:49 -msgid "VisuGUI_CursorDlg::Choose a value" -msgstr "Choose a Value" - -#: VisuGUI_CursorDlg.cxx:20 -msgid "VisuGUI_CursorDlg::MyDialog" -msgstr "Change Cursor" - -#: VisuGUI_IsoSurfacesDlg.cxx:87 -msgid "VisuGUI_IsoSurfacesDlg::&Cancel" -msgstr "Cancel" - -#: VisuGUI_IsoSurfacesDlg.cxx:74 -msgid "VisuGUI_IsoSurfacesDlg::&Help" -msgstr "Help" - -#: VisuGUI_IsoSurfacesDlg.cxx:81 -msgid "VisuGUI_IsoSurfacesDlg::&OK" -msgstr "OK" - -#: VisuGUI_IsoSurfacesDlg.cxx:26 -msgid "VisuGUI_IsoSurfacesDlg::Iso Surfaces Representation" -msgstr "" - -#: VisuGUI_IsoSurfacesDlg.cxx:40 -msgid "VisuGUI_IsoSurfacesDlg::Maximum value" -msgstr "" - -#: VisuGUI_IsoSurfacesDlg.cxx:35 -msgid "VisuGUI_IsoSurfacesDlg::Minimum value" -msgstr "" - -#: VisuGUI_IsoSurfacesDlg.cxx:21 -msgid "VisuGUI_IsoSurfacesDlg::MyDialog" -msgstr "Iso Surface" - -#: VisuGUI_IsoSurfacesDlg.cxx:44 -msgid "VisuGUI_IsoSurfacesDlg::Number of surfaces" -msgstr "" - -#: VisuGUI_MagnitudeDlg.cxx:43 -msgid "VisuGUI_MagnitudeDlg::VISU_BUT_CANCEL" -msgstr "Cancel" - -#: VisuGUI_MagnitudeDlg.cxx:30 -msgid "VisuGUI_MagnitudeDlg::VISU_BUT_HELP" -msgstr "Help" - -#: VisuGUI_MagnitudeDlg.cxx:37 -msgid "VisuGUI_MagnitudeDlg::VISU_BUT_OK" -msgstr "OK" - -#: VisuGUI_MagnitudeDlg.cxx:54 -msgid "VisuGUI_MagnitudeDlg::VISU_MEN_PHASE" -msgstr "Magnitude" - -#: VisuGUI_PartialScaDlg.cxx:43 -msgid "VisuGUI_PartialScaDlg::&Cancel" -msgstr "Cancel" - -#: VisuGUI_PartialScaDlg.cxx:30 -msgid "VisuGUI_PartialScaDlg::&Help" -msgstr "Help" - -#: VisuGUI_PartialScaDlg.cxx:37 -msgid "VisuGUI_PartialScaDlg::&OK" -msgstr "OK" - -#: VisuGUI_PartialScaDlg.cxx:76 -msgid "VisuGUI_PartialScaDlg::Max :" -msgstr "" - -#: VisuGUI_PartialScaDlg.cxx:81 -msgid "VisuGUI_PartialScaDlg::Min :" -msgstr "" - -#: VisuGUI_PartialScaDlg.cxx:49 -msgid "VisuGUI_PartialScaDlg::Min an Max limits of scalar Display" -msgstr "" - -#: VisuGUI_PartialScaDlg.cxx:20 -msgid "VisuGUI_PartialScaDlg::MyDialog" -msgstr "Partial Scalar" - -#: VisuGUI_PhaseDlg.cxx:43 -msgid "VisuGUI_PhaseDlg::VISU_BUT_CANCEL" -msgstr "Cancel" - -#: VisuGUI_PhaseDlg.cxx:30 -msgid "VisuGUI_PhaseDlg::VISU_BUT_HELP" -msgstr "Help" - -#: VisuGUI_PhaseDlg.cxx:37 -msgid "VisuGUI_PhaseDlg::VISU_BUT_OK" -msgstr "OK" - -#: VisuGUI_PhaseDlg.cxx:54 -msgid "VisuGUI_PhaseDlg::VISU_MEN_PHASE" -msgstr "Phase" - -#: VisuGUI_PhaseMagnitudeDlg.cxx:83 -msgid "VisuGUI_PhaseMagnitudeDlg::&Cancel" -msgstr "Cancel" - -#: VisuGUI_PhaseMagnitudeDlg.cxx:70 -msgid "VisuGUI_PhaseMagnitudeDlg::&Help" -msgstr "Help" - -#: VisuGUI_PhaseMagnitudeDlg.cxx:77 -msgid "VisuGUI_PhaseMagnitudeDlg::&OK" -msgstr "OK" - -#: VisuGUI_PhaseMagnitudeDlg.cxx:57 -msgid "VisuGUI_PhaseMagnitudeDlg::Magnitude :" -msgstr "" - -#: VisuGUI_PhaseMagnitudeDlg.cxx:52 -msgid "VisuGUI_PhaseMagnitudeDlg::Phase :" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:47 -msgid "VisuGUI_VectorsDlg::&Cancel" -msgstr "Cancel" - -#: VisuGUI_VectorsDlg.cxx:34 -msgid "VisuGUI_VectorsDlg::&Help" -msgstr "Help" - -#: VisuGUI_VectorsDlg.cxx:41 -msgid "VisuGUI_VectorsDlg::&OK" -msgstr "OK" - -#: VisuGUI_VectorsDlg.cxx:68 -msgid "VisuGUI_VectorsDlg::0.1" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:129 -msgid "VisuGUI_VectorsDlg::Arrows" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:124 -msgid "VisuGUI_VectorsDlg::Cones (2)" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:119 -msgid "VisuGUI_VectorsDlg::Cones (6)" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:109 -msgid "VisuGUI_VectorsDlg::Glyph type" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:84 -msgid "VisuGUI_VectorsDlg::Line width" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:97 -msgid "VisuGUI_VectorsDlg::Magnitude coloring" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:24 -msgid "VisuGUI_VectorsDlg::MyDialog" -msgstr "Vectors" - -#: VisuGUI_VectorsDlg.cxx:63 -msgid "VisuGUI_VectorsDlg::Scale factor" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:103 -msgid "VisuGUI_VectorsDlg::Use glyphs" -msgstr "" - -#: VisuGUI_VectorsDlg.cxx:53 -msgid "VisuGUI_VectorsDlg::Vectors Representation" -msgstr "" - -msgid "VisuGUI_BAD_MEDFILE" -msgstr "Med file is not correct" - -msgid "VisuGUI_IMPORT_FROM_MED" -msgstr "Import from med file" - -msgid "MED_MEN_IMPORT" -msgstr "Import" - -msgid "MED_MEN_ALL_FILES" -msgstr "All Files ( * )" - -msgid "MED_MEN_IMPORT_MED" -msgstr "MED Files ( *.med )" - -msgid "BUT_CLOSE" -msgstr "Close" - diff --git a/src/VISU_I/VISU_LookupTable.cxx b/src/VISU_I/VISU_LookupTable.cxx deleted file mode 100644 index af543757..00000000 --- a/src/VISU_I/VISU_LookupTable.cxx +++ /dev/null @@ -1,79 +0,0 @@ -using namespace std; -// File : VISU_LookupTable.cxx -// Created : UI team, 18.02.03 -// Descr : Scaling values of vtkLookupTable -// Author : Vitaliy Smetannikov -// Project : SALOME -// Module : OBJECT -// Copyright : Open CASCADE 2003 - - -#include "VISU_LookupTable.hxx" -#include "vtkObjectFactory.h" - - -VISU_LookupTable *VISU_LookupTable::New() { - vtkObject* ret = vtkObjectFactory::CreateInstance("VISU_LookupTable"); - if(ret) { - return (VISU_LookupTable*)ret; - } - // If the factory was unable to create the object, then create it here. - return new VISU_LookupTable; -} - -VISU_LookupTable::VISU_LookupTable(int sze, int ext) - : vtkLogLookupTable(sze, ext), myScale(1.), myIsLog(0) -{} - -int VISU_LookupTable::ComputeLogRange(float inRange[2], float outRange[2]){ - if(inRange[0] >= inRange[1]){ - //vtkErrorMacro (<<"Minimum value must be less than maximum value"); - return -1; - } - if(0.0 <= inRange[0] && 0.0 < inRange[1]){ - if (inRange[0] == 0.0) inRange[0] = 1.0e-06 * (inRange[1] - inRange[0]); - outRange[0] = log10((double)inRange[0]); - outRange[1] = log10((double)inRange[1]); - return 0; - }else if(inRange[0] < 0.0 && inRange[1] <= 0.0){ - outRange[0] = log10((double)-inRange[0]); - outRange[1] = log10((double)-inRange[1]); - return 1; - }else{ - //vtkErrorMacro(<<"Can't use logarithmic table on mixed negative/positive values"); - return -1; - } -} - -void VISU_LookupTable::SetTableRange(float min, float max){ - this->TableRange[0] = min; - this->TableRange[1] = max; - this->UseAbsoluteValue = ComputeLogRange(this->TableRange,this->myLogRange); - if(this->UseAbsoluteValue < 0) return; - this->LogMinRange = this->myLogRange[0]; - this->LogMaxRange = this->myLogRange[1]; -} - -unsigned char* VISU_LookupTable::MapValue(float v) { - v = this->TableRange[0] + (v - this->TableRange[0])*myScale; - if(myIsLog) { - v = pow((float)10.0,v)*myScale; - //v = pow(10.0, (this->LogMinRange + (v - this->LogMinRange)))*myScale; - return vtkLogLookupTable::MapValue(v); - }else{ - //v *= myScale; - return vtkLookupTable::MapValue(v); - } -} - - - - - - - - - - - - diff --git a/src/VISU_I/VISU_LookupTable.hxx b/src/VISU_I/VISU_LookupTable.hxx deleted file mode 100644 index a690fb63..00000000 --- a/src/VISU_I/VISU_LookupTable.hxx +++ /dev/null @@ -1,41 +0,0 @@ -// File : VISU_LookupTable.h -// Created : UI team, 18.02.03 -// Descr : Scaling values of vtkLookupTable -// Author : Vitaliy Smetannikov -// Project : SALOME -// Module : OBJECT -// Copyright : Open CASCADE 2003 - - -#ifndef VISU_LookupTable_H -#define VISU_LookupTable_H - -//#include -#include - -class VISU_LookupTable: public vtkLogLookupTable { - public: - vtkTypeMacro(VISU_LookupTable,vtkLogLookupTable); - - static VISU_LookupTable *New(); - - void SetTableRange(float min, float max); - static int ComputeLogRange(float inRange[2], float outRange[2]); - float* GetLogRange() { return myLogRange;} - unsigned char *MapValue(float v); - - float GetMapScale() { return myScale; } - void SetMapScale(float theScale) { myScale = theScale; Modified(); } - - int IsLog() { return myIsLog; } - void SetLog(int theLog) { myIsLog = theLog; Modified(); } - - protected: - VISU_LookupTable(int sze=256, int ext=256); - ~VISU_LookupTable() {}; - - float myScale; - int myIsLog; - float myLogRange[2]; -}; -#endif // VISU_LookupTable_H diff --git a/src/VISU_I/VISU_ScalarBarActor.cxx b/src/VISU_I/VISU_ScalarBarActor.cxx deleted file mode 100644 index 754779ca..00000000 --- a/src/VISU_I/VISU_ScalarBarActor.cxx +++ /dev/null @@ -1,600 +0,0 @@ -using namespace std; -// File: VISU_ScalarBarActor.cxx -// Created: Wed Feb 26 10:34:56 2003 -// Author: Alexey PETROV -// - - -#include "VISU_ScalarBarActor.hxx" -#include "VISU_LookupTable.hxx" -#include - -//------------------------------------------------------------------------------ -VISU_ScalarBarActor* VISU_ScalarBarActor::New(){ - vtkObject* ret = vtkObjectFactory::CreateInstance("VISU_ScalarBarActor"); - if(ret) - return (VISU_ScalarBarActor*)ret; - return new VISU_ScalarBarActor; -} - -VISU_ScalarBarActor::VISU_ScalarBarActor() -{ - this->myLookupTable = NULL; - this->Position2Coordinate->SetValue(0.17, 0.8); - - this->PositionCoordinate->SetCoordinateSystemToNormalizedViewport(); - this->PositionCoordinate->SetValue(0.82,0.1); - - this->MaximumNumberOfColors = 64; - this->NumberOfLabels = 5; - this->NumberOfLabelsBuilt = 0; - this->Orientation = VTK_ORIENT_VERTICAL; - this->Title = NULL; - - this->Bold = 1; - this->Italic = 1; - this->Shadow = 1; - this->FontFamily = VTK_ARIAL; - this->LabelFormat = new char[8]; - sprintf(this->LabelFormat,"%s","%-#6.3g"); - - this->TitleMapper = vtkTextMapper::New(); - this->TitleMapper->SetJustificationToCentered(); - this->TitleActor = vtkActor2D::New(); - this->TitleActor->SetMapper(this->TitleMapper); - this->TitleActor->GetPositionCoordinate()-> - SetReferenceCoordinate(this->PositionCoordinate); - - this->TextMappers = NULL; - this->TextActors = NULL; - - this->ScalarBar = vtkPolyData::New(); - this->ScalarBarMapper = vtkPolyDataMapper2D::New(); - this->ScalarBarMapper->SetInput(this->ScalarBar); - this->ScalarBarActor = vtkActor2D::New(); - this->ScalarBarActor->SetMapper(this->ScalarBarMapper); - this->ScalarBarActor->GetPositionCoordinate()-> - SetReferenceCoordinate(this->PositionCoordinate); - this->LastOrigin[0] = 0; - this->LastOrigin[1] = 0; - this->LastSize[0] = 0; - this->LastSize[1] = 0; -} - -void VISU_ScalarBarActor::ReleaseGraphicsResources(vtkWindow *win) -{ - this->TitleActor->ReleaseGraphicsResources(win); - if (this->TextMappers != NULL ) - { - for (int i=0; i < this->NumberOfLabelsBuilt; i++) - { - this->TextActors[i]->ReleaseGraphicsResources(win); - } - } - this->ScalarBarActor->ReleaseGraphicsResources(win); -} - -VISU_ScalarBarActor::~VISU_ScalarBarActor() -{ - if (this->LabelFormat) - { - delete [] this->LabelFormat; - this->LabelFormat = NULL; - } - - this->TitleMapper->Delete(); - this->TitleActor->Delete(); - - if (this->TextMappers != NULL ) - { - for (int i=0; i < this->NumberOfLabelsBuilt; i++) - { - this->TextMappers[i]->Delete(); - this->TextActors[i]->Delete(); - } - delete [] this->TextMappers; - delete [] this->TextActors; - } - - this->ScalarBar->Delete(); - this->ScalarBarMapper->Delete(); - this->ScalarBarActor->Delete(); - - if (this->Title) - { - delete [] this->Title; - this->Title = NULL; - } - - this->SetLookupTable(NULL); -} - -void VISU_ScalarBarActor::SetLookupTable(vtkScalarsToColors* theLookupTable){ - //this->myLookupTable = dynamic_cast(theLookupTable); - if(this->myLookupTable != NULL) this->myLookupTable->UnRegister(this); - this->myLookupTable = VISU_LookupTable::SafeDownCast(theLookupTable); - this->myLookupTable->Register(this); -} - -vtkScalarsToColors* VISU_ScalarBarActor::GetLookupTable(){ - cout<<"VISU_ScalarBarActor::GetLookupTable = "<myLookupTable; - return this->myLookupTable; -} - -int VISU_ScalarBarActor::RenderOverlay(vtkViewport *viewport) -{ - int renderedSomething = 0; - int i; - - // Everything is built, just have to render - if (this->Title != NULL) - { - renderedSomething += this->TitleActor->RenderOverlay(viewport); - } - this->ScalarBarActor->RenderOverlay(viewport); - if( this->TextActors == NULL) - { - vtkWarningMacro(<<"Need a mapper to render a scalar bar"); - return renderedSomething; - } - - for (i=0; iNumberOfLabels; i++) - { - renderedSomething += this->TextActors[i]->RenderOverlay(viewport); - } - - renderedSomething = (renderedSomething > 0)?(1):(0); - - return renderedSomething; -} - -int VISU_ScalarBarActor::RenderOpaqueGeometry(vtkViewport *viewport) -{ - int renderedSomething = 0; - int i; - int size[2]; - - if ( ! this->myLookupTable ) - { - vtkWarningMacro(<<"Need a mapper to render a scalar bar"); - return 0; - } - - // Check to see whether we have to rebuild everything - if ( viewport->GetMTime() > this->BuildTime || - ( viewport->GetVTKWindow() && - viewport->GetVTKWindow()->GetMTime() > this->BuildTime ) ) - { - // if the viewport has changed we may - or may not need - // to rebuild, it depends on if the projected coords chage - int *barOrigin; - barOrigin = this->PositionCoordinate->GetComputedViewportValue(viewport); - size[0] = - this->Position2Coordinate->GetComputedViewportValue(viewport)[0] - - barOrigin[0]; - size[1] = - this->Position2Coordinate->GetComputedViewportValue(viewport)[1] - - barOrigin[1]; - if (this->LastSize[0] != size[0] || this->LastSize[1] != size[1] || - this->LastOrigin[0] != barOrigin[0] || - this->LastOrigin[1] != barOrigin[1]) - { - this->Modified(); - } - } - - // Check to see whether we have to rebuild everything - if ( this->GetMTime() > this->BuildTime || - this->myLookupTable->GetMTime() > this->BuildTime ) - { - vtkDebugMacro(<<"Rebuilding subobjects"); - - // Delete previously constructed objects - // - if (this->TextMappers != NULL ) - { - for (i=0; i < this->NumberOfLabelsBuilt; i++) - { - this->TextMappers[i]->Delete(); - this->TextActors[i]->Delete(); - } - delete [] this->TextMappers; - delete [] this->TextActors; - } - - // Build scalar bar object - // - VISU_LookupTable *lut = this->myLookupTable; //VISU specific - // we hard code how many steps to display - int numColors = this->MaximumNumberOfColors; - float *range = lut->GetRange(); - - int numPts = 2*(numColors + 1); - vtkPoints *pts = vtkPoints::New(); - pts->SetNumberOfPoints(numPts); - vtkCellArray *polys = vtkCellArray::New(); - polys->Allocate(polys->EstimateSize(numColors,4)); - vtkScalars *colors = vtkScalars::New(VTK_UNSIGNED_CHAR,3); - colors->SetNumberOfScalars(numColors); - vtkUnsignedCharArray *colorData = (vtkUnsignedCharArray *)colors->GetData(); - - this->ScalarBarActor->SetProperty(this->GetProperty()); - this->ScalarBar->Initialize(); - this->ScalarBar->SetPoints(pts); - this->ScalarBar->SetPolys(polys); - this->ScalarBar->GetCellData()->SetScalars(colors); - pts->Delete(); polys->Delete(); colors->Delete(); - - // get the viewport size in display coordinates - int *barOrigin, barWidth, barHeight; - barOrigin = this->PositionCoordinate->GetComputedViewportValue(viewport); - size[0] = - this->Position2Coordinate->GetComputedViewportValue(viewport)[0] - - barOrigin[0]; - size[1] = - this->Position2Coordinate->GetComputedViewportValue(viewport)[1] - - barOrigin[1]; - this->LastOrigin[0] = barOrigin[0]; - this->LastOrigin[1] = barOrigin[1]; - this->LastSize[0] = size[0]; - this->LastSize[1] = size[1]; - - // Update all the composing objects - // - if (this->Title == NULL ) - { - this->TitleActor->VisibilityOff(); - } - this->TitleActor->VisibilityOn(); - this->TitleActor->SetProperty(this->GetProperty()); - this->TitleMapper->SetInput(this->Title); - this->TitleMapper->SetBold(this->Bold); - this->TitleMapper->SetItalic(this->Italic); - this->TitleMapper->SetShadow(this->Shadow); - this->TitleMapper->SetFontFamily(this->FontFamily); - - - // find the best size for the title font - int titleSize[2]; - this->SizeTitle(titleSize, size, viewport); - - // find the best size for the ticks - int labelSize[2]; - this->AllocateAndSizeLabels(labelSize, size, viewport,range); - this->NumberOfLabelsBuilt = this->NumberOfLabels; - - // generate points - float x[3]; x[2] = 0.0; - float delta; - if ( this->Orientation == VTK_ORIENT_VERTICAL ) - { - barWidth = size[0] - 4 - labelSize[0]; - barHeight = (int)(0.86*size[1]); - delta=(float)barHeight/numColors; - for (i=0; iSetPoint(2*i,x); - x[0] = barWidth; - pts->SetPoint(2*i+1,x); - } - } - else - { - barWidth = size[0]; - barHeight = (int)(0.4*size[1]); - delta=(float)barWidth/numColors; - for (i=0; iSetPoint(2*i,x); - x[1] = 0; - pts->SetPoint(2*i+1,x); - } - } - - //polygons & cell colors - unsigned char *rgba, *rgb; - int ptIds[4]; - float val, *aLogRange = this->myLookupTable->GetLogRange(); - for (i=0; iInsertNextCell(4,ptIds); - rgba = lut->MapValue(range[0] + (range[1] - range[0])*((float)i /(numColors-1.0))); - if(this->myLookupTable->IsLog()){ // SALOME specific - val = aLogRange[0] + (float)i/(numColors-1.0) * (aLogRange[1]-aLogRange[0]); - rgba = lut->MapValue(val); - } - rgb = colorData->GetPointer(3*i); //write into array directly - rgb[0] = rgba[0]; - rgb[1] = rgba[1]; - rgb[2] = rgba[2]; - } - - // Now position everything properly - // - if (this->Orientation == VTK_ORIENT_VERTICAL) - { - int sizeTextData[2]; - - // center the title - this->TitleActor->SetPosition(size[0]/2, 0.9*size[1]); - - for (i=0; i < this->NumberOfLabels; i++) - { - val = (float)i/(this->NumberOfLabels-1) *barHeight; - this->TextMappers[i]->SetJustificationToLeft(); - this->TextMappers[i]->GetSize(viewport,sizeTextData); - this->TextActors[i]->SetPosition(barWidth+3, - val - sizeTextData[1]/2); - } - } - else - { - this->TitleActor->SetPosition(size[0]/2, - barHeight + labelSize[1] + 0.1*size[1]); - for (i=0; i < this->NumberOfLabels; i++) - { - val = (float)i/(this->NumberOfLabels-1) * barWidth; - this->TextMappers[i]->SetJustificationToCentered(); - this->TextActors[i]->SetPosition(val, barHeight + 0.05*size[1]); - } - } - - this->BuildTime.Modified(); - } - - // Everything is built, just have to render - if (this->Title != NULL) - { - renderedSomething += this->TitleActor->RenderOpaqueGeometry(viewport); - } - this->ScalarBarActor->RenderOpaqueGeometry(viewport); - for (i=0; iNumberOfLabels; i++) - { - renderedSomething += this->TextActors[i]->RenderOpaqueGeometry(viewport); - } - - renderedSomething = (renderedSomething > 0)?(1):(0); - - return renderedSomething; -} - -void VISU_ScalarBarActor::PrintSelf(ostream& os, vtkIndent indent) -{ - vtkActor2D::PrintSelf(os,indent); - - if ( this->myLookupTable ) - { - os << indent << "Lookup Table:\n"; - this->myLookupTable->PrintSelf(os,indent.GetNextIndent()); - } - else - { - os << indent << "Lookup Table: (none)\n"; - } - - os << indent << "Title: " << (this->Title ? this->Title : "(none)") << "\n"; - os << indent << "Maximum Number Of Colors: " - << this->MaximumNumberOfColors << "\n"; - os << indent << "Number Of Labels: " << this->NumberOfLabels << "\n"; - os << indent << "Number Of Labels Built: " << this->NumberOfLabelsBuilt << "\n"; - - os << indent << "Orientation: "; - if ( this->Orientation == VTK_ORIENT_HORIZONTAL ) - { - os << "Horizontal\n"; - } - else - { - os << "Vertical\n"; - } - - os << indent << "Font Family: "; - if ( this->FontFamily == VTK_ARIAL ) - { - os << "Arial\n"; - } - else if ( this->FontFamily == VTK_COURIER ) - { - os << "Courier\n"; - } - else - { - os << "Times\n"; - } - - os << indent << "Bold: " << (this->Bold ? "On\n" : "Off\n"); - os << indent << "Italic: " << (this->Italic ? "On\n" : "Off\n"); - os << indent << "Shadow: " << (this->Shadow ? "On\n" : "Off\n"); - os << indent << "Label Format: " << this->LabelFormat << "\n"; -} - -void VISU_ScalarBarActor::ShallowCopy(vtkProp *prop) -{ - VISU_ScalarBarActor *a = VISU_ScalarBarActor::SafeDownCast(prop); - if ( a != NULL ) - { - this->SetPosition2(a->GetPosition2()); - this->SetLookupTable(a->GetLookupTable()); - this->SetMaximumNumberOfColors(a->GetMaximumNumberOfColors()); - this->SetOrientation(a->GetOrientation()); - this->SetBold(a->GetBold()); - this->SetItalic(a->GetItalic()); - this->SetShadow(a->GetShadow()); - this->SetFontFamily(a->GetFontFamily()); - this->SetLabelFormat(a->GetLabelFormat()); - this->SetTitle(a->GetTitle()); - - this->GetPositionCoordinate()->SetCoordinateSystem( - a->GetPositionCoordinate()->GetCoordinateSystem()); - this->GetPositionCoordinate()->SetValue( - a->GetPositionCoordinate()->GetValue()); - this->GetPosition2Coordinate()->SetCoordinateSystem( - a->GetPosition2Coordinate()->GetCoordinateSystem()); - this->GetPosition2Coordinate()->SetValue( - a->GetPosition2Coordinate()->GetValue()); - } - - // Now do superclass - this->vtkActor2D::ShallowCopy(prop); -} - -void VISU_ScalarBarActor::AllocateAndSizeLabels(int *labelSize, int *size, - vtkViewport *viewport, - float *range) -{ - labelSize[0] = 0; - labelSize[1] = 0; - int fontSize; - int tempi[2]; - - this->TextMappers = new vtkTextMapper * [this->NumberOfLabels]; - this->TextActors = new vtkActor2D * [this->NumberOfLabels]; - char string[512]; - float val, *aLogRange = this->myLookupTable->GetLogRange(); - int targetWidth, targetHeight; - int i; - - for (i=0; i < this->NumberOfLabels; i++) - { - this->TextMappers[i] = vtkTextMapper::New(); - val = range[0] + (float)i/(this->NumberOfLabels-1) * (range[1]-range[0]); - if(0 < i && i < this->NumberOfLabels - 1) // SALOME specific - if(this->myLookupTable->IsLog()){ - val = aLogRange[0] + (float)i/(this->NumberOfLabels-1) * (aLogRange[1]-aLogRange[0]); - val = pow((float)10.0,val); - } - sprintf(string, this->LabelFormat, val); - this->TextMappers[i]->SetInput(string); - this->TextMappers[i]->SetBold(this->Bold); - this->TextMappers[i]->SetItalic(this->Italic); - this->TextMappers[i]->SetShadow(this->Shadow); - this->TextMappers[i]->SetFontFamily(this->FontFamily); - this->TextActors[i] = vtkActor2D::New(); - this->TextActors[i]->SetMapper(this->TextMappers[i]); - this->TextActors[i]->SetProperty(this->GetProperty()); - this->TextActors[i]->GetPositionCoordinate()-> - SetReferenceCoordinate(this->PositionCoordinate); - } - if (this->NumberOfLabels) - { - if ( this->Orientation == VTK_ORIENT_VERTICAL ) - { - targetWidth = (int)(0.6*size[0]); - targetHeight = (int)(0.86*size[1]/this->NumberOfLabels); - } - else - { - targetWidth = (int)(size[0]*0.8/this->NumberOfLabels); - targetHeight = (int)(0.25*size[1]); - } - fontSize = targetWidth; - for (i=0; i < this->NumberOfLabels; i++) - { - this->TextMappers[i]->SetFontSize(fontSize); - this->TextMappers[i]->GetSize(viewport,tempi); - if (labelSize[0] < tempi[0]) - { - labelSize[0] = tempi[0]; - } - if (labelSize[1] < tempi[1]) - { - labelSize[1] = tempi[1]; - } - } - - while (labelSize[0] < targetWidth && labelSize[1] < targetHeight && - fontSize < 100 ) - { - fontSize++; - labelSize[0] = 0; - labelSize[1] = 0; - for (i=0; i < this->NumberOfLabels; i++) - { - this->TextMappers[i]->SetFontSize(fontSize); - this->TextMappers[i]->GetSize(viewport,tempi); - if (labelSize[0] < tempi[0]) - { - labelSize[0] = tempi[0]; - } - if (labelSize[1] < tempi[1]) - { - labelSize[1] = tempi[1]; - } - } - } - - while ((labelSize[0] > targetWidth || - labelSize[1] > targetHeight) && fontSize > 0 ) - { - fontSize--; - labelSize[0] = 0; - labelSize[1] = 0; - for (i=0; i < this->NumberOfLabels; i++) - { - this->TextMappers[i]->SetFontSize(fontSize); - this->TextMappers[i]->GetSize(viewport,tempi); - if (labelSize[0] < tempi[0]) - { - labelSize[0] = tempi[0]; - } - if (labelSize[1] < tempi[1]) - { - labelSize[1] = tempi[1]; - } - } - } - } -} - -void VISU_ScalarBarActor::SizeTitle(int *titleSize, int *size, - vtkViewport *viewport) -{ - int targetWidth, targetHeight; - titleSize[0] = 0; - titleSize[1] = 0; - int fontSize; - int tempi[2]; - - if (this->Title != NULL && (strlen(this->Title) != 0)) - { - if ( this->Orientation == VTK_ORIENT_VERTICAL ) - { - targetWidth = size[0]; - targetHeight = (int)(0.1*size[1]); - } - else - { - targetWidth = size[0]; - targetHeight = (int)(0.25*size[1]); - } - fontSize = targetWidth; - this->TitleMapper->SetFontSize(fontSize); - this->TitleMapper->GetSize(viewport,tempi); - - while (tempi[1] < targetHeight && tempi[0] < targetWidth - && fontSize < 100 ) - { - fontSize++; - this->TitleMapper->SetFontSize(fontSize); - this->TitleMapper->GetSize(viewport,tempi); - } - - while ((tempi[1] > targetHeight || tempi[0] > targetWidth ) - && fontSize > 0 ) - { - fontSize--; - this->TitleMapper->SetFontSize(fontSize); - this->TitleMapper->GetSize(viewport,tempi); - } - titleSize[0] = tempi[0]; - titleSize[1] = tempi[1]; - } -} diff --git a/src/VISU_I/VISU_ScalarBarActor.hxx b/src/VISU_I/VISU_ScalarBarActor.hxx deleted file mode 100644 index 9e4ed8bc..00000000 --- a/src/VISU_I/VISU_ScalarBarActor.hxx +++ /dev/null @@ -1,116 +0,0 @@ -// File: VISU_ScalarBarActor.hxx -// Created: Wed Feb 26 10:13:15 2003 -// Author: Alexey PETROV -// - - -#ifndef VISU_ScalarBarActor_HeaderFile -#define VISU_ScalarBarActor_HeaderFile - -#include -#include -#include -#include -#include - -class VISU_LookupTable; - -#define VTK_ORIENT_HORIZONTAL 0 -#define VTK_ORIENT_VERTICAL 1 - -class VTK_EXPORT VISU_ScalarBarActor : public vtkActor2D -{ -public: - vtkTypeMacro(VISU_ScalarBarActor,vtkActor2D); - void PrintSelf(ostream& os, vtkIndent indent); - - static VISU_ScalarBarActor *New(); - - int RenderOpaqueGeometry(vtkViewport* viewport); - int RenderTranslucentGeometry(vtkViewport*) { return 0; }; - int RenderOverlay(vtkViewport* viewport); - - virtual void ReleaseGraphicsResources(vtkWindow *); - - void SetLookupTable(vtkScalarsToColors*); - vtkScalarsToColors* GetLookupTable(); - - vtkSetClampMacro(MaximumNumberOfColors, int, 2, VTK_LARGE_INTEGER); - vtkGetMacro(MaximumNumberOfColors, int); - - vtkSetClampMacro(NumberOfLabels, int, 0, 64); - vtkGetMacro(NumberOfLabels, int); - - vtkSetClampMacro(Orientation,int,VTK_ORIENT_HORIZONTAL, VTK_ORIENT_VERTICAL); - vtkGetMacro(Orientation, int); - void SetOrientationToHorizontal() - {this->SetOrientation(VTK_ORIENT_HORIZONTAL);}; - void SetOrientationToVertical() {this->SetOrientation(VTK_ORIENT_VERTICAL);}; - - vtkSetMacro(Bold, int); - vtkGetMacro(Bold, int); - vtkBooleanMacro(Bold, int); - - vtkSetMacro(Italic, int); - vtkGetMacro(Italic, int); - vtkBooleanMacro(Italic, int); - - vtkSetMacro(Shadow, int); - vtkGetMacro(Shadow, int); - vtkBooleanMacro(Shadow, int); - - vtkSetMacro(FontFamily, int); - vtkGetMacro(FontFamily, int); - void SetFontFamilyToArial() {this->SetFontFamily(VTK_ARIAL);}; - void SetFontFamilyToCourier() {this->SetFontFamily(VTK_COURIER);}; - void SetFontFamilyToTimes() {this->SetFontFamily(VTK_TIMES);}; - - vtkSetStringMacro(LabelFormat); - vtkGetStringMacro(LabelFormat); - - vtkSetStringMacro(Title); - vtkGetStringMacro(Title); - - void ShallowCopy(vtkProp *prop); - -protected: - VISU_ScalarBarActor(); - ~VISU_ScalarBarActor(); - VISU_ScalarBarActor(const VISU_ScalarBarActor&); - void operator=(const VISU_ScalarBarActor&); - - VISU_LookupTable* myLookupTable; -private: - int MaximumNumberOfColors; - int NumberOfLabels; - int NumberOfLabelsBuilt; - int Orientation; - char *Title; - - int Bold; - int Italic; - int Shadow; - int FontFamily; - char *LabelFormat; - -private: - vtkTextMapper *TitleMapper; - vtkActor2D *TitleActor; - - vtkTextMapper **TextMappers; - vtkActor2D **TextActors; - - vtkPolyData *ScalarBar; - vtkPolyDataMapper2D *ScalarBarMapper; - vtkActor2D *ScalarBarActor; - - vtkTimeStamp BuildTime; - int LastSize[2]; - int LastOrigin[2]; - - void SizeTitle(int *titleSize, int *size, vtkViewport *viewport); - void AllocateAndSizeLabels(int *labelSize, int *size, - vtkViewport *viewport, float *range); -}; - -#endif -- 2.39.2