ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-15 20:50:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Preferences and compilation errors

Browse Source
This commit is contained in:
apl 2016-09-28 11:39:11 +03:00
parent 804c280322
commit 5e351de3da
10 changed files with 440 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/SalomeApp.xml.in Normal file → Executable file
View File

@ -100,6 +100,14 @@
<parameter name="dimensions_default_flyout" value="20" /> <parameter name="dimensions_default_flyout" value="20" />
<parameter name="dimensions_use_text3d" value="0" /> <parameter name="dimensions_use_text3d" value="0" />
<!-- Shape annotation presentation properties -->
<parameter name="shape_annotation_font_color" value="#ffffff" />
<parameter name="shape_annotation_font" value="Y14.5M-2009,14" />
<parameter name="shape_annotation_line_color" value="#ffffff" />
<parameter name="shape_annotation_line_width" value="1.0" />
<parameter name="shape_annotation_line_style" value="0" />
<parameter name="shape_annotation_autohide" value="false" />
<!-- Scalar bar for field step presentation --> <!-- Scalar bar for field step presentation -->
<parameter name="scalar_bar_x_position" value="0.05" /> <parameter name="scalar_bar_x_position" value="0.05" />
<parameter name="scalar_bar_y_position" value="0.1" /> <parameter name="scalar_bar_y_position" value="0.1" />

69
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -25,7 +25,6 @@
// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
#include "GEOM_Displayer.h" #include "GEOM_Displayer.h"
#include "GEOMGUI_DimensionProperty.h"
#include "GeometryGUI.h" #include "GeometryGUI.h"
#include <GEOM_Constants.h> #include <GEOM_Constants.h>
@ -39,12 +38,16 @@
#include <GEOM_Actor.h> #include <GEOM_Actor.h>
#include <GEOM_AISDimension.hxx> #include <GEOM_AISDimension.hxx>
#include <GEOM_Annotation.hxx>
#include <GEOM_TopWireframeShape.hxx> #include <GEOM_TopWireframeShape.hxx>
#include <GEOM_AISVector.hxx> #include <GEOM_AISVector.hxx>
#include <GEOM_AISTrihedron.hxx> #include <GEOM_AISTrihedron.hxx>
#include <GEOM_VTKTrihedron.hxx> #include <GEOM_VTKTrihedron.hxx>
#include <GEOM_VTKPropertyMaterial.hxx> #include <GEOM_VTKPropertyMaterial.hxx>
#include <GEOMGUI_DimensionProperty.h>
#include <GEOMGUI_ShapeAnnotations.h>
#include <GEOMUtils.hxx> #include <GEOMUtils.hxx>
#include <Material_Model.h> #include <Material_Model.h>
@ -1386,6 +1389,7 @@ void GEOM_Displayer::updateShapeAnnotations( const Handle(SALOME_InteractiveObje
AIS_ListIteratorOfListOfInteractive aIterateIO( aListOfIO ); AIS_ListIteratorOfListOfInteractive aIterateIO( aListOfIO );
// remove existing presentations of shape annotations // remove existing presentations of shape annotations
bool isAnyRemoved = false;
for ( ; aIterateIO.More(); aIterateIO.Next() ) for ( ; aIterateIO.More(); aIterateIO.Next() )
{ {
const Handle(AIS_InteractiveObject)& anIO = aIterateIO.Value(); const Handle(AIS_InteractiveObject)& anIO = aIterateIO.Value();
@ -1393,64 +1397,63 @@ void GEOM_Displayer::updateShapeAnnotations( const Handle(SALOME_InteractiveObje
continue; continue;
aListOfIO.Remove( aIterateIO ); aListOfIO.Remove( aIterateIO );
isAnyRemoved = true;
if ( !aIterateIO.More() ) if ( !aIterateIO.More() )
break; break;
} }
// read annotation preferences
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
QColor aQColor = aResMgr->colorValue ( "Geometry", "shape_annotation_color", QColor( 0, 0, 0 ) ); const QFont aFont = aResMgr->fontValue( "Geometry", "shape_annotation_font", QFont( "Arial", 14 ) );
int aLineWidth = aResMgr->integerValue( "Geometry", "shape_annotation_line_width", 1 ); const QColor aFontColor = aResMgr->colorValue( "Geometry", "shape_annotation_font_color", QColor( 255, 255, 255 ) );
QFont aFont = aResMgr->fontValue ( "Geometry", "shape_annotation_font", QFont("Arial", 14) ); const QColor aLineColor = aResMgr->colorValue( "Geometry", "shape_annotation_line_color", QColor( 255, 255, 255 ) );
bool aAutoHide = aResMgr->fontValue ( "Geometry", "shape_annotation_autohide", true ); const double aLineWidth = aResMgr->doubleValue( "Geometry", "shape_annotation_line_width", 1.0 );
const int aLineStyle = aResMgr->integerValue( "Geometry", "shape_annotation_line_style", 0 );
const bool isAutoHide = aResMgr->booleanValue( "Geometry", "shape_annotation_autohide", false );
// create shape annotations using data from the attribute of a study
QVariant aProperty = aStudy->getObjectProperty( GEOM::sharedPropertiesId(), QVariant aProperty = aStudy->getObjectProperty( GEOM::sharedPropertiesId(),
theIO->getEntry(), theIO->getEntry(),
GEOM::propertyName( GEOM::ShapeAnnotations ), GEOM::propertyName( GEOM::ShapeAnnotations ),
QVariant() ); QVariant() );
GEOMGUI_ShapeAnnotationProperty aStudyAnnotations; GEOMGUI_ShapeAnnotations aAnnotationList;
if ( aProperty.isValid() && aProperty.canConvert<GEOMGUI_DimensionProperty>() ) if ( aProperty.isValid() && aProperty.canConvert<GEOMGUI_ShapeAnnotations>() )
{ {
aStudyAnnotations = aProperty.value<GEOMGUI_ShapeAnnotationProperty>(); aAnnotationList = aProperty.value<GEOMGUI_ShapeAnnotations>();
}
else
{
aStudyAnnotations.LoadFromAttribute( getStudy(), theIO->getEntry() );
}
// create up-to-date shape annotation presentations for ( int anI = 0; anI < aAnnotationList.Count(); ++anI )
for ( int aPrsIt = 0; aPrsIt < aStudyAnnotations.GetNumber(); ++aPrsIt )
{ {
if ( !aStudyAnnotations.IsVisible( aPrsIt ) ) if ( !aAnnotationList.Get( anI ).IsVisible )
{ {
continue; continue;
} }
Handle(GEOM_Annotation) aPrs = new GEOM_Annotation(); Handle(GEOM_Annotation) aPresentation = new GEOM_Annotation();
aStudyAnnotations.GetRecord( aPrsIt )->Update( aPrs ); aAnnotationList.ToPresentation ( anI, aPresentation, theShapeLCS );
gp_Trsf aToLCS; aPresentation->SetOwner( theIO );
aToLCS.SetTransformation( theLCS, gp_Ax3() );
aPrs->SetLocalTransformation( aToLCS );
aPrs->SetOwner( theIO );
Quantity_Color aColor( aQColor.redF(), aQColor.greenF(), aQColor.blueF(), Quantity_TOC_RGB ); const Quantity_Color aOcctFontColor( aFontColor.redF(), aFontColor.greenF(), aFontColor.blueF(), Quantity_TOC_RGB );
const Quantity_Color aOcctLineColor( aLineColor.redF(), aLineColor.greenF(), aLineColor.blueF(), Quantity_TOC_RGB );
const Standard_Real aFontHeight = aFont.pixelSize() != -1 ? aFont.pixelSize() : aFont.pointSize();
Standard_Real aFontHeight = aFont.pixelSize() != -1 ? aFont.pixelSize() : aFont.pointSize(); aPresentation->SetTextHeight( aFont.pixelSize() != -1 ? aFont.pixelSize() : aFont.pointSize() );
aPrs->SetColor( aColor ); aPresentation->SetTextColor( Quantity_Color( aFontColor.redF(), aFontColor.greenF(), aFontColor.blueF(), Quantity_TOC_RGB ) );
aPrs->SetTextHeight( aFontHeight ); aPresentation->SetLineColor( Quantity_Color( aLineColor.redF(), aLineColor.greenF(), aLineColor.blueF(), Quantity_TOC_RGB ) );
aPrs->SetFont( aFont.family().toLatin1().data() ); aPresentation->SetLineWidth( aLineWidth );
aPrs->SetLineWidth( aLineWidth ); aPresentation->SetLineStyle( static_cast<Aspect_TypeOfLine>( aLineStyle ) );
aPresentation->SetAutoHide( isAutoHide ? Standard_True : Standard_False );
aListOfIO.Append( aPrs ); aListOfIO.Append( aPresentation );
}
}
else if ( !isAnyRemoved )
{
return;
} }
// update presentation
anOccPrs->Clear(); anOccPrs->Clear();
for ( aIterateIO.Initialize( aListOfIO ); aIterateIO.More(); aIterateIO.Next() ) for ( aIterateIO.Initialize( aListOfIO ); aIterateIO.More(); aIterateIO.Next() )
@ -1649,7 +1652,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
} }
updateDimensions( myIO, occPrs, gp_Ax3().Transformed( myShape.Location().Transformation() ) ); updateDimensions( myIO, occPrs, gp_Ax3().Transformed( myShape.Location().Transformation() ) );
updateAnnotations( myIO, occPrs, gp_Ax3().Transformed( myShape.Location().Transformation() ) ); updateShapeAnnotations( myIO, occPrs, gp_Ax3().Transformed( myShape.Location().Transformation() ) );
} }
} }

