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

PD: [skip ci] fixes for pipe task panel

Browse Source 
+ Add/Remove are checkable buttons so if user unchecks it then disable highlighting of spine
+ Avoid superfluous char* -> QString conversion
This commit is contained in:
wmayer
2020-09-17 14:04:36 +02:00
parent 8fa096f23b
commit 44b1a27cd4
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Mod/PartDesign/Gui/TaskPipeParameters.cpp
View File

@@ -204,9 +204,9 @@ void TaskPipeParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
}
}
else if (selectionMode == refRemove) {
QString sub = QString::fromStdString(msg.pSubName);
QString sub = QString::fromLatin1(msg.pSubName);
if (!sub.isEmpty()) {
removeFromListWidget(ui->listWidgetReferences, QString::fromUtf8(msg.pSubName));
removeFromListWidget(ui->listWidgetReferences, sub);
}
else {
ui->spineBaseEdit->clear();
@@ -248,6 +248,11 @@ void TaskPipeParameters::onButtonRefAdd(bool checked) {
selectionMode = refAdd;
static_cast<ViewProviderPipe*>(vp)->highlightReferences(true, false);
}
else {
Gui::Selection().clearSelection();
selectionMode = none;
static_cast<ViewProviderPipe*>(vp)->highlightReferences(false, false);
}
}
void TaskPipeParameters::onButtonRefRemove(bool checked) {
@@ -259,6 +264,11 @@ void TaskPipeParameters::onButtonRefRemove(bool checked) {
selectionMode = refRemove;
static_cast<ViewProviderPipe*>(vp)->highlightReferences(true, false);
}
else {
Gui::Selection().clearSelection();
selectionMode = none;
static_cast<ViewProviderPipe*>(vp)->highlightReferences(false, false);
}
}
void TaskPipeParameters::onBaseButton(bool checked) {
@@ -266,7 +276,7 @@ void TaskPipeParameters::onBaseButton(bool checked) {
if (checked) {
//clearButtons(refRemove);
//hideObject();
Gui::Selection().clearSelection();
Gui::Selection().clearSelection();
selectionMode = refObjAdd;
//DressUpView->highlightReferences(true);
}
@@ -541,6 +551,11 @@ void TaskPipeOrientation::onButtonRefAdd(bool checked) {
selectionMode = refAdd;
static_cast<ViewProviderPipe*>(vp)->highlightReferences(true, true);
}
else {
Gui::Selection().clearSelection();
selectionMode = none;
static_cast<ViewProviderPipe*>(vp)->highlightReferences(false, true);
}
}
void TaskPipeOrientation::onButtonRefRemove(bool checked) {
@@ -550,6 +565,11 @@ void TaskPipeOrientation::onButtonRefRemove(bool checked) {
selectionMode = refRemove;
static_cast<ViewProviderPipe*>(vp)->highlightReferences(true, true);
}
else {
Gui::Selection().clearSelection();
selectionMode = none;
static_cast<ViewProviderPipe*>(vp)->highlightReferences(false, true);
}
}
void TaskPipeOrientation::onBaseButton(bool checked)
@@ -576,8 +596,6 @@ void TaskPipeOrientation::onBinormalChanged(double)
recomputeFeature();
}
void TaskPipeOrientation::onSelectionChanged(const SelectionChanges& msg) {
if (selectionMode == none)
@@ -602,9 +620,9 @@ void TaskPipeOrientation::onSelectionChanged(const SelectionChanges& msg) {
}
}
else if (selectionMode == refRemove) {
QString sub = QString::fromStdString(msg.pSubName);
QString sub = QString::fromLatin1(msg.pSubName);
if (!sub.isEmpty())
removeFromListWidget(ui->listWidgetReferences, QString::fromUtf8(msg.pSubName));
removeFromListWidget(ui->listWidgetReferences, sub);
else {
ui->profileBaseEdit->clear();
}
@@ -985,7 +1003,8 @@ bool TaskDlgPipeParameters::accept()
int result = dia.exec();
if (result == QDialog::DialogCode::Rejected)
return false;
else if(!dlg.radioXRef->isChecked()) {
if(!dlg.radioXRef->isChecked()) {
if(!pcActiveBody->hasObject(pcPipe->Spine.getValue()) && !pcActiveBody->getOrigin()->hasObject(pcPipe->Spine.getValue())) {
pcPipe->Spine.setValue(PartDesignGui::TaskFeaturePick::makeCopy(pcPipe->Spine.getValue(), "", dlg.radioIndependent->isChecked()),