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

add axial movement to placement dialog

Browse Source
This commit is contained in:
mwganson
2018-09-26 21:00:09 -05:00
committed by wmayer
parent 4731c17b1e
commit ea8cd54872
3 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Gui/Placement.cpp
View File

@@ -91,6 +91,7 @@ Placement::Placement(QWidget* parent, Qt::WindowFlags fl)
ui->xPos->setUnit(Base::Unit::Length);
ui->yPos->setUnit(Base::Unit::Length);
ui->zPos->setUnit(Base::Unit::Length);
ui->axialPos->setUnit(Base::Unit::Length);
ui->xCnt->setValue(Base::Quantity(0, Base::Unit::Length));
ui->yCnt->setValue(Base::Quantity(0, Base::Unit::Length));
ui->zCnt->setValue(Base::Quantity(0, Base::Unit::Length));
@@ -337,7 +338,7 @@ void Placement::on_selectedVertex_clicked()
Base::Vector3d tmp;
double angle;
rot.getRawValue(tmp, angle);
Base::Vector3d axis(picked[0].x-picked[1].x,picked[0].y-picked[1].y,picked[0].z-picked[1].z);
Base::Vector3d axis(picked[1].x-picked[0].x,picked[1].y-picked[0].y,picked[1].z-picked[0].z);
axis.Normalize();
rot.setValue(axis, angle);
plm.setRotation(rot);
@@ -372,6 +373,28 @@ created, if needed."));
}
}
void Placement::on_applyAxial_clicked()
{
signalMapper->blockSignals(true);
double axPos = ui->axialPos->value().getValue();
Base::Placement p = getPlacementData();
double angle;
Base::Vector3d axis;
p.getRotation().getValue(axis, angle);
Base::Vector3d curPos (p.getPosition());
Base::Vector3d newPos;
Qt::KeyboardModifiers km = QApplication::keyboardModifiers();
if (km == Qt::ShiftModifier){ //go opposite direction on Shift+click
newPos = Base::Vector3d(curPos.x-(axis.x*axPos),curPos.y-(axis.y*axPos),curPos.z-(axis.z*axPos));
} else {
newPos = Base::Vector3d(curPos.x+(axis.x*axPos),curPos.y+(axis.y*axPos),curPos.z+(axis.z*axPos));
}
ui->xPos->setValue(Base::Quantity(newPos.x,Base::Unit::Length));
ui->yPos->setValue(Base::Quantity(newPos.y,Base::Unit::Length));
ui->zPos->setValue(Base::Quantity(newPos.z,Base::Unit::Length));
signalMapper->blockSignals(false);
onPlacementChanged(0);
}
void Placement::on_applyIncrementalPlacement_toggled(bool on)
{

1
src/Gui/Placement.h
View File

@@ -67,6 +67,7 @@ private Q_SLOTS:
void on_resetButton_clicked();
void on_centerOfMass_toggled(bool);
void on_selectedVertex_clicked();
void on_applyAxial_clicked();
private:
bool onApply();

23
src/Gui/Placement.ui
View File

@@ -45,6 +45,19 @@
</property>
</spacer>
</item>
<item row="4" column="0">
<widget class="QLabel" name="TextLabelAxial">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Axial:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="TextLabelZ">
<property name="sizePolicy">
@@ -93,6 +106,16 @@
<item row="3" column="1">
<widget class="Gui::QuantitySpinBox" name="zPos"/>
</item>
<item row="4" column="1">
<widget class="Gui::QuantitySpinBox" name="axialPos"/>
</item>
<item row="5" column="1">
<widget class="QPushButton" name="applyAxial">
<property name="text">
<string>Apply axial</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>