X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI_LayerDistributionParamWdg.cxx;h=57e21193d3c01efc8e8a4c4f4ed4c25db1b27529;hp=6b66fa066f56767cf3ab2803b58199a6d0732757;hb=59627b07d70f4caa4c768be6805334d2610fa54c;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813 diff --git a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx index 6b66fa066..57e21193d 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx @@ -1,63 +1,64 @@ -// SMESH StdMeshersGUI +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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, 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : StdMeshersGUI_LayerDistributionParamWdg.cxx -// Module : SMESH +// File : StdMeshersGUI_LayerDistributionParamWdg.cxx +// Author : Open CASCADE S.A.S. +// SMESH includes +// #include "StdMeshersGUI_LayerDistributionParamWdg.h" -#include -#include -#include -#include - -#include "SMESHGUI.h" -#include "SMESHGUI_Utils.h" -#include "SMESHGUI_HypothesesUtils.h" -#include "SMESHGUI_Hypotheses.h" -// #include "SUIT_ResourceMgr.h" -// #include "LightApp_SelectionMgr.h" -#include "SALOMEDSClient_SObject.hxx" -#include "SALOMEDS_Study.hxx" -#include "SalomeApp_Tools.h" +#include +#include +#include + +// SALOME GUI includes +#include + +// Qt includes +#include +#include +#include +#include +#include + +#define SPACING 6 //================================================================================ /*! * \brief Constructor initialized by filter - * \param f - object filter + * \param f - object filter */ //================================================================================ StdMeshersGUI_LayerDistributionParamWdg -::StdMeshersGUI_LayerDistributionParamWdg(SMESH::SMESH_Hypothesis_ptr hyp, - const QString& theName, - QDialog* dlg): - QHGroupBox(), myName(theName), myDlg( dlg ) +::StdMeshersGUI_LayerDistributionParamWdg(SMESH::SMESH_Hypothesis_ptr holderHyp, + SMESH::SMESH_Hypothesis_ptr distribHyp, + const QString& name, + QDialog* dlg): + QWidget(), myDlg( dlg ), myName(name) { + myHolderHyp = SMESH::SMESH_Hypothesis::_duplicate( holderHyp ); init(); - set( hyp ); -// if ( IsOk() ) -// onEdit(); + set( distribHyp ); } //================================================================================ @@ -72,6 +73,7 @@ void StdMeshersGUI_LayerDistributionParamWdg::set(SMESH::SMESH_Hypothesis_ptr hy myHyp = SMESH::SMESH_Hypothesis::_nil(); if ( !CORBA::is_nil( hyp )) { myHyp = SMESH::SMESH_Hypothesis::_duplicate( hyp ); + myHyp->SetHolderHypothesis( myHolderHyp ); myEditButton->setEnabled( true ); myCreateButton->setText( tr("CHANGE_TYPE")); myParamValue = hyp->GetName(); @@ -91,35 +93,33 @@ void StdMeshersGUI_LayerDistributionParamWdg::set(SMESH::SMESH_Hypothesis_ptr hy StdMeshersGUI_LayerDistributionParamWdg::~StdMeshersGUI_LayerDistributionParamWdg() { - if ( myHypTypePopup ) - delete myHypTypePopup; } //================================================================================ /*! - * \brief Create a leayout, initialize fields + * \brief Create a layout, initialize fields */ //================================================================================ void StdMeshersGUI_LayerDistributionParamWdg::init() { - setFrameStyle(QFrame::NoFrame); - setInsideMargin(0); + QHBoxLayout* aHBox = new QHBoxLayout( this ); + aHBox->setMargin( 0 ); + aHBox->setSpacing( SPACING ); mySMESHGUI = SMESHGUI::GetSMESHGUI(); - myCreateButton = new QPushButton( this, "createBut"); - myEditButton = new QPushButton( tr("EDIT"), this, "createBut"); + myCreateButton = new QPushButton( this ); + myCreateButton->setObjectName( "createBut" ); + myCreateButton->setMinimumWidth(100); -// SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI ); -// QPixmap iconSlct ( mgr->loadPixmap("SMESH", tr("ICON_SELECT"))); -// mySelButton->setPixmap(iconSlct); -// mySelButton->setToggleButton( true ); + myEditButton = new QPushButton( tr("EDIT"), this ); + myEditButton->setObjectName( "editBut" ); + myEditButton->setMinimumWidth(100); - myHypTypePopup = new QPopupMenu(); + myHypTypePopup = new QMenu( this ); // Add to pop-up hypotheses of "Regular_1D" algo - myHypTypePopup->clear(); HypothesisData* algoData = SMESH::GetHypothesisData( "Regular_1D" ); myHypTypes = SMESH::GetAvailableHypotheses( false, 1 ); QStringList::const_iterator anIter = myHypTypes.begin(); @@ -128,12 +128,16 @@ void StdMeshersGUI_LayerDistributionParamWdg::init() HypothesisData* hypData = SMESH::GetHypothesisData( *anIter ); bool bidon; if ( SMESH::IsAvailableHypothesis( algoData, hypData->TypeName, bidon )) - myHypTypePopup->insertItem( hypData->Label ); + myHypTypePopup->addAction( hypData->Label ); } + aHBox->addWidget( myCreateButton ); + aHBox->addStretch(5); + aHBox->addWidget( myEditButton ); + connect( myCreateButton, SIGNAL(clicked()), SLOT(onCreate())); connect( myEditButton, SIGNAL(clicked()), SLOT(onEdit())); - connect( myHypTypePopup, SIGNAL( activated( int ) ), SLOT( onHypTypePopup( int ) ) ); + connect( myHypTypePopup, SIGNAL(triggered( QAction* ) ), SLOT( onHypTypePopup( QAction* ) ) ); } //================================================================================ @@ -143,7 +147,7 @@ void StdMeshersGUI_LayerDistributionParamWdg::init() */ //================================================================================ -void StdMeshersGUI_LayerDistributionParamWdg::onHypTypePopup( int theIndex ) +void StdMeshersGUI_LayerDistributionParamWdg::onHypTypePopup( QAction* a ) { SMESH::SMESH_Gen_var gen = mySMESHGUI->GetSMESHGen(); @@ -153,16 +157,17 @@ void StdMeshersGUI_LayerDistributionParamWdg::onHypTypePopup( int theIndex ) // create a hyp HypothesisData* aHypData = 0; QStringList::const_iterator anIter = myHypTypes.begin(); + for ( ; !aHypData && anIter != myHypTypes.end(); ++anIter ) { HypothesisData* hypData = SMESH::GetHypothesisData( *anIter ); - if ( myHypTypePopup->text( theIndex ) == hypData->Label ) + if ( a->text() == hypData->Label ) aHypData = hypData; } QString aServLib = aHypData->ServerLibName; QString aHypType = aHypData->TypeName; try { - set( gen->CreateHypothesis(aHypType, aServLib)); + set( gen->CreateHypothesis(aHypType.toLatin1().data(), aServLib.toLatin1().data())); } catch (const SALOME::SALOME_Exception & S_ex) { SalomeApp_Tools::QtCatchCorbaException(S_ex); @@ -197,19 +202,26 @@ void StdMeshersGUI_LayerDistributionParamWdg::onEdit() return; CORBA::String_var hypType = myHyp->GetName(); - SMESHGUI_GenericHypothesisCreator* - editor = SMESH::GetHypothesisCreator( hypType.in() ); + // BUG 0020378 + SMESHGUI_GenericHypothesisCreator* editor = SMESH::GetHypothesisCreator(hypType.in()); if ( !editor ) return; - if ( myDlg ) myDlg->hide(); + if ( myDlg ) + myDlg->hide(); try { QWidget* parent = this; - if ( myDlg ) parent = myDlg->parentWidget(); - editor->edit( myHyp, myName, parent ); + if ( myDlg ) + parent = myDlg->parentWidget(); + editor->edit( myHyp, myName, parent, this, SLOT( onEdited( int ) ) ); } - catch(...) { + catch(...) + { } +} - if ( myDlg ) myDlg->show(); +void StdMeshersGUI_LayerDistributionParamWdg::onEdited( int result ) +{ + if ( myDlg ) + myDlg->show(); }