44
src/GEOMGUI/GEOM_msg_en.ts Normal file → Executable file
View File

@ -3500,6 +3500,50 @@ Please, select face, shell or solid and try again</translation>
<source>PREF_DIMENSIONS_USE_TEXT3D</source> <source>PREF_DIMENSIONS_USE_TEXT3D</source>
<translation>Use 3D text</translation> <translation>Use 3D text</translation>
</message> </message>
<message>
<source>PREF_SHAPE_ANNOTATIONS</source>
<translation>Shape annotations</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_FONT</source>
<translation>Font</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_FONT_COLOR</source>
<translation>Font color</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINE_COLOR</source>
<translation>Line color</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINE_WIDTH</source>
<translation>Line width</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINE_STYLE</source>
<translation>Line style</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_AUTOHIDE</source>
<translation>Hide when attachment is invisible</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_SOLID</source>
<translation>Solid</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_DASH</source>
<translation>Dashed</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOT</source>
<translation>Dotted</translation>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOTDASH</source>
<translation>Mixed</translation>
</message>
<message> <message>
<source>PREF_HIDE_INPUT_OBJECT</source> <source>PREF_HIDE_INPUT_OBJECT</source>
<translation>Hide input objects from the viewer</translation> <translation>Hide input objects from the viewer</translation>

33
src/GEOMGUI/GEOM_msg_fr.ts Normal file → Executable file
View File

@ -3492,6 +3492,39 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
<source>PREF_DIMENSIONS_USE_TEXT3D</source> <source>PREF_DIMENSIONS_USE_TEXT3D</source>
<translation>Utiliser du texte 3D</translation> <translation>Utiliser du texte 3D</translation>
</message> </message>
<message>
<source>PREF_SHAPE_ANNOTATIONS</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_FONT</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_FONT_COLOR</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINE_COLOR</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINE_WIDTH</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINE_STYLE</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_AUTOHIDE</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_SOLID</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_DASH</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOT</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOTDASH</source>
</message>
<message> <message>
<source>PREF_HIDE_INPUT_OBJECT</source> <source>PREF_HIDE_INPUT_OBJECT</source>
<translation>Cacher dans la vue les objets en entrée</translation> <translation>Cacher dans la vue les objets en entrée</translation>

33
src/GEOMGUI/GEOM_msg_ja.ts Normal file → Executable file
View File

@ -3495,6 +3495,39 @@
<source>PREF_DIMENSIONS_USE_TEXT3D</source> <source>PREF_DIMENSIONS_USE_TEXT3D</source>
<translation>3Dテキストの使用</translation> <translation>3Dテキストの使用</translation>
</message> </message>
<message>
<source>PREF_SHAPE_ANNOTATIONS</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_FONT</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_FONT_COLOR</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINE_COLOR</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINE_WIDTH</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINE_STYLE</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_AUTOHIDE</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_SOLID</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_DASH</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOT</source>
</message>
<message>
<source>PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOTDASH</source>
</message>
<message> <message>
<source>PREF_HIDE_INPUT_OBJECT</source> <source>PREF_HIDE_INPUT_OBJECT</source>
<translation>ビューワから入力したオブジェクトの非表示</translation> <translation>ビューワから入力したオブジェクトの非表示</translation>

51
src/GEOMGUI/GeometryGUI.cxx Normal file → Executable file
View File

