Skip to content

Commit

Permalink
[FEM] constraint contact: sort out already available function
Browse files Browse the repository at this point in the history
additionally add some comments in TaskFemConstraint.cpp
  • Loading branch information
donovaly authored and berndhahnebach committed Feb 25, 2020
1 parent 75d082c commit 520cfd8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 31 deletions.
24 changes: 13 additions & 11 deletions src/Mod/Fem/Gui/TaskFemConstraint.cpp
Expand Up @@ -136,21 +136,23 @@ const std::string TaskFemConstraint::getScale() const //OvG: Return pre-calculat
}

void TaskFemConstraint::setSelection(QListWidgetItem* item) {
std::string s = item->text().toStdString();
std::string docName = ConstraintView->getObject()->getDocument()->getName();
// highlights the list item in the model

// get the document name
std::string docName = ConstraintView->getObject()->getDocument()->getName();
// name of the item
std::string ItemName = item->text().toStdString();
// the object name is the part of the before the ':' of the item name
std::string delimiter = ":";

size_t pos = 0;
std::string objName;
std::string subName;
pos = s.find(delimiter);
objName = s.substr(0, pos);
s.erase(0, pos + delimiter.length());
subName = s;

pos = ItemName.find(delimiter);
std::string objName = ItemName.substr(0, pos);
// the subName is the name part tbehind the ':'
ItemName.erase(0, pos + delimiter.length());
// clear existing selection
Gui::Selection().clearSelection();
Gui::Selection().addSelection(docName.c_str(), objName.c_str(), subName.c_str(), 0, 0, 0);
// highligh the selected item
Gui::Selection().addSelection(docName.c_str(), objName.c_str(), ItemName.c_str(), 0, 0, 0);
}

void TaskFemConstraint::onReferenceDeleted(const int row) {
Expand Down
18 changes: 0 additions & 18 deletions src/Mod/Fem/Gui/TaskFemConstraintContact.cpp
Expand Up @@ -384,24 +384,6 @@ void TaskFemConstraintContact::removeFromSelectionMaster()
updateUI();
}

void TaskFemConstraintContact::setSelection(QListWidgetItem* item){
std::string docName=ConstraintView->getObject()->getDocument()->getName();

std::string s = item->text().toStdString();
std::string delimiter = ":";

size_t pos = 0;
std::string objName;
std::string subName;
pos = s.find(delimiter);
objName = s.substr(0, pos);
s.erase(0, pos + delimiter.length());
subName=s;

Gui::Selection().clearSelection();
Gui::Selection().addSelection(docName.c_str(),objName.c_str(),subName.c_str(),0,0,0);
}

void TaskFemConstraintContact::onReferenceDeletedSlave() {
TaskFemConstraintContact::removeFromSelectionSlave();
}
Expand Down
2 changes: 0 additions & 2 deletions src/Mod/Fem/Gui/TaskFemConstraintContact.h
Expand Up @@ -38,7 +38,6 @@
#include <QObject>
#include <Base/Console.h>
#include <App/DocumentObject.h>
#include <QListWidgetItem>

class Ui_TaskFemConstraintContact;

Expand All @@ -61,7 +60,6 @@ private Q_SLOTS:
void removeFromSelectionSlave();
void addToSelectionMaster();
void removeFromSelectionMaster();
void setSelection(QListWidgetItem* item);

protected:
void changeEvent(QEvent *e);
Expand Down

0 comments on commit 520cfd8

Please sign in to comment.