suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
View File

@ -80,7 +80,7 @@ TaskChamferParameters::TaskChamferParameters(ViewProviderDressUp *DressUpView,QW
std::vector<std::string> strings = pcChamfer->Base.getSubValues();
for (std::vector<std::string>::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)

5
src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
View File

@ -89,7 +89,7 @@ TaskDraftParameters::TaskDraftParameters(ViewProviderDressUp *DressUpView,QWidge
std::vector<std::string> strings = pcDraft->Base.getSubValues();
for (std::vector<std::string>::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)

2
src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
View File

@ -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;

5
src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
View File

@ -80,7 +80,7 @@ TaskFilletParameters::TaskFilletParameters(ViewProviderDressUp *DressUpView,QWid
std::vector<std::string> strings = pcFillet->Base.getSubValues();
for (std::vector<std::string>::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)

4
src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp
View File

@ -133,7 +133,7 @@ void TaskLinearPatternParameters::setupUI()
for (std::vector<App::DocumentObject*>::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);

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) {

4
src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp
View File

@ -118,7 +118,7 @@ void TaskMirroredParameters::setupUI()
for (std::vector<App::DocumentObject*>::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();

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

@ -117,15 +117,12 @@ void TaskMirroredParameters::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
}
// ---------------------
@ -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) {

4
src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp
View File

@ -142,7 +142,7 @@ TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransform
for (std::vector<App::DocumentObject*>::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();

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

@ -141,15 +141,12 @@ TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransform
// 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
}
// ---------------------
}
@ -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
}
}

4
src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp
View File

@ -132,7 +132,7 @@ void TaskPolarPatternParameters::setupUI()
for (std::vector<App::DocumentObject*>::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();

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

@ -131,15 +131,12 @@ void TaskPolarPatternParameters::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
}
// ---------------------
@ -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) {

4
src/Mod/PartDesign/Gui/TaskScaledParameters.cpp
View File

@ -114,7 +114,7 @@ void TaskScaledParameters::setupUI()
for (std::vector<App::DocumentObject*>::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();

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

@ -113,15 +113,12 @@ void TaskScaledParameters::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
}
// ---------------------
@ -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
}
}