#include <GEOM_OCCFilter.h>
#include <GEOM_Actor.h>
-#include <GEOM_AssemblyBuilder.h>
#include <GEOM_AISShape.hxx>
#include <GEOM_AISVector.hxx>
#include <GEOM_AISTrihedron.hxx>
#include <TopTools_MapOfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopoDS.hxx>
// VTK Includes
#include <vtkActorCollection.h>
if ( prs )
{
- vf->BeforeDisplay( this );
+ vf->BeforeDisplay( this, prs );
vf->Display( prs );
- vf->AfterDisplay( this );
+ vf->AfterDisplay( this, prs );
if ( updateViewer )
vf->Repaint();
int aMgrId = getViewManagerId(vf);
SalomeApp_Study* aStudy = getStudy();
aStudy->setObjectProperty(aMgrId, theIO->getEntry(), VISIBILITY_PROP, 1 );
-
+
+ setVisibilityState(theIO->getEntry(), Qtx::ShownState);
delete prs; // delete presentation because displayer is its owner
}
if ( vf ) {
SALOME_Prs* prs = vf->CreatePrs( theIO->getEntry() );
if ( prs ) {
+ vf->BeforeErase( this, prs );
vf->Erase( prs, forced );
+ vf->AfterErase( this, prs );
if ( updateViewer )
vf->Repaint();
delete prs; // delete presentation because displayer is its owner
int aMgrId = getViewManagerId(vf);
SalomeApp_Study* aStudy = getStudy();
aStudy->setObjectProperty(aMgrId, theIO->getEntry(), VISIBILITY_PROP, 0 );
+
+ setVisibilityState(theIO->getEntry(), Qtx::HiddenState);
}
}
}
QStringList uv = anIsos.split(DIGIT_SEPARATOR);
anUIsoNumber = uv[0].toInt();
aVIsoNumber = uv[1].toInt();
- AISShape->SetTransparency(aPropMap.value(TRANSPARENCY_PROP).toDouble());
+ //AISShape->SetTransparency(aPropMap.value(TRANSPARENCY_PROP).toDouble());
} else {
anUIsoNumber = aResMgr->integerValue("OCCViewer", "iso_number_u", 1);
aVIsoNumber = aResMgr->integerValue("OCCViewer", "iso_number_v", 1);
theActors->AddItem( aTrh );
}
else {
- theActors = GEOM_AssemblyBuilder::BuildActors( myShape, 0, 0, Standard_True, myType == GEOM_VECTOR );
+ PropMap aDefPropMap = getDefaultPropepryMap(SVTK_Viewer::Type());
+
QString anEntry;
if(!myIO.IsNull()) {
aMgrId = getViewManagerId(myViewFrame);
anEntry = myIO->getEntry();
}
useStudy = !anEntry.isEmpty() && aMgrId != -1;
+
+
+ theActors = vtkActorCollection::New();
+ GEOM_Actor* aGeomActor = GEOM_Actor::New();
+ aGeomActor->SetShape(myShape,aDefPropMap.value(DEFLECTION_COEFF_PROP).toDouble(),myType == GEOM_VECTOR);
+ theActors->AddItem(aGeomActor);
+ aGeomActor->Delete();
if(useStudy){
aPropMap = aStudy->getObjectPropMap(aMgrId,anEntry);
- PropMap aDefPropMap = getDefaultPropepryMap(SOCC_Viewer::Type());
bool isDiff = MergePropertyMaps(aPropMap, aDefPropMap);
if(isDiff)
aStudy->setObjectPropMap(aMgrId,anEntry,aPropMap);
aGeomGActor->SetOpacity(1.0 - aPropMap.value(TRANSPARENCY_PROP).toDouble());
aGeomGActor->SetVectorMode(aPropMap.value(VECTOR_MODE_PROP).toInt());
aGeomGActor->setDisplayMode(aPropMap.value(DISPLAY_MODE_PROP).toInt());
- aGeomGActor->SetDeflection(aPropMap.value(DEFLECTION_COEFF_PROP).toDouble(), aGeomGActor->GetIsRelative());
+ aGeomGActor->SetDeflection(aPropMap.value(DEFLECTION_COEFF_PROP).toDouble());
vtkFloatingPointType aColor[3] = {1.,0.,0.};
if(aPropMap.contains(COLOR_PROP)) {
* [ Reimplemented from SALOME_Displayer ]
*/
//=================================================================
-void GEOM_Displayer::BeforeDisplay( SALOME_View* v, const SALOME_OCCViewType& )
+void GEOM_Displayer::BeforeDisplay( SALOME_View* v, const SALOME_OCCPrs* )
{
SOCC_Viewer* vf = dynamic_cast<SOCC_Viewer*>( v );
if ( vf )
}
}
-void GEOM_Displayer::AfterDisplay( SALOME_View*, const SALOME_OCCViewType& )
+void GEOM_Displayer::AfterDisplay( SALOME_View* v, const SALOME_OCCPrs* p )
{
+ SalomeApp_Study* aStudy = getStudy();
+ if (!aStudy) return;
+ SOCC_Viewer* vf = dynamic_cast<SOCC_Viewer*>( v );
+ if ( vf && !p->IsNull() ) {
+ int aMgrId = getViewManagerId( vf );
+ Handle(AIS_InteractiveContext) ic = vf->getAISContext();
+ const SOCC_Prs* prs = dynamic_cast<const SOCC_Prs*>( p );
+ if ( !ic.IsNull() && prs ) {
+ AIS_ListOfInteractive objects;
+ prs->GetObjects( objects );
+ AIS_ListIteratorOfListOfInteractive it( objects );
+ while( it.More() ) {
+ Handle(GEOM_AISShape) sh = Handle(GEOM_AISShape)::DownCast( it.Value() );
+ if ( sh.IsNull() ) continue;
+ Handle(SALOME_InteractiveObject) IO = sh->getIO();
+ if ( IO.IsNull() ) continue;
+ PropMap aPropMap = aStudy->getObjectPropMap( aMgrId, IO->getEntry() );
+ if ( aPropMap.contains( TRANSPARENCY_PROP ) ) {
+ double transparency = aPropMap.value(TRANSPARENCY_PROP).toDouble();
+ ic->SetTransparency( sh, transparency, true );
+ it.Next();
+ }
+ }
+ }
+ }
}
-
//=================================================================
/*!
* GEOM_Displayer::SetColor
myShape = theShape;
}
-bool GEOM_Displayer::canBeDisplayed( const QString& /*entry*/, const QString& viewer_type ) const
+bool GEOM_Displayer::canBeDisplayed( const QString& entry, const QString& viewer_type ) const
{
- return viewer_type==SOCC_Viewer::Type() || viewer_type==SVTK_Viewer::Type();
+ return viewer_type == SOCC_Viewer::Type() || viewer_type == SVTK_Viewer::Type();
}
int GEOM_Displayer::SetDisplayMode( const int theMode )
anUIsoNumber = aResMgr->integerValue("OCCViewer", "iso_number_u", 1);
aVIsoNumber = aResMgr->integerValue("OCCViewer", "iso_number_v", 1);
} else if( viewer_type==SVTK_Viewer::Type()) {
- anUIsoNumber = 1;
- aVIsoNumber = 1;
+ anUIsoNumber = aResMgr->integerValue("VTKViewer", "iso_number_u", 1);
+ aVIsoNumber = aResMgr->integerValue("VTKViewer", "iso_number_u", 1);
}
QString anIsos("%1%2%3");
anIsos = anIsos.arg(anUIsoNumber);anIsos = anIsos.arg(DIGIT_SEPARATOR);anIsos = anIsos.arg(aVIsoNumber);
aDefaultMap.insert( COLOR_PROP , col);
//7. Deflection Coeff
- double aDC = aResMgr->doubleValue("Geometry", "deflection_coeff", 0.001);
+ double aDC;
+
+ if(viewer_type == SOCC_Viewer::Type()) {
+ aDC = aResMgr->doubleValue("Geometry", "deflection_coeff", 0.001);
+ } else if( viewer_type==SVTK_Viewer::Type()) {
+ aDC = 0.001;
+ }
+
aDefaultMap.insert( DEFLECTION_COEFF_PROP , aDC);
return aDefaultMap;