From cec0339cd0c62d8d5d7677341173ab05727e8acf Mon Sep 17 00:00:00 2001 From: donovaly Date: Tue, 7 Jan 2020 00:19:02 +0100 Subject: [PATCH] sort angles in the attacher dialog - now the angles are sorted x-y-z - added tooltips to clarify what e.g. the rotation axis of the yaw angle means (not only important for non-native speakers) --- .../AttachmentEditor/TaskAttachmentEditor.ui | 784 ++++++++--------- src/Mod/Part/Gui/TaskAttacher.ui | 801 +++++++++--------- 2 files changed, 812 insertions(+), 773 deletions(-) diff --git a/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui b/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui index 7275a38aa0..c42cb118b6 100644 --- a/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui +++ b/src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.ui @@ -1,385 +1,399 @@ - - - PartDesignGui::TaskDatumParameters - - - - 0 - 0 - 271 - 604 - - - - Form - - - - - - Selection accepted - - - Qt::AlignCenter - - - true - - - - - - - - - Reference 1 - - - true - - - - - - - - - - - - - - Reference 2 - - - true - - - - - - - - - - - - - - Reference 3 - - - true - - - - - - - - - - - - - - Reference 4 - - - true - - - - - - - - - - - - Attachment mode: - - - - - - - QAbstractItemView::SingleSelection - - - - - - - - 0 - 0 - - - - AttachmentOffset property. The placement is expressed in local space of object being attached. - - - Attachment Offset: - - - - - - - 0 - 0 - - - - X: - - - labelOffset - - - - - - - - 0 - 0 - - - - Y: - - - - - - - - 0 - 0 - - - - - 0 - 5 - - - - - - - - - 0 - 0 - - - - Z: - - - - - - - - 0 - 0 - - - - - 0 - 5 - - - - - - - - - 0 - 0 - - - - Yaw: - - - - - - - - 0 - 0 - - - - Pitch: - - - - - - - - 0 - 0 - - - - Roll: - - - - - - - - 0 - 0 - - - - - 0 - 5 - - - - - - - - - 0 - 0 - - - - deg - - - -360.000000000000000 - - - 360.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - deg - - - -360.000000000000000 - - - 360.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - deg - - - -360.000000000000000 - - - 360.000000000000000 - - - 0.000000000000000 - - - - - - - - - - Flip sides - - - - - - - - Gui::InputField - QLineEdit -
Gui/InputField.h
- - - Gui::QuantitySpinBox - QWidget -
Gui/QuantitySpinBox.h
- - - - - - buttonRef1 - lineRef1 - buttonRef2 - lineRef2 - buttonRef3 - lineRef3 - buttonRef4 - lineRef4 - listOfModes - attachmentOffsetX - attachmentOffsetY - attachmentOffsetZ - attachmentOffsetYaw - attachmentOffsetPitch - attachmentOffsetRoll - checkBoxFlip - - - - - - 10 - - - 10 - - - true - - - true - - - true - - - + + + PartDesignGui::TaskDatumParameters + + + + 0 + 0 + 271 + 604 + + + + Form + + + + + + Selection accepted + + + Qt::AlignCenter + + + true + + + + + + + + + Reference 1 + + + true + + + + + + + + + + + + + + Reference 2 + + + true + + + + + + + + + + + + + + Reference 3 + + + true + + + + + + + + + + + + + + Reference 4 + + + true + + + + + + + + + + + + Attachment mode: + + + + + + + QAbstractItemView::SingleSelection + + + + + + + + 0 + 0 + + + + + + + Attachment Offset: + + + + + + + 0 + 0 + + + + X: + + + labelOffset + + + + + + + + 0 + 0 + + + + Y: + + + + + + + + 0 + 0 + + + + + 0 + 5 + + + + Note: The placement is expressed in local space of object being attached. + + + + + + + + 0 + 0 + + + + Z: + + + + + + + + 0 + 0 + + + + + 0 + 5 + + + + Note: The placement is expressed in local space of object being attached. + + + + + + + + 0 + 0 + + + + Roll: + + + + + + + + 0 + 0 + + + + Pitch: + + + + + + + + 0 + 0 + + + + Yaw: + + + + + + + + 0 + 0 + + + + + 0 + 5 + + + + Note: The placement is expressed in local space of object being attached. + + + + + + + + 0 + 0 + + + + Rotation around the x-axis +Note: The placement is expressed in local space of object being attached. + + + deg + + + -360.000000000000000 + + + 360.000000000000000 + + + 0.000000000000000 + + + + + + + + 0 + 0 + + + + Rotation around the y-axis +Note: The placement is expressed in local space of object being attached. + + + deg + + + -360.000000000000000 + + + 360.000000000000000 + + + 0.000000000000000 + + + + + + + + 0 + 0 + + + + Rotation around the z-axis +Note: The placement is expressed in local space of object being attached. + + + deg + + + -360.000000000000000 + + + 360.000000000000000 + + + 0.000000000000000 + + + + + + + + + + Flip sides + + + + + + + + Gui::InputField + QLineEdit +
Gui/InputField.h
+ + + + buttonRef1 + lineRef1 + buttonRef2 + lineRef2 + buttonRef3 + lineRef3 + buttonRef4 + lineRef4 + listOfModes + attachmentOffsetX + attachmentOffsetY + attachmentOffsetZ + attachmentOffsetRoll + attachmentOffsetPitch + attachmentOffsetYaw + checkBoxFlip + + + + + + 10 + + + 10 + + + true + + + true + + + true + + + diff --git a/src/Mod/Part/Gui/TaskAttacher.ui b/src/Mod/Part/Gui/TaskAttacher.ui index a6f5150807..e2ad73ed6a 100644 --- a/src/Mod/Part/Gui/TaskAttacher.ui +++ b/src/Mod/Part/Gui/TaskAttacher.ui @@ -1,388 +1,413 @@ - - - PartGui::TaskAttacher - - - - 0 - 0 - 271 - 604 - - - - Form - - - - - - Selection accepted - - - Qt::AlignCenter - - - true - - - - - - - - - Reference 1 - - - true - - - - - - - - - - - - - - Reference 2 - - - true - - - - - - - - - - - - - - Reference 3 - - - true - - - - - - - - - - - - - - Reference 4 - - - true - - - - - - - - - - - - Attachment mode: - - - - - - - QAbstractItemView::SingleSelection - - - - - - - - 0 - 0 - - - - Attachment offset. -Note: The placement is expressed in local coordinate system -of object being attached. - - - Attachment Offset: - - - - - - - 0 - 0 - - - - X: - - - labelOffset - - - - - - - - 0 - 0 - - - - Y: - - - - - - - - 0 - 0 - - - - - 0 - 5 - - - - - - - - - 0 - 0 - - - - Z: - - - - - - - - 0 - 0 - - - - - 0 - 5 - - - - - - - - - 0 - 0 - - - - Yaw: - - - - - - - - 0 - 0 - - - - Pitch: - - - - - - - - 0 - 0 - - - - Roll: - - - - - - - - 0 - 0 - - - - - 0 - 5 - - - - - - - - - 0 - 0 - - - - deg - - - -360.000000000000000 - - - 360.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - deg - - - -360.000000000000000 - - - 360.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - deg - - - -360.000000000000000 - - - 360.000000000000000 - - - 0.000000000000000 - - - - - - - - - - Flip side of attachment and offset - - - Flip sides - - - - - - - - Gui::QuantitySpinBox - QWidget -
Gui/QuantitySpinBox.h
- - - Gui::PrefQuantitySpinBox - QWidget -
Gui/PrefWidgets.h
- - - - buttonRef1 - lineRef1 - buttonRef2 - lineRef2 - buttonRef3 - lineRef3 - buttonRef4 - lineRef4 - listOfModes - attachmentOffsetX - attachmentOffsetY - attachmentOffsetZ - attachmentOffsetYaw - attachmentOffsetPitch - attachmentOffsetRoll - checkBoxFlip - - - - - - 10 - - - 10 - - - true - - - true - - - true - - - + + + PartGui::TaskAttacher + + + + 0 + 0 + 271 + 604 + + + + Form + + + + + + Selection accepted + + + Qt::AlignCenter + + + true + + + + + + + + + Reference 1 + + + true + + + + + + + + + + + + + + Reference 2 + + + true + + + + + + + + + + + + + + Reference 3 + + + true + + + + + + + + + + + + + + Reference 4 + + + true + + + + + + + + + + + + Attachment mode: + + + + + + + QAbstractItemView::SingleSelection + + + + + + + + 0 + 0 + + + + + + + Attachment Offset: + + + + + + + 0 + 0 + + + + X: + + + labelOffset + + + + + + + + 0 + 0 + + + + Y: + + + + + + + + 0 + 0 + + + + + 0 + 5 + + + + Note: The placement is expressed in local coordinate system +of object being attached. + + + + + + + + 0 + 0 + + + + Z: + + + + + + + + 0 + 0 + + + + + 0 + 5 + + + + Note: The placement is expressed in local coordinate system +of object being attached. + + + + + + + + 0 + 0 + + + + Roll: + + + + + + + + 0 + 0 + + + + Pitch: + + + + + + + + 0 + 0 + + + + Yaw: + + + + + + + + 0 + 0 + + + + + 0 + 5 + + + + Note: The placement is expressed in local coordinate system +of object being attached. + + + + + + + + 0 + 0 + + + + Rotation around the x-axis +Note: The placement is expressed in local coordinate system +of object being attached. + + + deg + + + -360.000000000000000 + + + 360.000000000000000 + + + 0.000000000000000 + + + + + + + + 0 + 0 + + + + Rotation around the y-axis +Note: The placement is expressed in local coordinate system +of object being attached. + + + deg + + + -360.000000000000000 + + + 360.000000000000000 + + + 0.000000000000000 + + + + + + + + 0 + 0 + + + + Rotation around the z-axis +Note: The placement is expressed in local coordinate system +of object being attached. + + + deg + + + -360.000000000000000 + + + 360.000000000000000 + + + 0.000000000000000 + + + + + + + + + + Flip side of attachment and offset + + + Flip sides + + + + + + + + Gui::QuantitySpinBox + QWidget +
Gui/QuantitySpinBox.h
+ + + Gui::PrefQuantitySpinBox + QWidget +
Gui/PrefWidgets.h
+ + + + buttonRef1 + lineRef1 + buttonRef2 + lineRef2 + buttonRef3 + lineRef3 + buttonRef4 + lineRef4 + listOfModes + attachmentOffsetX + attachmentOffsetY + attachmentOffsetZ + attachmentOffsetRoll + attachmentOffsetPitch + attachmentOffsetYaw + checkBoxFlip + + + + + + 10 + + + 10 + + + true + + + true + + + true + + +