X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_AddMeshElementDlg.cxx;h=734ab30502a882759807644bd90044470477faa2;hb=bb40f7c1d3542da1ff59b6c3bface0574789dded;hp=067f35b9bad716f8de6737f6e9de99818c2f1c37;hpb=519f45e49541ef86004a139b9dccc909927bc406;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx index 067f35b9b..734ab3050 100644 --- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -229,10 +229,10 @@ namespace SMESH anIds->SetNumberOfIds(1); for (int i = 0, iEnd = theIds.size(); i < iEnd; i++){ anIds->InsertId(0,theIds[i]); - vtkIdType anId = myBallPolyData->InsertNextCell(VTK_POLY_VERTEX,anIds); - double d = theDiameter; - aScalars->SetTuple(anId,&d); - anIds->Reset(); + vtkIdType anId = myBallPolyData->InsertNextCell(VTK_POLY_VERTEX,anIds); + double d = theDiameter * theActor->GetBallScale(); + aScalars->SetTuple(anId,&d); + anIds->Reset(); } anIds->Delete(); @@ -258,7 +258,7 @@ namespace SMESH if (FindVtkViewWindow(myApplication->activeViewManager(), myViewWindow)) { myVTKViewWindow->RemoveActor(myPreviewActor,false,false); myVTKViewWindow->RemoveActor(myFaceOrientation,false,false); - myVTKViewWindow->RemoveActor(myBallActor,false,false); + myVTKViewWindow->RemoveActor(myBallActor,false,false); } myMapper->Delete(); @@ -586,6 +586,7 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply() SMESH::long_array_var anIdList = new SMESH::long_array; anIdList->length( 1 ); anIdList[0] = -1; + const bool onlyNodesInMesh = ( myMesh->NbElements() == 0 ); switch (myElementType) { case SMDSAbs_0DElement: @@ -645,8 +646,10 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply() mySelectionMgr->setSelectedObjects( aList, false ); mySimulation->SetVisibility(false); + if ( onlyNodesInMesh ) + myActor->SetRepresentation( SMESH_Actor::eEdge ); // wireframe SMESH::UpdateView(); - + buttonOk->setEnabled(false); buttonApply->setEnabled(false);