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

Fixes some merge Bugs

Browse Source
This commit is contained in:
jriegel 2014-04-13 16:42:07 +02:00 committed by Stefan Tröger
parent 91196ee244
commit 4ad93594a6
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
View File

@ -343,7 +343,14 @@ void TaskPolarPatternParameters::getAxis(App::DocumentObject*& obj, std::vector<
obj = NULL; obj = NULL;
} }
} }
const std::string TaskPolarPatternParameters::getAxis(void) const
{
if (ui->comboAxis->currentIndex() == 0)
return "N_Axis";
else if (ui->comboAxis->count() > 2 && ui->comboAxis->currentIndex() == 1)
return ui->comboAxis->currentText().toStdString();
return std::string("");
}
const bool TaskPolarPatternParameters::getReverse(void) const const bool TaskPolarPatternParameters::getReverse(void) const
{ {
return ui->checkReverse->isChecked(); return ui->checkReverse->isChecked();
@ -378,10 +385,7 @@ void TaskPolarPatternParameters::changeEvent(QEvent *e)
void TaskPolarPatternParameters::apply() void TaskPolarPatternParameters::apply()
{ {
std::string name = TransformedView->getObject()->getNameInDocument(); std::string name = TransformedView->getObject()->getNameInDocument();
std::vector<std::string> axes; std::string axis = getAxis();
App::DocumentObject* obj;
getAxis(obj, axes);
std::string axis = getPythonStr(obj, axes);
if (!axis.empty()) { if (!axis.empty()) {
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Axis = %s", name.c_str(), axis.c_str()); Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Axis = %s", name.c_str(), axis.c_str());
} else } else

2
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.h
View File

@ -73,7 +73,7 @@ protected:
virtual void clearButtons(); virtual void clearButtons();
void getAxis(App::DocumentObject*& obj, std::vector<std::string>& sub) const; void getAxis(App::DocumentObject*& obj, std::vector<std::string>& sub) const;
const std::string getStdAxis(void) const; const std::string getStdAxis(void) const;
//const std::string getAxis(void) const; const std::string getAxis(void) const;
const bool getReverse(void) const; const bool getReverse(void) const;
const double getAngle(void) const; const double getAngle(void) const;
const unsigned getOccurrences(void) const; const unsigned getOccurrences(void) const;