X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ScaleDlg.cxx;h=09a941be6be6ea6b9609f6e38bbd3bc08b1654bc;hb=301a74fd9859419f54f5cdca1d468b8e5c0a3152;hp=756255df38b23374d45ab4acbce8dd3ddeb6e2fa;hpb=91084ee58a53b97e38d910bc80cc3a813b177cb7;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
index 756255df3..09a941be6 100644
--- a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
@@ -477,68 +477,72 @@ bool SMESHGUI_ScaleDlg::ClickOnApply()
       switch ( actionButton ) {
 
       case MOVE_ELEMS_BUTTON:
-	if ( CheckBoxMesh->isChecked() )
-	  for ( int i = 0; i < myObjects.count(); i++ ) {
-	    SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
-	    myMeshes[i]->SetParameters( aParameters.join( ":" ).toLatin1().constData() );
-	    aMeshEditor->Scale(myObjects[i], aPoint, aScaleFact, false);
-	  }
-	else {
-	  SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
-	  myMeshes[0]->SetParameters( aParameters.join( ":" ).toLatin1().constData() );
-	  aMeshEditor->Scale(aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL), aPoint, aScaleFact, false);
-	}
+        if ( CheckBoxMesh->isChecked() )
+          for ( int i = 0; i < myObjects.count(); i++ ) {
+            SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
+            myMeshes[i]->SetParameters( aParameters.join( ":" ).toLatin1().constData() );
+            aMeshEditor->Scale(myObjects[i], aPoint, aScaleFact, false);
+          }
+        else {
+          SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
+          SMESH::SMESH_IDSource_wrap src = aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL);
+          myMeshes[0]->SetParameters( aParameters.join( ":" ).toLatin1().constData() );
+          aMeshEditor->Scale( src, aPoint, aScaleFact, false);
+        }
         break;
 
       case COPY_ELEMS_BUTTON:
         if ( makeGroups ) {
-	  SMESH::ListOfGroups_var groups;
-	  if(CheckBoxMesh->isChecked())
-	    for ( int i = 0; i < myObjects.count(); i++ ) {
-	      SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
-	      myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
-	      groups = aMeshEditor->ScaleMakeGroups(myObjects[i], aPoint, aScaleFact);
-	    }
+          SMESH::ListOfGroups_var groups;
+          if(CheckBoxMesh->isChecked())
+            for ( int i = 0; i < myObjects.count(); i++ ) {
+              SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
+              myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+              groups = aMeshEditor->ScaleMakeGroups(myObjects[i], aPoint, aScaleFact);
+            }
           else {
-	    SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
-	    myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
-	    groups = aMeshEditor->ScaleMakeGroups(aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL), aPoint, aScaleFact);
-	  }
-	}
+            SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
+            SMESH::SMESH_IDSource_wrap src = aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL);
+            myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+            groups = aMeshEditor->ScaleMakeGroups( src, aPoint, aScaleFact);
+          }
+        }
         else {
-	  if(CheckBoxMesh->isChecked()) {
-	    for ( int i = 0; i < myObjects.count(); i++ ) {
-	      SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
-	      myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
-	      aMeshEditor->Scale(myObjects[i], aPoint, aScaleFact, true);
-	    }
-	  }
+          if(CheckBoxMesh->isChecked()) {
+            for ( int i = 0; i < myObjects.count(); i++ ) {
+              SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
+              myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+              aMeshEditor->Scale(myObjects[i], aPoint, aScaleFact, true);
+            }
+          }
           else {
-	    SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
-	    myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
-	    aMeshEditor->Scale(aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL), aPoint, aScaleFact, true);
-	  }
-	}
+            SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
+            SMESH::SMESH_IDSource_wrap src = aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL);
+            myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+            aMeshEditor->Scale( src, aPoint, aScaleFact, true);
+          }
+        }
         break;
 
       case MAKE_MESH_BUTTON: {
-	SMESH::SMESH_Mesh_var mesh;
-	if (CheckBoxMesh->isChecked()) {
-	  for ( int i = 0; i < myObjects.count(); i++ ) {
-	    QString aName = SMESH::UniqueMeshName( LineEditNewMesh->text().replace( "*", myObjectsNames[i] ) );
-	    SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
-	    myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
-	    mesh = aMeshEditor->ScaleMakeMesh(myObjects[i], aPoint, aScaleFact, makeGroups,
-					      aName.toLatin1().data());
-	    if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
-	      anEntryList.append( aSObject->GetID().c_str() );
-	  }
-	}
-	else {
-	  SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
-	  myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
-	  mesh = aMeshEditor->ScaleMakeMesh(aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL), aPoint, aScaleFact, makeGroups,
-					      LineEditNewMesh->text().toLatin1().data());
+        SMESH::SMESH_Mesh_var mesh;
+        if (CheckBoxMesh->isChecked()) {
+          for ( int i = 0; i < myObjects.count(); i++ ) {
+            QString aName = SMESH::UniqueMeshName( LineEditNewMesh->text().replace( "*", myObjectsNames[i] ) );
+            SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditor();
+            myMeshes[i]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+            mesh = aMeshEditor->ScaleMakeMesh(myObjects[i], aPoint, aScaleFact, makeGroups,
+                                              aName.toLatin1().data());
+            if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
+              anEntryList.append( aSObject->GetID().c_str() );
+          }
+        }
+        else {
+          SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditor();
+          myMeshes[0]->SetParameters(aParameters.join( ":" ).toLatin1().constData());
+          SMESH::SMESH_IDSource_wrap src = aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL);
+          mesh = aMeshEditor->ScaleMakeMesh( src, aPoint, aScaleFact, makeGroups,
+                                             LineEditNewMesh->text().toLatin1().data());
           if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) )
             anEntryList.append( aSObject->GetID().c_str() );
         }
