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

small fixes as suggested by @chennes

Browse Source 
therefore also in the helix code
This commit is contained in:
donovaly
2021-04-06 03:26:19 +02:00
parent 7bfede97b7
commit b868dbbe7f
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/App/FeaturePad.cpp
View File

@@ -147,7 +147,7 @@ App::DocumentObjectExecReturn *Pad::execute(void)
Base::Vector3d paddingDirection;
if (!UseCustomVector.getValue()) {
if (ReferenceAxis.getValue() == 0) {
if (ReferenceAxis.getValue() == nullptr) {
// use sketch's normal vector for direction
paddingDirection = SketchVector;
AlongSketchNormal.setReadOnly(true);

6
src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
View File

@@ -235,8 +235,10 @@ void TaskHelixParameters::fillAxisCombo(bool forceRefill)
App::DocumentObject* ax = propReferenceAxis->getValue();
const std::vector<std::string> &subList = propReferenceAxis->getSubValues();
for (size_t i = 0; i < axesInList.size(); i++) {
if (ax == axesInList[i]->getValue() && subList == axesInList[i]->getSubValues())
if (ax == axesInList[i]->getValue() && subList == axesInList[i]->getSubValues()) {
indexOfCurrent = i;
break;
}
}
if (indexOfCurrent == -1 && ax) {
assert(subList.size() <= 1);
@@ -260,7 +262,7 @@ void TaskHelixParameters::addAxisToCombo(App::DocumentObject* linkObj,
{
this->ui->axis->addItem(itemText);
this->axesInList.emplace_back(new App::PropertyLinkSub);
App::PropertyLinkSub &lnk = *(axesInList[axesInList.size()-1]);
App::PropertyLinkSub &lnk = *(axesInList.back());
lnk.setValue(linkObj,std::vector<std::string>(1,linkSubname));
}

9
src/Mod/PartDesign/Gui/TaskPadParameters.cpp
View File

@@ -370,8 +370,10 @@ void TaskPadParameters::fillDirectionCombo()
App::DocumentObject* ax = propReferenceAxis->getValue();
const std::vector<std::string>& subList = propReferenceAxis->getSubValues();
for (size_t i = 0; i < axesInList.size(); i++) {
if (ax == axesInList[i]->getValue() && subList == axesInList[i]->getSubValues())
if (ax == axesInList[i]->getValue() && subList == axesInList[i]->getSubValues()) {
indexOfCurrent = i;
break;
}
}
if (indexOfCurrent == -1 && ax) {
assert(subList.size() <= 1);
@@ -400,7 +402,7 @@ void TaskPadParameters::addAxisToCombo(App::DocumentObject* linkObj,
{
this->ui->directionCB->addItem(itemText);
this->axesInList.emplace_back(new App::PropertyLinkSub);
App::PropertyLinkSub& lnk = *(axesInList[axesInList.size() - 1]);
App::PropertyLinkSub& lnk = *(axesInList.back());
lnk.setValue(linkObj, std::vector<std::string>(1, linkSubname));
}
@@ -636,8 +638,7 @@ std::string TaskPadParameters::getReferenceAxis(void) const
std::vector<std::string> sub;
App::DocumentObject* obj;
getReferenceAxis(obj, sub);
std::string axis = buildLinkSingleSubPythonStr(obj, sub);
return axis;
return buildLinkSingleSubPythonStr(obj, sub);
}
double TaskPadParameters::getXDirection(void) const

2
src/Mod/PartDesign/Gui/TaskPadParameters.ui
View File

@@ -92,7 +92,7 @@ or select an edge as reference</string>
<bool>true</bool>
</property>
<property name="toolTip">
<string>Use custom vector for pad direction otherwise
<string>Use custom vector for pad direction, otherwise
the sketch plane's normal vector will be used</string>
</property>
<property name="title">