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

Fixed bugs in various features that reversed the list of selections

Browse Source
This commit is contained in:
jrheinlaender
2013-10-15 20:51:56 +02:00
committed by Stefan Tröger
parent f91d5013a3
commit 5376e3a3e5
14 changed files with 70 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp.orig
View File

@@ -132,15 +132,12 @@ void TaskLinearPatternParameters::setupUI()
// Fill data into dialog elements
for (std::vector<App::DocumentObject*>::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) {