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

EditableDatumLabel add support for angle labels.

Browse Source
This commit is contained in:
Paddle
2023-10-16 15:37:15 +02:00
committed by abdullahtahiriyo
parent b53623872e
commit 6c2493799e
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Gui/EditableDatumLabel.cpp
View File

@@ -74,6 +74,7 @@ EditableDatumLabel::EditableDatumLabel(View3DInventorViewer* view,
label->datumtype = SoDatumLabel::DISTANCE;
label->param1 = 0.;
label->param2 = 0.;
label->param3 = 0.;
if (autoDistance) {
setLabelRecommendedDistance();
}
@@ -172,15 +173,15 @@ double EditableDatumLabel::getValue()
return spinBox->rawValue();
}
void EditableDatumLabel::setSpinboxValue(double val)
void EditableDatumLabel::setSpinboxValue(double val, const Base::Unit& unit)
{
if (!spinBox) {
Base::Console().Warning("Spinbox doesn't exist in EditableDatumLabel::setSpinboxValue.");
Base::Console().DeveloperWarning("EditableDatumLabel::setSpinboxValue", "Spinbox doesn't exist in");
return;
}
QSignalBlocker block(spinBox);
spinBox->setValue(val);
spinBox->setValue(Base::Quantity(val, unit));
positionSpinbox();
if (spinBox->hasFocus()) {
@@ -191,7 +192,7 @@ void EditableDatumLabel::setSpinboxValue(double val)
void EditableDatumLabel::setFocusToSpinbox()
{
if (!spinBox) {
Base::Console().Warning("Spinbox doesn't exist in EditableDatumLabel::setFocusToSpinbox.");
Base::Console().DeveloperWarning("EditableDatumLabel::setFocusToSpinbox", "Spinbox doesn't exist in");
return;
}
if (!spinBox->hasFocus()) {
@@ -299,9 +300,19 @@ void EditableDatumLabel::setLabelType(SoDatumLabel::Type type)
}
// NOLINTNEXTLINE
void EditableDatumLabel::setLabelDistance(double distance)
void EditableDatumLabel::setLabelDistance(double val)
{
label->param1 = float(distance);
label->param1 = float(val);
}
void EditableDatumLabel::setLabelStartAngle(double val)
{
label->param2 = float(val);
}
void EditableDatumLabel::setLabelRange(double val)
{
label->param3 = float(val);
}
void EditableDatumLabel::setLabelRecommendedDistance()

6
src/Gui/EditableDatumLabel.h
View File

@@ -54,7 +54,7 @@ public:
void startEdit(double val, QObject* eventFilteringObj = nullptr);
void stopEdit();
double getValue();
void setSpinboxValue(double val);
void setSpinboxValue(double val, const Base::Unit& unit = Base::Unit::Length);
void setPlacement(const Base::Placement& plc);
void setColor(SbColor color);
void setFocus();
@@ -62,7 +62,9 @@ public:
void setPoints(Base::Vector3d p1, Base::Vector3d p2);
void setFocusToSpinbox();
void setLabelType(SoDatumLabel::Type type);
void setLabelDistance(double distance);
void setLabelDistance(double val);
void setLabelStartAngle(double val);
void setLabelRange(double val);
void setLabelRecommendedDistance();
void setLabelAutoDistanceReverse(bool val);
void setSpinboxInvisibleToMouse(bool val);