@@ -718,25 +722,25 @@ void SMESHGUI_ScaleDlg::SelectionIntoArgument()
       Handle(SALOME_InteractiveObject) IO = it.Value();
       SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO( IO );
       if ( aMesh->_is_nil() )
-	return;
+        return;
   
       myActor = SMESH::FindActorByObject( aMesh );
       if ( !myActor )
-	myActor = SMESH::FindActorByEntry( IO->getEntry() );
+        myActor = SMESH::FindActorByEntry( IO->getEntry() );
       if ( !myActor && !CheckBoxMesh->isChecked() )
-	return;
+        return;
 
       if ( !SMESH::IObjectToInterface<SMESH::SMESH_IDSource>( IO )->_is_nil() ) {
-	if ( _PTR(Study) aStudy = SMESH::GetActiveStudyDocument() ) {
-	  _PTR(SObject) obj = aStudy->FindObjectID( qPrintable( QString( IO->getEntry() ) ) );
-	  _PTR(GenericAttribute) anAttr;
-	  if ( obj && obj->FindAttribute( anAttr, "AttributeName" ) ) {
-	    _PTR(AttributeName) aNameAttr( anAttr );
-	    myObjects << SMESH::IObjectToInterface<SMESH::SMESH_IDSource>( IO );
-	    myObjectsNames << aNameAttr->Value().c_str();
-	    myMeshes << aMesh;
-	  }
-	}
+        if ( _PTR(Study) aStudy = SMESH::GetActiveStudyDocument() ) {
+          _PTR(SObject) obj = aStudy->FindObjectID( qPrintable( QString( IO->getEntry() ) ) );
+          _PTR(GenericAttribute) anAttr;
+          if ( obj && obj->FindAttribute( anAttr, "AttributeName" ) ) {
+            _PTR(AttributeName) aNameAttr( anAttr );
+            myObjects << SMESH::IObjectToInterface<SMESH::SMESH_IDSource>( IO );
+            myObjectsNames << aNameAttr->Value().c_str();
+            myMeshes << aMesh;
+          }
+        }
       }
     }
       
@@ -756,7 +760,7 @@ void SMESHGUI_ScaleDlg::SelectionIntoArgument()
     if (CheckBoxMesh->isChecked()) {
       SMESH::GetNameOfSelectedIObjects( mySelectionMgr, aString );
       if (myMeshes.isEmpty())
-	return;
+        return;
         // get IDs from mesh
         /*
         SMDS_Mesh* aSMDSMesh = myActor->GetObject()->GetMesh();
@@ -1132,20 +1136,21 @@ void SMESHGUI_ScaleDlg::onDisplaySimulation( bool toDisplayPreview ) {
         bool copy = ( ActionGroup->checkedId() == COPY_ELEMS_BUTTON ||
                       ActionGroup->checkedId() == MAKE_MESH_BUTTON );
         SUIT_OverrideCursor aWaitCursor;
-	QList<SMESH::MeshPreviewStruct_var> aMeshPreviewStruct;
-
-	if(CheckBoxMesh->isChecked())
-	  for ( int i = 0; i < myObjects.count(); i++ ) {
-	    SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditPreviewer();
-	    aMeshEditor->Scale(myObjects[i], aPoint, aScaleFact, copy);
-	    aMeshPreviewStruct << aMeshEditor->GetPreviewData();
-	  }
+        QList<SMESH::MeshPreviewStruct_var> aMeshPreviewStruct;
+
+        if(CheckBoxMesh->isChecked())
+          for ( int i = 0; i < myObjects.count(); i++ ) {
+            SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[i]->GetMeshEditPreviewer();
+            aMeshEditor->Scale(myObjects[i], aPoint, aScaleFact, copy);
+            aMeshPreviewStruct << aMeshEditor->GetPreviewData();
+          }
         else {
-	  SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditPreviewer();
-	  aMeshEditor->Scale(aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL), aPoint, aScaleFact, copy);
-	  aMeshPreviewStruct << aMeshEditor->GetPreviewData();
-	}
-	setSimulationPreview(aMeshPreviewStruct);
+          SMESH::SMESH_MeshEditor_var aMeshEditor = myMeshes[0]->GetMeshEditPreviewer();
+          SMESH::SMESH_IDSource_wrap src = aMeshEditor->MakeIDSource(anElementsId, SMESH::ALL);
+          aMeshEditor->Scale( src, aPoint, aScaleFact, copy);
+          aMeshPreviewStruct << aMeshEditor->GetPreviewData();
+        }
+        setSimulationPreview(aMeshPreviewStruct);
       } catch (...) {
         hidePreview();
       }