From 0072aa3b6a1bbc99e7b09aa549d70d15372f288e Mon Sep 17 00:00:00 2001 From: nds Date: Thu, 17 Nov 2016 13:22:21 +0300 Subject: [PATCH] Show All Annotations /Hide All Annotations action in Text Tree widget, help page for annotation. --- doc/salome/gui/GEOM/images/annotation.png | Bin 0 -> 14164 bytes .../gui/GEOM/images/annotation_preview.png | Bin 0 -> 9913 bytes doc/salome/gui/GEOM/input/annotation.doc | 48 ++++++++++ .../GEOM/input/using_measurement_tools.doc | 1 + src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx | 83 +++++++++++++++--- src/GEOMGUI/GEOMGUI_AnnotationMgr.h | 16 +++- src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx | 22 +++-- src/GEOMGUI/GEOMGUI_TextTreeWdg.h | 2 + src/MeasureGUI/MeasureGUI.cxx | 50 ++++++----- 9 files changed, 178 insertions(+), 44 deletions(-) create mode 100644 doc/salome/gui/GEOM/images/annotation.png create mode 100644 doc/salome/gui/GEOM/images/annotation_preview.png create mode 100644 doc/salome/gui/GEOM/input/annotation.doc diff --git a/doc/salome/gui/GEOM/images/annotation.png b/doc/salome/gui/GEOM/images/annotation.png new file mode 100644 index 0000000000000000000000000000000000000000..584104fc36dfbe72197df9f215d5818833390142 GIT binary patch literal 14164 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/GEOM/images/annotation_preview.png b/doc/salome/gui/GEOM/images/annotation_preview.png new file mode 100644 index 0000000000000000000000000000000000000000..0cb50206deaf049f8d347f53143f36b1d0e77223 GIT binary patch literal 9913 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 X% Annotation functionality allows showing in the viewer special user-defined text label connected to corresponding part of a CAD model with a line. + +\image html annotation_preview.png + +Shape annotation behavior are summarized below: +

    +
  • Annotation text is always parallel to the screen and horizontal.
    • +
  • Annotation text is not zoomed or rotated when a 3D scene is zoomed or rotated by the user.
    • +
  • The user is able to modify the font, the style, the color and the size of the annotation text and the color, the width and the style of the connection line applied to all annotations. +It can be accessed from the main menu via File -> Preferences. The Shape annotations group on Geometry Settings pane contains controls for it. +
    • +
  • The annotation text is defined using UTF-8 encoding and thus support any Unicode characters.
    • +
  • Position of an annotation in a 3D view is defined by dragging it with the mouse.
    • +
  • There are several algorithms for the annotation position calculation during the scene manipulations (panning, zooming, rotation):
    • +
      +
    • Algorithm 1: an annotation has fixed position in 2D screen coordinates (fixed screen position mode). In this mode, the annotations are always visible (appear as “topmost objects”), never hidden by the (annotated) geometry.
      • +
    • Algorithm 2: an annotation has fixed position in 3D model space, this position is projected onto the screen just as normal point coordinates. In this mode, some annotations may be invisible depending on the camera (position, orientation, zoom).
      • +
    +
  • Annotations appear in an Annotations sub-tree in Text Browser.
    • +
  • All annotations may be shown/hidden in a 3D view using corresponded popup menu on Annotations item in Text Browser.
    • +
  • Annotations of a shape may be shown/hidden in a 3D view using corresponded popup menu on the shape item in Object Browser.
    • +
  • Annotation is logically connected to the shape:
    • +
      +
    • Selection of an annotation will highlight corresponding shape/subshape in 3D view.
      • +
    • When the shape is deleted, the annotation will be also deleted.
      • +
    +
+ +It can be accessed from the main menu via Inspection -> Annotation + +\image html annotation.png "Create Annotation dialog" + +In this dialog you can: +
    +
  • Set Text text shown in View 3d and a name of annotation presented in the Text Browser.
    • +
  • Select a \b Shape to which the annotation will be assigned.
    • +
  • Set Fixed screen position to select alogithm for the annotation position caldulation.
    • +
  • Select a Shape Type to which the annotation will be assigned on the shape. + It contains "Whole shape", "Vertex", "Edge", "Face" and "Solid" choices.
    • +
  • Select a sub shape to assign annotation to. Text control contains information about local selection in the viewer.
    • +
  • Push \b Apply or Apply and Close button to commit creation of the field.
  • +
