From 24a0d3dbaef5bb337f41f6476a5c1eedf2b41948 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 8 May 2015 15:40:10 +0300 Subject: [PATCH] OCCT 6.9.0 (IR-2015-05-23) compatibility (remove temporary workaround) --- src/OCCViewer/CMakeLists.txt | 5 -- src/OCCViewer/OCCViewer_CubeAxesDlg.cxx | 61 ------------------------- 2 files changed, 66 deletions(-) diff --git a/src/OCCViewer/CMakeLists.txt b/src/OCCViewer/CMakeLists.txt index 760e267f2..eefdd3f50 100755 --- a/src/OCCViewer/CMakeLists.txt +++ b/src/OCCViewer/CMakeLists.txt @@ -41,11 +41,6 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS(${QT_DEFINITIONS} ${CAS_DEFINITIONS} ${OGL_DEFINITIONS}) -# VSR: TEMPORARY, to be removed -IF(OCCT_690BETA_COMPAT) -ADD_DEFINITIONS(-DOCCT_690BETA_COMPAT) -ENDIF(OCCT_690BETA_COMPAT) - # libraries to link to SET(_link_LIBRARIES ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CAS_KERNEL} ${CAS_VIEWER} ${CAS_TKGeomAlgo} diff --git a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx index ea7231107..71a821d77 100644 --- a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx +++ b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx @@ -265,7 +265,6 @@ void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView ) int aGap = 20; #if OCC_VERSION_LARGE > 0x06080000 -#ifndef OCCT_690BETA_COMPAT // VSR: temporarily, to be removed later and replace below implementation Graphic3d_GraduatedTrihedron gt; // main params gt.SetDrawGrid(Standard_True); // to draw grid @@ -293,66 +292,6 @@ void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView ) } // draw trihedron theView->GraduatedTrihedronDisplay(gt); -#else // #ifndef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation - Graphic3d_GraduatedTrihedron gt; - // main params - gt.SetToDrawTickmarks(Standard_True); // to draw grid - gt.SetToDrawAxes(Standard_True); // to draw axes - gt.SetGridColor(Quantity_NOC_WHITE); // grid color - // X axis aspect - gt.ChangeXAxisAspect().SetName(anAxisData[0].Name.toLatin1().constData()); - gt.ChangeXAxisAspect().SetToDrawName(anAxisData[0].DrawName); - gt.ChangeXAxisAspect().SetToDrawValues(anAxisData[0].DrawValues); - gt.ChangeXAxisAspect().SetToDrawTickmarks(anAxisData[0].DrawTickmarks); - gt.ChangeXAxisAspect().SetNameColor(Quantity_Color(anAxisData[0].NameColor.redF(), - anAxisData[0].NameColor.greenF(), - anAxisData[0].NameColor.blueF(), - Quantity_TOC_RGB)); - gt.ChangeXAxisAspect().SetColor(Quantity_Color(anAxisData[0].Color.redF(), - anAxisData[0].Color.greenF(), - anAxisData[0].Color.blueF(), - Quantity_TOC_RGB)); - gt.ChangeXAxisAspect().SetTickmarkNumber(anAxisData[0].NbValues-1); - gt.ChangeXAxisAspect().SetTickmarkLength(anAxisData[0].TickmarkLength); - gt.ChangeXAxisAspect().SetValuesOffset(anAxisData[0].Offset); - gt.ChangeXAxisAspect().SetNameOffset(anAxisData[0].Offset + aGap); // see above - // Y axis aspect - gt.ChangeYAxisAspect().SetName(anAxisData[1].Name.toLatin1().constData()); - gt.ChangeYAxisAspect().SetToDrawName(anAxisData[1].DrawName); - gt.ChangeYAxisAspect().SetToDrawValues(anAxisData[1].DrawValues); - gt.ChangeYAxisAspect().SetToDrawTickmarks(anAxisData[1].DrawTickmarks); - gt.ChangeYAxisAspect().SetNameColor(Quantity_Color(anAxisData[1].NameColor.redF(), - anAxisData[1].NameColor.greenF(), - anAxisData[1].NameColor.blueF(), - Quantity_TOC_RGB)); - gt.ChangeYAxisAspect().SetColor(Quantity_Color(anAxisData[1].Color.redF(), - anAxisData[1].Color.greenF(), - anAxisData[1].Color.blueF(), - Quantity_TOC_RGB)); - gt.ChangeYAxisAspect().SetTickmarkNumber(anAxisData[1].NbValues-1); - gt.ChangeYAxisAspect().SetTickmarkLength(anAxisData[1].TickmarkLength); - gt.ChangeYAxisAspect().SetValuesOffset(anAxisData[1].Offset); - gt.ChangeYAxisAspect().SetNameOffset(anAxisData[1].Offset + aGap); // see above - // Z axis aspect - gt.ChangeZAxisAspect().SetName(anAxisData[2].Name.toLatin1().constData()); - gt.ChangeZAxisAspect().SetToDrawName(anAxisData[2].DrawName); - gt.ChangeZAxisAspect().SetToDrawValues(anAxisData[2].DrawValues); - gt.ChangeZAxisAspect().SetToDrawTickmarks(anAxisData[2].DrawTickmarks); - gt.ChangeZAxisAspect().SetNameColor(Quantity_Color(anAxisData[2].NameColor.redF(), - anAxisData[2].NameColor.greenF(), - anAxisData[2].NameColor.blueF(), - Quantity_TOC_RGB)); - gt.ChangeZAxisAspect().SetColor(Quantity_Color(anAxisData[2].Color.redF(), - anAxisData[2].Color.greenF(), - anAxisData[2].Color.blueF(), - Quantity_TOC_RGB)); - gt.ChangeZAxisAspect().SetTickmarkNumber(anAxisData[2].NbValues-1); - gt.ChangeZAxisAspect().SetTickmarkLength(anAxisData[2].TickmarkLength); - gt.ChangeZAxisAspect().SetValuesOffset(anAxisData[2].Offset); - gt.ChangeZAxisAspect().SetNameOffset(anAxisData[2].Offset + aGap); // see above - // draw trihedron - theView->GraduatedTrihedronDisplay(gt); -#endif // #ifdef OCCT_690BETA_COMPAT / VSR: temporarily, to be removed later and replace below implementation #else theView->GraduatedTrihedronDisplay( anAxisData[0].Name.toLatin1().constData(), -- 2.39.2