X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Displayer.cxx;h=f722385ce486ee79b6d3b846e4da41c24822256b;hp=613fbb9e4349512b65c611b9c7b4d371140b999a;hb=HEAD;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070 diff --git a/src/SMESHGUI/SMESHGUI_Displayer.cxx b/src/SMESHGUI/SMESHGUI_Displayer.cxx index 613fbb9e4..f722385ce 100644 --- a/src/SMESHGUI/SMESHGUI_Displayer.cxx +++ b/src/SMESHGUI/SMESHGUI_Displayer.cxx @@ -1,32 +1,34 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // SMESH SMESHGUI : Displayer for SMESH module // File : SMESHGUI_Displayer.cxx // Author : Alexander SOLOVYOV, Open CASCADE S.A.S. // SMESH includes // -#include "SMESHGUI_Displayer.h" +#include "SMESHGUI_Displayer.h" #include "SMESHGUI_VTKUtils.h" +#include "SMESHGUI_Utils.h" // SALOME GUI includes #include @@ -34,10 +36,44 @@ #include #include #include +#include +#include +#include + +//For PV3D +#include "SMESH_Actor.h" + +// IDL includes +#include +#include CORBA_SERVER_HEADER(SMESH_Group) +#include CORBA_SERVER_HEADER(SMESH_Mesh) + +std::string SMESHGUI_Displayer::getName( const QString& entry ) +{ + Handle( SALOME_InteractiveObject ) theIO = new SALOME_InteractiveObject(); + theIO->setEntry( entry.toUtf8().constData() ); + if ( !theIO.IsNull() ) + { + // Find SOBject (because shape should be published previously) + if ( study() ) + { + _PTR(SObject) aSObj ( study()->studyDS()->FindObjectID( theIO->getEntry() ) ); + _PTR(GenericAttribute) anAttr; + + if ( aSObj && aSObj->FindAttribute( anAttr, "AttributeName") ) + { + _PTR(AttributeName) aNameAttr( anAttr ); + return aNameAttr->Value(); + } + } + } + return ""; +} SMESHGUI_Displayer::SMESHGUI_Displayer( SalomeApp_Application* app ) : LightApp_Displayer(), - myApp( app ) + myApp( app ), + isNeedFitAll(false) { } @@ -47,7 +83,7 @@ SMESHGUI_Displayer::~SMESHGUI_Displayer() SALOME_Prs* SMESHGUI_Displayer::buildPresentation( const QString& entry, SALOME_View* theViewFrame ) { - SALOME_Prs* prs = 0; + SALOME_Prs *prs = nullptr; SALOME_View* aViewFrame = theViewFrame ? theViewFrame : GetActiveView(); @@ -57,18 +93,41 @@ SALOME_Prs* SMESHGUI_Displayer::buildPresentation( const QString& entry, SALOME_ if( vtk_viewer ) { SUIT_ViewWindow* wnd = vtk_viewer->getViewManager()->getActiveView(); - SMESH_Actor* anActor = SMESH::FindActorByEntry( wnd, entry.toLatin1().data() ); + SMESH_Actor* anActor = SMESH::FindActorByEntry( wnd, entry.toUtf8().data() ); if( !anActor ) - anActor = SMESH::CreateActor( study()->studyDS(), entry.toLatin1().data(), true ); + anActor = SMESH::CreateActor( entry.toUtf8().data(), true ); if( anActor ) { - SMESH::DisplayActor( wnd, anActor ); - prs = LightApp_Displayer::buildPresentation( entry.toLatin1().data(), aViewFrame ); + isNeedFitAll = SMESH::NoSmeshActors(); + SMESH::DisplayActor( wnd, anActor ); + prs = LightApp_Displayer::buildPresentation( entry.toUtf8().data(), aViewFrame ); } if( prs ) - UpdatePrs( prs ); + UpdatePrs( prs ); else if( anActor ) - SMESH::RemoveActor( vtk_viewer->getViewManager()->getActiveView(), anActor ); + SMESH::RemoveActor( vtk_viewer->getViewManager()->getActiveView(), anActor ); + } + + SPV3D_ViewModel *pv3d_viewer = dynamic_cast( aViewFrame ); + if(pv3d_viewer) + { + SUIT_ViewWindow* wnd = pv3d_viewer->getViewManager()->getActiveView(); + SMESH_Actor* anActor = SMESH::FindActorByEntry( wnd, entry.toUtf8().data() ); + if( !anActor ) + anActor = SMESH::CreateActor( entry.toUtf8().data(), true ); + if( anActor ) + { + prs = LightApp_Displayer::buildPresentation( entry.toUtf8().data(), aViewFrame ); + if( prs ) + { + SPV3D_Prs *pv3dPrs = dynamic_cast( prs ); + if( pv3dPrs ) + { + pv3dPrs->SetName( getName( entry ) ); + pv3dPrs->FillUsingActor( anActor ); + } + } + } } } @@ -80,7 +139,37 @@ SalomeApp_Study* SMESHGUI_Displayer::study() const return dynamic_cast( myApp->activeStudy() ); } -bool SMESHGUI_Displayer::canBeDisplayed( const QString& /*entry*/, const QString& viewer_type ) const +bool SMESHGUI_Displayer::canBeDisplayed( const QString& entry, const QString& viewer_type ) const { - return viewer_type==SVTK_Viewer::Type(); + bool res = false; + if(viewer_type != SVTK_Viewer::Type() && viewer_type != SPV3D_ViewModel::Type()) + return res; + + _PTR(SObject) obj = SMESH::getStudy()->FindObjectID( (const char*)entry.toUtf8() ); + CORBA::Object_var anObj = SMESH::SObjectToObject( obj ); + + if ( !CORBA::is_nil( anObj ) ) + { + SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( anObj ); + if ( ! ( res = !mesh->_is_nil() )) + { + SMESH::SMESH_subMesh_var aSubMeshObj = SMESH::SMESH_subMesh::_narrow( anObj ); + if ( ! ( res = !aSubMeshObj->_is_nil() )) + { + SMESH::SMESH_GroupBase_var aGroupObj = SMESH::SMESH_GroupBase::_narrow( anObj ); + res = !aGroupObj->_is_nil(); + } + } + } + return res; } + +void SMESHGUI_Displayer::Display( const QStringList& theList, const bool anUpdateViewer, SALOME_View* theView ) +{ + LightApp_Displayer::Display( theList, anUpdateViewer, theView ); + + if (isNeedFitAll) { + SMESH::FitAll(); + isNeedFitAll = false; + } +} \ No newline at end of file