mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-25 08:50:35 +05:00
The selections of elements corrected.
This commit is contained in:
parent
255ab4e2ee
commit
783b5a717c
@ -438,34 +438,19 @@ void SMESHGUI_ExtrusionDlg::onTextChange (const QString& theNewText)
|
|||||||
aMesh = myActor->GetObject()->GetMesh();
|
aMesh = myActor->GetObject()->GetMesh();
|
||||||
|
|
||||||
if (aMesh) {
|
if (aMesh) {
|
||||||
//mySelectionMgr->clearSelected();
|
|
||||||
//mySelectionMgr->AddIObject(myActor->getIO());
|
|
||||||
SALOME_ListIO aList;
|
|
||||||
aList.Append(myActor->getIO());
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
|
|
||||||
QStringList aListId = QStringList::split(" ", theNewText, false);
|
QStringList aListId = QStringList::split(" ", theNewText, false);
|
||||||
|
|
||||||
if (send == LineEditElements) {
|
if (send == LineEditElements) {
|
||||||
const Handle(SALOME_InteractiveObject)& anIO = myActor->getIO();
|
const Handle(SALOME_InteractiveObject)& anIO = myActor->getIO();
|
||||||
TColStd_IndexedMapOfInteger selectedIndices;
|
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
mySelector->GetIndex(anIO, selectedIndices);
|
|
||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e) {
|
if (e)
|
||||||
//if (!mySelectionMgr->IsIndexSelected(myActor->getIO(), e->GetID())) {
|
newIndices.Add(e->GetID());
|
||||||
if (selectedIndices.Add(e->GetID())) {
|
myNbOkElements++;
|
||||||
//mySelectionMgr->AddOrRemoveIndex(myActor->getIO(), e->GetID(), true);
|
|
||||||
newIndices.Add(e->GetID());
|
|
||||||
}
|
|
||||||
myNbOkElements++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (newIndices.Extent() > 0) {
|
|
||||||
mySelector->AddOrRemoveIndex(anIO, newIndices, true);
|
|
||||||
myViewWindow->highlight( anIO, true, true );
|
|
||||||
}
|
}
|
||||||
|
mySelector->AddOrRemoveIndex(anIO, newIndices, false);
|
||||||
|
myViewWindow->highlight( anIO, true, true );
|
||||||
myElementsId = theNewText;
|
myElementsId = theNewText;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -261,9 +261,7 @@ void SMESHGUI_RemoveElementsDlg::ClickOnApply()
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (aResult) {
|
if (aResult) {
|
||||||
SALOME_ListIO aList;
|
myEditCurrentArgument->clear();
|
||||||
aList.Append(myActor->getIO());
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
SMESH::UpdateView();
|
SMESH::UpdateView();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -314,36 +312,27 @@ void SMESHGUI_RemoveElementsDlg::onTextChange (const QString& theNewText)
|
|||||||
if(myActor){
|
if(myActor){
|
||||||
if(SMDS_Mesh* aMesh = myActor->GetObject()->GetMesh()){
|
if(SMDS_Mesh* aMesh = myActor->GetObject()->GetMesh()){
|
||||||
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
|
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
|
||||||
SALOME_ListIO aList;
|
|
||||||
aList.Append(anIO);
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
|
|
||||||
TColStd_IndexedMapOfInteger selectedIndices;
|
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
mySelector->GetIndex(anIO,selectedIndices);
|
|
||||||
|
|
||||||
QStringList aListId = QStringList::split(" ", theNewText, false);
|
QStringList aListId = QStringList::split(" ", theNewText, false);
|
||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
if(const SMDS_MeshElement *anElem = aMesh->FindElement(aListId[i].toInt())) {
|
if(const SMDS_MeshElement *anElem = aMesh->FindElement(aListId[i].toInt())) {
|
||||||
if (selectedIndices.Add(anElem->GetID())) {
|
newIndices.Add(anElem->GetID());
|
||||||
newIndices.Add(anElem->GetID());
|
|
||||||
}
|
|
||||||
myNbOkElements++;
|
myNbOkElements++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newIndices.Extent() > 0){
|
mySelector->AddOrRemoveIndex(anIO,newIndices,false);
|
||||||
mySelector->AddOrRemoveIndex(anIO,newIndices,true);
|
myViewWindow->highlight(anIO,true,true);
|
||||||
myViewWindow->highlight(anIO,true,true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (myNbOkElements) {
|
if (myNbOkElements) {
|
||||||
buttonOk->setEnabled(true);
|
buttonOk->setEnabled(true);
|
||||||
buttonApply->setEnabled(true);
|
buttonApply->setEnabled(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
myBusy = false;
|
myBusy = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -214,7 +214,11 @@ void SMESHGUI_RemoveNodesDlg::Init()
|
|||||||
connect(SelectButtonC1A1, SIGNAL (clicked()), this, SLOT(SetEditCurrentArgument()));
|
connect(SelectButtonC1A1, SIGNAL (clicked()), this, SLOT(SetEditCurrentArgument()));
|
||||||
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
|
connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog()));
|
||||||
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
|
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
|
||||||
|
/* to close dialog if study change */
|
||||||
|
connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(ClickOnCancel()));
|
||||||
|
connect(myEditCurrentArgument, SIGNAL(textChanged(const QString&)),
|
||||||
|
SLOT(onTextChange(const QString&)));
|
||||||
|
|
||||||
/* Move widget on the botton right corner of main widget */
|
/* Move widget on the botton right corner of main widget */
|
||||||
int x, y;
|
int x, y;
|
||||||
mySMESHGUI->DefineDlgPosition(this, x, y);
|
mySMESHGUI->DefineDlgPosition(this, x, y);
|
||||||
@ -259,9 +263,7 @@ void SMESHGUI_RemoveNodesDlg::ClickOnApply()
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (aResult) {
|
if (aResult) {
|
||||||
SALOME_ListIO aList;
|
myEditCurrentArgument->clear();
|
||||||
aList.Append(myActor->getIO());
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
SMESH::UpdateView();
|
SMESH::UpdateView();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -311,28 +313,19 @@ void SMESHGUI_RemoveNodesDlg::onTextChange (const QString& theNewText)
|
|||||||
if(myActor){
|
if(myActor){
|
||||||
if(SMDS_Mesh* aMesh = myActor->GetObject()->GetMesh()){
|
if(SMDS_Mesh* aMesh = myActor->GetObject()->GetMesh()){
|
||||||
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
|
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
|
||||||
SALOME_ListIO aList;
|
|
||||||
aList.Append(anIO);
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
|
|
||||||
TColStd_IndexedMapOfInteger selectedIndices;
|
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
mySelector->GetIndex(anIO,selectedIndices);
|
|
||||||
|
|
||||||
QStringList aListId = QStringList::split(" ", theNewText, false);
|
QStringList aListId = QStringList::split(" ", theNewText, false);
|
||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
if (const SMDS_MeshNode *aNode = aMesh->FindNode(aListId[ i ].toInt())) {
|
if (const SMDS_MeshNode *aNode = aMesh->FindNode(aListId[i].toInt())) {
|
||||||
if (selectedIndices.Add(aNode->GetID())) {
|
newIndices.Add(aNode->GetID());
|
||||||
newIndices.Add(aNode->GetID());
|
|
||||||
}
|
|
||||||
myNbOkNodes++;
|
myNbOkNodes++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(newIndices.Extent() > 0){
|
mySelector->AddOrRemoveIndex(anIO,newIndices,false);
|
||||||
mySelector->AddOrRemoveIndex(anIO,newIndices,true);
|
myViewWindow->highlight(anIO,true,true);
|
||||||
myViewWindow->highlight(anIO,true,true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -522,35 +522,22 @@ void SMESHGUI_RevolutionDlg::onTextChange (const QString& theNewText)
|
|||||||
|
|
||||||
if (aMesh) {
|
if (aMesh) {
|
||||||
if (send == LineEditElements) {
|
if (send == LineEditElements) {
|
||||||
//mySelectionMgr->clearSelected();
|
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
|
||||||
//mySelectionMgr->AddIObject(myActor->getIO());
|
|
||||||
SALOME_ListIO aList;
|
|
||||||
aList.Append(myActor->getIO());
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
|
|
||||||
TColStd_IndexedMapOfInteger selectedIndices;
|
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
mySelector->GetIndex(myActor->getIO(), selectedIndices);
|
|
||||||
|
|
||||||
QStringList aListId = QStringList::split(" ", theNewText, false);
|
QStringList aListId = QStringList::split(" ", theNewText, false);
|
||||||
|
|
||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e) {
|
if (e)
|
||||||
//if (!mySelectionMgr->IsIndexSelected(myActor->getIO(), e->GetID())) {
|
newIndices.Add(e->GetID());
|
||||||
if (selectedIndices.Add(e->GetID())) {
|
myNbOkElements++;
|
||||||
//mySelectionMgr->AddOrRemoveIndex (myActor->getIO(), e->GetID(), true);
|
|
||||||
newIndices.Add(e->GetID());
|
|
||||||
}
|
|
||||||
myNbOkElements++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (newIndices.Extent() > 0)
|
|
||||||
{
|
|
||||||
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, true);
|
|
||||||
myViewWindow->highlight( myActor->getIO(), true, true );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
|
||||||
|
myViewWindow->highlight( myActor->getIO(), true, true );
|
||||||
|
|
||||||
myElementsId = theNewText;
|
myElementsId = theNewText;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -479,34 +479,21 @@ void SMESHGUI_RotationDlg::onTextChange (const QString& theNewText)
|
|||||||
|
|
||||||
if (aMesh) {
|
if (aMesh) {
|
||||||
if (send == LineEditElements) {
|
if (send == LineEditElements) {
|
||||||
//mySelectionMgr->clearSelected();
|
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
|
||||||
//mySelectionMgr->AddIObject(myActor->getIO());
|
|
||||||
SALOME_ListIO aList;
|
|
||||||
aList.Append(myActor->getIO());
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
|
|
||||||
TColStd_IndexedMapOfInteger selectedIndices;
|
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
mySelector->GetIndex( myActor->getIO(), selectedIndices);
|
|
||||||
|
|
||||||
QStringList aListId = QStringList::split(" ", theNewText, false);
|
QStringList aListId = QStringList::split(" ", theNewText, false);
|
||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e) {
|
if (e)
|
||||||
//if (!mySelectionMgr->IsIndexSelected(myActor->getIO(), e->GetID())) {
|
newIndices.Add(e->GetID());
|
||||||
if (selectedIndices.Add(e->GetID())) {
|
myNbOkElements++;
|
||||||
//mySelectionMgr->AddOrRemoveIndex (myActor->getIO(), e->GetID(), true);
|
|
||||||
newIndices.Add(e->GetID());
|
|
||||||
}
|
|
||||||
myNbOkElements++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (newIndices.Extent() > 0){
|
|
||||||
mySelector->AddOrRemoveIndex( myActor->getIO(), newIndices, true );
|
|
||||||
myViewWindow->highlight( myActor->getIO(), true, true );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mySelector->AddOrRemoveIndex( anIO, newIndices, false );
|
||||||
|
myViewWindow->highlight( anIO, true, true );
|
||||||
|
|
||||||
myElementsId = theNewText;
|
myElementsId = theNewText;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -86,9 +86,9 @@ QtxValue SMESHGUI_Selection::param( const int ind, const QString& p ) const
|
|||||||
else if ( p=="hasReference" ) val = QtxValue( hasReference( ind ) );
|
else if ( p=="hasReference" ) val = QtxValue( hasReference( ind ) );
|
||||||
else if ( p=="isVisible" ) val = QtxValue( isVisible( ind ) );
|
else if ( p=="isVisible" ) val = QtxValue( isVisible( ind ) );
|
||||||
|
|
||||||
// printf( "--> param() : [%s] = %s (%s)\n", p.latin1(), val.toString().latin1(), val.typeName() );
|
printf( "--> param() : [%s] = %s (%s)\n", p.latin1(), val.toString().latin1(), val.typeName() );
|
||||||
// if ( val.type() == QVariant::List )
|
if ( val.type() == QVariant::List )
|
||||||
// cout << "size: " << val.toList().count() << endl;
|
cout << "size: " << val.toList().count() << endl;
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -321,6 +321,7 @@ void SMESHGUI_SmoothingDlg::Init()
|
|||||||
|
|
||||||
myEditCurrentArgument = LineEditElements;
|
myEditCurrentArgument = LineEditElements;
|
||||||
LineEditElements->setFocus();
|
LineEditElements->setFocus();
|
||||||
|
LineEditElements->clear();
|
||||||
LineEditNodes->clear();
|
LineEditNodes->clear();
|
||||||
myElementsId = "";
|
myElementsId = "";
|
||||||
myNbOkElements = 0;
|
myNbOkElements = 0;
|
||||||
@ -456,57 +457,33 @@ void SMESHGUI_SmoothingDlg::onTextChange (const QString& theNewText)
|
|||||||
aMesh = myActor->GetObject()->GetMesh();
|
aMesh = myActor->GetObject()->GetMesh();
|
||||||
|
|
||||||
if (aMesh) {
|
if (aMesh) {
|
||||||
//mySelectionMgr->clearSelected();
|
|
||||||
//mySelectionMgr->AddIObject(myActor->getIO());
|
|
||||||
SALOME_ListIO aList;
|
|
||||||
aList.Append(myActor->getIO());
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
|
|
||||||
QStringList aListId = QStringList::split(" ", theNewText, false);
|
QStringList aListId = QStringList::split(" ", theNewText, false);
|
||||||
|
|
||||||
if (send == LineEditElements) {
|
if (send == LineEditElements) {
|
||||||
const Handle(SALOME_InteractiveObject)& anIO = myActor->getIO();
|
const Handle(SALOME_InteractiveObject)& anIO = myActor->getIO();
|
||||||
TColStd_IndexedMapOfInteger selectedIndices;
|
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
mySelector->GetIndex( anIO, selectedIndices );
|
|
||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e) {
|
if (e)
|
||||||
//if (!mySelectionMgr->IsIndexSelected(myActor->getIO(), e->GetID())) {
|
newIndices.Add(e->GetID());
|
||||||
if (selectedIndices.Add(e->GetID())) {
|
myNbOkElements++;
|
||||||
//mySelectionMgr->AddOrRemoveIndex(myActor->getIO(), e->GetID(), true);
|
|
||||||
newIndices.Add(e->GetID());
|
|
||||||
}
|
|
||||||
myNbOkElements++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (newIndices.Extent() > 0) {
|
|
||||||
mySelector->AddOrRemoveIndex(anIO, newIndices, true);
|
|
||||||
myViewWindow->highlight( anIO, true, true );
|
|
||||||
}
|
}
|
||||||
|
mySelector->AddOrRemoveIndex(anIO, newIndices, false);
|
||||||
|
myViewWindow->highlight( anIO, true, true );
|
||||||
myElementsId = theNewText;
|
myElementsId = theNewText;
|
||||||
|
|
||||||
} else if (send == LineEditNodes) {
|
} else if (send == LineEditNodes) {
|
||||||
TColStd_IndexedMapOfInteger selectedIndices;
|
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
mySelector->GetIndex(myActor->getIO(), selectedIndices);
|
|
||||||
|
|
||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshNode * n = aMesh->FindNode(aListId[ i ].toInt());
|
const SMDS_MeshNode * n = aMesh->FindNode(aListId[ i ].toInt());
|
||||||
if (n) {
|
if (n)
|
||||||
//if (!mySelectionMgr->IsIndexSelected(myActor->getIO(), n->GetID())) {
|
newIndices.Add(n->GetID());
|
||||||
if (selectedIndices.Add(n->GetID())) {
|
myNbOkNodes++;
|
||||||
//mySelectionMgr->AddOrRemoveIndex (myActor->getIO(), n->GetID(), true);
|
|
||||||
newIndices.Add(n->GetID());
|
|
||||||
}
|
|
||||||
myNbOkNodes++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (newIndices.Extent() > 0)
|
|
||||||
{
|
|
||||||
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, true);
|
|
||||||
myViewWindow->highlight( myActor->getIO(), true, true );
|
|
||||||
}
|
}
|
||||||
|
mySelector->AddOrRemoveIndex(myActor->getIO(), newIndices, false);
|
||||||
|
myViewWindow->highlight( myActor->getIO(), true, true );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -537,36 +537,23 @@ void SMESHGUI_SymmetryDlg::onTextChange (const QString& theNewText)
|
|||||||
aMesh = myActor->GetObject()->GetMesh();
|
aMesh = myActor->GetObject()->GetMesh();
|
||||||
|
|
||||||
if (aMesh) {
|
if (aMesh) {
|
||||||
//mySelectionMgr->clearSelected();
|
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
|
||||||
//mySelectionMgr->AddIObject(myActor->getIO());
|
|
||||||
SALOME_ListIO aList;
|
|
||||||
aList.Append(myActor->getIO());
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
|
|
||||||
TColStd_IndexedMapOfInteger selectedIndices;
|
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
mySelector->GetIndex(myActor->getIO(), selectedIndices);
|
|
||||||
|
|
||||||
QStringList aListId = QStringList::split(" ", theNewText, false);
|
QStringList aListId = QStringList::split(" ", theNewText, false);
|
||||||
|
|
||||||
if (send == LineEditElements) {
|
if (send == LineEditElements) {
|
||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e) {
|
if (e)
|
||||||
//if (!mySelectionMgr->IsIndexSelected(myActor->getIO(), e->GetID())) {
|
newIndices.Add(e->GetID());
|
||||||
if (selectedIndices.Add(e->GetID())) {
|
myNbOkElements++;
|
||||||
//mySelectionMgr->AddOrRemoveIndex (myActor->getIO(), e->GetID(), true);
|
|
||||||
newIndices.Add(e->GetID());
|
|
||||||
}
|
|
||||||
myNbOkElements++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (newIndices.Extent() > 0){
|
|
||||||
mySelector->AddOrRemoveIndex( myActor->getIO(), newIndices, true );
|
|
||||||
myViewWindow->highlight( myActor->getIO(), true, true );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mySelector->AddOrRemoveIndex( anIO, newIndices, false );
|
||||||
|
myViewWindow->highlight( anIO, true, true );
|
||||||
|
|
||||||
myElementsId = theNewText;
|
myElementsId = theNewText;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -502,38 +502,25 @@ void SMESHGUI_TranslationDlg::onTextChange (const QString& theNewText)
|
|||||||
aMesh = myActor->GetObject()->GetMesh();
|
aMesh = myActor->GetObject()->GetMesh();
|
||||||
|
|
||||||
if (aMesh) {
|
if (aMesh) {
|
||||||
//mySelectionMgr->clearSelected();
|
Handle(SALOME_InteractiveObject) anIO = myActor->getIO();
|
||||||
//mySelectionMgr->AddIObject(myActor->getIO());
|
|
||||||
SALOME_ListIO aList;
|
|
||||||
aList.Append(myActor->getIO());
|
|
||||||
mySelectionMgr->setSelectedObjects(aList, false);
|
|
||||||
|
|
||||||
TColStd_IndexedMapOfInteger selectedIndices;
|
|
||||||
TColStd_MapOfInteger newIndices;
|
TColStd_MapOfInteger newIndices;
|
||||||
mySelector->GetIndex( myActor->getIO(), selectedIndices );
|
|
||||||
|
|
||||||
QStringList aListId = QStringList::split(" ", theNewText, false);
|
QStringList aListId = QStringList::split(" ", theNewText, false);
|
||||||
|
|
||||||
if (send == LineEditElements) {
|
if (send == LineEditElements) {
|
||||||
for (int i = 0; i < aListId.count(); i++) {
|
for (int i = 0; i < aListId.count(); i++) {
|
||||||
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
const SMDS_MeshElement * e = aMesh->FindElement(aListId[ i ].toInt());
|
||||||
if (e) {
|
if (e)
|
||||||
//if (!mySelectionMgr->IsIndexSelected(myActor->getIO(), e->GetID())) {
|
newIndices.Add(e->GetID());
|
||||||
if (selectedIndices.Add(e->GetID())) {
|
myNbOkElements++;
|
||||||
//mySelectionMgr->AddOrRemoveIndex (myActor->getIO(), e->GetID(), true);
|
|
||||||
newIndices.Add(e->GetID());
|
|
||||||
}
|
|
||||||
myNbOkElements++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newIndices.Extent() > 0){
|
|
||||||
mySelector->AddOrRemoveIndex( myActor->getIO(), newIndices, true );
|
|
||||||
myViewWindow->highlight( myActor->getIO(), true, true );
|
|
||||||
}
|
|
||||||
|
|
||||||
myElementsId = theNewText;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mySelector->AddOrRemoveIndex( anIO, newIndices, false );
|
||||||
|
myViewWindow->highlight( anIO, true, true );
|
||||||
|
|
||||||
|
myElementsId = theNewText;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (myNbOkElements) {
|
if (myNbOkElements) {
|
||||||
|
Loading…
Reference in New Issue
Block a user