From 36e99837e1d5aec13075373d2f50abb4ecc2336c Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 27 Oct 2005 14:00:11 +0000 Subject: [PATCH] This commit was generated by cvs2git to create tag 'BR-D5-38-2003_D2005-21-10'. Sprout from BR-D5-38-2003_Base 2005-10-27 14:00:09 UTC admin 'This commit was generated by cvs2git to create branch 'BR-D5-38-2003_Base'.' Cherrypick from BR-D5-38-2003 2005-10-21 06:54:50 UTC apo 'Adjust to HEAD modifications': src/OBJECT/VISU_GaussPtsAct.cxx src/OBJECT/VISU_GaussPtsDeviceActor.cxx src/OBJECT/VISU_ScalarMapAct.cxx src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx src/PIPELINE/VISU_ScalarBarCtrl.cxx src/PIPELINE/VISU_ScalarBarCtrl.hxx src/VISUGUI/VisuGUI_Tools.cxx src/VISUGUI/VisuGUI_ViewTools.h src/VISU_I/VISU_TimeAnimation.cxx src/VISU_I/VISU_View_i.cc src/VVTK/VVTK_Renderer.cxx Cherrypick from master 2005-10-20 14:06:28 UTC enk 'Fix for Bug PAL8856': INSTALL doc/salome/tui/VISU/doxyfile src/OBJECT/VISU_ScalarMapAct.h src/VISUGUI/VISU_msg_en.po src/VISUGUI/VisuGUI_ActionsDef.h src/VISU_I/VISU_View_i.hh --- INSTALL | 8 +- doc/salome/tui/VISU/doxyfile | 97 +-- src/OBJECT/VISU_GaussPtsAct.cxx | 4 +- src/OBJECT/VISU_GaussPtsDeviceActor.cxx | 2 +- src/OBJECT/VISU_ScalarMapAct.cxx | 26 +- src/OBJECT/VISU_ScalarMapAct.h | 3 - src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx | 13 +- src/PIPELINE/VISU_ScalarBarCtrl.cxx | 12 +- src/PIPELINE/VISU_ScalarBarCtrl.hxx | 2 +- src/VISUGUI/VISU_msg_en.po | 9 - src/VISUGUI/VisuGUI_ActionsDef.h | 3 - src/VISUGUI/VisuGUI_Tools.cxx | 2 +- src/VISUGUI/VisuGUI_ViewTools.h | 2 +- src/VISU_I/VISU_TimeAnimation.cxx | 4 +- src/VISU_I/VISU_View_i.cc | 738 +++++++----------- src/VISU_I/VISU_View_i.hh | 67 +- src/VVTK/VVTK_Renderer.cxx | 2 +- 17 files changed, 394 insertions(+), 600 deletions(-) diff --git a/INSTALL b/INSTALL index 5953dd67..fc58f193 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -This is the version 3.1.0a2 of VISU +This is the version 3.1.0a of VISU Compatible with : - - KERNEL 3.1.0a2 - - SALOMEGUI 3.1.0a2 - - MED 3.1.0a2 + - KERNEL 3.1.0a + - SALOMEGUI 3.1.0a + - MED 3.1.0a diff --git a/doc/salome/tui/VISU/doxyfile b/doc/salome/tui/VISU/doxyfile index b4346ae4..3ee35aea 100755 --- a/doc/salome/tui/VISU/doxyfile +++ b/doc/salome/tui/VISU/doxyfile @@ -1,89 +1,73 @@ -# Doxyfile 1.3.7 +# Doxyfile 1.3-rc1 #--------------------------------------------------------------------------- -# Project related configuration options +# General configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME v.3.1.0a" +PROJECT_NAME = "SALOME - VISU - v.2.1.0" 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 -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = YES -HIDE_UNDOC_CLASSES = YES +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO 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 -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 5 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/src \ - ../../../share/salome/idl -FILE_PATTERNS = *.idl *.h *.hh *.hxx *.c *.cc *.cxx *.ixx *.jxx -RECURSIVE = YES +INPUT = ../../../share/salome/idl/VISU_Gen.idl +FILE_PATTERNS = +RECURSIVE = NO EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = YES +EXAMPLE_RECURSIVE = NO IMAGE_PATH = sources/ INPUT_FILTER = FILTER_SOURCE_FILES = YES - #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -92,15 +76,12 @@ 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 #--------------------------------------------------------------------------- @@ -121,7 +102,6 @@ DISABLE_INDEX = YES ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 250 - #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -136,8 +116,6 @@ LATEX_HEADER = PDF_HYPERLINKS = NO USE_PDFLATEX = NO LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO - #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- @@ -147,7 +125,6 @@ COMPACT_RTF = NO RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = - #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- @@ -155,21 +132,16 @@ 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 #--------------------------------------------------------------------------- @@ -177,7 +149,6 @@ GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES PERLMOD_MAKEVAR_PREFIX = - #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- @@ -190,16 +161,14 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = NO - #--------------------------------------------------------------------------- -# Configuration::additions related to external references +# Configuration::addtions related to external references #--------------------------------------------------------------------------- TAGFILES = GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl - #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- @@ -208,22 +177,24 @@ 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::additions related to the search engine +# Configuration::addtions 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/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx index b17b622c..61be970f 100644 --- a/src/OBJECT/VISU_GaussPtsAct.cxx +++ b/src/OBJECT/VISU_GaussPtsAct.cxx @@ -364,7 +364,6 @@ VISU_GaussPtsAct { Superclass::SetVisibility(theMode); myScalarBarCtrl->SetVisibility(theMode); - Highlight(isHighlighted()); } //---------------------------------------------------------------------------- @@ -626,7 +625,6 @@ void VISU_GaussPtsAct ::Highlight(bool theIsHighlight) { - myOutlineActor->SetVisibility(false); myTextActor->SetVisibility(0); myCursorPyramidSelected->SetVisibility(0); myCursorPyramid->SetVisibility(0); @@ -724,6 +722,8 @@ VISU_GaussPtsAct myCellActor->SetVisibility(anIsVisible && theIsHighlight); } } + myOutline->SetBounds( GetInput()->GetBounds() ); + myOutlineActor->SetVisibility( anIsVisible && theIsHighlight ); } diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx index 86eb25d2..fe4e22cf 100644 --- a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx +++ b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx @@ -131,7 +131,7 @@ VISU_GaussPtsDeviceActor myMapper->SetInput( myPassFilter[ anId ]->GetPolyDataOutput() ); - Superclass::SetMapper( myMapper.GetPointer() ); + vtkLODActor::SetMapper( myMapper.GetPointer() ); } VISU_GaussPointsPL* diff --git a/src/OBJECT/VISU_ScalarMapAct.cxx b/src/OBJECT/VISU_ScalarMapAct.cxx index 527f726f..391ec412 100644 --- a/src/OBJECT/VISU_ScalarMapAct.cxx +++ b/src/OBJECT/VISU_ScalarMapAct.cxx @@ -47,7 +47,7 @@ VISU_ScalarMapAct aProperty->SetAmbient(1.0); aProperty->SetDiffuse(0.0); aProperty->SetSpecular(0.0); - + myProperty->DeepCopy(aProperty); } @@ -97,27 +97,3 @@ VISU_ScalarMapAct myBarVisibility = theMode; if(myScalarBar) myScalarBar->SetVisibility(myBarVisibility); } - -void VISU_ScalarMapAct::SetShading(bool theOn) -{ - vtkProperty* aProperty = GetProperty(); - - if (theOn) - { - aProperty->SetAmbient(0.0); - aProperty->SetDiffuse(1.0); - } - else - { - aProperty->SetAmbient(1.0); - aProperty->SetDiffuse(0.0); - } - myProperty->DeepCopy(aProperty); -} - -bool VISU_ScalarMapAct::IsShading() -{ - vtkProperty* aProperty = GetProperty(); - - return (aProperty->GetAmbient() == 0 && aProperty->GetDiffuse() == 1); -} diff --git a/src/OBJECT/VISU_ScalarMapAct.h b/src/OBJECT/VISU_ScalarMapAct.h index 1d8197a1..bae6e529 100644 --- a/src/OBJECT/VISU_ScalarMapAct.h +++ b/src/OBJECT/VISU_ScalarMapAct.h @@ -50,9 +50,6 @@ class VTKOCC_EXPORT VISU_ScalarMapAct : public VISU_Actor { virtual void SetBarVisibility(bool theMode); virtual bool GetBarVisibility(){ return myBarVisibility;} - virtual void SetShading(bool theOn = true); - virtual bool IsShading(); - protected: VISU_ScalarMapAct(); bool myBarVisibility; diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx index 0709a853..913f0c94 100755 --- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx +++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx @@ -282,7 +282,7 @@ GLhandleARB VISU_OpenGLPointSpriteMapper::InitShader() else cout << "Loading vertex program... failed" << endl << endl; */ - free( shader ); + delete shader; glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); @@ -447,6 +447,8 @@ void VISU_OpenGLPointSpriteMapper::RenderPiece(vtkRenderer *ren, vtkActor *act) return; } + //cout << "Using OpenGLPointSpriteMapper" << endl; + vtkIdType numPts; vtkPolyData *input= this->GetInput(); @@ -798,10 +800,9 @@ void VISU_OpenGLPointSpriteMapper::DrawPoints(int idx, glPointSize( this->DefaultPointSize ); #ifdef GL_ARB_vertex_buffer_object - PFNGLGENBUFFERSARBPROC glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)dlsym( this->OpenGLLibrary, "glGenBuffersARB" ); - PFNGLBINDBUFFERARBPROC glBindBufferARB = (PFNGLBINDBUFFERARBPROC)dlsym( this->OpenGLLibrary, "glBindBufferARB" ); - PFNGLBUFFERDATAARBPROC glBufferDataARB = (PFNGLBUFFERDATAARBPROC)dlsym( this->OpenGLLibrary, "glBufferDataARB" ); - PFNGLDELETEBUFFERSARBPROC glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)dlsym( this->OpenGLLibrary, "glDeleteBuffersARB" ); + PFNGLGENBUFFERSARBPROC glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)dlsym( this->OpenGLLibrary, "glGenBuffersARB" ); + PFNGLBINDBUFFERARBPROC glBindBufferARB = (PFNGLBINDBUFFERARBPROC)dlsym( this->OpenGLLibrary, "glBindBufferARB" ); + PFNGLBUFFERDATAARBPROC glBufferDataARB = (PFNGLBUFFERDATAARBPROC)dlsym( this->OpenGLLibrary, "glBufferDataARB" ); #ifdef GL_ARB_shader_objects PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB = @@ -878,8 +879,6 @@ void VISU_OpenGLPointSpriteMapper::DrawPoints(int idx, glDisableClientState(GL_COLOR_ARRAY); glDisableClientState(GL_VERTEX_ARRAY); - glDeleteBuffersARB( 1, &aBufferObjectID ); - #ifdef GL_ARB_shader_objects glUseProgramObjectARB( 0 ); #endif diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.cxx b/src/PIPELINE/VISU_ScalarBarCtrl.cxx index 4554d1fb..e200b2ea 100644 --- a/src/PIPELINE/VISU_ScalarBarCtrl.cxx +++ b/src/PIPELINE/VISU_ScalarBarCtrl.cxx @@ -105,10 +105,10 @@ VISU_ScalarBarCtrl::~VISU_ScalarBarCtrl() void VISU_ScalarBarCtrl::SetMode(const int theMode) { myMode=theMode; - //myScalarBarNumber=myScalarBarNumberMax; - //if(!myMode){ - // myScalarBarNumber=1; - //} + myScalarBarNumber=myScalarBarNumberMax; + if(!myMode){ + myScalarBarNumber=1; + } } //================================================================== // function : GetMode @@ -256,7 +256,7 @@ void VISU_ScalarBarCtrl::AddToRender(vtkRenderer* theRenderer) int i; // Update(); - for (i=0; iAddActor2D(mySBA[i]); } } @@ -266,7 +266,7 @@ void VISU_ScalarBarCtrl::AddToRender(vtkRenderer* theRenderer) //================================================================== void VISU_ScalarBarCtrl::RemoveFromRender(vtkRenderer* theRenderer) { - for (int i=0; iRemoveActor2D(mySBA[i]); } } diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.hxx b/src/PIPELINE/VISU_ScalarBarCtrl.hxx index f55ae051..dab82503 100644 --- a/src/PIPELINE/VISU_ScalarBarCtrl.hxx +++ b/src/PIPELINE/VISU_ScalarBarCtrl.hxx @@ -123,7 +123,7 @@ protected: protected: int myMode; - //int myScalarBarNumber; + int myScalarBarNumber; int myScalarBarNumberMax; float myDistance, myL, myB, myPosition[2]; float myRangeLocal[2]; diff --git a/src/VISUGUI/VISU_msg_en.po b/src/VISUGUI/VISU_msg_en.po index 5598166f..41f32151 100644 --- a/src/VISUGUI/VISU_msg_en.po +++ b/src/VISUGUI/VISU_msg_en.po @@ -268,12 +268,6 @@ msgstr "Show Table" msgid "VisuGUI::MEN_SHRINK" msgstr "Shrink" -msgid "VisuGUI::MEN_SHADING" -msgstr "Shading On" - -msgid "VisuGUI::MEN_NOSHADING" -msgstr "Shading Off" - msgid "VisuGUI::MEN_STREAM_LINES" msgstr "Stream Lines" @@ -671,9 +665,6 @@ msgstr "X:" msgid "VisuGUI_ScalarBarPane::LBL_Y" msgstr "Y:" -msgid "VisuGUI_ScalarBarPane::LBL_SHOW_PREVIEW" -msgstr "Show preview" - msgid "VisuGUI_ScalarBarPane::DIMENSIONS_GRP" msgstr "Dimensions" diff --git a/src/VISUGUI/VisuGUI_ActionsDef.h b/src/VISUGUI/VisuGUI_ActionsDef.h index b3b99f36..0a795733 100644 --- a/src/VISUGUI/VisuGUI_ActionsDef.h +++ b/src/VISUGUI/VisuGUI_ActionsDef.h @@ -55,9 +55,6 @@ #define VISU_SHRINK 4055 #define VISU_UNSHRINK 4056 -#define VISU_SHADING 4083 -#define VISU_NOSHADING 4084 - #define VISU_CELL_COLOR 4057 #define VISU_COLOR 4058 #define VISU_EDGE_COLOR 4059 diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx index 71b4bcef..5593929b 100644 --- a/src/VISUGUI/VisuGUI_Tools.cxx +++ b/src/VISUGUI/VisuGUI_Tools.cxx @@ -730,7 +730,7 @@ namespace VISU FindActor(SVTK_ViewWindow* theViewWindow, const char* theEntry) { - using namespace SVTK; + using namespace VTK; if(vtkRenderer* aRenderer = theViewWindow->getRenderer()){ if(vtkActorCollection* aCollection = aRenderer->GetActors()){ if(VISU_Actor* anActor = Find(aCollection,TIsSameEntry(theEntry))){ diff --git a/src/VISUGUI/VisuGUI_ViewTools.h b/src/VISUGUI/VisuGUI_ViewTools.h index f732ab23..8a12e3c7 100644 --- a/src/VISUGUI/VisuGUI_ViewTools.h +++ b/src/VISUGUI/VisuGUI_ViewTools.h @@ -203,7 +203,7 @@ namespace VISU FindActor(TVieweWindow* theViewWindow, const char* theEntry) { - using namespace SVTK; + using namespace VTK; if(vtkRenderer* aRenderer = theViewWindow->getRenderer()){ if(vtkActorCollection* aCollection = aRenderer->GetActors()){ if(VISU_Actor* anActor = Find(aCollection,TIsSameEntry(theEntry))){ diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx index cacc4046..c4049d7a 100644 --- a/src/VISU_I/VISU_TimeAnimation.cxx +++ b/src/VISU_I/VISU_TimeAnimation.cxx @@ -59,7 +59,9 @@ 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(); + //QAD_StudyFrame* aStudyFrame = pView->GetStudyFrame(); + //myView = VISU::GetViewFrame(aStudyFrame); + SUIT_ViewWindow* aVW = pView->myViewWindow; myView = VISU::GetViewWindow(aVW); } diff --git a/src/VISU_I/VISU_View_i.cc b/src/VISU_I/VISU_View_i.cc index be9223a3..da0593b7 100644 --- a/src/VISU_I/VISU_View_i.cc +++ b/src/VISU_I/VISU_View_i.cc @@ -211,7 +211,7 @@ namespace VISU { struct TSplitEvent: public SALOME_Event { SalomeApp_Application * myApplication; - SUIT_ViewWindow * myVW; + SUIT_ViewWindow * myViewWindow; Qt::Orientation myOrientation; QtxWorkstack::SplitType mySplitType; @@ -221,7 +221,7 @@ namespace VISU { Qt::Orientation theOrientation, QtxWorkstack::SplitType theSplitType): myApplication(theApplication), - myVW(theViewWindow), + myViewWindow(theViewWindow), myOrientation(theOrientation), mySplitType(theSplitType) {} @@ -233,7 +233,7 @@ namespace VISU { if (tabDesk) { QtxWorkstack* workstack = tabDesk->workstack(); if (workstack) { - workstack->Split(myVW, myOrientation, mySplitType); + workstack->Split(myViewWindow, myOrientation, mySplitType); } } } @@ -243,40 +243,32 @@ namespace VISU { View_i:: SplitRight() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSplitEvent(myApplication, aVW, - Qt::Horizontal, QtxWorkstack::SPLIT_MOVE)); + ProcessVoidEvent(new TSplitEvent(myApplication,myViewWindow, + Qt::Horizontal,QtxWorkstack::SPLIT_MOVE)); } void View_i:: SplitLeft() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSplitEvent(myApplication, aVW, - Qt::Horizontal, QtxWorkstack::SPLIT_STAY)); + ProcessVoidEvent(new TSplitEvent(myApplication,myViewWindow, + Qt::Horizontal,QtxWorkstack::SPLIT_STAY)); } void View_i:: SplitBottom() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSplitEvent(myApplication, aVW, - Qt::Vertical, QtxWorkstack::SPLIT_MOVE)); + ProcessVoidEvent(new TSplitEvent(myApplication,myViewWindow, + Qt::Vertical,QtxWorkstack::SPLIT_MOVE)); } void View_i:: SplitTop() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSplitEvent(myApplication, aVW, - Qt::Vertical, QtxWorkstack::SPLIT_STAY)); + ProcessVoidEvent(new TSplitEvent(myApplication,myViewWindow, + Qt::Vertical,QtxWorkstack::SPLIT_STAY)); } void @@ -285,31 +277,29 @@ namespace VISU { { struct TOnTopEvent: public SALOME_Event { - SUIT_ViewWindow * myVW; + SUIT_ViewWindow * myViewWindow; public: TOnTopEvent (SUIT_ViewWindow * theViewWindow): - myVW(theViewWindow) + myViewWindow(theViewWindow) {} virtual void Execute() { - if (myVW) { - myVW->setFocus(); + if (myViewWindow) { + myViewWindow->setFocus(); } } }; - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TOnTopEvent(aVW)); + ProcessVoidEvent(new TOnTopEvent(myViewWindow)); } struct TAttractEvent: public SALOME_Event { SalomeApp_Application * myApplication; - SUIT_ViewWindow * myVW1; - SUIT_ViewWindow * myVW2; + SUIT_ViewWindow * myViewWindow1; + SUIT_ViewWindow * myViewWindow2; bool myAttractAll; public: @@ -318,8 +308,8 @@ namespace VISU { SUIT_ViewWindow * theViewWindow2, bool theAttractAll): myApplication(theApplication), - myVW1(theViewWindow1), - myVW2(theViewWindow2), + myViewWindow1(theViewWindow1), + myViewWindow2(theViewWindow2), myAttractAll(theAttractAll) {} @@ -330,7 +320,7 @@ namespace VISU { if (tabDesk) { QtxWorkstack* workstack = tabDesk->workstack(); if (workstack) { - workstack->Attract(myVW1, myVW2, myAttractAll); + workstack->Attract(myViewWindow1, myViewWindow2, myAttractAll); } } } @@ -342,12 +332,7 @@ namespace VISU { { if (!CORBA::is_nil(theView)) { if (VISU::View_i* pView = dynamic_cast(VISU::GetServant(theView).in())) { - if (pView) { - SUIT_ViewWindow* aVW1 = GetViewWindow(); - SUIT_ViewWindow* aVW2 = pView->GetViewWindow(); - if (aVW1 && aVW2) - ProcessVoidEvent(new TAttractEvent(myApplication, aVW1, aVW2, false)); - } + ProcessVoidEvent(new TAttractEvent(myApplication,myViewWindow,pView->myViewWindow,false)); } } } @@ -358,12 +343,7 @@ namespace VISU { { if (!CORBA::is_nil(theView)) { if (VISU::View_i* pView = dynamic_cast(VISU::GetServant(theView).in())) { - if (pView) { - SUIT_ViewWindow* aVW1 = GetViewWindow(); - SUIT_ViewWindow* aVW2 = pView->GetViewWindow(); - if (aVW1 && aVW2) - ProcessVoidEvent(new TAttractEvent(myApplication, aVW1, aVW2, true)); - } + ProcessVoidEvent(new TAttractEvent(myApplication,myViewWindow,pView->myViewWindow,true)); } } } @@ -371,7 +351,7 @@ namespace VISU { struct TSizePositionEvent: public SALOME_Event { SalomeApp_Application * myApplication; - SUIT_ViewWindow * myVW; + SUIT_ViewWindow * myViewWindow; double myValue; bool myIsSize; @@ -381,7 +361,7 @@ namespace VISU { double theValue, bool theIsSize): myApplication(theApplication), - myVW(theViewWindow), + myViewWindow(theViewWindow), myValue(theValue), myIsSize(theIsSize) {} @@ -395,9 +375,9 @@ namespace VISU { QtxWorkstack* workstack = tabDesk->workstack(); if (workstack) { if (myIsSize) { - //jfa to do:workstack->SetRelativeSizeInSplitter(myVW, myValue); + //jfa to do:workstack->SetRelativeSizeInSplitter(myViewWindow, myValue); } else { - workstack->SetRelativePositionInSplitter(myVW, myValue); + workstack->SetRelativePositionInSplitter(myViewWindow, myValue); } } } @@ -411,9 +391,7 @@ namespace VISU { if (thePosition < 0.0 || 1.0 < thePosition) { return; } - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSizePositionEvent(myApplication, aVW, thePosition, false)); + ProcessVoidEvent(new TSizePositionEvent(myApplication,myViewWindow,thePosition,false)); } void @@ -423,15 +401,13 @@ namespace VISU { if (theSize < 0.0 || 1.0 < theSize) { return; } - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSizePositionEvent(myApplication, aVW, theSize, true)); + ProcessVoidEvent(new TSizePositionEvent(myApplication,myViewWindow,theSize,true)); } struct TWSSizePositionEvent: public SALOME_Event { SalomeApp_Application * myApplication; - SUIT_ViewWindow * myVW; + SUIT_ViewWindow * myViewWindow; Qt::Orientation myOrientation; double myValue; bool myIsSize; @@ -443,7 +419,7 @@ namespace VISU { double theValue, bool theIsSize): myApplication(theApplication), - myVW(theViewWindow), + myViewWindow(theViewWindow), myOrientation(theOrientation), myValue(theValue), myIsSize(theIsSize) @@ -458,9 +434,9 @@ namespace VISU { QtxWorkstack* workstack = tabDesk->workstack(); if (workstack) { if (myIsSize) { - //jfa to do:workstack->SetRelativeSize(myVW, myOrientation, myValue); + //jfa to do:workstack->SetRelativeSize(myViewWindow, myOrientation, myValue); } else { - workstack->SetRelativePosition(myVW, myOrientation, myValue); + workstack->SetRelativePosition(myViewWindow, myOrientation, myValue); } } } @@ -474,10 +450,8 @@ namespace VISU { if (thePosition < 0.0 || 1.0 < thePosition) { return; } - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TWSSizePositionEvent(myApplication, aVW, - Qt::Horizontal, thePosition, false)); + ProcessVoidEvent(new TWSSizePositionEvent(myApplication,myViewWindow, + Qt::Horizontal,thePosition,false)); } void @@ -487,10 +461,8 @@ namespace VISU { if (thePosition < 0.0 || 1.0 < thePosition) { return; } - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TWSSizePositionEvent(myApplication, aVW, - Qt::Vertical, thePosition, false)); + ProcessVoidEvent(new TWSSizePositionEvent(myApplication,myViewWindow, + Qt::Vertical,thePosition,false)); } void @@ -500,10 +472,8 @@ namespace VISU { if (theSize < 0.0 || 1.0 < theSize) { return; } - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TWSSizePositionEvent(myApplication, aVW, - Qt::Horizontal, theSize, true)); + ProcessVoidEvent(new TWSSizePositionEvent(myApplication,myViewWindow, + Qt::Horizontal,theSize,true)); } void @@ -513,17 +483,15 @@ namespace VISU { if (theSize < 0.0 || 1.0 < theSize) { return; } - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TWSSizePositionEvent(myApplication, aVW, - Qt::Vertical, theSize, true)); + ProcessVoidEvent(new TWSSizePositionEvent(myApplication,myViewWindow, + Qt::Vertical,theSize,true)); } // End: New methods for view parameters management // Begin: Old methods for view parameters management, they don't work now struct TSetViewSize: public SALOME_Event { - SUIT_ViewWindow* myVW; + SUIT_ViewWindow* myViewWindow; typedef void (QRect::* TAction)(int); TAction myAction; CORBA::Long mySize; @@ -532,7 +500,7 @@ namespace VISU { TSetViewSize(SUIT_ViewWindow* theViewWindow, TAction theAction, CORBA::Long theSize): - myVW(theViewWindow), + myViewWindow(theViewWindow), myAction(theAction), mySize(theSize) {} @@ -541,7 +509,7 @@ namespace VISU { void Execute() { - if (QWidget* aParent = myVW->parentWidget(true)) { + if (QWidget* aParent = myViewWindow->parentWidget(true)) { QRect aQRect = aParent->frameGeometry(); (aQRect.*myAction)(mySize); aParent->setGeometry(aQRect); @@ -566,7 +534,7 @@ namespace VISU { struct TGetViewSize: public SALOME_Event { - SUIT_ViewWindow* myVW; + SUIT_ViewWindow* myViewWindow; typedef int (QRect::* TAction)() const; TAction myAction; @@ -577,7 +545,7 @@ namespace VISU { public: TGetViewSize(SUIT_ViewWindow* theViewWindow, TAction theAction): - myVW(theViewWindow), + myViewWindow(theViewWindow), myAction(theAction) {} @@ -585,7 +553,7 @@ namespace VISU { void Execute() { - if(QWidget* aParent = myVW->parentWidget(true)){ + if(QWidget* aParent = myViewWindow->parentWidget(true)){ QRect aQRect = aParent->frameGeometry(); myResult = (aQRect.*myAction)(); } @@ -611,13 +579,13 @@ namespace VISU { class TWorkspaceEvent: public SALOME_Event { protected: - QWidget* myVW; + QWidget* myViewWindow; QWidget* myWorkspace; public: TWorkspaceEvent(QWidget* theViewWindow, QWidget* theWorkspace): - myVW(theViewWindow), + myViewWindow(theViewWindow), myWorkspace(theWorkspace) {} }; @@ -640,7 +608,7 @@ namespace VISU { void Execute() { - if(QWidget* aParent = myVW->parentWidget(true)) + if(QWidget* aParent = myViewWindow->parentWidget(true)) SUIT_Tools::alignWidget(aParent,myWorkspace,myAligment); } }; @@ -721,7 +689,7 @@ namespace VISU { void Execute() { - if(QWidget* aParent = myVW->parentWidget(true)) + if(QWidget* aParent = myViewWindow->parentWidget(true)) aParent->move(int(myX*myWorkspace->width()),int(myY*myWorkspace->height())); } }; @@ -748,7 +716,7 @@ namespace VISU { void Execute() { - if(QWidget* aParent = myVW->parentWidget(true)) + if(QWidget* aParent = myViewWindow->parentWidget(true)) aParent->setGeometry(aParent->x(), aParent->y(), int(myX*myWorkspace->width()), @@ -784,9 +752,7 @@ namespace VISU { } }; - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TEvent(aVW, theColor)); + ProcessVoidEvent(new TEvent(myViewWindow,theColor)); } @@ -815,42 +781,28 @@ namespace VISU { View_i:: GetBackground() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - return ProcessEvent(new TBackgroundEvent(aVW)); - - SALOMEDS::Color aBlack; - aBlack.R = 0.0; - aBlack.G = 0.0; - aBlack.B = 0.0; - return aBlack; + return ProcessEvent(new TBackgroundEvent(myViewWindow)); } void View_i:: Minimize() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TFrameActionEvent(aVW, &SUIT_ViewWindow::showMinimized)); + ProcessVoidEvent(new TFrameActionEvent(myViewWindow,&SUIT_ViewWindow::showMinimized)); } void View_i:: Restore() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TFrameActionEvent(aVW, &SUIT_ViewWindow::showNormal)); + ProcessVoidEvent(new TFrameActionEvent(myViewWindow,&SUIT_ViewWindow::showNormal)); } void View_i:: Maximize() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TFrameActionEvent(aVW, &SUIT_ViewWindow::showMaximized)); + ProcessVoidEvent(new TFrameActionEvent(myViewWindow,&SUIT_ViewWindow::showMaximized)); } void @@ -885,13 +837,13 @@ namespace VISU { class TSavePictureEvent: public SALOME_Event { - SUIT_ViewWindow * myVW; + SUIT_ViewWindow * myViewWindow; const char * myFileName; public: typedef CORBA::Boolean TResult; TResult myResult; TSavePictureEvent (SUIT_ViewWindow * theViewWindow, const char * theFileName) - : myVW(theViewWindow), + : myViewWindow(theViewWindow), myFileName(theFileName), myResult(false) { @@ -899,8 +851,8 @@ namespace VISU { virtual void Execute() { - if (myVW) { - QImage img = myVW->dumpView(); + if (myViewWindow) { + QImage img = myViewWindow->dumpView(); if (!img.isNull()) { QString fileName (myFileName); if (!fileName.isEmpty()) { @@ -909,7 +861,6 @@ namespace VISU { if (fmt == "JPG" ) fmt = "JPEG"; //QApplication::setOverrideCursor(Qt::waitCursor); img.save(fileName, fmt.latin1()); - myResult = true; //QApplication::restoreOverrideCursor(); } } @@ -920,11 +871,12 @@ namespace VISU { CORBA::Boolean View_i::SavePicture(const char* theFileName) { - return ProcessEvent(new TSavePictureEvent (GetViewWindow(), theFileName)); + return ProcessEvent(new TSavePictureEvent (myViewWindow,theFileName)); } const char* - View_i::GetComment() const + View_i:: + GetComment() const { return ""; } @@ -935,40 +887,76 @@ namespace VISU { { } - SUIT_ViewWindow* View_i::GetViewWindow() - { - if (myViewWindow) { - QPtrVector aViews = myViewManager->getViews(); - int aPos = aViews.find(myViewWindow); - if (aPos < 0) - myViewWindow = NULL; - } - return myViewWindow; - } - void View_i::SetViewWindow(SUIT_ViewWindow* theViewWindow) + //================= OLD CODE =================== + + //QAD_Study* CheckStudy (SALOMEDS::Study_ptr theStudy) + //{ + // //QAD_Desktop* aDesktop = QAD_Application::getDesktop(); + // //QAD_Study* aStudy = aDesktop->findStudy(theStudy); + // if (!aStudy) { + // CORBA::String_var aName = theStudy->Name(); + // aFileInfo.setFile(aName.in()); + // if (aFileInfo.exists()) + // aStudy = aDesktop->loadStudy(aFileInfo.baseName()); + // else + // aStudy = aDesktop->loadStudy(aName.in()); + // if (!aStudy) { + // MESSAGE("CheckStudy()::ERROR: Can't load study"); + // } + // } + // return aStudy; + //} + + template + struct TNewSpecViewEvent: public SALOME_Event { - myViewWindow = theViewWindow; - } + SalomeApp_Application* myApplication; + typedef SUIT_ViewManager* TResult; + TResult myResult; + + TNewSpecViewEvent (SalomeApp_Application* theApplication): + myApplication(theApplication), + myResult(NULL) + {} + + virtual + void + Execute() + { + myResult = myApplication->getViewManager(TViewer::Type(), false); + if (!myResult) { + myResult = myApplication->getViewManager(TViewer::Type(), true); + myResult->closeAllViews(); + } + } + }; //=========================================================================== XYPlot_i::XYPlot_i (SalomeApp_Application* theApplication) : View_i(theApplication, NULL) { if (MYDEBUG) MESSAGE("XYPlot_i::XYPlot_i"); + if (theApplication) { + myViewManager = ProcessEvent(new TNewSpecViewEvent(theApplication)); + } } + struct TCreatePlot2dViewEvent: public SALOME_Event { - XYPlot_i * myPlot2dView; - int myNew; + SUIT_ViewManager* myViewManager; + XYPlot_i * myPlot2dView; + int myNew; typedef Plot2d_ViewFrame* TResult; TResult myResult; - TCreatePlot2dViewEvent (XYPlot_i * thePlot2dView, - const int theNew): + TCreatePlot2dViewEvent (SUIT_ViewManager* theViewManager, + XYPlot_i * thePlot2dView, + const int theNew): + myViewManager(theViewManager), myPlot2dView(thePlot2dView), myNew(theNew), myResult(NULL) @@ -978,48 +966,27 @@ namespace VISU { void Execute() { - if (!myPlot2dView->myApplication) - return; - - SUIT_ViewManager* aViewMgr = - myPlot2dView->myApplication->getViewManager(SPlot2d_Viewer::Type(), false); - SUIT_ViewWindow* aVW = NULL; - - if (aViewMgr) { - if (myNew) - aVW = aViewMgr->createViewWindow(); - else - aVW = aViewMgr->getActiveView(); + if (myNew) { + myPlot2dView->myViewWindow = myViewManager->createViewWindow(); } else { - if (myNew) { - aViewMgr = myPlot2dView->myApplication->getViewManager(SPlot2d_Viewer::Type(), true); - aVW = aViewMgr->getActiveView(); - } else { - return; // there are no current Plot2d view - } + myPlot2dView->myViewWindow = myViewManager->getActiveView(); } - - if (aVW) { - Plot2d_ViewWindow* aPlot2dVW = dynamic_cast(aVW); + if (myPlot2dView->myViewWindow) { + Plot2d_ViewWindow* aPlot2dVW = dynamic_cast(myPlot2dView->myViewWindow); if (aPlot2dVW) { myResult = aPlot2dVW->getViewFrame(); if (myResult) { myResult->Repaint(); - } - - myPlot2dView->myViewManager = aViewMgr; - myPlot2dView->SetViewWindow(aVW); - } + } + } } } }; Storable* XYPlot_i::Create (int theNew) { - myView = ProcessEvent(new TCreatePlot2dViewEvent(this, theNew)); - if (myView) - return this; - return NULL; + myView = ProcessEvent(new TCreatePlot2dViewEvent(myViewManager, this, theNew)); + return this; } void XYPlot_i::Update() @@ -1030,13 +997,7 @@ namespace VISU { void XYPlot_i::Close() { //jfa: may be need to be enclosed in SALOME_Event? - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - aVW->close(); - //QPtrVector aViews = myViewManager->getViews(); - //int aPos = aViews.find(myViewWindow); - //if (aPos >= 0) - // myViewWindow->close(); + myViewWindow->close(); } XYPlot_i::~XYPlot_i() { @@ -1045,59 +1006,49 @@ namespace VISU { void XYPlot_i::SetTitle (const char* theTitle) { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TVoidMemFun1ArgEvent - (aVW, &SUIT_ViewWindow::setCaption, QString(theTitle))); + ProcessVoidEvent(new TVoidMemFun1ArgEvent + (myViewWindow, &SUIT_ViewWindow::setCaption, QString(theTitle))); } char* XYPlot_i::GetTitle() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - return CORBA::string_dup(aVW->caption().latin1()); - return CORBA::string_dup(""); + //jfa: may be need to be enclosed in SALOME_Event? + return CORBA::string_dup(myViewWindow->caption().latin1()); } void XYPlot_i::SetSubTitle (const char* theTitle) { - if (GetViewWindow()) - ProcessVoidEvent(new TVoidMemFun1ArgEvent - (myView, &Plot2d_ViewFrame::setTitle, QString(theTitle))); + ProcessVoidEvent(new TVoidMemFun1ArgEvent + (myView, &Plot2d_ViewFrame::setTitle, QString(theTitle))); } char* XYPlot_i::GetSubTitle() { - if (GetViewWindow()) - return CORBA::string_dup(myView->getTitle()); - return CORBA::string_dup(""); + //jfa: may be need to be enclosed in SALOME_Event? + return CORBA::string_dup(myView->getTitle()); } void XYPlot_i::SetCurveType (VISU::XYPlot::CurveType theType) { - if (GetViewWindow()) - ProcessVoidEvent(new TVoidMemFun2ArgEvent - (myView,&Plot2d_ViewFrame::setCurveType,theType,true)); + ProcessVoidEvent(new TVoidMemFun2ArgEvent + (myView,&Plot2d_ViewFrame::setCurveType,theType,true)); } VISU::XYPlot::CurveType XYPlot_i::GetCurveType() { - if (GetViewWindow()) - return (VISU::XYPlot::CurveType)myView->getCurveType(); - return VISU::XYPlot::POINTS; + //jfa: may be need to be enclosed in SALOME_Event? + return (VISU::XYPlot::CurveType)myView->getCurveType(); } void XYPlot_i::SetMarkerSize (CORBA::Long theSize) { - if (GetViewWindow()) - ProcessVoidEvent(new TVoidMemFun2ArgEvent - (myView,&Plot2d_ViewFrame::setMarkerSize,theSize,true)); + ProcessVoidEvent(new TVoidMemFun2ArgEvent + (myView,&Plot2d_ViewFrame::setMarkerSize,theSize,true)); } CORBA::Long XYPlot_i::GetMarkerSize() { - if (GetViewWindow()) - return myView->getMarkerSize(); - return -1; + //jfa: may be need to be enclosed in SALOME_Event? + return myView->getMarkerSize(); } class TEnableGridEvent: public SALOME_Event @@ -1126,17 +1077,15 @@ namespace VISU { void XYPlot_i::EnableXGrid (CORBA::Boolean theMajor, CORBA::Long theNumMajor, CORBA::Boolean theMinor, CORBA::Long theNumMinor) { - if (GetViewWindow()) - ProcessVoidEvent(new TEnableGridEvent(myView,&Plot2d_ViewFrame::setXGrid, - theMajor,theNumMajor,theMinor,theNumMinor)); + ProcessVoidEvent(new TEnableGridEvent(myView,&Plot2d_ViewFrame::setXGrid, + theMajor,theNumMajor,theMinor,theNumMinor)); } void XYPlot_i::EnableYGrid(CORBA::Boolean theMajor, CORBA::Long theNumMajor, CORBA::Boolean theMinor, CORBA::Long theNumMinor) { //asl: Plot2d_ViewFrame::setYGrid has more parameters - //if (GetViewWindow()) - // ProcessVoidEvent(new TEnableGridEvent(myView,&Plot2d_ViewFrame::setYGrid, - // theMajor,theNumMajor,theMinor,theNumMinor)); + //ProcessVoidEvent(new TEnableGridEvent(myView,&Plot2d_ViewFrame::setYGrid, + // theMajor,theNumMajor,theMinor,theNumMinor)); } class TSetScaleModeEvent: public SALOME_Event @@ -1159,31 +1108,26 @@ namespace VISU { void XYPlot_i::SetHorScaling (VISU::Scaling theScaling) { - if (GetViewWindow()) - ProcessVoidEvent(new TSetScaleModeEvent(myView,&Plot2d_ViewFrame::setHorScaleMode, - theScaling == VISU::LOGARITHMIC)); + ProcessVoidEvent(new TSetScaleModeEvent(myView,&Plot2d_ViewFrame::setHorScaleMode, + theScaling == VISU::LOGARITHMIC)); } VISU::Scaling XYPlot_i::GetHorScaling() { //jfa: may be need to be enclosed in SALOME_Event? - if (GetViewWindow()) - return (VISU::Scaling)myView->getHorScaleMode(); - return VISU::LINEAR; + return (VISU::Scaling)myView->getHorScaleMode(); } void XYPlot_i::SetVerScaling(VISU::Scaling theScaling) { - if (GetViewWindow()) - ProcessVoidEvent(new TSetScaleModeEvent(myView,&Plot2d_ViewFrame::setVerScaleMode, - theScaling == VISU::LOGARITHMIC)); + ProcessVoidEvent(new TSetScaleModeEvent(myView,&Plot2d_ViewFrame::setVerScaleMode, + theScaling == VISU::LOGARITHMIC)); } VISU::Scaling XYPlot_i::GetVerScaling() { - if (GetViewWindow()) - return (VISU::Scaling)myView->getVerScaleMode(); - return VISU::LINEAR; + //jfa: may be need to be enclosed in SALOME_Event? + return (VISU::Scaling)myView->getVerScaleMode(); } class TSetTitleEvent: public SALOME_Event @@ -1204,33 +1148,28 @@ namespace VISU { void XYPlot_i::SetXTitle (const char* theTitle) { - if (GetViewWindow()) - ProcessVoidEvent(new TSetTitleEvent(myView, Plot2d_ViewFrame::XTitle, theTitle)); + ProcessVoidEvent(new TSetTitleEvent(myView, Plot2d_ViewFrame::XTitle, theTitle)); } char* XYPlot_i::GetXTitle() { - if (GetViewWindow()) - return CORBA::string_dup(myView->getTitle(Plot2d_ViewFrame::XTitle)); - return CORBA::string_dup(""); + //jfa: may be need to be enclosed in SALOME_Event? + return CORBA::string_dup(myView->getTitle(Plot2d_ViewFrame::XTitle)); } void XYPlot_i::SetYTitle (const char* theTitle) { - if (GetViewWindow()) - ProcessVoidEvent(new TSetTitleEvent(myView, Plot2d_ViewFrame::YTitle, theTitle)); + ProcessVoidEvent(new TSetTitleEvent(myView, Plot2d_ViewFrame::YTitle, theTitle)); } char* XYPlot_i::GetYTitle() { - if (GetViewWindow()) - return CORBA::string_dup(myView->getTitle(Plot2d_ViewFrame::YTitle)); - return CORBA::string_dup(""); + //jfa: may be need to be enclosed in SALOME_Event? + return CORBA::string_dup(myView->getTitle(Plot2d_ViewFrame::YTitle)); } void XYPlot_i::ShowLegend (CORBA::Boolean theShowing) { - if (GetViewWindow()) - ProcessVoidEvent(new TVoidMemFun2ArgEvent - (myView,&Plot2d_ViewFrame::showLegend,theShowing,true)); + ProcessVoidEvent(new TVoidMemFun2ArgEvent + (myView,&Plot2d_ViewFrame::showLegend,theShowing,true)); } class TXYPlotViewEvent: public SALOME_Event @@ -1298,32 +1237,27 @@ namespace VISU { void XYPlot_i::Display (PrsObject_ptr thePrsObj) { - if (GetViewWindow()) - ProcessVoidEvent(new TXYPlotViewEvent (myApplication,myView,thePrsObj,eDisplay)); + ProcessVoidEvent(new TXYPlotViewEvent (myApplication,myView,thePrsObj,eDisplay)); } void XYPlot_i::Erase (PrsObject_ptr thePrsObj) { - if (GetViewWindow()) - ProcessVoidEvent(new TXYPlotViewEvent (myApplication,myView,thePrsObj,eErase)); + ProcessVoidEvent(new TXYPlotViewEvent (myApplication,myView,thePrsObj,eErase)); } void XYPlot_i::DisplayOnly (PrsObject_ptr thePrsObj) { - if (GetViewWindow()) - ProcessVoidEvent(new TXYPlotViewEvent (myApplication,myView,thePrsObj,eDisplayOnly)); + ProcessVoidEvent(new TXYPlotViewEvent (myApplication,myView,thePrsObj,eDisplayOnly)); } void XYPlot_i::EraseAll() { - if (GetViewWindow()) - ProcessVoidEvent(new TVoidMemFunEvent (myView,&Plot2d_ViewFrame::EraseAll)); + ProcessVoidEvent(new TVoidMemFunEvent (myView,&Plot2d_ViewFrame::EraseAll)); } void XYPlot_i::FitAll() { - if (GetViewWindow()) - ProcessVoidEvent(new TVoidMemFunEvent (myView,&Plot2d_ViewFrame::fitAll)); + ProcessVoidEvent(new TVoidMemFunEvent (myView,&Plot2d_ViewFrame::fitAll)); } class TFitRangeEvent: public SALOME_Event @@ -1479,19 +1413,22 @@ namespace VISU { : View_i(theApplication, NULL) { if (MYDEBUG) MESSAGE("View3D_i::View3D_i"); + if (theApplication) { + myViewManager = ProcessEvent(new TNewSpecViewEvent(theApplication)); + } } struct TCreateView3dEvent: public SALOME_Event { - View3D_i * myView3D; - int myNew; + SUIT_ViewManager* myViewManager; + int myNew; typedef SUIT_ViewWindow* TResult; TResult myResult; - TCreateView3dEvent (View3D_i * theView3D, - const int theNew): - myView3D(theView3D), + TCreateView3dEvent (SUIT_ViewManager* theViewManager, + const int theNew): + myViewManager(theViewManager), myNew(theNew), myResult(NULL) {} @@ -1500,54 +1437,33 @@ namespace VISU { void Execute() { - if (!myView3D->myApplication) - return; - - SUIT_ViewManager * aViewMgr = - myView3D->myApplication->getViewManager(SVTK_Viewer::Type(), false); - - if (aViewMgr) { - if (myNew) { - myResult = aViewMgr->createViewWindow(); - } else { - myResult = aViewMgr->getActiveView(); - } + if (myNew) { + myResult = myViewManager->createViewWindow(); } else { - if (myNew) { - aViewMgr = myView3D->myApplication->getViewManager(SVTK_Viewer::Type(), true); - myResult = aViewMgr->getActiveView(); - } else { - return; // there are no current 3D view - } + myResult = myViewManager->getActiveView(); } - - myView3D->myViewManager = aViewMgr; } }; Storable* View3D_i::Create (int theNew) { if (MYDEBUG) MESSAGE("View3D_i::Create"); - SUIT_ViewWindow* aVW = ProcessEvent(new TCreateView3dEvent(this, theNew)); - if (aVW) { - SetViewWindow(aVW); - return this; - } - return NULL; + myViewWindow = ProcessEvent(new TCreateView3dEvent(myViewManager, theNew)); + return this; } void View3D_i::Update() { class TEvent: public SALOME_Event { - SUIT_ViewWindow* myVW; + SUIT_ViewWindow* myViewWindow; public: - TEvent(SUIT_ViewWindow* theViewWindow): - myVW(theViewWindow) + TEvent(SUIT_ViewWindow* theStudyFrame): + myViewWindow(theStudyFrame) {} virtual void Execute() { - SVTK_ViewWindow* vf = VISU::GetViewWindow(myVW); + SVTK_ViewWindow* vf = GetViewWindow(myViewWindow); vtkRenderer* Renderer = vf->getRenderer(); vtkActorCollection* theActors = Renderer->GetActors(); theActors->InitTraversal(); @@ -1560,22 +1476,15 @@ namespace VISU { } } } - RepaintView(myVW); + RepaintView(myViewWindow); } }; - - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TEvent(aVW)); + ProcessVoidEvent(new TEvent(myViewWindow)); } bool View3D_i::SaveViewParams (SUIT_ViewManager* theViewManager, const char* theName) { MESSAGE("View3D_i::SaveViewParams()"); - - if (!theViewManager || !theName) - return false; - _PTR(Study) aCStudy; if (SUIT_Study* aSStudy = theViewManager->study()) { if (SalomeApp_Study* aStudy = dynamic_cast(aSStudy)) { @@ -1585,7 +1494,7 @@ namespace VISU { if (!aCStudy) return false; - if (strcmp(theName, "") != 0) { + if (theName) { std::vector<_PTR(SObject)> aList = aCStudy->FindObjectByName(theName, "VISU"); _PTR(GenericAttribute) anAttr; int iEnd = aList.size(); @@ -1613,18 +1522,18 @@ namespace VISU { class TSaveViewParamsEvent: public SALOME_Event { - SUIT_ViewManager* myViewMgr; + SUIT_ViewManager* myViewManager; const char* myName; public: TSaveViewParamsEvent (SUIT_ViewManager* theViewManager, const char* theName): - myViewMgr(theViewManager), + myViewManager(theViewManager), myName(theName) {} virtual void Execute() { - myResult = View3D_i::SaveViewParams(myViewMgr, myName); + myResult = View3D_i::SaveViewParams(myViewManager, myName); } typedef CORBA::Boolean TResult; TResult myResult; @@ -1672,18 +1581,18 @@ namespace VISU { class TRestoreViewParamsEvent: public SALOME_Event { - SUIT_ViewManager* myViewMgr; + SUIT_ViewManager* myViewManager; const char* myName; public: TRestoreViewParamsEvent (SUIT_ViewManager* theViewManager, const char* theName): - myViewMgr(theViewManager), + myViewManager(theViewManager), myName(theName) {} virtual void Execute() { - myResult = View3D_i::RestoreViewParams(myViewMgr, myName); + myResult = View3D_i::RestoreViewParams(myViewManager, myName); } typedef CORBA::Boolean TResult; TResult myResult; @@ -1694,7 +1603,7 @@ namespace VISU { return ProcessEvent(new TRestoreViewParamsEvent (myViewManager, theName)); } - void View3D_i::Restore (SUIT_ViewWindow* theViewWindow, + void View3D_i::Restore (SUIT_ViewWindow* theStudyFrame, const Storable::TRestoringMap& theMap) { SALOMEDS::Color aColor; @@ -1724,59 +1633,59 @@ namespace VISU { aScaleFactor[1] = VISU::Storable::FindValue(theMap,"myScaleFactor[1]").toDouble(); aScaleFactor[2] = VISU::Storable::FindValue(theMap,"myScaleFactor[2]").toDouble(); - SetBackground(theViewWindow,aColor); - SetPointOfView(theViewWindow,aPosition); - SetViewUp(theViewWindow,aViewUp); - SetFocalPoint(theViewWindow,aFocalPnt); - SetParallelScale(theViewWindow,aParallelScale); - ScaleView(theViewWindow,VISU::View3D::XAxis,aScaleFactor[0]); - ScaleView(theViewWindow,VISU::View3D::YAxis,aScaleFactor[1]); - ScaleView(theViewWindow,VISU::View3D::ZAxis,aScaleFactor[2]); + SetBackground(theStudyFrame,aColor); + SetPointOfView(theStudyFrame,aPosition); + SetViewUp(theStudyFrame,aViewUp); + SetFocalPoint(theStudyFrame,aFocalPnt); + SetParallelScale(theStudyFrame,aParallelScale); + ScaleView(theStudyFrame,VISU::View3D::XAxis,aScaleFactor[0]); + ScaleView(theStudyFrame,VISU::View3D::YAxis,aScaleFactor[1]); + ScaleView(theStudyFrame,VISU::View3D::ZAxis,aScaleFactor[2]); } - string View3D_i::ToString (SUIT_ViewWindow* theViewWindow) + string View3D_i::ToString (SUIT_ViewWindow* theStudyFrame) { ostringstream strOut; - Storable::DataToStream(strOut, "myComment", myComment.c_str()); - ToStream(theViewWindow, strOut); - strOut << ends; - if(MYDEBUG) MESSAGE("View3D_i::ToString - " << strOut.str()); + Storable::DataToStream( strOut, "myComment", myComment.c_str() ); + ToStream(theStudyFrame,strOut); + strOut<GetBackground(backint); + GetRenderer(theStudyFrame)->GetBackground(backint); Storable::DataToStream(theStr,"myColor.R",backint[0]); Storable::DataToStream(theStr,"myColor.G",backint[1]); Storable::DataToStream(theStr,"myColor.B",backint[2]); double aPosition[3]; - GetPointOfView(theViewWindow,aPosition); + GetPointOfView(theStudyFrame,aPosition); Storable::DataToStream(theStr,"myPosition[0]",aPosition[0]); Storable::DataToStream(theStr,"myPosition[1]",aPosition[1]); Storable::DataToStream(theStr,"myPosition[2]",aPosition[2]); double aFocalPnt[3]; - GetFocalPoint(theViewWindow,aFocalPnt); + GetFocalPoint(theStudyFrame,aFocalPnt); Storable::DataToStream(theStr,"myFocalPnt[0]",aFocalPnt[0]); Storable::DataToStream(theStr,"myFocalPnt[1]",aFocalPnt[1]); Storable::DataToStream(theStr,"myFocalPnt[2]",aFocalPnt[2]); double aViewUp[3]; - GetCamera(theViewWindow)->GetViewUp(aViewUp); + GetCamera(theStudyFrame)->GetViewUp(aViewUp); Storable::DataToStream(theStr,"myViewUp[0]",aViewUp[0]); Storable::DataToStream(theStr,"myViewUp[1]",aViewUp[1]); Storable::DataToStream(theStr,"myViewUp[2]",aViewUp[2]); - Storable::DataToStream(theStr,"myParallelScale",GetParallelScale(theViewWindow)); + Storable::DataToStream(theStr,"myParallelScale",GetParallelScale(theStudyFrame)); double aScaleFactor[3]; - VISU::GetViewWindow(theViewWindow)->GetScale(aScaleFactor); + GetViewWindow(theStudyFrame)->GetScale(aScaleFactor); Storable::DataToStream(theStr,"myScaleFactor[0]",aScaleFactor[0]); Storable::DataToStream(theStr,"myScaleFactor[1]",aScaleFactor[1]); Storable::DataToStream(theStr,"myScaleFactor[2]",aScaleFactor[2]); @@ -1784,21 +1693,13 @@ namespace VISU { void View3D_i::ToStream(std::ostringstream& theStr) { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ToStream(aVW, theStr); + ToStream(myViewWindow,theStr); } void View3D_i::Close() { //jfa: may be need to be enclosed in SALOME_Event? - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - aVW->close(); - //QPtrVector aViews = myViewManager->getViews(); - //int aPos = aViews.find(myViewWindow); - //if (aPos >= 0) - // myViewWindow->close(); + myViewWindow->close(); } View3D_i::~View3D_i() @@ -1808,21 +1709,17 @@ namespace VISU { void View3D_i::SetTitle (const char* theTitle) { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TVoidMemFun1ArgEvent - (aVW,&SUIT_ViewWindow::setCaption,QString(theTitle))); + ProcessVoidEvent(new TVoidMemFun1ArgEvent + (myViewWindow,&SUIT_ViewWindow::setCaption,QString(theTitle))); } char* View3D_i::GetTitle() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - return CORBA::string_dup(aVW->caption().latin1()); - return CORBA::string_dup(""); + //jfa: may be need to be enclosed in SALOME_Event? + return CORBA::string_dup(myViewWindow->caption().latin1()); } - void View3D_i::SetBackground (SUIT_ViewWindow* theViewWindow, + void View3D_i::SetBackground (SUIT_ViewWindow* theStudyFrame, const SALOMEDS::Color& theColor) { //jfa: may be need to be enclosed in SALOME_Event? @@ -1830,123 +1727,110 @@ namespace VISU { aColor[0] = int(255.0*theColor.R); 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); + QColor aNewColor(aColor[0],aColor[1],aColor[2]); + GetViewWindow(theStudyFrame)->setBackgroundColor(aNewColor); } - SALOMEDS::Color View3D_i::GetBackground (SUIT_ViewWindow* theViewWindow) + SALOMEDS::Color View3D_i::GetBackground (SUIT_ViewWindow* theStudyFrame) { + //jfa: may be need to be enclosed in SALOME_Event? SALOMEDS::Color aColor; float backint[3]; - GetRenderer(theViewWindow)->GetBackground(backint); + GetRenderer(theStudyFrame)->GetBackground(backint); aColor.R = backint[0]; aColor.G = backint[1]; aColor.B = backint[2]; return aColor; } class TUpdateViewerEvent: public SALOME_Event { - SUIT_ViewWindow* myVW; + SUIT_ViewWindow* myViewWindow; Prs3d_i* myPrs3d; int myDisplaing; public: - TUpdateViewerEvent(SUIT_ViewWindow* theViewWindow, + TUpdateViewerEvent(SUIT_ViewWindow* theStudyFrame, Prs3d_i* thePrs3d, int theDisplaing): - myVW(theViewWindow), + myViewWindow(theStudyFrame), myPrs3d(thePrs3d), myDisplaing(theDisplaing) {} virtual void Execute(){ - UpdateViewer(myVW, myDisplaing, myPrs3d); + UpdateViewer(myViewWindow,myDisplaing,myPrs3d); } }; void View3D_i::EraseAll() { if(MYDEBUG) MESSAGE("View3D_i::EraseAll"); - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TUpdateViewerEvent(aVW,NULL,eEraseAll)); + ProcessVoidEvent(new TUpdateViewerEvent(myViewWindow,NULL,eEraseAll)); } void View3D_i::DisplayAll() { if(MYDEBUG) MESSAGE("View3D_i::DisplayAll"); - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TUpdateViewerEvent(aVW,NULL,eDisplayAll)); + ProcessVoidEvent(new TUpdateViewerEvent(myViewWindow,NULL,eDisplayAll)); } void View3D_i::Erase (PrsObject_ptr thePrsObj) { if(MYDEBUG) MESSAGE("View3D_i::Erase"); - SUIT_ViewWindow* aVW = GetViewWindow(); CORBA::Object_ptr anObj = thePrsObj; - Prs3d_i* aPrs = dynamic_cast(VISU::GetServant(anObj).in()); - if (aVW && aPrs) - ProcessVoidEvent(new TUpdateViewerEvent(aVW,aPrs,eErase)); + if(Prs3d_i* aPrs = dynamic_cast(VISU::GetServant(anObj).in())){ + ProcessVoidEvent(new TUpdateViewerEvent(myViewWindow,aPrs,eErase)); + } } void View3D_i::Display (PrsObject_ptr thePrsObj) { if(MYDEBUG) MESSAGE("View3D_i::Display"); - SUIT_ViewWindow* aVW = GetViewWindow(); CORBA::Object_ptr anObj = thePrsObj; - Prs3d_i* aPrs = dynamic_cast(VISU::GetServant(anObj).in()); - if (aVW && aPrs) - ProcessVoidEvent(new TUpdateViewerEvent(aVW,aPrs,eDisplay)); + if(Prs3d_i* aPrs = dynamic_cast(VISU::GetServant(anObj).in())){ + ProcessVoidEvent(new TUpdateViewerEvent(myViewWindow,aPrs,eDisplay)); + } } void View3D_i::DisplayOnly (PrsObject_ptr thePrsObj) { if(MYDEBUG) MESSAGE("View3D_i::DisplayOnly"); - SUIT_ViewWindow* aVW = GetViewWindow(); CORBA::Object_ptr anObj = thePrsObj; - Prs3d_i* aPrs = dynamic_cast(VISU::GetServant(anObj).in()); - if (aVW && aPrs) - ProcessVoidEvent(new TUpdateViewerEvent(aVW,aPrs,eDisplayOnly)); + if(Prs3d_i* aPrs = dynamic_cast(VISU::GetServant(anObj).in())){ + ProcessVoidEvent(new TUpdateViewerEvent(myViewWindow,aPrs,eDisplayOnly)); + } } void View3D_i::FitAll() { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) { - ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW), &SVTK_ViewWindow::onFitAll)); - Update(); - } + ProcessVoidEvent(new TVoidMemFunEvent + (GetViewWindow(myViewWindow), &SVTK_ViewWindow::onFitAll)); + Update(); } void View3D_i::SetView (VISU::View3D::ViewType theType) { - SUIT_ViewWindow* aVW = GetViewWindow(); - if (!aVW) - return; - switch (theType) { case VISU::View3D::FRONT : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW), &SVTK_ViewWindow::onFrontView)); + (GetViewWindow(myViewWindow), &SVTK_ViewWindow::onFrontView)); break; case VISU::View3D::BACK : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW), &SVTK_ViewWindow::onBackView)); + (GetViewWindow(myViewWindow), &SVTK_ViewWindow::onBackView)); break; case VISU::View3D::LEFT : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW),&SVTK_ViewWindow::onLeftView)); + (GetViewWindow(myViewWindow),&SVTK_ViewWindow::onLeftView)); break; case VISU::View3D::RIGHT : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW),&SVTK_ViewWindow::onRightView)); + (GetViewWindow(myViewWindow),&SVTK_ViewWindow::onRightView)); break; case VISU::View3D::TOP : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW),&SVTK_ViewWindow::onTopView)); + (GetViewWindow(myViewWindow),&SVTK_ViewWindow::onTopView)); break; case VISU::View3D::BOTTOM : ProcessVoidEvent(new TVoidMemFunEvent - (VISU::GetViewWindow(aVW),&SVTK_ViewWindow::onBottomView)); + (GetViewWindow(myViewWindow),&SVTK_ViewWindow::onBottomView)); break; } Update(); @@ -1955,199 +1839,181 @@ namespace VISU { class TSet3DViewParamEvent: public SALOME_Event { public: - typedef void (*TFun)(SUIT_ViewWindow* theViewWindow, const CORBA::Double theParam[3]); + typedef void (*TFun)(SUIT_ViewWindow* theStudyFrame, const CORBA::Double theParam[3]); TSet3DViewParamEvent (TFun theFun, - SUIT_ViewWindow* theViewWindow, + SUIT_ViewWindow* theStudyFrame, const CORBA::Double theParam[3]): myFun(theFun), - myVW(theViewWindow), + myViewWindow(theStudyFrame), myParam(theParam) {} - virtual void Execute() { - myFun(myVW,myParam); + virtual void Execute(){ + myFun(myViewWindow,myParam); } private: TFun myFun; - SUIT_ViewWindow* myVW; + SUIT_ViewWindow* myViewWindow; const CORBA::Double* myParam; }; - void View3D_i::SetPointOfView (SUIT_ViewWindow* theViewWindow, + void View3D_i::SetPointOfView (SUIT_ViewWindow* theStudyFrame, const CORBA::Double thePosition[3]) { //jfa: may be need to be enclosed in SALOME_Event? - GetCamera(theViewWindow)->SetPosition(thePosition); + GetCamera(theStudyFrame)->SetPosition(thePosition); } void View3D_i::SetPointOfView (const VISU::View3D::XYZ thePosition) { if(MYDEBUG) MESSAGE("View3D_i::SetPointOfView"); - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSet3DViewParamEvent(&SetPointOfView,aVW,thePosition)); + ProcessVoidEvent(new TSet3DViewParamEvent(&SetPointOfView,myViewWindow,thePosition)); } - void View3D_i::GetPointOfView (SUIT_ViewWindow* theViewWindow, + void View3D_i::GetPointOfView (SUIT_ViewWindow* theStudyFrame, CORBA::Double thePosition[3]) { - GetCamera(theViewWindow)->GetPosition(thePosition); + //jfa: may be need to be enclosed in SALOME_Event? + GetCamera(theStudyFrame)->GetPosition(thePosition); } VISU::View3D::XYZ_slice* View3D_i::GetPointOfView() { + //jfa: may be need to be enclosed in SALOME_Event? if(MYDEBUG) MESSAGE("View3D_i::GetPointOfView"); CORBA::Double aPosition[3]; - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - GetPointOfView(aVW,aPosition); + GetPointOfView(myViewWindow,aPosition); return VISU::View3D::XYZ_dup(aPosition); } - void View3D_i::SetViewUp (SUIT_ViewWindow* theViewWindow, + void View3D_i::SetViewUp (SUIT_ViewWindow* theStudyFrame, const CORBA::Double theViewUp[3]) { - GetCamera(theViewWindow)->SetViewUp(theViewUp); + GetCamera(theStudyFrame)->SetViewUp(theViewUp); } void View3D_i::SetViewUp (const VISU::View3D::XYZ theViewUp) { if(MYDEBUG) MESSAGE("View3D_i::SetViewUp"); - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSet3DViewParamEvent(&SetViewUp,aVW,theViewUp)); + ProcessVoidEvent(new TSet3DViewParamEvent(&SetViewUp,myViewWindow,theViewUp)); } - void View3D_i::GetViewUp (SUIT_ViewWindow* theViewWindow, + void View3D_i::GetViewUp (SUIT_ViewWindow* theStudyFrame, CORBA::Double theViewUp[3]) { - GetCamera(theViewWindow)->GetViewUp(theViewUp); + GetCamera(theStudyFrame)->GetViewUp(theViewUp); } VISU::View3D::XYZ_slice* View3D_i::GetViewUp() { + //jfa: may be need to be enclosed in SALOME_Event? if(MYDEBUG) MESSAGE("View3D_i::GetViewUp"); CORBA::Double aViewUp[3]; - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - GetCamera(aVW)->GetViewUp(aViewUp); + GetCamera(myViewWindow)->GetViewUp(aViewUp); return VISU::View3D::XYZ_dup(aViewUp); } - void View3D_i::SetFocalPoint (SUIT_ViewWindow* theViewWindow, + void View3D_i::SetFocalPoint (SUIT_ViewWindow* theStudyFrame, const CORBA::Double theFocalPnt[3]) { - GetCamera(theViewWindow)->SetFocalPoint(theFocalPnt); + GetCamera(theStudyFrame)->SetFocalPoint(theFocalPnt); } void View3D_i::SetFocalPoint (const VISU::View3D::XYZ theCoord) { if(MYDEBUG) MESSAGE("View3D_i::SetFocalPoint"); - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSet3DViewParamEvent(&SetFocalPoint,aVW,theCoord)); + ProcessVoidEvent(new TSet3DViewParamEvent(&SetFocalPoint,myViewWindow,theCoord)); } - void View3D_i::GetFocalPoint (SUIT_ViewWindow* theViewWindow, + void View3D_i::GetFocalPoint (SUIT_ViewWindow* theStudyFrame, CORBA::Double theFocalPnt[3]) { - GetCamera(theViewWindow)->GetFocalPoint(theFocalPnt); + GetCamera(theStudyFrame)->GetFocalPoint(theFocalPnt); } VISU::View3D::XYZ_slice* View3D_i::GetFocalPoint() { + //jfa: may be need to be enclosed in SALOME_Event? if(MYDEBUG) MESSAGE("View3D_i::GetFocalPoint"); CORBA::Double aFocalPnt[3]; - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - GetFocalPoint(aVW,aFocalPnt); + GetFocalPoint(myViewWindow,aFocalPnt); return VISU::View3D::XYZ_dup(aFocalPnt); } class TSetViewParamEvent: public SALOME_Event { public: - typedef void (*TFun)(SUIT_ViewWindow* theViewWindow, CORBA::Double theParam); + typedef void (*TFun)(SUIT_ViewWindow* theStudyFrame, CORBA::Double theParam); TSetViewParamEvent (TFun theFun, - SUIT_ViewWindow* theViewWindow, + SUIT_ViewWindow* theStudyFrame, CORBA::Double theParam): myFun(theFun), - myVW(theViewWindow), + myViewWindow(theStudyFrame), myParam(theParam) {} virtual void Execute() { - myFun(myVW,myParam); + myFun(myViewWindow,myParam); } private: TFun myFun; - SUIT_ViewWindow* myVW; + SUIT_ViewWindow* myViewWindow; CORBA::Double myParam; }; - void View3D_i::SetParallelScale (SUIT_ViewWindow* theViewWindow, + void View3D_i::SetParallelScale (SUIT_ViewWindow* theStudyFrame, CORBA::Double theScale) { - GetCamera(theViewWindow)->SetParallelScale(theScale); + GetCamera(theStudyFrame)->SetParallelScale(theScale); } void View3D_i::SetParallelScale (CORBA::Double theScale) { if(MYDEBUG) MESSAGE("View3D_i::SetParallelScale"); - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - ProcessVoidEvent(new TSetViewParamEvent(&SetParallelScale,aVW,theScale)); + ProcessVoidEvent(new TSetViewParamEvent(&SetParallelScale,myViewWindow,theScale)); } - CORBA::Double View3D_i::GetParallelScale (SUIT_ViewWindow* theViewWindow) + CORBA::Double View3D_i::GetParallelScale (SUIT_ViewWindow* theStudyFrame) { - return GetCamera(theViewWindow)->GetParallelScale(); + return GetCamera(theStudyFrame)->GetParallelScale(); } CORBA::Double View3D_i::GetParallelScale() { + //jfa: may be need to be enclosed in SALOME_Event? if(MYDEBUG) MESSAGE("View3D_i::GetParallelScale"); - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) - return GetParallelScale(aVW); - return 1.0; + return GetParallelScale(myViewWindow); } - void View3D_i::ScaleView (SUIT_ViewWindow* theViewWindow, + void View3D_i::ScaleView (SUIT_ViewWindow* theStudyFrame, VISU::View3D::Axis theAxis, CORBA::Double theParam) { - SVTK_ViewWindow* aViewWindow = VISU::GetViewWindow(theViewWindow); + SVTK_ViewWindow* aViewFrame = GetViewWindow(theStudyFrame); double aScaleFactor[3]; - aViewWindow->GetScale(aScaleFactor); + aViewFrame->GetScale(aScaleFactor); aScaleFactor[theAxis] = theParam; - aViewWindow->SetScale(aScaleFactor); + aViewFrame->SetScale(aScaleFactor); } - void SetScaleView (SUIT_ViewWindow* theViewWindow, const CORBA::Double theScale[3]) + void SetScaleView (SUIT_ViewWindow* theStudyFrame, const CORBA::Double theScale[3]) { double aScale[3] = {theScale[0], theScale[1], theScale[2]}; - VISU::GetViewWindow(theViewWindow)->SetScale(aScale); + GetViewWindow(theStudyFrame)->SetScale(aScale); } void View3D_i::ScaleView(VISU::View3D::Axis theAxis, CORBA::Double theParam) { if(MYDEBUG) MESSAGE("View3D_i::ScaleView"); - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) { - double aScale[3]; - VISU::GetViewWindow(aVW)->GetScale(aScale); - aScale[theAxis] = theParam; - ProcessVoidEvent(new TSet3DViewParamEvent(&SetScaleView,aVW,aScale)); - } + double aScale[3]; + GetViewWindow(myViewWindow)->GetScale(aScale); + aScale[theAxis] = theParam; + ProcessVoidEvent(new TSet3DViewParamEvent(&SetScaleView,myViewWindow,aScale)); } void View3D_i::RemoveScale() { if(MYDEBUG) MESSAGE("View3D_i::RemoveScale"); - SUIT_ViewWindow* aVW = GetViewWindow(); - if (aVW) { - double aScale[3] = {1.0, 1.0, 1.0}; - ProcessVoidEvent(new TSet3DViewParamEvent(&SetScaleView,aVW,aScale)); - } + double aScale[3] = {1.0, 1.0, 1.0}; + ProcessVoidEvent(new TSet3DViewParamEvent(&SetScaleView,myViewWindow,aScale)); } } diff --git a/src/VISU_I/VISU_View_i.hh b/src/VISU_I/VISU_View_i.hh index 76b44da5..4f9c8176 100644 --- a/src/VISU_I/VISU_View_i.hh +++ b/src/VISU_I/VISU_View_i.hh @@ -49,8 +49,15 @@ namespace VISU public virtual Storable { public: + QWidget *myWorkspace; + SUIT_ViewWindow *myViewWindow; + + protected: + SalomeApp_Application *myApplication; + SUIT_ViewManager *myViewManager; + View_i (SalomeApp_Application *theApplication, - SUIT_ViewManager* theViewManager); + SUIT_ViewManager* theViewManager); virtual ~View_i(); public: @@ -108,18 +115,6 @@ namespace VISU virtual void Close() = 0; virtual void ToStream(std::ostringstream& theStr); virtual const char* GetComment() const; - - SUIT_ViewWindow* GetViewWindow(); - void SetViewWindow(SUIT_ViewWindow* theViewWindow); - - public: - QWidget *myWorkspace; - - SalomeApp_Application *myApplication; - SUIT_ViewManager *myViewManager; - - private: - SUIT_ViewWindow *myViewWindow; }; @@ -148,9 +143,9 @@ namespace VISU virtual CORBA::Long GetMarkerSize(); virtual void EnableXGrid (CORBA::Boolean theMajor, CORBA::Long theNumMajor, - CORBA::Boolean theMinor, CORBA::Long theNumMinor); + CORBA::Boolean theMinor, CORBA::Long theNumMinor); virtual void EnableYGrid (CORBA::Boolean theMajor, CORBA::Long theNumMajor, - CORBA::Boolean theMinor, CORBA::Long theNumMinor); + CORBA::Boolean theMinor, CORBA::Long theNumMinor); virtual void SetHorScaling (VISU::Scaling theScaling); virtual VISU::Scaling GetHorScaling(); @@ -225,10 +220,10 @@ namespace VISU virtual void SetTitle (const char* theTitle); virtual char* GetTitle(); - static void SetBackground (SUIT_ViewWindow* theViewWindow, + static void SetBackground (SUIT_ViewWindow* theStudyFrame, const SALOMEDS::Color& theColor); - static SALOMEDS::Color GetBackground (SUIT_ViewWindow* theViewWindow); + static SALOMEDS::Color GetBackground (SUIT_ViewWindow* theStudyFrame); virtual void EraseAll(); virtual void DisplayAll(); @@ -241,54 +236,54 @@ namespace VISU virtual void FitAll(); virtual void SetView (VISU::View3D::ViewType theType); - static void SetPointOfView (SUIT_ViewWindow* theViewWindow, - const CORBA::Double thePosition[3]); + static void SetPointOfView (SUIT_ViewWindow* theStudyFrame, + const CORBA::Double thePosition[3]); virtual void SetPointOfView (const VISU::View3D::XYZ theCoord); - static void GetPointOfView (SUIT_ViewWindow* theViewWindow, - CORBA::Double thePosition[3]); + static void GetPointOfView (SUIT_ViewWindow* theStudyFrame, + CORBA::Double thePosition[3]); virtual VISU::View3D::XYZ_slice* GetPointOfView(); - static void SetViewUp (SUIT_ViewWindow* theViewWindow, - const CORBA::Double theViewUp[3]); + static void SetViewUp (SUIT_ViewWindow* theStudyFrame, + const CORBA::Double theViewUp[3]); virtual void SetViewUp (const VISU::View3D::XYZ theDir); - static void GetViewUp (SUIT_ViewWindow* theViewWindow, CORBA::Double theViewUp[3]); + static void GetViewUp (SUIT_ViewWindow* theStudyFrame, CORBA::Double theViewUp[3]); virtual VISU::View3D::XYZ_slice* GetViewUp(); - static void SetFocalPoint (SUIT_ViewWindow* theViewWindow, const CORBA::Double theFocalPnt[3]); + static void SetFocalPoint (SUIT_ViewWindow* theStudyFrame, const CORBA::Double theFocalPnt[3]); virtual void SetFocalPoint (const VISU::View3D::XYZ theCoord); - static void View3D_i::GetFocalPoint (SUIT_ViewWindow* theViewWindow, CORBA::Double theFocalPnt[3]); + static void View3D_i::GetFocalPoint (SUIT_ViewWindow* theStudyFrame, CORBA::Double theFocalPnt[3]); virtual VISU::View3D::XYZ_slice* GetFocalPoint(); - static void SetParallelScale (SUIT_ViewWindow* theViewWindow, CORBA::Double theScale); + static void SetParallelScale (SUIT_ViewWindow* theStudyFrame, CORBA::Double theScale); virtual void SetParallelScale (CORBA::Double theScale); - static CORBA::Double GetParallelScale (SUIT_ViewWindow* theViewWindow); + static CORBA::Double GetParallelScale (SUIT_ViewWindow* theStudyFrame); virtual CORBA::Double GetParallelScale (); - static void ScaleView (SUIT_ViewWindow* theViewWindow, - VISU::View3D::Axis theAxis, CORBA::Double theParam); + static void ScaleView (SUIT_ViewWindow* theStudyFrame, + VISU::View3D::Axis theAxis, CORBA::Double theParam); virtual void ScaleView (VISU::View3D::Axis theAxis, CORBA::Double theParam); virtual void RemoveScale(); - static std::string ToString (SUIT_ViewWindow* theViewWindow); + static std::string ToString (SUIT_ViewWindow* theStudyFrame); - static void ToStream (SUIT_ViewWindow* theViewWindow, std::ostringstream& theStr); + static void ToStream (SUIT_ViewWindow* theStudyFrame, std::ostringstream& theStr); static bool SaveViewParams (SUIT_ViewManager* theViewManager, - const char* theName); + const char* theName); virtual CORBA::Boolean SaveViewParams (const char* theName); static bool RestoreViewParams (SUIT_ViewManager* theViewManager, - const char* theName); + const char* theName); virtual CORBA::Boolean RestoreViewParams (const char* theName); static QString GenerateViewParamsName(); - static void Restore (SUIT_ViewWindow* theViewWindow, - const Storable::TRestoringMap& theMap); + static void Restore (SUIT_ViewWindow* theStudyFrame, + const Storable::TRestoringMap& theMap); virtual void Close(); diff --git a/src/VVTK/VVTK_Renderer.cxx b/src/VVTK/VVTK_Renderer.cxx index 142008d1..a54004e6 100644 --- a/src/VVTK/VVTK_Renderer.cxx +++ b/src/VVTK/VVTK_Renderer.cxx @@ -209,7 +209,7 @@ VVTK_Renderer1 { if(MYDEBUG) INFOS("VVTK_Renderer1() - "<SetPlaceFactor(1.1); + myImplicitFunctionWidget->SetPlaceFactor(1.0); myImplicitFunctionWidget->SetOutlineTranslation(false); vtkProperty* aSelectedPlaneProperty = myImplicitFunctionWidget->GetSelectedPlaneProperty(); vtkProperty* aPlaneProperty = myImplicitFunctionWidget->GetPlaneProperty(); -- 2.39.2