ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 08:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

First integration of a new PV3D viewer.

Browse Source
This commit is contained in:
Anthony Geay 2023-03-27 08:52:33 +01:00
parent 2c3f99cda1
commit 542718ee9d
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/SMESHGUI/SMESHGUI_Displayer.cxx
View File

@ -36,13 +36,39 @@
#include <SUIT_ViewManager.h> #include <SUIT_ViewManager.h>
#include <SVTK_ViewModel.h> #include <SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h> #include <SVTK_ViewWindow.h>
#include <SPV3D_Prs.h>
#include <SPV3D_ViewModel.h>
#include <PV3DViewer_ViewWindow.h>
//For PV3D
#include "SMESH_Actor.h"
// IDL includes // IDL includes
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Group) #include CORBA_SERVER_HEADER(SMESH_Group)
#include CORBA_SERVER_HEADER(SMESH_Mesh) #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 ) SMESHGUI_Displayer::SMESHGUI_Displayer( SalomeApp_Application* app )
: LightApp_Displayer(), : LightApp_Displayer(),
@ -57,7 +83,7 @@ SMESHGUI_Displayer::~SMESHGUI_Displayer()
SALOME_Prs* SMESHGUI_Displayer::buildPresentation( const QString& entry, SALOME_View* theViewFrame ) 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(); SALOME_View* aViewFrame = theViewFrame ? theViewFrame : GetActiveView();
@ -81,6 +107,28 @@ SALOME_Prs* SMESHGUI_Displayer::buildPresentation( const QString& entry, SALOME_
else if( anActor ) else if( anActor )
SMESH::RemoveActor( vtk_viewer->getViewManager()->getActiveView(), anActor ); SMESH::RemoveActor( vtk_viewer->getViewManager()->getActiveView(), anActor );
} }
SPV3D_ViewModel *pv3d_viewer = dynamic_cast<SPV3D_ViewModel *>( 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<SPV3D_Prs*>( prs );
if( pv3dPrs )
{
pv3dPrs->SetName( getName( entry ) );
pv3dPrs->FillUsingActor( anActor );
}
}
}
}
} }
return prs; return prs;
@ -94,7 +142,7 @@ SalomeApp_Study* SMESHGUI_Displayer::study() const
bool SMESHGUI_Displayer::canBeDisplayed( const QString& entry, const QString& viewer_type ) const bool SMESHGUI_Displayer::canBeDisplayed( const QString& entry, const QString& viewer_type ) const
{ {
bool res = false; bool res = false;
if(viewer_type != SVTK_Viewer::Type()) if(viewer_type != SVTK_Viewer::Type() && viewer_type != SPV3D_ViewModel::Type())
return res; return res;
_PTR(SObject) obj = SMESH::getStudy()->FindObjectID( (const char*)entry.toUtf8() ); _PTR(SObject) obj = SMESH::getStudy()->FindObjectID( (const char*)entry.toUtf8() );

1
src/SMESHGUI/SMESHGUI_Displayer.h
View File

@ -48,6 +48,7 @@ public:
protected: protected:
SalomeApp_Study* study() const; SalomeApp_Study* study() const;
std::string getName( const QString& entry );
private: private:
SalomeApp_Application* myApp; SalomeApp_Application* myApp;