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

[PD] shape binder: code style improvements

Browse Source 
all done by MSVC
This commit is contained in:
Uwe
2022-03-27 21:48:09 +02:00
parent 8a8fe98454
commit 153fa35bdb
3 changed files with 421 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
View File

@@ -54,9 +54,9 @@ using namespace Gui;
// TODO Review and cleanup the file (2015-09-11, Fat-Zer)
TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder *view, bool /*newObj*/, QWidget *parent)
TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder* view, bool /*newObj*/, QWidget* parent)
: Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("PartDesign_ShapeBinder"),
tr("Datum shape parameters"), true, parent)
tr("Datum shape parameters"), true, parent)
, SelectionObserver(view)
, ui(new Ui_TaskShapeBinder)
{
@@ -66,45 +66,45 @@ TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder *view, bool /*newObj*/,
QMetaObject::connectSlotsByName(this);
connect(ui->buttonRefAdd, SIGNAL(toggled(bool)),
this, SLOT(onButtonRefAdd(bool)));
this, SLOT(onButtonRefAdd(bool)));
connect(ui->buttonRefRemove, SIGNAL(toggled(bool)),
this, SLOT(onButtonRefRemove(bool)));
this, SLOT(onButtonRefRemove(bool)));
connect(ui->buttonBase, SIGNAL(toggled(bool)),
this, SLOT(onBaseButton(bool)));
this, SLOT(onBaseButton(bool)));
this->groupLayout()->addWidget(proxy);
Gui::Document* doc = Gui::Application::Instance->activeDocument();
Gui::Document* doc = Gui::Application::Instance->activeDocument();
vp = view;
//add initial values
App::GeoFeature* obj = nullptr;
std::vector<std::string> subs;
PartDesign::ShapeBinder::getFilteredReferences(&static_cast<PartDesign::ShapeBinder*>(vp->getObject())->Support, obj, subs);
if(obj)
PartDesign::ShapeBinder::getFilteredReferences(&static_cast<PartDesign::ShapeBinder*>(vp->getObject())->Support, obj, subs);
if (obj)
ui->baseEdit->setText(QString::fromUtf8(obj->getNameInDocument()));
for (auto sub : subs)
ui->listWidgetReferences->addItem(QString::fromStdString(sub));
//make sure the user sees all important things: the base feature to select edges and the
//spine/auxiliary spine they already selected
if(obj) {
if (obj) {
auto* svp = doc->getViewProvider(obj);
if(svp) {
if (svp) {
supportShow = svp->isShow();
svp->setVisible(true);
}
}
updateUI();
}
void TaskShapeBinder::updateUI()
{
}
void TaskShapeBinder::onSelectionChanged(const Gui::SelectionChanges& msg)
@@ -116,26 +116,27 @@ void TaskShapeBinder::onSelectionChanged(const Gui::SelectionChanges& msg)
if (referenceSelected(msg)) {
if (selectionMode == refAdd) {
QString sub = QString::fromStdString(msg.pSubName);
if(!sub.isEmpty())
if (!sub.isEmpty())
ui->listWidgetReferences->addItem(QString::fromStdString(msg.pSubName));
ui->baseEdit->setText(QString::fromStdString(msg.pObjectName));
}
else if (selectionMode == refRemove) {
QString sub = QString::fromStdString(msg.pSubName);
if(!sub.isEmpty())
if (!sub.isEmpty())
removeFromListWidget(ui->listWidgetReferences, QString::fromUtf8(msg.pSubName));
else {
ui->baseEdit->clear();
}
} else if(selectionMode == refObjAdd) {
}
}
else if (selectionMode == refObjAdd) {
ui->listWidgetReferences->clear();
ui->baseEdit->setText(QString::fromUtf8(msg.pObjectName));
}
clearButtons();
static_cast<ViewProviderShapeBinder*>(vp)->highlightReferences(false, false);
vp->getObject()->getDocument()->recomputeFeature(vp->getObject());
}
}
clearButtons();
exitSelectionMode();
}
@@ -144,9 +145,9 @@ void TaskShapeBinder::onSelectionChanged(const Gui::SelectionChanges& msg)
TaskShapeBinder::~TaskShapeBinder()
{/*
PartDesign::Pipe* pipe = static_cast<PartDesign::Pipe*>(vp->getObject());
Gui::Document* doc = Gui::Application::Instance->activeDocument();
//make sure the user sees all important things: the base feature to select edges and the
Gui::Document* doc = Gui::Application::Instance->activeDocument();
//make sure the user sees all important things: the base feature to select edges and the
//spine/auxiliary spine they already selected
if(pipe->BaseFeature.getValue())
doc->getViewProvider(pipe->BaseFeature.getValue())->hide();
@@ -159,12 +160,12 @@ TaskShapeBinder::~TaskShapeBinder()
*/
}
void TaskShapeBinder::changeEvent(QEvent *)
void TaskShapeBinder::changeEvent(QEvent*)
{
}
void TaskShapeBinder::onButtonRefAdd(bool checked) {
if (checked) {
//clearButtons(refAdd);
//hideObject();
@@ -179,7 +180,7 @@ void TaskShapeBinder::onButtonRefRemove(bool checked) {
if (checked) {
//clearButtons(refRemove);
//hideObject();
Gui::Selection().clearSelection();
Gui::Selection().clearSelection();
selectionMode = refRemove;
vp->highlightReferences(true, false);
}
@@ -190,7 +191,7 @@ void TaskShapeBinder::onBaseButton(bool checked) {
if (checked) {
//clearButtons(refRemove);
//hideObject();
Gui::Selection().clearSelection();
Gui::Selection().clearSelection();
selectionMode = refObjAdd;
//DressUpView->highlightReferences(true);
}
@@ -208,19 +209,19 @@ void TaskShapeBinder::removeFromListWidget(QListWidget* widget, QString itemstr)
}
bool TaskShapeBinder::referenceSelected(const SelectionChanges& msg) const {
if ((msg.Type == Gui::SelectionChanges::AddSelection) && (
(selectionMode == refAdd) || (selectionMode == refRemove)
|| (selectionMode == refObjAdd))) {
(selectionMode == refAdd) || (selectionMode == refRemove)
|| (selectionMode == refObjAdd))) {
if (strcmp(msg.pDocName, vp->getObject()->getDocument()->getName()) != 0)
return false;
// not allowed to reference ourself
const char* fname = vp->getObject()->getNameInDocument();
const char* fname = vp->getObject()->getNameInDocument();
if (strcmp(msg.pObjectName, fname) == 0)
return false;
//change the references
std::string subName(msg.pSubName);
@@ -245,7 +246,7 @@ bool TaskShapeBinder::referenceSelected(const SelectionChanges& msg) const {
obj = selectedObj;
}
if(selectionMode != refObjAdd) {
if (selectionMode != refObjAdd) {
// ensure the new selected subref belongs to the same object
if (strcmp(msg.pObjectName, obj->getNameInDocument()) != 0)
return false;
@@ -257,7 +258,8 @@ bool TaskShapeBinder::referenceSelected(const SelectionChanges& msg) const {
refs.push_back(subName);
else
return false; // duplicate selection
} else {
}
else {
if (f != refs.end())
refs.erase(f);
else
@@ -269,7 +271,7 @@ bool TaskShapeBinder::referenceSelected(const SelectionChanges& msg) const {
refs.clear();
obj = selectedObj;
}
static_cast<PartDesign::ShapeBinder*>(vp->getObject())->Support.setValue(obj, refs);
return true;
@@ -296,11 +298,11 @@ void TaskShapeBinder::exitSelectionMode() {
// TaskDialog
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskDlgShapeBinder::TaskDlgShapeBinder(ViewProviderShapeBinder *view, bool newObj)
: Gui::TaskView::TaskDialog()
TaskDlgShapeBinder::TaskDlgShapeBinder(ViewProviderShapeBinder* view, bool newObj)
: Gui::TaskView::TaskDialog()
{
assert(view);
parameter = new TaskShapeBinder(view, newObj);
parameter = new TaskShapeBinder(view, newObj);
vp = view;
Content.push_back(parameter);
@@ -319,10 +321,10 @@ bool TaskDlgShapeBinder::accept()
std::string name = vp->getObject()->getNameInDocument();
try {
Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.recompute()");
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
if (!vp->getObject()->isValid())
throw Base::RuntimeError(vp->getObject()->getStatusString());
Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
Gui::Command::commitCommand();
}
catch (const Base::Exception& e) {
@@ -335,11 +337,11 @@ bool TaskDlgShapeBinder::accept()
bool TaskDlgShapeBinder::reject()
{
// roll back the done things
Gui::Command::abortCommand();
Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
return true;
// roll back the done things
Gui::Command::abortCommand();
Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
return true;
}
#include "moc_TaskShapeBinder.cpp"