Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation errors using gcc-5.X relating to explicit stream::operator bool()
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_LayerDistributionParamWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
index ee46af5b11a5adfc286d2f14e6d9ff17aa50130d..57e21193d3c01efc8e8a4c4f4ed4c25db1b27529 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-45,20
+45,20
@@
//================================================================================
/*!
* \brief Constructor initialized by filter
//================================================================================
/*!
* \brief Constructor initialized by filter
-
* \param f - object filter
+ * \param f - object filter
*/
//================================================================================
StdMeshersGUI_LayerDistributionParamWdg
*/
//================================================================================
StdMeshersGUI_LayerDistributionParamWdg
-::StdMeshersGUI_LayerDistributionParamWdg(SMESH::SMESH_Hypothesis_ptr hyp,
- const QString& theName,
- QDialog* dlg):
- QWidget(), 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();
init();
- set( hyp );
-// if ( IsOk() )
-// onEdit();
+ set( distribHyp );
}
//================================================================================
}
//================================================================================
@@
-73,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 = 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();
myEditButton->setEnabled( true );
myCreateButton->setText( tr("CHANGE_TYPE"));
myParamValue = hyp->GetName();
@@
-96,7
+97,7
@@
StdMeshersGUI_LayerDistributionParamWdg::~StdMeshersGUI_LayerDistributionParamWd
//================================================================================
/*!
//================================================================================
/*!
- * \brief Create a l
e
ayout, initialize fields
+ * \brief Create a layout, initialize fields
*/
//================================================================================
*/
//================================================================================
@@
-110,9
+111,11
@@
void StdMeshersGUI_LayerDistributionParamWdg::init()
myCreateButton = new QPushButton( this );
myCreateButton->setObjectName( "createBut" );
myCreateButton = new QPushButton( this );
myCreateButton->setObjectName( "createBut" );
+ myCreateButton->setMinimumWidth(100);
myEditButton = new QPushButton( tr("EDIT"), this );
myEditButton->setObjectName( "editBut" );
myEditButton = new QPushButton( tr("EDIT"), this );
myEditButton->setObjectName( "editBut" );
+ myEditButton->setMinimumWidth(100);
myHypTypePopup = new QMenu( this );
myHypTypePopup = new QMenu( this );
@@
-129,8
+132,8
@@
void StdMeshersGUI_LayerDistributionParamWdg::init()
}
aHBox->addWidget( myCreateButton );
}
aHBox->addWidget( myCreateButton );
+ aHBox->addStretch(5);
aHBox->addWidget( myEditButton );
aHBox->addWidget( myEditButton );
- aHBox->addStretch();
connect( myCreateButton, SIGNAL(clicked()), SLOT(onCreate()));
connect( myEditButton, SIGNAL(clicked()), SLOT(onEdit()));
connect( myCreateButton, SIGNAL(clicked()), SLOT(onCreate()));
connect( myEditButton, SIGNAL(clicked()), SLOT(onEdit()));