+ +*/ diff --git a/doc/salome/gui/GEOM/input/using_measurement_tools.doc b/doc/salome/gui/GEOM/input/using_measurement_tools.doc index 515a94ce4..feca9e24f 100644 --- a/doc/salome/gui/GEOM/input/using_measurement_tools.doc +++ b/doc/salome/gui/GEOM/input/using_measurement_tools.doc @@ -17,6 +17,7 @@
  • \subpage angle_page "Angle"
  • \subpage tolerance_page "Tolerance"
  • \subpage managing_dimensions_page "Dimensions"
    • +
  • \subpage annotation_page "Annotations"
  • \subpage whatis_page "WhatIs"
  • \subpage inspect_object_operation_page "Inspect Object"
  • \subpage shape_statistics_operation_page "Shape Statistics"
    • diff --git a/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx b/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx index b7f4e9f9d..e1cecc0d1 100755 --- a/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx +++ b/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -144,7 +145,8 @@ bool GEOMGUI_AnnotationMgr::IsDisplayed( const QString& theEntry, const int theI // purpose : Displays annotation shape presentation in view. It creates an annotation presentation // and stores it in an internal container //======================================================================= -void GEOMGUI_AnnotationMgr::Display( const QString& theEntry, const int theIndex, SOCC_Viewer* theView ) +void GEOMGUI_AnnotationMgr::Display( const QString& theEntry, const int theIndex, SOCC_Viewer* theView, + const bool isStoreViewState, const bool isUpdateViewer ) { SOCC_Viewer* aView = viewOrActiveView( theView ); if ( !aView ) @@ -161,7 +163,8 @@ void GEOMGUI_AnnotationMgr::Display( const QString& theEntry, const int theIndex QString anEntry = QString("%1%2%3").arg(theEntry).arg(GetEntrySeparator()).arg(theIndex); SALOME_Prs* aPrs = CreatePresentation( aProperty, anObject, aView, anEntry ); ((SALOME_View*)aView)->Display( getDisplayer(), aPrs ); - getDisplayer()->UpdateViewer(); + if ( isUpdateViewer ) + getDisplayer()->UpdateViewer(); EntryToAnnotations anEntryToMap; if ( myVisualized.contains( aView ) ) @@ -175,9 +178,11 @@ void GEOMGUI_AnnotationMgr::Display( const QString& theEntry, const int theIndex anEntryToMap[theEntry] = anAnnotationToPrsMap; myVisualized[aView] = anEntryToMap; - // change persistent for the entry: set visible state in true for indices which presentations are shown - storeVisibleState( theEntry, theView ); - storeFixedPosition( theEntry, theView ); + if ( isStoreViewState ) { + // change persistent for the entry: set visible state in true for indices which presentations are shown + storeVisibleState( theEntry, theView ); + storeFixedPosition( theEntry, theView ); + } } void GEOMGUI_AnnotationMgr::Redisplay( const QString& theEntry, const int theIndex, @@ -251,7 +256,8 @@ void GEOMGUI_AnnotationMgr::Redisplay( const QString& theEntry, const int theInd } } -void GEOMGUI_AnnotationMgr::Erase( const QString& theEntry, const int theIndex, SOCC_Viewer* theView ) +void GEOMGUI_AnnotationMgr::Erase( const QString& theEntry, const int theIndex, SOCC_Viewer* theView, + const bool isUpdateViewer ) { SOCC_Viewer* aView = viewOrActiveView( theView ); if ( !aView ) @@ -271,7 +277,8 @@ void GEOMGUI_AnnotationMgr::Erase( const QString& theEntry, const int theIndex, // erase presentation from the viewer SALOME_Prs* aPrs = anAnnotationToPrs[theIndex]; ((SALOME_View*)aView)->Erase( getDisplayer(), aPrs ); - getDisplayer()->UpdateViewer(); + if ( isUpdateViewer ) + getDisplayer()->UpdateViewer(); // remove displayed parameters from an internal container anAnnotationToPrs.remove( theIndex ); @@ -288,7 +295,8 @@ void GEOMGUI_AnnotationMgr::Erase( const QString& theEntry, const int theIndex, storeVisibleState( theEntry, theView ); } -void GEOMGUI_AnnotationMgr::DisplayVisibleAnnotations( const QString& theEntry, SOCC_Viewer* theView ) +void GEOMGUI_AnnotationMgr::DisplayVisibleAnnotations( const QString& theEntry, SOCC_Viewer* theView, + const bool isUpdateViewer ) { SalomeApp_Study* aStudy = dynamic_cast( getApplication()->activeStudy() ); _PTR(SObject) aSObj = aStudy->studyDS()->FindObjectID( theEntry.toStdString() ); @@ -303,12 +311,13 @@ void GEOMGUI_AnnotationMgr::DisplayVisibleAnnotations( const QString& theEntry, for ( int anIndex = 0; anIndex < aCount; ++anIndex ) { if ( isVisible[anIndex] ) - Display( theEntry, anIndex, theView ); + Display( theEntry, anIndex, theView, true, isUpdateViewer ); } } } -void GEOMGUI_AnnotationMgr::EraseVisibleAnnotations( const QString& theEntry, SOCC_Viewer* theView ) +void GEOMGUI_AnnotationMgr::EraseVisibleAnnotations( const QString& theEntry, SOCC_Viewer* theView, + const bool isUpdateViewer ) { SOCC_Viewer* aView = viewOrActiveView( theView ); if ( !myVisualized.contains( aView ) ) @@ -333,7 +342,8 @@ void GEOMGUI_AnnotationMgr::EraseVisibleAnnotations( const QString& theEntry, SO SALOME_Prs* aPrs = anAnnotationToPrs[anIndex]; ((SALOME_View*)aView)->Erase( getDisplayer(), aPrs ); } - getDisplayer()->UpdateViewer(); + if ( isUpdateViewer ) + getDisplayer()->UpdateViewer(); anEntryToAnnotation.remove( theEntry ); myVisualized[aView] = anEntryToAnnotation; } @@ -436,6 +446,57 @@ void GEOMGUI_AnnotationMgr::UpdateVisibleAnnotations( const QString& theEntry, S getDisplayer()->UpdateViewer(); } +void GEOMGUI_AnnotationMgr::DisplayAllAnnotations( SOCC_Viewer* theView ) +{ + SOCC_Viewer* aView = viewOrActiveView( theView ); + if ( !myVisualized.contains( aView ) ) + return; + + GeometryGUI* aModule = dynamic_cast( getApplication()->activeModule() ); + GEOMGUI_TextTreeWdg* aTextWidget = aModule->GetTextTreeWdg(); + QList anEntries = aTextWidget->getAllEntries( GEOMGUI_TextTreeWdg::AnnotationShape ); + + SalomeApp_Study* aStudy = dynamic_cast( getApplication()->activeStudy() ); + for ( int i = 0, aCount = anEntries.size(); i < aCount; i++ ) { + QString anEntry = anEntries[i]; + + _PTR(SObject) aSObj = aStudy->studyDS()->FindObjectID( anEntry.toStdString() ); + if ( !aSObj ) + continue; + + const Handle(GEOMGUI_AnnotationAttrs) aShapeAnnotations = GEOMGUI_AnnotationAttrs::FindAttributes( aSObj ); + if ( !aShapeAnnotations.IsNull() ) + continue; + + int anAnnotationsCount = aShapeAnnotations->GetNbAnnotation(); + for ( int anIndex = 0; anIndex < anAnnotationsCount; ++anIndex ) + { + Display( anEntry, anIndex, aView, false, false ); + } + getDisplayer()->UpdateViewer(); + storeVisibleState( anEntry, aView ); + storeFixedPosition( anEntry, aView ); + } +} + +void GEOMGUI_AnnotationMgr::EraseAllAnnotations( SOCC_Viewer* theView ) +{ + SOCC_Viewer* aView = viewOrActiveView( theView ); + if ( !myVisualized.contains( aView ) ) + return; + + GeometryGUI* aModule = dynamic_cast( getApplication()->activeModule() ); + GEOMGUI_TextTreeWdg* aTextWidget = aModule->GetTextTreeWdg(); + QList anEntries = aTextWidget->getAllEntries( GEOMGUI_TextTreeWdg::AnnotationShape ); + + for ( int i = 0, aCount = anEntries.size(); i < aCount; i++ ) { + QString anEntry = anEntries[i]; + EraseVisibleAnnotations( anEntry, aView, false ); + storeVisibleState( anEntry, aView ); + } + getDisplayer()->UpdateViewer(); +} + void GEOMGUI_AnnotationMgr::SetPreviewStyle( const QString& theEntry, const int theIndex, const bool theIsPreview ) { SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); diff --git a/src/GEOMGUI/GEOMGUI_AnnotationMgr.h b/src/GEOMGUI/GEOMGUI_AnnotationMgr.h index 56a46acec..52d3b1260 100755 --- a/src/GEOMGUI/GEOMGUI_AnnotationMgr.h +++ b/src/GEOMGUI/GEOMGUI_AnnotationMgr.h @@ -59,17 +59,25 @@ public: const QString& theEntry = QString() ); bool IsDisplayed( const QString& theEntry, const int theIndex, SOCC_Viewer* theView = 0 ) const; - void Display( const QString& theEntry, const int theIndex, SOCC_Viewer* theView = 0 ); - void Erase( const QString& theEntry, const int theIndex, SOCC_Viewer* theView = 0 ); + void Display( const QString& theEntry, const int theIndex, SOCC_Viewer* theView = 0, + const bool isStoreViewState = true, const bool isUpdateViewer = true ); + void Erase( const QString& theEntry, const int theIndex, SOCC_Viewer* theView = 0, + const bool isUpdateViewer = true ); void EraseRemovedAnnotation( const QString& theEntry, const int theIndex ); void Redisplay( const QString& theEntry, const int theIndex, const GEOMGUI_AnnotationAttrs::Properties& theProperties); void Redisplay( const QString& theEntry, const int theIndex, const GEOMGUI_AnnotationAttrs::Properties& theProperties, SOCC_Viewer* theView ); - void DisplayVisibleAnnotations( const QString& theEntry, SOCC_Viewer* theView = 0 ); - void EraseVisibleAnnotations( const QString& theEntry, SOCC_Viewer* theView = 0 ); + void DisplayVisibleAnnotations( const QString& theEntry, SOCC_Viewer* theView = 0, + const bool isUpdateViewer = true ); + void EraseVisibleAnnotations( const QString& theEntry, SOCC_Viewer* theView = 0, + const bool isUpdateViewer = true ); void UpdateVisibleAnnotations( const QString& theEntry, SOCC_Viewer* theView = 0 ); + + void DisplayAllAnnotations( SOCC_Viewer* theView = 0 ); + void EraseAllAnnotations( SOCC_Viewer* theView = 0 ); + void SetPreviewStyle( const QString& theEntry, const int theIndex, const bool theIsPreview ); void RemoveView( SOCC_Viewer* theView ); diff --git a/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx b/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx index 47dd3441e..b245a14f9 100755 --- a/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx +++ b/src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx @@ -521,13 +521,14 @@ void GEOMGUI_TextTreeWdg::updateVisibilityColumn( const BranchType& theBranchTyp //================================================================================= void GEOMGUI_TextTreeWdg::showContextMenu( const QPoint& pos ) { - if ( selectedItems().isEmpty() ) - return; + CAM_Application* anApp = dynamic_cast(myStudy->application()); + GeometryGUI* aModule = dynamic_cast(anApp->activeModule()); + QMenu aMenu; - aMenu.addAction( myActions[GEOMOp::OpShow] ); - aMenu.addAction( myActions[GEOMOp::OpHide] ); + aMenu.addAction( aModule->action(GEOMOp::OpShowAllAnnotations) ); + aMenu.addAction( aModule->action(GEOMOp::OpHideAllAnnotations) ); - if ( selectedItems().count() == 1 ) { + if ( !selectedItems().isEmpty() && selectedItems().count() == 1 ) { QTreeWidgetItem* anItem = selectedItems().first(); QString anEntry = entryFromItem( anItem->parent() ); if ( !anEntry.isEmpty() ) { @@ -539,8 +540,6 @@ void GEOMGUI_TextTreeWdg::showContextMenu( const QPoint& pos ) return; aMenu.clear(); // Edit annotation action - CAM_Application* anApp = dynamic_cast(myStudy->application()); - GeometryGUI* aModule = dynamic_cast(anApp->activeModule()); QAction* anEditAction = aModule->action(GEOMOp::OpEditAnnotation); if ( anEditAction ) aMenu.addAction( anEditAction ); @@ -730,6 +729,15 @@ void GEOMGUI_TextTreeWdg::setSelected( const QMap >& theAnno } } +//================================================================================= +// function : getAllEntries +// purpose : +//================================================================================= +QList GEOMGUI_TextTreeWdg::getAllEntries( const BranchType& theBranchType ) +{ + return getObjects( theBranchType ).keys(); +} + //================================================================================= // function : setShapeItemVisibility // purpose : diff --git a/src/GEOMGUI/GEOMGUI_TextTreeWdg.h b/src/GEOMGUI/GEOMGUI_TextTreeWdg.h index 2025a511e..d92a607b8 100644 --- a/src/GEOMGUI/GEOMGUI_TextTreeWdg.h +++ b/src/GEOMGUI/GEOMGUI_TextTreeWdg.h @@ -73,6 +73,8 @@ public: void getSelected( QMap >& theAnnotations ); void setSelected( const QMap >& theAnnotations ); + QList getAllEntries( const BranchType& theBranchType ); + protected: void createActions(); void redisplay( QString theEntry ); diff --git a/src/MeasureGUI/MeasureGUI.cxx b/src/MeasureGUI/MeasureGUI.cxx index ea9758c95..084a9b61a 100755 --- a/src/MeasureGUI/MeasureGUI.cxx +++ b/src/MeasureGUI/MeasureGUI.cxx @@ -231,38 +231,44 @@ void MeasureGUI::ChangeAnnotationsVisibility( const bool theIsVisible ) return; Handle(SALOME_InteractiveObject) anIObject = getSingleSelectedIO(); - if ( anIObject.IsNull() - || !anIObject->hasEntry() ) - return; - - const QString aEntry = anIObject->getEntry(); + if ( !anIObject.IsNull() && anIObject->hasEntry() ) { + const QString aEntry = anIObject->getEntry(); - _PTR(SObject) aSObj = anActiveStudy->studyDS()->FindObjectID( aEntry.toStdString() ); + _PTR(SObject) aSObj = anActiveStudy->studyDS()->FindObjectID( aEntry.toStdString() ); - const Handle(GEOMGUI_AnnotationAttrs) - aShapeAnnotations = GEOMGUI_AnnotationAttrs::FindAttributes( aSObj ); + const Handle(GEOMGUI_AnnotationAttrs) + aShapeAnnotations = GEOMGUI_AnnotationAttrs::FindAttributes( aSObj ); - if ( aShapeAnnotations.IsNull() ) { - return; - } + if ( aShapeAnnotations.IsNull() ) { + return; + } - const int aCount = aShapeAnnotations->GetNbAnnotation(); + const int aCount = aShapeAnnotations->GetNbAnnotation(); - if ( aCount > 0 ) { + if ( aCount > 0 ) { - SUIT_OverrideCursor wc; + SUIT_OverrideCursor wc; - for ( int anI = 0; anI < aCount; ++anI ) { + for ( int anI = 0; anI < aCount; ++anI ) { - if ( !theIsVisible ) { - getGeometryGUI()->GetAnnotationMgr()->Erase( aEntry, anI ); + if ( !theIsVisible ) { + getGeometryGUI()->GetAnnotationMgr()->Erase( aEntry, anI ); + } + else { + getGeometryGUI()->GetAnnotationMgr()->Display( aEntry , anI ); + } } - else { - getGeometryGUI()->GetAnnotationMgr()->Display( aEntry , anI ); - } - } - getGeometryGUI()->emitAnnotationsUpdated( aEntry ); + getGeometryGUI()->emitAnnotationsUpdated( aEntry ); + } + } + else { + if ( theIsVisible ) { + getGeometryGUI()->GetAnnotationMgr()->DisplayAllAnnotations(); + } + else { + getGeometryGUI()->GetAnnotationMgr()->EraseAllAnnotations(); + } } } -- 2.39.2