From 4323e4e185bc05de8215f3cc12e077f4ccf953bc Mon Sep 17 00:00:00 2001 From: asl Date: Mon, 26 Jun 2017 11:47:36 +0300 Subject: [PATCH] 0023450: Fields are not displayed in GEOM + IPAL54211: SALOME-8.3.0: Geometry fields are displayed incorrectly + Clean-up deprecated OCCT-related code --- src/CASCatch/CASCatch_Failure.cxx | 2 +- src/CASCatch/CASCatch_Failure.hxx | 8 +- src/DDS/DDS.h | 3 - src/DDS/DDS_DicGroup.cxx | 4 +- src/DDS/DDS_DicGroup.h | 8 +- src/DDS/DDS_DicItem.cxx | 2 +- src/DDS/DDS_DicItem.h | 8 +- src/DDS/DDS_Dictionary.cxx | 4 +- src/DDS/DDS_Dictionary.h | 8 +- src/DDS/DDS_KeyWords.cxx | 4 +- src/DDS/DDS_KeyWords.h | 8 +- src/LightApp/LightApp_Application.cxx | 10 +- src/OBJECT/SALOME_AISObject.cxx | 2 +- src/OBJECT/SALOME_AISObject.hxx | 2 +- src/OBJECT/SALOME_AISShape.cxx | 2 +- src/OBJECT/SALOME_AISShape.hxx | 2 +- src/OBJECT/SALOME_Filter.cxx | 2 +- src/OBJECT/SALOME_Filter.hxx | 8 +- src/OBJECT/SALOME_InteractiveObject.cxx | 2 +- src/OBJECT/SALOME_InteractiveObject.hxx | 10 +- src/OBJECT/SALOME_TypeFilter.cxx | 2 +- src/OBJECT/SALOME_TypeFilter.hxx | 2 +- src/OCCViewer/OCCViewer_AISSelector.cxx | 15 -- src/OCCViewer/OCCViewer_ClippingDlg.cxx | 12 +- .../OCCViewer_CreateRestoreViewDlg.cxx | 3 - src/OCCViewer/OCCViewer_CubeAxesDlg.cxx | 59 ----- src/OCCViewer/OCCViewer_EnvTextureDlg.cxx | 15 -- src/OCCViewer/OCCViewer_EnvTextureDlg.h | 5 - src/OCCViewer/OCCViewer_Trihedron.cxx | 17 +- src/OCCViewer/OCCViewer_Trihedron.h | 17 +- src/OCCViewer/OCCViewer_Utilities.cxx | 24 -- src/OCCViewer/OCCViewer_VService.cxx | 25 -- src/OCCViewer/OCCViewer_ViewFrame.cxx | 3 - src/OCCViewer/OCCViewer_ViewModel.cxx | 35 +-- src/OCCViewer/OCCViewer_ViewPort.cxx | 2 - src/OCCViewer/OCCViewer_ViewPort3d.cxx | 80 +----- src/OCCViewer/OCCViewer_ViewPort3d.h | 11 - src/OCCViewer/OCCViewer_ViewWindow.cxx | 239 +----------------- src/Prs/SALOME_Prs.h | 8 +- src/VTKViewer/VTKViewer_Filter.cxx | 2 +- src/VTKViewer/VTKViewer_Filter.h | 10 +- src/ViewerData/ViewerData_AISShape.cxx | 19 +- src/ViewerData/ViewerData_AISShape.hxx | 35 +-- 43 files changed, 84 insertions(+), 655 deletions(-) diff --git a/src/CASCatch/CASCatch_Failure.cxx b/src/CASCatch/CASCatch_Failure.cxx index ecdaf950c..8d34ee2f0 100644 --- a/src/CASCatch/CASCatch_Failure.cxx +++ b/src/CASCatch/CASCatch_Failure.cxx @@ -29,7 +29,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT( CASCatch_Failure, Standard_Transient ) +IMPLEMENT_STANDARD_RTTIEXT(CASCatch_Failure, Standard_Transient) #ifndef NO_CXX_EXCEPTION static Handle(CASCatch_Failure) RaisedError; diff --git a/src/CASCatch/CASCatch_Failure.hxx b/src/CASCatch/CASCatch_Failure.hxx index 27c1f6ea6..f8d5954ce 100644 --- a/src/CASCatch/CASCatch_Failure.hxx +++ b/src/CASCatch/CASCatch_Failure.hxx @@ -26,12 +26,8 @@ #ifndef CASCATCH_FAILURE_HXX #define CASCATCH_FAILURE_HXX -#include - #include #include -DEFINE_STANDARD_HANDLE( CASCatch_Failure, Standard_Transient ) - #include /*! @@ -53,8 +49,7 @@ Standard_EXPORT static void Raise(const Standard_CString aMessage = "") ; Standard_EXPORT virtual void Throw() const;public: public: - - OCCT_DEFINE_STANDARD_RTTIEXT(CASCatch_Failure,Standard_Transient) + DEFINE_STANDARD_RTTIEXT(CASCatch_Failure, Standard_Transient) private: /*!\var myMessage @@ -64,5 +59,6 @@ Standard_Character* myMessage; }; +DEFINE_STANDARD_HANDLE(CASCatch_Failure, Standard_Transient) #endif // CASCATCH_FAILURE_HXX diff --git a/src/DDS/DDS.h b/src/DDS/DDS.h index f2a03e931..70104b189 100644 --- a/src/DDS/DDS.h +++ b/src/DDS/DDS.h @@ -23,10 +23,7 @@ #ifndef DDS_H #define DDS_H -#include - #include - #include #define UNIT_SYSTEM_SI "SI" diff --git a/src/DDS/DDS_DicGroup.cxx b/src/DDS/DDS_DicGroup.cxx index ed5d18e5b..d4ed520b7 100644 --- a/src/DDS/DDS_DicGroup.cxx +++ b/src/DDS/DDS_DicGroup.cxx @@ -32,7 +32,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_DicGroup, MMgt_TShared) +IMPLEMENT_STANDARD_RTTIEXT(DDS_DicGroup, Standard_Transient) /*! \class DDS_DicGroup @@ -47,7 +47,7 @@ OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_DicGroup, MMgt_TShared) \param name group name */ DDS_DicGroup::DDS_DicGroup( const TCollection_AsciiString& name ) -: MMgt_TShared(), +: Standard_Transient(), myName( name ), myActiveSystem( UNIT_SYSTEM_SI ) { diff --git a/src/DDS/DDS_DicGroup.h b/src/DDS/DDS_DicGroup.h index debefdbe6..a592657af 100644 --- a/src/DDS/DDS_DicGroup.h +++ b/src/DDS/DDS_DicGroup.h @@ -27,15 +27,15 @@ #include "DDS_DicItem.h" -#include +#include #include #include class LDOM_Element; -DEFINE_STANDARD_HANDLE(DDS_DicGroup, MMgt_TShared) +DEFINE_STANDARD_HANDLE(DDS_DicGroup, Standard_Transient) -class DDS_DicGroup : public MMgt_TShared +class DDS_DicGroup : public Standard_Transient { public: Standard_EXPORT DDS_DicGroup( const TCollection_AsciiString& ); @@ -89,7 +89,7 @@ private: friend class DDS_Dictionary; public: - OCCT_DEFINE_STANDARD_RTTIEXT(DDS_DicGroup,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(DDS_DicGroup, Standard_Transient) }; typedef NCollection_IndexedDataMap DDS_IndexedDataMapOfDicGroups; diff --git a/src/DDS/DDS_DicItem.cxx b/src/DDS/DDS_DicItem.cxx index 2ff1d1c37..1d40d4c57 100644 --- a/src/DDS/DDS_DicItem.cxx +++ b/src/DDS/DDS_DicItem.cxx @@ -30,7 +30,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_DicItem, MMgt_TShared) +IMPLEMENT_STANDARD_RTTIEXT(DDS_DicItem, Standard_Transient) /*! \class DDS_DicItem diff --git a/src/DDS/DDS_DicItem.h b/src/DDS/DDS_DicItem.h index d3f01a517..26dcb53e3 100644 --- a/src/DDS/DDS_DicItem.h +++ b/src/DDS/DDS_DicItem.h @@ -25,7 +25,7 @@ #include "DDS.h" -#include +#include #include @@ -49,7 +49,7 @@ class DDS_Dictionary; // optional : format, units, // min value, max value, default value. -class DDS_DicItem : public MMgt_TShared +class DDS_DicItem : public Standard_Transient { public: /*! Enum describes type of datum value */ @@ -253,10 +253,10 @@ private: friend class DDS_DicGroup; public: - OCCT_DEFINE_STANDARD_RTTIEXT(DDS_DicItem,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(DDS_DicItem, Standard_Transient) }; -DEFINE_STANDARD_HANDLE(DDS_DicItem, MMgt_TShared) +DEFINE_STANDARD_HANDLE(DDS_DicItem, Standard_Transient) typedef NCollection_IndexedDataMap DDS_IndexedDataMapOfDicItems; diff --git a/src/DDS/DDS_Dictionary.cxx b/src/DDS/DDS_Dictionary.cxx index b26dc1e6d..079bb4647 100644 --- a/src/DDS/DDS_Dictionary.cxx +++ b/src/DDS/DDS_Dictionary.cxx @@ -38,7 +38,7 @@ #include #include -OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_Dictionary, MMgt_TShared) +IMPLEMENT_STANDARD_RTTIEXT(DDS_Dictionary, Standard_Transient) Handle(DDS_Dictionary) DDS_Dictionary::myDictionary = Handle(DDS_Dictionary)(); @@ -259,7 +259,7 @@ Handle(DDS_Dictionary) DDS_Dictionary::myDictionary = Handle(DDS_Dictionary)(); Use Get() method instead. */ DDS_Dictionary::DDS_Dictionary() -: MMgt_TShared() +: Standard_Transient() { } diff --git a/src/DDS/DDS_Dictionary.h b/src/DDS/DDS_Dictionary.h index 458f13f0f..3db4752dd 100644 --- a/src/DDS/DDS_Dictionary.h +++ b/src/DDS/DDS_Dictionary.h @@ -27,14 +27,14 @@ #include -#include +#include class LDOM_Element; class TCollection_AsciiString; -DEFINE_STANDARD_HANDLE(DDS_Dictionary, MMgt_TShared) +DEFINE_STANDARD_HANDLE(DDS_Dictionary, Standard_Transient) -class DDS_Dictionary : public MMgt_TShared +class DDS_Dictionary : public Standard_Transient { public: Standard_EXPORT static Handle(DDS_Dictionary) Get(); @@ -92,7 +92,7 @@ private: static Handle(DDS_Dictionary) myDictionary; public: - OCCT_DEFINE_STANDARD_RTTIEXT(DDS_Dictionary,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(DDS_Dictionary, Standard_Transient) }; #endif diff --git a/src/DDS/DDS_KeyWords.cxx b/src/DDS/DDS_KeyWords.cxx index f01c58b5a..db9796076 100644 --- a/src/DDS/DDS_KeyWords.cxx +++ b/src/DDS/DDS_KeyWords.cxx @@ -22,7 +22,7 @@ #include "DDS_KeyWords.h" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_KeyWords, MMgt_TShared) +IMPLEMENT_STANDARD_RTTIEXT(DDS_KeyWords, Standard_Transient) /*! \class DDS_KeyWords @@ -87,7 +87,7 @@ OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_KeyWords, MMgt_TShared) Use Get() method instead. */ DDS_KeyWords::DDS_KeyWords() -: MMgt_TShared() +: Standard_Transient() { SetKeyWord( "D_URI", "dictionary" ); diff --git a/src/DDS/DDS_KeyWords.h b/src/DDS/DDS_KeyWords.h index 62de5d8ff..137c6efe1 100644 --- a/src/DDS/DDS_KeyWords.h +++ b/src/DDS/DDS_KeyWords.h @@ -25,15 +25,15 @@ #include "DDS.h" -#include +#include #include -DEFINE_STANDARD_HANDLE(DDS_KeyWords, MMgt_TShared) +DEFINE_STANDARD_HANDLE(DDS_KeyWords, Standard_Transient) class TCollection_AsciiString; -class DDS_KeyWords : public MMgt_TShared +class DDS_KeyWords : public Standard_Transient { public: Standard_EXPORT static Handle(DDS_KeyWords) Get(); @@ -53,7 +53,7 @@ private: KeyWordMap myKeyWord; public: - OCCT_DEFINE_STANDARD_RTTIEXT(DDS_KeyWords,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(DDS_KeyWords, Standard_Transient) }; #endif diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index 38acfcc60..e770b1508 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -1581,7 +1581,6 @@ SUIT_ViewManager* LightApp_Application::createViewManager( const QString& vmType resMgr->booleanValue( "3DViewer", "relative_size", vm->trihedronRelative() )); vm->setInteractionStyle( resMgr->integerValue( "3DViewer", "navigation_mode", vm->interactionStyle() ) ); vm->setProjectionType( resMgr->integerValue( "OCCViewer", "projection_mode", vm->projectionType() ) ); - #if OCC_VERSION_LARGE > 0x06090000 vm->setStereoType( resMgr->integerValue( "OCCViewer", "stereo_type", vm->stereoType() ) ); vm->setAnaglyphFilter( resMgr->integerValue( "OCCViewer", "anaglyph_filter", vm->anaglyphFilter() ) ); vm->setStereographicFocus( resMgr->integerValue( "OCCViewer", "focus_type", vm->stereographicFocusType() ), @@ -1592,7 +1591,6 @@ SUIT_ViewManager* LightApp_Application::createViewManager( const QString& vmType vm->setReverseStereo( resMgr->booleanValue( "OCCViewer", "reverse_stereo", vm->isReverseStereo() ) ); vm->setVSync( resMgr->booleanValue( "OCCViewer", "enable_vsync", vm->isVSync() ) ); vm->setQuadBufferSupport( resMgr->booleanValue( "OCCViewer", "enable_quad_buffer_support", vm->isQuadBufferSupport() ) ); - #endif vm->setZoomingStyle( resMgr->integerValue( "3DViewer", "zooming_mode", vm->zoomingStyle() ) ); vm->enablePreselection( resMgr->booleanValue( "OCCViewer", "enable_preselection", vm->isPreselectionEnabled() ) ); vm->enableSelection( resMgr->booleanValue( "OCCViewer", "enable_selection", vm->isSelectionEnabled() ) ); @@ -2411,7 +2409,7 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref ) anIndicesList << 0 << 1; pref->setItemProperty( "strings", aValuesList, occProjMode ); pref->setItemProperty( "indexes", anIndicesList, occProjMode ); -#if OCC_VERSION_LARGE > 0x06090000 + // .... -> Stereo group int stereoGroup = pref->addPreference( tr( "PREF_GROUP_STEREO" ), occGroup); pref->setItemProperty( "columns", 2, stereoGroup ); @@ -2482,7 +2480,7 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref ) // .... -> Enable quad-buffer support pref->addPreference( tr( "PREF_ENABLE_QUAD_BUFFER_SUPPORT" ), stereoGroup, LightApp_Preferences::Bool, "OCCViewer", "enable_quad_buffer_support" ); -#endif + // ... "Background" group <> int bgGroup = pref->addPreference( tr( "PREF_VIEWER_BACKGROUND" ), occGroup ); // pref->setItemProperty( "columns", 2, bgGroup ); @@ -3257,7 +3255,7 @@ void LightApp_Application::preferencesChanged( const QString& sec, const QString } } #endif -#if OCC_VERSION_LARGE > 0x06090000 + #ifndef DISABLE_OCCVIEWER if ( sec == QString( "OCCViewer" ) && param == QString( "stereo_type" ) ) { @@ -3394,7 +3392,7 @@ void LightApp_Application::preferencesChanged( const QString& sec, const QString } } #endif -#endif + if ( sec == QString( "3DViewer" ) && param == QString( "zooming_mode" ) ) { int mode = resMgr->integerValue( "3DViewer", "zooming_mode", 0 ); diff --git a/src/OBJECT/SALOME_AISObject.cxx b/src/OBJECT/SALOME_AISObject.cxx index 64bcbf9c9..82b02f568 100755 --- a/src/OBJECT/SALOME_AISObject.cxx +++ b/src/OBJECT/SALOME_AISObject.cxx @@ -22,7 +22,7 @@ #include "SALOME_AISObject.hxx" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISObject, AIS_InteractiveObject) +IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISObject, AIS_InteractiveObject) SALOME_AISObject::SALOME_AISObject() { diff --git a/src/OBJECT/SALOME_AISObject.hxx b/src/OBJECT/SALOME_AISObject.hxx index d30ce8a86..4fea394ee 100755 --- a/src/OBJECT/SALOME_AISObject.hxx +++ b/src/OBJECT/SALOME_AISObject.hxx @@ -42,7 +42,7 @@ public: Standard_EXPORT virtual void setName(const Standard_CString aName) = 0; public: - OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_AISObject,AIS_InteractiveObject) + DEFINE_STANDARD_RTTIEXT(SALOME_AISObject, AIS_InteractiveObject) }; DEFINE_STANDARD_HANDLE(SALOME_AISObject, AIS_InteractiveObject) diff --git a/src/OBJECT/SALOME_AISShape.cxx b/src/OBJECT/SALOME_AISShape.cxx index 7be2fd5c3..51f0c90ba 100755 --- a/src/OBJECT/SALOME_AISShape.cxx +++ b/src/OBJECT/SALOME_AISShape.cxx @@ -22,7 +22,7 @@ #include "SALOME_AISShape.hxx" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISShape, ViewerData_AISShape) +IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISShape, ViewerData_AISShape) /*! Constructor diff --git a/src/OBJECT/SALOME_AISShape.hxx b/src/OBJECT/SALOME_AISShape.hxx index acf22fa61..3c1765834 100755 --- a/src/OBJECT/SALOME_AISShape.hxx +++ b/src/OBJECT/SALOME_AISShape.hxx @@ -54,7 +54,7 @@ public: Standard_EXPORT virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ) = 0; public: - OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_AISShape,ViewerData_AISShape) + DEFINE_STANDARD_RTTIEXT(SALOME_AISShape, ViewerData_AISShape) }; DEFINE_STANDARD_HANDLE(SALOME_AISShape, ViewerData_AISShape) diff --git a/src/OBJECT/SALOME_Filter.cxx b/src/OBJECT/SALOME_Filter.cxx index f52c49bce..f2d9ad7f5 100644 --- a/src/OBJECT/SALOME_Filter.cxx +++ b/src/OBJECT/SALOME_Filter.cxx @@ -22,7 +22,7 @@ #include "SALOME_Filter.hxx" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_Filter, MMgt_TShared) +IMPLEMENT_STANDARD_RTTIEXT(SALOME_Filter, Standard_Transient) SALOME_Filter::SALOME_Filter() { diff --git a/src/OBJECT/SALOME_Filter.hxx b/src/OBJECT/SALOME_Filter.hxx index 4f1c200ca..1db4f6924 100644 --- a/src/OBJECT/SALOME_Filter.hxx +++ b/src/OBJECT/SALOME_Filter.hxx @@ -23,13 +23,13 @@ #ifndef SALOME_FILTER_HXX #define SALOME_FILTER_HXX -#include #include +#include #include #include "SALOME_InteractiveObject.hxx" -class SALOME_Filter : public MMgt_TShared +class SALOME_Filter : public Standard_Transient { public: Standard_EXPORT SALOME_Filter(); @@ -38,9 +38,9 @@ public: Standard_EXPORT virtual Standard_Boolean IsOk(const Handle(SALOME_InteractiveObject)& anObj) const = 0; public: - OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_Filter,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(SALOME_Filter, Standard_Transient) }; -DEFINE_STANDARD_HANDLE(SALOME_Filter, MMgt_TShared) +DEFINE_STANDARD_HANDLE(SALOME_Filter, Standard_Transient) #endif // SALOME_FILTER_HXX diff --git a/src/OBJECT/SALOME_InteractiveObject.cxx b/src/OBJECT/SALOME_InteractiveObject.cxx index e357b0b20..3fba48c65 100755 --- a/src/OBJECT/SALOME_InteractiveObject.cxx +++ b/src/OBJECT/SALOME_InteractiveObject.cxx @@ -27,7 +27,7 @@ #include "SALOME_InteractiveObject.hxx" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_InteractiveObject, MMgt_TShared) +IMPLEMENT_STANDARD_RTTIEXT(SALOME_InteractiveObject, Standard_Transient) /*! Default constructor diff --git a/src/OBJECT/SALOME_InteractiveObject.hxx b/src/OBJECT/SALOME_InteractiveObject.hxx index 95a74fcea..af2fa716c 100755 --- a/src/OBJECT/SALOME_InteractiveObject.hxx +++ b/src/OBJECT/SALOME_InteractiveObject.hxx @@ -23,18 +23,16 @@ #ifndef SALOME_INTERACTIVEOBJECT_HXX #define SALOME_INTERACTIVEOBJECT_HXX -#include #include +#include #include -#include - #include class SALOME_InteractiveObject; -DEFINE_STANDARD_HANDLE(SALOME_InteractiveObject, MMgt_TShared) +DEFINE_STANDARD_HANDLE(SALOME_InteractiveObject, Standard_Transient) -class SALOME_InteractiveObject : public MMgt_TShared +class SALOME_InteractiveObject : public Standard_Transient { public: Standard_EXPORT SALOME_InteractiveObject(); @@ -71,7 +69,7 @@ protected: std::string myReference; public: - OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_InteractiveObject,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(SALOME_InteractiveObject, Standard_Transient) }; #endif // SALOME_INTERACTIVEOBJECT_HXX diff --git a/src/OBJECT/SALOME_TypeFilter.cxx b/src/OBJECT/SALOME_TypeFilter.cxx index b4191f105..019f3a16e 100644 --- a/src/OBJECT/SALOME_TypeFilter.cxx +++ b/src/OBJECT/SALOME_TypeFilter.cxx @@ -22,7 +22,7 @@ #include "SALOME_TypeFilter.hxx" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_TypeFilter, SALOME_Filter) +IMPLEMENT_STANDARD_RTTIEXT(SALOME_TypeFilter, SALOME_Filter) /*! Constructor diff --git a/src/OBJECT/SALOME_TypeFilter.hxx b/src/OBJECT/SALOME_TypeFilter.hxx index a9a58f634..874607e3c 100644 --- a/src/OBJECT/SALOME_TypeFilter.hxx +++ b/src/OBJECT/SALOME_TypeFilter.hxx @@ -40,7 +40,7 @@ protected: Standard_CString myKind; public: - OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_TypeFilter,SALOME_Filter) + DEFINE_STANDARD_RTTIEXT(SALOME_TypeFilter, SALOME_Filter) }; DEFINE_STANDARD_HANDLE(SALOME_TypeFilter, SALOME_Filter) diff --git a/src/OCCViewer/OCCViewer_AISSelector.cxx b/src/OCCViewer/OCCViewer_AISSelector.cxx index 03b001be7..831195d87 100755 --- a/src/OCCViewer/OCCViewer_AISSelector.cxx +++ b/src/OCCViewer/OCCViewer_AISSelector.cxx @@ -22,8 +22,6 @@ #include "OCCViewer_AISSelector.h" -#include - /*! Constructor */ @@ -72,12 +70,8 @@ void OCCViewer_AISSelector::setHilightColor ( Quantity_NameOfColor color ) { myHilightColor = color; if ( !myAISContext.IsNull() ) { -#if OCC_VERSION_LARGE > 0x07000000 const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle(); hStyle->SetColor( myHilightColor ); -#else - myAISContext->SetHilightColor( myHilightColor ); -#endif } } @@ -88,12 +82,8 @@ void OCCViewer_AISSelector::setSelectColor ( Quantity_NameOfColor color ) { mySelectColor = color; if ( !myAISContext.IsNull() ) { -#if OCC_VERSION_LARGE > 0x07000000 const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle(); sStyle->SetColor( mySelectColor ); -#else - myAISContext->SelectionColor( mySelectColor ); -#endif } } @@ -104,15 +94,10 @@ void OCCViewer_AISSelector::setAISContext ( const Handle (AIS_InteractiveContext { myAISContext = aisContext; if ( ! myAISContext.IsNull() ) { -#if OCC_VERSION_LARGE > 0x07000000 const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle(); const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle(); hStyle->SetColor( myHilightColor ); sStyle->SetColor( mySelectColor ); -#else - myAISContext->SetHilightColor( myHilightColor ); - myAISContext->SelectionColor( mySelectColor ); -#endif myAISContext->SetSubIntensityColor( Quantity_NOC_CYAN1 ); } } diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx index 0805a55f9..3659c59e7 100644 --- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx +++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx @@ -37,8 +37,6 @@ #include "OCCViewer_ViewManager.h" #include "OCCViewer_ClipPlaneInteractor.h" -#include - #include #include #include @@ -47,11 +45,7 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x06080000 - #include -#else - #include -#endif +#include #include #include #include @@ -99,7 +93,6 @@ void getMinMaxFromContext( Handle(AIS_InteractiveContext) ic, if ( !aPrs->IsEmpty() && !aPrs->IsInfinite() ) { isFound = true; double xmin, ymin, zmin, xmax, ymax, zmax; -#if OCC_VERSION_LARGE > 0x06070100 Bnd_Box aBox = aPrs->MinMaxValues(); xmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().X(); ymin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Y(); @@ -107,9 +100,6 @@ void getMinMaxFromContext( Handle(AIS_InteractiveContext) ic, xmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().X(); ymax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Y(); zmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Z(); -#else - aPrs->MinMaxValues( xmin, ymin, zmin, xmax, ymax, zmax ); -#endif aXMin = qMin( aXMin, xmin ); aXMax = qMax( aXMax, xmax ); aYMin = qMin( aYMin, ymin ); aYMax = qMax( aYMax, ymax ); aZMin = qMin( aZMin, zmin ); aZMax = qMax( aZMax, zmax ); diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx index f081f6ed0..4c4ae27b0 100755 --- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx +++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx @@ -129,9 +129,6 @@ void OCCViewer_CreateRestoreViewDlg::changeImage( QListWidgetItem* curItem ) Standard_Boolean prev = aView3d->SetImmediateUpdate( Standard_False ); aView3d->SetScale( myCurrentItem.scale ); -#if OCC_VERSION_LARGE <= 0x06070100 - aView3d->SetCenter( myCurrentItem.centerX, myCurrentItem.centerY ); -#endif aView3d->SetProj( myCurrentItem.projX, myCurrentItem.projY, myCurrentItem.projZ ); aView3d->SetTwist( myCurrentItem.twist ); aView3d->SetAt( myCurrentItem.atX, myCurrentItem.atY, myCurrentItem.atZ ); diff --git a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx index 8a8c93c28..992e4a5d5 100644 --- a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx +++ b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx @@ -29,11 +29,7 @@ #include "QtxAction.h" #include "QtxIntSpinBox.h" -#include - -#if OCC_VERSION_LARGE > 0x06080000 #include -#endif #include #include @@ -264,7 +260,6 @@ void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView ) // font support will be introduced in OCC-6.4) int aGap = 20; -#if OCC_VERSION_LARGE > 0x06080000 Graphic3d_GraduatedTrihedron gt; // main params gt.SetDrawGrid(Standard_True); // to draw grid @@ -292,60 +287,6 @@ void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView ) } // draw trihedron theView->GraduatedTrihedronDisplay(gt); -#else - theView->GraduatedTrihedronDisplay( - anAxisData[0].Name.toLatin1().constData(), - anAxisData[1].Name.toLatin1().constData(), - anAxisData[2].Name.toLatin1().constData(), - anAxisData[0].DrawName, - anAxisData[1].DrawName, - anAxisData[2].DrawName, - anAxisData[0].DrawValues, - anAxisData[1].DrawValues, - anAxisData[2].DrawValues, - Standard_True, // draw grid - Standard_False, // draw axes - anAxisData[0].NbValues - 1, - anAxisData[1].NbValues - 1, - anAxisData[2].NbValues - 1, - anAxisData[0].Offset, - anAxisData[1].Offset, - anAxisData[2].Offset, - anAxisData[0].Offset + aGap, // see above - anAxisData[1].Offset + aGap, // see above - anAxisData[2].Offset + aGap, // see above - anAxisData[0].DrawTickmarks, - anAxisData[1].DrawTickmarks, - anAxisData[2].DrawTickmarks, - anAxisData[0].TickmarkLength, - anAxisData[1].TickmarkLength, - anAxisData[2].TickmarkLength, - Quantity_NOC_WHITE, // grid color - Quantity_Color( anAxisData[0].NameColor.redF(), - anAxisData[0].NameColor.greenF(), - anAxisData[0].NameColor.blueF(), - Quantity_TOC_RGB ), - Quantity_Color( anAxisData[1].NameColor.redF(), - anAxisData[1].NameColor.greenF(), - anAxisData[1].NameColor.blueF(), - Quantity_TOC_RGB ), - Quantity_Color( anAxisData[2].NameColor.redF(), - anAxisData[2].NameColor.greenF(), - anAxisData[2].NameColor.blueF(), - Quantity_TOC_RGB ), - Quantity_Color( anAxisData[0].Color.redF(), - anAxisData[0].Color.greenF(), - anAxisData[0].Color.blueF(), - Quantity_TOC_RGB ), - Quantity_Color( anAxisData[1].Color.redF(), - anAxisData[1].Color.greenF(), - anAxisData[1].Color.blueF(), - Quantity_TOC_RGB ), - Quantity_Color( anAxisData[2].Color.redF(), - anAxisData[2].Color.greenF(), - anAxisData[2].Color.blueF(), - Quantity_TOC_RGB ) ); -#endif // OCC_VERSION_LARGE > 0x06080000 } else theView->GraduatedTrihedronErase(); diff --git a/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx b/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx index b6e952481..4ed2aab2e 100644 --- a/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx +++ b/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx @@ -169,11 +169,7 @@ void OCCViewer_EnvTextureDlg::onEnvTexture( bool theIsChecked ) onTextureChanged(); else { Handle(Graphic3d_TextureEnv) aTexture; -#if OCC_VERSION_LARGE > 0x07000000 setEnvTexture( aTexture ); -#else - setEnvTexture( aTexture, V3d_TEX_ALL ); -#endif } } @@ -200,11 +196,7 @@ void OCCViewer_EnvTextureDlg::onTextureChanged() << Graphic3d_NOT_ENV_LINES << Graphic3d_NOT_ENV_ROAD; aTexture = new Graphic3d_TextureEnv( aTextures.at( myEnvTextureId->currentIndex() ) ); } -#if OCC_VERSION_LARGE > 0x07000000 setEnvTexture( aTexture ); -#else - setEnvTexture( aTexture, V3d_TEX_ENVIRONMENT ); -#endif } /*! @@ -232,19 +224,12 @@ void OCCViewer_EnvTextureDlg::ClickOnHelp() /*! Sets current texture environment for all view in the viewer */ -#if OCC_VERSION_LARGE > 0x07000000 void OCCViewer_EnvTextureDlg::setEnvTexture( Handle(Graphic3d_TextureEnv) theTexture) -#else -void OCCViewer_EnvTextureDlg::setEnvTexture( Handle(Graphic3d_TextureEnv) theTexture, V3d_TypeOfSurfaceDetail theMode ) -#endif { for ( int i = OCCViewer_ViewFrame::BOTTOM_RIGHT; i <= OCCViewer_ViewFrame::TOP_RIGHT; i++ ) { if ( OCCViewer_ViewWindow* aViewWindow = myViewFrame->getView(i) ) { Handle(V3d_View) aView = aViewWindow->getViewPort()->getView(); aView->SetTextureEnv( theTexture ); -#if OCC_VERSION_LARGE <= 0x07000000 - aView->SetSurfaceDetail( theMode ); -#endif aView->Redraw(); } } diff --git a/src/OCCViewer/OCCViewer_EnvTextureDlg.h b/src/OCCViewer/OCCViewer_EnvTextureDlg.h index d06c67985..2580bc12f 100644 --- a/src/OCCViewer/OCCViewer_EnvTextureDlg.h +++ b/src/OCCViewer/OCCViewer_EnvTextureDlg.h @@ -23,7 +23,6 @@ #include "OCCViewer.h" #include #include -#include class OCCViewer_ViewWindow; class OCCViewer_ViewFrame; @@ -51,11 +50,7 @@ private slots: private: void initParam(); -#if OCC_VERSION_LARGE > 0x07000000 void setEnvTexture( Handle(Graphic3d_TextureEnv) ); -#else - void setEnvTexture( Handle(Graphic3d_TextureEnv), V3d_TypeOfSurfaceDetail ); -#endif OCCViewer_ViewFrame* myViewFrame; Handle(V3d_View) myView3d; diff --git a/src/OCCViewer/OCCViewer_Trihedron.cxx b/src/OCCViewer/OCCViewer_Trihedron.cxx index d13af530e..7cce7c2cc 100644 --- a/src/OCCViewer/OCCViewer_Trihedron.cxx +++ b/src/OCCViewer/OCCViewer_Trihedron.cxx @@ -49,7 +49,7 @@ #define PI 3.14159265359 -OCCT_IMPLEMENT_STANDARD_RTTIEXT( OCCViewer_Trihedron, AIS_InteractiveObject ) +IMPLEMENT_STANDARD_RTTIEXT( OCCViewer_Trihedron, AIS_InteractiveObject ) /*! * Constructor @@ -72,7 +72,6 @@ OCCViewer_Trihedron::~OCCViewer_Trihedron() /*! * Sets the bounding box (MinMax values). */ -#if OCC_VERSION_LARGE > 0x06070100 // for OCC-6.7.2 and higher version void OCCViewer_Trihedron::bounds( Graphic3d_BndBox4f& theMinMax ) const { Graphic3d_Vec4 aMinPt (-1.f, -1.f, -1.f, 1.f); @@ -81,20 +80,6 @@ void OCCViewer_Trihedron::bounds( Graphic3d_BndBox4f& theMinMax ) const theMinMax.Add (aMinPt); theMinMax.Add (aMaxPt); } -#else -void OCCViewer_Trihedron::bounds( Graphic3d_CBounds& aMinMax ) const -{ - Standard_Real aXMin = -1, aYMin = -1, aZMin = -1; - Standard_Real aXMax = 1, aYMax = 1, aZMax = 1; - - if( aMinMax.XMin > aXMin ) aMinMax.XMin = aXMin; - if( aMinMax.YMin > aYMin ) aMinMax.YMin = aYMin; - if( aMinMax.ZMin > aZMin ) aMinMax.ZMin = aZMin; - if( aMinMax.XMax < aXMax ) aMinMax.XMax = aXMax; - if( aMinMax.YMax < aYMax ) aMinMax.YMax = aYMax; - if( aMinMax.ZMax < aZMax ) aMinMax.ZMax = aZMax; -} -#endif /*! * Redefined method. Calculates the object presentation. diff --git a/src/OCCViewer/OCCViewer_Trihedron.h b/src/OCCViewer/OCCViewer_Trihedron.h index 0618e4f20..92e7b5876 100644 --- a/src/OCCViewer/OCCViewer_Trihedron.h +++ b/src/OCCViewer/OCCViewer_Trihedron.h @@ -23,12 +23,7 @@ #include "OCCViewer.h" #include -#include -#if OCC_VERSION_LARGE > 0x06070100 // for OCC-6.7.2 and higher version - #include -#else - #include -#endif +#include #include /*! @@ -48,20 +43,16 @@ public: virtual void ComputeSelection( const Handle( SelectMgr_Selection )&, const Standard_Integer ); -#if OCC_VERSION_LARGE > 0x06070100 virtual void bounds( Graphic3d_BndBox4f& ) const; -#else - virtual void bounds( Graphic3d_CBounds& ) const; -#endif virtual void display(); - OCCT_DEFINE_STANDARD_RTTIEXT(OCCViewer_Trihedron,AIS_InteractiveObject) + DEFINE_STANDARD_RTTIEXT(OCCViewer_Trihedron, AIS_InteractiveObject) private: unsigned int myTextList; }; -DEFINE_STANDARD_HANDLE( OCCViewer_Trihedron, AIS_InteractiveObject ) +DEFINE_STANDARD_HANDLE(OCCViewer_Trihedron, AIS_InteractiveObject) -#endif +#endif // OCCVIEWER_TRIHEDRON_H diff --git a/src/OCCViewer/OCCViewer_Utilities.cxx b/src/OCCViewer/OCCViewer_Utilities.cxx index e88b29182..9a560d77a 100755 --- a/src/OCCViewer/OCCViewer_Utilities.cxx +++ b/src/OCCViewer/OCCViewer_Utilities.cxx @@ -27,15 +27,9 @@ #include "QtxActionToolMgr.h" #include "QtxMultiAction.h" -// KERNEL includes -#include - // OCC includes #include #include -#if OCC_VERSION_LARGE < 0x07000000 -#include -#endif // QT includes #include @@ -52,7 +46,6 @@ Handle(Image_PixMap) OCCViewer_Utilities::imageToPixmap( const QImage& anImage ) const uchar* aImageBytes = anImage.bits(); for ( int aLine = anImage.height() - 1; aLine >= 0; --aLine ) { -#if OCC_VERSION_LARGE > 0x06070100 // convert pixels from ARGB to renderer-compatible RGBA for ( int aByte = 0; aByte < anImage.width(); ++aByte ) { Image_ColorBGRA& aPixmapBytes = aPixmap->ChangeValue(aLine, aByte); @@ -62,18 +55,6 @@ Handle(Image_PixMap) OCCViewer_Utilities::imageToPixmap( const QImage& anImage ) aPixmapBytes.r() = (Standard_Byte) *aImageBytes++; aPixmapBytes.a() = (Standard_Byte) *aImageBytes++; } -#else - Image_ColorBGRA* aPixmapBytes = aPixmap->EditData().ChangeRow(aLine); - - // convert pixels from ARGB to renderer-compatible RGBA - for ( int aByte = 0; aByte < anImage.width(); ++aByte ) { - aPixmapBytes->b() = (Standard_Byte) *aImageBytes++; - aPixmapBytes->g() = (Standard_Byte) *aImageBytes++; - aPixmapBytes->r() = (Standard_Byte) *aImageBytes++; - aPixmapBytes->a() = (Standard_Byte) *aImageBytes++; - aPixmapBytes++; - } -#endif } } return aPixmap; @@ -170,7 +151,6 @@ bool OCCViewer_Utilities::computeVisibleBounds( const Handle(V3d_View) theView, aStructure->IsInfinite() || aStructure->CStructure()->IsForHighlight ) continue; double aBounds[6]; -#if OCC_VERSION_LARGE > 0x06070100 Bnd_Box aBox = aStructure->MinMaxValues(); aBounds[0] = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().X(); aBounds[2] = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Y(); @@ -178,10 +158,6 @@ bool OCCViewer_Utilities::computeVisibleBounds( const Handle(V3d_View) theView, aBounds[1] = aBox.IsVoid() ? RealLast() : aBox.CornerMax().X(); aBounds[3] = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Y(); aBounds[5] = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Z(); -#else - aStructure->MinMaxValues( aBounds[0], aBounds[2], aBounds[4], - aBounds[1], aBounds[3], aBounds[5] ); -#endif if ( aBounds[0] > -DBL_MAX && aBounds[1] < DBL_MAX && aBounds[2] > -DBL_MAX && aBounds[3] < DBL_MAX && diff --git a/src/OCCViewer/OCCViewer_VService.cxx b/src/OCCViewer/OCCViewer_VService.cxx index a9cd79fe7..048b43348 100644 --- a/src/OCCViewer/OCCViewer_VService.cxx +++ b/src/OCCViewer/OCCViewer_VService.cxx @@ -25,13 +25,7 @@ #include #include -#include -#if OCC_VERSION_LARGE > 0x06070200 // for OCC-6.7.3 and higher version #include -#else -#include -#include -#endif #include #if defined(WIN32) @@ -71,11 +65,7 @@ Handle(V3d_Viewer) OCCViewer_VService::CreateViewer( const Standard_ExtString na const Standard_Boolean computedMode, const Standard_Boolean defaultComputedMode ) { -#if OCC_VERSION_LARGE > 0x06070200 // for OCC-6.7.3 and higher version static Handle(OpenGl_GraphicDriver) aGraphicDriver; -#else - static Handle(Graphic3d_GraphicDriver) aGraphicDriver; -#endif if (aGraphicDriver.IsNull()) { Handle(Aspect_DisplayConnection) aDisplayConnection; @@ -84,25 +74,10 @@ Handle(V3d_Viewer) OCCViewer_VService::CreateViewer( const Standard_ExtString na #else aDisplayConnection = new Aspect_DisplayConnection(); #endif -#if OCC_VERSION_LARGE > 0x06070200 // for OCC-6.7.3 and higher version aGraphicDriver = new OpenGl_GraphicDriver(aDisplayConnection); -#else - aGraphicDriver = Graphic3d::InitGraphicDriver( aDisplayConnection ); -#endif } -#if OCC_VERSION_LARGE > 0x07010001 return new V3d_Viewer( aGraphicDriver, name, domain, viewSize, viewProjection, Quantity_NOC_GRAY30, V3d_ZBUFFER, V3d_GOURAUD, computedMode, defaultComputedMode ); - -#elif OCC_VERSION_LARGE > 0x07000000 - return new V3d_Viewer( aGraphicDriver, name, domain, viewSize, viewProjection, - Quantity_NOC_GRAY30, V3d_ZBUFFER, V3d_GOURAUD, V3d_WAIT, - computedMode, defaultComputedMode ); -#else - return new V3d_Viewer( aGraphicDriver, name, domain, viewSize, viewProjection, - Quantity_NOC_GRAY30, V3d_ZBUFFER, V3d_GOURAUD, V3d_WAIT, - computedMode, defaultComputedMode, V3d_TEX_NONE ); -#endif } diff --git a/src/OCCViewer/OCCViewer_ViewFrame.cxx b/src/OCCViewer/OCCViewer_ViewFrame.cxx index 222a292bc..9656c64b4 100644 --- a/src/OCCViewer/OCCViewer_ViewFrame.cxx +++ b/src/OCCViewer/OCCViewer_ViewFrame.cxx @@ -186,9 +186,6 @@ void OCCViewer_ViewFrame::setSubViewParams( OCCViewer_ViewWindow* theView ) // set environment texture parameters aView->SetTextureEnv( aMainView->TextureEnv() ); -#if OCC_VERSION_LARGE <= 0x07000000 - aView->SetSurfaceDetail( aMainView->SurfaceDetail() ); -#endif } void OCCViewer_ViewFrame::splitSubViews() diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx index 0b0ce6a97..adb29592d 100644 --- a/src/OCCViewer/OCCViewer_ViewModel.cxx +++ b/src/OCCViewer/OCCViewer_ViewModel.cxx @@ -37,8 +37,6 @@ #include "ViewerData_AISShape.hxx" -#include - #include "QtxActionToolMgr.h" #include "QtxBackgroundTool.h" @@ -54,11 +52,7 @@ #include #include -#if OCC_VERSION_LARGE > 0x06080000 - #include -#else - #include -#endif +#include #include #include @@ -74,10 +68,6 @@ #include #include -#if OCC_VERSION_MAJOR < 7 - #include -#endif - /*! Get data for supported background modes: gradient types, identifiers and supported image formats */ @@ -130,15 +120,8 @@ OCCViewer_Viewer::OCCViewer_Viewer( bool DisplayTrihedron) // init selector myAISContext = new AIS_InteractiveContext( myV3dViewer ); -#if OCC_VERSION_LARGE > 0x07010100 myAISContext->HighlightStyle(Prs3d_TypeOfHighlight_LocalSelected)->SetColor( Quantity_NOC_WHITE ); myAISContext->HighlightStyle(Prs3d_TypeOfHighlight_Selected)->SetColor( Quantity_NOC_WHITE ); -#elif OCC_VERSION_LARGE > 0x07000000 - const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle(); - sStyle->SetColor( Quantity_NOC_WHITE ); -#else - myAISContext->SelectionColor( Quantity_NOC_WHITE ); -#endif // display isoline on planar faces (box for ex.) myAISContext->IsoOnPlane( true ); @@ -154,13 +137,8 @@ OCCViewer_Viewer::OCCViewer_Viewer( bool DisplayTrihedron) //myTrihedron->SetColor( Col ); myTrihedron->SetArrowColor( Col.Name() ); myTrihedron->SetSize(100); -#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_Drawer) drawer = myTrihedron->Attributes(); + if (drawer->HasOwnDatumAspect()) { 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)); @@ -271,9 +249,6 @@ void OCCViewer_Viewer::initView( OCCViewer_ViewWindow* view ) OCCViewer_ViewPort3d* vp3d = view->getViewPort(); if ( vp3d ) { -#if OCC_VERSION_LARGE <= 0x07000000 - vp3d->getView()->SetSurfaceDetail(V3d_TEX_ALL); -#endif // connect signal from viewport connect(vp3d, SIGNAL(vpClosed(OCCViewer_ViewPort3d*)), this, SLOT(onViewClosed(OCCViewer_ViewPort3d*))); connect(vp3d, SIGNAL(vpMapped(OCCViewer_ViewPort3d*)), this, SLOT(onViewMapped(OCCViewer_ViewPort3d*))); @@ -1459,7 +1434,6 @@ double OCCViewer_Viewer::computeSceneSize(const Handle(V3d_View)& view3d) const double aMaxSide = 0; double Xmin = 0, Ymin = 0, Zmin = 0, Xmax = 0, Ymax = 0, Zmax = 0; -#if OCC_VERSION_LARGE > 0x06070100 Bnd_Box aBox = view3d->View()->MinMaxValues(); Xmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().X(); Ymin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Y(); @@ -1467,9 +1441,6 @@ double OCCViewer_Viewer::computeSceneSize(const Handle(V3d_View)& view3d) const Xmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().X(); Ymax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Y(); Zmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Z(); -#else - view3d->View()->MinMaxValues( Xmin, Ymin, Zmin, Xmax, Ymax, Zmax ); -#endif if ( Xmin != RealFirst() && Ymin != RealFirst() && Zmin != RealFirst() && Xmax != RealLast() && Ymax != RealLast() && Zmax != RealLast() ) diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx index d0d2ce19d..331e1ac8f 100755 --- a/src/OCCViewer/OCCViewer_ViewPort.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort.cxx @@ -218,9 +218,7 @@ void OCCViewer_ViewPort::initialize() setBackgroundRole( QPalette::NoRole );//NoBackground ); // set focus policy to threat QContextMenuEvent from keyboard setFocusPolicy( Qt::StrongFocus ); -#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0) && OCC_VERSION_LARGE < 0x07000000) || QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) setAttribute( Qt::WA_PaintOnScreen ); -#endif setAttribute( Qt::WA_NoSystemBackground ); } diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx index 784d86c0d..cdf1edfe9 100755 --- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx @@ -40,20 +40,8 @@ #include #include -#if OCC_VERSION_MAJOR < 7 - #include -#endif - -#if OCC_VERSION_LARGE > 0x06070100 #include -#else -#include -#include -#endif - -#if OCC_VERSION_LARGE > 0x07010000 #include -#endif #include "utilities.h" @@ -83,18 +71,7 @@ OCCViewer_ViewPort3d::OCCViewer_ViewPort3d( QWidget* parent, const Handle( V3d_V // VSR: 01/07/2010 commented to avoid SIGSEGV at SALOME exit //selectVisualId(); -#if OCC_VERSION_LARGE > 0x06070100 myActiveView = new V3d_View( viewer, type ); -#else - if ( type == V3d_ORTHOGRAPHIC ) { - myOrthoView = new V3d_OrthographicView( viewer ); - myActiveView = myOrthoView; - myPerspView = 0; - } else { - myPerspView = new V3d_PerspectiveView( viewer ); - myActiveView = myPerspView; - } -#endif setDefaultParams(); @@ -240,44 +217,16 @@ bool OCCViewer_ViewPort3d::syncronize( const OCCViewer_ViewPort3d* ref ) refView->Up( x, y, z ); tgtView->SetUp( x, y, z ); refView->Eye( x, y, z ); tgtView->SetEye( x, y, z ); refView->Proj( x, y, z ); tgtView->SetProj( x, y, z ); -#if OCC_VERSION_LARGE <= 0x06070100 - refView->Center( x, y ); tgtView->SetCenter( x, y ); -#endif tgtView->SetScale( refView->Scale() ); tgtView->SetTwist( refView->Twist() ); /* update */ tgtView->Update(); tgtView->SetImmediateUpdate( Standard_True ); -#if OCC_VERSION_LARGE <= 0x07000000 - tgtView->ZFitAll(); -#endif - return true; -} -#if OCC_VERSION_LARGE <= 0x07000000 -/*! - Returns Z-size of this view. [ public ] -*/ -double OCCViewer_ViewPort3d::getZSize() const -{ - if ( !activeView().IsNull() ) - return activeView()->ZSize(); - return 0; + return true; } -/*! - Sets Z-size of this view ( for both orthographic and perspective ). [ public ] -*/ -void OCCViewer_ViewPort3d::setZSize( double zsize ) -{ - myActiveView->SetZSize( zsize ); - /* if ( !myOrthoView.IsNull() ) - myOrthoView->SetZSize( zsize ); - if ( !myPerspView.IsNull() ) - myPerspView->SetZSize( zsize );*/ -} -#endif /*! Get axial scale to the view @@ -582,10 +531,6 @@ void OCCViewer_ViewPort3d::rotate( int x, int y, void OCCViewer_ViewPort3d::endRotation() { if ( !activeView().IsNull() ) { -#if OCC_VERSION_LARGE <= 0x07000000 - activeView()->ZFitAll( 1.0 ); - activeView()->SetZSize( 0.0 ); -#endif activeView()->Update(); emit vpTransformed( this ); } @@ -606,12 +551,7 @@ void OCCViewer_ViewPort3d::paintEvent( QPaintEvent* e ) QApplication::syncX(); #endif if ( !myPaintersRedrawing ) { -#if OCC_VERSION_MAJOR < 7 - QRect rc = e->rect(); - activeView()->Redraw( rc.x(), rc.y(), rc.width(), rc.height() ); -#else activeView()->Redraw(); -#endif } } OCCViewer_ViewPort::paintEvent( e ); @@ -657,16 +597,8 @@ void OCCViewer_ViewPort3d::fitAll( bool keepScale, bool withZ, bool upd ) Standard_Real margin = 0.01; -#if OCC_VERSION_LARGE > 0x06070100 activeView()->FitAll( margin, upd ); -#if OCC_VERSION_LARGE <= 0x07000000 - if(withZ) - activeView()->ZFitAll(); -#endif -#else - activeView()->FitAll( margin, withZ, upd ); - activeView()->SetZSize(0.); -#endif + emit vpTransformed( this ); } @@ -774,15 +706,7 @@ bool OCCViewer_ViewPort3d::synchronize( OCCViewer_ViewPort* view ) Handle(V3d_View) aView3d = getView(); Handle(V3d_View) aRefView3d = vp3d->getView(); aView3d->SetImmediateUpdate( Standard_False ); -#if OCC_VERSION_LARGE > 0x06070100 aView3d->Camera()->Copy( aRefView3d->Camera() ); -#else - aView3d->SetViewMapping( aRefView3d->ViewMapping() ); - aView3d->SetViewOrientation( aRefView3d->ViewOrientation() ); -#endif -#if OCC_VERSION_LARGE <= 0x07000000 - aView3d->ZFitAll(); -#endif aView3d->SetImmediateUpdate( Standard_True ); aView3d->Update(); blockSignals( blocked ); diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.h b/src/OCCViewer/OCCViewer_ViewPort3d.h index 994284898..013c7db71 100755 --- a/src/OCCViewer/OCCViewer_ViewPort3d.h +++ b/src/OCCViewer/OCCViewer_ViewPort3d.h @@ -23,8 +23,6 @@ #ifndef OCCVIEWER_VIEWPORT3D_H #define OCCVIEWER_VIEWPORT3D_H -#include - #include "OCCViewer_ViewPort.h" #include "Qtx.h" @@ -65,11 +63,6 @@ public: // void setActive( V3d_TypeOfView ); virtual bool syncronize( const OCCViewer_ViewPort3d* ); -#if OCC_VERSION_LARGE <= 0x07000000 - double getZSize() const; - void setZSize( double ); -#endif - void getAxialScale( double&, double&, double& ); virtual void onUpdate(); @@ -128,10 +121,6 @@ private: private: Handle(V3d_View) myActiveView; -#if OCC_VERSION_LARGE <= 0x06070100 - Handle(V3d_View) myOrthoView; - Handle(V3d_View) myPerspView; -#endif bool myBusy; double myScale; bool myIsAdvancedZoomingEnabled; diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx index 060349844..264cc3337 100644 --- a/src/OCCViewer/OCCViewer_ViewWindow.cxx +++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx @@ -52,8 +52,6 @@ #include #include -#include - #include #include #include @@ -82,14 +80,8 @@ #include #include #include -#if OCC_VERSION_LARGE > 0x06090000 #include #include -#endif - -#if OCC_VERSION_MAJOR < 7 - #include -#endif #include #include @@ -410,9 +402,6 @@ bool OCCViewer_ViewWindow::eventFilter( QObject* watched, QEvent* e ) int x1 = (int)( aEvent->x() + width()*delta/100 ); int y1 = (int)( aEvent->y() + height()*delta/100 ); myViewPort->zoom( x, y, x1, y1 ); -#if OCC_VERSION_LARGE <= 0x07000000 - myViewPort->getView()->ZFitAll(); -#endif emit vpTransformationFinished ( ZOOMVIEW ); } } @@ -675,18 +664,11 @@ bool OCCViewer_ViewWindow::computeGravityCenter( double& theX, double& theY, dou // the ones which lie within the screen limits Standard_Real aScreenLimits[4] = { 0.0, 0.0, 0.0, 0.0 }; -#if OCC_VERSION_LARGE > 0x06070100 // NDC space screen limits aScreenLimits[0] = -1.0; aScreenLimits[1] = 1.0; aScreenLimits[2] = -1.0; aScreenLimits[3] = 1.0; -#else - aView3d->View()->ViewMapping().WindowLimit( aScreenLimits[0], - aScreenLimits[1], - aScreenLimits[2], - aScreenLimits[3] ); -#endif Standard_Integer aPointsNb = 0; @@ -706,7 +688,6 @@ bool OCCViewer_ViewWindow::computeGravityCenter( double& theX, double& theY, dou if ( aStructure->IsEmpty() || !aStructure->IsVisible() || aStructure->CStructure()->IsForHighlight ) continue; -#if OCC_VERSION_LARGE > 0x06070100 Bnd_Box aBox = aStructure->MinMaxValues(); aXmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().X(); aYmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Y(); @@ -714,9 +695,6 @@ bool OCCViewer_ViewWindow::computeGravityCenter( double& theX, double& theY, dou aXmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().X(); aYmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Y(); aZmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Z(); -#else - aStructure->MinMaxValues( aXmin, aYmin, aZmin, aXmax, aYmax, aZmax ); -#endif // Infinite structures are skipped Standard_Real aLIM = ShortRealLast() - 1.0; @@ -735,16 +713,9 @@ bool OCCViewer_ViewWindow::computeGravityCenter( double& theX, double& theY, dou for ( Standard_Integer aPointIt = 0; aPointIt < 8; ++aPointIt ) { const gp_Pnt& aBBPoint = aPoints[aPointIt]; -#if OCC_VERSION_LARGE > 0x06070100 gp_Pnt aProjected = aView3d->Camera()->Project( aBBPoint ); const Standard_Real& U = aProjected.X(); const Standard_Real& V = aProjected.Y(); -#else - Standard_Real U = 0.0; - Standard_Real V = 0.0; - Standard_Real W = 0.0; - aView3d->View()->Projects( aBBPoint.X(), aBBPoint.Y(), aBBPoint.Z(), U, V, W ); -#endif if (U >= aScreenLimits[0] && U <= aScreenLimits[1] @@ -1066,9 +1037,6 @@ void OCCViewer_ViewWindow::vpMouseReleaseEvent(QMouseEvent* theEvent) case PANVIEW: case ZOOMVIEW: -#if OCC_VERSION_LARGE <= 0x07000000 - myViewPort->getView()->ZFitAll(); -#endif resetState(); break; @@ -1335,7 +1303,7 @@ void OCCViewer_ViewWindow::createActions() aAction->setStatusTip(tr("DSC_PERSPECTIVE_MODE")); aAction->setCheckable(true); toolMgr()->registerAction( aAction, PerspectiveId ); -#if OCC_VERSION_LARGE > 0x06090000 + // - stereo projection aAction = new QtxAction(tr("MNU_STEREO_MODE"), aResMgr->loadPixmap( "OCCViewer", tr( "ICON_OCCVIEWER_STEREO" ) ), tr( "MNU_STEREO_MODE" ), 0, this); @@ -1343,7 +1311,7 @@ void OCCViewer_ViewWindow::createActions() aAction->setCheckable(true); toolMgr()->registerAction( aAction, StereoId ); connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onStereoType(bool))); -#endif + // - add exclusive action group QActionGroup* aProjectionGroup = new QActionGroup( this ); aProjectionGroup->addAction( toolMgr()->action( OrthographicId ) ); @@ -1525,9 +1493,7 @@ void OCCViewer_ViewWindow::createToolBar() QtxMultiAction* aScaleAction = new QtxMultiAction( this ); aScaleAction->insertAction( toolMgr()->action( FitAllId ) ); aScaleAction->insertAction( toolMgr()->action( FitRectId ) ); -#if OCC_VERSION_LARGE > 0x06090000 aScaleAction->insertAction( toolMgr()->action( FitSelectionId ) ); -#endif aScaleAction->insertAction( toolMgr()->action( ZoomId ) ); toolMgr()->append( aScaleAction, tid ); @@ -1554,9 +1520,7 @@ void OCCViewer_ViewWindow::createToolBar() toolMgr()->append( OrthographicId, tid ); toolMgr()->append( PerspectiveId, tid ); -#if OCC_VERSION_LARGE > 0x06090000 toolMgr()->append( StereoId, tid ); -#endif toolMgr()->append( ResetId, tid ); } @@ -1721,12 +1685,10 @@ void OCCViewer_ViewWindow::onProjectionType( QAction* theAction ) aCamera->SetProjectionType ( Graphic3d_Camera::Projection_Perspective ); aCamera->SetFOVy(30.0); } -#if OCC_VERSION_LARGE > 0x06090000 if (toolMgr()->action( StereoId )->isChecked()) { aCamera->SetProjectionType ( Graphic3d_Camera::Projection_Stereo ); aCamera->SetFOVy(30.0); } -#endif aView3d->Redraw(); onViewFitAll(); } @@ -1739,7 +1701,6 @@ void OCCViewer_ViewWindow::onProjectionType( QAction* theAction ) */ void OCCViewer_ViewWindow::onStereoType( bool activate ) { -#if OCC_VERSION_LARGE > 0x06090000 Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { Handle(Graphic3d_Camera) aCamera = aView3d->Camera(); @@ -1774,7 +1735,6 @@ void OCCViewer_ViewWindow::onStereoType( bool activate ) if ( isQuadBufferSupport() && !isOpenGlStereoSupport() && stereoType() == QuadBuffer && toolMgr()->action( StereoId )->isChecked() ) SUIT_MessageBox::warning( 0, tr( "WRN_WARNING" ), tr( "WRN_SUPPORT_QUAD_BUFFER" ) ); -#endif } /*! @@ -1789,10 +1749,8 @@ void OCCViewer_ViewWindow::onProjectionType() setProjectionType( Orthographic ); if (toolMgr()->action( PerspectiveId )->isChecked()) setProjectionType( Perspective ); -#if OCC_VERSION_LARGE > 0x06090000 if (toolMgr()->action( StereoId )->isChecked()) setProjectionType( Stereo ); -#endif emit vpTransformationFinished( PROJECTION ); } @@ -1800,9 +1758,7 @@ void OCCViewer_ViewWindow::setProjectionType( int mode ) { QtxAction* anOrthographicAction = dynamic_cast( toolMgr()->action( OrthographicId ) ); QtxAction* aPerspectiveAction = dynamic_cast( toolMgr()->action( PerspectiveId ) ); -#if OCC_VERSION_LARGE > 0x06090000 QtxAction* aStereoAction = dynamic_cast( toolMgr()->action( StereoId ) ); -#endif switch ( mode ) { case Orthographic: onProjectionType( anOrthographicAction ); @@ -1817,17 +1773,12 @@ void OCCViewer_ViewWindow::setProjectionType( int mode ) // update action state if method is called outside if ( mode == Orthographic && !anOrthographicAction->isChecked() ) { anOrthographicAction->setChecked( true ); - #if OCC_VERSION_LARGE > 0x06090000 aStereoAction->setChecked( false ); - #endif } if ( mode == Perspective && !aPerspectiveAction->isChecked() ) { aPerspectiveAction->setChecked( true ); - #if OCC_VERSION_LARGE > 0x06090000 aStereoAction->setChecked( false ); - #endif } -#if OCC_VERSION_LARGE > 0x06090000 if ( mode == Stereo ) { aStereoAction->setChecked( true ); if ( anOrthographicAction->isEnabled() ) { @@ -1860,7 +1811,6 @@ void OCCViewer_ViewWindow::setProjectionType( int mode ) if ( !aPerspectiveAction->isEnabled() ) aPerspectiveAction->setEnabled( true ); } -#endif } /*! @@ -1879,9 +1829,7 @@ void OCCViewer_ViewWindow::onFitAll() void OCCViewer_ViewWindow::onFitSelection() { emit vpTransformationStarted( FITSELECTION ); -#if OCC_VERSION_LARGE > 0x06090000 myModel->getAISContext()->FitSelected( getViewPort()->getView() ); -#endif emit vpTransformationFinished( FITSELECTION ); } @@ -2012,7 +1960,6 @@ void OCCViewer_ViewWindow::performRestoring( const viewAspect& anItem, bool base aView3d->SetProj( anItem.projX, anItem.projY, anItem.projZ ); aView3d->SetAxialScale( anItem.scaleX, anItem.scaleY, anItem.scaleZ ); -#if OCC_VERSION_LARGE > 0x06070100 if ( anItem.centerX != 0.0 || anItem.centerY != 0.0 ) { double anUpX = 0.0, anUpY = 0.0, anUpZ = 0.0; @@ -2034,9 +1981,6 @@ void OCCViewer_ViewWindow::performRestoring( const viewAspect& anItem, bool base aView3d->SetAt( anAt.X(), anAt.Y(), anAt.Z() ); aView3d->SetProj( anItem.projX, anItem.projY, anItem.projZ ); } -#else - aView3d->SetCenter( anItem.centerX, anItem.centerY ); -#endif if ( !baseParamsOnly ) { @@ -2285,11 +2229,7 @@ QImage OCCViewer_ViewWindow::dumpView() QImage anImage( aWidth, aHeight, QImage::Format_ARGB32 ); for ( int i = 0; i < aWidth; i++ ) { for ( int j = 0; j < aHeight; j++ ) { -#if OCC_VERSION_LARGE > 0x07010001 Quantity_Color pixel = aPix.PixelColor( i, j ).GetRGB(); -#else - Quantity_Color pixel = aPix.PixelColor( i, j ); -#endif QColor color = QColor::fromRgbF( pixel.Red(), pixel.Green(), pixel.Blue() ); anImage.setPixelColor( i, j, color ); } @@ -2311,11 +2251,7 @@ bool OCCViewer_ViewWindow::dumpViewToFormat( const QImage& img, if ( format != "PS" && format != "EPS") res = myViewPort->getView()->Dump( fileName.toStdString().c_str() ); -#if OCC_VERSION_MAJOR < 7 - Handle(Visual3d_View) a3dView = myViewPort->getView()->View(); -#else Handle(Graphic3d_CView) a3dView = myViewPort->getView()->View(); -#endif if (format == "PS") res = a3dView->Export(strdup(qPrintable(fileName)), Graphic3d_EF_PostScript); @@ -2360,15 +2296,9 @@ void OCCViewer_ViewWindow::setCuttingPlane( bool on, const double x, const doub gp_Pln pln (gp_Pnt(x, y, z), gp_Dir(dx, dy, dz)); double a, b, c, d; pln.Coefficients(a, b, c, d); -#if OCC_VERSION_LARGE > 0x07000000 Handle(Graphic3d_SequenceOfHClipPlane) aPlanes = view->ClipPlanes(); Graphic3d_SequenceOfHClipPlane::Iterator anIter (*aPlanes); if(aPlanes->Size() > 0 ) { -#else - Graphic3d_SequenceOfHClipPlane aPlanes = view->GetClipPlanes(); - Graphic3d_SequenceOfHClipPlane::Iterator anIter (aPlanes); - if(aPlanes.Size() > 0 ) { -#endif Handle(Graphic3d_ClipPlane) aClipPlane = anIter.Value(); aClipPlane->SetEquation(pln); aClipPlane->SetOn(Standard_True); @@ -2377,13 +2307,8 @@ void OCCViewer_ViewWindow::setCuttingPlane( bool on, const double x, const doub } } else { -#if OCC_VERSION_LARGE > 0x07000000 Handle(Graphic3d_SequenceOfHClipPlane) aPlanes = view->ClipPlanes(); Graphic3d_SequenceOfHClipPlane::Iterator anIter (*aPlanes); -#else - Graphic3d_SequenceOfHClipPlane aPlanes = view->GetClipPlanes(); - Graphic3d_SequenceOfHClipPlane::Iterator anIter (aPlanes); -#endif for( ;anIter.More();anIter.Next() ){ Handle(Graphic3d_ClipPlane) aClipPlane = anIter.Value(); aClipPlane->SetOn(Standard_False); @@ -2410,13 +2335,8 @@ bool OCCViewer_ViewWindow::isCuttingPlane() { Handle(V3d_View) view = myViewPort->getView(); bool res = false; -#if OCC_VERSION_LARGE > 0x07000000 Handle(Graphic3d_SequenceOfHClipPlane) aPlanes = view->ClipPlanes(); Graphic3d_SequenceOfHClipPlane::Iterator anIter (*aPlanes); -#else - Graphic3d_SequenceOfHClipPlane aPlanes = view->GetClipPlanes(); - Graphic3d_SequenceOfHClipPlane::Iterator anIter (aPlanes); -#endif for( ;anIter.More();anIter.Next() ) { Handle(Graphic3d_ClipPlane) aClipPlane = anIter.Value(); if(aClipPlane->IsOn()) { @@ -2470,10 +2390,6 @@ viewAspect OCCViewer_ViewWindow::getViewParams() const params.isVisible= isShown; params.size = size; -#if OCC_VERSION_LARGE <= 0x06070100 // the property is deprecated after OCCT 6.7.1 - aView3d->Center( params.centerX, params.centerY ); -#endif - // graduated trihedron bool anIsVisible = false; OCCViewer_AxisWidget::AxisData anAxisData[3]; @@ -2534,10 +2450,6 @@ QString OCCViewer_ViewWindow::getVisualParameters() QStringList data; data << QString( "scale=%1" ) .arg( params.scale, 0, 'e', 12 ); -#if OCC_VERSION_LARGE <= 0x06070100 // the property is deprecated after OCCT 6.7.1 - data << QString( "centerX=%1" ) .arg( params.centerX, 0, 'e', 12 ); - data << QString( "centerY=%1" ) .arg( params.centerY, 0, 'e', 12 ); -#endif data << QString( "projX=%1" ) .arg( params.projX, 0, 'e', 12 ); data << QString( "projY=%1" ) .arg( params.projY, 0, 'e', 12 ); data << QString( "projZ=%1" ) .arg( params.projZ, 0, 'e', 12 ); @@ -2836,9 +2748,6 @@ void OCCViewer_ViewWindow::setVisualParameters( const QString& parameters ) aTexture = new Graphic3d_TextureEnv( TCollection_AsciiString( et_paramValue.toStdString().c_str() ) ); Handle(V3d_View) aView = this->getViewPort()->getView(); aView->SetTextureEnv( aTexture ); -#if OCC_VERSION_LARGE <= 0x07000000 - aView->SetSurfaceDetail( V3d_TEX_ENVIRONMENT ); -#endif } } else if ( paramName == "lightSource" ) @@ -3210,10 +3119,8 @@ int OCCViewer_ViewWindow::projectionType() const mode = Perspective; if (aCamera->ProjectionType() == Graphic3d_Camera::Projection_Orthographic) mode = Orthographic; - #if OCC_VERSION_LARGE > 0x06090000 if (aCamera->ProjectionType() == Graphic3d_Camera::Projection_Stereo) mode = Stereo; - #endif } return mode; } @@ -3222,10 +3129,8 @@ void OCCViewer_ViewWindow::setStereoType( int type ) { Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams(); aParams->StereoMode = (Graphic3d_StereoMode)type; - #endif } } @@ -3234,10 +3139,8 @@ int OCCViewer_ViewWindow::stereoType() const int type = QuadBuffer; Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams(); type = (OCCViewer_ViewWindow::StereoType)aParams->StereoMode; - #endif } return type; } @@ -3246,7 +3149,6 @@ void OCCViewer_ViewWindow::setAnaglyphFilter( int type ) { Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams(); if (type == RedCyan) aParams->AnaglyphFilter = Graphic3d_RenderingParams::Anaglyph_RedCyan_Optimized; @@ -3254,7 +3156,6 @@ void OCCViewer_ViewWindow::setAnaglyphFilter( int type ) aParams->AnaglyphFilter = Graphic3d_RenderingParams::Anaglyph_YellowBlue_Optimized; if (type == GreenMagenta) aParams->AnaglyphFilter = Graphic3d_RenderingParams::Anaglyph_GreenMagenta_Simple; - #endif } } @@ -3263,7 +3164,6 @@ int OCCViewer_ViewWindow::anaglyphFilter() const int type = RedCyan; Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams(); if (aParams->AnaglyphFilter == Graphic3d_RenderingParams::Anaglyph_RedCyan_Optimized) type = RedCyan; @@ -3271,7 +3171,6 @@ int OCCViewer_ViewWindow::anaglyphFilter() const type = YellowBlue; if (aParams->AnaglyphFilter == Graphic3d_RenderingParams::Anaglyph_GreenMagenta_Simple) type = GreenMagenta; - #endif } return type; } @@ -3280,10 +3179,8 @@ void OCCViewer_ViewWindow::setStereographicFocus( int type, double value ) { Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(Graphic3d_Camera) aCamera = aView3d->Camera(); aCamera->SetZFocus( (Graphic3d_Camera::FocusType) type, value ); - #endif } } @@ -3292,10 +3189,8 @@ int OCCViewer_ViewWindow::stereographicFocusType() const int type = Relative; Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(Graphic3d_Camera) aCamera = aView3d->Camera(); type = (OCCViewer_ViewWindow::FocusIODType)aCamera->ZFocusType(); - #endif } return type; } @@ -3305,10 +3200,8 @@ double OCCViewer_ViewWindow::stereographicFocusValue() const double value = 1.0; Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(Graphic3d_Camera) aCamera = aView3d->Camera(); value = aCamera->ZFocus(); - #endif } return value; } @@ -3317,10 +3210,8 @@ void OCCViewer_ViewWindow::setInterocularDistance( int type, double value ) { Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(Graphic3d_Camera) aCamera = aView3d->Camera(); aCamera->SetIOD( (Graphic3d_Camera::IODType) type, value ); - #endif } } @@ -3329,10 +3220,8 @@ int OCCViewer_ViewWindow::interocularDistanceType() const int type = Relative; Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(Graphic3d_Camera) aCamera = aView3d->Camera(); type = (OCCViewer_ViewWindow::FocusIODType)aCamera->GetIODType(); - #endif } return type; } @@ -3342,10 +3231,8 @@ double OCCViewer_ViewWindow::interocularDistanceValue() const double value = 0.05; Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(Graphic3d_Camera) aCamera = aView3d->Camera(); value = aCamera->IOD(); - #endif } return value; } @@ -3354,10 +3241,8 @@ void OCCViewer_ViewWindow::setReverseStereo( bool reverse ) { Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams(); aParams->ToReverseStereo = reverse; - #endif } } @@ -3366,10 +3251,8 @@ bool OCCViewer_ViewWindow::isReverseStereo() const int reverse = false; Handle(V3d_View) aView3d = myViewPort->getView(); if ( !aView3d.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams(); reverse = aParams->ToReverseStereo; - #endif } return reverse; } @@ -3378,11 +3261,9 @@ void OCCViewer_ViewWindow::setVSync( bool enable ) { Handle(AIS_InteractiveContext) anIntCont = myModel->getAISContext(); if ( !anIntCont.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(anIntCont->CurrentViewer()->Driver()); OpenGl_Caps* aCaps = &aDriver->ChangeOptions(); aCaps->swapInterval = enable; - #endif } } @@ -3391,11 +3272,9 @@ bool OCCViewer_ViewWindow::isVSync() const int enable = true; Handle(AIS_InteractiveContext) anIntCont = myModel->getAISContext(); if ( !anIntCont.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(anIntCont->CurrentViewer()->Driver()); OpenGl_Caps* aCaps = &aDriver->ChangeOptions(); enable = aCaps->swapInterval; - #endif } return enable; } @@ -3404,11 +3283,9 @@ void OCCViewer_ViewWindow::setQuadBufferSupport( bool enable ) { Handle(AIS_InteractiveContext) anIntCont = myModel->getAISContext(); if ( !anIntCont.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(anIntCont->CurrentViewer()->Driver()); OpenGl_Caps* aCaps = &aDriver->ChangeOptions(); aCaps->contextStereo = enable; - #endif } } @@ -3417,11 +3294,9 @@ bool OCCViewer_ViewWindow::isQuadBufferSupport() const int enable = true; Handle(AIS_InteractiveContext) anIntCont = myModel->getAISContext(); if ( !anIntCont.IsNull() ) { - #if OCC_VERSION_LARGE > 0x06090000 Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(anIntCont->CurrentViewer()->Driver()); OpenGl_Caps* aCaps = &aDriver->ChangeOptions(); enable = aCaps->contextStereo; - #endif } return enable; } @@ -3532,7 +3407,6 @@ SUIT_CameraProperties OCCViewer_ViewWindow::cameraProperties() aProps.setAxialScale( anAxialScale[0], anAxialScale[1], anAxialScale[2] ); aProps.setViewUp( anUp[0], anUp[1], anUp[2] ); -#if OCC_VERSION_LARGE > 0x06070100 aSourceView->Eye( anEye[0], anEye[1], anEye[2] ); // store camera properties "as is": it is up to synchronized @@ -3551,50 +3425,6 @@ SUIT_CameraProperties OCCViewer_ViewWindow::cameraProperties() aProps.setViewAngle( aSourceView->Camera()->FOVy() ); } aProps.setMappingScale( aSourceView->Camera()->Scale() ); -#else - Standard_Real aCameraDepth = aSourceView->Depth() + aSourceView->ZSize() * 0.5; - - // generate view orientation matrix for transforming OCC projection reference point - // into a camera (eye) position. - gp_Dir aLeftDir = gp_Dir( anUp[0], anUp[1], anUp[2] ) ^ gp_Dir( aProj[0], aProj[1], aProj[2] ); - - gp_GTrsf aTrsf; - aTrsf.SetValue( 1, 1, aLeftDir.X() ); - aTrsf.SetValue( 2, 1, aLeftDir.Y() ); - aTrsf.SetValue( 3, 1, aLeftDir.Z() ); - - aTrsf.SetValue( 1, 2, anUp[0] ); - aTrsf.SetValue( 2, 2, anUp[1] ); - aTrsf.SetValue( 3, 2, anUp[2] ); - - aTrsf.SetValue( 1, 3, aProj[0] ); - aTrsf.SetValue( 2, 3, aProj[1] ); - aTrsf.SetValue( 3, 3, aProj[2] ); - - aTrsf.SetValue( 1, 4, anAt[0] ); - aTrsf.SetValue( 2, 4, anAt[1] ); - aTrsf.SetValue( 3, 4, anAt[2] ); - - Graphic3d_Vertex aProjRef = aSourceView->ViewMapping().ProjectionReferencePoint(); - - // transform to world-space coordinate system - gp_XYZ aPosition( aProjRef.X(), aProjRef.Y(), aCameraDepth ); - aTrsf.Transforms( aPosition ); - - // compute focal point - double aFocalPoint[3]; - - aFocalPoint[0] = aPosition.X() - aProj[0] * aCameraDepth; - aFocalPoint[1] = aPosition.Y() - aProj[1] * aCameraDepth; - aFocalPoint[2] = aPosition.Z() - aProj[2] * aCameraDepth; - - aProps.setFocalPoint( aFocalPoint[0], aFocalPoint[1], aFocalPoint[2] ); - aProps.setPosition( aPosition.X(), aPosition.Y(), aPosition.Z() ); - - Standard_Real aViewScale[2]; - aSourceView->Size( aViewScale[0], aViewScale[1] ); - aProps.setMappingScale( aViewScale[1] ); -#endif return aProps; } @@ -3630,77 +3460,12 @@ void OCCViewer_ViewWindow::synchronize( SUIT_ViewWindow* theView ) aProps.getViewUp( anUpDir[0], anUpDir[1], anUpDir[2] ); aProps.getAxialScale( anAxialScale[0], anAxialScale[1], anAxialScale[2] ); -#if OCC_VERSION_LARGE > 0x06070100 aDestView->SetAt( aFocalPoint[0], aFocalPoint[1], aFocalPoint[2] ); aDestView->SetEye( aPosition[0], aPosition[1], aPosition[2] ); aDestView->SetUp( anUpDir[0], anUpDir[1], anUpDir[2] ); aDestView->Camera()->SetScale( aProps.getMappingScale() ); -#else - gp_Dir aProjDir( aPosition[0] - aFocalPoint[0], - aPosition[1] - aFocalPoint[1], - aPosition[2] - aFocalPoint[2] ); - - // get custom view translation - Standard_Real aTranslation[3]; - aDestView->At( aTranslation[0], aTranslation[1], aTranslation[2] ); - - gp_Dir aLeftDir = gp_Dir( anUpDir[0], anUpDir[1], anUpDir[2] ) - ^ gp_Dir( aProjDir.X(), aProjDir.Y(), aProjDir.Z() ); - - gp_GTrsf aTrsf; - aTrsf.SetValue( 1, 1, aLeftDir.X() ); - aTrsf.SetValue( 2, 1, aLeftDir.Y() ); - aTrsf.SetValue( 3, 1, aLeftDir.Z() ); - - aTrsf.SetValue( 1, 2, anUpDir[0] ); - aTrsf.SetValue( 2, 2, anUpDir[1] ); - aTrsf.SetValue( 3, 2, anUpDir[2] ); - - aTrsf.SetValue( 1, 3, aProjDir.X() ); - aTrsf.SetValue( 2, 3, aProjDir.Y() ); - aTrsf.SetValue( 3, 3, aProjDir.Z() ); - - aTrsf.SetValue( 1, 4, aTranslation[0] ); - aTrsf.SetValue( 2, 4, aTranslation[1] ); - aTrsf.SetValue( 3, 4, aTranslation[2] ); - aTrsf.Invert(); - - // transform to view-space coordinate system - gp_XYZ aProjRef( aPosition[0], aPosition[1], aPosition[2] ); - aTrsf.Transforms( aProjRef ); - - // set view camera properties using low-level approach. this is done - // in order to avoid interference with static variables in v3d view used - // when rotation is in process in another view. - Visual3d_ViewMapping aMapping = aDestView->View()->ViewMapping(); - Visual3d_ViewOrientation anOrientation = aDestView->View()->ViewOrientation(); - - Graphic3d_Vector aMappingProj( aProjDir.X(), aProjDir.Y(), aProjDir.Z() ); - Graphic3d_Vector aMappingUp( anUpDir[0], anUpDir[1], anUpDir[2] ); - - aMappingProj.Normalize(); - aMappingUp.Normalize(); - - anOrientation.SetViewReferencePlane( aMappingProj ); - anOrientation.SetViewReferenceUp( aMappingUp ); - - aDestView->SetViewMapping( aMapping ); - aDestView->SetViewOrientation( anOrientation ); - - // set panning - aDestView->SetCenter( aProjRef.X(), aProjRef.Y() ); - - // set mapping scale - double aMapScaling = aProps.getMappingScale(); - Standard_Real aWidth, aHeight; - aDestView->Size( aWidth, aHeight ); - aDestView->SetSize ( aWidth > aHeight ? aMapScaling * (aWidth / aHeight) : aMapScaling ); -#endif getViewPort()->setAxialScale( anAxialScale[0], anAxialScale[1], anAxialScale[2] ); -#if OCC_VERSION_LARGE <= 0x07000000 - aDestView->ZFitAll(); -#endif aDestView->SetImmediateUpdate( Standard_True ); aDestView->Redraw(); diff --git a/src/Prs/SALOME_Prs.h b/src/Prs/SALOME_Prs.h index f7f5e330f..10198c3cb 100755 --- a/src/Prs/SALOME_Prs.h +++ b/src/Prs/SALOME_Prs.h @@ -36,16 +36,12 @@ #include #include -#include +#include class SALOME_View; class SALOME_Displayer; class SALOME_ListIO; -#if OCC_VERSION_MAJOR >= 7 - class SALOME_InteractiveObject; -#else - class Handle_SALOME_InteractiveObject; -#endif +class SALOME_InteractiveObject; /*! \class SALOME_Prs diff --git a/src/VTKViewer/VTKViewer_Filter.cxx b/src/VTKViewer/VTKViewer_Filter.cxx index 7aa8e69a9..63e048e27 100755 --- a/src/VTKViewer/VTKViewer_Filter.cxx +++ b/src/VTKViewer/VTKViewer_Filter.cxx @@ -26,7 +26,7 @@ #include "VTKViewer_Filter.h" -OCCT_IMPLEMENT_STANDARD_RTTIEXT(VTKViewer_Filter, MMgt_TShared) +IMPLEMENT_STANDARD_RTTIEXT(VTKViewer_Filter, Standard_Transient) /*! * \class VTKViewer_Filter diff --git a/src/VTKViewer/VTKViewer_Filter.h b/src/VTKViewer/VTKViewer_Filter.h index 1ccb8ed14..9926bde2d 100755 --- a/src/VTKViewer/VTKViewer_Filter.h +++ b/src/VTKViewer/VTKViewer_Filter.h @@ -30,14 +30,12 @@ #include "VTKViewer.h" -#include +#include #include -#include - class VTKViewer_Actor; -DEFINE_STANDARD_HANDLE(VTKViewer_Filter, MMgt_TShared); +DEFINE_STANDARD_HANDLE(VTKViewer_Filter, Standard_Transient); /* Class : VTKViewer_Filter @@ -45,7 +43,7 @@ DEFINE_STANDARD_HANDLE(VTKViewer_Filter, MMgt_TShared); should be redefined in derived classes */ -class VTKViewer_Filter : public MMgt_TShared +class VTKViewer_Filter : public Standard_Transient { public: @@ -63,7 +61,7 @@ protected: VTKViewer_Actor* myActor; public: - OCCT_DEFINE_STANDARD_RTTIEXT(VTKViewer_Filter,MMgt_TShared) + DEFINE_STANDARD_RTTIEXT(VTKViewer_Filter, Standard_Transient) }; #endif diff --git a/src/ViewerData/ViewerData_AISShape.cxx b/src/ViewerData/ViewerData_AISShape.cxx index 4e97067ee..fe91800a8 100644 --- a/src/ViewerData/ViewerData_AISShape.cxx +++ b/src/ViewerData/ViewerData_AISShape.cxx @@ -22,26 +22,21 @@ #include "ViewerData_AISShape.hxx" -#ifdef USE_TEXTURED_SHAPE - OCCT_IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_TexturedShape) -#else - OCCT_IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_Shape) -#endif +IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_ColoredShape) /*! - Constructor - \param shape - TopoDS shape + Constructor. + \param shape Shape to manage. */ -ViewerData_AISShape::ViewerData_AISShape (const TopoDS_Shape& theShape) -: BASE_SHAPE (theShape), - myIsClippable (true) +ViewerData_AISShape::ViewerData_AISShape(const TopoDS_Shape& theShape) +: AIS_ColoredShape(theShape), + myIsClippable(true) { } /*! - Destructor + Destructor. */ ViewerData_AISShape::~ViewerData_AISShape() { } - diff --git a/src/ViewerData/ViewerData_AISShape.hxx b/src/ViewerData/ViewerData_AISShape.hxx index ed725f80b..d45ade296 100644 --- a/src/ViewerData/ViewerData_AISShape.hxx +++ b/src/ViewerData/ViewerData_AISShape.hxx @@ -20,40 +20,27 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#ifndef _ViewerData_AISShape_HeaderFile -#define _ViewerData_AISShape_HeaderFile - -// When below macro is defined, AIS_TexturedShape is used as base class -#define USE_TEXTURED_SHAPE - -#ifdef USE_TEXTURED_SHAPE - #include - #define BASE_SHAPE AIS_TexturedShape -#else - #include - #define BASE_SHAPE AIS_Shape -#endif +#ifndef VIEWERDATA_AISSHAPE +#define VIEWERDATA_AISSHAPE #include #include +#include -#include - -class ViewerData_AISShape - : public BASE_SHAPE +class ViewerData_AISShape : public AIS_ColoredShape { public: - Standard_EXPORT ViewerData_AISShape (const TopoDS_Shape& theShape); + Standard_EXPORT ViewerData_AISShape(const TopoDS_Shape&); Standard_EXPORT ~ViewerData_AISShape(); - // checks if shape is clippable + //! Checks if shape is clippable. Standard_EXPORT inline bool IsClippable() const { return myIsClippable; } - // makes shape clippable/not clippable - Standard_EXPORT inline void SetClippable (bool isClippable) + //! Makes shape clippable/not clippable. + Standard_EXPORT inline void SetClippable(bool isClippable) { myIsClippable = isClippable; } @@ -62,9 +49,9 @@ protected: bool myIsClippable; public: - OCCT_DEFINE_STANDARD_RTTIEXT(ViewerData_AISShape, BASE_SHAPE) + DEFINE_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_ColoredShape) }; -DEFINE_STANDARD_HANDLE(ViewerData_AISShape, BASE_SHAPE) +DEFINE_STANDARD_HANDLE(ViewerData_AISShape, AIS_ColoredShape) -#endif // _ViewerData_AISShape_HeaderFile +#endif // VIEWERDATA_AISSHAPE -- 2.39.2