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

fixes #3724

Browse Source
This commit is contained in:
Abdullah Tahiri
2018-12-14 17:15:28 +01:00
committed by wmayer
parent 0c886a479a
commit 7acdd87bf2
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/PartDesign/Gui/ViewProviderLoft.cpp
View File

@@ -127,9 +127,9 @@ void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxiliary*/
Part::Feature* base;
if(!auxiliary)
base = static_cast<Part::Feature*>(pcLoft->Spine.getValue());
else
else
base = static_cast<Part::Feature*>(pcLoft->AuxillerySpine.getValue());
if (base == NULL) return;
PartGui::ViewProviderPart* svp = dynamic_cast<PartGui::ViewProviderPart*>(
Gui::Application::Instance->getViewProvider(base));
@@ -138,10 +138,10 @@ void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxiliary*/
std::vector<std::string> edges;
if(!auxiliary)
edges = pcLoft->Spine.getSubValuesStartsWith("Edge");
else
else
edges = pcLoft->AuxillerySpine.getSubValuesStartsWith("Edge");
if (on) {
if (on) {
if (!edges.empty() && originalLineColors.empty()) {
TopTools_IndexedMapOfShape eMap;
TopExp::MapShapes(base->Shape.getValue(), TopAbs_EDGE, eMap);
@@ -171,8 +171,8 @@ QIcon ViewProviderLoft::getIcon(void) const {
str += QString::fromLatin1("Additive_");
else
str += QString::fromLatin1("Subtractive_");
str += QString::fromLatin1("Loft.svg");
return Gui::BitmapFactory().pixmap(str.toStdString().c_str());
return mergeTip(Gui::BitmapFactory().pixmap(str.toStdString().c_str()));
}

16
src/Mod/PartDesign/Gui/ViewProviderPipe.cpp
View File

@@ -89,9 +89,9 @@ bool ViewProviderPipe::doubleClicked(void)
}
bool ViewProviderPipe::setEdit(int ModNum) {
if (ModNum == ViewProvider::Default )
if (ModNum == ViewProvider::Default )
setPreviewDisplayMode(true);
return PartDesignGui::ViewProvider::setEdit(ModNum);
}
@@ -129,9 +129,9 @@ void ViewProviderPipe::highlightReferences(const bool on, bool auxiliary)
Part::Feature* base;
if(!auxiliary)
base = static_cast<Part::Feature*>(pcPipe->Spine.getValue());
else
else
base = static_cast<Part::Feature*>(pcPipe->AuxillerySpine.getValue());
if (base == NULL) return;
PartGui::ViewProviderPart* svp = dynamic_cast<PartGui::ViewProviderPart*>(
Gui::Application::Instance->getViewProvider(base));
@@ -140,10 +140,10 @@ void ViewProviderPipe::highlightReferences(const bool on, bool auxiliary)
std::vector<std::string> edges;
if(!auxiliary)
edges = pcPipe->Spine.getSubValuesStartsWith("Edge");
else
else
edges = pcPipe->AuxillerySpine.getSubValuesStartsWith("Edge");
if (on) {
if (on) {
if (!edges.empty() && originalLineColors.empty()) {
TopTools_IndexedMapOfShape eMap;
TopExp::MapShapes(base->Shape.getValue(), TopAbs_EDGE, eMap);
@@ -174,8 +174,8 @@ QIcon ViewProviderPipe::getIcon(void) const {
str += QString::fromLatin1("Additive_");
else
str += QString::fromLatin1("Subtractive_");
str += QString::fromLatin1("Pipe.svg");
return Gui::BitmapFactory().pixmap(str.toStdString().c_str());
return mergeTip(Gui::BitmapFactory().pixmap(str.toStdString().c_str()));
}