From b6dff302eaf2433b8e62328a9b00edf1c23e511a Mon Sep 17 00:00:00 2001 From: imn Date: Mon, 16 Feb 2015 17:53:38 +0300 Subject: [PATCH] Add used in the future header Prs3d_Drawer.hxx for bug 0022818: EDF 9341 GUI: A compound of one circle is shown as two superimposing circles in the OCC viewer --- src/OCCViewer/OCCViewer_ViewModel.cxx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx index c769ea891..83e9355e8 100755 --- a/src/OCCViewer/OCCViewer_ViewModel.cxx +++ b/src/OCCViewer/OCCViewer_ViewModel.cxx @@ -53,7 +53,11 @@ #include #include -#include +#if OCC_VERSION_LARGE > 0x06080000 + #include +#else + #include +#endif #include #include @@ -121,8 +125,13 @@ OCCViewer_Viewer::OCCViewer_Viewer( bool DisplayTrihedron) //myTrihedron->SetColor( Col ); myTrihedron->SetArrowColor( Col.Name() ); myTrihedron->SetSize(100); - Handle(AIS_Drawer) drawer = myTrihedron->Attributes(); - if (drawer->HasDatumAspect()) { + #if OCC_VERSION_LARGE > 0x06080000 + Handle(Prs3d_Drawer) drawer = myTrihedron->Attributes(); + if (drawer->HasOwnDatumAspect()) { + #else + Handle(AIS_Drawer) drawer = myTrihedron->Attributes(); + if (drawer->HasDatumAspect()) { + #endif Handle(Prs3d_DatumAspect) daspect = drawer->DatumAspect(); daspect->FirstAxisAspect()->SetColor(Quantity_Color(1.0, 0.0, 0.0, Quantity_TOC_RGB)); daspect->SecondAxisAspect()->SetColor(Quantity_Color(0.0, 1.0, 0.0, Quantity_TOC_RGB)); -- 2.39.2