From 5376e3a3e5ac7d902b06c97bc8e07a5b23b60ba9 Mon Sep 17 00:00:00 2001 From: jrheinlaender Date: Tue, 15 Oct 2013 20:51:56 +0200 Subject: [PATCH] Fixed bugs in various features that reversed the list of selections --- .../PartDesign/Gui/TaskChamferParameters.cpp | 5 ++-- .../PartDesign/Gui/TaskDraftParameters.cpp | 5 ++-- .../PartDesign/Gui/TaskDressUpParameters.cpp | 2 +- .../PartDesign/Gui/TaskFilletParameters.cpp | 5 ++-- .../Gui/TaskLinearPatternParameters.cpp | 4 ++-- .../Gui/TaskLinearPatternParameters.cpp.orig | 24 ++++++++----------- .../PartDesign/Gui/TaskMirroredParameters.cpp | 4 ++-- .../Gui/TaskMirroredParameters.cpp.orig | 24 ++++++++----------- .../Gui/TaskMultiTransformParameters.cpp | 4 ++-- .../Gui/TaskMultiTransformParameters.cpp.orig | 24 ++++++++----------- .../Gui/TaskPolarPatternParameters.cpp | 4 ++-- .../Gui/TaskPolarPatternParameters.cpp.orig | 24 ++++++++----------- .../PartDesign/Gui/TaskScaledParameters.cpp | 4 ++-- .../Gui/TaskScaledParameters.cpp.orig | 24 ++++++++----------- 14 files changed, 70 insertions(+), 87 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp index a0d53d1a7..9e9d9351f 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp @@ -80,7 +80,7 @@ TaskChamferParameters::TaskChamferParameters(ViewProviderDressUp *DressUpView,QW std::vector strings = pcChamfer->Base.getSubValues(); for (std::vector::const_iterator i = strings.begin(); i != strings.end(); i++) { - ui->listWidgetReferences->insertItem(0, QString::fromStdString(*i)); + ui->listWidgetReferences->addItem(QString::fromStdString(*i)); } // Create context menu QAction* action = new QAction(tr("Remove"), this); @@ -97,7 +97,7 @@ void TaskChamferParameters::onSelectionChanged(const Gui::SelectionChanges& msg) if (msg.Type == Gui::SelectionChanges::AddSelection) { if (referenceSelected(msg)) { if (selectionMode == refAdd) - ui->listWidgetReferences->insertItem(0, QString::fromStdString(msg.pSubName)); + ui->listWidgetReferences->addItem(QString::fromStdString(msg.pSubName)); else removeItemFromListWidget(ui->listWidgetReferences, msg.pSubName); clearButtons(none); @@ -110,6 +110,7 @@ void TaskChamferParameters::clearButtons(const selectionModes notThis) { if (notThis != refAdd) ui->buttonRefAdd->setChecked(false); if (notThis != refRemove) ui->buttonRefRemove->setChecked(false); + DressUpView->highlightReferences(false); } void TaskChamferParameters::onRefDeleted(void) diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp index a967509c6..65702bea7 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp @@ -89,7 +89,7 @@ TaskDraftParameters::TaskDraftParameters(ViewProviderDressUp *DressUpView,QWidge std::vector strings = pcDraft->Base.getSubValues(); for (std::vector::const_iterator i = strings.begin(); i != strings.end(); ++i) { - ui->listWidgetReferences->insertItem(0, QString::fromStdString(*i)); + ui->listWidgetReferences->addItem(QString::fromStdString(*i)); } // Create context menu QAction* action = new QAction(tr("Remove"), this); @@ -114,7 +114,7 @@ void TaskDraftParameters::onSelectionChanged(const Gui::SelectionChanges& msg) if (msg.Type == Gui::SelectionChanges::AddSelection) { if (referenceSelected(msg)) { if (selectionMode == refAdd) - ui->listWidgetReferences->insertItem(0, QString::fromStdString(msg.pSubName)); + ui->listWidgetReferences->addItem(QString::fromStdString(msg.pSubName)); else removeItemFromListWidget(ui->listWidgetReferences, msg.pSubName); clearButtons(none); @@ -151,6 +151,7 @@ void TaskDraftParameters::clearButtons(const selectionModes notThis) if (notThis != refRemove) ui->buttonRefRemove->setChecked(false); if (notThis != line) ui->buttonLine->setChecked(false); if (notThis != plane) ui->buttonPlane->setChecked(false); + DressUpView->highlightReferences(false); } void TaskDraftParameters::onButtonPlane(bool checked) diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp index 31e1ca1f1..82afe610d 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp @@ -96,8 +96,8 @@ const bool TaskDressUpParameters::referenceSelected(const Gui::SelectionChanges& else return false; } - pcDressUp->Base.setValue(base, refs); DressUpView->highlightReferences(false); + pcDressUp->Base.setValue(base, refs); pcDressUp->getDocument()->recomputeFeature(pcDressUp); return true; diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp index 19ecbc715..089534a6f 100644 --- a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp @@ -80,7 +80,7 @@ TaskFilletParameters::TaskFilletParameters(ViewProviderDressUp *DressUpView,QWid std::vector strings = pcFillet->Base.getSubValues(); for (std::vector::const_iterator i = strings.begin(); i != strings.end(); i++) { - ui->listWidgetReferences->insertItem(0, QString::fromStdString(*i)); + ui->listWidgetReferences->addItem(QString::fromStdString(*i)); } // Create context menu QAction* action = new QAction(tr("Remove"), this); @@ -97,7 +97,7 @@ void TaskFilletParameters::onSelectionChanged(const Gui::SelectionChanges& msg) if (msg.Type == Gui::SelectionChanges::AddSelection) { if (referenceSelected(msg)) { if (selectionMode == refAdd) - ui->listWidgetReferences->insertItem(0, QString::fromStdString(msg.pSubName)); + ui->listWidgetReferences->addItem(QString::fromStdString(msg.pSubName)); else removeItemFromListWidget(ui->listWidgetReferences, msg.pSubName); clearButtons(none); @@ -110,6 +110,7 @@ void TaskFilletParameters::clearButtons(const selectionModes notThis) { if (notThis != refAdd) ui->buttonRefAdd->setChecked(false); if (notThis != refRemove) ui->buttonRefRemove->setChecked(false); + DressUpView->highlightReferences(false); } void TaskFilletParameters::onRefDeleted(void) diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp index ad2c75785..0a560e66c 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp @@ -133,7 +133,7 @@ void TaskLinearPatternParameters::setupUI() for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) { if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); + ui->listWidgetFeatures->addItem(QString::fromLatin1((*i)->getNameInDocument())); } // --------------------- @@ -235,7 +235,7 @@ void TaskLinearPatternParameters::onSelectionChanged(const Gui::SelectionChanges if (msg.Type == Gui::SelectionChanges::AddSelection) { if (originalSelected(msg)) { if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); + ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp.orig b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp.orig index 8357e5423..00495a34d 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp.orig +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp.orig @@ -132,15 +132,12 @@ void TaskLinearPatternParameters::setupUI() // Fill data into dialog elements for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - if ((*i) != NULL) { // find the first valid original - ui->lineOriginal->setText(QString::fromLatin1((*i)->getNameInDocument())); - break; - } -======= if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii((*i)->getNameInDocument())); ->>>>>>> Enable multiple originals for the transformed features +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii((*i)->getNameInDocument())); +>>>>>>> Fixed bugs in various features that reversed the list of selections } // --------------------- @@ -241,18 +238,17 @@ void TaskLinearPatternParameters::onSelectionChanged(const Gui::SelectionChanges { if (msg.Type == Gui::SelectionChanges::AddSelection) { if (originalSelected(msg)) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - ui->lineOriginal->setText(QString::fromLatin1(msg.pObjectName)); - } else if (referenceSelectionMode) { -======= if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii(msg.pObjectName)); +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii(msg.pObjectName)); +>>>>>>> Fixed bugs in various features that reversed the list of selections else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); exitSelectionMode(); } else if (selectionMode == reference) { ->>>>>>> Enable multiple originals for the transformed features // Note: ReferenceSelection has already checked the selection for validity exitSelectionMode(); if (!blockUpdate) { diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp index e99932399..7ef750785 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp @@ -118,7 +118,7 @@ void TaskMirroredParameters::setupUI() for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) { if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); + ui->listWidgetFeatures->addItem(QString::fromLatin1((*i)->getNameInDocument())); } // --------------------- @@ -192,7 +192,7 @@ void TaskMirroredParameters::onSelectionChanged(const Gui::SelectionChanges& msg if (originalSelected(msg)) { if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); + ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); exitSelectionMode(); diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp.orig b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp.orig index 37fc6cf74..d4e499753 100644 --- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp.orig +++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp.orig @@ -117,15 +117,12 @@ void TaskMirroredParameters::setupUI() // Fill data into dialog elements for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - if ((*i) != NULL) { // find the first valid original - ui->lineOriginal->setText(QString::fromLatin1((*i)->getNameInDocument())); - break; - } -======= if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii((*i)->getNameInDocument())); ->>>>>>> Enable multiple originals for the transformed features +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii((*i)->getNameInDocument())); +>>>>>>> Fixed bugs in various features that reversed the list of selections } // --------------------- @@ -198,17 +195,16 @@ void TaskMirroredParameters::onSelectionChanged(const Gui::SelectionChanges& msg if (msg.Type == Gui::SelectionChanges::AddSelection) { if (originalSelected(msg)) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - ui->lineOriginal->setText(QString::fromLatin1(msg.pObjectName)); - } else if (referenceSelectionMode) { -======= if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii(msg.pObjectName)); +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii(msg.pObjectName)); +>>>>>>> Fixed bugs in various features that reversed the list of selections else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); exitSelectionMode(); } else if (selectionMode == reference) { ->>>>>>> Enable multiple originals for the transformed features // Note: ReferenceSelection has already checked the selection for validity exitSelectionMode(); if (!blockUpdate) { diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp index 98a2f4635..7cd9a8eaf 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp @@ -142,7 +142,7 @@ TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransform for (std::vector::const_iterator i = originals.begin(); i != originals.end(); i++) { if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); + ui->listWidgetFeatures->addItem(QString::fromLatin1((*i)->getNameInDocument())); } // --------------------- } @@ -151,7 +151,7 @@ void TaskMultiTransformParameters::onSelectionChanged(const Gui::SelectionChange { if (originalSelected(msg)) { if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); + ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); exitSelectionMode(); diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp.orig b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp.orig index ba9a802e0..c9c1474e5 100644 --- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp.orig +++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp.orig @@ -141,15 +141,12 @@ TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransform // Fill data into dialog elements for (std::vector::const_iterator i = originals.begin(); i != originals.end(); i++) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - if ((*i) != NULL) { // find the first valid original - ui->lineOriginal->setText(QString::fromLatin1((*i)->getNameInDocument())); - break; - } -======= if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii((*i)->getNameInDocument())); ->>>>>>> Enable multiple originals for the transformed features +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii((*i)->getNameInDocument())); +>>>>>>> Fixed bugs in various features that reversed the list of selections } // --------------------- } @@ -157,16 +154,15 @@ TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransform void TaskMultiTransformParameters::onSelectionChanged(const Gui::SelectionChanges& msg) { if (originalSelected(msg)) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - App::DocumentObject* selectedObject = TransformedView->getObject()->getDocument()->getActiveObject(); - ui->lineOriginal->setText(QString::fromLatin1(selectedObject->getNameInDocument())); -======= if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii(msg.pObjectName)); +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii(msg.pObjectName)); +>>>>>>> Fixed bugs in various features that reversed the list of selections else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); exitSelectionMode(); ->>>>>>> Enable multiple originals for the transformed features } } diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp index 16faa793d..330e585e6 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp @@ -132,7 +132,7 @@ void TaskPolarPatternParameters::setupUI() for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) { if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); + ui->listWidgetFeatures->addItem(QString::fromLatin1((*i)->getNameInDocument())); } // --------------------- @@ -206,7 +206,7 @@ void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges& if (originalSelected(msg)) { if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); + ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); exitSelectionMode(); diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp.orig b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp.orig index 5ab4878fc..0b5b6c0f5 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp.orig +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp.orig @@ -131,15 +131,12 @@ void TaskPolarPatternParameters::setupUI() // Fill data into dialog elements for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - if ((*i) != NULL) { // find the first valid original - ui->lineOriginal->setText(QString::fromLatin1((*i)->getNameInDocument())); - break; - } -======= if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii((*i)->getNameInDocument())); ->>>>>>> Enable multiple originals for the transformed features +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii((*i)->getNameInDocument())); +>>>>>>> Fixed bugs in various features that reversed the list of selections } // --------------------- @@ -212,17 +209,16 @@ void TaskPolarPatternParameters::onSelectionChanged(const Gui::SelectionChanges& if (msg.Type == Gui::SelectionChanges::AddSelection) { if (originalSelected(msg)) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - ui->lineOriginal->setText(QString::fromLatin1(msg.pObjectName)); - } else if (referenceSelectionMode) { -======= if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii(msg.pObjectName)); +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii(msg.pObjectName)); +>>>>>>> Fixed bugs in various features that reversed the list of selections else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); exitSelectionMode(); } else if (selectionMode == reference) { ->>>>>>> Enable multiple originals for the transformed features // Note: ReferenceSelection has already checked the selection for validity exitSelectionMode(); if (!blockUpdate) { diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp index fd5995794..815bcff7c 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp @@ -114,7 +114,7 @@ void TaskScaledParameters::setupUI() for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) { if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); + ui->listWidgetFeatures->addItem(QString::fromLatin1((*i)->getNameInDocument())); } // --------------------- @@ -149,7 +149,7 @@ void TaskScaledParameters::onSelectionChanged(const Gui::SelectionChanges& msg) { if (originalSelected(msg)) { if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); + ui->listWidgetFeatures->addItem(QString::fromLatin1(msg.pObjectName)); else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); exitSelectionMode(); diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp.orig b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp.orig index 5729ca98d..a727feefe 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp.orig +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp.orig @@ -113,15 +113,12 @@ void TaskScaledParameters::setupUI() // Fill data into dialog elements for (std::vector::const_iterator i = originals.begin(); i != originals.end(); ++i) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - if ((*i) != NULL) { // find the first valid original - ui->lineOriginal->setText(QString::fromLatin1((*i)->getNameInDocument())); - break; - } -======= if ((*i) != NULL) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii((*i)->getNameInDocument())); ->>>>>>> Enable multiple originals for the transformed features +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1((*i)->getNameInDocument())); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii((*i)->getNameInDocument())); +>>>>>>> Fixed bugs in various features that reversed the list of selections } // --------------------- @@ -155,16 +152,15 @@ void TaskScaledParameters::updateUI() void TaskScaledParameters::onSelectionChanged(const Gui::SelectionChanges& msg) { if (originalSelected(msg)) { -<<<<<<< eb9a4ab96f8703de819cdc5e405217b784ccff90 - App::DocumentObject* selectedObject = TransformedView->getObject()->getDocument()->getActiveObject(); - ui->lineOriginal->setText(QString::fromLatin1(selectedObject->getNameInDocument())); -======= if (selectionMode == addFeature) - ui->listWidgetFeatures->insertItem(0, QString::fromAscii(msg.pObjectName)); +<<<<<<< 9bd4990584bfddd638e710ece8d981c1d8e4cc5e + ui->listWidgetFeatures->insertItem(0, QString::fromLatin1(msg.pObjectName)); +======= + ui->listWidgetFeatures->addItem(QString::fromAscii(msg.pObjectName)); +>>>>>>> Fixed bugs in various features that reversed the list of selections else removeItemFromListWidget(ui->listWidgetFeatures, msg.pObjectName); exitSelectionMode(); ->>>>>>> Enable multiple originals for the transformed features } }