suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Miscellaneous fixes

Browse Source
This commit is contained in:
jrheinlaender 2013-05-23 20:19:59 +04:30 committed by Stefan Tröger
parent 75dc92fd90
commit 106efeec02
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/PartDesign/App/DatumLine.cpp
View File

@ -269,12 +269,12 @@ const std::set<QString> Line::getHint()
return std::set<QString>();
}
Base::Vector3d Line::getBasePoint()
Base::Vector3d Line::getBasePoint() const
{
return Placement.getValue().getPosition();
}
Base::Vector3d Line::getDirection()
Base::Vector3d Line::getDirection() const
{
Base::Rotation rot = Placement.getValue().getRotation();
Base::Vector3d dir;

4
src/Mod/PartDesign/App/DatumLine.h
View File

@ -47,8 +47,8 @@ public:
static void initHints();
const std::set<QString> getHint();
Base::Vector3d getBasePoint();
Base::Vector3d getDirection();
Base::Vector3d getBasePoint() const;
Base::Vector3d getDirection() const;
protected:
virtual void onChanged(const App::Property* prop);

1
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
View File

@ -333,6 +333,7 @@ void TaskLinearPatternParameters::onDirectionChanged(int num) {
QString buf = QString::fromUtf8("Axis%1").arg(num-5);
std::string str = buf.toStdString();
pcLinearPattern->Direction.setValue(pcSketch, std::vector<std::string>(1,str));
exitSelectionMode();
}
else if (num == ui->comboDirection->count() - 1) {
// enter reference selection mode

1
src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
View File

@ -259,6 +259,7 @@ void TaskMirroredParameters::onPlaneChanged(int num) {
QString buf = QString::fromUtf8("Axis%1").arg(num-5);
std::string str = buf.toStdString();
pcMirrored->MirrorPlane.setValue(pcSketch, std::vector<std::string>(1,str));
exitSelectionMode();
}
else if (num == ui->comboPlane->count() - 1) {
// enter reference selection mode

10
src/Mod/PartDesign/Gui/TaskSketchBasedParameters.cpp
View File

@ -96,9 +96,10 @@ void TaskSketchBasedParameters::onSelectReference(const bool pressed, const bool
if (pressed) {
Gui::Document* doc = Gui::Application::Instance->activeDocument();
if (doc && solid) {
if (doc) {
doc->setHide(pcSketchBased->getNameInDocument());
doc->setShow(solid->getNameInDocument());
if (solid)
doc->setShow(solid->getNameInDocument());
}
Gui::Selection().clearSelection();
Gui::Selection().addSelectionGate
@ -106,9 +107,10 @@ void TaskSketchBasedParameters::onSelectReference(const bool pressed, const bool
} else {
Gui::Selection().rmvSelectionGate();
Gui::Document* doc = Gui::Application::Instance->activeDocument();
if (doc && solid) {
if (doc) {
doc->setShow(pcSketchBased->getNameInDocument());
doc->setHide(solid->getNameInDocument());
if (solid)
doc->setHide(solid->getNameInDocument());
}
}
}