View Issue Details

IDProjectCategoryView StatusLast Update
0030857Open CASCADEOCCT:Visualizationpublic2019-09-07 16:27
Reporternds Assigned Toapn  
PrioritynormalSeverityintegration request 
Status closedResolutionfixed 
Target Version7.4.0Fixed in Version7.4.0 
Summary0030857: Visualization - using one implementation of Text in graphic group
DescriptionThe expansion of Text() methods of Graphic3d_Group should last.

It's proposed to define a common structure for passing auxiliary parameters and Text representation modes, and replacing all Text() methods with single one (existing methods to be preserved for a while as deprecated redirections to new method).
TagsNo tags attached.
Test case numberNot needed

Relationships

related to 0030912 newvpozdyayev Visualization - OpenGl_Text with height less than 2 points 
related to 0030537 closednds Visualization - wrapping text in font text formatter 

Activities

git

2019-08-05 07:56

administrator   ~0086007

Branch CR30857 has been created by nds.

SHA-1: a3976f3355b7319135df2f99b41416d7cc5e79d1


Detailed log of new commits:

Author: nds
Date: Mon Aug 5 07:42:47 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction
    
    # Conflicts:
    # src/Graphic3d/Graphic3d_Group.cxx

git

2019-08-05 08:21

administrator   ~0086008

Branch CR30857 has been updated by nds.

SHA-1: 9e9042aa6854dffbfd878335f230bfbae1210f70


Detailed log of new commits:

Author: nds
Date: Mon Aug 5 08:18:54 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction

git

2019-08-06 07:22

administrator   ~0086020

Branch CR30857 has been updated by nds.

SHA-1: f3c7794de1c3c4c396b040f2156ae5a5c18b16f6


Detailed log of new commits:

Author: nds
Date: Tue Aug 6 07:20:08 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #compilation correction: Handle(Font_TextFormatter) will come with 0030537

git

2019-08-06 07:30

administrator   ~0086021

Branch CR30857_1 has been created by nds.

SHA-1: 8be0fd14000782ec652b3c496bfa72a7955a1b93


Detailed log of new commits:

Author: nds
Date: Mon Aug 5 07:42:47 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction

git

2019-08-07 09:01

administrator   ~0086043

Branch CR30857_2 has been created by nds.

SHA-1: 71868b94aa3fe32863281491c30a18b4bb868bef


Detailed log of new commits:

Author: nds
Date: Wed Aug 7 08:59:10 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction

nds

2019-08-07 12:39

developer   ~0086054

Dear Kirill,

please, review proposed modifications.

Job: http://jenkins-test-12.nnov.opencascade.com/view/CR30857-master-NDS/

Best regards, Natalia

kgv

2019-08-07 13:39

developer   ~0086056

Last edited: 2019-08-07 13:40

+  const NCollection_String& Text() const { return myText; }
...
+  //! Returns text orientation in 3D space.
+  const gp_Ax2& Orientation() const { return myOrientation; }
+
+  Graphic3d_HorizontalTextAlignment HAlignment() const { return myHAlign; }
+  Graphic3d_VerticalTextAlignment VAlignment() const { return myVAlign; }

Setters are missing.
It is better providing setters defining orientation/3d point/anchor logic independent from initialization of other common fields like text, alignment, etc. instead of confusing big Init() _almost_everything_ methods.


   //! Creates the string <theText> at orientation <theOrientation> in 3D space.
