ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 18:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix of IPAL19366(Qt4 porting. Adding of items in the list is very long action).

Browse Source
This commit is contained in:
akl 2008-03-31 12:56:23 +00:00
parent 3f36c66f5a
commit 4352a0e199
1 changed files with 67 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/SMESHGUI/SMESHGUI_GroupDlg.cxx
View File

@ -1146,12 +1146,21 @@ void SMESHGUI_GroupDlg::onObjectSelectionChanged()
aNbItems = SMESH::GetNameOfSelectedElements(mySelector, myActor->getIO(), aListStr); aNbItems = SMESH::GetNameOfSelectedElements(mySelector, myActor->getIO(), aListStr);
} }
if (aNbItems > 0) { if (aNbItems > 0) {
QListWidgetItem* anItem;
QList<QListWidgetItem*> listItemsToSel;
QStringList anElements = aListStr.split(" ", QString::SkipEmptyParts); QStringList anElements = aListStr.split(" ", QString::SkipEmptyParts);
for (QStringList::iterator it = anElements.begin(); it != anElements.end(); ++it) { for (QStringList::iterator it = anElements.begin(); it != anElements.end(); ++it) {
QList<QListWidgetItem*> found = myElements->findItems(*it, Qt::MatchExactly); QList<QListWidgetItem*> found = myElements->findItems(*it, Qt::MatchExactly);
QListWidgetItem* anItem; foreach(anItem, found)
foreach(anItem, found) anItem->setSelected(true); if (!anItem->isSelected())
listItemsToSel.push_back(anItem);
} }
bool blocked = myElements->signalsBlocked();
myElements->blockSignals(true);
foreach(anItem, listItemsToSel) anItem->setSelected(true);
myElements->blockSignals(blocked);
onListSelectionChanged();
listItemsToSel.clear();
} }
} }
} }
@ -1357,6 +1366,8 @@ void SMESHGUI_GroupDlg::onAdd()
mySelector->SetSelectionMode(ActorSelection); mySelector->SetSelectionMode(ActorSelection);
} }
QListWidgetItem* anItem = 0;
QList<QListWidgetItem*> listItemsToSel;
if (myCurrentLineEdit == 0) { if (myCurrentLineEdit == 0) {
//if (aNbSel != 1) { myIsBusy = false; return; } //if (aNbSel != 1) { myIsBusy = false; return; }
@ -1372,16 +1383,24 @@ void SMESHGUI_GroupDlg::onAdd()
QStringList anElements = aListStr.split(" ", QString::SkipEmptyParts); QStringList anElements = aListStr.split(" ", QString::SkipEmptyParts);
for (QStringList::iterator it = anElements.begin(); it != anElements.end(); ++it) { for (QStringList::iterator it = anElements.begin(); it != anElements.end(); ++it) {
QList<QListWidgetItem*> found = myElements->findItems(*it, Qt::MatchExactly); QList<QListWidgetItem*> found = myElements->findItems(*it, Qt::MatchExactly);
QListWidgetItem* anItem;
if (found.count() == 0) { if (found.count() == 0) {
anItem = new QListWidgetItem(*it); anItem = new QListWidgetItem(*it);
myElements->addItem(anItem); myElements->addItem(anItem);
anItem->setSelected(true); if (!anItem->isSelected())
listItemsToSel.push_back(anItem);
} }
else { else {
foreach(anItem, found) anItem->setSelected(true); foreach(anItem, found)
if (!anItem->isSelected())
listItemsToSel.push_back(anItem);
} }
} }
bool blocked = myElements->signalsBlocked();
myElements->blockSignals(true);
foreach(anItem, listItemsToSel) anItem->setSelected(true);
myElements->blockSignals(blocked);
onListSelectionChanged();
listItemsToSel.clear();
} }
} else if (myCurrentLineEdit == mySubMeshLine) { } else if (myCurrentLineEdit == mySubMeshLine) {
//SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects()); //SALOME_ListIteratorOfListIO anIt (mySelectionMgr->StoredIObjects());
@ -1402,16 +1421,24 @@ void SMESHGUI_GroupDlg::onAdd()
for (int i = 0; i < k; i++) { for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]); QString aText = QString::number(anElements[i]);
QList<QListWidgetItem*> found = myElements->findItems(aText, Qt::MatchExactly); QList<QListWidgetItem*> found = myElements->findItems(aText, Qt::MatchExactly);
QListWidgetItem* anItem = 0;
if (found.count() == 0) { if (found.count() == 0) {
anItem = new QListWidgetItem(aText); anItem = new QListWidgetItem(aText);
myElements->addItem(anItem); myElements->addItem(anItem);
anItem->setSelected(true); if (!anItem->isSelected())
listItemsToSel.push_back(anItem);
} }
else { else {
foreach(anItem, found) anItem->setSelected(true); foreach(anItem, found)
if (!anItem->isSelected())
listItemsToSel.push_back(anItem);
} }
} }
bool blocked = myElements->signalsBlocked();
myElements->blockSignals(true);
foreach(anItem, listItemsToSel) anItem->setSelected(true);
myElements->blockSignals(blocked);
onListSelectionChanged();
listItemsToSel.clear();
} }
catch (const SALOME::SALOME_Exception& ex) { catch (const SALOME::SALOME_Exception& ex) {
SalomeApp_Tools::QtCatchCorbaException(ex); SalomeApp_Tools::QtCatchCorbaException(ex);
@ -1440,16 +1467,24 @@ void SMESHGUI_GroupDlg::onAdd()
for (int i = 0; i < k; i++) { for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]); QString aText = QString::number(anElements[i]);
QList<QListWidgetItem*> found = myElements->findItems(aText, Qt::MatchExactly); QList<QListWidgetItem*> found = myElements->findItems(aText, Qt::MatchExactly);
QListWidgetItem* anItem = 0;
if (found.count() == 0) { if (found.count() == 0) {
anItem = new QListWidgetItem(aText); anItem = new QListWidgetItem(aText);
myElements->addItem(anItem); myElements->addItem(anItem);
anItem->setSelected(true); if (!anItem->isSelected())
listItemsToSel.push_back(anItem);
} }
else { else {
foreach(anItem, found) anItem->setSelected(true); foreach(anItem, found)
if (!anItem->isSelected())
listItemsToSel.push_back(anItem);
} }
} }
bool blocked = myElements->signalsBlocked();
myElements->blockSignals(true);
foreach(anItem, listItemsToSel) anItem->setSelected(true);
myElements->blockSignals(blocked);
onListSelectionChanged();
listItemsToSel.clear();
} }
} }
} }
@ -1490,16 +1525,24 @@ void SMESHGUI_GroupDlg::onAdd()
for (int i = 0; i < k; i++) { for (int i = 0; i < k; i++) {
QString aText = QString::number(anElements[i]); QString aText = QString::number(anElements[i]);
QList<QListWidgetItem*> found = myElements->findItems(aText, Qt::MatchExactly); QList<QListWidgetItem*> found = myElements->findItems(aText, Qt::MatchExactly);
QListWidgetItem* anItem = 0;
if (found.count() == 0) { if (found.count() == 0) {
anItem = new QListWidgetItem(aText); anItem = new QListWidgetItem(aText);
myElements->addItem(anItem); myElements->addItem(anItem);
anItem->setSelected(true); if (!anItem->isSelected())
listItemsToSel.push_back(anItem);
} }
else { else {
foreach(anItem, found) anItem->setSelected(true); foreach(anItem, found)
if (!anItem->isSelected())
listItemsToSel.push_back(anItem);
} }
} }
bool blocked = myElements->signalsBlocked();
myElements->blockSignals(true);
foreach(anItem, listItemsToSel) anItem->setSelected(true);
myElements->blockSignals(blocked);
onListSelectionChanged();
listItemsToSel.clear();
} }
//VSR: mySelectGeomGroup->setChecked(false); //VSR: mySelectGeomGroup->setChecked(false);
@ -1638,11 +1681,19 @@ void SMESHGUI_GroupDlg::onSort()
std::sort(anArray.begin(), anArray.end()); std::sort(anArray.begin(), anArray.end());
// anArray.sort(); // anArray.sort();
myElements->clear(); myElements->clear();
QListWidgetItem* anItem;
QList<QListWidgetItem*> listItemsToSel;
for (i = 0; i < k; i++) { for (i = 0; i < k; i++) {
QListWidgetItem* anItem = new QListWidgetItem(QString::number(anArray[i])); anItem = new QListWidgetItem(QString::number(anArray[i]));
myElements->addItem(anItem); myElements->addItem(anItem);
anItem->setSelected(aSelected.contains(anArray[i])); if (aSelected.contains(anArray[i]))
listItemsToSel.push_back(anItem);
} }
bool blocked = myElements->signalsBlocked();
myElements->blockSignals(true);
foreach(anItem, listItemsToSel) anItem->setSelected(true);
myElements->blockSignals(blocked);
listItemsToSel.clear();
myIsBusy = false; myIsBusy = false;
} }
} }