diff --git a/src/AIAC/Feedback/HoleFeedback.cpp b/src/AIAC/Feedback/HoleFeedback.cpp index 6743822ab..9539d7d18 100644 --- a/src/AIAC/Feedback/HoleFeedback.cpp +++ b/src/AIAC/Feedback/HoleFeedback.cpp @@ -9,6 +9,7 @@ namespace AIAC { pt2->SetVisibility(false); this->m_InfoText = GOText::Add("///", *pt1); + this->m_InfoText->SetTextSize(GOTextSize::Small); this->m_InfoText->SetColor(GOColor::WHITE); this->m_HoleLine2ToolStart = GOLine::Add(*pt1, *pt2); @@ -117,7 +118,7 @@ namespace AIAC { if (angleOrientRoundedStr.size() == 1) angleOrientRoundedStr = "0" + angleOrientRoundedStr; // (iv) depth - float depthLeft = this->m_Visualizer.m_HoleLineAxis->GetPEnd().DistanceTo(*AC_FF_TOOL->GetData().TooltipGO); + float depthLeft = this->m_Visualizer.m_HoleLineAxis->GetPStart().DistanceTo(*AC_FF_TOOL->GetData().TooltipGO); float holeLength = this->m_Visualizer.m_HoleLineAxis->GetLength(); float depthDrilled = holeLength - depthLeft; float depthDrilledScaled = depthDrilled / scaleF; @@ -129,6 +130,7 @@ namespace AIAC { if (160.f < angle && angle < 200.f) // TODO: set tolerance var member, 20deg for now { distScaledMMStr = "00"; + this->m_Visualizer.m_HoleLine2ToolStart->SetColor(GOColor::YELLOW); if (depthDrilled < 0.f) this->m_Visualizer.m_HoleLine2ToolEnd->SetColor(GOColor::RED); else diff --git a/src/AIAC/Feedback/HoleFeedback.h b/src/AIAC/Feedback/HoleFeedback.h index 2c947535c..9803e01b3 100644 --- a/src/AIAC/Feedback/HoleFeedback.h +++ b/src/AIAC/Feedback/HoleFeedback.h @@ -7,7 +7,11 @@ #include "FabFeedback.h" #include "utils/GeometryUtils.h" -namespace AIAC{ +namespace AIAC +{ + /** + @brief The visualizer for the HoleFeedback class + */ class HoleFeedbackVisualizer : public FeedbackVisualizer { public: HoleFeedbackVisualizer(); diff --git a/src/AIAC/GOSys/GOPrimitive.h b/src/AIAC/GOSys/GOPrimitive.h index 7798d236e..54a33fac0 100644 --- a/src/AIAC/GOSys/GOPrimitive.h +++ b/src/AIAC/GOSys/GOPrimitive.h @@ -39,7 +39,7 @@ namespace AIAC struct GOTextSize { static constexpr double Default = 1.0; - static constexpr double Small = 2.5; + static constexpr double Small = 0.5; static constexpr double Medium = 5.0; static constexpr double Big = 10.0; };