+  Standard_DEPRECATED("Deprecated method Text() with obsolete arguments, use AddText() instead of it")
   Standard_EXPORT virtual void Text (const TCollection_ExtendedString&       
... 
+  //! Adds a text for display
+  Standard_EXPORT virtual void AddText (const Handle(Graphic3d_TextParams)& theTextParams,
+                                        const Standard_Boolean theToEvalMinMax = Standard_True);

Please move deprecated Text() methods to dedicated "public:" section at the end of class.

+  Graphic3d_Vertex myPoint;

It doesn't worth keep using this obsolete Graphic3d_Vertex class in new structures.
Please remove this field and store point inside gp_Ax2 field and use gp_Pnt for setters.

+  //! Creates the string <AText> at position <APoint>.
+  //! The 3D point of attachment is projected. The text is
+  //! written in the plane of projection.
+  //! The attributes are given with respect to the plane of
+  //! projection.
+  //! AHeight : Height of text.
+  //! (Relative to the Normalized Projection
+  //! Coordinates (NPC) Space).
+  //! AAngle  : Orientation of the text
+  //! (with respect to the horizontal).
+  Standard_EXPORT Graphic3d_TextParams (const Standard_Real theHeight);

Description does not match method.

+//! This class describes texture parameters.
+class Graphic3d_TextParams : public Standard_Transient

texture?
Graphic3d_TextParams does not look like a text parameters but more like Graphic3d_Text or Graphic3d_TextLabel.

nds

2019-08-07 14:09

developer   ~0086061

Last edited: 2019-08-07 14:10

Thank you for review.

It seems that OpenGl_TextParam in obsolete. What is your opinion, should it be removed in the current issue?

kgv

2019-08-07 14:20

developer   ~0086062

yes

git

2019-08-16 13:04

administrator   ~0086275

Branch CR30857_3 has been created by nds.

SHA-1: 4d6db8fb0ce0400c7fda670fad2a1abb044f9421


Detailed log of new commits:

Author: nds
Date: Fri Aug 16 13:01:41 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #issue remarks correction

git

2019-08-16 13:20

administrator   ~0086276

Branch CR30857_4 has been created by nds.

SHA-1: fff2d27b1124eac7848196539c88e3c4edf33929


Detailed log of new commits:

Author: nds
Date: Fri Aug 16 13:18:12 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction

git

2019-08-19 08:43

administrator   ~0086323

Branch CR30857_3 has been updated by nds.

SHA-1: f297c8e9b1b6c62be84f9c66935f4b5883794c3f


Detailed log of new commits:

Author: nds
Date: Thu Aug 15 13:17:18 2019 +0300

    0030901: Visualization - OSD_MemInfo moving memory computation out of the constructor
    
    (cherry picked from commit 0be11733a7d5caa8a2d3da244d189b8cf71fa945)

git

2019-08-20 09:43

administrator   ~0086350

Branch CR30857_4 has been updated by nds.

SHA-1: b90cd8862e2cc1d77f72ffccb15cc07ff6dddc27


Detailed log of new commits:

Author: nds
Date: Tue Aug 20 09:41:23 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #correction of warings on Linux, some minor code improve

git

2019-08-20 09:46

administrator   ~0086351

Branch CR30857_4 has been updated by nds.

SHA-1: 20388b4b481c2b4ee315d81c7ff33c3cc000291d


Detailed log of new commits:

Author: nds
Date: Tue Aug 20 09:43:32 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #correction of warings on Linux, some minor code improve

git

2019-08-20 10:15

administrator   ~0086352

Branch CR30857_5 has been created by nds.

SHA-1: db31a5fbbfa45e38b7f62d031e36b4c0fae5d832


Detailed log of new commits:

Author: nds
Date: Tue Aug 20 10:12:34 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    Graphic3d_Group::Text() are obsolete, AddText() should be used instead of these methods.
    Introduced new class Graphic3d_Text for parameters necessary to fill OpenGl_Text. All parameters of Graphic3d_Group::Text() are united in this class.
    
    OpenGl_Text constructors with direct position/orientation values are obsolete, constructor with Graphic3d_Text should be used here.
    OpenGl_TextParam is obsolete, using of it is not supported any more.

nds

2019-08-20 10:42

developer   ~0086355

Dear Kirill

remarks are corrected.
Please, check it once again.

kgv

2019-08-20 17:58

developer   ~0086375

+    aTextParams->SetPosition (gp_Pnt (aPlast.X(),aPlast.Y(),aPlast.Z()));

redundant conversion.

+//! More compilated formatting is available using Font_TextFormatter.
+//!
+class Graphic3d_Text : public Standard_Transien

Unexpected empty line in documentation.

+  //! Destructor.
+  Standard_EXPORT virtual ~Graphic3d_Text() {}

Inconsistent Standard_EXPORT for inline method.

+  //! Sets text value.
+  const NCollection_String& Text() const { return myText; }
+
+  //! Returns text value.
+  void SetText (const NCollection_String& theText) { myText = theText; }

Swapped description.

+  //! Sets text orientation in 3D space.
+  void SetOrientation (const gp_Ax2& theOrientation) { myOrientation = theOrientation; myHasPlane = Standard_True; }
+
+  //! Reset text orientation in 3D space.
+  void ResetOrientation() { myOrientation = gp_Ax2(); myHasPlane = Standard_False; }

Please split one-liners.

+  Handle(Font_TextFormatter) myTextFormatter; //!< text formatter collect information about text letter positions

collects.

+  NCollection_String myText; //!< text value
+  Handle(Font_TextFormatter) myTextFormatter; //!< text formatter collect information about text letter positions
+
+  bool myHasPlane; //!< Check if text have orientation in 3D space.
+  gp_Ax2 myOrientation; //!< Text orientation in 3D space.
+  Standard_Boolean myHasOwnAnchor; //!< flag if text uses position as point of attach
+
+  Standard_Real myHeight; //!< height of text
+  Graphic3d_HorizontalTextAlignment myHAlign; //!< horizontal alignment
+  Graphic3d_VerticalTextAlignment myVAlign; //!< vertical alignment

Please re-arrange fields by their size.

+#ifndef _Graphic3d_TextParams_HeaderFile
+#define _Graphic3d_TextParams_HeaderFile
...
+#endif // _Graphic3d_TextParams_HeaderFile

Should be updated.

+        aTextParams->SetText (aStr.ToCString());

Please add SetText() accepting TCollection_AsciiString.

-  aParams.Height = int ((theHeight < 2.0) ? aStruct->GlDriver()->DefaultTextHeight() : theHeight);
+  if (theTextParams->Height() < 2.0)
+    theTextParams->SetHeight (int (aStruct->GlDriver()->DefaultTextHeight()));

Please add TODO here - this should be handled in different way (throw exception / take default text height without modifying Graphic3d_Text / log warning, etc.).

+  Standard_EXPORT virtual void AddText (const Handle(Graphic3d_Text)& theTextParams,
+                                        const Standard_Boolean theToEvalMinMax = Standard_True) Standard_OVERRIDE;

Please skip default value for theToEvalMinMax in subclass.

  mutable GLdouble myExportHeight;

myExportHeight is used nowhere and can be removed.

+  Handle(Graphic3d_Text) myParams;

Should be first field.

  Standard_Boolean hasAnchorPoint() const { return myParams->HasOwnAnchorPoint() != Standard_False; }

Why "!= Standard_False"?

   theAttachmentPoint.Coord(x,y,z);
...
+  aTextParams->SetPosition (gp_Pnt (x,y,z));
...
+  aTextParams->SetPosition (gp_Pnt (pX.X(), pX.Y(), pX.Z()));
+  aTextParams->SetPosition (gp_Pnt (pY.X(), pY.Y(), pY.Z()));
+  aTextParams->SetPosition (gp_Pnt (pZ.X(), pZ.Y(), pZ.Z()));

Redundant conversion.

git

2019-08-22 07:54

administrator   ~0086391

Branch CR30857_5 has been updated by nds.

SHA-1: 5b550440db9bb671b1723ca8ec911bf89978a53b


Detailed log of new commits:

Author: nds
Date: Thu Aug 22 07:51:46 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    # remarks correction

git

2019-08-22 08:08

administrator   ~0086392

Branch CR30857_6 has been created by nds.

SHA-1: 79d29b2482fcce10418ef752d56e97d3ef08aa8a


Detailed log of new commits:

Author: nds
Date: Thu Aug 22 08:05:53 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    Graphic3d_Group::Text() are obsolete, AddText() should be used instead of these methods.
    Introduced new class Graphic3d_Text for parameters necessary to fill OpenGl_Text. All parameters of Graphic3d_Group::Text() are united in this class.
    
    OpenGl_Text constructors with direct position/orientation values are obsolete, constructor with Graphic3d_Text should be used here.
    OpenGl_TextParam is obsolete, using of it is not supported any more.

nds

2019-08-22 08:19

developer   ~0086393

Dear Kirill,

please, check the new branch for the issue.

Some remarks:
- Adding SetText(TCollection_AsciiString) gives errors if we do not cast (for example Standard_CString) to exact type (ambiguous call to overloaded function). Had I correctly understand your recoomendation - adding method, not replacing existing with NCollection_String?

- throwing an exception in if (theTextParams->Height() < 2.0) will give use different result in relation to the previous implementation. Do you validate it?

Best regards, Natalia

git

2019-08-22 08:44

administrator   ~0086395

Branch CR30857_6 has been updated by nds.

SHA-1: b398424dbbc56eed59dc32568aa91be65a766b59


Detailed log of new commits:

Author: nds
Date: Thu Aug 22 08:42:08 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    # warnings correction on Debian

git

2019-08-22 09:16

administrator   ~0086396

Branch CR30857_7 has been created by nds.

SHA-1: 20290962ca803b473eab988ace637b6f6c659a07


Detailed log of new commits:

Author: nds
Date: Thu Aug 22 09:13:20 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    Graphic3d_Group::Text() are obsolete, AddText() should be used instead of these methods.
    Introduced new class Graphic3d_Text for parameters necessary to fill OpenGl_Text. All parameters of Graphic3d_Group::Text() are united in this class.
    
    OpenGl_Text constructors with direct position/orientation values are obsolete, constructor with Graphic3d_Text should be used here.
    OpenGl_TextParam is obsolete, using of it is not supported any more.

nds

2019-08-22 09:16

developer   ~0086397

please, use CR30857_7

kgv

2019-08-22 10:14

developer   ~0086400

> - Adding SetText(TCollection_AsciiString) gives errors if we do not cast
> (for example Standard_CString) to exact type
> (ambiguous call to overloaded function).
> Had I correctly understand your recoomendation - adding method,
> not replacing existing with NCollection_String?
Ideally, NCollection_String/TCollection_AsciiString usage should become transparent to user, but this would be possible only after 0025308.

The proposed change is based on understanding that majority of OCCT users would use TCollection_AsciiString for manipulating strings instead of NCollection_String - so that this use case (TCollection_AsciiString input) should be more straightforward to user. At the same time, formatter uses NCollection_String also for concatenating final string, so that changing it's logic to use TCollection_AsciiString is probably suboptimal.

I see that just adding SetText with TCollection_AsciiString argument would lead to ambiguity for "const char*" input. So that to workaround it you'll have to add also SetText() with "const char*" input redirecting to NCollection_String.

> - throwing an exception in if (theTextParams->Height() < 2.0)
> will give use different result in relation to the previous implementation.
> Do you validate it?
For the moment, I do not propose changing behavior but to add TODO for another bug.
The question here is to identify why the code using DefaultTextHeight() has been introduced in the first place and where this scenario is currently used to decide how to solve the issue smoothly.

git

2019-08-22 11:34

administrator   ~0086405

Branch CR30857_7 has been updated by nds.

SHA-1: 54eefe57326750995ecef4663e83b3408ce5e371


Detailed log of new commits:

Author: nds
Date: Thu Aug 22 11:32:02 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    # remarks correction

git

2019-08-22 11:43

administrator   ~0086406

Branch CR30857_8 has been created by nds.

SHA-1: e3e22703f1a4b22144eacfe156350d234cb4b290


Detailed log of new commits:

Author: nds
Date: Thu Aug 22 11:40:29 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    Graphic3d_Group::Text() are obsolete, AddText() should be used instead of these methods.
    Introduced new class Graphic3d_Text for parameters necessary to fill OpenGl_Text. All parameters of Graphic3d_Group::Text() are united in this class.
    
    OpenGl_Text constructors with direct position/orientation values are obsolete, constructor with Graphic3d_Text should be used here.
    OpenGl_TextParam is obsolete, using of it is not supported any more.

nds

2019-08-22 11:52

developer   ~0086407

Corrected.

git

2019-08-22 13:58

administrator   ~0086414

Branch CR30857_8 has been updated by nds.

SHA-1: 8e67f13de1fa25c06937ef40f1dbe9fe7a49f2b4


Detailed log of new commits:

Author: nds
Date: Thu Aug 22 13:56:16 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #remarks correction

git

2019-08-22 15:27

administrator   ~0086415

Branch CR30857_8 has been updated by nds.

SHA-1: 3757748147b517fd92f0ed92b2c66fddc1b09ce2


Detailed log of new commits:

Author: nds
Date: Thu Aug 22 15:25:12 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #remarks correction - Init with text parameters is obsolete

git

2019-08-22 15:43

administrator   ~0086416

Branch CR30857_9 has been created by nds.

SHA-1: 34bb2e7283c4859272b08416c744718e2abb5b69


Detailed log of new commits:

Author: nds
Date: Thu Aug 22 15:41:07 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    Graphic3d_Group::Text() are obsolete, AddText() should be used instead of these methods.
    Introduced new class Graphic3d_Text for parameters necessary to fill OpenGl_Text. All parameters of Graphic3d_Group::Text() are united in this class.
    
    OpenGl_Text constructors with direct position/orientation values are obsolete, constructor with Graphic3d_Text should be used here.
    OpenGl_TextParam is obsolete, using of it is not supported any more.

git

2019-08-23 07:39

administrator   ~0086425

Branch CR30857_9 has been updated by nds.

SHA-1: 02cb51014ccdf1321aa4594fc040ee318e6f2707


Detailed log of new commits:

Author: nds
Date: Fri Aug 23 07:37:13 2019 +0300

    0030537: Visualization - wrapping text in font text formatter
    
    # remarks correction.

git

2019-08-23 08:10

administrator   ~0086426

Branch CR30857_10 has been created by nds.

SHA-1: cb1e0fb1e05d362bdffb39a465f287e1cc6e9a68


Detailed log of new commits:

Author: nds
Date: Fri Aug 23 08:07:40 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    Graphic3d_Group::Text(...) are obsolete, AddText() should be used instead of these methods.
    Graphic3d_Text is a new class for parameters necessary to fill OpenGl_Text. All parameters of Graphic3d_Group::Text() are moved into this class.
    
    OpenGl_TextParam is removed, these fields were moved into Graphic3d_Text.
    OpenGl_Text constructors/Init with OpenGl_TextParam parameter were removed. Constructor with Graphic3d_Text should be used instead of it.
    Using OpenGl_Text Init() with OpenGl_TextParam should be now replaced on two cases. The first case is setting values into Graphic3d_Text and the second case is calling Reset() after. As example, look at modification in OpenGl_FrameStatsPrs.

nds

2019-08-23 09:28

developer   ~0086428

Dear Kirill,

it is corrected, please review.
Jenkins Job: http://jenkins-test-12.nnov.opencascade.com/view/CR30857-master-NDS/

Best regards, Natalia

git

2019-08-23 13:55

administrator   ~0086433

Branch CR30857_10 has been updated by nds.

SHA-1: fd28303c4f8e375856cef568455d94d5fd2de7ad


Detailed log of new commits:

Author: nds
Date: Fri Aug 23 13:52:33 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #remarks correction.

git

2019-08-23 13:58

administrator   ~0086434

Branch CR30857_10 has been updated by nds.

SHA-1: 52fc7d1b35bdd879c84b0245719fcac93a26d09a


Detailed log of new commits:

Author: nds
Date: Fri Aug 23 13:55:50 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #remarks correction.

git

2019-08-23 14:26

administrator   ~0086436

Branch CR30857_10 has been updated by nds.

SHA-1: a5f4bd9ed387a77b462dc51aacec0ec17e97a162


Detailed log of new commits:

Author: nds
Date: Fri Aug 23 14:23:23 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #remarks correction.

git

2019-08-23 14:30

administrator   ~0086437

Branch CR30857_11 has been created by nds.

SHA-1: f1fe21a5ff907fbfc68ac3e7808543cf92956e95


Detailed log of new commits:

Author: nds
Date: Fri Aug 23 14:28:04 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    Graphic3d_Group::Text(...) are obsolete, AddText() should be used instead of these methods.
    Graphic3d_Text is a new class for parameters necessary to fill OpenGl_Text. All parameters of Graphic3d_Group::Text() are moved into this class.
    
    OpenGl_TextParam is removed, these fields were moved into Graphic3d_Text.
    OpenGl_Text constructors/Init with OpenGl_TextParam parameter were removed. Constructor with Graphic3d_Text should be used instead of it.
    Using OpenGl_Text Init() with OpenGl_TextParam should be now replaced on two cases. The first case is setting values into Graphic3d_Text and the second case is calling Reset() after. As example, look at modification in OpenGl_FrameStatsPrs.

nds

2019-08-23 14:45

developer   ~0086438

Dear Kirill,

Remarks are corrected.
The same job is started.

Best regards, Natalia

apn

2019-08-23 16:54

administrator   ~0086440

Combination -
OCCT branch : CR30857_11
master SHA - f1fe21a5ff907fbfc68ac3e7808543cf92956e95
5f5b1aed1c6e139bbd34314eca77ae7abcd8895c
Products branch : master SHA - 32e882a7b3145a66baa739f965d275c822c0bd8a
was compiled on Linux, MacOS and Windows platforms and tested in optimize mode.

Number of compiler warnings:
No new/fixed warnings

Regressions/Differences/Improvements:
No regressions/differences

CPU differences:
Debian80-64:
OCCT
Total CPU difference: 16079.660000000105 / 16105.290000000065 [-0.16%]
Products
Total CPU difference: 10477.77000000006 / 10484.700000000048 [-0.07%]
Windows-64-VC14:
OCCT
Total CPU difference: 18284.6875 / 18149.296875 [+0.75%]
Products
Total CPU difference: 12046.4375 / 12045.34375 [+0.01%]

Image differences :
No differences that require special attention

Memory differences :
No differences that require special attention

git

2019-08-24 15:22

administrator   ~0086442

Branch CR30857_3 has been updated by nds.

SHA-1: 25249e8ba2fcdfc227104a5956de0286e13e4d95


Detailed log of new commits:

Author: nds
Date: Sat Aug 24 15:20:07 2019 +0300

    0029451: Information Message Alert to debug an algorithm or object functionality
    
    Dump/Init implementation in OCCT object and parsing it in VInspector (partially)

git

2019-08-24 15:24

administrator   ~0086443

Branch CR30857_3 has been updated by nds.

SHA-1: 04e4f19865647cbc1c40d4c1e85148435b117786


Detailed log of new commits:

Author: nds
Date: Thu Aug 15 13:17:18 2019 +0300

    0030901: Visualization - OSD_MemInfo moving memory computation out of the constructor
    
    (cherry picked from commit 0be11733a7d5caa8a2d3da244d189b8cf71fa945)
    (cherry picked from commit 5d3749315adf89005acb89158cbd2248d9a87df5)

git

2019-09-02 18:00

administrator   ~0086636

Branch CR30857 has been deleted by apn.

SHA-1: f3c7794de1c3c4c396b040f2156ae5a5c18b16f6

git

2019-09-02 18:00

administrator   ~0086637

Branch CR30857_1 has been deleted by apn.

SHA-1: 8be0fd14000782ec652b3c496bfa72a7955a1b93

git

2019-09-02 18:00

administrator   ~0086638

Branch CR30857_2 has been deleted by apn.

SHA-1: 71868b94aa3fe32863281491c30a18b4bb868bef

git

2019-09-02 18:00

administrator   ~0086639

Branch CR30857_3 has been deleted by apn.

SHA-1: 04e4f19865647cbc1c40d4c1e85148435b117786

git

2019-09-02 18:00

administrator   ~0086640

Branch CR30857_4 has been deleted by apn.

SHA-1: 20388b4b481c2b4ee315d81c7ff33c3cc000291d

git

2019-09-02 18:00

administrator   ~0086641

Branch CR30857_5 has been deleted by apn.

SHA-1: 5b550440db9bb671b1723ca8ec911bf89978a53b

git

2019-09-02 18:00

administrator   ~0086642

Branch CR30857_6 has been deleted by apn.

SHA-1: b398424dbbc56eed59dc32568aa91be65a766b59

git

2019-09-02 18:01

administrator   ~0086643

Branch CR30857_7 has been deleted by apn.

SHA-1: 54eefe57326750995ecef4663e83b3408ce5e371

git

2019-09-02 18:01

administrator   ~0086644

Branch CR30857_8 has been deleted by apn.

SHA-1: 3757748147b517fd92f0ed92b2c66fddc1b09ce2

git

2019-09-02 18:01

administrator   ~0086645

Branch CR30857_9 has been deleted by apn.

SHA-1: 02cb51014ccdf1321aa4594fc040ee318e6f2707

git

2019-09-02 18:01

administrator   ~0086646

Branch CR30857_10 has been deleted by apn.

SHA-1: a5f4bd9ed387a77b462dc51aacec0ec17e97a162

git

2019-09-02 18:01

administrator   ~0086647

Branch CR30857_11 has been deleted by apn.

SHA-1: f1fe21a5ff907fbfc68ac3e7808543cf92956e95

git

2019-09-04 00:52

administrator   ~0086708

Branch CR30857_3 has been created by nds.

SHA-1: 3a8ba84200bb4402ef38e1889ed7072b24dce42f


Detailed log of new commits:

Author: nds
Date: Wed Sep 4 00:49:54 2019 +0300

    0030791: Visualization - possibility to display materials by different hatching style for clipping
    
    # move capping style from presentation into drawer
    # crash in capping by setting projection as
    # several hatch templates

Author: nds
Date: Fri Aug 16 13:01:41 2019 +0300

    0030857: Visualization - using one implementation of Text in graphic group - warnings correction - merge correction
    
    #issue remarks correction

git

2019-09-07 16:27

administrator   ~0086939

Branch CR30857_3 has been deleted by inv.

SHA-1: 3a8ba84200bb4402ef38e1889ed7072b24dce42f

Related Changesets

occt: master 8ed07085

2019-08-23 11:28:04

nds


Committer: apn Details Diff
0030857: Visualization - using one implementation of Text in graphic group

Graphic3d_Group::Text(...) are obsolete, AddText() should be used instead of these methods.
Graphic3d_Text is a new class for parameters necessary to fill OpenGl_Text. All parameters of Graphic3d_Group::Text() are moved into this class.

OpenGl_TextParam is removed, these fields were moved into Graphic3d_Text.
OpenGl_Text constructors/Init with OpenGl_TextParam parameter were removed. Constructor with Graphic3d_Text should be used instead of it.
Using OpenGl_Text Init() with OpenGl_TextParam should be now replaced on two cases. The first case is setting values into Graphic3d_Text and the second case is calling Reset() after. As example, look at modification in OpenGl_FrameStatsPrs.
Affected Issues
0030857
mod - dox/dev_guides/upgrade/upgrade.md Diff File
mod - src/AIS/AIS_ColorScale.cxx Diff File
mod - src/DsgPrs/DsgPrs_XYZAxisPresentation.cxx Diff File
mod - src/Graphic3d/FILES Diff File
mod - src/Graphic3d/Graphic3d_Group.cxx Diff File
mod - src/Graphic3d/Graphic3d_Group.hxx Diff File
add - src/Graphic3d/Graphic3d_Text.cxx Diff File
add - src/Graphic3d/Graphic3d_Text.hxx Diff File
mod - src/MeshVS/MeshVS_TextPrsBuilder.cxx Diff File
mod - src/OpenGl/FILES Diff File
mod - src/OpenGl/OpenGl_FrameStatsPrs.cxx Diff File
mod - src/OpenGl/OpenGl_GraduatedTrihedron.cxx Diff File
mod - src/OpenGl/OpenGl_GraphicDriver.cxx Diff File
mod - src/OpenGl/OpenGl_Group.cxx Diff File
mod - src/OpenGl/OpenGl_Group.hxx Diff File
mod - src/OpenGl/OpenGl_Text.cxx Diff File
mod - src/OpenGl/OpenGl_Text.hxx Diff File
rm - src/OpenGl/OpenGl_TextParam.hxx Diff File
mod - src/OpenGl/OpenGl_Workspace.hxx Diff File
mod - src/Prs3d/Prs3d_Text.cxx Diff File
mod - src/V3d/V3d_Viewer.cxx Diff File

Issue History

Date Modified Username Field Change
2019-08-02 08:39 nds New Issue
2019-08-02 08:39 nds Assigned To => kgv
2019-08-02 08:40 nds Relationship added related to 0030537
2019-08-05 07:56 git Note Added: 0086007
2019-08-05 08:21 git Note Added: 0086008
2019-08-06 07:22 git Note Added: 0086020
2019-08-06 07:30 git Note Added: 0086021
2019-08-06 09:40 nds Assigned To kgv => nds
2019-08-07 09:01 git Note Added: 0086043
2019-08-07 12:39 nds Note Added: 0086054
2019-08-07 12:39 nds Assigned To nds => kgv
2019-08-07 12:39 nds Status new => resolved
2019-08-07 13:39 kgv Note Added: 0086056
2019-08-07 13:40 kgv Note Edited: 0086056
2019-08-07 14:09 nds Note Added: 0086061
2019-08-07 14:10 nds Note Edited: 0086061
2019-08-07 14:20 kgv Note Added: 0086062
2019-08-13 13:25 kgv Assigned To kgv => nds
2019-08-13 13:25 kgv Status resolved => assigned
2019-08-16 13:04 git Note Added: 0086275
2019-08-16 13:20 git Note Added: 0086276
2019-08-19 08:43 git Note Added: 0086323
2019-08-20 09:43 git Note Added: 0086350
2019-08-20 09:46 git Note Added: 0086351
2019-08-20 10:15 git Note Added: 0086352
2019-08-20 10:42 nds Note Added: 0086355
2019-08-20 10:42 nds Assigned To nds => kgv
2019-08-20 10:42 nds Status assigned => resolved
2019-08-20 17:58 kgv Note Added: 0086375
2019-08-20 17:58 kgv Assigned To kgv => nds
2019-08-20 17:58 kgv Status resolved => assigned
2019-08-22 07:54 git Note Added: 0086391
2019-08-22 08:08 git Note Added: 0086392
2019-08-22 08:19 nds Note Added: 0086393
2019-08-22 08:19 nds Assigned To nds => kgv
2019-08-22 08:19 nds Status assigned => resolved
2019-08-22 08:44 git Note Added: 0086395
2019-08-22 09:16 git Note Added: 0086396
2019-08-22 09:16 nds Note Added: 0086397
2019-08-22 10:14 kgv Note Added: 0086400
2019-08-22 10:14 kgv Assigned To kgv => nds
2019-08-22 10:14 kgv Status resolved => assigned
2019-08-22 11:12 nds Relationship added related to 0030912
2019-08-22 11:34 git Note Added: 0086405
2019-08-22 11:43 git Note Added: 0086406
2019-08-22 11:52 nds Note Added: 0086407
2019-08-22 11:52 nds Assigned To nds => kgv
2019-08-22 11:52 nds Status assigned => resolved
2019-08-22 13:12 kgv Assigned To kgv => nds
2019-08-22 13:12 kgv Status resolved => assigned
2019-08-22 13:58 git Note Added: 0086414
2019-08-22 15:27 git Note Added: 0086415
2019-08-22 15:43 git Note Added: 0086416
2019-08-23 07:39 git Note Added: 0086425
2019-08-23 08:10 git Note Added: 0086426
2019-08-23 09:28 nds Note Added: 0086428
2019-08-23 09:28 nds Assigned To nds => kgv
2019-08-23 09:28 nds Status assigned => resolved
2019-08-23 11:51 kgv Assigned To kgv => nds
2019-08-23 11:51 kgv Status resolved => assigned
2019-08-23 13:55 git Note Added: 0086433
2019-08-23 13:58 git Note Added: 0086434
2019-08-23 14:26 git Note Added: 0086436
2019-08-23 14:30 git Note Added: 0086437
2019-08-23 14:45 nds Note Added: 0086438
2019-08-23 14:45 nds Assigned To nds => kgv
2019-08-23 14:45 nds Status assigned => resolved
2019-08-23 14:55 kgv Assigned To kgv => bugmaster
2019-08-23 14:55 kgv Severity minor => integration request
2019-08-23 14:55 kgv Status resolved => reviewed
2019-08-23 16:54 apn Test case number => Not needed
2019-08-23 16:54 apn Note Added: 0086440
2019-08-23 16:54 apn Status reviewed => tested
2019-08-24 15:22 git Note Added: 0086442
2019-08-24 15:24 git Note Added: 0086443
2019-08-24 16:56 apn Changeset attached => occt master 8ed07085
2019-08-24 16:56 apn Assigned To bugmaster => apn
2019-08-24 16:56 apn Status tested => verified
2019-08-24 16:56 apn Resolution open => fixed
2019-09-02 18:00 git Note Added: 0086636
2019-09-02 18:00 git Note Added: 0086637
2019-09-02 18:00 git Note Added: 0086638
2019-09-02 18:00 git Note Added: 0086639
2019-09-02 18:00 git Note Added: 0086640
2019-09-02 18:00 git Note Added: 0086641
2019-09-02 18:00 git Note Added: 0086642
2019-09-02 18:01 git Note Added: 0086643
2019-09-02 18:01 git Note Added: 0086644
2019-09-02 18:01 git Note Added: 0086645
2019-09-02 18:01 git Note Added: 0086646
2019-09-02 18:01 git Note Added: 0086647
2019-09-04 00:52 git Note Added: 0086708
2019-09-07 16:27 git Note Added: 0086939