@ -2355,6 +2355,10 @@ void GeometryGUI::createPreferences()
addPreference( tr( "PREF_AUTO_BRING_TO_FRONT" ), genGroup, addPreference( tr( "PREF_AUTO_BRING_TO_FRONT" ), genGroup,
LightApp_Preferences::Bool, "Geometry", "auto_bring_to_front" ); LightApp_Preferences::Bool, "Geometry", "auto_bring_to_front" );
// --------------------------------------------------------------------------
// Dimensions (Measurements) preferences
// --------------------------------------------------------------------------
int aDimGroupId = addPreference( tr( "PREF_DIMENSIONS" ), tabId ); int aDimGroupId = addPreference( tr( "PREF_DIMENSIONS" ), tabId );
setPreferenceProperty( aDimGroupId, "columns", 2 ); setPreferenceProperty( aDimGroupId, "columns", 2 );
@ -2438,6 +2442,53 @@ void GeometryGUI::createPreferences()
addPreference( tr( "PREF_DIMENSIONS_USE_TEXT3D" ), aDimGroupId, addPreference( tr( "PREF_DIMENSIONS_USE_TEXT3D" ), aDimGroupId,
LightApp_Preferences::Bool, "Geometry", "dimensions_use_text3d" ); LightApp_Preferences::Bool, "Geometry", "dimensions_use_text3d" );
// --------------------------------------------------------------------------
// Shape annotation preferences
// --------------------------------------------------------------------------
const int aShapeAnnGroupId = addPreference( tr( "PREF_SHAPE_ANNOTATIONS" ), tabId );
setPreferenceProperty( aShapeAnnGroupId, "columns", 2 );
addPreference( tr( "PREF_SHAPE_ANNOTATIONS_FONT_COLOR" ), aShapeAnnGroupId, LightApp_Preferences::Color, "Geometry", "shape_annotation_font_color" );
addPreference( tr( "PREF_SHAPE_ANNOTATIONS_LINE_COLOR" ), aShapeAnnGroupId, LightApp_Preferences::Color, "Geometry", "shape_annotation_line_color" );
const int aShapeAnnFont =
addPreference( tr( "PREF_SHAPE_ANNOTATIONS_FONT" ), aShapeAnnGroupId, LightApp_Preferences::Font, "Geometry", "shape_annotation_font" );
int aShapeAnnFontFeatures = QtxFontEdit::Family | QtxFontEdit::Size | QtxFontEdit::Bold | QtxFontEdit::Italic;
setPreferenceProperty( aShapeAnnFont, "features", aShapeAnnFontFeatures );
setPreferenceProperty( aShapeAnnFont, "mode", QtxFontEdit::Custom );
setPreferenceProperty( aShapeAnnFont, "fonts", anOCCFonts );
const int aShapeAnnLineWidth =
addPreference( tr( "PREF_SHAPE_ANNOTATIONS_LINE_WIDTH" ), aShapeAnnGroupId, LightApp_Preferences::IntSpin, "Geometry", "shape_annotation_line_width" );
setPreferenceProperty( aShapeAnnLineWidth, "min", 1 );
setPreferenceProperty( aShapeAnnLineWidth, "max", 5 );
addPreference( tr( "PREF_SHAPE_ANNOTATIONS_AUTOHIDE" ), aShapeAnnGroupId, LightApp_Preferences::Bool, "Geometry", "shape_annotation_autohide" );
const int aShapeAnnLineStyle =
addPreference( tr( "PREF_SHAPE_ANNOTATIONS_LINE_STYLE" ), aShapeAnnGroupId, LightApp_Preferences::Selector, "Geometry", "shape_annotation_line_style" );
QStringList aLineStyleList;
aLineStyleList.append( tr("PREF_SHAPE_ANNOTATIONS_LINESTYLE_SOLID") );
aLineStyleList.append( tr("PREF_SHAPE_ANNOTATIONS_LINESTYLE_DASH") );
aLineStyleList.append( tr("PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOT") );
aLineStyleList.append( tr("PREF_SHAPE_ANNOTATIONS_LINESTYLE_DOTDASH") );
QList<QVariant> aLineStyleIds;
aLineStyleIds.append(0);
aLineStyleIds.append(1);
aLineStyleIds.append(2);
aLineStyleIds.append(3);
setPreferenceProperty( aShapeAnnLineStyle, "strings", aLineStyleList );
setPreferenceProperty( aShapeAnnLineStyle, "indexes", aLineStyleIds );
// --------------------------------------------------------------------------
// Isoline drawing preferences
// --------------------------------------------------------------------------
int isoGroup = addPreference( tr( "PREF_ISOS" ), tabId ); int isoGroup = addPreference( tr( "PREF_ISOS" ), tabId );
setPreferenceProperty( isoGroup, "columns", 2 ); setPreferenceProperty( isoGroup, "columns", 2 );
int isoU = addPreference( tr( "PREF_ISOS_U" ), isoGroup, int isoU = addPreference( tr( "PREF_ISOS_U" ), isoGroup,

280
src/OBJECT/GEOM_Annotation.cxx
View File

@ -38,7 +38,9 @@
#include <OpenGl_Context.hxx> #include <OpenGl_Context.hxx>
#include <OpenGl_GraphicDriver.hxx> #include <OpenGl_GraphicDriver.hxx>
#include <OpenGl_Group.hxx> #include <OpenGl_Group.hxx>
#include <OpenGl_PrimitiveArray.hxx>
#include <OpenGl_Structure.hxx> #include <OpenGl_Structure.hxx>
#include <OpenGl_Text.hxx>
#include <OpenGl_View.hxx> #include <OpenGl_View.hxx>
#include <OpenGl_Workspace.hxx> #include <OpenGl_Workspace.hxx>
#include <Prs3d_Root.hxx> #include <Prs3d_Root.hxx>
@ -47,7 +49,7 @@
#include <SelectMgr_EntityOwner.hxx> #include <SelectMgr_EntityOwner.hxx>
#include <V3d_Viewer.hxx> #include <V3d_Viewer.hxx>
IMPLEMENT_STANDARD_RTTIEXT (GEOM_Annotation, AIS_InteractiveObject) IMPLEMENT_STANDARD_RTTIEXT( GEOM_Annotation, AIS_InteractiveObject )
// ======================================================================= // =======================================================================
// function : Constructor // function : Constructor
@ -55,32 +57,34 @@ IMPLEMENT_STANDARD_RTTIEXT (GEOM_Annotation, AIS_InteractiveObject)
// ======================================================================= // =======================================================================
GEOM_Annotation::GEOM_Annotation() : AIS_InteractiveObject() GEOM_Annotation::GEOM_Annotation() : AIS_InteractiveObject()
{ {
SetPosition (gp_Pnt (0.0, 0.0, 0.0)); SetPosition( gp_Pnt( 0.0, 0.0, 0.0 ) );
SetScreenFixed (Standard_False); SetScreenFixed( Standard_False );
SetAttachPoint (gp_Pnt (0.0, 0.0, 0.0)); SetAttachPoint( gp_Pnt( 0.0, 0.0, 0.0 ) );
SetDisplayMode (0); SetDisplayMode( 0 );
SetZLayer (Graphic3d_ZLayerId_Top); SetZLayer( Graphic3d_ZLayerId_Top );
SetAutoHide (Standard_True); SetAutoHide( Standard_True );
SetHilightMode (HighlightAll); SetHilightMode( HighlightAll );
Handle(Prs3d_TextAspect) aTextAspect = new Prs3d_TextAspect(); Handle(Prs3d_TextAspect) aTextAspect = new Prs3d_TextAspect();
aTextAspect->SetHeight (20.0); aTextAspect->SetHeight( 20.0 );
aTextAspect->SetColor (Quantity_Color (1.0, 1.0, 1.0, Quantity_TOC_RGB)); aTextAspect->SetColor( Quantity_Color( 1.0, 1.0, 1.0, Quantity_TOC_RGB ) );
myDrawer->SetTextAspect (aTextAspect); myDrawer->SetTextAspect( aTextAspect );
Handle(Prs3d_LineAspect) aLineAspect = Handle(Prs3d_LineAspect) aLineAspect =
new Prs3d_LineAspect (Quantity_NOC_WHITE, Aspect_TOL_SOLID, 1.0); new Prs3d_LineAspect( Quantity_NOC_WHITE, Aspect_TOL_SOLID, 1.0 );
myDrawer->SetLineAspect (aLineAspect); myDrawer->SetLineAspect( aLineAspect );
} }
// ======================================================================= // =======================================================================
// function : SetText // function : SetText
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::SetText (const TCollection_ExtendedString& theText) void GEOM_Annotation::SetText( const TCollection_ExtendedString& theText )
{ {
if (myText != theText) if (myText != theText)
{
SetToUpdate(); SetToUpdate();
}
myText = theText; myText = theText;
} }
@ -89,27 +93,29 @@ void GEOM_Annotation::SetText (const TCollection_ExtendedString& theText)
// function : SetPosition // function : SetPosition
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::SetPosition (const gp_Pnt& thePosition) void GEOM_Annotation::SetPosition( const gp_Pnt& thePosition )
{ {
myPosition = thePosition; myPosition = thePosition;
AIS_InteractiveObject::SetTransformPersistence (Graphic3d_TMF_ZoomPers | Graphic3d_TMF_RotatePers, thePosition); UpdatePersistence();
} }
// ======================================================================= // =======================================================================
// function : SetScreenFixed // function : SetScreenFixed
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::SetScreenFixed (const Standard_Boolean theIsFixed) void GEOM_Annotation::SetScreenFixed( const Standard_Boolean theIsFixed )
{ {
myIsScreenFixed = theIsFixed; myIsScreenFixed = theIsFixed;
UpdatePersistence();
} }
// ======================================================================= // =======================================================================
// function : SetAttachPoint // function : SetAttachPoint
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::SetAttachPoint (const gp_Pnt& thePoint) void GEOM_Annotation::SetAttachPoint( const gp_Pnt& thePoint )
{ {
myAttach = thePoint; myAttach = thePoint;
} }
@ -118,22 +124,44 @@ void GEOM_Annotation::SetAttachPoint (const gp_Pnt& thePoint)
// function : SetColor // function : SetColor
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::SetColor (const Quantity_Color& theColor) void GEOM_Annotation::SetColor( const Quantity_Color& theColor )
{ {
myDrawer->TextAspect()->SetColor (theColor); SetTextColor( theColor );
myDrawer->LineAspect()->SetColor (theColor); SetLineColor( theColor );
AIS_InteractiveObject::SetColor (theColor); }
// =======================================================================
// function : SetTextColor
// purpose :
// =======================================================================
void GEOM_Annotation::SetTextColor( const Quantity_Color& theColor )
{
myDrawer->TextAspect()->SetColor( theColor );
SetToUpdate();
}
// =======================================================================
// function : SetLineColor
// purpose :
// =======================================================================
void GEOM_Annotation::SetLineColor( const Quantity_Color& theColor )
{
myDrawer->LineAspect()->SetColor( theColor );
SetToUpdate();
} }
// ======================================================================= // =======================================================================
// function : SetTextHeight // function : SetTextHeight
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::SetTextHeight (const Standard_Real theHeight) void GEOM_Annotation::SetTextHeight( const Standard_Real theHeight )
{ {
if (GetTextHeight() != theHeight) if (GetTextHeight() != theHeight)
{ {
myDrawer->TextAspect()->SetHeight (theHeight); myDrawer->TextAspect()->SetHeight( theHeight );
SetToUpdate (); SetToUpdate ();
} }
} }
@ -142,11 +170,12 @@ void GEOM_Annotation::SetTextHeight (const Standard_Real theHeight)
// function : SetFontAspect // function : SetFontAspect
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::SetFontAspect (const Font_FontAspect theFontAspect) void GEOM_Annotation::SetFontAspect( const Font_FontAspect theFontAspect )
{ {
if (GetFontAspect() != theFontAspect) if (GetFontAspect() != theFontAspect)
{ {
myDrawer->TextAspect()->Aspect()->SetTextFontAspect (theFontAspect); myDrawer->TextAspect()->Aspect()->SetTextFontAspect( theFontAspect );
SetToUpdate(); SetToUpdate();
} }
} }
@ -155,11 +184,12 @@ void GEOM_Annotation::SetFontAspect (const Font_FontAspect theFontAspect)
// function : SetFont // function : SetFont
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::SetFont (const TCollection_AsciiString& theFont) void GEOM_Annotation::SetFont( const TCollection_AsciiString& theFont )
{ {
if (GetFont() != theFont) if (GetFont() != theFont)
{ {
myDrawer->TextAspect()->Aspect()->SetFont (theFont); myDrawer->TextAspect()->Aspect()->SetFont( theFont );
SetToUpdate(); SetToUpdate();
} }
} }
@ -168,18 +198,53 @@ void GEOM_Annotation::SetFont (const TCollection_AsciiString& theFont)
// function : SetLineWidth // function : SetLineWidth
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::SetLineWidth (const Standard_Real theLineWidth) void GEOM_Annotation::SetLineWidth( const Standard_Real theLineWidth )
{ {
myDrawer->LineAspect()->SetWidth (theLineWidth); if (GetLineWidth() != theLineWidth)
{
myDrawer->LineAspect()->SetWidth( theLineWidth );
SetToUpdate();
}
}
// =======================================================================
// function : SetLineStyle
// purpose :
// =======================================================================
void GEOM_Annotation::SetLineStyle( const Aspect_TypeOfLine theStyle )
{
if (GetLineStyle() != theStyle)
{
myDrawer->LineAspect()->SetTypeOfLine( theStyle );
SetToUpdate();
}
}
// =======================================================================
// function : UpdatePersistence
// purpose :
// =======================================================================
void GEOM_Annotation::UpdatePersistence()
{
if (!myIsScreenFixed)
{
AIS_InteractiveObject::SetTransformPersistence( Graphic3d_TMF_ZoomPers | Graphic3d_TMF_RotatePers, myPosition );
}
else
{
AIS_InteractiveObject::SetTransformPersistence( Graphic3d_TMF_2d, gp_Pnt( 0.0, 0.0, 0.0 ) );
}
} }
// ======================================================================= // =======================================================================
// function : Compute // function : Compute
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/, void GEOM_Annotation::Compute( const Handle(PrsMgr_PresentationManager3d)& /*thePresentationManager*/,
const Handle(Prs3d_Presentation)& thePresentation, const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode) const Standard_Integer theMode )
{ {
thePresentation->Clear(); thePresentation->Clear();
@ -188,39 +253,39 @@ void GEOM_Annotation::Compute (const Handle(PrsMgr_PresentationManager3d)& /*the
return; return;
} }
Handle(OpenGl_Group) aGroup = Handle(OpenGl_Group)::DownCast (Prs3d_Root::NewGroup (thePresentation)); Handle(OpenGl_Group) aGroup = Handle(OpenGl_Group)::DownCast( Prs3d_Root::NewGroup( thePresentation ) );
if (aGroup.IsNull()) if (aGroup.IsNull())
{ {
return; return;
} }
Handle(Prs3d_TextAspect) anAsp = myDrawer->TextAspect(); Handle(Prs3d_TextAspect) anAsp = myDrawer->TextAspect();
NCollection_String aUtfText (myText.ToExtString()); NCollection_String aUtfText( myText.ToExtString() );
OpenGl_Annotation* aAnnotationDraw = OpenGl_Annotation* aAnnotationDraw =
new OpenGl_Annotation (this, static_cast<Standard_Integer>(anAsp->Height()), aGroup->GlStruct()->GlDriver()); new OpenGl_Annotation( this, static_cast<Standard_Integer>( anAsp->Height() ), aGroup->GlStruct()->GlDriver() );
aGroup->AddElement (aAnnotationDraw); aGroup->AddElement( aAnnotationDraw );
aGroup->SetGroupPrimitivesAspect (myDrawer->TextAspect()->Aspect()); aGroup->SetGroupPrimitivesAspect( myDrawer->TextAspect()->Aspect() );
aGroup->SetGroupPrimitivesAspect (myDrawer->LineAspect()->Aspect()); aGroup->SetGroupPrimitivesAspect( myDrawer->LineAspect()->Aspect() );
NCollection_Handle<Bnd_Box> aBoundingBox = TextBoundingBox(); const NCollection_Handle<Bnd_Box> aBoundingBox = TextBoundingBox();
gp_Pnt aBoxMin = aBoundingBox->CornerMin(); const gp_Pnt aBoxMin = aBoundingBox->CornerMin();
gp_Pnt aBoxMax = aBoundingBox->CornerMax(); const gp_Pnt aBoxMax = aBoundingBox->CornerMax();
aGroup->ChangeBoundingBox() = Graphic3d_BndBox4f ( aGroup->ChangeBoundingBox() = Graphic3d_BndBox4f (
Graphic3d_Vec4 (static_cast<Standard_ShortReal> (aBoxMin.X()), Graphic3d_Vec4( static_cast<Standard_ShortReal>( aBoxMin.X() ),
static_cast<Standard_ShortReal> (aBoxMin.Y()), static_cast<Standard_ShortReal>( aBoxMin.Y() ),
static_cast<Standard_ShortReal> (aBoxMin.Z()), 1.0F), static_cast<Standard_ShortReal>( aBoxMin.Z() ), 1.0F ),
Graphic3d_Vec4 (static_cast<Standard_ShortReal> (aBoxMax.X()), Graphic3d_Vec4( static_cast<Standard_ShortReal>( aBoxMax.X() ),
static_cast<Standard_ShortReal> (aBoxMax.Y()), static_cast<Standard_ShortReal>( aBoxMax.Y() ),
static_cast<Standard_ShortReal> (aBoxMax.Z()), 1.0F)); static_cast<Standard_ShortReal>( aBoxMax.Z() ), 1.0F ) );
} }
// ======================================================================= // =======================================================================
// function : ComputeSelection // function : ComputeSelection
// purpose : // purpose :
// ======================================================================= // =======================================================================
void GEOM_Annotation::ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, void GEOM_Annotation::ComputeSelection( const Handle(SelectMgr_Selection)& theSelection,
const Standard_Integer theMode) const Standard_Integer theMode )
{ {
if (theMode != 0) if (theMode != 0)
{ {
@ -229,10 +294,10 @@ void GEOM_Annotation::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
theSelection->Clear(); theSelection->Clear();
NCollection_Handle<Bnd_Box> aBoundingBox = TextBoundingBox(); const NCollection_Handle<Bnd_Box> aBoundingBox = TextBoundingBox();
Handle(SelectMgr_EntityOwner) anEntityOwner = new SelectMgr_EntityOwner (this, 10); const Handle(SelectMgr_EntityOwner) anEntityOwner = new SelectMgr_EntityOwner( this, 10 );
Handle(Select3D_SensitiveBox) aSensitive = new Select3D_SensitiveBox (anEntityOwner, *aBoundingBox.get()); const Handle(Select3D_SensitiveBox) aSensitive = new Select3D_SensitiveBox( anEntityOwner, *aBoundingBox.get() );
theSelection->Add (aSensitive); theSelection->Add( aSensitive );
} }
// ======================================================================= // =======================================================================
@ -245,14 +310,16 @@ NCollection_Handle<Bnd_Box> GEOM_Annotation::TextBoundingBox() const
Bnd_Box aBox; Bnd_Box aBox;
Font_FTFont aFont; Font_FTFont aFont;
unsigned int aResolution = GetContext()->CurrentViewer()->DefaultRenderingParams().Resolution; unsigned int aResolution = GetContext()->CurrentViewer()->DefaultRenderingParams().Resolution;
if (aFont.Init (anAsp->Aspect()->Font().ToCString(), if ( aFont.Init( anAsp->Aspect()->Font().ToCString(),
anAsp->Aspect()->GetTextFontAspect(), (unsigned int)anAsp->Height(), aResolution)) anAsp->Aspect()->GetTextFontAspect(),
(unsigned int)anAsp->Height(),
aResolution ) )
{ {
const NCollection_String aText ((Standard_Utf16Char* )myText.ToExtString()); const NCollection_String aText( (Standard_Utf16Char* )myText.ToExtString() );
Font_Rect aFontRect = aFont.BoundingBox (aText, Graphic3d_HTA_LEFT, Graphic3d_VTA_BOTTOM); const Font_Rect aFontRect = aFont.BoundingBox( aText, Graphic3d_HTA_LEFT, Graphic3d_VTA_BOTTOM );
NCollection_Handle<Bnd_Box> aBox = new Bnd_Box(); NCollection_Handle<Bnd_Box> aBox = new Bnd_Box();
aBox->Add (gp_Pnt (0.0, 0.0, 0.0)); aBox->Add( gp_Pnt( 0.0, 0.0, 0.0 ) );
aBox->Add (gp_Pnt (aFontRect.Width(), aFontRect.Height(), 0.0)); aBox->Add( gp_Pnt( aFontRect.Width(), aFontRect.Height(), 0.0 ) );
return aBox; return aBox;
} }
@ -264,35 +331,35 @@ NCollection_Handle<Bnd_Box> GEOM_Annotation::TextBoundingBox() const
// function : Constructor // function : Constructor
// purpose : // purpose :
// ======================================================================= // =======================================================================
GEOM_Annotation::OpenGl_Annotation::OpenGl_Annotation (GEOM_Annotation* theAnnotation, GEOM_Annotation::OpenGl_Annotation::OpenGl_Annotation( GEOM_Annotation* theAnnotation,
const Standard_Integer theTextHeight, const Standard_Integer theTextHeight,
const OpenGl_GraphicDriver* theDriver) const OpenGl_GraphicDriver* theDriver )
: OpenGl_Element(), : OpenGl_Element(),
myAISObject (theAnnotation), myAISObject( theAnnotation ),
myText (theAnnotation->myText.ToExtString()), myText( theAnnotation->myText.ToExtString() ),
myTextLineY (0.f), myTextLineY( 0.f ),
myTextDPI (0) myTextDPI( 0 )
{ {
// graphical resources for drawing text and underline // graphical resources for drawing text and underline
myTextParams.Height = theTextHeight; myTextParams.Height = theTextHeight;
myTextParams.HAlign = Graphic3d_HTA_LEFT; myTextParams.HAlign = Graphic3d_HTA_LEFT;
myTextParams.VAlign = Graphic3d_VTA_BOTTOM; myTextParams.VAlign = Graphic3d_VTA_BOTTOM;
myTextDraw = new OpenGl_Text (myText.ToCString(), OpenGl_Vec3(), myTextParams); myTextDraw = new OpenGl_Text( myText.ToCString(), OpenGl_Vec3(), myTextParams );
myTextLineDraw = new OpenGl_PrimitiveArray (theDriver); myTextLineDraw = new OpenGl_PrimitiveArray( theDriver );
// graphical resources for drawing extension line and marker // graphical resources for drawing extension line and marker
Handle(Graphic3d_ArrayOfSegments) Handle(Graphic3d_ArrayOfSegments)
aExtVertexArray = new Graphic3d_ArrayOfSegments(2); aExtVertexArray = new Graphic3d_ArrayOfSegments( 2 );
aExtVertexArray->AddVertex (0.0, 0.0, 0.0); aExtVertexArray->AddVertex( 0.0, 0.0, 0.0 );
aExtVertexArray->AddVertex (0.0, 0.0, 1.0); aExtVertexArray->AddVertex( 0.0, 0.0, 1.0 );
myExtLineDraw = new OpenGl_PrimitiveArray (theDriver, Graphic3d_TOPA_SEGMENTS, myExtLineDraw = new OpenGl_PrimitiveArray( theDriver, Graphic3d_TOPA_SEGMENTS,
aExtVertexArray->Indices(), aExtVertexArray->Attributes(), aExtVertexArray->Bounds()); aExtVertexArray->Indices(), aExtVertexArray->Attributes(), aExtVertexArray->Bounds() );
Handle(Graphic3d_ArrayOfPoints) Handle(Graphic3d_ArrayOfPoints)
aExtMakerArray = new Graphic3d_ArrayOfPoints(1); aExtMakerArray = new Graphic3d_ArrayOfPoints( 1 );
aExtMakerArray->AddVertex (0.0, 0.0, 1.0); aExtMakerArray->AddVertex( 0.0, 0.0, 1.0 );
myExtMarkerDraw = new OpenGl_PrimitiveArray (theDriver, Graphic3d_TOPA_POINTS, myExtMarkerDraw = new OpenGl_PrimitiveArray( theDriver, Graphic3d_TOPA_POINTS,
aExtMakerArray->Indices(), aExtMakerArray->Attributes(), aExtMakerArray->Bounds()); aExtMakerArray->Indices(), aExtMakerArray->Attributes(), aExtMakerArray->Bounds() );
} }
// ======================================================================= // =======================================================================
@ -302,7 +369,7 @@ GEOM_Annotation::OpenGl_Annotation::OpenGl_Annotation (GEOM_Annotation* theAnnot
// ======================================================================= // =======================================================================
GEOM_Annotation::OpenGl_Annotation::~OpenGl_Annotation() GEOM_Annotation::OpenGl_Annotation::~OpenGl_Annotation()
{ {
Release (NULL); Release( NULL );
} }
// ======================================================================= // =======================================================================
@ -310,14 +377,14 @@ GEOM_Annotation::OpenGl_Annotation::~OpenGl_Annotation()
// function : Release // function : Release
// purpose : Releases GL resources with the given GL context. // purpose : Releases GL resources with the given GL context.
// ======================================================================= // =======================================================================
void GEOM_Annotation::OpenGl_Annotation::Release (OpenGl_Context* theCtx) void GEOM_Annotation::OpenGl_Annotation::Release( OpenGl_Context* theCtx )
{ {
if (myTextDraw) if (myTextDraw)
{ {
myTextDraw->Release (theCtx); myTextDraw->Release( theCtx );
myTextLineDraw->Release (theCtx); myTextLineDraw->Release( theCtx );
myExtLineDraw->Release (theCtx); myExtLineDraw->Release( theCtx );
myExtMarkerDraw->Release (theCtx); myExtMarkerDraw->Release( theCtx );
} }
myTextDraw = NULL; myTextDraw = NULL;
myTextLineDraw = NULL; myTextLineDraw = NULL;
@ -330,7 +397,7 @@ void GEOM_Annotation::OpenGl_Annotation::Release (OpenGl_Context* theCtx)
// function : Render // function : Render
// purpose : Renders the annotation graphical elements. // purpose : Renders the annotation graphical elements.
// ======================================================================= // =======================================================================
void GEOM_Annotation::OpenGl_Annotation::Render (const Handle(OpenGl_Workspace)& theWorkspace) const void GEOM_Annotation::OpenGl_Annotation::Render( const Handle(OpenGl_Workspace)& theWorkspace ) const
{ {
const Handle(OpenGl_Context)& aContext = theWorkspace->GetGlContext(); const Handle(OpenGl_Context)& aContext = theWorkspace->GetGlContext();
@ -344,24 +411,24 @@ void GEOM_Annotation::OpenGl_Annotation::Render (const Handle(OpenGl_Workspace)&
// getting string size will also initialize font library // getting string size will also initialize font library
Standard_ShortReal aWidth, aHeight, aDescent; Standard_ShortReal aWidth, aHeight, aDescent;
myTextDraw->StringSize (aContext, myText, *anAspect, myTextParams, aDPI, aWidth, aHeight, aDescent); myTextDraw->StringSize( aContext, myText, *anAspect, myTextParams, aDPI, aWidth, aHeight, aDescent );
myTextDPI = aDPI; myTextDPI = aDPI;
myTextLineY = ceil (aHeight * -0.2f); myTextLineY = ceil( aHeight * -0.2f );
Handle(Graphic3d_ArrayOfSegments) Handle(Graphic3d_ArrayOfSegments)
aVertexArray = new Graphic3d_ArrayOfSegments (2); aVertexArray = new Graphic3d_ArrayOfSegments( 2 );
aVertexArray->AddVertex (0.0f, myTextLineY, 0.0f); aVertexArray->AddVertex( 0.0f, myTextLineY, 0.0f );
aVertexArray->AddVertex (aWidth, myTextLineY, 0.0f); aVertexArray->AddVertex( aWidth, myTextLineY, 0.0f );
myTextLineDraw->InitBuffers (aContext, Graphic3d_TOPA_SEGMENTS, myTextLineDraw->InitBuffers( aContext, Graphic3d_TOPA_SEGMENTS,
aVertexArray->Indices(), aVertexArray->Attributes(), aVertexArray->Bounds()); aVertexArray->Indices(), aVertexArray->Attributes(), aVertexArray->Bounds() );
} }
// --------------------------------------------- // ---------------------------------------------
// perform view culling test by attachment point // perform view culling test by attachment point
// --------------------------------------------- // ---------------------------------------------
const OpenGl_Vec4 aAttach (static_cast<float>(myAISObject->myAttach.X()), const OpenGl_Vec4 aAttach( static_cast<float>( myAISObject->myAttach.X() ),
static_cast<float>(myAISObject->myAttach.Y()), static_cast<float>( myAISObject->myAttach.Y() ),
static_cast<float>(myAISObject->myAttach.Z()), 1.F); static_cast<float>( myAISObject->myAttach.Z() ), 1.F );
const Handle(Graphic3d_Camera) aCamera = theWorkspace->View()->Camera(); const Handle(Graphic3d_Camera) aCamera = theWorkspace->View()->Camera();
const OpenGl_Mat4& aCameraProjMat = aCamera->ProjectionMatrixF(); const OpenGl_Mat4& aCameraProjMat = aCamera->ProjectionMatrixF();
@ -370,9 +437,9 @@ void GEOM_Annotation::OpenGl_Annotation::Render (const Handle(OpenGl_Workspace)&
if (myAISObject->myIsAutoHide) if (myAISObject->myIsAutoHide)
{ {
const OpenGl_Vec4 aAttachClip = aCameraProjMat * aAttachView; const OpenGl_Vec4 aAttachClip = aCameraProjMat * aAttachView;
if (abs (aAttachClip.x()) > aAttachClip.w() if (abs( aAttachClip.x() ) > aAttachClip.w()
|| abs (aAttachClip.y()) > aAttachClip.w() || abs( aAttachClip.y() ) > aAttachClip.w()
|| abs (aAttachClip.z()) > aAttachClip.w()) || abs( aAttachClip.z() ) > aAttachClip.w())
{ {
return; return;
} }
@ -381,7 +448,7 @@ void GEOM_Annotation::OpenGl_Annotation::Render (const Handle(OpenGl_Workspace)&
// ------------------------------------------------------------- // -------------------------------------------------------------
// render text label in current persistence matrix and underline // render text label in current persistence matrix and underline
// ------------------------------------------------------------- // -------------------------------------------------------------
myTextDraw->Render (theWorkspace); myTextDraw->Render( theWorkspace );
// ---------------------------------------------- // ----------------------------------------------
// render underline in current persistence matrix // render underline in current persistence matrix
@ -389,31 +456,31 @@ void GEOM_Annotation::OpenGl_Annotation::Render (const Handle(OpenGl_Workspace)&
const bool toHighlight = theWorkspace->ToHighlight(); const bool toHighlight = theWorkspace->ToHighlight();
if (toHighlight && myAISObject->myHilightMode == HighlightLabel) if (toHighlight && myAISObject->myHilightMode == HighlightLabel)
{ {
theWorkspace->SetHighlight (false); theWorkspace->SetHighlight( false );
theWorkspace->ApplyAspectLine(); theWorkspace->ApplyAspectLine();
} }
myTextLineDraw->Render (theWorkspace); myTextLineDraw->Render( theWorkspace );
// ------------------------------------------------------------ // ------------------------------------------------------------
// render dynamic extension line using synthetic transformation // render dynamic extension line using synthetic transformation
// ------------------------------------------------------------ // ------------------------------------------------------------
const OpenGl_Mat4& aViewMat = aContext->WorldViewState.Current(); const OpenGl_Mat4& aViewMat = aContext->WorldViewState.Current();
const OpenGl_Vec4 aHingeView = aViewMat * OpenGl_Vec4 (0.0f, myTextLineY, 0.0f, 1.0f); const OpenGl_Vec4 aHingeView = aViewMat * OpenGl_Vec4( 0.0f, myTextLineY, 0.0f, 1.0f );
// prepare matrix to specify geometry of extension line in view space // prepare matrix to specify geometry of extension line in view space
// by multiplication of unit z coordinate vector on given matrix. // by multiplication of unit z coordinate vector on given matrix.
OpenGl_Mat4 aExtGeometryMat; OpenGl_Mat4 aExtGeometryMat;
aExtGeometryMat.SetColumn (2, aAttachView - aHingeView); aExtGeometryMat.SetColumn( 2, aAttachView - aHingeView );
aExtGeometryMat.SetColumn (3, aHingeView); aExtGeometryMat.SetColumn( 3, aHingeView );
aContext->ModelWorldState.Push(); aContext->ModelWorldState.Push();
aContext->ModelWorldState.SetIdentity(); aContext->ModelWorldState.SetIdentity();
aContext->WorldViewState.Push(); aContext->WorldViewState.Push();
aContext->WorldViewState.SetCurrent (aExtGeometryMat); aContext->WorldViewState.SetCurrent( aExtGeometryMat );
aContext->ApplyModelViewMatrix(); aContext->ApplyModelViewMatrix();
myExtLineDraw->Render (theWorkspace); myExtLineDraw->Render( theWorkspace );
myExtMarkerDraw->Render (theWorkspace); myExtMarkerDraw->Render( theWorkspace );
aContext->ModelWorldState.Pop(); aContext->ModelWorldState.Pop();
aContext->WorldViewState.Pop(); aContext->WorldViewState.Pop();
@ -421,6 +488,7 @@ void GEOM_Annotation::OpenGl_Annotation::Render (const Handle(OpenGl_Workspace)&
if (toHighlight != theWorkspace->ToHighlight()) if (toHighlight != theWorkspace->ToHighlight())
{ {
theWorkspace->SetHighlight (toHighlight); theWorkspace->SetHighlight( toHighlight );
} }
} }

75
src/OBJECT/GEOM_Annotation.hxx
View File

@ -34,8 +34,6 @@
#include <NCollection_Handle.hxx> #include <NCollection_Handle.hxx>
#include <NCollection_String.hxx> #include <NCollection_String.hxx>
#include <OpenGl_Element.hxx> #include <OpenGl_Element.hxx>
#include <OpenGl_PrimitiveArray.hxx>
#include <OpenGl_Text.hxx>
#include <OpenGl_TextParam.hxx> #include <OpenGl_TextParam.hxx>
#include <Prs3d_Presentation.hxx> #include <Prs3d_Presentation.hxx>
#include <Prs3d_LineAspect.hxx> #include <Prs3d_LineAspect.hxx>
@ -44,6 +42,10 @@
#include <SelectMgr_EntityOwner.hxx> #include <SelectMgr_EntityOwner.hxx>
#include <TCollection_ExtendedString.hxx> #include <TCollection_ExtendedString.hxx>
class OpenGl_GraphicDriver;
class OpenGl_PrimitiveArray;
class OpenGl_Text;
/*! /*!
* \class GEOM_Annotation * \class GEOM_Annotation
* \brief Interactive object, representating annotation entity * \brief Interactive object, representating annotation entity
@ -52,7 +54,7 @@ class GEOM_Annotation : public AIS_InteractiveObject
{ {
public: public:
DEFINE_STANDARD_RTTIEXT (GEOM_Annotation, AIS_InteractiveObject) DEFINE_STANDARD_RTTIEXT( GEOM_Annotation, AIS_InteractiveObject )
//! Enumerates supported highlighting modes. //! Enumerates supported highlighting modes.
//! - HighlightAll : all elements of the annotation are highlighted. //! - HighlightAll : all elements of the annotation are highlighted.
@ -73,7 +75,7 @@ public:
//! Sets annotation text string. //! Sets annotation text string.
//! \param theText [in] the string displayed in annotation label. //! \param theText [in] the string displayed in annotation label.
Standard_EXPORT void SetText (const TCollection_ExtendedString& theText); Standard_EXPORT void SetText( const TCollection_ExtendedString& theText );
//! Returns annotation text string. //! Returns annotation text string.
const TCollection_ExtendedString& GetText() const { return myText; } const TCollection_ExtendedString& GetText() const { return myText; }
@ -84,7 +86,7 @@ public:
//! (\sa SetScreenFixed) the position is defined as {x,y} pixel coordinate //! (\sa SetScreenFixed) the position is defined as {x,y} pixel coordinate
//! of window space, otherwise 3D point defined in world's coordinate system //! of window space, otherwise 3D point defined in world's coordinate system
//! is used. //! is used.
Standard_EXPORT void SetPosition (const gp_Pnt& thePosition); Standard_EXPORT void SetPosition( const gp_Pnt& thePosition );
//! Returns position of the annotation text label. //! Returns position of the annotation text label.
const gp_Pnt& GetPosition() const { return myPosition; } const gp_Pnt& GetPosition() const { return myPosition; }
@ -93,7 +95,7 @@ public:
//! is fixed at predefined pixel location in the window coordinate space. Other mode //! is fixed at predefined pixel location in the window coordinate space. Other mode
//! is "3D screen aligned" positioning, when the label is aligned in plane of the //! is "3D screen aligned" positioning, when the label is aligned in plane of the
//! screen, while its position is a 3D point defined in world's coordinate system. //! screen, while its position is a 3D point defined in world's coordinate system.
Standard_EXPORT void SetScreenFixed (const Standard_Boolean theIsFixed); Standard_EXPORT void SetScreenFixed( const Standard_Boolean theIsFixed );
//! Retuns value of "screen fixed" positioning mode. //! Retuns value of "screen fixed" positioning mode.
Standard_Boolean GetIsScreenFixed() const { return myIsScreenFixed; } Standard_Boolean GetIsScreenFixed() const { return myIsScreenFixed; }
@ -101,7 +103,7 @@ public:
//! Sets attachment point of extension line. //! Sets attachment point of extension line.
//! \param thePoint [in] the 3D cartesian point defined in world's coordinate system //! \param thePoint [in] the 3D cartesian point defined in world's coordinate system
//! (a point on annotated geometry). //! (a point on annotated geometry).
Standard_EXPORT void SetAttachPoint (const gp_Pnt& thePoint); Standard_EXPORT void SetAttachPoint( const gp_Pnt& thePoint );
//! Returns attachment point of extension line. //! Returns attachment point of extension line.
const gp_Pnt& GetAttachPoint() const { return myAttach; } const gp_Pnt& GetAttachPoint() const { return myAttach; }
@ -109,64 +111,81 @@ public:
public: public:
//! Sets color for the presentation. //! Sets color for the presentation.
Standard_EXPORT virtual void SetColor (const Quantity_Color& theColor) Standard_OVERRIDE; Standard_EXPORT virtual void SetColor( const Quantity_Color& theColor ) Standard_OVERRIDE;
//! Sets text color.
Standard_EXPORT void SetTextColor( const Quantity_Color& theColor );
//! Returns color for the text's label. //! Returns color for the text's label.
Quantity_Color GetColor() const { return myDrawer->TextAspect()->Aspect()->Color(); } Quantity_Color GetTextColor() const { return myDrawer->TextAspect()->Aspect()->Color(); }
//! Sets line's color.
Standard_EXPORT void SetLineColor( const Quantity_Color& theColor);
//! Returns color for the connection line.
Quantity_Color GetLineColor() const { return myDrawer->LineAspect()->Aspect()->Color(); }
//! Sets text height in pixels. //! Sets text height in pixels.
Standard_EXPORT void SetTextHeight (const Standard_Real theHeight); Standard_EXPORT void SetTextHeight( const Standard_Real theHeight );
//! Returns text's height in pixels. //! Returns text's height in pixels.
Standard_Real GetTextHeight() const { return myDrawer->TextAspect()->Height(); } Standard_Real GetTextHeight() const { return myDrawer->TextAspect()->Height(); }
//! Sets font aspect for label. //! Sets font aspect for label.
Standard_EXPORT void SetFontAspect (const Font_FontAspect theFontAspect); Standard_EXPORT void SetFontAspect( const Font_FontAspect theFontAspect );
//! Returns label's font aspect. //! Returns label's font aspect.
Font_FontAspect GetFontAspect() const { return myDrawer->TextAspect()->Aspect()->GetTextFontAspect(); } Font_FontAspect GetFontAspect() const { return myDrawer->TextAspect()->Aspect()->GetTextFontAspect(); }
//! Sets font used for drawing the label. //! Sets font used for drawing the label.
Standard_EXPORT void SetFont (const TCollection_AsciiString& theFont); Standard_EXPORT void SetFont( const TCollection_AsciiString& theFont );
//! Returns font used for drawing the label. //! Returns font used for drawing the label.
TCollection_AsciiString GetFont() const { return myDrawer->TextAspect()->Aspect()->Font(); } TCollection_AsciiString GetFont() const { return myDrawer->TextAspect()->Aspect()->Font(); }
//! Sets line width to be used for drawing the annotation's extension line and underline. //! Sets line width to be used for drawing the annotation's extension line and underline.
Standard_EXPORT void SetLineWidth (const Standard_Real theLineWidth); Standard_EXPORT void SetLineWidth( const Standard_Real theLineWidth );
//! Returns line width for drawing the annotation's extension line and underline. //! Returns line width for drawing the annotation's extension line and underline.
Standard_Real LineWidth() const { return myDrawer->LineAspect()->Aspect()->Width(); } Standard_Real GetLineWidth() const { return myDrawer->LineAspect()->Aspect()->Width(); }
//! Sets style of connection line.
Standard_EXPORT void SetLineStyle( const Aspect_TypeOfLine theStyle );
//! Retusn style of connection line.
Aspect_TypeOfLine GetLineStyle() const { return myDrawer->LineAspect()->Aspect()->Type(); }
//! Sets annotation auto-hiding option. //! Sets annotation auto-hiding option.
//! \param theIsEnable [in] the option flag. If passed true, the annotation //! \param theIsEnable [in] the option flag. If passed true, the annotation
//! will be automatically hidden in the view if the attachment point //! will be automatically hidden in the view if the attachment point
//! goes outside of the view. //! goes outside of the view.
void SetAutoHide (const Standard_Boolean theIsEnable) { myIsAutoHide = theIsEnable; } void SetAutoHide( const Standard_Boolean theIsEnable ) { myIsAutoHide = theIsEnable; }
//! Returns current state of the auto-hiding option. //! Returns current state of the auto-hiding option.
Standard_Boolean GetAutoHide() const { return myIsAutoHide; } Standard_Boolean GetAutoHide() const { return myIsAutoHide; }
//! Sets highlight mode used for display of presentation. //! Sets highlight mode used for display of presentation.
//! \param theMode [in] the one of the supported highlight modes. //! \param theMode [in] the one of the supported highlight modes.
void SetHighlightMode (const HighlightMode theMode) { myHilightMode = theMode; } void SetHighlightMode( const HighlightMode theMode ) { myHilightMode = theMode; }
//! Returns highlight mode //! Returns highlight mode
HighlightMode GetHilightMode() const { return myHilightMode; } HighlightMode GetHilightMode() const { return myHilightMode; }
private: private:
Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, void UpdatePersistence();
virtual void Compute( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
const Handle(Prs3d_Presentation)& thePresentation, const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode = 0) Standard_OVERRIDE; const Standard_Integer theMode = 0 ) Standard_OVERRIDE;
Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, virtual void ComputeSelection( const Handle(SelectMgr_Selection)& theSelection,
const Standard_Integer theMode) Standard_OVERRIDE; const Standard_Integer theMode ) Standard_OVERRIDE;
virtual void SetLocalTransformation (const gp_Trsf& theTransformation) Standard_OVERRIDE {} virtual void SetLocalTransformation( const gp_Trsf& theTransformation ) Standard_OVERRIDE {}
virtual void SetTransformPersistence (const Graphic3d_TransModeFlags& theFlag, virtual void SetTransformPersistence( const Graphic3d_TransModeFlags& theFlag,
const gp_Pnt& thePoint = gp_Pnt (0.0, 0.0, 0.0)) Standard_OVERRIDE {} const gp_Pnt& thePoint = gp_Pnt (0.0, 0.0, 0.0) ) Standard_OVERRIDE {}
NCollection_Handle<Bnd_Box> TextBoundingBox() const; NCollection_Handle<Bnd_Box> TextBoundingBox() const;
@ -192,18 +211,18 @@ private:
//! \param theAnnotation [in] the instance of interactive presentation class. //! \param theAnnotation [in] the instance of interactive presentation class.
//! \param theTextHeight [in] the height of the text label. //! \param theTextHeight [in] the height of the text label.
//! \param theDriver [in] the instance of graphical driver required for initialization. //! \param theDriver [in] the instance of graphical driver required for initialization.
OpenGl_Annotation (GEOM_Annotation* theAnnotation, OpenGl_Annotation( GEOM_Annotation* theAnnotation,
const Standard_Integer theTextHeight, const Standard_Integer theTextHeight,
const OpenGl_GraphicDriver* theDriver); const OpenGl_GraphicDriver* theDriver );
//! Destructor. Releases GL resources with NULL context. //! Destructor. Releases GL resources with NULL context.
virtual ~OpenGl_Annotation(); virtual ~OpenGl_Annotation();
//! Releases GL resources with the given GL context. //! Releases GL resources with the given GL context.
virtual void Release (OpenGl_Context* theCtx) Standard_OVERRIDE; virtual void Release( OpenGl_Context* theCtx ) Standard_OVERRIDE;
//! Renders the annotation graphical elements. //! Renders the annotation graphical elements.
virtual void Render (const Handle(OpenGl_Workspace)& theWorkspace) const Standard_OVERRIDE; virtual void Render( const Handle(OpenGl_Workspace)& theWorkspace ) const Standard_OVERRIDE;
private: private:
@ -221,6 +240,6 @@ private:
friend class OpenGl_Annotation; // allow opengl element to get private data and invoke callback methods friend class OpenGl_Annotation; // allow opengl element to get private data and invoke callback methods
}; };
DEFINE_STANDARD_HANDLE (GEOM_Annotation, AIS_InteractiveObject) DEFINE_STANDARD_HANDLE( GEOM_Annotation, AIS_InteractiveObject )
#endif #endif

4
src/OBJECT/GEOM_Constants.cxx
View File

@ -104,7 +104,9 @@ namespace GEOM
// texture // texture
"Texture", // - "Texture", // -
// dimensions // dimensions
"Dimensions" // - "Dimensions", // -
// shape annotations
"ShapeAnnotations" // -
}; };
return ( type >= GEOM::Visibility && type <= GEOM::LastProperty ) ? names[type] : QString(); return ( type >= GEOM::Visibility && type <= GEOM::LastProperty ) ? names[type] : QString();
} }

3
src/OBJECT/GEOM_Constants.h
View File

@ -58,7 +58,8 @@ namespace GEOM
OutlineColor, OutlineColor,
Texture, Texture,
Dimensions, Dimensions,
LastProperty = Dimensions, ShapeAnnotations,
LastProperty = ShapeAnnotations,
}; };
GEOM_OBJECT_EXPORT double minDeflection(); GEOM_OBJECT_EXPORT double minDeflection();