From: asv Date: Fri, 17 Feb 2006 07:36:47 +0000 (+0000) Subject: Merge with OCC_development..a2 branch X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=511c8e26a138eae5edbb14352a10a754a00a6eed;p=modules%2Fvisu.git Merge with OCC_development..a2 branch --- diff --git a/INSTALL b/INSTALL index 151559b0..1e34a59b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -This is the version 3.1.0 of VISU +This is the version 3.2.0a1 of VISU Compatible with : - - KERNEL 3.1.0 - - SALOMEGUI 3.1.0 - - MED 3.1.0 + - KERNEL 3.2.0a1 + - SALOMEGUI 3.2.0a1 + - MED 3.2.0a1 diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 574db11c..e38b5b7a 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -38,6 +38,7 @@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_LIBS = @BOOST_LIBS@ +BOOST_LIBTHREAD = @BOOST_LIBTHREAD@ # JAVA diff --git a/bin/VERSION b/bin/VERSION index 12ccd0e5..cadcd19d 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - VISU VERSION: 3.1.0 +THIS IS SALOME - VISU VERSION: 3.2.0a1 diff --git a/doc/salome/VISU_index_v3.1.0.html b/doc/salome/VISU_index_v3.1.0.html index d123d0aa..dce35eb1 100644 --- a/doc/salome/VISU_index_v3.1.0.html +++ b/doc/salome/VISU_index_v3.1.0.html @@ -65,25 +65,16 @@
-

- GUI Documentation -

- - +
+ +Gauss Viewer User Guide -
- - -

+
TUI Documentation - -

- - - +

diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.in index e03160f1..805d892e 100644 --- a/doc/salome/gui/Makefile.in +++ b/doc/salome/gui/Makefile.in @@ -16,6 +16,7 @@ VPATH=.:@srcdir@ docs: cp -fr $(srcdir)/VISU ./ + cp -fr $(srcdir)/GAUSS ./ -find $(PWD) -name CVS -exec rm -rf {} \; clean: @@ -23,11 +24,14 @@ clean: distclean: clean rm -fr VISU + rm -fr GAUSS install: mkdir -p $(docdir)/gui cp -rf VISU $(docdir)/gui + cp -rf GAUSS $(docdir)/gui -find $(PWD) -name CVS -exec rm -rf {} \; uninstall: rm -rf $(docdir)/gui/VISU + rm -rf $(docdir)/gui/GAUSS diff --git a/doc/salome/gui/VISU/cshdat_robohelp.htm b/doc/salome/gui/VISU/cshdat_robohelp.htm index bb2335a8..c948d8d1 100755 --- a/doc/salome/gui/VISU/cshdat_robohelp.htm +++ b/doc/salome/gui/VISU/cshdat_robohelp.htm @@ -1,6 +1,6 @@ -VISU refrence manual +Post-Pro Reference Manual diff --git a/doc/salome/gui/VISU/cshdat_webhelp.htm b/doc/salome/gui/VISU/cshdat_webhelp.htm index 42ec5d52..f8d93044 100755 --- a/doc/salome/gui/VISU/cshdat_webhelp.htm +++ b/doc/salome/gui/VISU/cshdat_webhelp.htm @@ -1,6 +1,6 @@ -VISU refrence manual +Post-Pro Reference Manual diff --git a/doc/salome/gui/VISU/files/cut_lines_presentation.htm b/doc/salome/gui/VISU/files/cut_lines_presentation.htm index 8f328e2f..f71a61ff 100755 --- a/doc/salome/gui/VISU/files/cut_lines_presentation.htm +++ b/doc/salome/gui/VISU/files/cut_lines_presentation.htm @@ -19,21 +19,20 @@ p.whs2 { font-family:'Times New Roman' , serif; font-size:12pt; } img_whs3 { border:none; width:30px; height:30px; float:none; border-style:none; } ol.whs4 { list-style:decimal; } p.whs5 { font-family:'Times New Roman' , serif; font-size:12pt; margin-left:40px; } -img_whs6 { border:none; width:340px; height:543px; border-style:none; float:left; } -p.whs7 { font-family:'Times New Roman' , serif; font-style:italic; color:#ff0000; margin-left:40px; } -p.whs8 { font-family:'Times New Roman' , serif; margin-left:40px; font-style:normal; color:#000000; } -img_whs9 { border:none; width:28px; height:26px; float:none; border-style:none; } +p.whs6 { font-family:'Times New Roman' , serif; font-style:italic; color:#ff0000; margin-left:40px; } +p.whs7 { font-family:'Times New Roman' , serif; margin-left:40px; font-style:normal; color:#000000; } +img_whs8 { border:none; width:28px; height:26px; float:none; border-style:none; } +img_whs9 { border:none; width:340px; height:543px; float:none; border-style:none; } p.whs10 { margin-left:40px; } ul.whs11 { list-style:disc; } -p.whs12 { margin-left:24px; } +p.whs12 { margin-left:36px; } p.whs13 { font-family:'Times New Roman' , serif; margin-left:0px; } p.whs14 { font-family:'Times New Roman' , serif; margin-left:0px; font-weight:normal; } -p.whs15 { font-family:'Times New Roman' , serif; margin-left:40px; } -p.whs16 { margin-left:0px; } -p.whs17 { margin-left:0px; font-family:'Times New Roman' , serif; } -img_whs18 { border:none; width:574px; height:411px; float:none; border-style:none; } -p.whs19 { margin-left:0px; font-family:'Times New Roman' , serif; background-image:url('../texture_horiz_ltbluebubbles.jpg'); } -img_whs20 { border:none; width:35px; height:37px; float:none; border-style:none; } +p.whs15 { margin-left:0px; } +p.whs16 { margin-left:0px; font-family:'Times New Roman' , serif; } +img_whs17 { border:none; width:574px; height:411px; float:none; border-style:none; } +p.whs18 { margin-left:0px; font-family:'Times New Roman' , serif; background-image:url('../texture_horiz_ltbluebubbles.jpg'); } +img_whs19 { border:none; width:35px; height:37px; float:none; border-style:none; } -->

Deformed Shape presentation

Deformed Shape is +

Deformed Shape is a type of field presentation when vector values corresponding to the cells of the mesh are visualized by shifting of these cells.

To create a Deformed Shape presentation:

@@ -119,56 +120,62 @@ else

Deformed +
Deformed Shape tab allows to set additional parameters of your Deformed Shape presentation:

-
+
-
- Scale +
Scale Factor: visualization scaling of all vector values applied to the cells of the mesh.
-
- Magnitude +
Magnitude coloring check box: this option allows to color your presentation according the scalar range defined in Scalar Bar properties or to display it using only one color (this color is taken by default).

-

+

-
+
-
Scalar +
Scalar Bar tab allows to define the parameters of the scalar bar displayed along with this presentation (see also).

-

+

-
After you have finished +
After you have finished with setting these parameters, click OK. Your presentation with scalar bar will be immediately displayed in the viewer:
-

+

-

+

-

+

-
+

-

+

@@ -97,7 +97,7 @@ kadovFilePopupInit('a1');

Import a mesh from a MED - file
@@ -105,7 +105,7 @@ kadovFilePopupInit('a2');

Create a presentation of - a submesh and set view parameters
@@ -113,14 +113,14 @@ kadovFilePopupInit('a3');

Create field presentations - and use sweeping

-
Animate fields
@@ -128,7 +128,7 @@ kadovFilePopupInit('a5');

Import a table from a file and create a 2d plot based on - the data from this table
Vector Field Presentation
-
Vector - Field presentation +
Vector Field presentation visualizes vectors of the corresponding cells of the mesh in graphical mode.

-
To create a Vector presentation:
+
To create a Vector presentation:

@@ -118,9 +118,13 @@ else

-
+
+ +

+ +
-
Vectors presentation:

-

+

-
+
-
Scale +
Scale Factor: visualization scaling of all vector values applied to the cells of the mesh.
-
Line +
Line width: width of the lines representing vectors in your presentation.
-
Magnitude +
Magnitude coloring check box: this option allows to color your presentation according the scalar range defined in Scalar Bar properties or to display it using only one color (this color can be selected if you click Select Color button).
-
Use +
Use glyphs check box: this option allows you to visualize vectors with pointers and select their type and position on the line of the @@ -163,9 +167,9 @@ else

-
+
-
Scalar +
Scalar Bar tab allows to define the parameters of the scalar bar displayed along with this presentation (see also).
@@ -180,7 +184,7 @@ else

-

+


diff --git a/doc/salome/gui/VISU/pics/viewsettings.png b/doc/salome/gui/VISU/pics/viewsettings.png index 215f4308..79dcc495 100755 Binary files a/doc/salome/gui/VISU/pics/viewsettings.png and b/doc/salome/gui/VISU/pics/viewsettings.png differ diff --git a/doc/salome/gui/VISU/visu.htm b/doc/salome/gui/VISU/visu.htm index 22a7dbfd..a946b8eb 100755 --- a/doc/salome/gui/VISU/visu.htm +++ b/doc/salome/gui/VISU/visu.htm @@ -8,7 +8,7 @@ if (sPath.indexOf("http")!= -1) document.write(""); //--> - VISU refrence manual + Post-Pro Reference Manual diff --git a/doc/salome/gui/VISU/visu.log b/doc/salome/gui/VISU/visu.log index d61ab26e..1bd36f31 100755 --- a/doc/salome/gui/VISU/visu.log +++ b/doc/salome/gui/VISU/visu.log @@ -134,12 +134,6 @@ visu.hhk clipping.htm creating_plot2d_presentations_from_tables.htm creating_tables.htm -files\a.htm -files\a1.htm -files\a2.htm -files\a3.htm -files\a4.htm -files\a5.htm files\about_structure_of_med_object.htm files\about_tables.htm files\animating_presentations.htm @@ -194,15 +188,12 @@ pics\streamlines.png image20.gif bgbaby.gif q_blue.jpg -createfieldprsnt.gif pics\cellsel.jpg pics\vectorsprsnt.jpg pics\isosurf.jpg pics\setupplot2d.png pics\importtablefromfile.png image21.gif -importmed.gif -launchvisu.gif pics\surface.jpg pics\fitdatarange.png image22.gif @@ -248,8 +239,6 @@ pics\visufullscreen.png pics\editplot2dpresentation.png pics\cutlines.png pics\importfromfile.png -createtable.gif -createpresent.gif pics\animationparam.jpg pics\display.jpg pics\dataonelements2.png @@ -259,7 +248,6 @@ pics\display1.jpg pics\dataonelements3.png pics\scaling.png pics\scalarbarproperties.png -animation.gif pics\cutlinesicn.jpg pics\animation.jpg pics\cellselection.jpg @@ -316,6 +304,7 @@ whgdata\whlstfl19.htm whgdata\whlstfl20.htm whgdata\whlstfl21.htm whgdata\whlstfl22.htm +whgdata\whlstfl23.htm whgdata\whlstf0.htm whgdata\whlstf1.htm whgdata\whlstf2.htm diff --git a/doc/salome/gui/VISU/visu_csh.htm b/doc/salome/gui/VISU/visu_csh.htm index a2cd881d..963cc5dc 100755 --- a/doc/salome/gui/VISU/visu_csh.htm +++ b/doc/salome/gui/VISU/visu_csh.htm @@ -1,6 +1,6 @@ -VISU refrence manual +Post-Pro Reference Manual diff --git a/doc/salome/gui/VISU/visu_rhc.htm b/doc/salome/gui/VISU/visu_rhc.htm index fe588648..f295471b 100755 --- a/doc/salome/gui/VISU/visu_rhc.htm +++ b/doc/salome/gui/VISU/visu_rhc.htm @@ -1,6 +1,6 @@ -VISU refrence manual +Post-Pro Reference Manual diff --git a/doc/salome/gui/VISU/whcshdata.htm b/doc/salome/gui/VISU/whcshdata.htm index 068986f6..37d60961 100755 --- a/doc/salome/gui/VISU/whcshdata.htm +++ b/doc/salome/gui/VISU/whcshdata.htm @@ -1,6 +1,6 @@ -VISU refrence manual +Post-Pro Reference Manual diff --git a/doc/salome/gui/VISU/whdata/whfwdata0.htm b/doc/salome/gui/VISU/whdata/whfwdata0.htm index eb1324ec..293865bc 100755 --- a/doc/salome/gui/VISU/whdata/whfwdata0.htm +++ b/doc/salome/gui/VISU/whdata/whfwdata0.htm @@ -13,15 +13,16 @@ - VISU refrence manual + Post-Pro Reference Manual diff --git a/doc/salome/gui/VISU/whskin_info.htm b/doc/salome/gui/VISU/whskin_info.htm index 11dc9052..81097e6c 100755 --- a/doc/salome/gui/VISU/whskin_info.htm +++ b/doc/salome/gui/VISU/whskin_info.htm @@ -9,7 +9,7 @@ - + diff --git a/doc/salome/gui/VISU/whxdata/whfwdata0.xml b/doc/salome/gui/VISU/whxdata/whfwdata0.xml index 3f7a9c93..83b6beda 100755 --- a/doc/salome/gui/VISU/whxdata/whfwdata0.xml +++ b/doc/salome/gui/VISU/whxdata/whfwdata0.xml @@ -1,15 +1,16 @@ 0,6,30, - 4,5,7,2,10,15,14,16,17,18,21,33,27,28,31, + 4,5,7,2,10,15,14,16,17,18,21,33,27,28,29,31, 6,30, - 4,5,7,2,10,15,14,16,17,21,33,27,28,31, + 29, + 4,5,7,2,10,15,14,16,17,21,33,27,28,29,31, 7,10, 7,11,19,29, 4,5,7,10,21,27,31, 3,11,12,18,20,22,26,28,6, 5,7,10,27,31, - 5,0, + 5,0,29, 31, 29, 14, @@ -22,12 +23,12 @@ 5,0,29, 11,17, 4,5,7,2,11,12,13,14,16,20,23,33,26,27,28,29,30,31,32, - 11,12,13,18,23,27,29,30,32, + 11,13,18,23,27,29,30,32, 24,6,30, 0,11,12, 5,19, 5,31, - 5,11,12,28,30,31, + 5,12,28,30,31, 3,4,18, 26,27, 5,7,10,14,24,26,28,6,29, @@ -147,6 +148,8 @@ 4,5,7,8,9,2,10,11,12,13,15,14,16,17,18,20,23,33,26,28,6,29,30,31,32, 0, 3, + 29, + 29, 7,1, 5,14,28, 7,1, @@ -168,6 +171,7 @@ 14, 3,5, 18, + 29, 14, 17,20,30, 21, @@ -179,7 +183,7 @@ 3,30, 3, 27,30, - 3,5,8,11,12,13,14,16,18,19,20,22,23,24,26,27,28,29,30,31,32, + 3,5,8,11,12,13,14,16,18,19,20,22,23,24,26,27,28,30,31,32, 3,4,17,19,20,21,29, 11,12,13,23,26,30,32, 5,1, @@ -247,6 +251,7 @@ 5, 30, 3, + 29, 22, 23,31, 23, @@ -273,6 +278,7 @@ 30, 13,30,32, 3,5,8,10,11,12,13,14,17,18,21,23,26,27,28,6,29,30,32, + 29, 8,28,30, 5,16, 4,11,12, @@ -281,13 +287,14 @@ 1,29, 30, 26, - 23,30, + 23,29,30, 30, 5,0,7,8,1,9,2,10,11,12,13,15,14,16,17,18,20,21,23,33,24,25,26,27,28,6,29,30,31,32, 3,11,12,13,18,19,6,30,32, 4, 26, 23,31, + 29, 4,0,26,28,6,29,32, 2,14,33, 3,5,19,22,25,26,28, @@ -295,7 +302,9 @@ 14,28, 5,10, 30, + 29, 7,10,18,21,24,29, + 29, 26, 18,21, 0,8,2,10,19,21,33,25,26, @@ -305,8 +314,7 @@ 6, 26, 0, - 11,12,18,23,26,28,30,31, - 29, + 12,18,23,26,28,29,30,31, 3,5,0,7,8,9,2,10,11,12,13,15,14,16,17,18,20,21,23,33,24,26,28,6,30,31,32, 11,12, 3, @@ -381,13 +389,13 @@ 10,27, 4,5,13,23,26,29,32, 4, - 5, + 5,29, 7,1, 4,10, 31, 11, 25, - 11,12, + 12, 26, 7, 16,24, @@ -412,7 +420,7 @@ 13,16,26,27,29,32, 3,5,8,2,11,12,13,18,23,33,26,30,31,32, 4, - 3,4,5,0,8,11,12,13,20,23,25,30,32, + 3,4,5,0,8,11,13,20,23,25,30,32, 17,20, 1, 0, @@ -432,7 +440,7 @@ 3,7,11,12,18,25,31, 5,0,11,12,15,29, 6, - 11,12, + 12, 30, 5, 11,12,20, @@ -448,7 +456,7 @@ 11,12,18,28, 5, 4, - 5, + 5,29, 16, 30, 29, @@ -471,6 +479,7 @@ 12,23,6,31, 6, 5,19,31, + 29, 4,0,11,12,13,21,23,26,30,32, 3,4,7,1,2,11,15,18,19,21,22,33,29, 32, diff --git a/doc/salome/tui/VISU/doxyfile b/doc/salome/tui/VISU/doxyfile index e4d7a67d..8a80b6b9 100755 --- a/doc/salome/tui/VISU/doxyfile +++ b/doc/salome/tui/VISU/doxyfile @@ -1,73 +1,89 @@ -# Doxyfile 1.3-rc1 +# Doxyfile 1.3.7 #--------------------------------------------------------------------------- -# General configuration options +# Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - VISU - v.3.1.0" +PROJECT_NAME = "SALOME - VISU - v.3.2.0a1" PROJECT_NUMBER = id#1.1 OUTPUT_DIRECTORY = ../ +CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = YES +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = NO +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 5 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = YES +OPTIMIZE_OUTPUT_JAVA = YES +SUBGROUPING = YES + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- EXTRACT_ALL = YES EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES EXTRACT_LOCAL_CLASSES = YES -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO +EXTRACT_LOCAL_METHODS = NO +HIDE_UNDOC_MEMBERS = YES +HIDE_UNDOC_CLASSES = YES HIDE_FRIEND_COMPOUNDS = NO HIDE_IN_BODY_DOCS = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = NO -ALWAYS_DETAILED_SEC = YES -INLINE_INHERITED_MEMB = YES -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = INTERNAL_DOCS = YES CASE_SENSE_NAMES = YES -SHORT_NAMES = NO HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES INLINE_INFO = YES SORT_MEMBER_DOCS = NO -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 5 +SORT_BRIEF_DOCS = NO +SORT_BY_SCOPE_NAME = NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES -ALIASES = ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 25 -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = YES SHOW_USED_FILES = NO + #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = log.txt + #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = ../../../share/salome/idl/VISU_Gen.idl -FILE_PATTERNS = -RECURSIVE = NO +INPUT = ../../../share/salome/src \ + ../../../share/salome/idl +FILE_PATTERNS = *.idl *.h *.hh *.hxx *.c *.cc *.cxx *.ixx *.jxx +RECURSIVE = YES EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO +EXAMPLE_RECURSIVE = YES IMAGE_PATH = sources/ INPUT_FILTER = FILTER_SOURCE_FILES = YES + #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -76,12 +92,15 @@ INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = NO REFERENCES_RELATION = YES +VERBATIM_HEADERS = YES + #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = NO COLS_IN_ALPHA_INDEX = 5 IGNORE_PREFIX = + #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- @@ -102,6 +121,7 @@ DISABLE_INDEX = YES ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 250 + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -116,6 +136,8 @@ LATEX_HEADER = PDF_HYPERLINKS = NO USE_PDFLATEX = NO LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO + #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -125,6 +147,7 @@ COMPACT_RTF = NO RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = + #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- @@ -132,16 +155,21 @@ GENERATE_MAN = NO MAN_OUTPUT = man MAN_EXTENSION = .3 MAN_LINKS = NO + #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = NO +XML_OUTPUT = xml XML_SCHEMA = XML_DTD = +XML_PROGRAMLISTING = YES + #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- GENERATE_AUTOGEN_DEF = NO + #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- @@ -149,6 +177,7 @@ GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES PERLMOD_MAKEVAR_PREFIX = + #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- @@ -161,14 +190,16 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = NO + #--------------------------------------------------------------------------- -# Configuration::addtions related to external references +# Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl + #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- @@ -177,24 +208,22 @@ HIDE_UNDOC_RELATIONS = NO HAVE_DOT = YES CLASS_GRAPH = YES COLLABORATION_GRAPH = NO +UML_LOOK = NO TEMPLATE_RELATIONS = YES INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = NO +CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DOT_IMAGE_FORMAT = jpg DOT_PATH = DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1200 +MAX_DOT_GRAPH_DEPTH = 0 GENERATE_LEGEND = NO DOT_CLEANUP = YES + #--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine +# Configuration::additions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = NO -CGI_NAME = search.cgi -CGI_URL = -DOC_URL = -DOC_ABSPATH = -BIN_ABSPATH = /usr/local/bin/ -EXT_DOC_PATHS = diff --git a/doc/salome/tui/VISU/sources/static/tree.js b/doc/salome/tui/VISU/sources/static/tree.js index 55430919..0a056a0d 100755 --- a/doc/salome/tui/VISU/sources/static/tree.js +++ b/doc/salome/tui/VISU/sources/static/tree.js @@ -1,4 +1,4 @@ -foldersTree = gFld("SALOME v.3.1.0 ", "", "") +foldersTree = gFld("SALOME v.3.2.0a1 ", "", "") insDoc(foldersTree, gLnk("Main Page", "", "main.html")) aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) diff --git a/resources/VISUCatalog.xml b/resources/VISUCatalog.xml index 32e2edb5..2d457cb7 100644 --- a/resources/VISUCatalog.xml +++ b/resources/VISUCatalog.xml @@ -16,7 +16,7 @@ Post-Pro VISU NRI - 3.1.0 + 3.2.0a1 Post-Pro component 1 ModuleVisu.png diff --git a/src/CONVERTOR/Makefile.in b/src/CONVERTOR/Makefile.in index 59057158..9f3ea401 100644 --- a/src/CONVERTOR/Makefile.in +++ b/src/CONVERTOR/Makefile.in @@ -64,7 +64,7 @@ CPPFLAGS+= -ftemplate-depth-32 $(VTK_INCLUDES) $(HDF5_INCLUDES) $(QT_INCLUDES) \ $(BOOST_CPPFLAGS) LDFLAGS+= $(VTK_LIBS) $(QT_LIBS) \ - $(BOOST_LIBS) -lboost_thread-mt \ + $(BOOST_LIBS) -lboost_thread${BOOST_LIBTHREAD} \ -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper \ -L${GUI_ROOT_DIR}/lib/salome -lVTKViewer diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx index ba2a8ad5..8d1fe336 100644 --- a/src/CONVERTOR/VISU_Convertor_impl.cxx +++ b/src/CONVERTOR/VISU_Convertor_impl.cxx @@ -326,11 +326,11 @@ namespace VISU if(myIsAll) return myMeshOnEntity->GetElemObjID(theID); - vtkIdType anInputID; + vtkIdType anInputID, aStartID, anInputDataSetID; const TVTKAppendFilter& anAppendFilter = GetFilter(); - vtkIdType aID = anAppendFilter->GetCellInputID(theID,anInputID); - PSubProfileImpl aSubProfileImpl = mySubProfileArr[anInputID]; - return aSubProfileImpl->GetElemObjID(aID); + anAppendFilter->GetCellInputID(theID,anInputID,aStartID,anInputDataSetID); + PSubProfileImpl aSubProfileImpl = mySubProfileArr[anInputDataSetID]; + return aSubProfileImpl->GetElemObjID(anInputID); } vtkIdType @@ -383,12 +383,12 @@ namespace VISU if(myIsAll) return myMeshOnEntity->GetElemName(theObjID); - vtkIdType anInputID; vtkIdType aVTKId = GetElemVTKID(theObjID); + vtkIdType anInputID, aStartID, anInputDataSetID; const TVTKAppendFilter& anAppendFilter = GetFilter(); - vtkIdType aSubID = anAppendFilter->GetCellInputID(aVTKId,anInputID); - PSubProfileImpl aSubProfileImpl = mySubProfileArr[anInputID]; - vtkIdType anEntityObjId = aSubProfileImpl->GetElemObjID(aSubID); + anAppendFilter->GetCellInputID(aVTKId,anInputID,aStartID,anInputDataSetID); + PSubProfileImpl aSubProfileImpl = mySubProfileArr[anInputDataSetID]; + vtkIdType anEntityObjId = aSubProfileImpl->GetElemObjID(anInputID); return myMeshOnEntity->GetElemName(anEntityObjId); } @@ -475,9 +475,10 @@ namespace VISU TGaussPointID TGaussSubMeshImpl - ::GetObjID(vtkIdType theID) const + ::GetObjID(vtkIdType theID, + vtkIdType theStartID) const { - TCellID aCellID = theID / myGauss->myNbPoints; + TCellID aCellID = theStartID + theID / myGauss->myNbPoints; TLocalPntID aLocalPntID = theID % myGauss->myNbPoints; return TGaussPointID(aCellID,aLocalPntID); @@ -514,12 +515,12 @@ namespace VISU TGaussMeshImpl ::GetObjID(vtkIdType theID) const { + vtkIdType anInputID, aStartId, anInputDataSetID; const TVTKAppendFilter& anAppendFilter = GetFilter(); - vtkIdType anInputDataSetID; - vtkIdType anInputID = anAppendFilter->GetCellInputID(theID,anInputDataSetID); + anAppendFilter->GetCellInputID(theID,anInputID,aStartId,anInputDataSetID); const TGaussSubMeshImpl& aSubMeshImpl = myGaussSubMeshArr[anInputDataSetID]; - return aSubMeshImpl.GetObjID(anInputID); + return aSubMeshImpl.GetObjID(anInputID,aStartId); } TVTKOutput* @@ -601,11 +602,11 @@ namespace VISU TMeshOnEntityImpl ::GetElemObjID(vtkIdType theID) const { - vtkIdType anInputID; + vtkIdType anInputID, aStartId, anInputDataSetID; const TVTKAppendFilter& anAppendFilter = GetFilter(); - vtkIdType aID = anAppendFilter->GetCellInputID(theID,anInputID); - const PSubMeshImpl& aSubMesh = mySubMeshArr[anInputID]; - return aSubMesh->GetElemObjID(aID); + anAppendFilter->GetCellInputID(theID,anInputID,aStartId,anInputDataSetID); + const PSubMeshImpl& aSubMesh = mySubMeshArr[anInputDataSetID]; + return aSubMesh->GetElemObjID(anInputID); } std::string @@ -620,11 +621,11 @@ namespace VISU ::GetElemName(vtkIdType theObjID) const { vtkIdType aVTKId = GetElemVTKID(theObjID); - vtkIdType anInputID; + vtkIdType anInputID, aStartId, anInputDataSetID; const TVTKAppendFilter& anAppendFilter = GetFilter(); - vtkIdType aSubID = anAppendFilter->GetCellInputID(aVTKId,anInputID); - const PSubMeshImpl& aSubMesh = mySubMeshArr[anInputID]; - return aSubMesh->GetElemName(aSubID); + anAppendFilter->GetCellInputID(aVTKId,anInputID,aStartId,anInputDataSetID); + const PSubMeshImpl& aSubMesh = mySubMeshArr[anInputDataSetID]; + return aSubMesh->GetElemName(anInputID); } //--------------------------------------------------------------- @@ -704,11 +705,11 @@ namespace VISU TGroupImpl ::GetElemObjID(vtkIdType theID) const { - vtkIdType anInputID; + vtkIdType anInputID, aStartId, anInputDataSetID; const TVTKAppendFilter& anAppendFilter = GetFilter(); - vtkIdType anID = anAppendFilter->GetCellInputID(theID,anInputID); - const PFamilyImpl& aFamily = myFamilyArr[anInputID]; - return aFamily->GetElemObjID(anID); + anAppendFilter->GetCellInputID(theID,anInputID,aStartId,anInputDataSetID); + const PFamilyImpl& aFamily = myFamilyArr[anInputDataSetID]; + return aFamily->GetElemObjID(anInputID); } vtkIdType diff --git a/src/CONVERTOR/VISU_Convertor_impl.hxx b/src/CONVERTOR/VISU_Convertor_impl.hxx index c4efc7d2..20889db7 100644 --- a/src/CONVERTOR/VISU_Convertor_impl.hxx +++ b/src/CONVERTOR/VISU_Convertor_impl.hxx @@ -456,7 +456,8 @@ namespace VISU //! To implement the TGaussPtsIDMapper::GetObjID virtual TGaussPointID - GetObjID(vtkIdType theID) const; + GetObjID(vtkIdType theID, + vtkIdType theStartID) const; PGaussImpl myGauss; //myNbPoints; - TCellID aCellID = theID / aNbPoints; + TCellID aCellID = theID / myGauss->myNbPoints; + TLocalPntID aLocalPntID = theID % myGauss->myNbPoints; + if(myIsElemNum) aCellID = myElemNum[aCellID]; - - TLocalPntID aLocalPntID = theID % aNbPoints; + else + aCellID += theStartID; return TGaussPointID(aCellID,aLocalPntID); } @@ -913,7 +915,10 @@ namespace ::Init(const MED::PElemInfo& theElemInfo) { myIsElemNum = theElemInfo->IsElemNum(); - myElemNum = theElemInfo->myElemNum; + + if(myIsElemNum) + myElemNum = theElemInfo->myElemNum; + if(theElemInfo->IsElemNames()) myElemInfo = theElemInfo; } diff --git a/src/CONVERTOR/VISU_MedConvertor.hxx b/src/CONVERTOR/VISU_MedConvertor.hxx index abcb6ad7..0ce3377a 100644 --- a/src/CONVERTOR/VISU_MedConvertor.hxx +++ b/src/CONVERTOR/VISU_MedConvertor.hxx @@ -99,7 +99,8 @@ namespace VISU virtual TGaussPointID - GetObjID(vtkIdType theID) const; + GetObjID(vtkIdType theID, + vtkIdType theStartID) const; }; typedef SharedPtr PMEDGaussSubMesh; diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index e73a5816..0499046f 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -76,7 +76,7 @@ LDFLAGS+= \ -L${KERNEL_ROOT_DIR}/lib/salome LIBS+= \ - -lboost_signals-mt \ + -lboost_signals${BOOST_LIBTHREAD} \ -lSalomeObject \ -lVisuPipeLine \ -lSVTK diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h index ffeab72e..96302c1e 100644 --- a/src/OBJECT/VISU_Actor.h +++ b/src/OBJECT/VISU_Actor.h @@ -60,7 +60,7 @@ namespace VISU //---------------------------------------------------------------------------- class VTKOCC_EXPORT VISU_Actor : public SALOME_Actor, - public boost::bsignals::trackable + public boost::BOOST_SIGNALS_NAMESPACE::trackable { public: vtkTypeMacro(VISU_Actor,SALOME_Actor); diff --git a/src/OBJECT/VISU_ActorFactory.h b/src/OBJECT/VISU_ActorFactory.h index 97cee603..9a9bc12f 100644 --- a/src/OBJECT/VISU_ActorFactory.h +++ b/src/OBJECT/VISU_ActorFactory.h @@ -46,7 +46,7 @@ namespace VISU This interface inherits from boost::bsignals::trackable in order to provide automatic diconnection from defined signals if the object is destroyed. */ - struct TActorFactory: public virtual boost::bsignals::trackable + struct TActorFactory: public virtual boost::BOOST_SIGNALS_NAMESPACE::trackable { //! Just to make this class virtual virtual diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx index e7758b85..acaef85a 100644 --- a/src/OBJECT/VISU_GaussPtsAct.cxx +++ b/src/OBJECT/VISU_GaussPtsAct.cxx @@ -839,13 +839,16 @@ VISU_GaussPtsAct return; myOutlineActor->SetVisibility(false); - myTextActor->SetVisibility(0); - myCursorPyramidSelected->SetVisibility(0); - myCursorPyramid->SetVisibility(0); - myCellActor->SetVisibility(0); + myTextActor->SetVisibility(false); + myCursorPyramidSelected->SetVisibility(false); + myCursorPyramid->SetVisibility(false); + myCellActor->SetVisibility(false); GetScalarBarCtrl()->SetIsMarked(false); GetScalarBarCtrl()->Update(); + if(!theIsHighlight) + return; + bool anIsVisible = GetVisibility(); Selection_Mode aSelectionMode = mySelector->SelectionMode(); @@ -1031,9 +1034,6 @@ VISU_GaussPtsAct if(!myInsideCursorSettings || myInsideCursorSettings->GetInitial()) return; - if(!IsSegmentationEnabled()) - return; - VISU_GaussPointsPL* aPipeline = theActor->GetPipeLine(); SALOME_ExtractGeometry* anExtractGeometry = aPipeline->GetExtractGeometryFilter(); @@ -1310,9 +1310,6 @@ VISU_GaussPtsAct1 if(!myOutsideCursorSettings || myOutsideCursorSettings->GetInitial()) return; - if(!IsSegmentationEnabled()) - return; - VISU_GaussPointsPL* aPipeline = myOutsideDeviceActor->GetPipeLine(); SALOME_ExtractGeometry* anExtractGeometry = aPipeline->GetExtractGeometryFilter(); diff --git a/src/PIPELINE/VISU_CutLinesPL.cxx b/src/PIPELINE/VISU_CutLinesPL.cxx index b518dfad..e2cfe567 100644 --- a/src/PIPELINE/VISU_CutLinesPL.cxx +++ b/src/PIPELINE/VISU_CutLinesPL.cxx @@ -34,7 +34,10 @@ using namespace std; vtkStandardNewMacro(VISU_CutLinesPL); -VISU_CutLinesPL::VISU_CutLinesPL(){} +VISU_CutLinesPL::VISU_CutLinesPL(){ + myCondition = 1; + myPosition = 0; +} void VISU_CutLinesPL::ShallowCopy(VISU_PipeLine *thePipeLine){ if(VISU_CutLinesPL *aPipeLine = dynamic_cast(thePipeLine)){ diff --git a/src/PIPELINE/VISU_CutPlanesPL.cxx b/src/PIPELINE/VISU_CutPlanesPL.cxx index 63dd3e5a..2a547971 100644 --- a/src/PIPELINE/VISU_CutPlanesPL.cxx +++ b/src/PIPELINE/VISU_CutPlanesPL.cxx @@ -42,6 +42,16 @@ vtkStandardNewMacro(VISU_CutPlanesPL); VISU_CutPlanesPL::VISU_CutPlanesPL(){ myAppendPolyData = vtkAppendPolyData::New(); myIsShrinkable = false; + + myNbParts = 10; + + myBasePlane[0] = YZ; + myBasePlane[0] = XY; + + myDisplacement[0] = myDisplacement[1] = 0.5; + + myAng[0][0] = myAng[0][1] = myAng[0][2] = 0.0; + myAng[1][0] = myAng[1][1] = myAng[1][2] = 0.0; } VISU_CutPlanesPL::~VISU_CutPlanesPL(){ diff --git a/src/VISUGUI/VISUM_msg_en.po b/src/VISUGUI/VISUM_msg_en.po index e9676f43..def90f7c 100644 --- a/src/VISUGUI/VISUM_msg_en.po +++ b/src/VISUGUI/VISUM_msg_en.po @@ -412,7 +412,10 @@ msgid "VisuGUI_TransparencyDlg::BUT_CLOSE" msgstr "Close" msgid "VVTK_ViewManager::VTK_VIEW_TITLE" -msgstr "VISU scene:%1 - viewer:%2" +msgstr "Gauss scene:%1 - viewer:%2" + +msgid "VVTK_MainWindow::LBL_TOOLBAR_RECORD_LABEL" +msgstr "Recording Operations" msgid "VVTK_MainWindow::MNU_VVTK_RECORDING_START" msgstr "Start recording" @@ -438,6 +441,9 @@ msgstr "Stop recording" msgid "VVTK_MainWindow::DSC_VVTK_RECORDING_STOP" msgstr "Stop recording" +msgid "VVTK_MainWindow1::LBL_TOOLBAR_GAUSS_LABEL" +msgstr "Gauss Viewer Tools" + msgid "VVTK_MainWindow1::MNU_VVTK_INTERACTOR_STYLE_SWITCH" msgstr "Interaction Style Switch" diff --git a/src/VISUGUI/VISU_msg_en.po b/src/VISUGUI/VISU_msg_en.po index eb50916f..af102ea6 100644 --- a/src/VISUGUI/VISU_msg_en.po +++ b/src/VISUGUI/VISU_msg_en.po @@ -163,14 +163,20 @@ msgstr "Use Shading" #: VisuGUI.cxx +msgid "VisuGUI::MEN_IMPORT" +msgstr "Import" + msgid "VisuGUI::MEN_IMPORT_FROM_FILE" +msgstr "MED file" + +msgid "VisuGUI::IMPORT_FROM_FILE" msgstr "Import from File" -msgid "VisuGUI::MEN_EXPLORE_MED_FILE" -msgstr "Explore MED File" +msgid "VisuGUI::USE_BUILD_PROGRESS" +msgstr "Use build progress" msgid "VisuGUI::MEN_IMPORT_TABLE" -msgstr "Import table from File" +msgstr "Table from file" msgid "VisuGUI::MEN_SCALAR_MAP" msgstr "Scalar Map" diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 3128e69f..7bc17315 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -73,6 +73,7 @@ #include "SalomeApp_Application.h" #include "SalomeApp_DataModel.h" #include "SalomeApp_Study.h" +#include "SalomeApp_CheckFileDlg.h" #include "LightApp_SelectionMgr.h" #include "LightApp_Selection.h" #include "LightApp_Preferences.h" @@ -95,7 +96,6 @@ #include "VisuGUI_PopupTools.h" #include "VisuGUI_NameDlg.h" -#include "VisuGUI_FileDlg.h" #include "VisuGUI_CursorDlg.h" #include "VisuGUI_Selection.h" #include "VisuGUI_TimeAnimation.h" @@ -172,55 +172,66 @@ OnImportFromFile() if(MYDEBUG) MESSAGE("VisuGUI::OnImportFromFile()"); if ( CheckLock(GetCStudy(GetAppStudy(this)),GetDesktop(this)) ) return; + + SUIT_ResourceMgr* aResourceMgr = GetResourceMgr(); - VisuGUI_BuildProgressDlg* aBuildProgressDlg = new VisuGUI_BuildProgressDlg( GetDesktop(this) ); - aBuildProgressDlg->setGenerator( GetVisuGen(this) ); - aBuildProgressDlg->show(); -} - - -void -VisuGUI:: -OnExploreMEDFile() -{ - if(MYDEBUG) MESSAGE("VisuGUI::OnExploreMEDFile()"); - _PTR(Study) aStudy = GetCStudy(GetAppStudy(this)); - if ( CheckLock(aStudy,GetDesktop(this)) ) + // Get file name + QStringList aFilter; + aFilter.append( tr( "FLT_MED_FILES" ) ); + aFilter.append( tr( "FLT_ALL_FILES" ) ); + + bool toUseBuildProgress = aResourceMgr->booleanValue("VISU", "use_build_progress", false); + + SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg( GetDesktop(this), true, tr("USE_BUILD_PROGRESS") ); + fd->setCaption( tr( "IMPORT_FROM_FILE" ) ); + fd->setFilters( aFilter ); + fd->SetChecked( toUseBuildProgress ); + fd->exec(); + QFileInfo aFileInfo( fd->selectedFile() ); + toUseBuildProgress = fd->IsChecked(); + delete fd; + + // Check the file name + if ( !aFileInfo.exists() ) return; + + if ( !toUseBuildProgress ) + { + bool toBuildFields = aResourceMgr->booleanValue( "VISU", "build_fields", true ); + bool toBuildMinMax = aResourceMgr->booleanValue( "VISU", "build_min_max", true ); + bool toBuildGroups = aResourceMgr->booleanValue( "VISU", "build_groups", true ); + bool toBuildAll = aResourceMgr->booleanValue( "VISU", "full_med_loading", false ); + bool toBuildAtOnce = aResourceMgr->booleanValue( "VISU", "build_at_once", false ); + + QString anInfo("Importing From File " + aFileInfo.filePath() + "..." ); + application()->putInfo( anInfo ); - SALOME_MED::MED_Gen_var aGen = GetMEDEngine(); - - QStringList aFilter; - aFilter.append( tr("FLT_MED_FILES") ); - aFilter.append( tr("FLT_ALL_FILES") ); + QApplication::setOverrideCursor(Qt::waitCursor); + VISU::Result_var aResult = GetVisuGen(this)->CreateResult( aFileInfo.filePath() ); + aResult->SetBuildFields( toBuildFields, toBuildMinMax ); + aResult->SetBuildGroups( toBuildGroups ); + aResult->Build( toBuildAll, toBuildAtOnce ); + QApplication::restoreOverrideCursor(); - QFileInfo aFileInfo = - SUIT_FileDlg::getFileName(GetDesktop(this), - "", - aFilter, - tr("MEN_EXPLORE_MED_FILE"), - true); - if(aFileInfo.exists()){ - application()->putInfo( tr("MEN_EXPLORE_MED_FILE") + " " + aFileInfo.filePath() + "..." ); - std::string aStudyName = aStudy->Name(); - try - { - aGen->readStructFileWithFieldType(aFileInfo.filePath(),aStudyName.c_str()); + if (CORBA::is_nil(aResult.in())) { + SUIT_MessageBox::warn1(GetDesktop(this), + tr("WRN_VISU"), + tr("ERR_ERROR_IN_THE_FILE"), + tr("BUT_OK")); + }else{ + application()->putInfo( anInfo + tr("INF_DONE")); + UpdateObjBrowser(this); + } } - catch(...) + else { - SUIT_MessageBox::warn1(GetDesktop(this), - tr("WRN_VISU"), - tr("ERR_ERROR_IN_THE_FILE"), - tr("BUT_OK")); + VisuGUI_BuildProgressDlg* aBuildProgressDlg = new VisuGUI_BuildProgressDlg( GetDesktop(this) ); + aBuildProgressDlg->setFileName( aFileInfo.filePath() ); + aBuildProgressDlg->setGenerator( GetVisuGen(this) ); + aBuildProgressDlg->show(); } - application()->putInfo(aFileInfo.filePath()+tr("INF_DONE")); - getApp()->updateObjectBrowser(true); // as need to update MED tree - getApp()->updateActions(); - } } - void VisuGUI:: OnImportTableFromFile() @@ -472,9 +483,10 @@ OnCreateMesh() return; // create a VTK view window if it does not exist - GetViewWindow( this, /*create=*/true ); + SVTK_ViewWindow* aViewWindow = GetViewWindow(this); - CreateMesh(this, anIO); + // create mesh presentation and display it in aViewWindow + CreateMesh(this, anIO, aViewWindow); } void @@ -486,7 +498,7 @@ OnCreateManyMesh() return; // create a VTK view window if it does not exist - GetViewWindow( this, /*create=*/true ); + SVTK_ViewWindow* aViewWindow = GetViewWindow(this); // Get selected SObject LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); @@ -498,7 +510,8 @@ OnCreateManyMesh() if (anIO.IsNull() || !anIO->hasEntry()) return; - CreateMesh(this, anIO); + // create mesh presentation and display it in aViewWindow + CreateMesh(this, anIO, aViewWindow); } } @@ -581,62 +594,65 @@ OnDisplayPrs() { if(MYDEBUG) MESSAGE("VisuGUI::OnDisplayPrs"); + LightApp_SelectionMgr* mgr = GetSelectionMgr(this); + if (!mgr) return; + QApplication::setOverrideCursor(Qt::waitCursor); + + SVTK_ViewWindow* vw = GetActiveViewWindow(this); + SALOME_ListIO aSel, aList; - LightApp_SelectionMgr* mgr = GetSelectionMgr(this); - mgr->selectedObjects( aSel ); + mgr->selectedObjects(aSel); + extractContainers(aSel, aList); - extractContainers( aSel, aList ); + for (SALOME_ListIteratorOfListIO it (aList); it.More(); it.Next()) { + Handle(SALOME_InteractiveObject) anIO = it.Value(); + CORBA::Object_var anObject = GetSelectedObj(GetAppStudy(this), anIO->getEntry()); - Handle(SALOME_InteractiveObject) anIO; - for ( SALOME_ListIteratorOfListIO it( aList ); it.More(); it.Next() ) { - anIO = it.Value(); - CORBA::Object_var anObject = GetSelectedObj( GetAppStudy(this), anIO->getEntry() ); - if ( !CORBA::is_nil( anObject ) ) { + if (!CORBA::is_nil(anObject)) { // is it Prs3d object ? VISU::Prs3d_i* aPrsObject = dynamic_cast(VISU::GetServant(anObject).in()); - if(aPrsObject){ + if (aPrsObject) { if(MYDEBUG) MESSAGE("VisuGUI::OnDisplayPrs : Prs3d object"); //UpdateViewer( this, aPrsObject ); - SVTK_ViewWindow* vw = GetViewWindow( this, /*create=*/true ); - if ( vw ) - { - displayer()->Display( anIO->getEntry() ); + if (vw) { + displayer()->Display(anIO->getEntry()); vw->highlight(anIO, 1); } continue; } // is it Curve ? VISU::Curve_i* aCurve = dynamic_cast(VISU::GetServant(anObject).in()); - if(aCurve){ + if (aCurve) { if(MYDEBUG) MESSAGE("VisuGUI::OnDisplayPrs : Curve object"); //PlotCurve( this, aCurve, VISU::eDisplay ); - displayer()->Display( anIO->getEntry() ); + displayer()->Display(anIO->getEntry()); continue; } // is it Container ? VISU::Container_i* aContainer = dynamic_cast(VISU::GetServant(anObject).in()); - if(aContainer){ + if (aContainer) { if(MYDEBUG) MESSAGE("VisuGUI::DisplayPrs : Container object"); //PlotContainer( this, aContainer, VISU::eDisplay ); - displayer()->Display( anIO->getEntry() ); + displayer()->Display(anIO->getEntry()); continue; } // is it Table ? VISU::Table_i* aTable = dynamic_cast(VISU::GetServant(anObject).in()); - if(aTable){ + if (aTable) { if(MYDEBUG) MESSAGE("VisuGUI::DisplayPrs : Table object"); //PlotTable( this, aTable, VISU::eDisplay ); - displayer()->Display( anIO->getEntry() ); + displayer()->Display(anIO->getEntry()); continue; } } } - SVTK_ViewWindow* vw = GetViewWindow( this ); - if ( vw ) { + + if (vw) { vw->getRenderer()->ResetCameraClippingRange(); vw->Repaint(); } + QApplication::restoreOverrideCursor(); } @@ -656,27 +672,24 @@ OnErasePrs() QApplication::setOverrideCursor(Qt::waitCursor); - SVTK_ViewWindow* vw = GetViewWindow( this ); - if (vw) - vw->unHighlightAll(); + //SVTK_ViewWindow* vw = GetActiveViewWindow(this); + //if (vw) + // vw->unHighlightAll(); SALOME_ListIO aList, aSel; LightApp_SelectionMgr* mgr = GetSelectionMgr(this); - mgr->selectedObjects( aSel ); - - extractContainers( aSel, aList ); + mgr->selectedObjects(aSel); + extractContainers(aSel, aList); - Handle(SALOME_InteractiveObject) anIO; - for ( SALOME_ListIteratorOfListIO it( aList ); it.More(); it.Next() ) { - anIO = it.Value(); - CORBA::Object_var anObject = GetSelectedObj( GetAppStudy(this), anIO->getEntry() ); - if (!CORBA::is_nil(anObject)) - RemoveScalarBarPosition(this,anObject); - ErasePrs( this, anObject, false ); + for (SALOME_ListIteratorOfListIO it (aList); it.More(); it.Next()) { + Handle(SALOME_InteractiveObject) anIO = it.Value(); + CORBA::Object_var anObject = GetSelectedObj(GetAppStudy(this), anIO->getEntry()); + //ErasePrs(this, anObject, /*repaint_view_window = */false); + ErasePrs(this, anObject, /*repaint_view_window = */true); } - if (vw) - vw->Repaint(); + //if (vw) + // vw->Repaint(); QApplication::restoreOverrideCursor(); } @@ -686,7 +699,7 @@ VisuGUI:: OnEraseAll() { startOperation( myEraseAll ); - if (SVTK_ViewWindow* vw = GetViewWindow(this)) { + if (SVTK_ViewWindow* vw = GetActiveViewWindow(this)) { vw->unHighlightAll(); if (vtkRenderer *aRen = vw->getRenderer()) { vtkActor *anActor; @@ -694,7 +707,7 @@ OnEraseAll() for (anActColl->InitTraversal(); (anActor = anActColl->GetNextActor()) != NULL; ) { if (anActor->GetVisibility() > 0) if (VISU_Actor* anVISUActor = VISU_Actor::SafeDownCast(anActor)) { - RemoveScalarBarPosition(this,anVISUActor->GetPrs3d()); + RemoveScalarBarPosition(this, vw, anVISUActor->GetPrs3d()); anVISUActor->VisibilityOff(); } } @@ -711,26 +724,17 @@ VisuGUI:: OnEditScalarMap() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow(this)){ - aViewWindow->highlight(anIO, 1); - } - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) + EditPrs3d(this, anIO, aPrs3d); } - void VisuGUI:: OnEditDeformedShape() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow(this)){ - aViewWindow->highlight(anIO, 1); - } - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) + EditPrs3d(this, anIO, aPrs3d); } void @@ -738,12 +742,8 @@ VisuGUI:: OnEditScalarMapOnDeformedShape() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow()){ - aViewWindow->highlight(anIO, 1); - } - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) + EditPrs3d(this, anIO, aPrs3d); } void @@ -751,82 +751,53 @@ VisuGUI:: OnEditCutPlanes() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow(this)){ - aViewWindow->highlight(anIO, 1); - } - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) + EditPrs3d(this, anIO, aPrs3d); } - void VisuGUI:: OnEditCutLines() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow(this)){ - aViewWindow->highlight(anIO, 1); - } - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) + EditPrs3d(this, anIO, aPrs3d); } - void VisuGUI:: OnEditIsoSurfaces() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow(this)){ - aViewWindow->highlight(anIO, 1); - } - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) + EditPrs3d(this, anIO, aPrs3d); } - void VisuGUI:: OnEditVectors() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow(this)){ - aViewWindow->highlight(anIO, 1); - } - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) + EditPrs3d(this, anIO, aPrs3d); } - void VisuGUI:: OnEditStreamLines() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow(this)){ - aViewWindow->highlight(anIO, 1); - } - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) + EditPrs3d(this, anIO, aPrs3d); } - void VisuGUI:: OnEditPlot3D() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow(this)){ - aViewWindow->highlight(anIO, 1); - } - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) + EditPrs3d(this, anIO, aPrs3d); } @@ -899,7 +870,7 @@ OnChangeColor() VISU::Prs3d_i* aPrs3d = dynamic_cast(aServant.in()); if (!aPrs3d) return; - SVTK_ViewWindow* vw = GetViewWindow(this); + SVTK_ViewWindow* vw = GetActiveViewWindow(this); if (!vw) return; VISU_Actor* anActor = GetActor(aPrs3d, vw); @@ -971,7 +942,7 @@ OnChangeWireframeColor() VISU::Prs3d_i* aPrs3d = dynamic_cast(aServant.in()); if (!aPrs3d) return; - SVTK_ViewWindow* vw = GetViewWindow(this); + SVTK_ViewWindow* vw = GetActiveViewWindow(this); if (!vw) return; VISU_Actor* anActor = GetActor(aPrs3d, vw); @@ -1006,7 +977,7 @@ OnChangeOpacity() VISU::Prs3d_i* aPrsObject = dynamic_cast(aServant.in()); if (!aPrsObject) return; - SVTK_ViewWindow* vw = GetViewWindow(this); + SVTK_ViewWindow* vw = GetActiveViewWindow(this); if (!vw) return; VISU_Actor* anActor = GetActor(aPrsObject, vw); @@ -1029,7 +1000,7 @@ OnChangeLines() VISU::Prs3d_i* aPrsObject = dynamic_cast(aServant.in()); if (!aPrsObject) return; - SVTK_ViewWindow* vw = GetViewWindow(this); + SVTK_ViewWindow* vw = GetActiveViewWindow(this); if (!vw) return; VISU_Actor* anActor = GetActor(aPrsObject, vw); @@ -1553,7 +1524,7 @@ OnSweep() VISU::ScalarMap_i* aPrsObject = dynamic_cast(aServant.in()); if (!aPrsObject) return; - SVTK_ViewWindow* vw = GetViewWindow(this); + SVTK_ViewWindow* vw = GetActiveViewWindow(this); if (!vw) return; VISU_Actor* aActor = GetActor(aPrsObject, vw); @@ -1596,7 +1567,7 @@ void VisuGUI:: OnTimeAnimation() { - if(!VISU::GetViewWindow(this)) + if (!VISU::GetActiveViewWindow(this)) return; _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this)); @@ -1635,7 +1606,7 @@ void VisuGUI:: OnShowAnimation() { - if(!VISU::GetViewWindow(this)) + if (!VISU::GetActiveViewWindow(this)) return; LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); @@ -1693,7 +1664,6 @@ OnCopyPresentation() VISU::Mesh_i* aMeshPrs = dynamic_cast(aPrsObject); VISU::Mesh_i* aSameMesh = new VISU::Mesh_i(aMeshPrs->GetResult()); aSameMesh->SameAs(aMeshPrs); - UpdateViewer(this, aSameMesh); } break; case VISU::TSCALARMAP: @@ -1701,7 +1671,6 @@ OnCopyPresentation() VISU::ScalarMap_i* aScalarPrs = dynamic_cast(aPrsObject); VISU::ScalarMap_i* aSameScalar = new VISU::ScalarMap_i(aScalarPrs->GetResult(),true); aSameScalar->SameAs(aScalarPrs); - UpdateViewer(this, aSameScalar); } break; case VISU::TDEFORMEDSHAPE: @@ -1709,15 +1678,15 @@ OnCopyPresentation() VISU::DeformedShape_i* aDefPrs = dynamic_cast(aPrsObject); VISU::DeformedShape_i* aSameDeformed = new VISU::DeformedShape_i(aDefPrs->GetResult(),true); aSameDeformed->SameAs(aDefPrs); - UpdateViewer(this, aSameDeformed); } break; case VISU::TSCALARMAPONDEFORMEDSHAPE: { - VISU::ScalarMapOnDeformedShape_i* aDefPrs = dynamic_cast(aPrsObject); - VISU::ScalarMapOnDeformedShape_i* aSameScalarMapOnDeformed = new VISU::ScalarMapOnDeformedShape_i(aDefPrs->GetResult(),true); + VISU::ScalarMapOnDeformedShape_i* aDefPrs = + dynamic_cast(aPrsObject); + VISU::ScalarMapOnDeformedShape_i* aSameScalarMapOnDeformed = + new VISU::ScalarMapOnDeformedShape_i(aDefPrs->GetResult(),true); aSameScalarMapOnDeformed->SameAs(aDefPrs); - UpdateViewer(this, aSameScalarMapOnDeformed); } break; case VISU::TCUTPLANES: @@ -1725,7 +1694,6 @@ OnCopyPresentation() VISU::CutPlanes_i* aCutPrs = dynamic_cast(aPrsObject); VISU::CutPlanes_i* aSameCut = new VISU::CutPlanes_i(aCutPrs->GetResult(),true); aSameCut->SameAs(aCutPrs); - UpdateViewer(this, aSameCut); } break; case VISU::TCUTLINES: @@ -1733,7 +1701,6 @@ OnCopyPresentation() VISU::CutLines_i* aCutPrs = dynamic_cast(aPrsObject); VISU::CutLines_i* aSameCut = new VISU::CutLines_i(aCutPrs->GetResult(),true); aSameCut->SameAs(aCutPrs); - UpdateViewer(this, aSameCut); } break; case VISU::TISOSURFACE: @@ -1741,7 +1708,6 @@ OnCopyPresentation() VISU::IsoSurfaces_i* aIsoPrs = dynamic_cast(aPrsObject); VISU::IsoSurfaces_i* aSameIso = new VISU::IsoSurfaces_i(aIsoPrs->GetResult(),true); aSameIso->SameAs(aIsoPrs); - UpdateViewer(this, aSameIso); } break; case VISU::TSTREAMLINES: @@ -1749,7 +1715,6 @@ OnCopyPresentation() VISU::StreamLines_i* aLinesPrs = dynamic_cast(aPrsObject); VISU::StreamLines_i* aSameLines = new VISU::StreamLines_i(aLinesPrs->GetResult(),true); aSameLines->SameAs(aLinesPrs); - UpdateViewer(this, aSameLines); } break; case VISU::TVECTORS: @@ -1757,7 +1722,6 @@ OnCopyPresentation() VISU::Vectors_i* aVectorsPrs = dynamic_cast(aPrsObject); VISU::Vectors_i* aSameVectors = new VISU::Vectors_i(aVectorsPrs->GetResult(),true); aSameVectors->SameAs(aVectorsPrs); - UpdateViewer(this, aSameVectors); } break; case VISU::TPLOT3D: @@ -1765,7 +1729,6 @@ OnCopyPresentation() VISU::Plot3D_i* aPlot3DPrs = dynamic_cast(aPrsObject); VISU::Plot3D_i* aSamePlot3D = new VISU::Plot3D_i(aPlot3DPrs->GetResult()); aSamePlot3D->SameAs(aPlot3DPrs); - UpdateViewer(this, aSamePlot3D); } break; } @@ -1776,7 +1739,7 @@ void VisuGUI:: OnSelectionInfo() { - if (GetViewWindow(this)) + if (GetActiveViewWindow(this)) (new VisuGUI_SelectionDlg(this))->show(); else SUIT_MessageBox::warn1(GetDesktop(this), @@ -1839,11 +1802,9 @@ OnMergeScalarBars() } } if (update) { - if (SVTK_ViewWindow* vw = GetViewWindow(this)) { -//if (vw->getRenderer()->GetActors()->GetNumberOfItems() > 0) { - vw->getRenderer()->ResetCameraClippingRange(); - vw->Repaint(); -//} + if (SVTK_ViewWindow* vw = GetActiveViewWindow(this)) { + vw->getRenderer()->ResetCameraClippingRange(); + vw->Repaint(); } } } @@ -1878,11 +1839,9 @@ OnFreeScalarBars() } } if (update) { - if (SVTK_ViewWindow* vw = GetViewWindow(this)) { -//if (vw->getRenderer()->GetActors()->GetNumberOfItems() > 0) { - vw->getRenderer()->ResetCameraClippingRange(); - vw->Repaint(); -//} + if (SVTK_ViewWindow* vw = GetActiveViewWindow(this)) { + vw->getRenderer()->ResetCameraClippingRange(); + vw->Repaint(); } } } @@ -1926,7 +1885,7 @@ void VisuGUI:: OnArrangeActors() { - SVTK_ViewWindow* vw = GetViewWindow(this); + SVTK_ViewWindow* vw = GetActiveViewWindow(this); if (vw) { ArrangeDlg* aDlg = new ArrangeDlg (GetDesktop(this), vw); aDlg->exec(); @@ -1960,10 +1919,6 @@ createActions() tr("MEN_IMPORT_FROM_FILE"), "", (CTRL + Key_I), aParent, false, this, SLOT(OnImportFromFile())); - createAction( VISU_EXPLORE_MED, "", QIconSet(), - tr("MEN_EXPLORE_MED_FILE"), "", (CTRL + Key_M), aParent, false, - this, SLOT(OnExploreMEDFile())); - createAction( VISU_IMPORT_TABLE, "", QIconSet(), tr("MEN_IMPORT_TABLE"), "", 0, aParent, false, this, SLOT(OnImportTableFromFile())); @@ -2243,13 +2198,11 @@ createActions() aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_GLOBAL_SELECTION")); createAction( VISU_GLOBAL_SELECTION, tr("MEN_GLOBAL_SELECTION"), QIconSet(aPixmap), tr("MEN_GLOBAL_SELECTION"), "", 0, aParent, false, - //this, SLOT(OnEraseAll())); this); aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_PARTIAL_SELECTION")); createAction( VISU_PARTIAL_SELECTION, tr("MEN_PARTIAL_SELECTION"), QIconSet(aPixmap), tr("MEN_PARTIAL_SELECTION"), "", 0, aParent, false, - //this, SLOT(OnEraseAll())); this); createAction( VISU_SHOW_ANIMATION, tr("MEN_SHOW_ANIMATION"), QIconSet(), @@ -2265,9 +2218,10 @@ createMenus() int aMenuId; aMenuId = createMenu( tr( "MEN_DESK_FILE" ), -1 ); createMenu( separator(), aMenuId, -1, 10 ); - createMenu( VISU_IMPORT_FROM_FILE, aMenuId, 10 ); // import from file - createMenu( VISU_EXPLORE_MED, aMenuId, 10 ); // explore MED file - createMenu( VISU_IMPORT_TABLE, aMenuId, 10 ); // import table + + int anImportId = createMenu( tr( "MEN_IMPORT" ), aMenuId, -1, 10 ); + createMenu( VISU_IMPORT_FROM_FILE, anImportId ); // import from file + createMenu( VISU_IMPORT_TABLE, anImportId ); // import table aMenuId = createMenu( tr( "MEN_VISUALIZATION" ), -1, -1, 30 ); createMenu( VISU_SCALAR_MAP, aMenuId, 10 ); // scalar map @@ -2974,6 +2928,7 @@ void VisuGUI::createPreferences() // group: "MED files import" int importGr = addPreference( tr( "MED files import" ), srangeTab ); setPreferenceProperty( importGr, "columns", 1 ); + addPreference( tr( "Use build progress" ), importGr, LightApp_Preferences::Bool, "VISU", "use_build_progress" ); addPreference( tr( "Full MED loading" ), importGr, LightApp_Preferences::Bool, "VISU", "full_med_loading" ); addPreference( tr( "Build at once" ), importGr, LightApp_Preferences::Bool, "VISU", "build_at_once" ); addPreference( tr( "Build fields" ), importGr, LightApp_Preferences::Bool, "VISU", "build_fields" ); diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h index 22224d72..cec1e4c2 100644 --- a/src/VISUGUI/VisuGUI.h +++ b/src/VISUGUI/VisuGUI.h @@ -81,7 +81,6 @@ public slots: protected slots: void OnImportFromFile(); - void OnExploreMEDFile(); void OnImportTableFromFile(); void OnExportTableToFile(); void OnImportMedField(); diff --git a/src/VISUGUI/VisuGUI_ActionsDef.h b/src/VISUGUI/VisuGUI_ActionsDef.h index 1fe7a7b2..681a9d13 100644 --- a/src/VISUGUI/VisuGUI_ActionsDef.h +++ b/src/VISUGUI/VisuGUI_ActionsDef.h @@ -21,15 +21,13 @@ #define VISUGUI_ACTIONSDEF //#define VISU_IMPORT_FROM_FILE 112 -//#define VISU_EXPLORE_MED 113 //#define VISU_IMPORT_MED 114 //#define VISU_IMPORT_TABLE 199 #define VISU_IMPORT_FROM_FILE 4002 -#define VISU_EXPLORE_MED 4003 -#define VISU_IMPORT_TABLE 4004 -#define VISU_IMPORT_MED_STRUCTURE 4005 -#define VISU_IMPORT_MED_TIMESTAMP 4006 -#define VISU_IMPORT_MED_FIELD 4007 +#define VISU_IMPORT_TABLE 4003 +#define VISU_IMPORT_MED_STRUCTURE 4004 +#define VISU_IMPORT_MED_TIMESTAMP 4005 +#define VISU_IMPORT_MED_FIELD 4006 #define VISU_SCALAR_MAP 4011 #define VISU_DEFORMED_SHAPE 4012 diff --git a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx index 7705f32d..5c6f69c5 100644 --- a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx +++ b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx @@ -48,7 +48,10 @@ * Constructor */ VisuGUI_BuildProgressDlg::VisuGUI_BuildProgressDlg( QWidget* theParent ): - QDialog( theParent, "VisuGUI_BuildProgressBar", false ), + QDialog( theParent, + "VisuGUI_BuildProgressBar", + false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), myIsRaiseColor( false ) { setCaption( tr( "DLG_BUILD_PROGRESS_TITLE" ) ); @@ -205,7 +208,7 @@ VisuGUI_BuildProgressDlg::~VisuGUI_BuildProgressDlg() void VisuGUI_BuildProgressDlg::show() { - if( onBrowseFile() ) + if( !myFileName.isNull() || onBrowseFile() ) QWidget::show(); } @@ -390,3 +393,12 @@ void VisuGUI_BuildProgressDlg::onBuildCheckBoxClicked() myBuildGroupsButton->setPaletteBackgroundColor( aColor ); } + +void VisuGUI_BuildProgressDlg::setFileName( const QString& theFileName ) +{ + if ( !theFileName.isNull() ) + { + myFileName = theFileName; + myFileNameLineEdit->setText( myFileName.section( '/', -1 ) ); + } +} diff --git a/src/VISUGUI/VisuGUI_BuildProgressDlg.h b/src/VISUGUI/VisuGUI_BuildProgressDlg.h index 4d880596..d0db5912 100644 --- a/src/VISUGUI/VisuGUI_BuildProgressDlg.h +++ b/src/VISUGUI/VisuGUI_BuildProgressDlg.h @@ -54,6 +54,7 @@ public: virtual void show(); QString fileName() const { return myFileName; } + void setFileName( const QString& theFileName ); protected slots: void done( int ); diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx index 2c9f7f1b..1f35f980 100644 --- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx +++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx @@ -22,6 +22,7 @@ #include "VisuGUI.h" #include "VisuGUI_Tools.h" +#include "VisuGUI_ViewTools.h" #include "VISU_Prs3d_i.hh" #include "VISU_Result_i.hh" @@ -389,7 +390,7 @@ VisuGUI_ClippingDlg::~VisuGUI_ClippingDlg() { // no need to delete child widgets, Qt does it all for us std::for_each(myPlanes.begin(),myPlanes.end(),TSetVisiblity(false)); - VISU::RenderViewWindow(VISU::GetViewWindow(myVisuGUI)); + VISU::RenderViewWindow(VISU::GetActiveViewWindow(myVisuGUI)); } //================================================================================= @@ -481,7 +482,7 @@ void VisuGUI_ClippingDlg::ClickOnApply() if (!myPrs3d) return; - if (SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(myVisuGUI)) { + if (SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(myVisuGUI)) { SUIT_OverrideCursor wc; // Save clipping planes, currently applied to the presentation @@ -565,7 +566,7 @@ void VisuGUI_ClippingDlg::ClickOnCancel() //================================================================================= void VisuGUI_ClippingDlg::onSelectionChanged() { - if (SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(myVisuGUI)) { + if (SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(myVisuGUI)) { Handle(SALOME_InteractiveObject) anIO; CORBA::Object_var anObject = VISU::GetSelectedObj(myVisuGUI, &anIO); myIO = anIO; @@ -653,7 +654,7 @@ void VisuGUI_ClippingDlg::ClickOnNew() if (!myPrs3d) return; - if (SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(myVisuGUI)) { + if (SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(myVisuGUI)) { OrientedPlane* aPlane = OrientedPlane::New(aViewWindow); VISU::TVTKPlane aTVTKPlane(aPlane); myPlanes.push_back(aTVTKPlane); @@ -689,7 +690,7 @@ void VisuGUI_ClippingDlg::ClickOnDelete() ClickOnApply(); Sinchronize(); - if (SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(myVisuGUI)) + if (SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(myVisuGUI)) VISU::RenderViewWindow(aViewWindow); } @@ -886,7 +887,7 @@ void VisuGUI_ClippingDlg::SetCurrentPlaneParam() if (AutoApplyCheckBox->isChecked()) ClickOnApply(); - if (SVTK_ViewWindow* vw = VISU::GetViewWindow(myVisuGUI)) + if (SVTK_ViewWindow* vw = VISU::GetActiveViewWindow(myVisuGUI)) VISU::RenderViewWindow(vw); } @@ -1094,6 +1095,6 @@ void VisuGUI_ClippingDlg::onIJKAxisChanged(int axisId) void VisuGUI_ClippingDlg::OnPreviewToggle (bool theIsToggled) { std::for_each(myPlanes.begin(),myPlanes.end(),TSetVisiblity(theIsToggled)); - if (SVTK_ViewWindow* vw = VISU::GetViewWindow(myVisuGUI)) + if (SVTK_ViewWindow* vw = VISU::GetActiveViewWindow(myVisuGUI)) VISU::RenderViewWindow(vw); } diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx index a9983bf3..545e8c81 100644 --- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx @@ -12,6 +12,7 @@ #include "VisuGUI.h" #include "VisuGUI_Tools.h" +#include "VisuGUI_ViewTools.h" #include "VISU_Gen_i.hh" #include "VISU_CutLines_i.hh" @@ -105,7 +106,7 @@ VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule) QHBox* aPosBox = new QHBox (aPlanePane); aPosBox->setSpacing(5); - QLabel* aPosLbl = new QLabel (tr("LBL_POS"), aPosBox); + new QLabel (tr("LBL_POS"), aPosBox); myPosSpn = new QtxDblSpinBox (0, 1, 0.1, aPosBox); myPosSpn->setValue(0.5); aPlaneLayout->addWidget(aPosBox); @@ -166,7 +167,7 @@ VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule) QHBox* aNbBox = new QHBox(aLinesPane); aNbBox->setSpacing(5); - QLabel* aNbLbl = new QLabel( tr( "LBL_NB_PLANS" ), aNbBox ); + new QLabel( tr( "LBL_NB_PLANS" ), aNbBox ); myNbSpn = new QtxDblSpinBox( 1, 100, 1, aNbBox ); myNbSpn->setValue( 10 ); @@ -186,7 +187,7 @@ VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule) QHBox* aPosBox2 = new QHBox(aLinesPane); aPosBox2->setSpacing(5); - QLabel* aPosLbl2 = new QLabel( tr( "LBL_POS" ), aPosBox2 ); + new QLabel( tr( "LBL_POS" ), aPosBox2 ); myPosSpn2 = new QtxDblSpinBox( 0, 1, 0.1, aPosBox2 ); myPosSpn2->setValue( 0.5 ); aLinesLayout->addWidget( aPosBox2 ); @@ -258,7 +259,7 @@ VisuGUI_CutLinesDlg::~VisuGUI_CutLinesDlg() deletePlanes(); if (myCutLines) //delete myCutLines; myCutLines->Destroy(); - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) vf->Repaint(); } @@ -327,7 +328,7 @@ int VisuGUI_CutLinesDlg::storeToPrsObject (VISU::CutLines_i* thePrs) //------------------------------------------------------------------------------ void VisuGUI_CutLinesDlg::createPlanes() { - SVTK_ViewWindow* aView = VISU::GetViewWindow(); + SVTK_ViewWindow* aView = VISU::GetActiveViewWindow(); if (aView == NULL) return; if (myCutLines == NULL) return; if (myPreviewActor != 0) return; @@ -357,7 +358,7 @@ void VisuGUI_CutLinesDlg::createPlanes() void VisuGUI_CutLinesDlg::deletePlanes() { if (myPreviewActor == 0) return; - if (SVTK_ViewWindow* aView = VISU::GetViewWindow()){ + if (SVTK_ViewWindow* aView = VISU::GetActiveViewWindow()){ aView->RemoveActor(myPreviewActor); aView->RemoveActor(myPreviewActorGlyphs); } @@ -414,7 +415,7 @@ void VisuGUI_CutLinesDlg::onCutSelect (int theId, bool theUpdate) myRotXLbl2->setText( tr("LBL_ROT_Z")); myRotYLbl2->setText( tr("LBL_ROT_X")); } - SVTK_ViewWindow* aView = VISU::GetViewWindow(); + SVTK_ViewWindow* aView = VISU::GetActiveViewWindow(); if (aView) { if (theUpdate && myPreviewCheck->isChecked() && (myCutLines != NULL)) { /*myCutLines->SetOrientation2(getOrientaion(false), @@ -443,7 +444,7 @@ void VisuGUI_CutLinesDlg::setBaseDefault (bool theUpdate) /* float aPos = myCutLines->GetBasePlanePosition(); myBasePlanePos->setText( QString::number(aPos) ); myBasePlanePos->setEnabled(false);*/ - SVTK_ViewWindow* aView = VISU::GetViewWindow(); + SVTK_ViewWindow* aView = VISU::GetActiveViewWindow(); if (aView) { if (theUpdate && myPreviewCheck->isChecked() && (myCutLines != NULL)) { //myCutLines->SetBasePlanePosition(aPos); @@ -515,7 +516,7 @@ void VisuGUI_CutLinesDlg::DrawTable() vh->setLabel( i, str.arg(i+1) ); } // Update preview - SVTK_ViewWindow* aView = VISU::GetViewWindow(); + SVTK_ViewWindow* aView = VISU::GetActiveViewWindow(); if (aView) { if (myPreviewCheck->isChecked()) { // myCutLines->GetPL()->Update(); @@ -593,7 +594,7 @@ void VisuGUI_CutLinesDlg::updateGlyphs(bool update){ source->Delete(); aPlaneMapper->Delete(); - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) if (update) vf->Repaint(); } @@ -684,7 +685,7 @@ void VisuGUI_CutLinesDlg::onValueChanged (int theRow, int theCol) QString aTxt = myPosTable->text(theRow, 0); bool isChanged = !aTxt.isEmpty(); ((QCheckTableItem*)myPosTable->item(theRow, 1))->setChecked(!isChanged); - SVTK_ViewWindow* aView = VISU::GetViewWindow(); + SVTK_ViewWindow* aView = VISU::GetActiveViewWindow(); if (aView) { if (myPreviewCheck->isChecked()) { //Update Preview @@ -700,7 +701,7 @@ void VisuGUI_CutLinesDlg::onValueChanged (int theRow, int theCol) if (isDefault) { //myCutLines->SetDefaultPosition(theRow); // myPosTable->setText(theRow, 0, QString::number(myCutLines->GetLinePosition(theRow))); - SVTK_ViewWindow* aView = VISU::GetViewWindow(); + SVTK_ViewWindow* aView = VISU::GetActiveViewWindow(); if (aView) { if (myPreviewCheck->isChecked()) { //Update Preview @@ -820,7 +821,7 @@ void VisuGUI_CutLinesDlg::reject() void VisuGUI_CutLinesDlg::onPreviewCheck (bool thePreview) { - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) { + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) { if (thePreview) { //storeToPrsObject(myCutLines); // myCutLines->GetPL()->Update(); @@ -851,7 +852,7 @@ void VisuGUI_CutLinesDlg::onAllCurvesInvertedCheck(bool theInvert) void VisuGUI_CutLinesDlg::onRotation (double theValue) { if (myCutLines == NULL) return; - SVTK_ViewWindow* aView = VISU::GetViewWindow(); + SVTK_ViewWindow* aView = VISU::GetActiveViewWindow(); if (aView) { if (myPreviewCheck->isChecked()) { @@ -872,7 +873,7 @@ void VisuGUI_CutLinesDlg::onRotation (double theValue) void VisuGUI_CutLinesDlg::onPlanePos (const QString& theValue) { if (myCutLines == NULL) return; - SVTK_ViewWindow* aView = VISU::GetViewWindow(); + SVTK_ViewWindow* aView = VISU::GetActiveViewWindow(); if (aView) { if (myPreviewCheck->isChecked()) { //myCutLines->SetBasePlanePosition(theValue.toDouble()); diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx index c4072907..486a475d 100644 --- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx @@ -30,6 +30,7 @@ #include "VisuGUI.h" #include "VisuGUI_Tools.h" +#include "VisuGUI_ViewTools.h" #include "VISU_CutPlanes_i.hh" #include "VISU_CutPlanesPL.hxx" @@ -166,11 +167,10 @@ VisuGUI_CutPlanesPane::VisuGUI_CutPlanesPane (QWidget* theParent) VisuGUI_CutPlanesPane::~VisuGUI_CutPlanesPane() { - cout<<"### VisuGUI_CutPlanesPane::~VisuGUI_CutPlanesPane"<Destroy(); - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) vf->Repaint(); } @@ -194,7 +194,7 @@ void VisuGUI_CutPlanesPane::initFromPrsObject (VISU::CutPlanes_i* thePrs) void VisuGUI_CutPlanesPane::createPlanes() { - if (VISU::GetViewWindow() == NULL) return; + if (VISU::GetActiveViewWindow() == NULL) return; if (myCutPlanes == NULL) return; if (myPreviewActor != 0) return; @@ -211,7 +211,7 @@ void VisuGUI_CutPlanesPane::createPlanes() myPreviewActor->PickableOff(); myPreviewActor->SetMapper(aPlaneMapper); aPlaneMapper->Delete(); - VISU::GetViewWindow()->AddActor(myPreviewActor); + VISU::GetActiveViewWindow()->AddActor(myPreviewActor); } int VisuGUI_CutPlanesPane::storeToPrsObject (VISU::CutPlanes_i* thePrs) @@ -349,7 +349,7 @@ void VisuGUI_CutPlanesPane::DrawTable() // Update preview if (myPreviewCheck->isChecked()) { - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) { + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) { myCutPlanes->GetPL()->Update(); deletePlanes(); createPlanes(); @@ -386,7 +386,7 @@ void VisuGUI_CutPlanesPane::onValueChanged (int theRow, int theCol) if (myPreviewCheck->isChecked()) { //Update Preview - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) { + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) { myCutPlanes->SetPlanePosition( theRow, aTxt.toDouble()); myCutPlanes->GetPL()->Update(); deletePlanes(); @@ -401,7 +401,7 @@ void VisuGUI_CutPlanesPane::onValueChanged (int theRow, int theCol) myPosTable->setText(theRow, 0, QString::number(myCutPlanes->GetPlanePosition(theRow))); if (myPreviewCheck->isChecked()) { - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) { + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) { //Update Preview myCutPlanes->GetPL()->Update(); deletePlanes(); @@ -417,7 +417,7 @@ void VisuGUI_CutPlanesPane::onValueChanged (int theRow, int theCol) void VisuGUI_CutPlanesPane::deletePlanes() { if (myPreviewActor == 0) return; - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) vf->RemoveActor(myPreviewActor); myPreviewActor->Delete(); myPreviewActor = 0; @@ -427,7 +427,7 @@ void VisuGUI_CutPlanesPane::onRotation (double theValue) { if (myCutPlanes == NULL) return; if (myPreviewCheck->isChecked()) { - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) { + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) { myCutPlanes->SetOrientation(getOrientaion(),getRotation1()*PI/180.,getRotation2()*PI/180.); myCutPlanes->GetPL()->Update(); deletePlanes(); @@ -439,7 +439,7 @@ void VisuGUI_CutPlanesPane::onRotation (double theValue) void VisuGUI_CutPlanesPane::onPreviewCheck (bool thePreview) { - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) { + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) { if (thePreview) { storeToPrsObject(myCutPlanes); myCutPlanes->GetPL()->Update(); diff --git a/src/VISUGUI/VisuGUI_Displayer.cxx b/src/VISUGUI/VisuGUI_Displayer.cxx index 1fa6f098..2939ca90 100644 --- a/src/VISUGUI/VisuGUI_Displayer.cxx +++ b/src/VISUGUI/VisuGUI_Displayer.cxx @@ -27,10 +27,13 @@ // $Header: /home/server/cvs/VISU/VISU_SRC/src/VISUGUI/VisuGUI_Displayer.cxx #include "VisuGUI_Displayer.h" -#include "VVTK_ViewModel.h" + #include "VisuGUI_Tools.h" +#include "VISU_ViewManager_i.hh" #include "VISU_Actor.h" +#include "VVTK_ViewModel.h" + #include #include @@ -41,7 +44,7 @@ #include #include -#include "VISU_ViewManager_i.hh" +#include VisuGUI_Displayer::VisuGUI_Displayer( SalomeApp_Application* app ) : LightApp_Displayer(), @@ -67,7 +70,9 @@ SALOME_Prs* VisuGUI_Displayer::buildPresentation( const QString& entry, SALOME_V if( CORBA::is_nil( anObj ) ) return 0; - SVTK_Viewer* vtk_viewer = dynamic_cast( aViewFrame ); + SVTK_Viewer* vtk_viewer = dynamic_cast( aViewFrame ); + if (!vtk_viewer) + vtk_viewer = dynamic_cast( aViewFrame ); if( vtk_viewer ) { SVTK_ViewWindow* wnd = @@ -116,14 +121,22 @@ SALOME_Prs* VisuGUI_Displayer::buildPresentation( const QString& entry, SALOME_V void VisuGUI_Displayer::buildPrs3d( SVTK_ViewWindow* wnd, VISU::Prs3d_i* thePrs ) const { - VISU_Actor* newAct = VISU::FindActor( wnd, thePrs ); - if( !newAct ) - { - newAct = thePrs->CreateActor(); + VISU_Actor* newAct = VISU::FindActor(wnd, thePrs); + if (!newAct) { + try { + newAct = thePrs->CreateActor(); + } catch (std::runtime_error& exc) { + thePrs->RemoveActors(); + + INFOS(exc.what()); + SUIT_MessageBox::warn1 + (myApp->desktop(), QObject::tr("WRN_VISU"), + QObject::tr("ERR_CANT_BUILD_PRESENTATION") + ": " + QObject::tr(exc.what()), + QObject::tr("BUT_OK")); + } } - if( newAct ) - { - wnd->AddActor( newAct ); + if (newAct) { + wnd->AddActor(newAct); wnd->Repaint(); } } diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx index 0c998c8e..53938c06 100644 --- a/src/VISUGUI/VisuGUI_Module.cxx +++ b/src/VISUGUI/VisuGUI_Module.cxx @@ -1,4 +1,4 @@ - +// VISU VISUGUI : GUI of VISU component // // Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -45,6 +45,8 @@ #include "LightApp_Preferences.h" #include "LightApp_Displayer.h" +#include "SALOMEDS_IParameters.hxx" + #include "VVTK_ViewManager.h" #include "VVTK_ViewWindow.h" #include "VVTK_ViewModel.h" @@ -55,9 +57,6 @@ #include "SVTK_RenderWindowInteractor.h" #include "VISU_Event.h" -#include "Plot2d_ViewWindow.h" -#include "Plot2d_ViewFrame.h" - #include "VisuGUI_Prs3dTools.h" #include "VISU_GaussPoints_i.hh" @@ -81,8 +80,6 @@ #include "VVTK_MainWindow.h" #include "VISU_View_i.hh" -#include "SALOMEDS_IParameters.hxx" - #include #include @@ -180,24 +177,24 @@ namespace VISU } //--------------------------------------------------------------- -VisuGUI_Module -::VisuGUI_Module() : +VisuGUI_Module:: +VisuGUI_Module() : VisuGUI() { } //--------------------------------------------------------------- -VisuGUI_Module -::~VisuGUI_Module() +VisuGUI_Module:: +~VisuGUI_Module() { } //--------------------------------------------------------------- void -VisuGUI_Module -::initialize( CAM_Application* theApp ) +VisuGUI_Module:: +initialize( CAM_Application* theApp ) { VisuGUI::initialize( theApp ); @@ -238,7 +235,8 @@ VisuGUI_Module accel->setActionKey( SVTK::PlusSpeedIncrementEvent, Key_Plus, aViewerType ); accel->setActionKey( SVTK::MinusSpeedIncrementEvent, Key_Minus, aViewerType ); - connect( getApp(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ), this, SLOT( OnViewManagerAdded (SUIT_ViewManager*) ) ); + connect( getApp(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ), + this, SLOT( OnViewManagerAdded (SUIT_ViewManager*) ) ); // Prepare popup menus QtxPopupMgr* mgr = popupMgr(); @@ -291,21 +289,21 @@ VisuGUI_Module this, SLOT(OnErasePrs())); mgr->insert( action( GAUSS_ERASE_PRS ), -1, -1, -1 ); // erase mgr->setRule( action( GAUSS_ERASE_PRS ), - aRule + " and (isVisible=true)", true ); + aRule + " and ({true} in $canBeDisplayed) and (isVisible=true)", true ); createAction( GAUSS_DISPLAY_PRS, VisuGUI::tr("MEN_DISPLAY"), QIconSet(), VisuGUI::tr("MEN_DISPLAY"), "", 0, this, false, this, SLOT(OnDisplayPrs())); mgr->insert( action( GAUSS_DISPLAY_PRS ), -1, -1, -1 ); // display mgr->setRule( action( GAUSS_DISPLAY_PRS ), - aRule + " and (isVisible=false)", true ); + aRule + " and ({true} in $canBeDisplayed) and (isVisible=false)", true ); createAction( GAUSS_DISPLAY_ONLY_PRS, VisuGUI::tr("MEN_DISPLAY_ONLY"), QIconSet(), VisuGUI::tr("MEN_DISPLAY_ONLY"), "", 0, this, false, this, SLOT(OnDisplayOnlyPrs())); mgr->insert( action( GAUSS_DISPLAY_ONLY_PRS ), -1, -1, -1 ); // display only mgr->setRule( action( GAUSS_DISPLAY_ONLY_PRS ), - aRule, true ); + aRule + " and ({true} in $canBeDisplayed)", true ); createAction( GAUSS_RENAME_CONFIGURATION, VisuGUI::tr("MEN_RENAME"), QIconSet(), VisuGUI::tr("MEN_RENAME"), "", 0, this, false, @@ -317,7 +315,8 @@ VisuGUI_Module tr("MEN_SAVE_CONFIGURATION"), "", 0, this, false, this, SLOT(OnSaveConfiguration())); mgr->insert( action( GAUSS_SAVE_CONFIGURATION ), -1, -1, -1 ); - mgr->setRule( action( GAUSS_SAVE_CONFIGURATION ), "selcount>=0 and client='VVTK' and activeView='VVTK'", true ); + mgr->setRule( action( GAUSS_SAVE_CONFIGURATION ), + "selcount>=0 and client='VVTK' and activeView='VVTK'", true ); createAction( GAUSS_OVERWRITE_CONFIGURATION, tr("MEN_OVERWRITE_CONFIGURATION"), QIconSet(), tr("MEN_OVERWRITE_CONFIGURATION"), "", 0, this, false, @@ -336,8 +335,8 @@ VisuGUI_Module //--------------------------------------------------------------- bool -VisuGUI_Module -::activateModule( SUIT_Study* theStudy ) +VisuGUI_Module:: +activateModule( SUIT_Study* theStudy ) { VisuGUI::activateModule( theStudy ); @@ -349,8 +348,8 @@ VisuGUI_Module //--------------------------------------------------------------- bool -VisuGUI_Module -::deactivateModule( SUIT_Study* theStudy ) +VisuGUI_Module:: +deactivateModule( SUIT_Study* theStudy ) { VisuGUI::deactivateModule( theStudy ); @@ -362,8 +361,8 @@ VisuGUI_Module //--------------------------------------------------------------- SUIT_ViewManager* -VisuGUI_Module -::onCreateViewManager() +VisuGUI_Module:: +onCreateViewManager() { Viewer* aViewer = new Viewer( this, myViewerMap ); return aViewer->getViewManager(); @@ -372,8 +371,8 @@ VisuGUI_Module //--------------------------------------------------------------- void -VisuGUI_Module -::onLastViewClosed(SUIT_ViewManager* theViewManager) +VisuGUI_Module:: +onLastViewClosed(SUIT_ViewManager* theViewManager) { myViewerMap.erase(theViewManager); } @@ -381,8 +380,8 @@ VisuGUI_Module //--------------------------------------------------------------- void -VisuGUI_Module -::createPreferences() +VisuGUI_Module:: +createPreferences() { VisuGUI::createPreferences(); @@ -397,15 +396,16 @@ VisuGUI_Module //--------------------------------------------------------------- void -VisuGUI_Module -::createGaussPointsPreferences() +VisuGUI_Module:: +createGaussPointsPreferences() { int gaussTab = addPreference( tr( "VISU_GAUSS_PREF_TAB_TTL" ) ); int primitiveGr = addPreference( tr( "VISU_GAUSS_PREF_PRIMITIVE_GROUP_TTL" ), gaussTab ); setPreferenceProperty( primitiveGr, "columns", 1 ); int primitiveTypePref = addPreference( tr( "VISU_GAUSS_PREF_PRIMITIVE_TYPE" ), primitiveGr, - LightApp_Preferences::Selector, "VISU", "point_sprite_primitive_type" ); + LightApp_Preferences::Selector, "VISU", + "point_sprite_primitive_type" ); QStringList values; values.append( tr( "VISU_GAUSS_PREF_POINTSPRITE" ) ); @@ -430,7 +430,8 @@ VisuGUI_Module LightApp_Preferences::File, "VISU", "point_sprite_alpha_texture" ); int alphaThresholdPref = addPreference( tr( "VISU_GAUSS_PREF_ALPHA_THRESHOLD" ), primitiveGr, - LightApp_Preferences::DblSpin, "VISU", "point_sprite_alpha_threshold" ); + LightApp_Preferences::DblSpin, "VISU", + "point_sprite_alpha_threshold" ); setPreferenceProperty( alphaThresholdPref, "min", 0.0 ); setPreferenceProperty( alphaThresholdPref, "max", 1.0 ); setPreferenceProperty( alphaThresholdPref, "step", 0.1 ); @@ -459,7 +460,8 @@ VisuGUI_Module setPreferenceProperty( maxSizePref, "max", 100 ); int magnificationPref = addPreference( tr( "VISU_GAUSS_PREF_MAGNIFICATION" ), sizeGr, - LightApp_Preferences::IntSpin, "VISU", "point_sprite_magnification" ); + LightApp_Preferences::IntSpin, "VISU", + "point_sprite_magnification" ); setPreferenceProperty( magnificationPref, "min", 10 ); setPreferenceProperty( magnificationPref, "max", 1000 ); @@ -521,8 +523,8 @@ VisuGUI_Module //--------------------------------------------------------------- void -VisuGUI_Module -::createInsideCursorPreferences() +VisuGUI_Module:: +createInsideCursorPreferences() { int insideCursorTab = addPreference( tr( "VISU_GAUSS_INSIDE_CURSOR_PREF_TAB_TTL" ) ); @@ -530,7 +532,8 @@ VisuGUI_Module setPreferenceProperty( primitiveGr, "columns", 1 ); int primitiveTypePref = addPreference( tr( "VISU_GAUSS_PREF_PRIMITIVE_TYPE" ), primitiveGr, - LightApp_Preferences::Selector, "VISU", "inside_point_sprite_primitive_type" ); + LightApp_Preferences::Selector, "VISU", + "inside_point_sprite_primitive_type" ); QStringList values; values.append( tr( "VISU_GAUSS_PREF_POINTSPRITE" ) ); @@ -555,18 +558,21 @@ VisuGUI_Module LightApp_Preferences::File, "VISU", "inside_point_sprite_alpha_texture" ); int alphaThresholdPref = addPreference( tr( "VISU_GAUSS_PREF_ALPHA_THRESHOLD" ), primitiveGr, - LightApp_Preferences::DblSpin, "VISU", "inside_point_sprite_alpha_threshold" ); + LightApp_Preferences::DblSpin, "VISU", + "inside_point_sprite_alpha_threshold" ); setPreferenceProperty( alphaThresholdPref, "min", 0.0 ); setPreferenceProperty( alphaThresholdPref, "max", 1.0 ); setPreferenceProperty( alphaThresholdPref, "step", 0.1 ); int resolutionPref = addPreference( tr( "VISU_GAUSS_PREF_RESOLUTION" ), primitiveGr, - LightApp_Preferences::IntSpin, "VISU", "inside_geom_sphere_resolution" ); + LightApp_Preferences::IntSpin, "VISU", + "inside_geom_sphere_resolution" ); setPreferenceProperty( resolutionPref, "min", 3 ); setPreferenceProperty( resolutionPref, "max", 100 ); int faceLimitPref = addPreference( tr( "VISU_GAUSS_PREF_FACE_LIMIT" ), primitiveGr, - LightApp_Preferences::IntSpin, "VISU", "inside_geom_sphere_face_limit" ); + LightApp_Preferences::IntSpin, "VISU", + "inside_geom_sphere_face_limit" ); setPreferenceProperty( faceLimitPref, "min", 10 ); setPreferenceProperty( faceLimitPref, "max", 1000000 ); @@ -574,12 +580,14 @@ VisuGUI_Module setPreferenceProperty( sizeGr, "columns", 2 ); int minSizePref = addPreference( tr( "VISU_GAUSS_PREF_MIN_SIZE" ), sizeGr, - LightApp_Preferences::IntSpin, "VISU", "inside_point_sprite_min_size" ); + LightApp_Preferences::IntSpin, "VISU", + "inside_point_sprite_min_size" ); setPreferenceProperty( minSizePref, "min", 1 ); setPreferenceProperty( minSizePref, "max", 100 ); int maxSizePref = addPreference( tr( "VISU_GAUSS_PREF_MAX_SIZE" ), sizeGr, - LightApp_Preferences::IntSpin, "VISU", "inside_point_sprite_max_size" ); + LightApp_Preferences::IntSpin, "VISU", + "inside_point_sprite_max_size" ); setPreferenceProperty( maxSizePref, "min", 1 ); setPreferenceProperty( maxSizePref, "max", 100 ); @@ -587,23 +595,24 @@ VisuGUI_Module setPreferenceProperty( magnificationGr, "columns", 2 ); int magnificationPref = addPreference( tr( "VISU_GAUSS_PREF_MAGNIFICATION" ), magnificationGr, - LightApp_Preferences::IntSpin, "VISU", "inside_point_sprite_magnification" ); + LightApp_Preferences::IntSpin, "VISU", + "inside_point_sprite_magnification" ); setPreferenceProperty( magnificationPref, "min", 10 ); setPreferenceProperty( magnificationPref, "max", 1000 ); int incrementPref = addPreference( tr( "VISU_GAUSS_PREF_INCREMENT" ), magnificationGr, - LightApp_Preferences::DblSpin, "VISU", "inside_point_sprite_increment" ); + LightApp_Preferences::DblSpin, "VISU", + "inside_point_sprite_increment" ); setPreferenceProperty( incrementPref, "min", 0.01 ); setPreferenceProperty( incrementPref, "max", 10 ); setPreferenceProperty( incrementPref, "step", 0.1 ); - } //--------------------------------------------------------------- void -VisuGUI_Module -::createOutsideCursorPreferences() +VisuGUI_Module:: +createOutsideCursorPreferences() { int outsideCursorTab = addPreference( tr( "VISU_GAUSS_OUTSIDE_CURSOR_PREF_TAB_TTL" ) ); @@ -611,7 +620,8 @@ VisuGUI_Module setPreferenceProperty( primitiveGr, "columns", 1 ); int primitiveTypePref = addPreference( tr( "VISU_GAUSS_PREF_PRIMITIVE_TYPE" ), primitiveGr, - LightApp_Preferences::Selector, "VISU", "outside_point_sprite_primitive_type" ); + LightApp_Preferences::Selector, "VISU", + "outside_point_sprite_primitive_type" ); QStringList values; values.append( tr( "VISU_GAUSS_PREF_POINTSPRITE" ) ); @@ -636,18 +646,21 @@ VisuGUI_Module LightApp_Preferences::File, "VISU", "outside_point_sprite_alpha_texture" ); int alphaThresholdPref = addPreference( tr( "VISU_GAUSS_PREF_ALPHA_THRESHOLD" ), primitiveGr, - LightApp_Preferences::DblSpin, "VISU", "outside_point_sprite_alpha_threshold" ); + LightApp_Preferences::DblSpin, "VISU", + "outside_point_sprite_alpha_threshold" ); setPreferenceProperty( alphaThresholdPref, "min", 0.0 ); setPreferenceProperty( alphaThresholdPref, "max", 1.0 ); setPreferenceProperty( alphaThresholdPref, "step", 0.1 ); int resolutionPref = addPreference( tr( "VISU_GAUSS_PREF_RESOLUTION" ), primitiveGr, - LightApp_Preferences::IntSpin, "VISU", "outside_geom_sphere_resolution" ); + LightApp_Preferences::IntSpin, "VISU", + "outside_geom_sphere_resolution" ); setPreferenceProperty( resolutionPref, "min", 3 ); setPreferenceProperty( resolutionPref, "max", 100 ); int faceLimitPref = addPreference( tr( "VISU_GAUSS_PREF_FACE_LIMIT" ), primitiveGr, - LightApp_Preferences::IntSpin, "VISU", "outside_geom_sphere_face_limit" ); + LightApp_Preferences::IntSpin, "VISU", + "outside_geom_sphere_face_limit" ); setPreferenceProperty( faceLimitPref, "min", 10 ); setPreferenceProperty( faceLimitPref, "max", 1000000 ); @@ -671,8 +684,8 @@ VisuGUI_Module //--------------------------------------------------------------- void -VisuGUI_Module -::createPickingPreferences() +VisuGUI_Module:: +createPickingPreferences() { int pickingTab = addPreference( tr( "VISU_PICKING_PREF_TAB_TTL" ) ); @@ -681,7 +694,7 @@ VisuGUI_Module setPreferenceProperty( cursorGr, "columns", 1 ); int cursorSizePref = addPreference( tr( "VISU_PICKING_PREF_CURSOR_SIZE" ), cursorGr, - LightApp_Preferences::DblSpin, "VISU", "picking_cursor_size" ); + LightApp_Preferences::DblSpin, "VISU", "picking_cursor_size" ); setPreferenceProperty( cursorSizePref, "min", 0 ); setPreferenceProperty( cursorSizePref, "max", 1.0 ); setPreferenceProperty( cursorSizePref, "step", 0.1 ); @@ -691,14 +704,15 @@ VisuGUI_Module setPreferenceProperty( pyramidHeightPref, "min", 1 ); setPreferenceProperty( pyramidHeightPref, "max", 100 ); - /*int selectionColorPref = */addPreference( tr( "VISU_PICKING_PREF_SELECTION_COLOR" ), cursorGr, - LightApp_Preferences::Color, "VISU", "picking_selection_color" ); + /*int selectionColorPref = */ + addPreference( tr( "VISU_PICKING_PREF_SELECTION_COLOR" ), cursorGr, + LightApp_Preferences::Color, "VISU", "picking_selection_color" ); // Tolerance int toleranceGr = addPreference( tr( "VISU_PICKING_PREF_TOLERANCE_GROUP_TTL" ), pickingTab ); int pointTolerancePref = addPreference( tr( "VISU_PICKING_PREF_POINT_SELECTION_TOLERANCE" ), toleranceGr, - LightApp_Preferences::DblSpin, "VISU", "picking_point_tolerance" ); + LightApp_Preferences::DblSpin, "VISU", "picking_point_tolerance" ); setPreferenceProperty( pointTolerancePref, "min", 0.001 ); setPreferenceProperty( pointTolerancePref, "max", 10 ); setPreferenceProperty( pointTolerancePref, "step", 0.01 ); @@ -750,13 +764,14 @@ VisuGUI_Module //--------------------------------------------------------------- void -VisuGUI_Module -::createSpaceMousePreferences() +VisuGUI_Module:: +createSpaceMousePreferences() { int mouseTab = addPreference( tr( "VISU_MOUSE_PREF_TAB_TLT" ) ); int mouseGr = addPreference( tr( "VISU_MOUSE_PREF_GROUP_TLT" ), mouseTab ); - int mousePref = addPreference( tr( "VISU_MOUSE_PREF" ), mouseGr, LightApp_Preferences::Selector, "VISU", "mouse_behaviour" ); + int mousePref = addPreference( tr( "VISU_MOUSE_PREF" ), mouseGr, + LightApp_Preferences::Selector, "VISU", "mouse_behaviour" ); QStringList values; values.append( tr( "VISU_MOUSE_PREF_STANDARD" ) ); values.append( tr( "VISU_MOUSE_PREF_KEYBOARD_FREE" ) ); @@ -767,16 +782,27 @@ VisuGUI_Module setPreferenceProperty( mousePref, "indexes", indices ); int keybrdGr = addPreference( tr( "VISU_KEYBOARD_PREF_GROUP_TTL" ), mouseTab ); - int keybrdPref = addPreference( tr( "VISU_KEYBOARD_PREF" ), keybrdGr, LightApp_Preferences::IntSpin, "VISU", "speed_increment" ); + int keybrdPref = addPreference( tr( "VISU_KEYBOARD_PREF" ), keybrdGr, + LightApp_Preferences::IntSpin, "VISU", "speed_increment" ); setPreferenceProperty( keybrdPref, "max", 1000 ); int spacemouseGr = addPreference( tr( "VISU_SPACEMOUSE_PREF" ), mouseTab ); setPreferenceProperty( spacemouseGr, "columns", 1 ); - int spacemousePref1 = addPreference( tr( "VISU_SPACEMOUSE_PREF_1" ), spacemouseGr, LightApp_Preferences::Selector, "VISU", "spacemouse_func1_btn" ); //decrease_speed_increment - int spacemousePref2 = addPreference( tr( "VISU_SPACEMOUSE_PREF_2" ), spacemouseGr, LightApp_Preferences::Selector, "VISU", "spacemouse_func2_btn" ); //increase_speed_increment - int spacemousePref3 = addPreference( tr( "VISU_SPACEMOUSE_PREF_3" ), spacemouseGr, LightApp_Preferences::Selector, "VISU", "spacemouse_func3_btn" ); //decrease_gauss_point_magnification - int spacemousePref4 = addPreference( tr( "VISU_SPACEMOUSE_PREF_4" ), spacemouseGr, LightApp_Preferences::Selector, "VISU", "spacemouse_func4_btn" ); //increase_gauss_point_magnification - int spacemousePref5 = addPreference( tr( "VISU_SPACEMOUSE_PREF_5" ), spacemouseGr, LightApp_Preferences::Selector, "VISU", "spacemouse_func5_btn" ); //dominant_combined_switch + int spacemousePref1 = addPreference( tr( "VISU_SPACEMOUSE_PREF_1" ), spacemouseGr, + LightApp_Preferences::Selector, "VISU", + "spacemouse_func1_btn" ); //decrease_speed_increment + int spacemousePref2 = addPreference( tr( "VISU_SPACEMOUSE_PREF_2" ), spacemouseGr, + LightApp_Preferences::Selector, "VISU", + "spacemouse_func2_btn" ); //increase_speed_increment + int spacemousePref3 = addPreference( tr( "VISU_SPACEMOUSE_PREF_3" ), spacemouseGr, + LightApp_Preferences::Selector, "VISU", + "spacemouse_func3_btn" ); //decrease_gauss_point_magnification + int spacemousePref4 = addPreference( tr( "VISU_SPACEMOUSE_PREF_4" ), spacemouseGr, + LightApp_Preferences::Selector, "VISU", + "spacemouse_func4_btn" ); //increase_gauss_point_magnification + int spacemousePref5 = addPreference( tr( "VISU_SPACEMOUSE_PREF_5" ), spacemouseGr, + LightApp_Preferences::Selector, "VISU", + "spacemouse_func5_btn" ); //dominant_combined_switch values.clear(); values.append( tr( "VISU_SPACEMOUSE_PREF_BTN_1" ) ); values.append( tr( "VISU_SPACEMOUSE_PREF_BTN_2" ) ); @@ -816,8 +842,8 @@ VisuGUI_Module //--------------------------------------------------------------- void -VisuGUI_Module -::createRecorderPreferences() +VisuGUI_Module:: +createRecorderPreferences() { int recorderTab = addPreference( tr( "VISU_RECORDER_PREF_TAB_TTL" ) ); @@ -852,27 +878,28 @@ VisuGUI_Module //--------------------------------------------------------------- void -VisuGUI_Module -::OnCreateGaussPoints() +VisuGUI_Module:: +OnCreateGaussPoints() { double initialTime = vtkTimerLog::GetCPUTime(); - CreatePrs3d(this,true); + CreatePrs3d(this); INFOS( "VisuGUI_Module::OnCreateGaussPoints() : Gauss Points created in " << vtkTimerLog::GetCPUTime() - initialTime << " seconds" ); } void -VisuGUI_Module -::OnViewManagerAdded(SUIT_ViewManager* viewMgr) +VisuGUI_Module:: +OnViewManagerAdded(SUIT_ViewManager* viewMgr) { QString type = viewMgr->getViewModel()->getType(); if ( type == VVTK_Viewer::Type() ) - connect( viewMgr, SIGNAL( viewCreated( SUIT_ViewWindow* ) ), this, SLOT( OnViewCreated( SUIT_ViewWindow* ) ) ); + connect( viewMgr, SIGNAL( viewCreated( SUIT_ViewWindow* ) ), + this, SLOT( OnViewCreated( SUIT_ViewWindow* ) ) ); } void -VisuGUI_Module -::OnViewCreated(SUIT_ViewWindow* view) +VisuGUI_Module:: +OnViewCreated(SUIT_ViewWindow* view) { SVTK_ViewWindow* viewWindow = dynamic_cast( view ); if ( viewWindow ) { @@ -886,8 +913,8 @@ VisuGUI_Module } void -VisuGUI_Module -::setProperty( SVTK_ViewWindow* viewWindow, const QString& pref ) +VisuGUI_Module:: +setProperty( SVTK_ViewWindow* viewWindow, const QString& pref ) { if ( !viewWindow ) return; @@ -922,8 +949,8 @@ VisuGUI_Module } void -VisuGUI_Module -::setProperty( SVTK_ViewManager* vm, const QString& prop ) +VisuGUI_Module:: +setProperty( SVTK_ViewManager* vm, const QString& prop ) { if ( !vm ) return; @@ -934,8 +961,8 @@ VisuGUI_Module } void -VisuGUI_Module -::preferencesChanged( const QString& group, const QString& pref ) +VisuGUI_Module:: +preferencesChanged( const QString& group, const QString& pref ) { VisuGUI::preferencesChanged(group,pref); @@ -953,14 +980,14 @@ VisuGUI_Module //--------------------------------------------------------------- SUIT_ViewManager* -VisuGUI_Module -::getViewManager(const QString& theType, - const bool theIsCreate) +VisuGUI_Module:: +getViewManager(const QString& theType, + const bool theIsCreate) { - if(SUIT_ViewManager* aViewManager = VisuGUI::getViewManager(theType,theIsCreate)) + if (SUIT_ViewManager* aViewManager = VisuGUI::getViewManager(theType,theIsCreate)) return aViewManager; - if(theIsCreate && VVTK_Viewer::Type() == theType) + if (theIsCreate && theType == VVTK_Viewer::Type()) return onCreateViewManager(); return NULL; @@ -968,131 +995,16 @@ VisuGUI_Module //--------------------------------------------------------------- void -VisuGUI_Module -::OnEditGaussPoints() +VisuGUI_Module:: +OnEditGaussPoints() { Handle(SALOME_InteractiveObject) anIO; - if(VISU::Prs3d_i* aPrs3d = GetPrsToModify(this,&anIO)){ - EditPrs3d(this, aPrs3d); - if(SVTK_ViewWindow* aViewWindow = GetViewWindow(this,true)){ - aViewWindow->highlight(anIO,1); - } - } -} - - -//--------------------------------------------------------------- -void -VisuGUI_Module -::OnDisplayPrs() -{ - if(MYDEBUG) MESSAGE("VisuGUI_Module::OnDisplayPrs"); - - QApplication::setOverrideCursor(Qt::waitCursor); - - if(LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this)){ - SALOME_ListIO aSel, aList; - aSelectionMgr->selectedObjects(aSel); - extractContainers(aSel, aList); - - for(SALOME_ListIteratorOfListIO it( aList ); it.More(); it.Next()){ - Handle(SALOME_InteractiveObject) anIO = it.Value(); - CORBA::Object_var anObject = GetSelectedObj( GetAppStudy(this), anIO->getEntry() ); - - // is it a Prs3d object ? - if(!CORBA::is_nil(anObject)){ - if(VISU::Prs3d_i* aPrs3d = dynamic_cast(VISU::GetServant(anObject).in())){ - if(MYDEBUG) MESSAGE("VisuGUI_Module::OnDisplayPrs : Prs3d object"); - if(aPrs3d->GetType() == VISU::TGAUSSPOINTS) - VISU::UpdateViewer(this,aPrs3d,false,true,true); - else if(SUIT_ViewManager* aViewManager = getApp()->activeViewManager()){ - QString aType = aViewManager->getType(); - if(aType == SVTK_Viewer::Type()) - VISU::UpdateViewer(this,aPrs3d,false,true,true); - else if(aType == VVTK_Viewer::Type()) - VISU::UpdateViewer(this,aPrs3d,false,true,true); - } - continue; - } - } - - // is it Curve ? - if(VISU::Curve_i* aCurve = dynamic_cast(VISU::GetServant(anObject).in())){ - if(MYDEBUG) MESSAGE("VisuGUI_Module::OnDisplayPrs : Curve object"); - PlotCurve( this, aCurve, VISU::eDisplay ); - continue; - } - - // is it Container ? - if(VISU::Container_i* aContainer = dynamic_cast(VISU::GetServant(anObject).in())){ - if(MYDEBUG) MESSAGE("VisuGUI_Module::DisplayPrs : Container object"); - PlotContainer( this, aContainer, VISU::eDisplay ); - continue; - } - - // is it Table ? - if(VISU::Table_i* aTable = dynamic_cast(VISU::GetServant(anObject).in())){ - if(MYDEBUG) MESSAGE("VisuGUI_Module::DisplayPrs : Table object"); - PlotTable( this, aTable, VISU::eDisplay ); - continue; - } + if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, &anIO)) { + // Create VVTK_ViewWindow, if it does not exist + if (VVTK_ViewWindow* aViewWindow = GetViewWindow(this)) { + EditPrs3d(this, anIO, aPrs3d, aViewWindow); } } - - QApplication::restoreOverrideCursor(); -} - - -//--------------------------------------------------------------- -void -VisuGUI_Module -::OnEraseAll() -{ - if(SUIT_ViewManager* aViewManager = getApp()->activeViewManager()){ - QString aType = aViewManager->getType(); - if(aType == SVTK_Viewer::Type()) - VISU::OnEraseAll(this); - else if(aType == VVTK_Viewer::Type()) - VISU::OnEraseAll(this); - else if(aType == SPlot2d_Viewer::Type()) - VISU::OnEraseAll(this); - } -} - - -//--------------------------------------------------------------- -void -VisuGUI_Module -::OnDisplayOnlyPrs() -{ - OnEraseAll(); - OnDisplayPrs(); -} - - -//--------------------------------------------------------------- -void -VisuGUI_Module -::OnErasePrs() -{ - QApplication::setOverrideCursor(Qt::waitCursor); - - LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); - SALOME_ListIO aSel, aList; - aSelectionMgr->selectedObjects(aSel); - extractContainers(aSel, aList); - - for(SALOME_ListIteratorOfListIO it( aList ); it.More(); it.Next()){ - Handle(SALOME_InteractiveObject) anIO = it.Value(); - CORBA::Object_var anObject = GetSelectedObj(GetAppStudy(this),anIO->getEntry()); - if(!CORBA::is_nil(anObject)){ - VISU::Base_var aBase = VISU::Base::_narrow(anObject); - if(!CORBA::is_nil(aBase)) - VISU::ErasePrs(this,aBase,true); - } - } - - QApplication::restoreOverrideCursor(); } @@ -1383,7 +1295,7 @@ namespace PortableServer::ServantBase_var aServant = VISU::GetServant(anObject); if(VISU::Prs3d_i* aPrs3d = dynamic_cast(aServant.in())){ // To set visiblity - VISU::UpdateViewer(theModule,aPrs3d,anIsFirst,false,false); + VISU::UpdateViewer(theModule, aPrs3d, /*disp_only = */anIsFirst, /*highlight = */false); anIsFirst = false; // To update selection @@ -1670,6 +1582,7 @@ eventFilter( QObject * theWatched, QEvent * theEvent ) return aRet; } + const char gSeparator = '_'; // character used to separate parameter names const char gDigitsSep = ':'; // character used to separate numeric parameter values (color = r:g:b) /*! @@ -1688,25 +1601,49 @@ void VisuGUI_Module::storeVisualParameters(int savePoint) SALOMEDS_IParameters ip(ap); // viewers counters are used for storing view_numbers in IParameters - int vtkViewers( 0 ), plotViewers( 0 ); + int svtkViewers( 0 ), vvtkViewers( 0 ), plotViewers( 0 ); // componentName is used for encoding of entries when storing them in IParameters _PTR(SComponent) visuEng = ClientFindOrCreateVisuComponent( studyDS ); std::string componentName = visuEng->ComponentDataType(); - // iterating view managers and its views QPtrList lst; + + // saving VVTK viewer parameters. VVTK (Gauss Viewers) are NOT created by SalomeApp since + // VVTK is declared in VISU, so here we store VVTK view window parameters. + // VisuGUI_Module::restoreVisualParameters() creates VVTK_Views and restores its parameters. + ip.setProperty( "ActiveGaussViewer", "-1" ); + getApp()->viewManagers( VVTK_Viewer::Type(), lst ); + for ( QPtrListIterator it( lst ); it.current(); ++it ) { + SUIT_ViewManager* vman = it.current(); + if ( SUIT_ViewWindow* vwin = vman->getActiveView() ) { + // using predefined string "GaussViewer" as "entry".. it's a hardcoded "workaround". + // gauss viewer parameters are retrieved using this "entry" string. + // name of parameter = caption of gauss ViewWindow + // value of parameter = ViewWindow's visual parameters + ip.setParameter( "GaussViewer", vwin->caption().latin1(), vwin->getVisualParameters().latin1() ); + + if ( application()->desktop()->activeWindow() == vwin ) + ip.setProperty( "ActiveGaussViewer", QString::number( vvtkViewers ).latin1() ); + vvtkViewers++; + } + } + + // main cycle to store parameters of displayed objects + lst.clear(); getApp()->viewManagers( lst ); + vvtkViewers = svtkViewers = plotViewers = 0; for ( QPtrListIterator it( lst ); it.current(); ++it ) { SUIT_ViewManager* vman = it.current(); - SUIT_ViewModel* vmodel = vman->getViewModel(); - if ( !vmodel ) - continue; + QString vType = vman->getType(); + int* viewsCounter = vType == SVTK_Viewer::Type() ? &svtkViewers : + vType == VVTK_Viewer::Type() ? &vvtkViewers : + vType == SPlot2d_Viewer::Type() ? &plotViewers : 0; // saving VTK actors' properties - if ( vmodel->getType() == SVTK_Viewer::Type() || // processing SVTK and VVTK viewers - vmodel->getType() == VVTK_Viewer::Type() ) { // in the same way (VVTK_ViewWindow - // inherits SVTK_ViewWindow) + if ( vType == SVTK_Viewer::Type() || // processing SVTK and VVTK viewers in the same + vType == VVTK_Viewer::Type() ) { // way (VVTK_ViewWindow inherits SVTK_ViewWindow) + QPtrVector views = vman->getViews(); for ( int i = 0, iEnd = vman->getViewsCount(); i < iEnd; i++ ) { if ( SVTK_ViewWindow* vtkView = dynamic_cast( views[i] ) ) { @@ -1722,8 +1659,8 @@ void VisuGUI_Module::storeVisualParameters(int savePoint) // subject to change on next component loading std::string entry = ip.encodeEntry( io->getEntry(), componentName ); - std::string param, vtkParam = vmodel->getType().latin1(); vtkParam += gSeparator; - vtkParam += QString::number( vtkViewers ).latin1(); vtkParam += gSeparator; + std::string param, vtkParam = vType.latin1(); vtkParam += gSeparator; + vtkParam += QString::number( *viewsCounter ).latin1(); vtkParam += gSeparator; param = vtkParam + "Visibility"; ip.setParameter( entry, param, "On" ); @@ -1777,9 +1714,9 @@ void VisuGUI_Module::storeVisualParameters(int savePoint) } // end of ..while.. actors traversal } // if ( vtkView ) } // for ( views ) - vtkViewers++; + (*viewsCounter)++; } // if ( SVTK view model ) - else if ( vmodel->getType() == SPlot2d_Viewer::Type() ) { // processing Plot2d viewers + else if ( vType == SPlot2d_Viewer::Type() ) { // processing Plot2d viewers QPtrVector views = vman->getViews(); for ( int i = 0, iEnd = vman->getViewsCount(); i < iEnd; i++ ) { if ( Plot2d_ViewWindow* plotView = dynamic_cast( views[i] ) ) { @@ -1797,8 +1734,8 @@ void VisuGUI_Module::storeVisualParameters(int savePoint) // subject to change on next component loading std::string entry = ip.encodeEntry( io->getEntry(), componentName ); - std::string param, plotParam = vmodel->getType().latin1(); plotParam += gSeparator; - plotParam += QString::number( plotViewers ).latin1(); plotParam += gSeparator; + std::string param, plotParam = vType.latin1(); plotParam += gSeparator; + plotParam += QString::number( *viewsCounter ).latin1(); plotParam += gSeparator; param = plotParam + "Visibility"; ip.setParameter( entry, param, "On" ); @@ -1807,7 +1744,7 @@ void VisuGUI_Module::storeVisualParameters(int savePoint) } // for curves } // if ( plotView ) } // for ( views ) - plotViewers++; + (*viewsCounter)++; } // if ( SPlot2d view model ) } } @@ -1864,16 +1801,35 @@ void VisuGUI_Module::restoreVisualParameters(int savePoint) SALOMEDS_IParameters ip(ap); // actors are stored in a map after displaying of them for quicker access in future - QMap > vtkActors; // map: entry to map: view_id to actor - + QMap > vtkActors; // map: entry to map: ViewType_ to actor (SVTK/VVTK) + std::vector entries = ip.getEntries(); for ( std::vector::iterator entIt = entries.begin(); entIt != entries.end(); ++entIt ) { - QString entry( ip.decodeEntry( *entIt ).c_str() ); + std::vector paramNames = ip.getAllParameterNames( *entIt ); std::vector paramValues = ip.getAllParameterValues( *entIt ); std::vector::iterator namesIt = paramNames.begin(); std::vector::iterator valuesIt = paramValues.begin(); + + if ( *entIt == "GaussViewer" ) { + // parameter names are view window's captions, values - visual parameters. + for ( ; namesIt != paramNames.end(); ++namesIt, ++valuesIt ) { + SUIT_ViewManager* vman = onCreateViewManager(); + SUIT_ViewWindow* vwin = vman->getActiveView(); + vwin->setCaption( (*namesIt).c_str() ); + + // wait untill the window is really shown. This step fixes MANY bugs.. + while ( !vwin->isVisible() ) + qApp->processEvents(); + + vwin->setVisualParameters( (*valuesIt).c_str() ); + } + continue; // skip to next entry + } + + // entry is a normal entry - it should be "decoded" (setting base adress of component) + QString entry( ip.decodeEntry( *entIt ).c_str() ); for ( ; namesIt != paramNames.end(); ++namesIt, ++valuesIt ) { std::string viewerType = ::getParam( *namesIt, ViewerType ); @@ -1885,12 +1841,17 @@ void VisuGUI_Module::restoreVisualParameters(int savePoint) if ( !ok ) // bad conversion of view index to integer continue; + cout << " -- " << viewerType << ": entry = " << entry.latin1() << ", paramName = " << paramName << endl; + if ( viewerType == SVTK_Viewer::Type().latin1() || viewerType == VVTK_Viewer::Type().latin1() ) { - - //cout << "--SVTK parameter: entry = " << entry.latin1() << ", paramName = " << paramName << endl; + + // used as inner map key for locating the actor. + QString viewerTypeIndex = viewerType + QString::number( viewIndex ); if ( paramName == "Visibility" && displayer() ) { + // if VVTK, then we must create viewer first, because + QPtrList lst; getApp()->viewManagers( viewerType, lst ); @@ -1905,19 +1866,19 @@ void VisuGUI_Module::restoreVisualParameters(int savePoint) // vtkView->Repaint(); // store displayed actor so setting of color, opacity, etc. will be much faster - QMap viewActorMap; + QMap viewActorMap; if ( vtkActors.contains( entry ) ) viewActorMap = vtkActors[ entry ]; - viewActorMap[ viewIndex ] = getActor( entry, vtkView ); + viewActorMap[ viewerTypeIndex ] = getActor( entry, vtkView ); vtkActors[ entry ] = viewActorMap; } } else { // the rest properties "work" with VISU_Actor, so we initialize it at first VISU_Actor* vActor = 0; if ( vtkActors.contains( entry ) ) { - QMap viewActorMap = vtkActors[ entry ]; - if ( viewActorMap.contains( viewIndex ) ) - vActor = viewActorMap[ viewIndex ]; + QMap viewActorMap = vtkActors[ entry ]; + if ( viewActorMap.contains( viewerTypeIndex ) ) + vActor = viewActorMap[ viewerTypeIndex ]; } if ( !vActor ) continue; @@ -1969,13 +1930,10 @@ void VisuGUI_Module::restoreVisualParameters(int savePoint) vActor->GetPrs3d()->AddClippingPlane( plane ); } } - } // else .. - } // if SVTK - else if ( viewerType == SPlot2d_Viewer::Type().latin1() ) { - //cout << "--Plot2d parameter: entry = " << entry.latin1() << ", paramName = " << paramName << endl; + else if ( viewerType == SPlot2d_Viewer::Type().latin1() ) { if ( paramName == "Visibility" && displayer() ) { QPtrList lst; @@ -2013,5 +1971,21 @@ void VisuGUI_Module::restoreVisualParameters(int savePoint) plotView->getViewFrame()->Repaint(); } } // ] end of update views + + // if active Gauss Viewer is set ( != -1) then raise the gauss view window. + bool ok; + QString activeGaussViewerStr = ip.getProperty( "ActiveGaussViewer" ).c_str(); + int activeGaussViewer = activeGaussViewerStr.toInt( &ok ); + if ( ok && activeGaussViewer != -1 ) { + lst.clear(); + getApp()->viewManagers( VVTK_Viewer::Type(), lst ); + if ( activeGaussViewer >= 0 && activeGaussViewer < lst.count() ) { + SUIT_ViewWindow* activeView = lst.at( activeGaussViewer )->getActiveView(); + if ( activeView ) { + activeView->setActiveWindow(); + activeView->setFocus(); + } + } + } } diff --git a/src/VISUGUI/VisuGUI_Module.h b/src/VISUGUI/VisuGUI_Module.h index 37360257..d0c371b4 100644 --- a/src/VISUGUI/VisuGUI_Module.h +++ b/src/VISUGUI/VisuGUI_Module.h @@ -24,7 +24,6 @@ // File : VisuGUI_Module.h // Author : // Module : VISU -// $Header$ #ifndef VisuGUI_Module_HeaderFile #define VisuGUI_Module_HeaderFile @@ -92,7 +91,6 @@ public: void restoreVisualParameters(int savePoint); - public slots: //! Reimplemented method of the module deactivation. virtual @@ -155,26 +153,6 @@ protected slots: void OnEditGaussPoints(); - //! Reimplemented method of the Gauss Points displaying. - virtual - void - OnDisplayPrs(); - - //! Reimplemented method of the Gauss Points displaying only. - virtual - void - OnDisplayOnlyPrs(); - - //! Reimplemented method of the Gauss Points full erasing. - virtual - void - OnEraseAll(); - - //! Reimplemented method of the Gauss Points erasing. - virtual - void - OnErasePrs(); - //! Virtual method of saving configuration. virtual void diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx index a7935632..04ba4334 100644 --- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx +++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx @@ -30,12 +30,14 @@ #include "VisuGUI.h" #include "VisuGUI_Tools.h" +#include "VisuGUI_ViewTools.h" #include "VISU_ViewManager_i.hh" #include "VISU_Plot3DPL.hxx" -#include "SALOME_Actor.h" #include "SVTK_ViewWindow.h" + +#include "SALOME_Actor.h" #include "SUIT_Desktop.h" #include @@ -127,7 +129,7 @@ class TPlane : public SALOME_Actor //======================================================================= VisuGUI_Plot3DPane::VisuGUI_Plot3DPane (QWidget* parent) : QVBox(parent), myInitFromPrs(false), myPreviewActor(NULL), - myViewWindow(VISU::GetViewWindow()), myPrs(NULL), myPipeCopy(NULL) + myViewWindow(VISU::GetActiveViewWindow()), myPrs(NULL), myPipeCopy(NULL) { layout()->setAlignment(Qt::AlignTop); setSpacing(6); diff --git a/src/VISUGUI/VisuGUI_PopupTools.cxx b/src/VISUGUI/VisuGUI_PopupTools.cxx index b4ca7c20..68299777 100644 --- a/src/VISUGUI/VisuGUI_PopupTools.cxx +++ b/src/VISUGUI/VisuGUI_PopupTools.cxx @@ -26,15 +26,17 @@ // Module : VISU #include "VisuGUI_PopupTools.h" + #include "VisuGUI_ViewTools.h" #include "VisuGUI_Tools.h" -#include "SalomeApp_Study.h" -#include "LightApp_Study.h" + +#include "VISU_Result_i.hh" #include "VISU_Actor.h" #include "VISU_ScalarMapAct.h" -#include "VISU_Result_i.hh" + #include "SalomeApp_Study.h" +#include "LightApp_Study.h" using namespace VISU; @@ -211,10 +213,10 @@ QString VisuGUI_Selection::representation( const int ind ) const { QString aResStr; - if ( SVTK_ViewWindow* aView = GetViewWindow( myModule ) ){ - if ( VISU_Actor* anVISUActor = FindActor( aView, entry( ind ).latin1() ) ){ + if (SVTK_ViewWindow* aView = GetActiveViewWindow(myModule)) { + if (VISU_Actor* anVISUActor = FindActor(aView, entry(ind).latin1())) { int aRepresent = anVISUActor->GetRepresentation(); - switch ( aRepresent ){ + switch (aRepresent) { ENUM2STRING( aResStr, VISU::POINT ); ENUM2STRING( aResStr, VISU::WIREFRAME ); ENUM2STRING( aResStr, VISU::SHADED ); @@ -278,8 +280,8 @@ namespace const QString& theEntry) { typedef typename TViewer::TViewWindow TViewWindow; - if(TViewWindow* aViewWindow = GetViewWindow(theModule)) - if(VISU_Actor* anActor = FindActor(aViewWindow,theEntry.latin1())) + if (TViewWindow* aViewWindow = GetActiveViewWindow(theModule)) + if (VISU_Actor* anActor = FindActor(aViewWindow,theEntry.latin1())) return anActor->GetVisibility() ? "true" : "false"; return QString(); @@ -315,7 +317,7 @@ QString VisuGUI_Selection::isShrunk( const int ind ) const { QString aResStr; - if ( SVTK_ViewWindow* aView = GetViewWindow( myModule ) ) + if ( SVTK_ViewWindow* aView = GetActiveViewWindow(myModule) ) if ( VISU_Actor* anVISUActor = FindActor( aView, entry( ind ).latin1() ) ) if ( anVISUActor->IsShrunkable() ) aResStr = anVISUActor->IsShrunk() ? "1" : "0"; @@ -332,7 +334,7 @@ QString VisuGUI_Selection::isShading( const int ind ) const { QString aResStr; - if ( SVTK_ViewWindow* aView = GetViewWindow( myModule ) ) + if ( SVTK_ViewWindow* aView = GetActiveViewWindow(myModule) ) if ( VISU_Actor* anVISUActor = FindActor( aView, entry( ind ).latin1() ) ) if ( VISU_ScalarMapAct* anActor = dynamic_cast(anVISUActor) ) aResStr = anActor->IsShading() ? "1" : "0"; @@ -344,12 +346,12 @@ QString VisuGUI_Selection::isScalarMapAct( const int ind ) const { QString aResStr; - if ( SVTK_ViewWindow* aView = GetViewWindow( myModule ) ) + if ( SVTK_ViewWindow* aView = GetActiveViewWindow(myModule) ) if ( VISU_Actor* anVISUActor = FindActor( aView, entry( ind ).latin1() ) ) - { - VISU_ScalarMapAct* anActor = dynamic_cast(anVISUActor); - aResStr = anActor ? "1" : "0"; - } - + { + VISU_ScalarMapAct* anActor = dynamic_cast(anVISUActor); + aResStr = anActor ? "1" : "0"; + } + return aResStr; } diff --git a/src/VISUGUI/VisuGUI_Prs3dTools.h b/src/VISUGUI/VisuGUI_Prs3dTools.h index 7984a698..3fc626bb 100644 --- a/src/VISUGUI/VisuGUI_Prs3dTools.h +++ b/src/VISUGUI/VisuGUI_Prs3dTools.h @@ -24,7 +24,6 @@ // File : VisuGUI_Module.h // Author : // Module : VISU -// $Header$ #ifndef VisuGUI_Prs3dTools_HeaderFile #define VisuGUI_Prs3dTools_HeaderFile @@ -52,9 +51,10 @@ namespace VISU template void EditPrs3d(VisuGUI* theModule, - VISU::Prs3d_i* thePrs3d) + VISU::Prs3d_i* thePrs3d, + SVTK_ViewWindow* theViewWindow) { - if(TPrs3d_i* aPrs3d = dynamic_cast(thePrs3d)){ + if (TPrs3d_i* aPrs3d = dynamic_cast(thePrs3d)) { TDlg* aDlg = new TDlg (theModule); aDlg->initFromPrsObject(aPrs3d); if (runAndWait(aDlg,TIsDlgModal)) { @@ -65,18 +65,17 @@ namespace VISU try { aPrs3d->UpdateActors(); } catch (std::runtime_error& exc) { + aPrs3d->RemoveActors(); + INFOS(exc.what()); SUIT_MessageBox::warn1 (GetDesktop(theModule), QObject::tr("WRN_VISU"), QObject::tr("ERR_CANT_BUILD_PRESENTATION") + ": " + QObject::tr(exc.what()), QObject::tr("BUT_OK")); - - aPrs3d->RemoveActors(); } - typedef typename TViewer::TViewWindow TViewWindow; - if(TViewWindow* aViewWindow = GetViewWindow(theModule)){ - aViewWindow->getRenderer()->ResetCameraClippingRange(); - aViewWindow->Repaint(); + if (theViewWindow) { + theViewWindow->getRenderer()->ResetCameraClippingRange(); + theViewWindow->Repaint(); } // Optionally, create table and curves for cut lines QApplication::setOverrideCursor(Qt::waitCursor); @@ -93,10 +92,19 @@ namespace VISU template inline void - EditPrs3d(VisuGUI* theModule, - VISU::Prs3d_i* thePrs3d) + EditPrs3d(VisuGUI* theModule, + Handle(SALOME_InteractiveObject)& theIO, + VISU::Prs3d_i* thePrs3d, + SVTK_ViewWindow* theViewWindow = NULL) { - EditPrs3d(theModule,thePrs3d); + SVTK_ViewWindow* aViewWindow = theViewWindow; + if (!aViewWindow) + // Create SVTK_ViewWindow, if it does not exist + aViewWindow = GetViewWindow(theModule); + if (aViewWindow) { + EditPrs3d(theModule, thePrs3d, aViewWindow); + aViewWindow->highlight(theIO, 1); + } } //--------------------------------------------------------------- @@ -134,26 +142,30 @@ namespace VISU bool CreatePrs3d(VisuGUI* theModule, _PTR(SObject) theTimeStamp, - const Handle(SALOME_InteractiveObject)& theIO, - const bool theIsCreateView = false) + const Handle(SALOME_InteractiveObject)& theIO) { Storable::TRestoringMap aMap = getMapOfValue(theTimeStamp); bool isExist; QString aType = Storable::FindValue(aMap,"myType",&isExist); - if(!isExist || aType.toInt() != TTIMESTAMP ) + if (!isExist || aType.toInt() != TTIMESTAMP ) return false; QString aMeshName = Storable::FindValue(aMap,"myMeshName",&isExist).latin1(); QString anEntity = Storable::FindValue(aMap,"myEntityId",&isExist).latin1(); QString aFieldName = Storable::FindValue(aMap,"myFieldName",&isExist).latin1(); QString aTimeStampId = Storable::FindValue(aMap,"myTimeStampId",&isExist).latin1(); - // - int aPos = GetFreePositionOfDefaultScalarBar(theModule); - GetResourceMgr()->setValue("VISU","scalar_bar_position_num",aPos); - // + + // Create new TViewWindow instance, if it does not exist. + typedef typename TViewer::TViewWindow TViewWindow; + TViewWindow* aViewWindow = GetViewWindow(theModule); + + // Define free position for scalar bar. + int aPos = GetFreePositionOfDefaultScalarBar(theModule, aViewWindow); + GetResourceMgr()->setValue("VISU", "scalar_bar_position_num", aPos); + QApplication::setOverrideCursor(Qt::waitCursor); - + TPrs3d_i* aPrs3d = CreatePrs3d(theModule, theTimeStamp, @@ -161,16 +173,16 @@ namespace VISU (Entity)anEntity.toInt(), aFieldName.latin1(), aTimeStampId.toInt()); - + QApplication::restoreOverrideCursor(); - if(aPrs3d){ + if (aPrs3d) { SUIT_ResourceMgr* aResourceMgr = GetResourceMgr(); int aValue = aResourceMgr->integerValue("VISU","BuildDefaultPrs3d",0); - if(!aValue){ - if(TDlg* aDlg = new TDlg(theModule)){ // dialog box in creation mode + if (!aValue) { + if (TDlg* aDlg = new TDlg(theModule)) { // dialog box in creation mode aDlg->initFromPrsObject(aPrs3d); - if(runAndWait(aDlg,IsDlgModal) && (aDlg->storeToPrsObject(aPrs3d))) { + if (runAndWait(aDlg,IsDlgModal) && (aDlg->storeToPrsObject(aPrs3d))) { // Optionally, create table and curves for cut lines QApplication::setOverrideCursor(Qt::waitCursor); CreateCurves( theModule, @@ -187,57 +199,60 @@ namespace VISU } } } - PublishInView(theModule,aPrs3d,true,theIsCreateView); - AddScalarBarPosition(theModule,aPrs3d,aPos); + // Display created presentation. + if (aViewWindow) { + PublishInView(theModule, aPrs3d, aViewWindow, /*highlight = */true); + aViewWindow->onFitAll(); + + AddScalarBarPosition(theModule, aViewWindow, aPrs3d, aPos); + } return true; } return false; } - + //--------------------------------------------------------------- template inline void - CreatePrs3d(VisuGUI* theModule, - const bool theIsCreateView = true) + CreatePrs3d(VisuGUI* theModule) { if (CheckLock(GetCStudy(GetAppStudy(theModule)),GetDesktop(theModule))) return; - + _PTR(SObject) aTimeStampSObj; Handle(SALOME_InteractiveObject) anIO; - if(!CheckTimeStamp(theModule,aTimeStampSObj,&anIO)) + if (!CheckTimeStamp(theModule,aTimeStampSObj,&anIO)) return; - - if(!CreatePrs3d(theModule,aTimeStampSObj,anIO,theIsCreateView)) + + // Create new TViewWindow instance, if it does not exist. + typedef typename TViewer::TViewWindow TViewWindow; + if (!GetViewWindow(theModule)) return; - + + if (!CreatePrs3d(theModule,aTimeStampSObj,anIO)) + return; + theModule->application()->putInfo(QObject::tr("INF_DONE")); - - typedef typename TViewer::TViewWindow TView; - if(TView* aView = GetViewWindow(theModule,theIsCreateView)) - aView->onFitAll(); } template inline void - CreatePrs3d(VisuGUI* theModule, - const bool theIsCreateView = true) + CreatePrs3d(VisuGUI* theModule) { - if(SUIT_ViewManager* aViewManager = theModule->getApp()->activeViewManager()){ + if (SUIT_ViewManager* aViewManager = theModule->getApp()->activeViewManager()) { QString aType = aViewManager->getType(); - if(aType == SVTK_Viewer::Type()) - CreatePrs3d(theModule,theIsCreateView); - else if(aType == VVTK_Viewer::Type()) - CreatePrs3d(theModule,theIsCreateView); + if (aType == VVTK_Viewer::Type()) + CreatePrs3d(theModule); + else + CreatePrs3d(theModule); } } - } #endif diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx index ddc63e88..54c96b88 100644 --- a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx +++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx @@ -30,12 +30,10 @@ #include "VisuGUI.h" #include "VisuGUI_Tools.h" - -#include "SVTK_FontWidget.h" - -#include "SVTK_ViewWindow.h" +#include "VisuGUI_ViewTools.h" #include "SVTK_ViewWindow.h" +#include "SVTK_FontWidget.h" #include "VISUConfig.hh" #include "VISU_Convertor.hxx" @@ -62,8 +60,20 @@ using namespace std; VisuGUI_ScalarBarPane::VisuGUI_ScalarBarPane (QWidget * parent, bool SetPref): QVBox(parent), myPreviewActor(0) { - myVerX = 0.01; myVerY = 0.10; myVerW = 0.10; myVerH = 0.80; - myHorX = 0.20; myHorY = 0.01; myHorW = 0.60; myHorH = 0.12; + SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr(); + QString propertyName; + propertyName = QString("scalar_bar_vertical_"); + myVerX = aResourceMgr->doubleValue("VISU", propertyName + "x", myVerX); + myVerY = aResourceMgr->doubleValue("VISU", propertyName + "y", myVerY); + myVerW = aResourceMgr->doubleValue("VISU", propertyName + "width", myVerW); + myVerH = aResourceMgr->doubleValue("VISU", propertyName + "height",myVerH); + + propertyName = QString("scalar_bar_horizontal_"); + myHorX = aResourceMgr->doubleValue("VISU", propertyName + "x", myHorX); + myHorY = aResourceMgr->doubleValue("VISU", propertyName + "y", myHorY); + myHorW = aResourceMgr->doubleValue("VISU", propertyName + "width", myHorW); + myHorH = aResourceMgr->doubleValue("VISU", propertyName + "height",myHorH); + Imin = 0.0; Imax = 0.0; /*Fmin = 0.0; Fmax = 0.0;*/ Rmin = 0.0; Rmax = 0.0; myRangeMode = -1; @@ -622,7 +632,7 @@ void VisuGUI_ScalarBarPane::initFromPrsObject(VISU::ScalarMap_i* thePrs) { void VisuGUI_ScalarBarPane::updatePreview() { if (myPreviewCheck->isChecked()) { - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) { + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) { deleteScalarBar(); createScalarBar(); vf->Repaint(); @@ -634,11 +644,11 @@ void VisuGUI_ScalarBarPane::updatePreview() */ void VisuGUI_ScalarBarPane::createScalarBar() { - if (VISU::GetViewWindow() == NULL) return; + if (VISU::GetActiveViewWindow() == NULL) return; if (myPreviewActor != 0) return; if (myScalarMap == NULL) return; - if(!check()) return; + if (!check()) return; if ( myBusy ) return; @@ -725,7 +735,7 @@ void VisuGUI_ScalarBarPane::createScalarBar() aScalarBarActor->Modified(); - VISU::GetViewWindow()->AddActor(myPreviewActor); + VISU::GetActiveViewWindow()->AddActor(myPreviewActor); myBusy = false; } @@ -736,7 +746,7 @@ void VisuGUI_ScalarBarPane::deleteScalarBar() if ( myBusy ) return; if (myPreviewActor == 0) return; - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()){ + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()){ vf->RemoveActor(myPreviewActor); myPreviewActor->GetScalarBar()->VisibilityOff(); } @@ -1033,7 +1043,7 @@ void VisuGUI_ScalarBarPane::onTextPref() void VisuGUI_ScalarBarPane::onPreviewCheck (bool thePreview) { - if (SVTK_ViewWindow* vf = VISU::GetViewWindow()) { + if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow()) { if (thePreview) { createScalarBar(); } else { diff --git a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx index ccb1c573..5089932d 100644 --- a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx +++ b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx @@ -171,10 +171,45 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject (VISU::ScalarMapOnDe Handle(SALOME_InteractiveObject) aIO = selected.First(); if (aIO->hasEntry()) { _PTR(SObject) aSObject = aActiveStudy->FindObjectID(aIO->getEntry()); - aSObject = aSObject->GetFather(); - aSObject = aSObject->GetFather(); - aSObject = aSObject->GetFather(); - aSObject = aSObject->GetFather(); + _PTR(GenericAttribute) anTmpAttr; + if(aSObject->FindAttribute(anTmpAttr, "AttributeComment")){ + _PTR(AttributeComment) aTmpComment (anTmpAttr); + string aTmpComm = aTmpComment->Value(); + QString aTmpstrIn (aTmpComm.c_str()); + VISU::Storable::TRestoringMap aTmpaMap; + VISU::Storable::StrToMap(aTmpstrIn,aTmpaMap); + bool aTmpisExist; + VISU::VISUType aTmpType = (VISU::VISUType)VISU::Storable::FindValue(aTmpaMap,"myType",&aTmpisExist).toInt(); + switch(aTmpType){ + case VISU::TTIMESTAMP: + { + aSObject = aSObject->GetFather(); + aSObject = aSObject->GetFather(); + break; + } + case VISU::TFIELD: + { + _PTR(SObject) newSObject; + if(aSObject->ReferencedObject(newSObject)) aSObject = newSObject; + aSObject = aSObject->GetFather(); + break; + } + case VISU::TANIMATION: + { + _PTR(ChildIterator) aTmpIter = aActiveStudy->NewChildIterator(aSObject); + for (aTmpIter->InitEx(true); aTmpIter->More(); aTmpIter->Next()) { + _PTR(SObject) aTmpChildSObj = aTmpIter->Value(); + _PTR(SObject) newSObject; + if(aTmpChildSObj->ReferencedObject(newSObject)){ + aSObject = newSObject; + aSObject->GetFather(); + break; + } + } + break; + } + } + } mySelectionObj = aSObject; CORBA::Object_var anObject = VISU::ClientSObjectToObject(mySelectionObj); VISU::Result_var aResult; diff --git a/src/VISUGUI/VisuGUI_Selection.cxx b/src/VISUGUI/VisuGUI_Selection.cxx index 5bcf465f..371d50a5 100644 --- a/src/VISUGUI/VisuGUI_Selection.cxx +++ b/src/VISUGUI/VisuGUI_Selection.cxx @@ -30,6 +30,7 @@ #include "VisuGUI.h" #include "VisuGUI_Tools.h" +#include "VisuGUI_ViewTools.h" #include "VISU_Actor.h" #include "VISU_PrsObject_i.hh" @@ -49,7 +50,6 @@ #include "SALOME_ListIteratorOfListIO.hxx" #include "SVTK_ViewWindow.h" -#include "SVTK_ViewModel.h" #include "SVTK_Selector.h" #include "utilities.h" @@ -263,7 +263,7 @@ VisuGUI_SelectionDlg::VisuGUI_SelectionDlg (const SalomeApp_Module* theModule): // Activate Points pane myWidgetStack->raiseWidget(myPointsPane); - if(SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(myModule)) + if (SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(myModule)) aViewWindow->SetSelectionMode(NodeSelection); onSelectionEvent(); @@ -276,7 +276,7 @@ VisuGUI_SelectionDlg::~VisuGUI_SelectionDlg() void VisuGUI_SelectionDlg::onSelectionChange (int theId) { - SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(myModule); + SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(myModule); if (!aViewWindow) return; switch (theId) { @@ -300,11 +300,10 @@ void VisuGUI_SelectionDlg::onSelectionChange (int theId) void VisuGUI_SelectionDlg::closeEvent (QCloseEvent* theEvent) { - if( mySelectionDlg ) - { + if (mySelectionDlg) { mySelectionDlg = NULL; disconnect(mySelectionMgr,0,0,0); - if(SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(myModule)){ + if (SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(myModule)) { switch(aViewWindow->SelectionMode()){ case NodeSelection: case CellSelection: @@ -337,10 +336,10 @@ template QString getVector(TData* theData, int theId){ #define ABS(a) (a>=0)?a:-a void VisuGUI_SelectionDlg::onSelectionEvent() { - SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(myModule); + SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(myModule); if (!aViewWindow) return; - switch(aViewWindow->SelectionMode()){ + switch (aViewWindow->SelectionMode()) { case NodeSelection: case CellSelection: case ActorSelection: @@ -538,7 +537,7 @@ bool onIdEdit (const QString& theText, QLabel* theFieldName) { SalomeApp_Application* anApp = theModule->getApp(); - SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(theModule); + SVTK_ViewWindow* aViewWindow = VISU::GetActiveViewWindow(theModule); if (!aViewWindow) return false; SVTK_Selector* aSelector = aViewWindow->GetSelector(); diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx index dd40bb95..acec9415 100644 --- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx +++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx @@ -12,8 +12,10 @@ #include "VisuGUI.h" #include "VisuGUI_Tools.h" +#include "VisuGUI_ViewTools.h" #include "VisuGUI_DeformedShapeDlg.h" #include "VisuGUI_CutPlanesDlg.h" +#include "VisuGUI_CutLinesDlg.h" #include "VisuGUI_Plot3DDlg.h" #include "VisuGUI_VectorsDlg.h" #include "VisuGUI_IsoSurfacesDlg.h" @@ -67,8 +69,10 @@ #define MAXVAL 1e10 ArrangeDlg::ArrangeDlg(QWidget* theParent, VISU_TimeAnimation* theAnimator) - : QDialog(theParent, "ArrangeDlg", true, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), - myAnimator(theAnimator), myViewWindow(theAnimator->getViewer()) + : QDialog(theParent, "ArrangeDlg", true, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), + myAnimator(theAnimator), + myViewWindow(theAnimator->getViewer()) { myCurrent = 0; init(); @@ -561,12 +565,13 @@ enum PrsComboItem { TSCALARMAP_ITEM = 0, // VISU::TSCALARMAP TISOSURFACE_ITEM = 1, // VISU::TISOSURFACE TCUTPLANES_ITEM = 2, // VISU::TCUTPLANES - TPLOT3D_ITEM = 3, // VISU::TPLOT3D - TDEFORMEDSHAPE_ITEM = 4, // VISU::TDEFORMEDSHAPE - TVECTORS_ITEM = 5, // VISU::TVECTORS - TSTREAMLINES_ITEM = 6, // VISU::TSTREAMLINES - TGAUSSPOINTS_ITEM = 7, // VISU::TGAUSSPOINTS - TSCALARMAPONDEFORMEDSHAPE_ITEM = 8 // VISU::TSCALARMAPONDEFORMEDSHAPE + TCUTLINES_ITEM = 3, // VISU::TCUTLINES + TPLOT3D_ITEM = 4, // VISU::TPLOT3D + TDEFORMEDSHAPE_ITEM = 5, // VISU::TDEFORMEDSHAPE + TVECTORS_ITEM = 6, // VISU::TVECTORS + TSTREAMLINES_ITEM = 7, // VISU::TSTREAMLINES + TGAUSSPOINTS_ITEM = 8, // VISU::TGAUSSPOINTS + TSCALARMAPONDEFORMEDSHAPE_ITEM = 9 // VISU::TSCALARMAPONDEFORMEDSHAPE }; //------------------------------------------------------------------------ @@ -590,34 +595,37 @@ void SetupDlg::onFieldChange (int theIndex) myTypeId2ComboId[TCUTPLANES_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TCUTPLANES_ITEM);; - myTypeCombo->insertItem("Plot 3D"); // item 3 + myTypeCombo->insertItem("Cut Lines"); // item 3 + myTypeId2ComboId[TCUTLINES_ITEM] = myComboId2TypeId.size(); + myComboId2TypeId.push_back(TCUTLINES_ITEM);; + + myTypeCombo->insertItem("Plot 3D"); // item 4 myTypeId2ComboId[TPLOT3D_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TPLOT3D_ITEM);; _PTR(SObject) aSObject = aData.myField; long aNumComp = VISU::getValue(aSObject, "myNumComponent").toLong(); if (aNumComp > 1) { - myTypeCombo->insertItem("Deformed Shape"); // item 4 + myTypeCombo->insertItem("Deformed Shape"); // item 5 myTypeId2ComboId[TDEFORMEDSHAPE_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TDEFORMEDSHAPE_ITEM);; - myTypeCombo->insertItem("Vectors"); // item 5 + myTypeCombo->insertItem("Vectors"); // item 6 myTypeId2ComboId[TVECTORS_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TVECTORS_ITEM);; - myTypeCombo->insertItem("Stream Lines"); // item 6 + myTypeCombo->insertItem("Stream Lines"); // item 7 myTypeId2ComboId[TSTREAMLINES_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TSTREAMLINES_ITEM);; - myTypeCombo->insertItem("Scalar map on Deformed shape"); // item 8 + myTypeCombo->insertItem("Scalar map on Deformed shape"); // item 9 myTypeId2ComboId[TSCALARMAPONDEFORMEDSHAPE_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TSCALARMAPONDEFORMEDSHAPE_ITEM);; - } long anEntityId = VISU::getValue(aSObject, "myEntityId").toLong(); if(anEntityId == VISU::CELL){ - myTypeCombo->insertItem("Gauss Points"); // item 7 + myTypeCombo->insertItem("Gauss Points"); // item 8 myTypeId2ComboId[TGAUSSPOINTS_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TGAUSSPOINTS_ITEM);; } @@ -632,6 +640,9 @@ void SetupDlg::onFieldChange (int theIndex) case VISU::TCUTPLANES: //Cut Planes myTypeCombo->setCurrentItem(myTypeId2ComboId[TCUTPLANES_ITEM]); break; + case VISU::TCUTLINES: //Cut Lines + myTypeCombo->setCurrentItem(myTypeId2ComboId[TCUTLINES_ITEM]); + break; case VISU::TPLOT3D: //Plot 3D myTypeCombo->setCurrentItem(myTypeId2ComboId[TPLOT3D_ITEM]); break; @@ -639,7 +650,7 @@ void SetupDlg::onFieldChange (int theIndex) myTypeCombo->setCurrentItem(myTypeId2ComboId[TDEFORMEDSHAPE_ITEM]); break; case VISU::TSCALARMAPONDEFORMEDSHAPE: //Scalar Map on Deformed Shape - myTypeCombo->setCurrentItem(TSCALARMAPONDEFORMEDSHAPE_ITEM); + myTypeCombo->setCurrentItem(myTypeId2ComboId[TSCALARMAPONDEFORMEDSHAPE_ITEM]); break; case VISU::TVECTORS: //Vectors myTypeCombo->setCurrentItem(myTypeId2ComboId[TVECTORS_ITEM]); @@ -669,6 +680,9 @@ void SetupDlg::onTypeChanged (int theIndex) case TCUTPLANES_ITEM: //Cut Planes aData.myPrsType = VISU::TCUTPLANES; break; + case TCUTLINES_ITEM: //Cut Lines + aData.myPrsType = VISU::TCUTLINES; + break; case TPLOT3D_ITEM: //Plot 3D aData.myPrsType = VISU::TPLOT3D; break; @@ -733,6 +747,10 @@ void SetupDlg::onPreferencesDlg() c.suspend(); EditPrs(myModule,aData); break; + case TCUTLINES_ITEM: //Cut Lines + c.suspend(); + EditPrs(myModule,aData); + break; case TPLOT3D_ITEM: //Plot 3D c.suspend(); EditPrs(myModule,aData); @@ -955,7 +973,7 @@ VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg (VisuGUI* theModule, _PTR(Stu myAnimator = new VISU_TimeAnimation (theStudy); myAnimator->setSpeed(1); - myAnimator->setViewer(VISU::GetViewWindow(theModule)); + myAnimator->setViewer(VISU::GetActiveViewWindow(theModule)); connect(myAnimator, SIGNAL(frameChanged(long, double)), this, SLOT(onExecution(long, double))); connect(myAnimator, SIGNAL(stopped()), this, SLOT(onStop())); diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx index 978a4c24..90f7dc2c 100644 --- a/src/VISUGUI/VisuGUI_Tools.cxx +++ b/src/VISUGUI/VisuGUI_Tools.cxx @@ -28,6 +28,9 @@ #include "VisuGUI_Tools.h" +#include "VisuGUI.h" +#include "VisuGUI_ViewTools.h" + #include "VISU_Gen_i.hh" #include "VISU_Prs3d_i.hh" #include "VISU_Result_i.hh" @@ -42,15 +45,15 @@ #include "SalomeApp_Study.h" #include "SalomeApp_Application.h" -#include "OB_Browser.h" #include "LightApp_DataObject.h" #include "LightApp_SelectionMgr.h" +#include "OB_Browser.h" + #include "SALOME_ListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx" #include "SVTK_ViewWindow.h" -#include "SVTK_ViewModel.h" #include "SVTK_Functor.h" #include "VTKViewer_Algorithm.h" @@ -61,8 +64,6 @@ #include "SUIT_Session.h" #include "SUIT_MessageBox.h" -#include "VisuGUI.h" - #include #include @@ -421,49 +422,6 @@ namespace VISU return true; } - // Display/Erase - - void - ErasePrs (const SalomeApp_Module* theModule, - CORBA::Object_ptr theObject, bool theUpdate) - { - if (!CORBA::is_nil(theObject)) { - VISU::Base_var aBase = VISU::Base::_narrow(theObject); - if (CORBA::is_nil(aBase)) return; - VISU::VISUType aType = aBase->GetType(); - switch (aType) { - case VISU::TCURVE: - { - if (VISU::Curve_i* aCurve = dynamic_cast(VISU::GetServant(aBase).in())) - PlotCurve(theModule, aCurve, VISU::eErase ); - break; - } - case VISU::TCONTAINER: - { - if (VISU::Container_i* aContainer = dynamic_cast(VISU::GetServant(aBase).in())) - PlotContainer(theModule, aContainer, VISU::eErase ); - break; - } - case VISU::TTABLE: - { - if (VISU::Table_i* aTable = dynamic_cast(VISU::GetServant(aBase).in())) - PlotTable(theModule, aTable, VISU::eErase ); - break; - } - default: - { - if (VISU::Prs3d_i* aPrsObject = dynamic_cast(VISU::GetServant(aBase).in())) { - ErasePrs3d(theModule, aPrsObject); - if (theUpdate) { - if (SVTK_ViewWindow* vw = GetViewWindow(theModule)) - vw->Repaint(); - } - } - } - } // switch (aType) - } - } - void DeleteSObject(VisuGUI* theModule, _PTR(Study) theStudy, @@ -472,16 +430,13 @@ namespace VISU _PTR(ChildIterator) aChildIter = theStudy->NewChildIterator(theSObject); for (aChildIter->InitEx(true); aChildIter->More(); aChildIter->Next()) { _PTR(SObject) aChildSObject = aChildIter->Value(); - CORBA::Object_var aChildObj = VISU::ClientSObjectToObject(aChildSObject); - RemoveScalarBarPosition(theModule,aChildObj); - ErasePrs(theModule, aChildObj); + ErasePrs(theModule, aChildObj, /*repaint_view_window = */false); } CORBA::Object_var anObj = VISU::ClientSObjectToObject(theSObject); if (!CORBA::is_nil(anObj)) { - RemoveScalarBarPosition(theModule,anObj); - ErasePrs(theModule, anObj); + ErasePrs(theModule, anObj, /*repaint_view_window = */true); VISU::RemovableObject_var aRemovableObject = VISU::RemovableObject::_narrow(anObj); if (!CORBA::is_nil(aRemovableObject)) { @@ -506,19 +461,10 @@ namespace VISU if (CheckLock(GetCStudy(GetAppStudy(theModule)),GetDesktop(theModule))) return; - RemoveScalarBarPosition(theModule,thePrs); - thePrs->RemoveFromStudy(); - } + SVTK_ViewWindow* vw = GetActiveViewWindow(theModule); + RemoveScalarBarPosition(theModule, vw, thePrs); - void - ErasePrs3d(const SalomeApp_Module* theModule, - VISU::Prs3d_i* thePrs) - { - if ( SVTK_ViewWindow* vw = GetViewWindow( theModule ) ){ - if (VISU_Actor* anVISUActor = FindActor( vw, thePrs )) { - anVISUActor->VisibilityOff(); - } - } + thePrs->RemoveFromStudy(); } // Presentation management @@ -527,8 +473,8 @@ namespace VISU ChangeRepresentation (const SalomeApp_Module* theModule, VISU::PresentationType theType) { - SVTK_ViewWindow* vw = GetViewWindow( theModule, false ); - if( !vw ) + SVTK_ViewWindow* vw = GetActiveViewWindow(theModule); + if (!vw) return; Handle(SALOME_InteractiveObject) anIO; @@ -563,17 +509,15 @@ namespace VISU } } } - + void SetShading ( const SalomeApp_Module* theModule, bool theOn ) { - SUIT_ViewWindow* aView = GetActiveView(theModule, SVTK_Viewer::Type()); - if (!aView) return; - SVTK_ViewWindow* vw = dynamic_cast( aView ); - if( !vw ) + SVTK_ViewWindow* vw = GetActiveViewWindow(theModule); + if (!vw) return; - + Handle(SALOME_InteractiveObject) anIO; CORBA::Object_var anObject = GetSelectedObj(theModule, &anIO); if (CORBA::is_nil(anObject)) return; @@ -654,167 +598,30 @@ namespace VISU return dynamic_cast(VISU::GetServant(anObject).in()); } - // Views - - SUIT_ViewWindow* GetActiveView(const SalomeApp_Module* theModule, QString theType) - { - if(SalomeApp_Application* anApp = theModule->getApp()){ - if(SUIT_ViewManager* aViewManager = anApp->activeViewManager()){ - if (!theType.isNull()) { - if (aViewManager->getType() != theType) - return 0; - } - return aViewManager->getActiveView(); - } - } - return 0; - } - // VTK View - TViewWindows - GetViews(const SalomeApp_Module* theModule) - { - TViewWindows aViewWindows; - if(SalomeApp_Application* anApp = theModule->getApp()){ - ViewManagerList aViewManagerList; - anApp->viewManagers(SVTK_Viewer::Type(),aViewManagerList); - QPtrListIterator anIter(aViewManagerList); - while(SUIT_ViewManager* aViewManager = anIter.current()){ - QPtrVector aViews = aViewManager->getViews(); - for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){ - if(SUIT_ViewWindow* aViewWindow = aViews.at(i)) - if(SVTK_ViewWindow* aView = dynamic_cast(aViewWindow)) - aViewWindows.push_back(aView); - } - ++anIter; - } - } - return aViewWindows; - } - - SVTK_ViewWindow* - GetViewWindow( const SalomeApp_Module* theModule, const bool theCreate ) - { - if (SalomeApp_Application* anApp = theModule->getApp()) - { - SVTK_ViewWindow* wnd = dynamic_cast(anApp->desktop()->activeWindow()); - if( wnd ) - return wnd; - else - { - SUIT_ViewManager* aViewManager = anApp->getViewManager( SVTK_Viewer::Type(), theCreate ); - return aViewManager ? dynamic_cast( aViewManager->getActiveView() ) : 0; - } - } - return NULL; - } - - /*SVTK_ViewWindow* - GetViewWindow(const SalomeApp_Module* theModule, const bool theCreate ) - { - if (SalomeApp_Application* anApp = theModule->getApp()) - { - SVTK_ViewWindow* wnd = dynamic_cast(anApp->desktop()->activeWindow()); - if( wnd ) - return wnd; - else - { - if(SUIT_ViewManager* aViewManager = anApp->getViewManager( SVTK_Viewer::Type(), theCreate )) - return dynamic_cast( aViewManager->getActiveView() ); - } - } - return NULL; - }*/ - - - SVTK_ViewWindow* - GetViewWindow() - { - SalomeApp_Application* anApp = dynamic_cast - (SUIT_Session::session()->activeApplication()); - if (anApp) { - if (SUIT_ViewManager* aViewManager = anApp->activeViewManager()) { - if (aViewManager->getType() == SVTK_Viewer::Type()) { - if (SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView()) { - return dynamic_cast(aViewWindow); - } - } - } - } - return NULL; - } - VISU_Actor* - PublishInView(const SalomeApp_Module* theModule, - VISU::Prs3d_i* thePrs) + PublishMeshInView(const SalomeApp_Module* theModule, + VISU::Prs3d_i* thePrs, + SVTK_ViewWindow* theViewWindow) { VISU_Actor* aActor = NULL; - if(!thePrs) + if (!thePrs || !theViewWindow) return aActor; - if(SVTK_ViewWindow* aView = GetViewWindow(theModule)){ - QApplication::setOverrideCursor( Qt::waitCursor ); - try{ - if(aActor = thePrs->CreateActor()) - aView->AddActor(aActor); - }catch(std::exception& exc){ - SUIT_MessageBox::warn1 - (GetDesktop(theModule), QObject::tr("WRN_VISU"), - QObject::tr("ERR_CANT_CREATE_ACTOR") + ": " + QObject::tr(exc.what()), - QObject::tr("BUT_OK")); - } - QApplication::restoreOverrideCursor(); - } - return aActor; - } - VISU_Actor* - UpdateViewer(const SalomeApp_Module* theModule, - VISU::Prs3d_i* thePrs, - bool theDispOnly) - { - SVTK_ViewWindow* vw = GetViewWindow( theModule ); - if (!vw) return NULL; - - vtkRenderer *aRen = vw->getRenderer(); - vtkActorCollection *anActColl = aRen->GetActors(); - anActColl->InitTraversal(); - - vtkActor *anActor; - VISU_Actor* anVISUActor = NULL; - VISU_Actor* aResActor = NULL; - while(vtkActor *anActor = anActColl->GetNextActor()){ - anVISUActor = VISU_Actor::SafeDownCast(anActor); - if(anVISUActor){ - VISU::Prs3d_i* aPrs = anVISUActor->GetPrs3d(); - if(aPrs == NULL) continue; - if (thePrs == aPrs) { - try { - aResActor = anVISUActor; - thePrs->UpdateActor(aResActor); - aResActor->VisibilityOn(); - } catch (std::runtime_error& exc) { - aResActor->VisibilityOff(); - INFOS(exc.what()); - SUIT_MessageBox::warn1 - (GetDesktop(theModule), QObject::tr("WRN_VISU"), - QObject::tr("ERR_CANT_CREATE_ACTOR") + ": " + QObject::tr(exc.what()), - QObject::tr("BUT_OK")); - } - } else if (theDispOnly) { - anVISUActor->VisibilityOff(); - } else { - } - } else if (theDispOnly && anActor->GetVisibility()) { - anActor->VisibilityOff(); - } else { - } + QApplication::setOverrideCursor( Qt::waitCursor ); + try { + if (aActor = thePrs->CreateActor()) + theViewWindow->AddActor(aActor); + } catch(std::exception& exc) { + SUIT_MessageBox::warn1 + (GetDesktop(theModule), QObject::tr("WRN_VISU"), + QObject::tr("ERR_CANT_CREATE_ACTOR") + ": " + QObject::tr(exc.what()), + QObject::tr("BUT_OK")); } - if (aResActor) - return aResActor; + QApplication::restoreOverrideCursor(); - //anVISUActor = PublishInView( theModule, thePrs ); - return anVISUActor; + return aActor; } void @@ -1196,7 +1003,8 @@ namespace VISU // Others void CreateMesh (const SalomeApp_Module* theModule, - const Handle(SALOME_InteractiveObject)& theIO) + const Handle(SALOME_InteractiveObject)& theIO, + SVTK_ViewWindow* theViewWindow) { _PTR(Study) aStudy = GetCStudy(GetAppStudy(theModule)); //if (CheckLock(aStudy)) @@ -1243,7 +1051,7 @@ namespace VISU timer.Show(); #endif - QApplication::restoreOverrideCursor(); + //QApplication::restoreOverrideCursor(); VISU::Mesh_i* pPresent = NULL; if (!CORBA::is_nil(aMesh)) pPresent = dynamic_cast(VISU::GetServant(aMesh).in()); @@ -1255,23 +1063,19 @@ namespace VISU return; } - if (SVTK_ViewWindow* aView = GetViewWindow(theModule)) { + if (theViewWindow) { try { #ifdef CHECKTIME Utils_Timer timer; timer.Start(); #endif - PublishInView(theModule, pPresent); - //aView->onFitAll(); - SetFitAll(aView); + PublishMeshInView(theModule, pPresent, theViewWindow); + SetFitAll(theViewWindow); #ifdef CHECKTIME timer.Stop(); MESSAGE("VisuGUI::CreateMesh() - DISPLAY MESH"); timer.Show(); #endif - theModule->application()->putInfo(QObject::tr("INF_DONE")); - // Make "Save" button active - theModule->getApp()->updateActions(); } catch (std::runtime_error& exc) { INFOS(exc.what()); SUIT_MessageBox::warn1 @@ -1280,6 +1084,10 @@ namespace VISU QObject::tr("BUT_OK")); } } + + theModule->application()->putInfo(QObject::tr("INF_DONE")); + // Make "Save" button active + theModule->getApp()->updateActions(); } // ======================================================================================== @@ -1411,58 +1219,45 @@ namespace VISU } return aList; } - - int GetFreePositionOfDefaultScalarBar(VisuGUI* theModule){ + + int GetFreePositionOfDefaultScalarBar(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow) + { int minIndx = 1; std::set aIndexes; - SVTK_ViewWindow* vw = GetViewWindow(theModule); TViewToPrs3d aMap = theModule->getScalarBarsMap(); - TViewToPrs3d::const_iterator aViewToPrsIter = aMap.find(vw); - if (aViewToPrsIter != aMap.end()){ + TViewToPrs3d::const_iterator aViewToPrsIter = aMap.find(theViewWindow); + if (aViewToPrsIter != aMap.end()) { TSetPrs3d::const_iterator aPrsIter = (aViewToPrsIter->second).begin(); - for(;aPrsIter!=(aViewToPrsIter->second).end();aPrsIter++){ + for (; aPrsIter != (aViewToPrsIter->second).end(); aPrsIter++) { aIndexes.insert((*aPrsIter).second); } } std::set::const_iterator aIter = aIndexes.begin(); - for (int i=1,length=aIndexes.size(); i <= length; i++){ + for (int i = 1,length = aIndexes.size(); i <= length; i++) { std::set::const_iterator aIter = aIndexes.find(i); - if(aIter==aIndexes.end()){minIndx = i;break;} + if (aIter == aIndexes.end()) { minIndx = i; break; } else minIndx = i + 1; - } return minIndx; } - - void AddScalarBarPosition(VisuGUI* theModule,VISU::Prs3d_i* thePrs3d, int pos){ - SVTK_ViewWindow* vw = GetViewWindow(theModule); + + void AddScalarBarPosition (VisuGUI* theModule, SVTK_ViewWindow* theViewWindow, + VISU::Prs3d_i* thePrs3d, int pos) + { TViewToPrs3d& aMap = theModule->myScalarBarsMap; - TPrs3dToInd aPair; aPair.first=thePrs3d; aPair.second=pos; - aMap[vw].insert(aPair); + TPrs3dToInd aPair; aPair.first = thePrs3d; aPair.second = pos; + aMap[theViewWindow].insert(aPair); } - - void RemoveScalarBarPosition(VisuGUI* theModule,SVTK_ViewWindow* vw,VISU::Prs3d_i* thePrs3d){ + + void RemoveScalarBarPosition(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow, + VISU::Prs3d_i* thePrs3d) + { TViewToPrs3d& aMap = theModule->myScalarBarsMap; - TSetPrs3d::iterator aIter = aMap[vw].begin(); - for(;aIter!=aMap[vw].end();aIter++) - if((*aIter).first == thePrs3d){ - aMap[vw].erase(*aIter); + TSetPrs3d::iterator aIter = aMap[theViewWindow].begin(); + for (; aIter != aMap[theViewWindow].end(); aIter++) + if ((*aIter).first == thePrs3d) { + aMap[theViewWindow].erase(*aIter); return; } } - - void RemoveScalarBarPosition(VisuGUI* theModule,VISU::Prs3d_i* thePrs3d){ - SVTK_ViewWindow* vw = GetViewWindow(theModule); - RemoveScalarBarPosition(theModule,vw,thePrs3d); - } - - void RemoveScalarBarPosition(VisuGUI* theModule,CORBA::Object_ptr theObject){ - if (!CORBA::is_nil(theObject)) { - Base_var aBase = Base::_narrow(theObject); - if (CORBA::is_nil(aBase)) return; - if (VISU::Prs3d_i* aPrsObject = dynamic_cast(VISU::GetServant(aBase).in())){ - RemoveScalarBarPosition(theModule,aPrsObject); - } - } - } } diff --git a/src/VISUGUI/VisuGUI_Tools.h b/src/VISUGUI/VisuGUI_Tools.h index d514b4b3..af166ad6 100644 --- a/src/VISUGUI/VisuGUI_Tools.h +++ b/src/VISUGUI/VisuGUI_Tools.h @@ -98,18 +98,12 @@ namespace VISU { bool IsRemovableSelected(const SalomeApp_Module* theModule); - // Display/Erase - void ErasePrs(const SalomeApp_Module* theModule, - CORBA::Object_ptr theObject, - bool theUpdate = true); void DeleteSObject(VisuGUI* theModule, _PTR(Study) theStudy, _PTR(SObject) theSObject); void DeletePrs3d(VisuGUI* theModule, VISU::Prs3d_i* thePrs, const Handle(SALOME_InteractiveObject)& theIO); - void ErasePrs3d(const SalomeApp_Module* theModule, - VISU::Prs3d_i* thePrs); // Presentation management void ChangeRepresentation (const SalomeApp_Module* theModule, @@ -126,21 +120,11 @@ namespace VISU { VISU::Result_var& theResult); bool IsSObjectTable(_PTR(SObject) theSObject); - // Views - SUIT_ViewWindow* GetActiveView(const SalomeApp_Module* theModule, - QString theType = QString::null); - - // VTK View - TViewWindows GetViews(const SalomeApp_Module* theModule); - SVTK_ViewWindow* GetViewWindow(const SalomeApp_Module* theModule, - const bool theCreate = false ); - SVTK_ViewWindow* GetViewWindow(); - - VISU_Actor* PublishInView(const SalomeApp_Module* theModule, - VISU::Prs3d_i* thePrs); - VISU_Actor* UpdateViewer(const SalomeApp_Module* theModule, - VISU::Prs3d_i* thePrs, - bool theDispOnly = false); + /*! Display mesh presentation in given VTK view window + */ + VISU_Actor* PublishMeshInView(const SalomeApp_Module* theModule, + VISU::Prs3d_i* thePrs, + SVTK_ViewWindow* theViewWindow); /*! * \brief Repaint all SVTK view windows, where the given object is displayed. @@ -183,26 +167,32 @@ namespace VISU { void CreatePlot( SalomeApp_Module* theModule, _PTR(SObject) theSobj ); + /*! Display/Erase/Update a curve presentation. + * Parameter \a frame may be NULL, in this case there is only update without display/erase + */ void UpdateCurve( VISU::Curve_i*, Plot2d_ViewFrame* frame, SPlot2d_Curve*, int theDisplaying ); - //parameter frame may be 0, in this case there is only update without display/erase - // Others + /*! Create mesh presentation and display it in \a theViewWindow. + * If \a theViewWindow is NULL, no displaying will be done. + */ void CreateMesh (const SalomeApp_Module* theModule, - const Handle(SALOME_InteractiveObject)& theIO); + const Handle(SALOME_InteractiveObject)& theIO, + SVTK_ViewWindow* theViewWindow = NULL); + // Others std::vector GetPrs3dList (const SalomeApp_Module* theModule, const Handle(SALOME_InteractiveObject)& theIO); std::vector GetPrs3dList (const SalomeApp_Module* theModule, _PTR(SObject) theObject); - int GetFreePositionOfDefaultScalarBar(VisuGUI* theModule); - void AddScalarBarPosition(VisuGUI* theModule,VISU::Prs3d_i* thePrs3d, int pos); - void RemoveScalarBarPosition(VisuGUI* theModule,VISU::Prs3d_i* thePrs3d); - void RemoveScalarBarPosition(VisuGUI* theModule,SVTK_ViewWindow* vw,VISU::Prs3d_i* thePrs3d); - void RemoveScalarBarPosition(VisuGUI* theModule,CORBA::Object_ptr theObject); + int GetFreePositionOfDefaultScalarBar(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow); + void AddScalarBarPosition(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow, + VISU::Prs3d_i* thePrs3d, int pos); + void RemoveScalarBarPosition(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow, + VISU::Prs3d_i* thePrs3d); } #endif diff --git a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx index bf893f50..b9556c4c 100644 --- a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx +++ b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx @@ -66,7 +66,7 @@ VisuGUI_TransparencyDlg::VisuGUI_TransparencyDlg( VisuGUI* theModule, : QDialog( VISU::GetDesktop( theModule ), name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ), mySelectionMgr( VISU::GetSelectionMgr( theModule ) ), - myViewWindow( VISU::GetViewWindow( theModule ) ) + myViewWindow( VISU::GetActiveViewWindow(theModule) ) { if (!name) setName("VisuGUI_TransparencyDlg"); diff --git a/src/VISUGUI/VisuGUI_ViewTools.cxx b/src/VISUGUI/VisuGUI_ViewTools.cxx index 868ab606..601e2a17 100644 --- a/src/VISUGUI/VisuGUI_ViewTools.cxx +++ b/src/VISUGUI/VisuGUI_ViewTools.cxx @@ -37,37 +37,35 @@ namespace VISU { void ErasePrs(VisuGUI* theModule, - VISU::Base_ptr theBase, - bool thIsUpdate) + CORBA::Object_ptr theObject, + bool theDoRepaintVW) { - VISU::VISUType aType = theBase->GetType(); + if (CORBA::is_nil(theObject)) return; + VISU::Base_var aBase = VISU::Base::_narrow(theObject); + if (CORBA::is_nil(aBase)) return; + + VISU::VISUType aType = aBase->GetType(); switch (aType) { case VISU::TCURVE: { - if (VISU::Curve_i* aCurve = dynamic_cast(VISU::GetServant(theBase).in())) + if (VISU::Curve_i* aCurve = dynamic_cast(VISU::GetServant(aBase).in())) PlotCurve(theModule, aCurve, VISU::eErase ); break; } case VISU::TCONTAINER: { - if (VISU::Container_i* aContainer = dynamic_cast(VISU::GetServant(theBase).in())) + if (VISU::Container_i* aContainer = dynamic_cast(VISU::GetServant(aBase).in())) PlotContainer(theModule, aContainer, VISU::eErase ); break; } case VISU::TTABLE: { - if (VISU::Table_i* aTable = dynamic_cast(VISU::GetServant(theBase).in())) + if (VISU::Table_i* aTable = dynamic_cast(VISU::GetServant(aBase).in())) PlotTable(theModule, aTable, VISU::eErase ); break; } default: { - if(VISU::Prs3d_i* aPrsObject = dynamic_cast(VISU::GetServant(theBase).in())){ - if(aType == VISU::TGAUSSPOINTS) - ErasePrs3d(theModule,aPrsObject,thIsUpdate); - else if(SUIT_ViewManager* aViewManager = theModule->getApp()->activeViewManager()){ - QString aType = aViewManager->getType(); - if(aType == SVTK_Viewer::Type()) - ErasePrs3d(theModule,aPrsObject,thIsUpdate); - else if(aType == VVTK_Viewer::Type()) - ErasePrs3d(theModule,aPrsObject,thIsUpdate); - } + if (VISU::Prs3d_i* aPrsObject = dynamic_cast(VISU::GetServant(aBase).in())) { + SVTK_ViewWindow* vw = GetActiveViewWindow(theModule); + RemoveScalarBarPosition(theModule, vw, aPrsObject); + ErasePrs3d(theModule, aPrsObject, theDoRepaintVW); } }} // switch (aType) } diff --git a/src/VISUGUI/VisuGUI_ViewTools.h b/src/VISUGUI/VisuGUI_ViewTools.h index f10bf63e..bb28861a 100644 --- a/src/VISUGUI/VisuGUI_ViewTools.h +++ b/src/VISUGUI/VisuGUI_ViewTools.h @@ -30,34 +30,36 @@ #include "VisuGUI.h" -#include "SUIT_MessageBox.h" -#include "SUIT_ViewManager.h" -#include "SUIT_ViewWindow.h" +#include "VisuGUI_Tools.h" + +#include "VISU_Prs3d_i.hh" +#include "VISU_Table_i.hh" +#include "VISU_ViewManager_i.hh" + +#include "VISU_Actor.h" #include "SalomeApp_Module.h" #include "SalomeApp_Application.h" -#include "VISU_Prs3d_i.hh" - #include "VVTK_ViewModel.h" #include "VVTK_ViewWindow.h" +#include "SVTK_Functor.h" #include "SVTK_ViewModel.h" #include "SVTK_ViewWindow.h" -#include "VisuGUI_Tools.h" +#include "SPlot2d_ViewModel.h" + #include "VTKViewer_Algorithm.h" -#include "SVTK_Functor.h" -#include "VISU_Table_i.hh" -#include "VISU_ViewManager_i.hh" +#include "SUIT_Session.h" +#include "SUIT_MessageBox.h" +#include "SUIT_ViewManager.h" +#include "SUIT_ViewWindow.h" + #include "SALOME_ListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx" -#include "SPlot2d_ViewModel.h" - -#include "VISU_Actor.h" - #include #include @@ -65,17 +67,26 @@ class VVTK_Viewer; namespace VISU { - //--------------------------------------------------------------- + /*! Return active view window, if it instantiates TViewer::TViewWindow class, + * overwise find or create corresponding view window, make it active and return it. + * \note Active VVTK_ViewWindow can be returned by request GetViewWindow(), + * because VVTK_ViewWindow inherits SVTK_ViewWindow. + */ template inline typename TViewer::TViewWindow* - GetViewWindow(VisuGUI* theModule, - const bool theIsViewCreate = false) + GetViewWindow(VisuGUI* theModule) { - typedef typename TViewer::TViewWindow TView; - if(SUIT_ViewManager* aViewManager = theModule->getViewManager(TViewer::Type(),theIsViewCreate)){ - if(SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView()){ - if(TView* aView = dynamic_cast(aViewWindow)){ + typedef typename TViewer::TViewWindow TViewWindow; + if (SalomeApp_Application* anApp = theModule->getApp()) { + if (TViewWindow* aView = dynamic_cast(anApp->desktop()->activeWindow())) + return aView; + } + SUIT_ViewManager* aViewManager = + theModule->getViewManager(TViewer::Type(), /*create = */true); + if (aViewManager) { + if (SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView()) { + if (TViewWindow* aView = dynamic_cast(aViewWindow)) { aViewWindow->raise(); aViewWindow->setFocus(); return aView; @@ -85,30 +96,54 @@ namespace VISU return NULL; } + /*! Return active view window, if it instantiates TViewWindow class, overwise return NULL. + * \note Active VVTK_ViewWindow can be returned by request GetActiveViewWindow(), + * because VVTK_ViewWindow inherits SVTK_ViewWindow. + */ + template + inline + TViewWindow* + GetActiveViewWindow(const SalomeApp_Module* theModule = NULL) + { + SalomeApp_Application* anApp = NULL; + if (theModule) + anApp = theModule->getApp(); + else + anApp = dynamic_cast + (SUIT_Session::session()->activeApplication()); + + if (anApp) + if (SUIT_ViewManager* aViewManager = anApp->activeViewManager()) + if (SUIT_ViewWindow* aViewWindow = aViewManager->getActiveView()) + return dynamic_cast(aViewWindow); + + return NULL; + } + //--------------------------------------------------------------- - template inline VISU_Actor* PublishInView(VisuGUI* theModule, Prs3d_i* thePrs, - const bool theIsHighlight = false, - const bool theIsCreateView = false) + SVTK_ViewWindow* theViewWindow, + const bool theIsHighlight = false) { - typedef typename TViewer::TViewWindow TView; - if(TView* aView = GetViewWindow(theModule,theIsCreateView)){ + if (theViewWindow) { QApplication::setOverrideCursor( Qt::waitCursor ); try { - if(VISU_Actor* anActor = thePrs->CreateActor()){ - aView->AddActor(anActor); - if(theIsHighlight) - aView->highlight(anActor->getIO(),true); - aView->getRenderer()->ResetCameraClippingRange(); - aView->Repaint(); + if (VISU_Actor* anActor = thePrs->CreateActor()) { + theViewWindow->AddActor(anActor); + if (theIsHighlight) + theViewWindow->highlight(anActor->getIO(),true); + theViewWindow->getRenderer()->ResetCameraClippingRange(); + theViewWindow->Repaint(); QApplication::restoreOverrideCursor(); return anActor; } } catch(std::exception& exc) { + thePrs->RemoveActors(); + QApplication::restoreOverrideCursor(); INFOS(exc.what()); SUIT_MessageBox::warn1 @@ -122,56 +157,53 @@ namespace VISU //--------------------------------------------------------------- - template inline VISU_Actor* UpdateViewer(VisuGUI* theModule, VISU::Prs3d_i* thePrs, bool theDispOnly = false, - const bool theIsHighlight = false, - const bool theIsViewCreate = false) + const bool theIsHighlight = false) { - typedef typename TViewer::TViewWindow TView; - if(TView* aView = GetViewWindow(theModule,theIsViewCreate)){ - vtkRenderer *aRen = aView->getRenderer(); + if (SVTK_ViewWindow* aViewWindow = GetActiveViewWindow(theModule)) { + vtkRenderer *aRen = aViewWindow->getRenderer(); vtkActorCollection *anActColl = aRen->GetActors(); anActColl->InitTraversal(); VISU_Actor* aResActor = NULL; - while(vtkActor *anAct = anActColl->GetNextActor()){ - if(VISU_Actor* anActor = dynamic_cast(anAct)){ - if(VISU::Prs3d_i* aPrs3d = anActor->GetPrs3d()){ - if(thePrs == aPrs3d){ + bool isOk = true; + while (vtkActor *anAct = anActColl->GetNextActor()) { + if (VISU_Actor* anActor = dynamic_cast(anAct)) { + if (VISU::Prs3d_i* aPrs3d = anActor->GetPrs3d()) { + if (thePrs == aPrs3d) { try { + aResActor = anActor; thePrs->UpdateActors(); + aResActor->VisibilityOn(); } catch (std::runtime_error& exc) { + thePrs->RemoveActors(); + isOk = false; + INFOS(exc.what()); - QApplication::restoreOverrideCursor(); SUIT_MessageBox::warn1 (GetDesktop(theModule), QObject::tr("WRN_VISU"), QObject::tr("ERR_CANT_BUILD_PRESENTATION") + ": " + QObject::tr(exc.what()), QObject::tr("BUT_OK")); - - thePrs->RemoveActors(); - return NULL; } - aResActor = anActor; - aResActor->VisibilityOn(); - }else if(theDispOnly){ + } else if (theDispOnly) { anActor->VisibilityOff(); } - }else if(theDispOnly && anActor->GetVisibility()){ + } else if (theDispOnly && anActor->GetVisibility()) { anActor->VisibilityOff(); } } } - if(aResActor){ - if(theIsHighlight) - aView->highlight(aResActor->getIO(),true); - aView->getRenderer()->ResetCameraClippingRange(); - aView->Repaint(); + if (aResActor) { + if (theIsHighlight && isOk) + aViewWindow->highlight(aResActor->getIO(), true); + aViewWindow->getRenderer()->ResetCameraClippingRange(); + aViewWindow->Repaint(); return aResActor; } - return PublishInView(theModule,thePrs,theIsHighlight,theIsViewCreate); + return PublishInView(theModule, thePrs, aViewWindow, theIsHighlight); } return NULL; } @@ -184,14 +216,14 @@ namespace VISU OnEraseAll(VisuGUI* theModule) { typedef typename TViewer::TViewWindow TViewWindow; - if(TViewWindow* aViewWindow = GetViewWindow(theModule)){ + if (TViewWindow* aViewWindow = GetActiveViewWindow(theModule)) { aViewWindow->unHighlightAll(); - if(vtkRenderer *aRen = aViewWindow->getRenderer()){ + if (vtkRenderer *aRen = aViewWindow->getRenderer()) { vtkActorCollection *aCollection = aRen->GetActors(); aCollection->InitTraversal(); - while(vtkActor *anAct = aCollection->GetNextActor()){ - if(anAct->GetVisibility() > 0) - if(SALOME_Actor* anActor = dynamic_cast(anAct)){ + while (vtkActor *anAct = aCollection->GetNextActor()) { + if (anAct->GetVisibility() > 0) + if (SALOME_Actor* anActor = dynamic_cast(anAct)) { anActor->VisibilityOff(); } } @@ -199,57 +231,37 @@ namespace VISU } } } - + template<> inline void OnEraseAll(VisuGUI* theModule) { - if(SPlot2d_Viewer* aPlot2d = GetPlot2dViewer(theModule,false)) + if (SPlot2d_Viewer* aPlot2d = GetPlot2dViewer(theModule, false)) aPlot2d->EraseAll(); } //--------------------------------------------------------------- - template - inline - VISU_Actor* - FindActor(TVieweWindow* theViewWindow, - const char* theEntry) - { - using namespace SVTK; - if(vtkRenderer* aRenderer = theViewWindow->getRenderer()){ - if(vtkActorCollection* aCollection = aRenderer->GetActors()){ - if(VISU_Actor* anActor = Find(aCollection,TIsSameEntry(theEntry))){ - return anActor; - } - } - } - return NULL; - } - - template inline void ErasePrs3d(VisuGUI* theModule, VISU::Prs3d_i* thePrs, - const bool thIsUpdate = true) + const bool theDoRepaintVW = true) { - typedef typename TViewer::TViewWindow TViewWindow; - if(TViewWindow* aViewWindow = GetViewWindow(theModule)){ - if(VISU_Actor* anActor = FindActor(aViewWindow,thePrs)){ + if (SVTK_ViewWindow* aViewWindow = GetActiveViewWindow(theModule)) { + if (VISU_Actor* anActor = FindActor(aViewWindow, thePrs)) { anActor->VisibilityOff(); - if(thIsUpdate) + if (theDoRepaintVW) aViewWindow->Repaint(); } } } - void ErasePrs(VisuGUI* theModule, - VISU::Base_ptr theBase, - bool thIsUpdate); + CORBA::Object_ptr theObject, + bool theDoRepaintVW); } #endif diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in index 20168853..a8182da9 100644 --- a/src/VISU_I/Makefile.in +++ b/src/VISU_I/Makefile.in @@ -112,7 +112,7 @@ LDFLAGS += \ -L${GUI_ROOT_DIR}/lib/salome \ -L${MED_ROOT_DIR}/lib/salome -LIBS+= -lboost_signals-mt \ +LIBS+= -lboost_signals${BOOST_LIBTHREAD} \ -lSalomeHDFPersist \ -lSalomeGenericObj \ -lSalomeContainer \ diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc index ee879b6a..d1e4c58e 100644 --- a/src/VISU_I/VISUConfig.cc +++ b/src/VISU_I/VISUConfig.cc @@ -194,6 +194,16 @@ namespace VISU{ } + QString Storable::FindValue(const TRestoringMap& theMap, const string& theArg, const QString& theDefaultValue) + { + bool anIsFound = false; + QString aValue = FindValue(theMap,theArg,&anIsFound); + if(anIsFound) + return aValue; + return theDefaultValue; + } + + //=========================================================================== PortableServer::ServantBase_var GetServant(CORBA::Object_ptr theObject){ if(CORBA::is_nil(theObject)) return NULL; diff --git a/src/VISU_I/VISUConfig.hh b/src/VISU_I/VISUConfig.hh index 6ec9a2d0..3e835d71 100644 --- a/src/VISU_I/VISUConfig.hh +++ b/src/VISU_I/VISUConfig.hh @@ -124,6 +124,7 @@ namespace VISU static void Registry(const char* theComment, TStorableEngine theEngine); static Storable* Create(SALOMEDS::SObject_ptr, const std::string& thePrefix, const std::string& theString); static QString FindValue(const TRestoringMap& theMap, const std::string& theArg, bool* isFind = NULL); + static QString FindValue(const TRestoringMap& theMap, const std::string& theArg, const QString& theDefaultValue); static void StrToMap(const QString& theStr, VISU::Storable::TRestoringMap& theMap); static SALOMEDS::SObject_ptr GetResultSO(SALOMEDS::SObject_ptr theSObject); static void DataToStream(std::ostringstream& theStr, const QString& theName, const QString& theVal); diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index ff03f9f2..f4cdedbe 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -299,58 +299,69 @@ namespace VISU //=========================================================================== SALOMEDS::TMPFile* VISU_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, const char* theURL, - bool isMultiFile) + bool theIsMultiFile) { Mutex mt(myMutex); - string aDir = isMultiFile ? theURL : SALOMEDS_Tool::GetTmpDir(); - TCollection_AsciiString aTmpDir (const_cast(aDir.c_str())); + string aTmpDir = theURL; if(MYDEBUG) MESSAGE("VISU_Gen_i::Save - "<GetStudy(); - - //CORBA::Boolean anIsValidScript; - //Engines::TMPFile_var aDump = DumpPython(aStudy,false,anIsValidScript); + + typedef std::vector TFileNames; + TFileNames aFileNames; + TFileNames aFiles; - SALOMEDS::ChildIterator_var itBig = aStudy->NewChildIterator(theComponent); - for (; itBig->More(); itBig->Next()) { - SALOMEDS::SObject_var gotBranch = itBig->Value(); + SALOMEDS::Study_var aStudy = theComponent->GetStudy(); + SALOMEDS::ChildIterator_var anIter = aStudy->NewChildIterator(theComponent); + for (; anIter->More(); anIter->Next()) { + SALOMEDS::SObject_var gotBranch = anIter->Value(); CORBA::Object_var anObj = SObjectToObject(gotBranch); if(CORBA::is_nil(anObj)) continue; - if(Result_i* pResult = dynamic_cast(GetServant(anObj).in())){ - switch(pResult->GetCreationId()){ + if(Result_i* aResult = dynamic_cast(GetServant(anObj).in())){ + switch(aResult->GetCreationId()){ case Result_i::eImportFile: case Result_i::eCopyAndImportFile: { - const QFileInfo& aFileInfo = pResult->GetFileInfo(); - QString aPrefix(""); - if (isMultiFile) aPrefix = SALOMEDS_Tool::GetNameFromPath(aStudy->URL()).c_str(); - QString aFileName = aPrefix + "_" + (pResult->GetName()).c_str(); - static QString aCommand; - aCommand.sprintf("cp %s %s%s",aFileInfo.filePath().latin1(),aTmpDir.ToCString(),aFileName.latin1()); - - int aRes = system(aCommand); - if(aRes){ - if(MYDEBUG) MESSAGE("VISU_Gen_i::Save - Cann't execute the command :"<URL()) + aFileName; + + std::ostringstream aStream; + aStream<<"cp "< 0){ - SALOMEDS::ListOfFileNames_var aSeq = new SALOMEDS::ListOfFileNames; - aSeq->length(aFileNames.Length()); - for(aCounter = aFileNames.Length(); aCounter > 0; aCounter--) - aSeq[aCounter-1] = CORBA::string_dup(aFileNames.Value(aCounter).ToCString()); - aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.ToCString(), aSeq.in(), isMultiFile); - if(!isMultiFile) - SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.ToCString(), aSeq.in(), true); + + if(MYDEBUG) MESSAGE("VISU_Gen_i::Save - aFileNames.size() - "<length(aFileNames.size()); + for(int aCounter = aFileNames.size(); aCounter > 0; aCounter--) + aListOfFileNames[aCounter-1] = aFileNames[aCounter-1].c_str(); } + + SALOMEDS::ListOfFileNames_var aListOfFiles = new SALOMEDS::ListOfFileNames; + aListOfFiles->length(aFiles.size()); + if(!aFiles.empty()){ + for(int aCounter = aFileNames.size(); aCounter > 0; aCounter--) + aListOfFiles[aCounter-1] = aFiles[aCounter-1].c_str(); + } + + SALOMEDS::TMPFile_var aStreamFile = new SALOMEDS::TMPFile(0); + if(theIsMultiFile) + aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir, aListOfFiles.in(), theIsMultiFile); + else + aStreamFile = SALOMEDS_Tool::PutFilesToStream(aListOfFiles.in(), aListOfFileNames.in()); + return aStreamFile._retn(); } diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc index 64bb0bb9..1bdd88b8 100644 --- a/src/VISU_I/VISU_Prs3d_i.cc +++ b/src/VISU_I/VISU_Prs3d_i.cc @@ -265,8 +265,8 @@ VISU::Prs3d_i }catch(std::bad_alloc& ex){ throw std::runtime_error("CreateActor >> No enough memory"); throw ex; - } catch(std::exception& ex){ - throw ex; + } catch(std::exception&){ + throw; }catch(...) { throw std::runtime_error("CreateActor >> unexpected exception was caught!!!"); } diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc index 2a85df81..c150b76d 100644 --- a/src/VISU_I/VISU_Result_i.cc +++ b/src/VISU_I/VISU_Result_i.cc @@ -787,20 +787,23 @@ VISU::Result_i ::Result_i (SALOMEDS::Study_ptr theStudy, const ESourceId& theSourceId, const ECreationId& theCreationId, - CORBA::Boolean theIsBuildImmediately): + CORBA::Boolean theIsBuildImmediately, + CORBA::Boolean theIsBuildFields, + CORBA::Boolean theIsBuildMinMax, + CORBA::Boolean theIsBuildGroups): myStudyDocument(SALOMEDS::Study::_duplicate(theStudy)), myCreationId(theCreationId), mySourceId(theSourceId), myIsBuildImmediately(theIsBuildImmediately), - myInput(NULL), + myIsBuildFields(theIsBuildFields), + myIsBuildGroups(theIsBuildMinMax), + myIsBuildMinMax(theIsBuildGroups), myIsEntitiesDone(false), myIsFieldsDone(false), myIsGroupsDone(false), myIsMinMaxDone(false), - myIsBuildFields(true), - myIsBuildGroups(true), - myIsBuildMinMax(true), - myIsAllDone(false) + myIsAllDone(false), + myInput(NULL) { myStudy = ProcessEvent(new TGetStudy(myStudyDocument->StudyId())); } @@ -1181,7 +1184,8 @@ Restore(SALOMEDS::SObject_ptr theSObject, SALOMEDS::SObject_var aRefSObj, aTargetRefSObj; if (mySObject->FindSubObject(1, aRefSObj) && - aRefSObj->ReferencedObject(aTargetRefSObj)) { + aRefSObj->ReferencedObject(aTargetRefSObj)) + { if(MYDEBUG) MESSAGE("Result_i::GetInput - There is some reference."); SALOMEDS::SComponent_var aCompRefSObj = aTargetRefSObj->GetFatherComponent(); CORBA::String_var aDataType = aCompRefSObj->ComponentDataType(); @@ -1258,7 +1262,17 @@ Restore(SALOMEDS::SObject_ptr theSObject, } if(MYDEBUG) MESSAGE("VISU::Result_i::Restore - mySourceId = " << mySourceId); myInput = CreateConvertor(myFileInfo.filePath().latin1()); - myInput->Build(); + + myInput->BuildEntities(); + if(myIsBuildFields){ + myInput->BuildFields(); + if(myIsBuildMinMax){ + myInput->BuildMinMax(); + } + } + if(myIsBuildGroups) + myInput->BuildGroups(); + QString aComment; aComment.sprintf("myComment=%s;myType=%d;myFileName=%s;myInitFileName=%s", GetComment(), VISU::TRESULT, myFileInfo.filePath().latin1(), @@ -1269,8 +1283,8 @@ Restore(SALOMEDS::SObject_ptr theSObject, SALOMEDS::AttributeComment_var aCmnt = SALOMEDS::AttributeComment::_narrow(anAttr); aCmnt->SetValue(aComment.latin1()); } - bool isBuildAll = VISU::GetResourceMgr()->booleanValue("VISU", "full_med_loading", false); - if (isBuildAll) + bool anIsBuildAll = VISU::GetResourceMgr()->booleanValue("VISU", "full_med_loading", false); + if(anIsBuildAll) BuildAll(); return this; } catch(std::exception& exc) { @@ -1357,6 +1371,9 @@ VISU::Result_i Storable::DataToStream(theStr,"myName",myName.c_str()); Storable::DataToStream(theStr,"myInitFileName",myInitFileName.c_str()); Storable::DataToStream(theStr,"myCreationId",myCreationId); + Storable::DataToStream(theStr,"myIsBuildFields",myIsFieldsDone); + Storable::DataToStream(theStr,"myIsBuildMinMax",myIsMinMaxDone); + Storable::DataToStream(theStr,"myIsBuildGroups",myIsGroupsDone); } @@ -1374,11 +1391,20 @@ VISU::Result_i if(aCreationId == eImportMed || aCreationId == eImportMedField) aSourceId = eRestoredComponent; - VISU::Result_i* pResult = new VISU::Result_i(aStudy,aSourceId,aCreationId); - if (pResult == NULL) + CORBA::Boolean anIsBuildFields = Storable::FindValue(theMap,"myIsBuildFields","0").toInt(); + CORBA::Boolean anIsBuildMinMax = Storable::FindValue(theMap,"myIsBuildMinMax","0").toInt(); + CORBA::Boolean anIsBuildGroups = Storable::FindValue(theMap,"myIsBuildGroups","0").toInt(); + + VISU::Result_i* aResult = new VISU::Result_i(aStudy, + aSourceId, + aCreationId, + anIsBuildFields, + anIsBuildMinMax, + anIsBuildGroups); + if (aResult == NULL) return NULL; - return pResult->Restore(theSObject,theMap,thePrefix); + return aResult->Restore(theSObject,theMap,thePrefix); } diff --git a/src/VISU_I/VISU_Result_i.hh b/src/VISU_I/VISU_Result_i.hh index ee903de6..24fa919b 100644 --- a/src/VISU_I/VISU_Result_i.hh +++ b/src/VISU_I/VISU_Result_i.hh @@ -41,7 +41,7 @@ class VISU_Convertor; namespace VISU { //---------------------------------------------------------------------------- - class MinMaxCunsomer: public virtual boost::bsignals::trackable + class MinMaxCunsomer: public virtual boost::BOOST_SIGNALS_NAMESPACE::trackable { protected: bool myMinMaxIsInitilized; @@ -73,7 +73,10 @@ namespace VISU Result_i(SALOMEDS::Study_ptr theStudy, const ESourceId& theSourceId, const ECreationId& theCreationId, - CORBA::Boolean theIsBuildImmediately = true); + CORBA::Boolean theIsBuildImmediately = true, + CORBA::Boolean theIsBuildFields = true, + CORBA::Boolean theIsBuildMinMax = true, + CORBA::Boolean theIsBuildGroups = true); virtual ~Result_i(); virtual void RemoveFromStudy(); diff --git a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc index 9b8868e3..75430d90 100644 --- a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc +++ b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc @@ -161,15 +161,18 @@ void VISU::ScalarMapOnDeformedShape_i ::SameAs(const Prs3d_i* theOrigin) { + int theScalarIter = GetScalarIteration(); + TSuperClass::SameAs(theOrigin); if(const ScalarMapOnDeformedShape_i* aPrs3d = dynamic_cast(theOrigin)){ ScalarMapOnDeformedShape_i* anOrigin = const_cast(aPrs3d); // increment the scalar iteration for using in VISU_TimeAnimation class implementation. + int anOriginScalarIter = anOrigin->GetScalarIteration(); this->SetScalarField(anOrigin->GetScalarMeshName().c_str(), anOrigin->GetScalarFieldName().c_str(), - anOrigin->GetScalarIteration() + 1, + theScalarIter, anOrigin->GetScalarEntity()); Update(); } diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx index 34023596..e2bc1dee 100644 --- a/src/VISU_I/VISU_TimeAnimation.cxx +++ b/src/VISU_I/VISU_TimeAnimation.cxx @@ -64,7 +64,7 @@ VISU_TimeAnimation::VISU_TimeAnimation (_PTR(Study) theStudy, if (!CORBA::is_nil(theView3D)) { VISU::View3D_i* pView = dynamic_cast(GetServant(theView3D).in()); SUIT_ViewWindow* aVW = pView->GetViewWindow(); - myView = VISU::GetViewWindow(aVW); + myView = dynamic_cast(aVW); connect( myView, SIGNAL( destroyed() ), this, SLOT( onViewDeleted() ) ); } @@ -162,10 +162,14 @@ namespace FieldData& theData, VISU::Result_i* theResult, bool theIsRangeDefined, - CORBA::Double theMinVal, - CORBA::Double theMaxVal) + CORBA::Double& theMinVal, + CORBA::Double& theMaxVal, + CORBA::Double theTimeMin, + CORBA::Double theTimeMax) { - double aMin = VTK_LARGE_FLOAT, aMax = -VTK_LARGE_FLOAT; + theMinVal = VTK_LARGE_FLOAT; + theMaxVal = -VTK_LARGE_FLOAT; + _PTR(ChildIterator) anIter = theStudy->NewChildIterator(theData.myField); anIter->Next(); // First is reference on support @@ -181,9 +185,9 @@ namespace theData.myTiming[aFrameId] = VISU_TimeAnimation::getTimeValue(aTimeStamp); if (theIsRangeDefined) { - if (theData.myTiming[aFrameId] < theMinVal) + if (theData.myTiming[aFrameId] < theTimeMin) continue; - if (theData.myTiming[aFrameId] > theMaxVal) + if (theData.myTiming[aFrameId] > theTimeMax) break; } @@ -198,8 +202,8 @@ namespace aFieldName.latin1(), aTimeStampId); theData.myPrs[aFrameId++] = aPresent; - aMin = std::min(aPresent->GetMin(),aMin); - aMax = std::min(aPresent->GetMax(),aMax); + theMinVal = std::min(aPresent->GetMin(),theMinVal); + theMaxVal = std::max(aPresent->GetMax(),theMaxVal); } theData.myNbFrames = aFrameId; @@ -208,7 +212,7 @@ namespace if( aRangeType != 1 ){ for(long aFrameId = 0; aFrameId < theData.myNbFrames; aFrameId++) { if (VISU::ScalarMap_i* aPrs = dynamic_cast(theData.myPrs[aFrameId])){ - aPrs->SetRange(aMin, aMax); + aPrs->SetRange(theMinVal, theMaxVal); aPrs->SetOffset(theData.myOffset); } } @@ -216,7 +220,7 @@ namespace if (theData.myPrsType == VISU::TISOSURFACE) for (long aFrameId = 0; aFrameId < theData.myNbFrames; aFrameId++) if (VISU::IsoSurfaces_i* aPrs = dynamic_cast(theData.myPrs[aFrameId])) - aPrs->SetSubRange(aMin, aMax); + aPrs->SetSubRange(theMinVal, theMaxVal); } } } @@ -238,31 +242,104 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { using namespace VISU; switch (aData.myPrsType) { case VISU::TSCALARMAP: // ScalarMap - GeneratePresentations(myStudy,aData,aResult,isRangeDefined(),myMinVal,myMaxVal); + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); break; case VISU::TISOSURFACE: // Iso Surfaces - GeneratePresentations(myStudy,aData,aResult,isRangeDefined(),myMinVal,myMaxVal); + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); break; case VISU::TCUTPLANES: // Cut Planes - GeneratePresentations(myStudy,aData,aResult,isRangeDefined(),myMinVal,myMaxVal); + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); + break; + case VISU::TCUTLINES: // Cut Lines + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); break; case VISU::TPLOT3D: // Plot3d - GeneratePresentations(myStudy,aData,aResult,isRangeDefined(),myMinVal,myMaxVal); + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); break; case VISU::TDEFORMEDSHAPE: // Deformed Shape - GeneratePresentations(myStudy,aData,aResult,isRangeDefined(),myMinVal,myMaxVal); + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); break; case VISU::TVECTORS: // Vectors - GeneratePresentations(myStudy,aData,aResult,isRangeDefined(),myMinVal,myMaxVal); + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); break; case VISU::TSTREAMLINES: // Stream Lines - GeneratePresentations(myStudy,aData,aResult,isRangeDefined(),myMinVal,myMaxVal); + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); break; case VISU::TGAUSSPOINTS: // Gauss Points - GeneratePresentations(myStudy,aData,aResult,isRangeDefined(),myMinVal,myMaxVal); + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); break; case VISU::TSCALARMAPONDEFORMEDSHAPE: // Scalar map on deformed shape - GeneratePresentations(myStudy,aData,aResult,isRangeDefined(),myMinVal,myMaxVal); + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myMinVal, + myMaxVal, + myTimeMin, + myTimeMax); break; default: MESSAGE("Not implemented for this presentation type: " << aData.myPrsType); @@ -654,6 +731,9 @@ std::string GetPresentationComment (VISU::VISUType thePrsType) case VISU::TCUTPLANES: aPrsCmt = VISU::CutPlanes_i::myComment; break; + case VISU::TCUTLINES: + aPrsCmt = VISU::CutLines_i::myComment; + break; case VISU::TPLOT3D: aPrsCmt = VISU::Plot3D_i::myComment; break; @@ -828,6 +908,8 @@ void VISU_TimeAnimation::restoreFromStudy(_PTR(SObject) theField) aData.myPrsType = VISU::TISOSURFACE; else if (strName == VISU::CutPlanes_i::myComment.c_str()) aData.myPrsType = VISU::TCUTPLANES; + else if (strName == VISU::CutLines_i::myComment.c_str()) + aData.myPrsType = VISU::TCUTLINES; else if (strName == VISU::Plot3D_i::myComment.c_str()) aData.myPrsType = VISU::TPLOT3D; else if (strName == VISU::DeformedShape_i::myComment.c_str()) @@ -857,8 +939,7 @@ void VISU_TimeAnimation::restoreFromStudy(_PTR(SObject) theField) aData.myPrs[0]->GetOffset(aData.myOffset); for (int i = 1; i < aData.myNbFrames; i++) { //jfa 03.08.2005:aData.myPrs[i]->SameAs(aData.myPrs[0]); - //enk 06.02.2006:aData.myPrs[i]->SameAsParams(aData.myPrs[0]);//jfa 03.08.2005 - aData.myPrs[i]->SameAsParams(aData.myPrs[i-1]);//enk 06.02.2006: initializing from previous presentation + aData.myPrs[i]->SameAsParams(aData.myPrs[0]);//jfa 03.08.2005 } } string aStr = aAnimSObject->GetID(); diff --git a/src/VISU_I/VISU_ViewManager_i.cc b/src/VISU_I/VISU_ViewManager_i.cc index c86ac5d8..7168bb99 100644 --- a/src/VISU_I/VISU_ViewManager_i.cc +++ b/src/VISU_I/VISU_ViewManager_i.cc @@ -257,31 +257,29 @@ namespace VISU { //=========================================================================== // VISU namespace functions //=========================================================================== - SVTK_ViewWindow* GetViewWindow (SUIT_ViewWindow* theStudyFrame) + vtkRenderer* GetRenderer (SUIT_ViewWindow* theViewWindow) { - return dynamic_cast(theStudyFrame); - } - - vtkRenderer* GetRenderer (SUIT_ViewWindow* theStudyFrame) - { - return GetViewWindow(theStudyFrame)->getRenderer(); + if (SVTK_ViewWindow* vw = dynamic_cast(theViewWindow)) + return vw->getRenderer(); + return NULL; } - vtkCamera* GetCamera (SUIT_ViewWindow* theStudyFrame) + vtkCamera* GetCamera (SUIT_ViewWindow* theViewWindow) { - return GetRenderer(theStudyFrame)->GetActiveCamera(); + return GetRenderer(theViewWindow)->GetActiveCamera(); } void RepaintView (SUIT_ViewWindow* theViewWindow) { - SVTK_ViewWindow* vf = GetViewWindow(theViewWindow); - vf->getRenderer()->ResetCameraClippingRange(); - vf->getRenderWindow()->Render(); + if (SVTK_ViewWindow* vf = dynamic_cast(theViewWindow)) { + vf->getRenderer()->ResetCameraClippingRange(); + vf->getRenderWindow()->Render(); + } } - VISU_Actor* UpdateViewer (SUIT_ViewWindow* theStudyFrame, int theDisplaing, Prs3d_i* thePrs) + VISU_Actor* UpdateViewer (SUIT_ViewWindow* theViewWindow, int theDisplaing, Prs3d_i* thePrs) { - SVTK_ViewWindow* vf = GetViewWindow(theStudyFrame); + SVTK_ViewWindow* vf = dynamic_cast(theViewWindow); if (!vf) return NULL; if(MYDEBUG) MESSAGE("UpdateViewer - theDisplaing = "<GetScale(aScaleFactor); + (dynamic_cast(theViewWindow))->GetScale(aScaleFactor); Storable::DataToStream(theStr,"myScaleFactor[0]",aScaleFactor[0]); Storable::DataToStream(theStr,"myScaleFactor[1]",aScaleFactor[1]); Storable::DataToStream(theStr,"myScaleFactor[2]",aScaleFactor[2]); @@ -1841,7 +1841,7 @@ namespace VISU { aColor[1] = int(255.0*theColor.G); aColor[2] = int(255.0*theColor.B); QColor aNewColor (aColor[0],aColor[1],aColor[2]); - VISU::GetViewWindow(theViewWindow)->setBackgroundColor(aNewColor); + (dynamic_cast(theViewWindow))->setBackgroundColor(aNewColor); } SALOMEDS::Color View3D_i::GetBackground (SUIT_ViewWindow* theViewWindow) @@ -1922,7 +1922,7 @@ namespace VISU { SUIT_ViewWindow* aVW = GetViewWindow(); if (aVW) { ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW), &SVTK_ViewWindow::onFitAll)); + (dynamic_cast(aVW), &SVTK_ViewWindow::onFitAll)); Update(); } } @@ -1936,27 +1936,27 @@ namespace VISU { switch (theType) { case VISU::View3D::FRONT : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW), &SVTK_ViewWindow::onFrontView)); + (dynamic_cast(aVW), &SVTK_ViewWindow::onFrontView)); break; case VISU::View3D::BACK : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW), &SVTK_ViewWindow::onBackView)); + (dynamic_cast(aVW), &SVTK_ViewWindow::onBackView)); break; case VISU::View3D::LEFT : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW),&SVTK_ViewWindow::onLeftView)); + (dynamic_cast(aVW),&SVTK_ViewWindow::onLeftView)); break; case VISU::View3D::RIGHT : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW),&SVTK_ViewWindow::onRightView)); + (dynamic_cast(aVW),&SVTK_ViewWindow::onRightView)); break; case VISU::View3D::TOP : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW),&SVTK_ViewWindow::onTopView)); + (dynamic_cast(aVW),&SVTK_ViewWindow::onTopView)); break; case VISU::View3D::BOTTOM : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW),&SVTK_ViewWindow::onBottomView)); + (dynamic_cast(aVW),&SVTK_ViewWindow::onBottomView)); break; } Update(); @@ -2126,7 +2126,7 @@ namespace VISU { void View3D_i::ScaleView (SUIT_ViewWindow* theViewWindow, VISU::View3D::Axis theAxis, CORBA::Double theParam) { - SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(theViewWindow); + SVTK_ViewWindow* aViewWindow = dynamic_cast(theViewWindow); double aScaleFactor[3]; aViewWindow->GetScale(aScaleFactor); aScaleFactor[theAxis] = theParam; @@ -2136,7 +2136,7 @@ namespace VISU { void SetScaleView (SUIT_ViewWindow* theViewWindow, const CORBA::Double theScale[3]) { double aScale[3] = {theScale[0], theScale[1], theScale[2]}; - VISU::GetViewWindow(theViewWindow)->SetScale(aScale); + (dynamic_cast(theViewWindow))->SetScale(aScale); } void View3D_i::ScaleView(VISU::View3D::Axis theAxis, CORBA::Double theParam) @@ -2145,7 +2145,7 @@ namespace VISU { SUIT_ViewWindow* aVW = GetViewWindow(); if (aVW) { double aScale[3]; - VISU::GetViewWindow(aVW)->GetScale(aScale); + (dynamic_cast(aVW))->GetScale(aScale); aScale[theAxis] = theParam; ProcessVoidEvent(new TSet3DViewParamEvent(&SetScaleView,aVW,aScale)); } diff --git a/src/VVTK/VVTK_MainWindow.cxx b/src/VVTK/VVTK_MainWindow.cxx index de0ebfd0..e292f1b6 100644 --- a/src/VVTK/VVTK_MainWindow.cxx +++ b/src/VVTK/VVTK_MainWindow.cxx @@ -79,7 +79,7 @@ VVTK_MainWindow // Recording myRecordingToolBar = new QToolBar(this); myRecordingToolBar->setCloseMode(QDockWindow::Undocked); - myRecordingToolBar->setLabel(tr("LBL_TOOLBAR_LABEL")); + myRecordingToolBar->setLabel(tr("LBL_TOOLBAR_RECORD_LABEL")); moveDockWindow(myRecordingToolBar,Qt::DockLeft); myStartAction = new QtxAction(tr("MNU_VVTK_RECORDING_START"), @@ -265,7 +265,7 @@ VVTK_MainWindow1 { myPtsToolBar = new QToolBar(this); myPtsToolBar->setCloseMode(QDockWindow::Undocked); - myPtsToolBar->setLabel(tr("LBL_TOOLBAR_LABEL")); + myPtsToolBar->setLabel(tr("LBL_TOOLBAR_GAUSS_LABEL")); moveDockWindow(myPtsToolBar,Qt::DockLeft); QPixmap aPixmap; diff --git a/src/VVTK/VVTK_Renderer.cxx b/src/VVTK/VVTK_Renderer.cxx index 484eff95..8a171986 100644 --- a/src/VVTK/VVTK_Renderer.cxx +++ b/src/VVTK/VVTK_Renderer.cxx @@ -236,19 +236,17 @@ vtkStandardNewMacro(VVTK_Renderer1); //---------------------------------------------------------------------------- VVTK_Renderer1::VVTK_Renderer1(): - //myImplicitFunctionWidget(VISU_ImplicitFunctionWidget::New()), myWidgetCtrl(VISU_WidgetCtrl::New()), myOutsideCursorSettings(NULL) { if(MYDEBUG) INFOS("VVTK_Renderer1() - "<SetPlaceFactor(1.1); myWidgetCtrl->SetPlaceFactor(1.1); // - VISU_PlanesWidget *pPlanesWidget=myWidgetCtrl->GetPlanesWidget(); - pPlanesWidget->SetOutlineTranslation(false); - vtkProperty* aSelectedPlaneProperty = pPlanesWidget->GetSelectedPlaneProperty(); - vtkProperty* aPlaneProperty = pPlanesWidget->GetPlaneProperty(); + VISU_PlanesWidget *aPlanesWidget = myWidgetCtrl->GetPlanesWidget(); + aPlanesWidget->SetOutlineTranslation(false); + vtkProperty* aSelectedPlaneProperty = aPlanesWidget->GetSelectedPlaneProperty(); + vtkProperty* aPlaneProperty = aPlanesWidget->GetPlaneProperty(); aPlaneProperty->SetOpacity(aSelectedPlaneProperty->GetOpacity()*1.5); // myWidgetCtrl->Delete(); @@ -274,6 +272,7 @@ VVTK_Renderer1 } } + //---------------------------------------------------------------------------- void VVTK_Renderer1 @@ -286,30 +285,32 @@ VVTK_Renderer1 AdjustWidgetCtrl(); } } + + //---------------------------------------------------------------------------- -void VVTK_Renderer1::AdjustWidgetCtrl() +void +VVTK_Renderer1 +::AdjustWidgetCtrl() { - if(SVTK_Renderer::OnAdjustActors()){ - VISU_PlanesWidget *pPlanesWidget=myWidgetCtrl->GetPlanesWidget(); - pPlanesWidget->InitialPlaceWidget(myBndBox); - pPlanesWidget->SetOrigin(0.5*(myBndBox[1] + myBndBox[0]), - 0.5*(myBndBox[3] + myBndBox[2]), - 0.5*(myBndBox[5] + myBndBox[4])); - // - VISU_SphereWidget *pSphereWidget=myWidgetCtrl->GetSphereWidget(); - pSphereWidget->SetCenter(0.5*(myBndBox[1] + myBndBox[0]), - 0.5*(myBndBox[3] + myBndBox[2]), - 0.5*(myBndBox[5] + myBndBox[4])); - float dX, dXmin=1.e20; - for (int i=0; i<3; ++i) { - dX=myBndBox[2*i+1]-myBndBox[2*i]; - if (dXSetRadius(dXmin); + VISU_PlanesWidget *aPlanesWidget = myWidgetCtrl->GetPlanesWidget(); + aPlanesWidget->InitialPlaceWidget(myBndBox); + aPlanesWidget->SetOrigin(0.5*(myBndBox[1] + myBndBox[0]), + 0.5*(myBndBox[3] + myBndBox[2]), + 0.5*(myBndBox[5] + myBndBox[4])); + // + VISU_SphereWidget *aSphereWidget = myWidgetCtrl->GetSphereWidget(); + aSphereWidget->SetCenter(0.5*(myBndBox[1] + myBndBox[0]), + 0.5*(myBndBox[3] + myBndBox[2]), + 0.5*(myBndBox[5] + myBndBox[4])); + + float aMinLength = VTK_LARGE_FLOAT; + for (int i=0; i<3; ++i) { + float aLength = myBndBox[2*i+1]-myBndBox[2*i]; + aMinLength = std::min(aMinLength,aLength); } + aSphereWidget->SetRadius(aMinLength); } + //---------------------------------------------------------------------------- void VVTK_Renderer1 @@ -329,7 +330,9 @@ VVTK_Renderer1 } //---------------------------------------------------------------------------- -VISU_WidgetCtrl* VVTK_Renderer1::GetWidgetCtrl() +VISU_WidgetCtrl* +VVTK_Renderer1 +::GetWidgetCtrl() { return myWidgetCtrl.GetPointer(); } diff --git a/src/VVTK/VVTK_ViewModel.cxx b/src/VVTK/VVTK_ViewModel.cxx index e3778816..5fcc06f9 100644 --- a/src/VVTK/VVTK_ViewModel.cxx +++ b/src/VVTK/VVTK_ViewModel.cxx @@ -1,208 +1,27 @@ -#include -#include - #include "VVTK_ViewModel.h" -#include "VVTK_ViewWindow.h" - -#include "SVTK_View.h" -#include "SVTK_MainWindow.h" -#include "SVTK_RenderWindowInteractor.h" -#include "VTKViewer_ViewModel.h" +#include "VVTK_ViewWindow.h" -//========================================================== -VVTK_Viewer -::VVTK_Viewer() +VVTK_Viewer:: +VVTK_Viewer() { - myTrihedronSize = 105; } -VVTK_Viewer -::~VVTK_Viewer() -{} - - -//========================================================== -void -VVTK_Viewer -::setViewManager(SUIT_ViewManager* theViewManager) +VVTK_Viewer:: +~VVTK_Viewer() { - SUIT_ViewModel::setViewManager(theViewManager); - - if ( !theViewManager ) - return; - - connect(theViewManager, SIGNAL(mousePress(SUIT_ViewWindow*, QMouseEvent*)), - this, SLOT(onMousePress(SUIT_ViewWindow*, QMouseEvent*))); - - connect(theViewManager, SIGNAL(mouseMove(SUIT_ViewWindow*, QMouseEvent*)), - this, SLOT(onMouseMove(SUIT_ViewWindow*, QMouseEvent*))); - - connect(theViewManager, SIGNAL(mouseRelease(SUIT_ViewWindow*, QMouseEvent*)), - this, SLOT(onMouseRelease(SUIT_ViewWindow*, QMouseEvent*))); } - //========================================================== -SUIT_ViewWindow* -VVTK_Viewer -::createView( SUIT_Desktop* theDesktop ) +SUIT_ViewWindow* +VVTK_Viewer:: +createView( SUIT_Desktop* theDesktop ) { - TViewWindow* aViewWindow = new TViewWindow(theDesktop); + TViewWindow* aViewWindow = new TViewWindow (theDesktop); aViewWindow->Initialize(this); - + aViewWindow->setBackgroundColor( backgroundColor() ); aViewWindow->SetTrihedronSize( trihedronSize() ); return aViewWindow; } - - -//========================================================== -void -VVTK_Viewer -::contextMenuPopup( QPopupMenu* thePopup ) -{ - thePopup->insertItem( VTKViewer_Viewer::tr( "MEN_DUMP_VIEW" ), this, SLOT( onDumpView() ) ); - thePopup->insertItem( VTKViewer_Viewer::tr( "MEN_CHANGE_BACKGROUD" ), this, SLOT( onChangeBgColor() ) ); - - thePopup->insertSeparator(); - - if(TViewWindow* aView = dynamic_cast(myViewManager->getActiveView())){ - if ( !aView->getMainWindow()->getToolBar()->isVisible() ){ - thePopup->insertItem( VTKViewer_Viewer::tr( "MEN_SHOW_TOOLBAR" ), this, SLOT( onShowToolbar() ) ); - } - } -} - - -//========================================================== -void -VVTK_Viewer -::Repaint() -{ - QPtrVector aViews = myViewManager->getViews(); - for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){ - if(TViewWindow* aView = dynamic_cast(aViews.at(i))){ - aView->getMainWindow()->Repaint(); - } - } -} - - -//========================================================== -bool -VVTK_Viewer -::isVisible( const Handle(SALOME_InteractiveObject)& io ) -{ - QPtrVector aViews = myViewManager->getViews(); - for(int i = 0, iEnd = aViews.size(); i < iEnd; i++) - if(SUIT_ViewWindow* aViewWindow = aViews.at(i)) - if(TViewWindow* aView = dynamic_cast(aViewWindow)) - if(!aView->getView()->isVisible( io )) - return false; - - return true; -} - - -//========================================================== -void -VVTK_Viewer -::onMousePress(SUIT_ViewWindow* vw, QMouseEvent* event) -{} - -void -VVTK_Viewer -::onMouseMove(SUIT_ViewWindow* vw, QMouseEvent* event) -{} - -void -VVTK_Viewer -::onMouseRelease(SUIT_ViewWindow* vw, QMouseEvent* event) -{} - - -//========================================================== -QColor -VVTK_Viewer -::backgroundColor() const -{ - return myBgColor; -} - -void -VVTK_Viewer -::setBackgroundColor( const QColor& theColor ) -{ - if ( !theColor.isValid() ) - return; - - QPtrVector aViews = myViewManager->getViews(); - for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){ - if(SUIT_ViewWindow* aViewWindow = aViews.at(i)){ - if(TViewWindow* aView = dynamic_cast(aViewWindow)){ - aView->setBackgroundColor(theColor); - } - } - } - - myBgColor = theColor; -} - -//========================================================== -int -VVTK_Viewer -::trihedronSize() const -{ - return myTrihedronSize; -} - -void -VVTK_Viewer -::setTrihedronSize( const int theSize ) -{ - myTrihedronSize = theSize; - if(SUIT_ViewManager* aViewManager = getViewManager()){ - QPtrVector aViews = aViewManager->getViews(); - for ( int i = 0; i < aViews.count(); i++ ){ - if(TViewWindow* aView = dynamic_cast(aViews.at( i ))){ - aView->getMainWindow()->SetTrihedronSize( theSize ); - } - } - } -} - -//========================================================== -void -VVTK_Viewer -::onDumpView() -{ - if(SUIT_ViewWindow* aView = myViewManager->getActiveView()) - aView->onDumpView(); -} - -//========================================================== -void -VVTK_Viewer -::onChangeBgColor() -{ - if(SUIT_ViewWindow* aView = myViewManager->getActiveView()){ - QColor aColor = QColorDialog::getColor( backgroundColor(), aView); - setBackgroundColor(aColor); - } -} - -//========================================================== -void -VVTK_Viewer -::onShowToolbar() -{ - QPtrVector aViews = myViewManager->getViews(); - for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){ - if(TViewWindow* aView = dynamic_cast(aViews.at(i))){ - aView->getMainWindow()->getToolBar()->show(); - } - } -} - diff --git a/src/VVTK/VVTK_ViewModel.h b/src/VVTK/VVTK_ViewModel.h index 0846edcd..5f343dc9 100644 --- a/src/VVTK/VVTK_ViewModel.h +++ b/src/VVTK/VVTK_ViewModel.h @@ -4,15 +4,12 @@ #include #include "VVTK.h" -#include "SVTK_ViewModelBase.h" - -#include "SALOME_Prs.h" -#include "SALOME_InteractiveObject.hxx" +#include "SVTK_ViewModel.h" class VVTK_ViewWindow; -//! Extends two interfaces #SVTK_ViewModelBase and #SALOME_View -class VVTK_EXPORT VVTK_Viewer : public SVTK_ViewModelBase, public SALOME_View +//! VVTK View Model +class VVTK_EXPORT VVTK_Viewer : public SVTK_Viewer { Q_OBJECT; @@ -23,48 +20,11 @@ public: VVTK_Viewer(); virtual ~VVTK_Viewer(); - //! Redefine SUIT_ViewModel::createView + //! See #SUIT_ViewModel::createView virtual SUIT_ViewWindow* createView(SUIT_Desktop*); - //! Redefine SUIT_ViewModel::setViewManager - virtual void setViewManager(SUIT_ViewManager* theViewManager); - //! Redefine SUIT_ViewModel::contextMenuPopup - virtual void contextMenuPopup( QPopupMenu* ); //! See SUIT_ViewModel::getType virtual QString getType() const { return Type(); } - - //! Redefine SALOME_View::Repaint - virtual void Repaint(); - - //! Redefine SALOME_View::isVisible - virtual bool isVisible( const Handle(SALOME_InteractiveObject)& ); - - //! Get background color of the viewer - QColor backgroundColor() const; - - //! Set background color to the viewer - void setBackgroundColor( const QColor& ); - - //! Get size of trihedron of the viewer (see SVTK_Renderer::SetTrihedronSize) - int trihedronSize() const; - - //! Set size of trihedron of the viewer (see SVTK_Renderer::SetTrihedronSize) - void setTrihedronSize( const int ); - -protected slots: - void onMousePress(SUIT_ViewWindow*, QMouseEvent*); - void onMouseMove(SUIT_ViewWindow*, QMouseEvent*); - void onMouseRelease(SUIT_ViewWindow*, QMouseEvent*); - - void onDumpView(); - void onShowToolbar(); - void onChangeBgColor(); - -private: - QColor myBgColor; - int myTrihedronSize; - bool mySelectionEnabled; - bool myMultiSelectionEnabled; }; #endif

Start Page visu.htm

Skin Name Default
Generating Time 16:06 10/17/2005
Generating Time 18:09 01/10/2006

Language ID 1033

Compile Script webhelp5_compile_script.xml

Compile Build Version 13.10.606

Start Page	visu.htm
Skin Name	Default
Generating Time	16:06 10/17/2005
Generating Time	18:09 01/10/2006
Language ID	1033
Compile Script	webhelp5_compile_script.xml
Compile Build Version	13.10.606

Deformed Shape presentation

Import a mesh from a MED - file <script type="text/javascript" language=JavaScript1.2>

Create a presentation of - a submesh and set view parameters <script type="text/javascript" language=JavaScript1.2>

Create field presentations - and use sweeping <script type="text/javascript" language=JavaScript1.2>

Vector Field Presentation

Import a mesh from a MED - file

Create a presentation of - a submesh and set view parameters

Create field presentations - and use sweeping