kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: Make SoDatumLabel constraints more interactable (#21920)

Browse Source 
* Sketcher: Make distance constraint more interactable

As the title says, this patch aligns selectability to what we actually
draw, so from now on extension lines and arrowheads will be also
selectable.

* Sketcher: Make radius/diameter constraint more interactable

* Sketcher: Make angle constraint more interactable

* Sketcher: Make symmetric constraint more interactable

* Sketcher: Make ArcLength constraint more interactable
This commit is contained in:
Kacper Donat
2025-08-03 22:04:59 +02:00
committed by GitHub
parent 1299b3eb9f 44b3686459
commit 481b5d644b
2 changed files with 905 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1458
src/Gui/SoDatumLabel.cpp
View File

File diff suppressed because it is too large Load Diff

90
src/Gui/SoDatumLabel.h
View File

@@ -45,6 +45,8 @@ class GuiExport SoDatumLabel : public SoShape {
SO_NODE_HEADER(SoDatumLabel);
friend class DatumLabelBox;
public:
enum Type
{
@@ -96,6 +98,84 @@ protected:
void notify(SoNotList * l) override;
private:
struct DistanceGeometry {
SbVec3f p1, p2; // main points used for measurement
SbVec3f dir, normal; // dir and normal vecs
SbVec3f midpos; // mid pt
SbVec3f perp1, perp2; // ext line endpts
SbVec3f par1, par2, par3, par4; // dim line pts
SbVec3f ar1, ar2; // 1st arrow head triang pts
SbVec3f ar3, ar4; // 2nd arrow head triang pts
float angle; // text angle
SbVec3f textOffset; // text pos
bool flipTriang; // check for arrow flipping
float margin; // margin for arrow calcs
float arrowWidth; // width of the arrow
};
struct DiameterGeometry {
SbVec3f p1, p2; // main points (center and edge for radius, endpoints for diameter)
SbVec3f center; // center point
SbVec3f dir, normal; // direction and normal vectors
SbVec3f pos; // text position base
SbVec3f pnt1, pnt2; // line segment points around text
SbVec3f ar0, ar1, ar2; // first arrow head triangle points
SbVec3f ar0_1, ar1_1, ar2_1; // second arrow head triangle points (diameter only)
float angle; // text angle
SbVec3f textOffset; // text position
float radius; // radius value
float margin; // margin for calculations
float arrowWidth; // arrow width
bool isDiameter; // true for diameter, false for radius
// Arc helper parameters
float startAngle, startRange; // start parameters
float endAngle, endRange; // start parameters
};
struct AngleGeometry {
SbVec3f p0; // angle intersection point
SbVec3f v0; // vector for text position
SbVec3f v1, v2; // direction vectors for start and end lines
SbVec3f pnt1, pnt2, pnt3, pnt4; // line endpoints
SbVec3f startArrowBase, endArrowBase; // arrow base points
SbVec3f dirStart, dirEnd; // arrow directions
float angle; // text angle (always 0 for angles)
SbVec3f textOffset; // text position
float length; // length parameter
float startangle, endangle, range; // angle parameters
float r; // arc radius
float margin; // margin for calculations
float arrowLength, arrowWidth; // arrow dimensions
double textMargin; // margin around text in arc
float endLineLength1, endLineLength2; // extension line lengths
float endLineLength12, endLineLength22; // extension line lengths (other side)
};
struct SymmetricGeometry {
SbVec3f p1, p2; // main points
SbVec3f dir, normal; // direction and normal vectors
SbVec3f ar0, ar1, ar2; // first arrow triangle points (tip, base1, base2)
SbVec3f ar3, ar4, ar5; // second arrow triangle points (tip, base1, base2)
float margin; // margin for calculations
};
struct ArcLengthGeometry {
SbVec3f ctr, p1, p2;
float length;
float margin;
float startangle, endangle;
float range;
float radius;
SbVec3f vm; // middle direction vector
SbVec3f pnt1, pnt2, pnt3, pnt4; // line endpoints
SbVec3f dirStart, dirEnd; // arrow directions
SbVec3f textOffset;
float angle;
bool isLargeArc; // whether range > pi
SbVec3f arcCenter; // center for arc drawing
float arcRadius; // radius for arc drawing
};
float getScaleFactor(SoState*) const;
void generateDistancePrimitives(SoAction * action, const SbVec3f&, const SbVec3f&);
void generateDiameterPrimitives(SoAction * action, const SbVec3f&, const SbVec3f&);
@@ -105,9 +185,17 @@ private:
SbVec3f getLabelTextCenterDistance(const SbVec3f&, const SbVec3f&);
SbVec3f getLabelTextCenterDiameter(const SbVec3f&, const SbVec3f&);
SbVec3f getLabelTextCenterAngle(const SbVec3f&);
SbVec3f getLabelTextCenterArcLength(const SbVec3f&, const SbVec3f&, const SbVec3f&);
SbVec3f getLabelTextCenterArcLength(const SbVec3f&, const SbVec3f&, const SbVec3f&) const;
bool hasDatumText() const;
void getDimension(float scale, int& srcw, int& srch);
DistanceGeometry calculateDistanceGeometry(const SbVec3f* points, float scale, int srch) const;
DiameterGeometry calculateDiameterGeometry(const SbVec3f* points) const;
AngleGeometry calculateAngleGeometry(const SbVec3f* points) const;
SymmetricGeometry calculateSymmetricGeometry(const SbVec3f* points) const;
ArcLengthGeometry calculateArcLengthGeometry(const SbVec3f* points) const;
void generateLineSelectionPrimitive(SoAction* action, const SbVec3f& start, const SbVec3f& end, float width);
void generateArcSelectionPrimitive(SoAction* action, const SbVec3f& center, float radius, float startAngle, float endAngle, float width);
void generateArrowSelectionPrimitive(SoAction* action, const SbVec3f& base, const SbVec3f& dir, float width, float length);
void drawDistance(const SbVec3f* points, float scale, int srch, float& angle, SbVec3f& textOffset);
void drawDistance(const SbVec3f* points);
void drawRadiusOrDiameter(const SbVec3f* points, float& angle, SbVec3f& textOffset);