From: smh Date: Mon, 5 Apr 2004 07:18:08 +0000 (+0000) Subject: SALOME PAL V1_4_1 X-Git-Tag: PAL_SALOME_1_4_1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=284c7ba2d72bb8fcd67ff2d9dea8098d8be9a8eb;p=modules%2Fvisu.git SALOME PAL V1_4_1 --- diff --git a/INSTALL b/INSTALL index 1e30dd5b..9411e009 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -This is the version 1.4.0 of VISU +This is the version 1.4.1 of VISU Compatible with : - - KERNEL 1.4.0 - - MED 1.4.0 + - KERNEL 1.4.1 + - MED 1.4.1 diff --git a/Makefile.in b/Makefile.in index a8adab1b..85b1b76d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl: @COMMENCE@ -SUBDIRS = idl src +SUBDIRS = idl src doc RESOURCES_FILES = \ ModuleVisu.png \ @@ -43,6 +43,7 @@ Visu_wireframe.png \ Visu_scaling.png \ VISU_en.xml \ VISU_fr.xml \ +VISU.config \ VISUCatalog.xml \ Visu_tree_visu.png \ Visu_streamlines.png @@ -67,10 +68,10 @@ include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref # test if SALOMEconfig.h has changed (contents) salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h @if ! [ -a $@ ]; then \ - cp -p $< $@; \ + cp -p -f $< $@; \ fi; \ if ! cmp $< $@; then \ - cp -p $< $@; \ + cp -p -f $< $@; \ fi; \ include/salome/sstream: salome_adm/unix/sstream @@ -94,7 +95,7 @@ install-include: $(include_list) $(INSTALL) -d $(includedir) @for f in X $(include_list); do \ if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(includedir)/. || exit 1); \ + ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ fi; \ done diff --git a/adm_local/unix/config_files/check_Med.m4 b/adm_local/unix/config_files/check_Med.m4 index 839a3d7b..49272705 100644 --- a/adm_local/unix/config_files/check_Med.m4 +++ b/adm_local/unix/config_files/check_Med.m4 @@ -45,7 +45,7 @@ if test -f ${MED_DIR}/bin/salome/libMEDMEM_Swig.py ; then AC_SUBST(MED_ROOT_DIR) else - AC_MSG_WARN("Cannot find compiled Med module distribution") + AC_MSG_WARN("Cannot find Med module sources") fi AC_MSG_RESULT(for Med: $Med_ok) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index e9de78bb..f8b9e383 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -131,7 +131,8 @@ OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ OMNIORB_IDL = @OMNIORB_IDL@ OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome +OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl \ + -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ @@ -148,7 +149,8 @@ CORBA_INCLUDES = @CORBA_INCLUDES@ CORBA_LIBS = @CORBA_LIBS@ CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ -IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome +IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \ + -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome IDLPYFLAGS = @IDLPYFLAGS@ IDL = @IDL@ @@ -202,13 +204,13 @@ idldir=${prefix}/idl/salome sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules incmakedir=${prefix}/salome_adm/unix -docdir=$(datadir)/doc +docdir=${prefix}/doc/salome # # begin of package rules # -.PHONY: all lib bin inc resources data doc tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean +.PHONY: all lib bin inc resources data docs tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean .SUFFIXES: .cxx .cc .c .f .o .lo .idl .py .i .ui .po .qm diff --git a/bin/VERSION b/bin/VERSION index fc5321c0..94d7ebbc 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - VISU VERSION: 1.4.0 +THIS IS SALOME - VISU VERSION: 1.4.1 diff --git a/configure.in.base b/configure.in.base index 0c666c61..4e6c9634 100644 --- a/configure.in.base +++ b/configure.in.base @@ -310,7 +310,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl +for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl do # if test ! -d $rep ; then # eval mkdir $rep @@ -343,14 +343,15 @@ dnl copy shells and utilities contained in the bin directory dnl excluding .in files (treated in AC-OUTPUT below) and CVS dnl directory -cd bin +mkdir -p bin/salome +cd bin/salome for i in $ROOT_SRCDIR/bin/* do local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` case "$local_bin" in *.in | *~) ;; - ./bin/CVS) ;; - *) ln -fs $i; echo $local_bin ;; + ./bin/CVS | ./bin/salome) ;; + *) /usr/bin/install -C $i .; echo $local_bin ;; esac done cd $ROOT_BUILDDIR diff --git a/doc/Makefile.in b/doc/Makefile.in index 01901597..7295ede7 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -11,9 +11,11 @@ top_builddir=.. srcdir=@srcdir@ VPATH=.:@srcdir@ -SUBDIRS=html +SUBDIRS= salome -doc: +@COMMENCE@ + +docs: @@SETX@; for d in $(SUBDIRS); do \ (cd $$d && $(MAKE) $@) || exit 1; \ done @@ -31,3 +33,8 @@ install: @@SETX@; for d in $(SUBDIRS); do \ (cd $$d && $(MAKE) $@) || exit 1; \ done + +uninstall: + @@SETX@; for d in $(SUBDIRS); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done diff --git a/idl/Makefile.in b/idl/Makefile.in index 95c59e05..b032d41d 100644 --- a/idl/Makefile.in +++ b/idl/Makefile.in @@ -6,7 +6,7 @@ top_srcdir=@top_srcdir@ top_builddir=.. srcdir=@srcdir@ -VPATH=.:$(srcdir):${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome +VPATH=.:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome @COMMENCE@ @@ -16,11 +16,14 @@ IDL_FILES = \ PY_CLIENT_IDL = $(IDL_FILES) # we copy all idl file in $(top_builddir)/idl -inc: $(IDL_FILES:%=$(top_builddir)/idl/%) +inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%) -$(IDL_FILES:%=$(top_builddir)/idl/%):$(top_builddir)/idl/%:% +$(top_builddir)/idl/salome: + mkdir $@ + +$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) # $(CP) $< $@ - cp -f $< $@ + cp -f $^ $(top_builddir)/idl/salome lib: pyidl @@ -32,7 +35,7 @@ pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) $(PYTHON_BUILD_SITE): $(INSTALL) -d $@ -$(PYTHON_BUILD_SITE)/%_idl.py: %.idl +$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $< @@ -40,12 +43,12 @@ $(PYTHON_BUILD_SITE)/%_idl.py: %.idl install: install-pyidl install-idl # create directory $(idldir) and copy idl files into it -install-idl: $(IDL_FILES) +install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) $(INSTALL) -d $(idldir) $(INSTALL_DATA) $^ $(idldir) -install-pyidl: $(IDL_FILES) +install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) $(INSTALL) -d $(PYTHON_SITE_INSTALL) @for file in $^ dummy; do \ if [ $$file != "dummy" ]; then \ @@ -60,6 +63,6 @@ cleandep: distclean: -$(RM) *.py - -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/%) + -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%) -$(RM) Makefile diff --git a/resources/VISU_en.xml b/resources/VISU_en.xml index 9b738601..5be5fdf0 100644 --- a/resources/VISU_en.xml +++ b/resources/VISU_en.xml @@ -36,17 +36,7 @@ - - - - - - - - - - - + @@ -67,7 +57,7 @@ - + @@ -101,12 +91,5 @@ - - - - - - - diff --git a/resources/VISU_fr.xml b/resources/VISU_fr.xml index 9b738601..0aa69895 100644 --- a/resources/VISU_fr.xml +++ b/resources/VISU_fr.xml @@ -67,7 +67,7 @@ - + diff --git a/src/CONVERTOR/VISUConvertor.cxx b/src/CONVERTOR/VISUConvertor.cxx index 4afe4b27..79856149 100644 --- a/src/CONVERTOR/VISUConvertor.cxx +++ b/src/CONVERTOR/VISUConvertor.cxx @@ -43,7 +43,7 @@ static int MYDEBUG = 1; static int MYDEBUG = 0; #endif -void parseFile(const char* theFileName) throw(std::runtime_error&){ +void parseFile(const char* theFileName) { try{ cout<<"'"< aCon(CreateConvertor(theFileName)); diff --git a/src/CONVERTOR/VISU_Convertor.cxx b/src/CONVERTOR/VISU_Convertor.cxx index c9dbdb41..8238d72a 100644 --- a/src/CONVERTOR/VISU_Convertor.cxx +++ b/src/CONVERTOR/VISU_Convertor.cxx @@ -36,7 +36,7 @@ static int MYDEBUG = 0; #endif extern "C" { - VISU_Convertor* CreateConvertor(const string& theFileName) throw(std::runtime_error&){ + VISU_Convertor* CreateConvertor(const string& theFileName) { if(QFileInfo(theFileName.c_str()).extension(false) == "med") return CreateMedConvertor(theFileName); else @@ -60,7 +60,6 @@ namespace VISU{ } pair TMeshOnEntity::GetCellsDims(const string& theFamilyName) const - throw(std::runtime_error&) { bool isFamilyPresent = (theFamilyName != ""); int aNbCells = 0, aCellsSize = 0; @@ -106,7 +105,6 @@ namespace VISU{ } const TFamily* GetFamily(const VISU::TMeshOnEntity& theMeshOnEntity, const string& theFamilyName) - throw(std::runtime_error&) { if(theFamilyName == "") return NULL; const VISU::TFamilyMap& aFamilyMap = theMeshOnEntity.myFamilyMap; @@ -118,7 +116,6 @@ namespace VISU{ } TFamily* GetFamily(VISU::TMeshOnEntity& theMeshOnEntity, const string& theFamilyName) - throw(std::runtime_error&) { if(theFamilyName == "") return NULL; VISU::TFamilyMap& aFamilyMap = theMeshOnEntity.myFamilyMap; @@ -140,7 +137,7 @@ namespace VISU{ } -const VISU::TMeshMap& VISU_Convertor::GetMeshMap() throw(std::runtime_error&){ +const VISU::TMeshMap& VISU_Convertor::GetMeshMap() { if(!myIsDone) { myIsDone = true; Build();} return myMeshMap; } diff --git a/src/CONVERTOR/VISU_Convertor.hxx b/src/CONVERTOR/VISU_Convertor.hxx index 65d2d6a3..92a45a32 100644 --- a/src/CONVERTOR/VISU_Convertor.hxx +++ b/src/CONVERTOR/VISU_Convertor.hxx @@ -130,16 +130,15 @@ namespace VISU{ TFamilyMap myFamilyMap; TFieldMap myFieldMap; TMeshOnEntity() : myNbCells(0), myCellsSize(0) {} - std::pair GetCellsDims(const std::string& theFamilyName = "") const - throw(std::runtime_error&); + std::pair GetCellsDims(const std::string& theFamilyName = "") const; + }; typedef std::map TMeshOnEntityMap; const TFamily* GetFamily(const VISU::TMeshOnEntity& theMeshOnEntity, - const std::string& theFamilyName) - throw(std::runtime_error&); + const std::string& theFamilyName); + TFamily* GetFamily(VISU::TMeshOnEntity& theMeshOnEntity, - const std::string& theFamilyName) - throw(std::runtime_error&); + const std::string& theFamilyName); typedef std::pair TFamilyAndEntity; typedef std::set TFamilyAndEntitySet; @@ -180,61 +179,56 @@ public: virtual int IsDone() const { return myIsDone;} typedef vtkUnstructuredGrid TOutput; - virtual VISU_Convertor* Build() throw (std::runtime_error&) = 0; - virtual const VISU::TMeshMap& GetMeshMap() throw(std::runtime_error&); - virtual float GetSize() throw (std::runtime_error&) = 0; + virtual VISU_Convertor* Build() = 0; + virtual const VISU::TMeshMap& GetMeshMap() ; + virtual float GetSize() = 0; virtual TOutput* GetMeshOnEntity(const std::string& theMeshName, const VISU::TEntity& theEntity, - const std::string& theFamilyName = "") - throw(std::runtime_error&) = 0; + const std::string& theFamilyName = "") = 0; + virtual float GetMeshOnEntitySize(const std::string& theMeshName, const VISU::TEntity& theEntity, - const std::string& theFamilyName = "") - throw (std::runtime_error&) = 0; - + const std::string& theFamilyName = "") = 0; virtual TOutput* GetMeshOnGroup(const std::string& theMeshName, - const std::string& theGroupName) - throw(std::runtime_error&) = 0; + const std::string& theGroupName) = 0; + virtual float GetMeshOnGroupSize(const std::string& theMeshName, - const std::string& theGroupName) - throw(std::runtime_error&) = 0; - + const std::string& theGroupName) = 0; virtual TOutput* GetTimeStampOnMesh(const std::string& theMeshName, const VISU::TEntity& theEntity, const std::string& theFieldName, - int theStampsNum) - throw(std::runtime_error&) = 0; + int theStampsNum) = 0; + virtual float GetTimeStampSize(const std::string& theMeshName, const VISU::TEntity& theEntity, const std::string& theFieldName, - int theStampsNum) - throw(std::runtime_error&) = 0; + int theStampsNum) = 0; + virtual float GetFieldOnMeshSize(const std::string& theMeshName, const VISU::TEntity& theEntity, - const std::string& theFieldName) - throw(std::runtime_error&) = 0; + const std::string& theFieldName) = 0; + virtual const VISU::TField& GetField(const std::string& theMeshName, VISU::TEntity theEntity, - const std::string& theFieldName) - throw(std::runtime_error&) = 0; + const std::string& theFieldName) = 0; + virtual const VISU::TField::TValForTime& GetTimeStamp(const std::string& theMeshName, const VISU::TEntity& theEntity, const std::string& theFieldName, - int theStampsNum) - throw(std::runtime_error&) = 0; - + int theStampsNum) = 0; + static std::string GenerateName(const VISU::TField::TTime& aTime); static std::string GenerateName(const std::string& theName, unsigned int theTimeId); static void WriteToFile(vtkUnstructuredGrid* theDataSet, const std::string& theFileName); }; extern "C"{ - VISU_Convertor* CreateMedConvertor(const std::string& theFileName) throw(std::runtime_error&); - VISU_Convertor* CreateDatConvertor(const std::string& theFileName) throw(std::runtime_error&); - VISU_Convertor* CreateConvertor(const std::string& theFileName) throw(std::runtime_error&); + VISU_Convertor* CreateMedConvertor(const std::string& theFileName) ; + VISU_Convertor* CreateDatConvertor(const std::string& theFileName) ; + VISU_Convertor* CreateConvertor(const std::string& theFileName) ; }; #endif diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx index 81a76c97..bbcbf60e 100644 --- a/src/CONVERTOR/VISU_Convertor_impl.cxx +++ b/src/CONVERTOR/VISU_Convertor_impl.cxx @@ -73,7 +73,6 @@ void VISU::WriteToFile(vtkUnstructuredGrid* theDataSet, const string& theFileNam namespace{ void GetPoints(VISU::TVTKSource& theStorage, VISU::TMesh& theMesh) - throw (std::runtime_error&) { vtkPoints* aPoints = theMesh.myPoints.GetPointer(); if(!aPoints){ @@ -121,7 +120,6 @@ namespace{ void GetCellsOnEntity(VISU::TVTKSource& theStorage, const VISU::TMeshOnEntity& theMeshOnEntity, const string& theFamilyName) - throw (std::runtime_error&) { //Check on existing family const VISU::TFamily* pFamily = VISU::GetFamily(theMeshOnEntity,theFamilyName); @@ -182,7 +180,6 @@ namespace{ void GetCellsOnGroup(VISU::TVTKSource& theStorage, const VISU::TMesh& theMesh, const VISU::TFamilyAndEntitySet& theFamilyAndEntitySet) - throw (std::runtime_error&) { //Calculate dimentions of the group int aNbCells = 0, aCellsSize = 0; @@ -247,7 +244,6 @@ namespace{ void InitProfile(VISU::TVTKExtractFilter& theFilter, const VISU::TMeshOnEntity& theMeshOnEntity, const VISU::TField::TValForTime& theValForTime) - throw (std::runtime_error&) { const VISU::TField::TValForCells& aValForCells = theValForTime.myValForCells; const VISU::TMeshOnEntity::TCellsConn &aCellsConn = theMeshOnEntity.myCellsConn; @@ -265,7 +261,6 @@ namespace{ const std::string& theFieldName, const VISU::TField& theField, const VISU::TField::TValForTime& theValForTime) - throw (std::runtime_error&) { //theFloatArray->DebugOn(); theFloatArray->SetNumberOfTuples(theNumberOfTuples); @@ -319,7 +314,6 @@ namespace{ const VISU::TMeshOnEntity& theMeshOnEntity, const VISU::TField& theField, const VISU::TField::TValForTime& theValForTime) - throw (std::runtime_error&) { int aNumberOfTuples = theField.myDataSize/theField.myNbComp; string aFieldName = GenerateFieldName(theField,theValForTime); @@ -357,7 +351,6 @@ namespace{ const VISU::TMeshOnEntity& theMeshOnEntity, const VISU::TField& theField, const VISU::TField::TValForTime& theValForTime) - throw (std::runtime_error&) { int aNumberOfTuples = theField.myDataSize/theField.myNbComp; string aFieldName = GenerateFieldName(theField,theValForTime); @@ -415,7 +408,6 @@ VISU_Convertor::TOutput* VISU_Convertor_impl::GetMeshOnEntity(const string& theMeshName, const VISU::TEntity& theEntity, const string& theFamilyName) - throw (std::runtime_error&) { if(MYDEBUG) MESSAGE("GetMeshOnEntity - theMeshName = '"<(aViewFrame); } +static void UpdateViewFrame() { + QList aFrameList = VisuGUI::GetActiveStudy()->getStudyFrames(); + + for (QAD_StudyFrame* aStudyFrame = aFrameList.first(); aStudyFrame; aStudyFrame = aFrameList.next()) { + if (aStudyFrame->getTypeView() == VIEW_VTK) { + QAD_ViewFrame* aViewFrame = aStudyFrame->getRightFrame()->getViewFrame(); + VTKViewer_ViewFrame* aVtkViewFrame = dynamic_cast(aViewFrame); + if (!aVtkViewFrame) continue; + VTKViewer_RenderWindowInteractor* anInteractor = aVtkViewFrame->getRWInteractor(); + if (anInteractor) { + anInteractor->SetSelectionProp(); + anInteractor->SetSelectionTolerance(); + VTKViewer_InteractorStyleSALOME* aStyle = anInteractor->GetInteractorStyleSALOME(); + if (aStyle) { + aStyle->setPreselectionProp(); + } + } + } + } +} + SALOMEDS::Study_var VisuGUI::GetStudyDocument(){ return GetActiveStudy()->getStudyDocument(); } @@ -448,12 +470,6 @@ bool VisuGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent) visuGUI->SelectionInfo(); break; - /* ========================================================================================================================= */ - /* Selection - Shape */ - /* ========================================================================================================================= */ - - //case 413 : - /* ========================================================================================================================= */ /* Visualization - Wireframe */ /* ========================================================================================================================= */ @@ -642,11 +658,25 @@ bool VisuGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent) tr ("VISU_BUT_OK") ); break; } + } catch (const std::bad_alloc& e ) { + INFOS("bad_alloc exception is caught "<setItemChecked(anId, true); + anId = 50; + parent->menuBar()->changeItem(anId,parent->getComponentUserName("VISU")); + + ::UpdateViewFrame(); + return true; } @@ -1130,10 +1163,10 @@ void VisuGUI::RecreateActor(VISU::Prs3d_i* thePrs) { thePrs->UpdateActor(anActor); } }catch(std::runtime_error& ex){ - QApplication::restoreOverrideCursor(); INFOS(ex.what()); + QApplication::restoreOverrideCursor(); QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"), - tr ("ERR_CANT_BUILD_PRESENTATION"), + tr ("ERR_CANT_BUILD_PRESENTATION") + " " + tr(ex.what()), tr ("VISU_BUT_OK") ); for(int i = 0, nbFrames = GetActiveStudy()->getStudyFramesCount(); i < nbFrames; i++) if(QAD_StudyFrame* aFrame = GetActiveStudy()->getStudyFrame(i)){ @@ -1198,7 +1231,7 @@ void VisuGUI::EditPrs() { { VISU::CutPlanes_i* aPrsObject = dynamic_cast(aPrs3d); if (aPrsObject) { - VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg(false, false); + VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg(false, false); aDlg->initFromPrsObject(aPrsObject); aDlg->show(); myActiveDialogBox = aDlg; @@ -1398,7 +1431,7 @@ void VisuGUI::CreateMesh() { }catch(std::runtime_error& exc){ INFOS(exc.what()); QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"), - tr ("ERR_CANT_CREATE_ACTOR"), + tr ("ERR_CANT_CREATE_ACTOR") + " " + tr(exc.what()), tr ("VISU_BUT_OK") ); } } @@ -2304,14 +2337,20 @@ void VisuGUI::Sweep() { } QApplication::setOverrideCursor( Qt::waitCursor ); - for (int j=0 ; jSetMapScale(aPercents); - aPrsObject->UpdateActor(aActor); - vf->getRW()->getRenderWindow()->Render(); - usleep(aTemp); + try{ + for (int j=0 ; jSetMapScale(aPercents); + aPrsObject->UpdateActor(aActor); + vf->getRW()->getRenderWindow()->Render(); + usleep(aTemp); + } } + }catch(std::exception& exc){ + INFOS("Follow exception was accured :\n"<clear(); SALOME_Selection* aSelection = SALOME_Selection::Selection(GetActiveStudy()->getSelection()); if ( aSelection->IObjectCount() == 0 ) { - if ( theParent == "Viewer" && isVTKViewer) - // Available only for VTK viewer + if ( theParent == "Viewer" && isVTKViewer && !aIsLocked) thePopup->insertItem( "Save view parameters", visuGUI, SLOT( SaveViewParams() ) ); return false; } @@ -2996,11 +3034,12 @@ bool VisuGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* thePopup, const QStri if ( !aIsLocked )thePopup->insertItem("Create Presentation", visuGUI, SLOT(CreateMesh())); break; case VISU::TVIEW3D: + if ( GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) + thePopup->insertItem( "Restore view parameters", visuGUI, SLOT( RestoreViewParams() ) ); if ( !aIsLocked ) { if ( GetActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK ) { // Available only for VTK viewer thePopup->insertItem( "Save view parameters", visuGUI, SLOT( SaveViewParams() ) ); - thePopup->insertItem( "Restore view parameters", visuGUI, SLOT( RestoreViewParams() ) ); } thePopup->insertItem( "Rename...", visuGUI, SLOT( Rename() ) ); thePopup->insertItem("Delete", visuGUI, SLOT(DeleteViewParams())); @@ -3098,6 +3137,7 @@ void VisuGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO) vf->AddActor(SelectedActor); }catch(std::runtime_error& exc){ INFOS(exc.what()); + throw exc; } }else if(MYDEBUG) MESSAGE("CORBA::is_nil(anObject) = true"); @@ -3147,11 +3187,12 @@ extern "C" VisuGUI::DefinePopup( theContext, theParent, theObject ); } - bool activeStudyChanged ( QAD_Desktop* parent ) + bool activeStudyChanged ( QAD_Desktop* parent ) { - //VisuGUI::activeStudyChanged( parent ); + ::UpdateViewFrame(); } - void buildPresentation ( const Handle(SALOME_InteractiveObject)& theIO ) + + void buildPresentation ( const Handle(SALOME_InteractiveObject)& theIO ) { VisuGUI::BuildPresentation(theIO); } @@ -3163,6 +3204,10 @@ extern "C" if (--bufferSize) buffer[1] = (int)VIEW_PLOT2D; } + void deactivate() + { + visuGUI->EmitSignalCloseAllDialogs(); + } } ////////////////////////////////////////////////////////////////////////////////// @@ -3261,8 +3306,8 @@ void VisuGUI::NewOpacity(VISU_Actor *Actor) int intopac; CursorDlg->Comment1->setText( tr( "Set value between") ); CursorDlg->Comment2->setText( tr( "0 (transparent) and 100 (opaque)" ) ); - oldopac=Actor->GetProperty()->GetOpacity(); - intopac=int(oldopac*100.); + oldopac=Actor->GetOpacity(); + intopac=int(oldopac*100.+0.5); CursorDlg->SpinBox1->setMinValue(0); CursorDlg->SpinBox1->setMaxValue(100); CursorDlg->SpinBox1->setValue(intopac); @@ -3272,7 +3317,7 @@ void VisuGUI::NewOpacity(VISU_Actor *Actor) { intopac = CursorDlg->SpinBox1->value() ; newopac = intopac/100.; - Actor->GetProperty()->SetOpacity(newopac); + Actor->SetOpacity(newopac); } delete CursorDlg; } @@ -3477,7 +3522,10 @@ bool FNAME(SALOMEDS::SObject_var theField) { \ return false; \ } \ } \ - CreateActor(pPresent); \ + try { \ + CreateActor(pPresent); \ + }catch (...) {\ + return false;} \ return true; \ } \ return false; \ @@ -3493,6 +3541,7 @@ BUILDPRS(VISU::StreamLines_i, CreateStreamLinesPrs, VisuGUI::CreateStreamLines, bool VisuGUI::CreateCutPlanes(SALOMEDS::SObject_var theField) { + try { VISU::Storable::TRestoringMap aMap = getMapOfValue(theField); bool isExist; QString aType = VISU::Storable::FindValue(aMap,"myType",&isExist); @@ -3529,10 +3578,12 @@ bool VisuGUI::CreateCutPlanes(SALOMEDS::SObject_var theField) { return true; } } +}catch (...){return false;} return false; } bool VisuGUI::CreateCutLines(SALOMEDS::SObject_var theField) { +try { VISU::Storable::TRestoringMap aMap = getMapOfValue(theField); bool isExist; QString aType = VISU::Storable::FindValue(aMap,"myType",&isExist); @@ -3593,6 +3644,7 @@ bool VisuGUI::CreateCutLines(SALOMEDS::SObject_var theField) { // return true; } } +}catch (...){return false; } return false; } @@ -3702,7 +3754,13 @@ void VisuGUI::ExportTableToFile() try { GetVisuGen() -> ExportTableToFile(aSObj, aFile.latin1()); QAD_Application::getDesktop()->putInfo(aFile+" exported."); + } catch(std::exception& ex) { + INFOS(ex.what()); + QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"), + tr ("ERR_ERROR_DURING_EXPORT") + " " + tr(ex.what()), + tr ("VISU_BUT_OK") ); } catch(...) { + INFOS(tr ("ERR_ERROR_DURING_EXPORT")); QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"), tr ("ERR_ERROR_DURING_EXPORT"), tr ("VISU_BUT_OK") ); @@ -3802,7 +3860,14 @@ void VisuGUI::ExportToFile(){ try{ //APO - aResult->GetInput()->ToFile(aFile.latin1()); QAD_Application::getDesktop()->putInfo(aFile+" exported."); - }catch(...){ + }catch(std::exception& ex) { + INFOS(ex.what()); + QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"), + tr ("ERR_ERROR_DURING_EXPORT") + " " +tr(ex.what()), + tr ("VISU_BUT_OK") ); + } + catch(...){ + INFOS(tr ("ERR_ERROR_DURING_EXPORT").latin1()); QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"), tr ("ERR_ERROR_DURING_EXPORT"), tr ("VISU_BUT_OK") ); @@ -3882,11 +3947,11 @@ VISU_Actor* VisuGUI::UpdateViewer(VISU::Prs3d_i* thePrs, bool theDispOnly){ try{ anVISUActor = thePrs->CreateActor(); vf->AddActor(anVISUActor); - }catch(std::runtime_error& exc){ + } catch ( std::runtime_error& exc ){ INFOS(exc.what()); QAD_MessageBox::warn1 ( QAD_Application::getDesktop(), tr ("VISU_WARNING"), - tr ("ERR_CANT_VISUALIZE_OBJECT"), - tr ("VISU_BUT_OK") ); + tr("ERR_CANT_VISUALIZE_OBJECT") + " " + tr(exc.what()), + tr ("VISU_BUT_OK") ); anVISUActor = NULL; } return anVISUActor; @@ -3946,14 +4011,26 @@ void VisuGUI::CreateActor(VISU::Prs3d_i* thePrs) { timer.Start(); #endif try{ + MESSAGE("Available memory : "<CreateActor(); vf->AddActor(aActor); - }catch(std::runtime_error& exc){ - INFOS(exc.what()); + }catch(std::runtime_error& exc) { + INFOS("std::runtime_error "<isChecked(); MYGenerateCurve = myCurvesCheck->isChecked(); if (myScalarPane->check()) { + ((QWidget*)sender())->setDisabled(true); storeToPrsObject(myPrs); if (myIsCreation) { if (isGenerateTable()) { @@ -614,7 +615,13 @@ void VisuGUI_CutLinesDlg::accept() { } } if (myStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { - visuGUI->CreateActor(myPrs); + try { + visuGUI->CreateActor(myPrs); + } + catch (...) { + reject(); + return; + } GET_VTK_VIEWFRAME(myStudy)->onViewFitAll(); } } else { diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx index 00d56132..8eed6ade 100644 --- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx @@ -193,6 +193,10 @@ void VisuGUI_CutPlanesPane::createPlanes() { vtkAppendPolyData* aPolyData = myCutPlanes->GetCutPlanesPL()->GetAppendPolyData(); vtkDataSetMapper* aPlaneMapper = vtkDataSetMapper::New(); + if (!aPolyData->GetOutput()->GetNumberOfCells()) { + onPreviewCheck(false); + return; + } aPlaneMapper->SetInput(aPolyData->GetOutput()); aPlaneMapper->ScalarVisibilityOff(); @@ -513,7 +517,13 @@ void VisuGUI_CutPlanesDlg::accept() { if (storeToPrsObject(myPrs)) { if (myIsCreation) { if (myStudy->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { + try { visuGUI->CreateActor(myPrs); + } + catch (...) { + reject(); + return; + } GET_VTK_VIEWFRAME(myStudy)->onViewFitAll(); } } else { @@ -548,11 +558,6 @@ void VisuGUI_CutPlanesDlg::onFrameActivated( QAD_StudyFrame* theFrame) { reject(); } -VisuGUI_CutPlanesDlg::~VisuGUI_CutPlanesDlg () { - reject(); -} - - //################################################################### diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.h b/src/VISUGUI/VisuGUI_CutPlanesDlg.h index 0651f738..b3ee6eea 100644 --- a/src/VISUGUI/VisuGUI_CutPlanesDlg.h +++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.h @@ -106,7 +106,7 @@ class VisuGUI_CutPlanesDlg : public QDialog public: VisuGUI_CutPlanesDlg(bool theIsCreation, bool theIsModal); - ~VisuGUI_CutPlanesDlg(); + ~VisuGUI_CutPlanesDlg() {}; void initFromPrsObject(VISU::CutPlanes_i* thePrs) {myPrs=thePrs; myScalarPane->initFromPrsObject(thePrs); myCutPane->initFromPrsObject(thePrs);} diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx index 45a6ac14..e1a65458 100644 --- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx +++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx @@ -137,6 +137,7 @@ void VisuGUI_IsoSurfPane::onCBUpdate() bool VisuGUI_IsoSurfPane::check() { if (MinIso->text().toDouble() >= MaxIso->text().toDouble()) { + MESSAGE(tr("MSG_MINMAX_VALUES")); QAD_MessageBox::warn1( this,tr("VISU_WARNING"), tr("MSG_MINMAX_VALUES"), tr("VISU_BUT_OK")); diff --git a/src/VISUGUI/VisuGUI_Selection.cxx b/src/VISUGUI/VisuGUI_Selection.cxx index 72fd9ef5..f75c3475 100644 --- a/src/VISUGUI/VisuGUI_Selection.cxx +++ b/src/VISUGUI/VisuGUI_Selection.cxx @@ -26,8 +26,8 @@ // Module : VISU // $Header$ -using namespace std; -#include "utilities.h" +#include "VisuGUI_Selection.h" + #include "SALOME_ListIteratorOfListIO.hxx" #include "SALOME_Selection.h" #include "VISU_Actor.h" @@ -41,6 +41,8 @@ using namespace std; #include #include +#include + #include #include #include @@ -53,8 +55,9 @@ using namespace std; #include #include -#include "VisuGUI_Selection.h" +#include "utilities.h" +using namespace std; extern VisuGUI *visuGUI; @@ -222,19 +225,21 @@ VisuGUI_SelectionDlg::VisuGUI_SelectionDlg() void VisuGUI_SelectionDlg::onSelectionChange(int theId) { - clearFields(); + // clearFields(); switch (theId) { case 0: // Points myWidgetStack->raiseWidget(myPointsPane); - QAD_Application::getDesktop()->SetSelectionMode(1, true); + QAD_Application::getDesktop()->SetSelectionMode(NodeSelection, true); + onPointIdEdit(myIDValLbl->text()); break; case 1: // Cells myWidgetStack->raiseWidget(myCellsPane); - QAD_Application::getDesktop()->SetSelectionMode(3, true); + QAD_Application::getDesktop()->SetSelectionMode(CellSelection, true); + onCellIdEdit(myCellIDValLbl->text()); break; case 2: // Actor myWidgetStack->raiseWidget(myActorsPane); - QAD_Application::getDesktop()->SetSelectionMode(4, true); + QAD_Application::getDesktop()->SetSelectionMode(ActorSelection, true); } onSelectionEvent(); // if (VTKViewer_ViewFrame* vf = visuGUI->GetVtkViewFrame()) @@ -243,7 +248,7 @@ void VisuGUI_SelectionDlg::onSelectionChange(int theId) { void VisuGUI_SelectionDlg::closeEvent(QCloseEvent* theEvent) { - QAD_Application::getDesktop()->SetSelectionMode(4, true); + QAD_Application::getDesktop()->SetSelectionMode(ActorSelection, true); disconnect(mySelection,0,0,0); QDialog::closeEvent(theEvent); } @@ -270,6 +275,8 @@ template QString getVector(TData* theData, int theId){ #define ABS(a) (a>=0)?a:-a void VisuGUI_SelectionDlg::onSelectionEvent() { + if (myFl) return; + myFl = true; Handle(SALOME_InteractiveObject) anIO; int aType = myWidgetStack->id(myWidgetStack->visibleWidget()); if(VISU::Prs3d_i* aPrs3d = visuGUI->GetSelectedPrs3d(&anIO)){ @@ -291,15 +298,19 @@ void VisuGUI_SelectionDlg::onSelectionEvent() { myDYLbl->setText(QString::number( ABS(aCoord[3]-aCoord[2]) )); myDZLbl->setText(QString::number( ABS(aCoord[5]-aCoord[4]) )); } + TColStd_MapOfInteger aMapIndex; + typedef map PointsMap; + PointsMap aPointsMap; mySelection->GetIndex(anIO, aMapIndex); TColStd_MapIteratorOfMapOfInteger anIter(aMapIndex); - if(anIter.More()){ - VISU_Actor* anActor = visuGUI->GetActor(aPrs3d); - vtkDataSet* aDataSet = anActor->GetMapper()->GetInput(); - // vtkDataSet* aDataSet = aPrs3d->GetPL()->GetMapper()->GetInput(); + + VISU_Actor* anActor = visuGUI->GetActor(aPrs3d); + vtkDataSet* aDataSet = anActor->GetMapper()->GetInput(); + vtkPointData* aPntData = aDataSet->GetPointData(); + + for (;anIter.More();anIter.Next()){ int aID = anIter.Key(); - vtkPointData* aPntData = aDataSet->GetPointData(); switch (aType) { case 0: @@ -318,45 +329,57 @@ void VisuGUI_SelectionDlg::onSelectionEvent() { break; case 1: { - int aMaxId = aDataSet->GetNumberOfCells(); + //int aMaxId = aDataSet->GetNumberOfCells(); //cout<<"### MaxId="<setText(""); \ - } \ +void onIdEdit(const QString& theText, + TDataSetMethod theMethod, + bool theIsCell, + SALOME_Selection* theSelection, + QLabel* theMeshName, + QString theValue, + QLabel* theFieldName) +{ + int anId = theText.toInt(); + Handle(SALOME_InteractiveObject) anIO; + if(VISU::Prs3d_i* aPrs3d = visuGUI->GetSelectedPrs3d(&anIO)){ + vtkDataSet* aDataSet = aPrs3d->GetPL()->GetMapper()->GetInput(); + int aMaxId = (aDataSet->*theMethod)(); + if(anId < 0) anId = 0; + if(aMaxId <= anId) anId = aMaxId-1; + theSelection->AddIObject(anIO); + VISU_Actor* anVISUActor = visuGUI->GetActor(aPrs3d); + if(theIsCell && !anVISUActor->GetVtkId(anId).empty()){ + theSelection->AddOrRemoveIndex( anIO, anVISUActor->GetVtkId(anId), false ); + }else{ + theSelection->AddOrRemoveIndex(anIO, anId, false); + } + }else{ + theMeshName->setText(theValue); + theFieldName->setText(""); + } } -SELECTBYNUM(onPointIdEdit, GetNumberOfPoints); -SELECTBYNUM(onCellIdEdit, GetNumberOfCells); - -#undef SELECTBYNUM +void VisuGUI_SelectionDlg::onPointIdEdit(const QString& theText){ + if (myFl) return; + TDataSetMethod aMethod = &vtkDataSet::GetNumberOfPoints; + onIdEdit(theText,aMethod,false,mySelection, + myMeshName,tr("WRN_NO_AVAILABLE_DATA"),myFieldName); +} +void VisuGUI_SelectionDlg::onCellIdEdit(const QString& theText){ + if (myFl) return; + TDataSetMethod aMethod = &vtkDataSet::GetNumberOfCells; + onIdEdit(theText,aMethod,true,mySelection, + myMeshName,tr("WRN_NO_AVAILABLE_DATA"),myFieldName); +} diff --git a/src/VISUGUI/VisuGUI_Selection.h b/src/VISUGUI/VisuGUI_Selection.h index 67bbae1b..fe39ef1e 100644 --- a/src/VISUGUI/VisuGUI_Selection.h +++ b/src/VISUGUI/VisuGUI_Selection.h @@ -91,6 +91,7 @@ private slots: QLabel* myDZLbl; SALOME_Selection* mySelection; + bool myFl; }; diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx index 32ab47e0..9927194b 100644 --- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx +++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx @@ -238,17 +238,17 @@ void SetupDlg::onTypeChanged(int theIndex) { void SetupDlg::onPreferencesDlg() { QApplication::setOverrideCursor( Qt::waitCursor ); FieldData& aData = myAnimator->getFieldData(myFieldLst->currentItem()); - if (aData.myPrs == 0) + if (aData.myPrs.empty()) myAnimator->generatePresentations(myFieldLst->currentItem()); QApplication::restoreOverrideCursor(); #define EDITPRS(TYPE, DLG) \ { \ DLG* aDlg = new DLG(); \ - aDlg->initFromPrsObject(dynamic_cast(aData.myPrs[0])); \ + aDlg->initFromPrsObject(dynamic_cast(aData.myPrs.at(0))); \ if (aDlg->exec()) { \ for (int i = 0; i < aData.myNbFrames; i++) \ - aDlg->storeToPrsObject(dynamic_cast(aData.myPrs[i])); \ + aDlg->storeToPrsObject(dynamic_cast(aData.myPrs.at(i))); \ } \ delete aDlg; \ } @@ -265,10 +265,10 @@ void SetupDlg::onPreferencesDlg() { // EDITPRS(VISU::CutPlanes_i, VisuGUI_CutPlanesDlg); { VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg(false, true); - aDlg->initFromPrsObject(dynamic_cast(aData.myPrs[0])); + aDlg->initFromPrsObject(dynamic_cast(aData.myPrs.at(0))); if (aDlg->exec()) { for (int i = 0; i < aData.myNbFrames; i++) - aDlg->storeToPrsObject(dynamic_cast(aData.myPrs[i])); + aDlg->storeToPrsObject(dynamic_cast(aData.myPrs.at(i))); } delete aDlg; } @@ -557,6 +557,8 @@ VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg(SALOMEDS::Study_var theStudy) mySaveCheck = new QCheckBox("Save pictures to directory", aSaveBox); aSaveLay->addMultiCellWidget(mySaveCheck, 0, 0, 0, 2); + connect(mySaveCheck, SIGNAL( toggled(bool)), + aWheel, SLOT( setDisabled(bool) )); QLabel* aPathLbl = new QLabel("Path:", aSaveBox); aPathLbl->setEnabled(false); @@ -626,7 +628,7 @@ void VisuGUI_TimeAnimationDlg::createFrames() { QApplication::setOverrideCursor( Qt::waitCursor ); for (int i = 0; i < myAnimator->getNbFields(); i++) { - if (myAnimator->getFieldData(i).myPrs == 0) + if (myAnimator->getFieldData(i).myPrs.empty()) myAnimator->generatePresentations(i); } if (myAnimator->getNbFrames() == 0) { diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc index e2229e19..bef92c9d 100644 --- a/src/VISU_I/VISUConfig.cc +++ b/src/VISU_I/VISUConfig.cc @@ -99,7 +99,6 @@ namespace VISU{ } void Storable::Registry(const char* theComment, TStorableEngine theEngine) - throw(std::logic_error&) { if(!VisuStoreMap.insert(TCallbackMap::value_type(theComment,theEngine)).second){ if(MYDEBUG) MESSAGE("Storable::Registry >> dupliacte registring !!!"); @@ -151,7 +150,6 @@ namespace VISU{ } Storable* Storable::Create(SALOMEDS::SObject_ptr theSObject, const string& thePrefix, const string& theLocalPersistentID) - throw (std::runtime_error&) { try{ QString strIn( theLocalPersistentID.c_str() ); @@ -174,7 +172,6 @@ namespace VISU{ } const QString& Storable::FindValue(const TRestoringMap& theMap, const string& theArg, bool* isFind) - throw(std::logic_error&) { TRestoringMap::const_iterator i = theMap.find(theArg); if(i == theMap.end()) { @@ -278,7 +275,7 @@ namespace VISU{ anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeComment"); SALOMEDS::AttributeComment_var aCmnt = SALOMEDS::AttributeComment::_narrow(anAttr); aCmnt->SetValue(theComment); - INFOS("CreateAttributes - Comment = "<FindObjectID(theRefFatherEntry); diff --git a/src/VISU_I/VISUConfig.hh b/src/VISU_I/VISUConfig.hh index dd9f4c6a..6ade69af 100644 --- a/src/VISU_I/VISUConfig.hh +++ b/src/VISU_I/VISUConfig.hh @@ -105,12 +105,9 @@ namespace VISU{ typedef Storable* (*TStorableEngine)(SALOMEDS::SObject_ptr theSObject, const std::string& thePrefix, const TRestoringMap& theMap); typedef std::map TCallbackMap; - static void Registry(const char* theComment, TStorableEngine theEngine) - throw(std::logic_error&); - static Storable* Create(SALOMEDS::SObject_ptr, const std::string& thePrefix, const std::string& theString) - throw(std::runtime_error&); - static const QString& FindValue(const TRestoringMap& theMap, const std::string& theArg, bool* isFind = NULL) - throw(std::logic_error&); + static void Registry(const char* theComment, TStorableEngine theEngine); + static Storable* Create(SALOMEDS::SObject_ptr, const std::string& thePrefix, const std::string& theString); + static const QString& FindValue(const TRestoringMap& theMap, const std::string& theArg, bool* isFind = NULL); 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_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx index 9c6da1f5..9c5022d2 100644 --- a/src/VISU_I/VISU_CorbaMedConvertor.cxx +++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx @@ -46,10 +46,10 @@ static int MYDEBUG = 0; static med_err ret = 0; extern "C" { - VISU_Convertor* CreateMEDConvertor(SALOMEDS::SObject_ptr theMedSObject) throw(std::runtime_error&){ + VISU_Convertor* CreateMEDConvertor(SALOMEDS::SObject_ptr theMedSObject) { return new VISU_MEDConvertor(theMedSObject); } - VISU_Convertor* CreateMEDFieldConvertor(SALOME_MED::FIELD_ptr theField) throw(std::runtime_error&){ + VISU_Convertor* CreateMEDFieldConvertor(SALOME_MED::FIELD_ptr theField) { return new VISU_MEDFieldConvertor(theField); } } @@ -118,7 +118,6 @@ static int NODEGEOM[1] = { }; void GetEntity2Geom(const VISU::TEntity& theEntity, int*& theVector, int* theEnd) - throw (std::runtime_error&) { switch(theEntity){ case VISU::CELL_ENTITY: theVector = CELLGEOM; *theEnd = MED_NBR_GEOMETRIE_MAILLE; break; @@ -245,7 +244,7 @@ static void GetCellsSize(VISU::TMesh& theMesh, } -VISU_Convertor* VISU_MEDFieldConvertor::Build() throw (std::runtime_error&){ +VISU_Convertor* VISU_MEDFieldConvertor::Build() { if(myField->_is_nil()) throw std::runtime_error("VISU_MEDFieldConvertor::Build >> myField->_is_nil() !!!"); @@ -301,7 +300,7 @@ VISU_Convertor* VISU_MEDFieldConvertor::Build() throw (std::runtime_error&){ return this; } -VISU_Convertor* VISU_MEDConvertor::Build() throw (std::runtime_error&){ +VISU_Convertor* VISU_MEDConvertor::Build() { if(mySObject->_is_nil()) throw std::runtime_error("VISU_MEDConvertor::Build >> mySObject->_is_nil() !!!"); SALOMEDS::Study_var aStudy = mySObject->GetStudy(); @@ -563,7 +562,6 @@ VISU_Convertor* VISU_MEDConvertor::Build() throw (std::runtime_error&){ int VISU_MEDConvertor::LoadMeshOnEntity(VISU::TMeshOnEntity& theMeshOnEntity, const string& theFamilyName) - throw (std::runtime_error&) { //Main part of code const string& aMeshName = theMeshOnEntity.myMeshName; @@ -581,7 +579,6 @@ int VISU_MEDConvertor::LoadMeshOnEntity(VISU::TMeshOnEntity& theMeshOnEntity, int VISU_MEDConvertor::LoadMeshOnGroup(VISU::TMesh& theMesh, const VISU::TFamilyAndEntitySet& theFamilyAndEntitySet) - throw (std::runtime_error&) { //Main part of code int isPointsUpdated = 0; @@ -607,7 +604,6 @@ int VISU_MEDConvertor::LoadFieldOnMesh(VISU::TMesh& theMesh, VISU::TMeshOnEntity& theMeshOnEntity, VISU::TField& theField, VISU::TField::TValForTime& theValForTime) - throw (std::runtime_error&) { //Main part of code int isPointsUpdated = LoadPoints(theMesh); @@ -618,7 +614,6 @@ int VISU_MEDConvertor::LoadFieldOnMesh(VISU::TMesh& theMesh, } int VISU_MEDConvertor::LoadPoints(VISU::TMesh& theMesh, const string& theFamilyName) - throw (std::runtime_error&) { //Check on existing family VISU::TMeshOnEntity& aMeshOnEntity = theMesh.myMeshOnEntityMap[VISU::NODE_ENTITY]; @@ -643,7 +638,7 @@ int VISU_MEDConvertor::LoadPoints(VISU::TMesh& theMesh, const string& theFamilyN if(MYDEBUG) MESSAGE("LoadPoints - iNumElemEnd = "<> There is no points in the mesh !!!"); aPointsCoord.resize(theMesh.myDim*iNumElemEnd,0.0); - SALOME_MED::double_array_var coord = aMedMesh->getCoordinates(SALOME_MED::MED_FULL_INTERLACE); + SALOME_MED::double_array_var coord = aMedMesh->getCoordinates(SALOME_MED::MED_FULL_INTERLACE); if(!isPointsLoaded){ for (int iNumElem = 0; iNumElem < iNumElemEnd; iNumElem++) for(int iDim = 0, iNumElem2Dim = iNumElem*theMesh.myDim; iDim < theMesh.myDim; iDim++, iNumElem2Dim++) @@ -677,7 +672,6 @@ int VISU_MEDConvertor::LoadPoints(VISU::TMesh& theMesh, const string& theFamilyN } int VISU_MEDConvertor::LoadCellsOnEntity(VISU::TMeshOnEntity& theMeshOnEntity, const string& theFamilyName) - throw (std::runtime_error&) { //Check on existing family VISU::TFamily* pFamily = VISU::GetFamily(theMeshOnEntity,theFamilyName); @@ -844,7 +838,6 @@ template int ImportField(TArray& theArray, int VISU_MEDConvertor::LoadField(const VISU::TMeshOnEntity& theMeshOnEntity, const VISU::TField& theField, VISU::TField::TValForTime& theValForTime) - throw (std::runtime_error&) { //Check on loading already done if(!theValForTime.myValForCells.empty()) return 0; diff --git a/src/VISU_I/VISU_CorbaMedConvertor.hxx b/src/VISU_I/VISU_CorbaMedConvertor.hxx index b506b181..5a86fc7d 100644 --- a/src/VISU_I/VISU_CorbaMedConvertor.hxx +++ b/src/VISU_I/VISU_CorbaMedConvertor.hxx @@ -83,26 +83,26 @@ class VISU_MEDConvertor: public VISU_Convertor_impl{ VISU_MEDConvertor() {}; public: VISU_MEDConvertor(SALOMEDS::SObject_ptr theMedSObject) : mySObject(SALOMEDS::SObject::_duplicate(theMedSObject)) {} - virtual VISU_Convertor* Build() throw (std::runtime_error&); + virtual VISU_Convertor* Build() ; protected: virtual int LoadMeshOnEntity(VISU::TMeshOnEntity& theMeshOnEntity, - const string& theFamilyName = "") - throw (std::runtime_error&); + const string& theFamilyName = ""); + virtual int LoadMeshOnGroup(VISU::TMesh& theMesh, - const VISU::TFamilyAndEntitySet& theFamilyAndEntitySet) - throw (std::runtime_error&); + const VISU::TFamilyAndEntitySet& theFamilyAndEntitySet); + virtual int LoadFieldOnMesh(VISU::TMesh& theMesh, VISU::TMeshOnEntity& theMeshOnEntity, VISU::TField& theField, - VISU::TField::TValForTime& theValForTime) - throw (std::runtime_error&); - int LoadPoints(VISU::TMesh& theMesh, const string& theFamilyName = "") - throw (std::runtime_error&); - int LoadCellsOnEntity(VISU::TMeshOnEntity& theMeshOnEntity, const string& theFamilyName = "") - throw (std::runtime_error&); + VISU::TField::TValForTime& theValForTime); + + int LoadPoints(VISU::TMesh& theMesh, const string& theFamilyName = "") ; + + int LoadCellsOnEntity(VISU::TMeshOnEntity& theMeshOnEntity, const string& theFamilyName = ""); + int LoadField(const VISU::TMeshOnEntity& theMeshOnEntity, - const VISU::TField& theField, VISU::TField::TValForTime& theValForTime) - throw (std::runtime_error&); + const VISU::TField& theField, VISU::TField::TValForTime& theValForTime); + }; class VISU_MEDFieldConvertor: public VISU_MEDConvertor{ @@ -110,12 +110,12 @@ class VISU_MEDFieldConvertor: public VISU_MEDConvertor{ SALOME_MED::FIELD_var myField; public: VISU_MEDFieldConvertor(SALOME_MED::FIELD_ptr theField) : myField(SALOME_MED::FIELD::_duplicate(theField)) {} - virtual VISU_Convertor* Build() throw (std::runtime_error&); + virtual VISU_Convertor* Build() ; }; extern "C" { - VISU_Convertor* CreateMEDConvertor(SALOMEDS::SObject_ptr theMedSObject) throw(std::runtime_error&); - VISU_Convertor* CreateMEDFieldConvertor(SALOME_MED::FIELD_ptr theField) throw(std::runtime_error&); + VISU_Convertor* CreateMEDConvertor(SALOMEDS::SObject_ptr theMedSObject) ; + VISU_Convertor* CreateMEDFieldConvertor(SALOME_MED::FIELD_ptr theField) ; } #endif diff --git a/src/VISU_I/VISU_CutLines_i.cc b/src/VISU_I/VISU_CutLines_i.cc index e4017fa5..76b54bca 100644 --- a/src/VISU_I/VISU_CutLines_i.cc +++ b/src/VISU_I/VISU_CutLines_i.cc @@ -81,7 +81,6 @@ VISU::Storable* VISU::CutLines_i::Create(const char* theMeshName, VISU::Entity t VISU::Storable* VISU::CutLines_i::Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&) { DoHook(); SetNbLines(VISU::Storable::FindValue(theMap,"myNbLines").toInt()); diff --git a/src/VISU_I/VISU_CutLines_i.hh b/src/VISU_I/VISU_CutLines_i.hh index 4c4a7e09..e0ee1820 100644 --- a/src/VISU_I/VISU_CutLines_i.hh +++ b/src/VISU_I/VISU_CutLines_i.hh @@ -96,8 +96,7 @@ namespace VISU{ virtual void ToStream(std::ostringstream& theStr); - virtual Storable* Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + virtual Storable* Restore(const Storable::TRestoringMap& theMap); void BuildTableOfReal(SALOMEDS::SObject_ptr theSObject); diff --git a/src/VISU_I/VISU_CutPlanes_i.cc b/src/VISU_I/VISU_CutPlanes_i.cc index d48d6e0a..cfa89252 100644 --- a/src/VISU_I/VISU_CutPlanes_i.cc +++ b/src/VISU_I/VISU_CutPlanes_i.cc @@ -78,7 +78,6 @@ VISU::Storable* VISU::CutPlanes_i::Create(const char* theMeshName, VISU::Entity VISU::Storable* VISU::CutPlanes_i::Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&) { DoHook(); SetNbPlanes(VISU::Storable::FindValue(theMap,"myNbPlanes").toInt()); diff --git a/src/VISU_I/VISU_CutPlanes_i.hh b/src/VISU_I/VISU_CutPlanes_i.hh index 6d64f6e5..867fe5d3 100644 --- a/src/VISU_I/VISU_CutPlanes_i.hh +++ b/src/VISU_I/VISU_CutPlanes_i.hh @@ -81,8 +81,7 @@ namespace VISU{ virtual void ToStream(std::ostringstream& theStr); - virtual Storable* Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + virtual Storable* Restore(const Storable::TRestoringMap& theMap); static const string myComment; virtual const char* GetComment() const; diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc index b53ec712..d77a80fd 100644 --- a/src/VISU_I/VISU_DeformedShape_i.cc +++ b/src/VISU_I/VISU_DeformedShape_i.cc @@ -93,7 +93,6 @@ VISU::Storable* VISU::DeformedShape_i::Create(const char* theMeshName, VISU::Ent VISU::Storable* VISU::DeformedShape_i::Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&) { DoHook(); SetScale(VISU::Storable::FindValue(theMap,"myFactor").toDouble()); @@ -146,7 +145,6 @@ void VISU::DeformedShape_i::SetMapScale(double theMapScale){ VISU_Actor* VISU::DeformedShape_i::CreateActor(const Handle(SALOME_InteractiveObject)& theIO) - throw (std::runtime_error&) { VISU_Actor* anActor = VISU::ScalarMap_i::CreateActor(theIO); anActor->SetRepresentation(1); @@ -155,7 +153,7 @@ VISU_Actor* VISU::DeformedShape_i::CreateActor(const Handle(SALOME_InteractiveOb } -void VISU::DeformedShape_i::UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&){ +void VISU::DeformedShape_i::UpdateActor(VISU_Actor* theActor) { if(VISU_ScalarMapAct* anActor = dynamic_cast(theActor)){ if(IsColored()){ anActor->SetBarVisibility(true); diff --git a/src/VISU_I/VISU_DeformedShape_i.hh b/src/VISU_I/VISU_DeformedShape_i.hh index 2f36e8e1..96fc4d22 100644 --- a/src/VISU_I/VISU_DeformedShape_i.hh +++ b/src/VISU_I/VISU_DeformedShape_i.hh @@ -77,14 +77,13 @@ namespace VISU{ virtual void ToStream(std::ostringstream& theStr); - virtual Storable* Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + virtual Storable* Restore(const Storable::TRestoringMap& theMap); virtual void SetMapScale(double theMapScale = 1.0); - virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL) - throw (std::runtime_error&); - virtual void UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&); + virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL); + + virtual void UpdateActor(VISU_Actor* theActor) ; }; } diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index a7d9986f..cd8b6454 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -56,6 +56,7 @@ #include #include +#include "Utils_ExceptHandlers.hxx" using namespace std; @@ -67,6 +68,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +UNEXPECT_CATCH(SalomeException, SALOME::SALOME_Exception); + extern "C" { PortableServer::ObjectId * VISUEngine_factory(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId * contId, @@ -125,10 +128,9 @@ namespace VISU{ aStudyBuilder->CommitCommand(); } return aSComponent; - } - + } - void RegistryStorable() throw(std::logic_error&) { + void RegistryStorable() { Storable::Registry(Result_i::myComment.c_str(),&(Result_i::Restore)); Storable::Registry(Mesh_i::myComment.c_str(),&(Restore)); Storable::Registry(ScalarMap_i::myComment.c_str(),&(Restore)); @@ -710,6 +712,7 @@ namespace VISU{ const char* theName) throw (SALOME::SALOME_Exception) { + Unexpect aCatch(SalomeException); if(MYDEBUG) MESSAGE("VISU_Gen_i::PublishInStudy : "<GetInput()->GetMeshOnEntitySize(theMeshName,(VISU::TEntity)theEntity,theFamilyName); bool aResult = VISU_PipeLine::CheckAvailableMemory(aSize); - INFOS("Mesh_i::IsPossible - CheckAvailableMemory = "<GetInput()->GetMeshOnGroupSize(theMeshName,theGroupName); bool aResult = VISU_PipeLine::CheckAvailableMemory(aSize); @@ -119,7 +119,6 @@ VISU::Storable* VISU::Mesh_i::Create(const char* theMeshName, const char* theGro VISU::Storable* VISU::Mesh_i::Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&) { Prs3d_i::Restore(theMap); @@ -242,26 +241,25 @@ VISU::Storable* VISU::Mesh_i::Build(int theRestoring){ VISU_Actor* VISU::Mesh_i::CreateActor(const Handle(SALOME_InteractiveObject)& theIO) - throw (std::runtime_error&) { VISU_MeshAct* anActor = VISU_MeshAct::New(); try{ VISU::Prs3d_i::CreateActor(anActor,theIO); UpdateActor(anActor); - }catch(std::runtime_error& exc){ + }catch (...) { anActor->Delete(); - throw exc; + throw ; } return anActor; } -void VISU::Mesh_i::UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&){ +void VISU::Mesh_i::UpdateActor(VISU_Actor* theActor) { if(VISU_MeshAct* anActor = dynamic_cast(theActor)){ if(MYDEBUG) MESSAGE("Mesh_i::UpdateActor"); VISU::Prs3d_i::UpdateActor(anActor); anActor->SetRepresentation(myPresentType); - anActor->GetProperty()->SetColor(myCellColor.R, myCellColor.G, myCellColor.B); + anActor->GetSurfaceProperty()->SetColor(myCellColor.R, myCellColor.G, myCellColor.B); anActor->GetEdgeProperty()->SetColor(myLinkColor.R, myLinkColor.G, myLinkColor.B); anActor->GetNodeProperty()->SetColor(myNodeColor.R, myNodeColor.G, myNodeColor.B); } diff --git a/src/VISU_I/VISU_Mesh_i.hh b/src/VISU_I/VISU_Mesh_i.hh index 56d23d53..5ae8a364 100644 --- a/src/VISU_I/VISU_Mesh_i.hh +++ b/src/VISU_I/VISU_Mesh_i.hh @@ -87,12 +87,11 @@ namespace VISU{ static const string myComment; virtual QString GenerateName(); - virtual Storable* Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + virtual Storable* Restore(const Storable::TRestoringMap& theMap); - virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL) - throw (std::runtime_error&); - virtual void UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&); + virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL); + + virtual void UpdateActor(VISU_Actor* theActor); }; } diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc index ea2ae269..5046a1fe 100644 --- a/src/VISU_I/VISU_Prs3d_i.cc +++ b/src/VISU_I/VISU_Prs3d_i.cc @@ -51,7 +51,7 @@ VISU::Prs3d_i::Prs3d_i(Result_i* theResult, SALOMEDS::SObject_ptr theSObject) : myAddToStudy = true; myPipeLine = NULL; CORBA::String_var aName = myStudy->Name(); - INFOS("Prs3d_i - this = "<> No enough memory"); throw ex; - }catch(...){ + } catch(std::exception& ex){ + throw ex; + }catch(...) { throw std::runtime_error("CreateActor >> unexpected exception was caught!!!"); - } + } } -void VISU::Prs3d_i::UpdateActor(VISU_Actor* theActor) throw (std::runtime_error&){ - try{ - vtkGeometryFilter* aGeometryFilter = vtkGeometryFilter::New(); - vtkDataSet *aDataSet = theActor->GetMapper()->GetInput(); - aGeometryFilter->SetInput(aDataSet); - vtkPolyData* aPolyData = aGeometryFilter->GetOutput(); - aPolyData->Update(); - static int INCMEMORY = 7; - float aSize = INCMEMORY*aPolyData->GetActualMemorySize()*1024.0; - int isPoss = VISU_PipeLine::CheckAvailableMemory(aSize); - INFOS("UpdateActor - aSize = "<> Actor is empty !!!"); - if(!isPoss) - throw std::runtime_error("Prs3d_i::UpdateActor >> There is no enough memory !!!"); - - theActor->GetMapper()->ShallowCopy(myPipeLine->GetMapper()); - theActor->Modified(); - }catch(std::runtime_error& ex){ - throw ex; - }catch(...){ - throw std::runtime_error("Prs3d_i::UpdateActor >> unexpected exception was caught!!!"); - } +void VISU::Prs3d_i::UpdateActor(VISU_Actor* theActor) { + theActor->GetMapper()->ShallowCopy(myPipeLine->GetMapper()); + theActor->Modified(); } VISU::Storable* VISU::Prs3d_i::Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&) { myName = VISU::Storable::FindValue(theMap,"myName").latin1(); return this; @@ -125,7 +105,7 @@ void VISU::Prs3d_i::ToStream(std::ostringstream& theStr){ Storable::DataToStream( theStr, "myName", myName.c_str() ); } -void VISU::Prs3d_i::Update() throw (std::runtime_error&){ +void VISU::Prs3d_i::Update() { try{ myPipeLine->Update(); }catch(...){ diff --git a/src/VISU_I/VISU_Prs3d_i.hh b/src/VISU_I/VISU_Prs3d_i.hh index 5c125b41..cd7115aa 100644 --- a/src/VISU_I/VISU_Prs3d_i.hh +++ b/src/VISU_I/VISU_Prs3d_i.hh @@ -58,12 +58,11 @@ namespace VISU{ VISU_PipeLine *myPipeLine; SALOMEDS::SObject_var mySObject; - void CreateActor(VISU_Actor* theActor, const Handle(SALOME_InteractiveObject)& theIO = NULL) - throw (std::runtime_error&); + void CreateActor(VISU_Actor* theActor, const Handle(SALOME_InteractiveObject)& theIO = NULL); virtual VISU_PipeLine* GetPipeLine(); public: - virtual void Update() throw(std::runtime_error&); + virtual void Update() ; VISU_PipeLine* GetPL(); void GetBounds(float aBounds[6]); @@ -71,13 +70,13 @@ namespace VISU{ virtual const char* GetComment() const = 0; virtual QString GenerateName() = 0; - virtual Storable* Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + virtual Storable* Restore(const Storable::TRestoringMap& theMap); + virtual void ToStream(std::ostringstream& theStr); - virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL) - throw (std::runtime_error&) = 0; - virtual void UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&); + virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL) = 0; + + virtual void UpdateActor(VISU_Actor* theActor) ; Result_i* GetResult() const { return myResult;} virtual SALOMEDS::SObject_var GetSObject(); @@ -86,7 +85,6 @@ namespace VISU{ template Storable* Restore(SALOMEDS::SObject_ptr theSObject, const string& thePrefix, const Storable::TRestoringMap& theMap) - throw(std::logic_error&) { VISU::Result_i* pResult = GetResult(theSObject); if(pResult != NULL){ diff --git a/src/VISU_I/VISU_PrsObject_i.cc b/src/VISU_I/VISU_PrsObject_i.cc index da77ebab..321696a1 100644 --- a/src/VISU_I/VISU_PrsObject_i.cc +++ b/src/VISU_I/VISU_PrsObject_i.cc @@ -54,6 +54,6 @@ QString VISU::PrsObject_i::GetEntry() { if(!CORBA::is_nil(aSObject.in())) anEntry = aSObject->GetID(); else - INFOS("PrsObject_i::GetEntry - Cannot find SObject in the Study with StudyId = "<StudyId()<<" !!!"); + MESSAGE("PrsObject_i::GetEntry - Cannot find SObject in the Study with StudyId = "<StudyId()<<" !!!"); return anEntry.in(); } diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc index f378c2c1..0438ffff 100644 --- a/src/VISU_I/VISU_Result_i.cc +++ b/src/VISU_I/VISU_Result_i.cc @@ -134,7 +134,7 @@ VISU::Result_i::Result_i(SALOMEDS::Study_ptr theStudy, const TSourceId& aSourceI myInput = NULL; myIsDone = 0; CORBA::String_var aName = theStudy->Name(); - INFOS("Result_i::Result_i - this = "<GetSize(); bool aResult = VISU_PipeLine::CheckAvailableMemory(aSize); - INFOS("Result_i::IsPossible - CheckAvailableMemory = "<NewBuilder(); aStudyBuilder->NewCommand(); // There is a transaction @@ -398,7 +397,7 @@ VISU::Storable* VISU::Result_i::Create(const char* theFileName){ static QString aCommand; aCommand.sprintf("cp %s %s",myFileInfo.absFilePath().latin1(),aTmpDir.get()); if(system(aCommand) == -1){ - INFOS("Create - Can't execute the command :"<GetStudy(); VISU::Result_i* pResult = new VISU::Result_i(aStudy); @@ -583,13 +580,13 @@ const SALOMEDS::Study_var& VISU::Result_i::GetStudyDocument() const { return myS const SALOMEDS::SComponent_var& VISU::Result_i::GetSComponent() const { return mySComponent;} VISU::Result_i::~Result_i() { - INFOS("Result_i::~Result_i() - this = "<(myPipeLine); } -void VISU::ScalarMap_i::Update() throw(std::runtime_error&){ +void VISU::ScalarMap_i::Update() { VISU::Prs3d_i::Update(); } @@ -494,7 +493,6 @@ void VISU::ScalarMap_i::SetMapScale(double theMapScale){ } VISU_Actor* VISU::ScalarMap_i::CreateActor(const Handle(SALOME_InteractiveObject)& theIO) - throw (std::runtime_error&) { VISU_ScalarMapAct* anActor = VISU_ScalarMapAct::New(); try{ @@ -503,14 +501,14 @@ VISU_Actor* VISU::ScalarMap_i::CreateActor(const Handle(SALOME_InteractiveObject anActor->SetRepresentation(2); anActor->myFieldName = myFieldName; UpdateActor(anActor); - }catch(std::runtime_error& exc){ + }catch(...) { anActor->Delete(); - throw exc; + throw std::runtime_error("CreateActor error"); } return anActor; } -void VISU::ScalarMap_i::UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&){ +void VISU::ScalarMap_i::UpdateActor(VISU_Actor* theActor) { if(VISU_ScalarMapAct* anActor = dynamic_cast(theActor)){ VISU::Prs3d_i::UpdateActor(theActor); VISU_ScalarBarActor *aScalarBar = anActor->GetScalarBar(); diff --git a/src/VISU_I/VISU_ScalarMap_i.hh b/src/VISU_I/VISU_ScalarMap_i.hh index 593213f0..a42b55f0 100644 --- a/src/VISU_I/VISU_ScalarMap_i.hh +++ b/src/VISU_I/VISU_ScalarMap_i.hh @@ -164,13 +164,12 @@ namespace VISU{ virtual const char* GetComment() const; virtual QString GenerateName(); - virtual Storable* Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + virtual Storable* Restore(const Storable::TRestoringMap& theMap); + static Storable* Restore(SALOMEDS::SObject_ptr theSObject, - const string& thePrefix, const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + const string& thePrefix, const Storable::TRestoringMap& theMap); - virtual void Update() throw(std::runtime_error&); + virtual void Update() ; virtual void SetMapScale(double theMapScale = 1.0); const VISU::TField* GetField() const { return myField;} @@ -181,9 +180,9 @@ namespace VISU{ virtual int GetIteration() { return myIteration; } - virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL) - throw (std::runtime_error&); - virtual void UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&); + virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL); + + virtual void UpdateActor(VISU_Actor* theActor) ; }; } diff --git a/src/VISU_I/VISU_StreamLines_i.cc b/src/VISU_I/VISU_StreamLines_i.cc index bb50cc01..85fd5da7 100644 --- a/src/VISU_I/VISU_StreamLines_i.cc +++ b/src/VISU_I/VISU_StreamLines_i.cc @@ -50,7 +50,7 @@ int VISU::StreamLines_i::IsPossible(Result_i* theResult, const char* theMeshName VISU_Convertor::TOutput *anOutput = theResult->GetInput()->GetTimeStampOnMesh(theMeshName,VISU::TEntity(theEntity),theFieldName,theIteration); bool aResult = VISU_StreamLinesPL::IsPossible(anOutput); - INFOS("StreamLines_i::IsPossible - aResult = "<FindAttribute( SO, anAttr, "AttributeTableOfInteger" ) ) { SALOMEDS::AttributeTableOfInteger_var anInt = SALOMEDS::AttributeTableOfInteger::_narrow( anAttr ); - return anInt->GetNbRows(); + return anInt->GetNbRows(); } else if ( Builder->FindAttribute( SO, anAttr, "AttributeTableOfReal" ) ) { SALOMEDS::AttributeTableOfReal_var aReal = SALOMEDS::AttributeTableOfReal::_narrow( anAttr ); @@ -128,6 +128,21 @@ VISU::Storable* VISU::Table_i::Create() { // generate name ... myName = GetTableTitle(); + + // mpv (PAL 5357): if name attribute already exist at this label, use it as name of table + if ( myName == "" ) + if ( !mySObj->_is_nil() ) { + CutLines_i* pCutLines = NULL; + CORBA::Object_var anObj = SObjectToObject(mySObj); + if(!CORBA::is_nil(anObj)){ + VISU::CutLines_var aCutLines = VISU::CutLines::_narrow(anObj); + if(!aCutLines->_is_nil()) + pCutLines = dynamic_cast(GetServant(aCutLines).in()); + } + if (!pCutLines) + if (mySObj->GetName()) myName = mySObj->GetName(); + } + if ( myName == "" ) myName = GenerateName(); // ... and build the object @@ -165,14 +180,15 @@ VISU::Storable* VISU::Table_i::Build( int theRestoring ) GetName(), "", aComment.latin1(), - true ); + pCutLines ); // create SObject referenced to real table object mySObj = SALOMEDS::SObject::_duplicate(myStudy->FindObjectID( anEntry.c_str() )); if(pCutLines) { pCutLines->BuildTableOfReal(mySObj); } - SALOMEDS::SObject_var refSO = Builder->NewObject( mySObj ); - Builder->Addreference( refSO, SO ); + // mpv (PAL5357): reference attributes are unnecessary now + //SALOMEDS::SObject_var refSO = Builder->NewObject( mySObj ); + //Builder->Addreference( refSO, SO ); } return this; } @@ -182,7 +198,6 @@ VISU::Storable* VISU::Table_i::Build( int theRestoring ) Restores table object from stream */ VISU::Storable* VISU::Table_i::Restore( const Storable::TRestoringMap& theMap, SALOMEDS::SObject_ptr SO) - throw( std::logic_error& ) { if(MYDEBUG) MESSAGE(GetComment()); myName = (const char*)(VISU::Storable::FindValue(theMap,"myName")); @@ -205,7 +220,6 @@ void VISU::Table_i::ToStream( std::ostringstream& theStr ) */ VISU::Storable* VISU::Table_i::Restore(SALOMEDS::SObject_ptr theSObject, const string& thePrefix, const Storable::TRestoringMap& theMap) - throw(std::logic_error&) { SALOMEDS::Study_var aStudy = theSObject->GetStudy(); VISU::Table_i* pResent = new VISU::Table_i( aStudy, "" ); @@ -284,7 +298,7 @@ VISU::Curve_i::Curve_i(SALOMEDS::Study_ptr theStudy, Table_i* theTable, CORBA::L */ VISU::Curve_i::~Curve_i() { - INFOS("Curve_i::~Curve_i"); + MESSAGE("Curve_i::~Curve_i"); } /*! Creates curve object @@ -574,7 +588,6 @@ Plot2d_Curve* VISU::Curve_i::CreatePresentation() Restores curve object from stream */ VISU::Storable* VISU::Curve_i::Restore( const Storable::TRestoringMap& theMap, SALOMEDS::SObject_ptr theSO) - throw( std::logic_error& ) { if(MYDEBUG) MESSAGE(GetComment()); mySObj = SALOMEDS::SObject::_duplicate(theSO); @@ -617,7 +630,6 @@ const char* VISU::Curve_i::GetTableID() { */ VISU::Storable* VISU::Curve_i::Restore(SALOMEDS::SObject_ptr theSObject, const string& thePrefix, const Storable::TRestoringMap& theMap) - throw(std::logic_error&) { SALOMEDS::Study_var aStudy = theSObject->GetStudy(); VISU::Table_i* pTable = GetTable(aStudy, theSObject->GetFather()); @@ -659,7 +671,7 @@ VISU::Container_i::Container_i( SALOMEDS::Study_ptr theStudy ) */ VISU::Container_i::~Container_i() { - INFOS("Container_i::~Container_i"); + MESSAGE("Container_i::~Container_i"); myCurves.clear(); } /*! @@ -861,7 +873,6 @@ VISU::Curve_i* VISU::Container_i::GetCurve( CORBA::Long theIndex ) Restores container data from the stream */ VISU::Storable* VISU::Container_i::Restore( const Storable::TRestoringMap& theMap ) - throw( std::logic_error& ) { if(MYDEBUG) MESSAGE(GetComment()); myName = VISU::Storable::FindValue( theMap, "myName" ).latin1(); @@ -884,7 +895,6 @@ void VISU::Container_i::ToStream( std::ostringstream& theStr ) */ VISU::Storable* VISU::Container_i::Restore(SALOMEDS::SObject_ptr theSObject, const string& thePrefix, const Storable::TRestoringMap& theMap) - throw(std::logic_error&) { SALOMEDS::Study_var aStudy = theSObject->GetStudy(); VISU::Container_i* pResent = new VISU::Container_i( aStudy ); diff --git a/src/VISU_I/VISU_Table_i.hh b/src/VISU_I/VISU_Table_i.hh index 25f9c4d9..136ce6ac 100644 --- a/src/VISU_I/VISU_Table_i.hh +++ b/src/VISU_I/VISU_Table_i.hh @@ -64,11 +64,9 @@ namespace VISU{ public: virtual Storable* Create(); - virtual Storable* Restore( const Storable::TRestoringMap& theMap, SALOMEDS::SObject_ptr SO) - throw(std::logic_error&); + virtual Storable* Restore( const Storable::TRestoringMap& theMap, SALOMEDS::SObject_ptr SO); static Storable* Restore(SALOMEDS::SObject_ptr theSObject, - const string& thePrefix, const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + const string& thePrefix, const Storable::TRestoringMap& theMap); virtual void ToStream( std::ostringstream& theStr ); static const string myComment; virtual const char* GetComment() const; @@ -122,11 +120,11 @@ namespace VISU{ public: virtual Storable* Create(); - virtual Storable* Restore( const Storable::TRestoringMap& theMap, SALOMEDS::SObject_ptr theSO) - throw(std::logic_error&); + virtual Storable* Restore( const Storable::TRestoringMap& theMap, SALOMEDS::SObject_ptr theSO); + static Storable* Restore(SALOMEDS::SObject_ptr theSObject, - const string& thePrefix, const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + const string& thePrefix, const Storable::TRestoringMap& theMap); + virtual void ToStream( std::ostringstream& theStr ); static const string myComment; virtual const char* GetComment() const; @@ -170,11 +168,11 @@ namespace VISU{ public: virtual Storable* Create(); - virtual Storable* Restore( const Storable::TRestoringMap& theMap ) - throw(std::logic_error&); + virtual Storable* Restore( const Storable::TRestoringMap& theMap ); + static Storable* Restore(SALOMEDS::SObject_ptr theSObject, - const string& thePrefix, const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + const string& thePrefix, const Storable::TRestoringMap& theMap); + virtual void ToStream( std::ostringstream& theStr ); static const string myComment; virtual const char* GetComment() const; diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx index 38106168..96631f1a 100644 --- a/src/VISU_I/VISU_TimeAnimation.cxx +++ b/src/VISU_I/VISU_TimeAnimation.cxx @@ -67,9 +67,6 @@ void VISU_TimeAnimation::addField(SALOMEDS::SObject_ptr theField) { FieldData aNewData; aNewData.myField = SALOMEDS::SObject::_duplicate(theField); aNewData.myNbFrames = 0; - aNewData.myPrs = 0; - aNewData.myActors = 0; - aNewData.myTiming = 0; aNewData.myPrsType = VISU::TSCALARMAP; VISU::Storable::TRestoringMap aMap = getMapOfValue(aNewData.myField); aNewData.myNbTimes = VISU::Storable::FindValue(aMap,"myNbTimeStamps").toLong(); @@ -90,26 +87,23 @@ void VISU_TimeAnimation::addField(SALOMEDS::SObject_ptr theField) { //************************************************************************ void VISU_TimeAnimation::clearData(FieldData& theData) { - if (theData.myTiming) { - free(theData.myTiming); - theData.myTiming = 0; - } + theData.myTiming.clear(); vtkRenderer* aRen = myView->getRenderer(); - if (theData.myActors) { - for (int i = 0; i < theData.myNbFrames; i++) { - if (theData.myActors[i] != 0) { - theData.myActors[i]->RemoveFromRender(aRen); - theData.myActors[i]->Delete(); + if (!theData.myActors.empty()) { + for (int i = 0, iEnd = theData.myActors.size(); i < iEnd; i++) { + if (theData.myActors.at(i) != 0) { + theData.myActors.at(i)->RemoveFromRender(aRen); + theData.myActors.at(i)->Delete(); } } - free(theData.myActors); - theData.myActors = 0; + theData.myActors.clear(); } - if (theData.myPrs) { - for (int i = 0; i < theData.myNbFrames; i++) - theData.myPrs[i]->_remove_ref(); - free(theData.myPrs); - theData.myPrs = 0; + if (!theData.myPrs.empty()) { + for (int i = 0, iEnd = theData.myPrs.size(); i < iEnd; i++) + if (theData.myPrs.at(i) != 0) { + theData.myPrs.at(i)->_remove_ref(); + } + theData.myPrs.clear(); } theData.myNbFrames = 0; myView->update(); @@ -128,8 +122,8 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { aData.myNbFrames = aData.myNbTimes; //VISU::Storable::FindValue(aMap,"myNbTimeStamps").toLong(); - aData.myPrs = (VISU::ScalarMap_i**) malloc(aData.myNbTimes * sizeof(VISU::ScalarMap_i*)); - aData.myTiming = (double*) malloc(aData.myNbTimes * sizeof(double)); + aData.myPrs.resize(aData.myNbTimes,NULL); + aData.myTiming.resize(aData.myNbTimes); SALOMEDS::ChildIterator_var anIter = myStudy->NewChildIterator(aData.myField); SALOMEDS::SObject_var aTimeStamp; @@ -144,10 +138,10 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { aTimeStamp = anIter->Value(); if (aTimeStamp->_is_nil()) continue; - aData.myTiming[i] = getTimeValue(aTimeStamp); + aData.myTiming.at(i) = getTimeValue(aTimeStamp); if (isRangeDefined()) { - if (aData.myTiming[i] < myMinVal) continue; - if (aData.myTiming[i] > myMaxVal) break; + if (aData.myTiming.at(i) < myMinVal) continue; + if (aData.myTiming.at(i) > myMaxVal) break; } VISU::Storable::TRestoringMap aTimeMap = getMapOfValue(aTimeStamp); @@ -164,7 +158,7 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { aFieldName.latin1(), aTimeStampId); //VISU::ScalarMap_var aTmp = aPresent->_this(); //aPresent->_remove_ref(); - aData.myPrs[i] = aPresent; + aData.myPrs.at(i) = aPresent; } break; @@ -175,7 +169,7 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { aFieldName.latin1(), aTimeStampId); //VISU::IsoSurfaces_var aTmp = aPresent->_this(); //aPresent->_remove_ref(); - aData.myPrs[i] = aPresent; + aData.myPrs.at(i) = aPresent; } break; @@ -186,7 +180,7 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { aFieldName.latin1(), aTimeStampId); //VISU::CutPlanes_var aTmp = aPresent->_this(); //aPresent->_remove_ref(); - aData.myPrs[i] = aPresent; + aData.myPrs.at(i) = aPresent; } break; @@ -197,7 +191,7 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { aFieldName.latin1(), aTimeStampId); //VISU::DeformedShape_var aTmp = aPresent->_this(); //aPresent->_remove_ref(); - aData.myPrs[i] = aPresent; + aData.myPrs.at(i) = aPresent; } break; @@ -208,7 +202,7 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { aFieldName.latin1(), aTimeStampId); //VISU::Vectors_var aTmp = aPresent->_this(); //aPresent->_remove_ref(); - aData.myPrs[i] = aPresent; + aData.myPrs.at(i) = aPresent; } break; @@ -219,22 +213,22 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { aFieldName.latin1(), aTimeStampId); //VISU::StreamLines_var aTmp = aPresent->_this(); //aPresent->_remove_ref(); - aData.myPrs[i] = aPresent; + aData.myPrs.at(i) = aPresent; } break; } - if (aData.myPrs[i]->GetMin() < aMin) aMin = aData.myPrs[i]->GetMin(); - if (aData.myPrs[i]->GetMax() > aMax) aMax = aData.myPrs[i]->GetMax(); + if (aData.myPrs.at(i)->GetMin() < aMin) aMin = aData.myPrs.at(i)->GetMin(); + if (aData.myPrs.at(i)->GetMax() > aMax) aMax = aData.myPrs.at(i)->GetMax(); i++; } aData.myNbFrames = i; QString aFixRange = QAD_CONFIG->getSetting("Visu:SBImposeRange"); if (aFixRange.compare("true") != 0) { for (i = 0; i < aData.myNbFrames; i++) - aData.myPrs[i]->SetRange(aMin, aMax); + aData.myPrs.at(i)->SetRange(aMin, aMax); if(aData.myPrsType == VISU::TISOSURFACE) for (i = 0; i < aData.myNbFrames; i++) - if(VISU::IsoSurfaces_i* aPrs = dynamic_cast(aData.myPrs[i])) + if(VISU::IsoSurfaces_i* aPrs = dynamic_cast(aData.myPrs.at(i))) aPrs->SetSubRange(aMin, aMax); } } @@ -246,33 +240,36 @@ CORBA::Boolean VISU_TimeAnimation::generateFrames() { MESSAGE("Viewer is nod defined for animation"); return false; } + myLastError = QString("Frame(s) for "); bool aNoError = true; VISU::Mutex mt(myMutex,qApp,MYDELAY); + clearView(); vtkRenderer* aRen = myView->getRenderer(); + for (int i = 0; i < getNbFields(); i++) { FieldData& aData = myFieldsLst[i]; - aData.myActors = (VISU_Actor**) malloc(aData.myNbFrames * sizeof(VISU_Actor*)); + aData.myActors.resize(aData.myNbFrames,NULL); for (long j = 0; j < aData.myNbFrames; j++) { VISU_Actor* aActor = NULL; try{ - aActor = aData.myPrs[j]->CreateActor(); + aActor = aData.myPrs.at(j)->CreateActor(); myView->AddActor(aActor); if(j == 0) aActor->VisibilityOn(); else aActor->VisibilityOff(); - }catch(std::runtime_error& exc){ + }catch(...){ //catch(std::runtime_error& exc){ aNoError = false; - myLastError += QString("%1 ").arg(aData.myTiming[j]); + myLastError += QString("%1 ").arg(aData.myTiming.at(j)); } - aData.myActors[j] = aActor; + aData.myActors.at(j) = aActor; } } myFrame = 0; myLastError += QString(" timestamp(s) cannot be created."); - emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); + emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); myView->Repaint(); return aNoError; } @@ -287,15 +284,14 @@ void VISU_TimeAnimation::clearView() { vtkRenderer* aRen = myView->getRenderer(); for (int i = 0; i < getNbFields(); i++) { FieldData& aData = myFieldsLst[i]; - if (aData.myActors) { - for (int i = 0; i < aData.myNbFrames; i++) { - if (aData.myActors[i] != 0) { - aData.myActors[i]->RemoveFromRender(aRen); - aData.myActors[i]->Delete(); + if (!aData.myActors.empty()) { + for (int i = 0, iEnd = aData.myActors.size(); i < iEnd; i++) { + if (aData.myActors.at(i) != 0) { + aData.myActors.at(i)->RemoveFromRender(aRen); + aData.myActors.at(i)->Delete(); } } - free(aData.myActors); - aData.myActors = 0; + aData.myActors.clear(); } } myView->update(); @@ -320,14 +316,14 @@ void VISU_TimeAnimation::nextFrame() { if (myFrame < (myFieldsLst[0].myNbFrames-1)) { int i; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOff(); + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); myFrame++; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOn(); + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); - emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); + emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); myView->Repaint(); } } @@ -338,14 +334,14 @@ void VISU_TimeAnimation::prevFrame() { if (myFrame > 0) { int i; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOff(); + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); myFrame--; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOn(); + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); - emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); + emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); myView->Repaint(); } } @@ -355,15 +351,18 @@ void VISU_TimeAnimation::firstFrame() { stopAnimation(); int i; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOff(); + if(!myFieldsLst[i].myActors.empty()) + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); myFrame = 0; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOn(); - - emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); - myView->Repaint(); + if(!myFieldsLst[i].myActors.empty()) + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); + if(!myFieldsLst[0].myTiming.empty()){ + emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); + myView->Repaint(); + } } //************************************************************************ @@ -371,14 +370,14 @@ void VISU_TimeAnimation::lastFrame() { stopAnimation(); int i; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOff(); + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); myFrame = myFieldsLst[0].myNbFrames-1; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOn(); + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); - emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); + emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); myView->Repaint(); } @@ -393,13 +392,13 @@ void VISU_TimeAnimation::gotoFrame(CORBA::Long theFrame) { qApp->syncX(); int i; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOff(); + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOff(); myFrame = theFrame; for (i = 0; i < getNbFields(); i++) - if (myFieldsLst[i].myActors[myFrame] != 0) - myFieldsLst[i].myActors[myFrame]->VisibilityOn(); - emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); + if (myFieldsLst[i].myActors.at(myFrame) != 0) + myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); + emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); myView->Repaint(); qApp->flushX(); qApp->processEvents(3); @@ -413,7 +412,7 @@ VISU::ScalarMap_ptr VISU_TimeAnimation::getPresentation(CORBA::Long theField, CO return VISU::ScalarMap::_nil(); if ((theFrame < 0) || (theFrame > (myFieldsLst[theField].myNbFrames - 1))) return VISU::ScalarMap::_nil(); - return myFieldsLst[theField].myPrs[theFrame]->_this(); + return myFieldsLst[theField].myPrs.at(theFrame)->_this(); } @@ -429,34 +428,32 @@ void VISU_TimeAnimation::run() { MESSAGE("Viewer is nod defined for animation"); return; } - double k=1; double aOneVal; bool isDumping = !myDumpPath.isEmpty(); aOneVal = (myFieldsLst[0].myNbFrames > 2) ? - myFieldsLst[0].myTiming[1] - myFieldsLst[0].myTiming[0] : 1; - + myFieldsLst[0].myTiming.at(1) - myFieldsLst[0].myTiming.at(0) : 1; qApp->lock(); while (myIsActive) { - emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]); + emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame)); for (int i = 0; i < getNbFields(); i++) { FieldData& aData = myFieldsLst[i]; if (myFrame > 0) { - if (aData.myActors[myFrame-1] != 0) - aData.myActors[myFrame-1]->VisibilityOff(); + if (aData.myActors.at(myFrame-1) != 0) + aData.myActors.at(myFrame-1)->VisibilityOff(); } else { - if (aData.myActors[aData.myNbFrames-1] != 0) - aData.myActors[aData.myNbFrames-1]->VisibilityOff(); + if (aData.myActors.at(aData.myNbFrames-1) != 0) + aData.myActors.at(aData.myNbFrames-1)->VisibilityOff(); } - if (aData.myActors[myFrame] != 0) { - aData.myActors[myFrame]->VisibilityOn(); + if (aData.myActors.at(myFrame) != 0) { + aData.myActors.at(myFrame)->VisibilityOn(); } } myView->Repaint(false); if (isDumping) { QPixmap px = QPixmap::grabWindow(myView->getViewWidget()->winId()); QString aFile(myDumpPath); - QString aName = QString("%1").arg(myFieldsLst[0].myTiming[myFrame]); + QString aName = QString("%1").arg(myFieldsLst[0].myTiming.at(myFrame)); int aPos = -1; while ((aPos = aName.find(".")) > -1 ) aName.replace(aPos, 1, "_"); @@ -472,17 +469,16 @@ void VISU_TimeAnimation::run() { break; case 1: if (myFieldsLst[0].myNbFrames > 2) - k = (myFieldsLst[0].myTiming[myFrame+1] - myFieldsLst[0].myTiming[myFrame])/aOneVal; + k = (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal; else k = 1; break; default: k = (myFrame < (myFieldsLst[0].myNbFrames-1))? - (myFieldsLst[0].myTiming[myFrame+1] - myFieldsLst[0].myTiming[myFrame])/aOneVal : 1; + (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal : 1; } } else k = 1; - qApp->unlock(); msleep((int)(1000.*k/mySpeed)); qApp->lock(); diff --git a/src/VISU_I/VISU_TimeAnimation.h b/src/VISU_I/VISU_TimeAnimation.h index 0331f2f7..f5c0a07b 100644 --- a/src/VISU_I/VISU_TimeAnimation.h +++ b/src/VISU_I/VISU_TimeAnimation.h @@ -11,13 +11,15 @@ #include "VISUConfig.hh" -class VTKViewer_ViewFrame; -class VISU_Actor; +#include #include #include #include +class VTKViewer_ViewFrame; +class VISU_Actor; + namespace VISU{ class Result_i; class ScalarMap_i; @@ -29,9 +31,9 @@ struct FieldData SALOMEDS::SObject_var myField; // field label long myNbTimes; // number of Timestamps long myNbFrames; // number of created Frames - VISU::ScalarMap_i** myPrs; // Presentations - VISU_Actor** myActors; // Actors - double* myTiming; // time values + std::vector myPrs; // Presentations + std::vector myActors; // Actors + std::vector myTiming; // time values }; diff --git a/src/VISU_I/VISU_Vectors_i.cc b/src/VISU_I/VISU_Vectors_i.cc index 2e271160..4cb92b29 100644 --- a/src/VISU_I/VISU_Vectors_i.cc +++ b/src/VISU_I/VISU_Vectors_i.cc @@ -52,7 +52,7 @@ int VISU::Vectors_i::IsPossible(Result_i* theResult, const char* theMeshName, VI float aSize = INCMEMORY* theResult->GetInput()->GetTimeStampSize(theMeshName,(VISU::TEntity)theEntity,theFieldName,theIteration); aResult = VISU_PipeLine::CheckAvailableMemory(aSize); - INFOS("Vectors_i::IsPossible - CheckAvailableMemory = "<GetProperty()->SetColor(myColor.R,myColor.G,myColor.B); anActor->GetProperty()->SetLineWidth(GetLineWidth()); UpdateActor(anActor); - }catch(std::runtime_error& exc){ + }catch(...){ anActor->Delete(); - throw exc; + throw ; } return anActor; } -void VISU::Vectors_i::UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&){ +void VISU::Vectors_i::UpdateActor(VISU_Actor* theActor) { if(VISU_VectorsAct* anActor = dynamic_cast(theActor)){ VISU::DeformedShape_i::UpdateActor(anActor); anActor->GetProperty()->SetLineWidth(GetLineWidth()); diff --git a/src/VISU_I/VISU_Vectors_i.hh b/src/VISU_I/VISU_Vectors_i.hh index fce5d7b0..40b45a43 100644 --- a/src/VISU_I/VISU_Vectors_i.hh +++ b/src/VISU_I/VISU_Vectors_i.hh @@ -73,16 +73,15 @@ namespace VISU{ virtual void ToStream(std::ostringstream& theStr); - virtual Storable* Restore(const Storable::TRestoringMap& theMap) - throw(std::logic_error&); + virtual Storable* Restore(const Storable::TRestoringMap& theMap); static const string myComment; virtual const char* GetComment() const; virtual QString GenerateName(); - virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL) - throw (std::runtime_error&); - virtual void UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&); + virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL); + + virtual void UpdateActor(VISU_Actor* theActor) ; }; } #endif diff --git a/src/VISU_I/VISU_ViewManager_i.cc b/src/VISU_I/VISU_ViewManager_i.cc index 61da0aab..26691ed0 100644 --- a/src/VISU_I/VISU_ViewManager_i.cc +++ b/src/VISU_I/VISU_ViewManager_i.cc @@ -914,7 +914,7 @@ namespace VISU{ return 0; } - Storable* View3D_i::Restore(const Storable::TRestoringMap& theMap) throw(std::logic_error&) { + Storable* View3D_i::Restore(const Storable::TRestoringMap& theMap) { // if(MYDEBUG) MESSAGE("View3D_i::Restore"); //myName = VISU::Storable::FindValue(theMap,"myName").latin1(); diff --git a/src/VISU_I/VISU_ViewManager_i.hh b/src/VISU_I/VISU_ViewManager_i.hh index 9463e754..c5189783 100644 --- a/src/VISU_I/VISU_ViewManager_i.hh +++ b/src/VISU_I/VISU_ViewManager_i.hh @@ -252,7 +252,7 @@ namespace VISU{ public: virtual Storable* Create(int theNew); - virtual Storable* Restore(const Storable::TRestoringMap& theMap) throw(std::logic_error&); + virtual Storable* Restore(const Storable::TRestoringMap& theMap) ; virtual void ToStream(std::ostringstream& theStr); virtual const char* GetComment() const; static const string myComment; diff --git a/src/VISU_SWIG/batchmode_visu_table.py b/src/VISU_SWIG/batchmode_visu_table.py index fe85ef75..aca745d1 100644 --- a/src/VISU_SWIG/batchmode_visu_table.py +++ b/src/VISU_SWIG/batchmode_visu_table.py @@ -15,6 +15,9 @@ import SALOMEDS import VISU import math +#-------------------------------------------------------------------------- +modulecatalog = naming_service.Resolve("/Kernel/ModulCatalog") + # >>> Getting study builder ================================================== myBuilder = myStudy.NewBuilder() @@ -25,7 +28,14 @@ myVisu.SetCurrentStudy(myStudy) if not myComponent: myComponent = myBuilder.NewComponent("VISU") aName = myBuilder.FindOrCreateAttribute(myComponent, "AttributeName") - aName.SetValue("Visu") + #aName.SetValue("Visu") + Comp = modulecatalog.GetComponent( "VISU" ) + aName.SetValue( Comp._get_componentusername() ) + + A2 = myBuilder.FindOrCreateAttribute(myComponent, "AttributePixMap"); + aPixmap = A2._narrow(SALOMEDS.AttributePixMap); + aPixmap.SetPixMap( "ICON_OBJBROWSER_Visu" ); + myBuilder.DefineComponentInstance(myComponent,myVisu) # >>> Creating object with Table of real[ 200 * 20 ] ======================== diff --git a/src/VISU_SWIG/batchmode_visu_view3d.py b/src/VISU_SWIG/batchmode_visu_view3d.py index 47396189..33f8d269 100644 --- a/src/VISU_SWIG/batchmode_visu_view3d.py +++ b/src/VISU_SWIG/batchmode_visu_view3d.py @@ -24,7 +24,7 @@ myFieldName = "VITESSE"; #medFile = "brideResultats.dat" #myFieldName = "VM_Elem."; -medFile = os.getenv('SALOME_ROOT_DIR') + '/data/' + medFile +medFile = os.getenv('KERNEL_ROOT_DIR') + '/examples/' + medFile myResult = myVisu.ImportFile(medFile) diff --git a/src/VISU_SWIG/visu_big_table.py b/src/VISU_SWIG/visu_big_table.py index 9a3317c4..fb90b2d6 100644 --- a/src/VISU_SWIG/visu_big_table.py +++ b/src/VISU_SWIG/visu_big_table.py @@ -25,7 +25,13 @@ myVisu.SetCurrentStudy(myStudy) if not myComponent: myComponent = myBuilder.NewComponent("VISU") aName = myBuilder.FindOrCreateAttribute(myComponent, "AttributeName") - aName.SetValue("Visu") + #aName.SetValue("Visu") + aName.SetValue( salome.sg.getComponentUserName("VISU") ) + + A2 = myBuilder.FindOrCreateAttribute(myComponent, "AttributePixMap"); + aPixmap = A2._narrow(SALOMEDS.AttributePixMap); + aPixmap.SetPixMap( "ICON_OBJBROWSER_Visu" ); + myBuilder.DefineComponentInstance(myComponent,myVisu) # >>> Creating object with Table of real[ 200 * 20 ] ======================== diff --git a/src/VISU_SWIG/visu_prs_example.py b/src/VISU_SWIG/visu_prs_example.py index 002ebd10..84d65be4 100644 --- a/src/VISU_SWIG/visu_prs_example.py +++ b/src/VISU_SWIG/visu_prs_example.py @@ -22,7 +22,7 @@ import visu_gui myVisu = visu_gui.myVisu medFile = "pointe.med" -medFile = os.getenv('SALOME_ROOT_DIR') + '/data/' + medFile +medFile = os.getenv('KERNEL_ROOT_DIR') + '/examples/' + medFile print medFile studyCurrent = salome.myStudyName diff --git a/src/VISU_SWIG/visu_swig_test.py b/src/VISU_SWIG/visu_swig_test.py index 45a26744..9946faba 100644 --- a/src/VISU_SWIG/visu_swig_test.py +++ b/src/VISU_SWIG/visu_swig_test.py @@ -1,5 +1,5 @@ from libVISU_Swig import * -medFile = os.getenv('SALOME_ROOT_DIR') + '/data/fra.med' +medFile = os.getenv('KERNEL_ROOT_DIR') + '/examples/fra.med' myCon=Convertor(medFile) myPrs=ScalarMap(myCon,"LE VOLUME",0,"VITESSE",1) myView=View3D() diff --git a/src/VISU_SWIG/visu_table.py b/src/VISU_SWIG/visu_table.py index 38641bbd..780e698c 100644 --- a/src/VISU_SWIG/visu_table.py +++ b/src/VISU_SWIG/visu_table.py @@ -25,7 +25,13 @@ myVisu.SetCurrentStudy(myStudy) if not myComponent: myComponent = myBuilder.NewComponent("VISU") aName = myBuilder.FindOrCreateAttribute(myComponent, "AttributeName") - aName.SetValue("Visu") + #aName.SetValue("Visu") + aName.SetValue( salome.sg.getComponentUserName("VISU") ) + + A2 = myBuilder.FindOrCreateAttribute(myComponent, "AttributePixMap"); + aPixmap = A2._narrow(SALOMEDS.AttributePixMap); + aPixmap.SetPixMap( "ICON_OBJBROWSER_Visu" ); + myBuilder.DefineComponentInstance(myComponent,myVisu) # >>> Creating object with Table of integer ================================== diff --git a/src/VISU_SWIG/visu_view3d.py b/src/VISU_SWIG/visu_view3d.py index 1248289f..cb4fecf1 100644 --- a/src/VISU_SWIG/visu_view3d.py +++ b/src/VISU_SWIG/visu_view3d.py @@ -20,7 +20,7 @@ myVisu = visu_gui.myVisu medFile = "fra.med" myFieldName = "VITESSE"; -medFile = os.getenv('SALOME_ROOT_DIR') + '/data/' + medFile +medFile = os.getenv('KERNEL_ROOT_DIR') + '/examples/' + medFile myResult = myVisu.ImportFile(medFile) aMeshName ="LE VOLUME"