Update pipe icon and add it to the taskwatcher
This commit is contained in:
parent
20d551bc88
commit
84cd1588d0
|
@ -78,8 +78,6 @@ TaskPipeParameters::TaskPipeParameters(ViewProviderPipe *PipeView,bool newObj, Q
|
|||
this, SLOT(onButtonRefAdd(bool)));
|
||||
connect(ui->buttonRefRemove, SIGNAL(toggled(bool)),
|
||||
this, SLOT(onButtonRefRemove(bool)));
|
||||
connect(ui->tangent, SIGNAL(toggled(bool)),
|
||||
this, SLOT(onTangentChanged(bool)));
|
||||
connect(ui->buttonProfileBase, SIGNAL(toggled(bool)),
|
||||
this, SLOT(onBaseButton(bool)));
|
||||
|
||||
|
@ -106,8 +104,7 @@ TaskPipeParameters::TaskPipeParameters(ViewProviderPipe *PipeView,bool newObj, Q
|
|||
ui->listWidgetReferences->addItem(QString::fromStdString(*i));
|
||||
|
||||
ui->comboBoxTransition->setCurrentIndex(pipe->Transition.getValue());
|
||||
ui->tangent->setChecked(pipe->SpineTangent.getValue());
|
||||
|
||||
|
||||
updateUI();
|
||||
}
|
||||
|
||||
|
|
|
@ -121,13 +121,6 @@
|
|||
<item>
|
||||
<widget class="QListWidget" name="listWidgetReferences"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="tangent">
|
||||
<property name="text">
|
||||
<string>Extend to tangent edges</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
#include <Gui/Control.h>
|
||||
#include <Gui/Command.h>
|
||||
#include <Gui/Application.h>
|
||||
#include <Gui/BitmapFactory.h>
|
||||
#include <TopExp.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
|
||||
|
@ -46,7 +47,6 @@ PROPERTY_SOURCE(PartDesignGui::ViewProviderPipe,PartDesignGui::ViewProvider)
|
|||
|
||||
ViewProviderPipe::ViewProviderPipe()
|
||||
{
|
||||
sPixmap = "PartDesign_Additive_Pipe.svg";
|
||||
}
|
||||
|
||||
ViewProviderPipe::~ViewProviderPipe()
|
||||
|
@ -189,3 +189,15 @@ void ViewProviderPipe::highlightReferences(const bool on, bool auxillery)
|
|||
}
|
||||
}
|
||||
|
||||
QIcon ViewProviderPipe::getIcon(void) const {
|
||||
QString str = QString::fromAscii("PartDesign_");
|
||||
auto* prim = static_cast<PartDesign::Pipe*>(getObject());
|
||||
if(prim->getAddSubType() == PartDesign::FeatureAddSub::Additive)
|
||||
str += QString::fromAscii("Additive_");
|
||||
else
|
||||
str += QString::fromAscii("Subtractive_");
|
||||
|
||||
str += QString::fromAscii("Pipe.svg");
|
||||
return Gui::BitmapFactory().pixmap(str.toStdString().c_str());
|
||||
}
|
||||
|
||||
|
|
|
@ -49,6 +49,7 @@ public:
|
|||
protected:
|
||||
virtual bool setEdit(int ModNum);
|
||||
virtual void unsetEdit(int ModNum);
|
||||
virtual QIcon getIcon(void) const;
|
||||
|
||||
private:
|
||||
std::vector<App::Color> originalLineColors;
|
||||
|
|
|
@ -652,6 +652,8 @@ void Workbench::activated()
|
|||
"PartDesign_Pocket",
|
||||
"PartDesign_Revolution",
|
||||
"PartDesign_Groove",
|
||||
"PartDesign_AdditivePipe",
|
||||
"PartDesign_SubtractivePipe",
|
||||
0};
|
||||
Watcher.push_back(new Gui::TaskView::TaskWatcherCommands(
|
||||
"SELECT Sketcher::SketchObject COUNT 1",
|
||||
|
|
Loading…
Reference in New Issue
Block a user