ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-13 01:04:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

full checking of geom selection

Browse Source
This commit is contained in:
asl 2005-07-07 11:33:32 +00:00
parent 71c8ad7da0
commit aba480e0e8
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESHGUI/SMESHGUI_InitMeshDlg.cxx
View File

@ -57,7 +57,7 @@ SMESHGUI_InitMeshDlg::SMESHGUI_InitMeshDlg( SMESHGUI* theModule )
GroupC1->layout()->setSpacing(6); GroupC1->layout()->setSpacing(6);
GroupC1->layout()->setMargin(11); GroupC1->layout()->setMargin(11);
myMeshNameLabel = new QLabel(tr("SMESH_NAME"), GroupC1, "TextLabel_NameMesh"); new QLabel(tr("SMESH_NAME"), GroupC1, "TextLabel_NameMesh");
GroupC1->addSpace(1); GroupC1->addSpace(1);
myMeshName = new QLineEdit(GroupC1, "LineEdit_NameMesh"); myMeshName = new QLineEdit(GroupC1, "LineEdit_NameMesh");
@ -72,8 +72,6 @@ SMESHGUI_InitMeshDlg::SMESHGUI_InitMeshDlg( SMESHGUI* theModule )
setObjectType( Algo, _smesh + ALGORITHM, -1 ); setObjectType( Algo, _smesh + ALGORITHM, -1 );
main->addWidget( GroupC1 ); main->addWidget( GroupC1 );
updateControlState();
} }
//================================================================================= //=================================================================================

1
src/SMESHGUI/SMESHGUI_InitMeshDlg.h
View File

@ -52,7 +52,6 @@ public:
QString meshName() const; QString meshName() const;
private: private:
QLabel* myMeshNameLabel;
QLineEdit* myMeshName; QLineEdit* myMeshName;
}; };

34
src/SMESHGUI/SMESHGUI_InitMeshOp.cxx
View File

@ -43,9 +43,12 @@
#include <SalomeApp_SelectionMgr.h> #include <SalomeApp_SelectionMgr.h>
#include <SalomeApp_Tools.h> #include <SalomeApp_Tools.h>
#include <SalomeApp_UpdateFlags.h>
#include <TColStd_MapOfInteger.hxx> #include <TColStd_MapOfInteger.hxx>
#include <GEOMBase.h>
//================================================================================= //=================================================================================
// function : Constructor // function : Constructor
// purpose : // purpose :
@ -107,7 +110,6 @@ void SMESHGUI_InitMeshOp::startOperation()
myHypothesisFilter = new SMESH_TypeFilter (HYPOTHESIS); myHypothesisFilter = new SMESH_TypeFilter (HYPOTHESIS);
init(); init();
myDlg->clearSelection();
myDlg->show(); myDlg->show();
} }
@ -230,10 +232,9 @@ bool SMESHGUI_InitMeshOp::onApply()
} }
} }
} }
// commit transaction
//update( UF_Model | UF_ObjBrowser ); update( UF_Model | UF_ObjBrowser );
module()->updateObjBrowser( true, 0 );
init(); init();
return true; return true;
} }
@ -264,7 +265,11 @@ QString SMESHGUI_InitMeshOp::defaultMeshName() const
void SMESHGUI_InitMeshOp::init() void SMESHGUI_InitMeshOp::init()
{ {
if( myDlg ) if( myDlg )
{
myDlg->setMeshName( defaultMeshName() ); myDlg->setMeshName( defaultMeshName() );
myDlg->clearSelection();
myDlg->updateControlState();
}
} }
//================================================================================= //=================================================================================
@ -295,3 +300,24 @@ SMESH::SMESH_Mesh_var SMESHGUI_InitMeshOp::initMesh ( GEOM::GEOM_Object_ptr theS
return aMesh._retn(); return aMesh._retn();
} }
//=================================================================================
// function : defaultMeshName()
// purpose :
//=================================================================================
void SMESHGUI_InitMeshOp::onSelectionChanged( int id )
{
if( !myDlg->hasSelection( id ) )
return;
if( id==SMESHGUI_InitMeshDlg::GeomObj )
{
QStringList selGeom;
myDlg->selectedObject( SMESHGUI_InitMeshDlg::GeomObj, selGeom );
_PTR(SObject) aGeomSO = studyDS()->FindObjectID( selGeom.first() );
GEOM::GEOM_Object_var myGeomShape = GEOM::GEOM_Object::_narrow( _CAST(SObject,aGeomSO)->GetObject() );
if( myGeomShape->_is_nil() || !GEOMBase::IsShape( myGeomShape ) )
myDlg->clearSelection( id );
}
}

1
src/SMESHGUI/SMESHGUI_InitMeshOp.h
View File

@ -65,6 +65,7 @@ protected slots:
private slots: private slots:
void onActivateObject( int ); void onActivateObject( int );
void onSelectionChanged( int );
private: private:
SMESHGUI_InitMeshDlg *myDlg; SMESHGUI_InitMeshDlg *myDlg;