-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2010 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
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESHGUI : GUI for SMESH component
// File : SMESHGUI_NodesDlg.cxx
// Author : Nicolas REJNERI, Open CASCADE S.A.S.
#include "SMESHGUI_Utils.h"
#include "SMESHGUI_VTKUtils.h"
#include "SMESHGUI_MeshUtils.h"
+#include "SMESHGUI_GroupUtils.h"
#include <SMESH_Actor.h>
#include <SMESH_ActorUtils.h>
#include <vtkPoints.h>
// Qt includes
+#include <QComboBox>
#include <QGroupBox>
#include <QLabel>
#include <QPushButton>
namespace SMESH
{
- void AddNode( SMESH::SMESH_Mesh_ptr theMesh, float x, float y, float z, const QStringList& theParameters )
+ long AddNode( SMESH::SMESH_Mesh_ptr theMesh, float x, float y, float z, const QStringList& theParameters )
{
+ long aNodeId = -1;
SUIT_OverrideCursor wc;
try {
_PTR(SObject) aSobj = SMESH::FindSObject( theMesh );
SMESH::SMESH_MeshEditor_var aMeshEditor = theMesh->GetMeshEditor();
- aMeshEditor->AddNode( x, y, z );
- theMesh->SetParameters( SMESHGUI::JoinObjectParameters(theParameters) );
+ aNodeId = aMeshEditor->AddNode( x, y, z );
+ theMesh->SetParameters( theParameters.join(":").toLatin1().constData() );
_PTR(Study) aStudy = GetActiveStudyDocument();
CORBA::Long anId = aStudy->StudyId();
if (TVisualObjPtr aVisualObj = SMESH::GetVisualObj( anId, aSobj->GetID().c_str() ) ) {
- aVisualObj->Update( true );
+ aVisualObj->Update( true );
}
}
catch ( SALOME::SALOME_Exception& exc ) {
catch ( ... ) {
INFOS( "Unknown exception was cought !!!" );
}
+ return aNodeId;
}
class TNodeSimulation
mySimulation = new SMESH::TNodeSimulation( SMESH::GetViewWindow( mySMESHGUI ) );
QPixmap image0( SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap( "SMESH",
- tr( "ICON_DLG_NODE" ) ) );
+ tr( "ICON_DLG_NODE" ) ) );
QVBoxLayout* SMESHGUI_NodesDlgLayout = new QVBoxLayout( this );
SMESHGUI_NodesDlgLayout->setSpacing( SPACING );
GroupCoordinatesLayout->addWidget( TextLabel_Z );
GroupCoordinatesLayout->addWidget( SpinBox_Z );
+
+ /***************************************************************/
+ GroupGroups = new QGroupBox( tr( "SMESH_ADD_TO_GROUP" ), this );
+ GroupGroups->setCheckable( true );
+ QHBoxLayout* GroupGroupsLayout = new QHBoxLayout(GroupGroups);
+ GroupGroupsLayout->setSpacing(SPACING);
+ GroupGroupsLayout->setMargin(MARGIN);
+
+ TextLabel_GroupName = new QLabel( tr( "SMESH_GROUP" ), GroupGroups );
+ ComboBox_GroupName = new QComboBox( GroupGroups );
+ ComboBox_GroupName->setEditable( true );
+
+ GroupGroupsLayout->addWidget( TextLabel_GroupName );
+ GroupGroupsLayout->addWidget( ComboBox_GroupName, 1 );
+
/***************************************************************/
GroupButtons = new QGroupBox( this );
QHBoxLayout* GroupButtonsLayout = new QHBoxLayout( GroupButtons );
/***************************************************************/
SMESHGUI_NodesDlgLayout->addWidget( GroupConstructors );
SMESHGUI_NodesDlgLayout->addWidget( GroupCoordinates );
+ SMESHGUI_NodesDlgLayout->addWidget( GroupGroups );
SMESHGUI_NodesDlgLayout->addWidget( GroupButtons );
myHelpFileName = "adding_nodes_and_elements_page.html#adding_nodes_anchor";
double step = 25.0;
/* min, max, step and decimals for spin boxes */
- SpinBox_X->RangeStepAndValidator( COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY );
- SpinBox_Y->RangeStepAndValidator( COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY );
- SpinBox_Z->RangeStepAndValidator( COORD_MIN, COORD_MAX, step, DBL_DIGITS_DISPLAY );
+ SpinBox_X->RangeStepAndValidator( COORD_MIN, COORD_MAX, step, "length_precision" );
+ SpinBox_Y->RangeStepAndValidator( COORD_MIN, COORD_MAX, step, "length_precision" );
+ SpinBox_Z->RangeStepAndValidator( COORD_MIN, COORD_MAX, step, "length_precision" );
SpinBox_X->SetValue( 0.0 );
SpinBox_Y->SetValue( 0.0 );
SpinBox_Z->SetValue( 0.0 );
+ /* reset "Add to group" control */
+ GroupGroups->setChecked( false );
+
mySMESHGUI->SetActiveDialogBox( this );
/* signals and slots connections */
if ( myMesh->_is_nil() ) {
SUIT_MessageBox::warning( this, tr( "SMESH_WRN_WARNING" ),
- tr( "MESH_IS_NOT_SELECTED" ) );
+ tr( "MESH_IS_NOT_SELECTED" ) );
return false;
}
aParameters << SpinBox_Z->text();
mySimulation->SetVisibility( false );
- SMESH::AddNode( myMesh, x, y, z, aParameters );
+ long aNodeId = SMESH::AddNode( myMesh, x, y, z, aParameters );
SMESH::SetPointRepresentation( true );
+ if( aNodeId != -1 && GroupGroups->isChecked() ) {
+ SMESH::SMESH_Group_var aGroup;
+ QString aGroupName = ComboBox_GroupName->currentText();
+ SMESH::ListOfGroups aListOfGroups = *myMesh->GetGroups();
+ for( int i = 0, n = aListOfGroups.length(); i < n; i++ ) {
+ SMESH::SMESH_GroupBase_var aGroupBase = aListOfGroups[i];
+ if( !aGroupBase->_is_nil() ) {
+ SMESH::SMESH_Group_var aRefGroup = SMESH::SMESH_Group::_narrow( aGroupBase );
+ if( !aRefGroup->_is_nil() ) {
+ QString aRefGroupName( aRefGroup->GetName() );
+ if( aRefGroupName == aGroupName ) {
+ aGroup = aRefGroup; // // add node to existing group
+ break;
+ }
+ }
+ }
+ }
+ if( aGroup->_is_nil() ) // create new group
+ aGroup = SMESH::AddGroup( myMesh, SMESH::NODE, aGroupName );
+
+ if( !aGroup->_is_nil() ) {
+ SMESH::long_array_var anIdList = new SMESH::long_array;
+ anIdList->length( 1 );
+ anIdList[0] = aNodeId;
+ aGroup->Add( anIdList.inout() );
+ }
+ }
+
// select myMesh
SALOME_ListIO aList;
mySelectionMgr->selectedObjects( aList );
LightApp_Application* app = (LightApp_Application*)( SUIT_Session::session()->activeApplication() );
if ( app )
app->onHelpContextModule( mySMESHGUI ? app->moduleName( mySMESHGUI->moduleName() ) :
- QString( "" ), myHelpFileName );
+ QString( "" ), myHelpFileName );
else {
QString platform;
#ifdef WIN32
platform = "application";
#endif
SUIT_MessageBox::warning( this, tr("WRN_WARNING"),
- tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
- arg( app->resourceMgr()->stringValue( "ExternalBrowser",
- platform ) ).
- arg( myHelpFileName ) );
+ tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+ arg( app->resourceMgr()->stringValue( "ExternalBrowser",
+ platform ) ).
+ arg( myHelpFileName ) );
}
}
mySimulation->SetVisibility( false );
SMESH::SetPointRepresentation( true );
+ QString aCurrentEntry = myEntry;
+
const SALOME_ListIO& aList = mySelector->StoredIObjects();
if ( aList.Extent() == 1 ) {
Handle(SALOME_InteractiveObject) anIO = aList.First();
if ( anIO->hasEntry() ) {
+ myEntry = anIO->getEntry();
myMesh = SMESH::GetMeshByIO( anIO );
if ( myMesh->_is_nil() ) return;
QString aText;
if ( SMESH::GetNameOfSelectedNodes( mySelector, anIO, aText ) == 1 ) {
- if ( SMESH_Actor* anActor = SMESH::FindActorByObject( myMesh.in() ) ) {
- if ( SMDS_Mesh* aMesh = anActor->GetObject()->GetMesh() ) {
- if ( const SMDS_MeshNode* aNode = aMesh->FindNode( aText.toInt() ) ) {
- SpinBox_X->SetValue( aNode->X() );
- SpinBox_Y->SetValue( aNode->Y() );
- SpinBox_Z->SetValue( aNode->Z() );
+ if ( SMESH_Actor* anActor = SMESH::FindActorByObject( myMesh.in() ) ) {
+ if ( SMDS_Mesh* aMesh = anActor->GetObject()->GetMesh() ) {
+ if ( const SMDS_MeshNode* aNode = aMesh->FindNode( aText.toInt() ) ) {
+ SpinBox_X->SetValue( aNode->X() );
+ SpinBox_Y->SetValue( aNode->Y() );
+ SpinBox_Z->SetValue( aNode->Z() );
}
- }
- }
+ }
+ }
}
mySimulation->SetPosition( SpinBox_X->GetValue(),
- SpinBox_Y->GetValue(),
- SpinBox_Z->GetValue() );
+ SpinBox_Y->GetValue(),
+ SpinBox_Z->GetValue() );
+ }
+ }
+
+ // process groups
+ if ( !myMesh->_is_nil() && myEntry != aCurrentEntry ) {
+ ComboBox_GroupName->clear();
+ ComboBox_GroupName->addItem( QString() );
+ SMESH::ListOfGroups aListOfGroups = *myMesh->GetGroups();
+ for( int i = 0, n = aListOfGroups.length(); i < n; i++ ) {
+ SMESH::SMESH_GroupBase_var aGroupBase = aListOfGroups[i];
+ if ( !aGroupBase->_is_nil() && aGroupBase->GetType() == SMESH::NODE ) {
+ SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow( aGroupBase );
+ if ( !aGroup->_is_nil() ) {
+ QString aGroupName( aGroup->GetName() );
+ if ( !aGroupName.isEmpty() )
+ ComboBox_GroupName->addItem( aGroupName );
+ }
+ }
}
}
}
SUIT_MessageBox::critical( this, tr( "SMESH_ERROR" ), str );
return false;
}
+
+ if( GroupGroups->isChecked() && ComboBox_GroupName->currentText().isEmpty() ) {
+ SUIT_MessageBox::warning( this, tr( "SMESH_WRN_WARNING" ), tr( "GROUP_NAME_IS_EMPTY" ) );
+ return false;
+ }
return true;
}
