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 some tests regressions
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_StdHypothesisCreator.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
index a9b7782829e37291b4565813acdbd9469c1a5891..a3d42ddadd3096343a609f816d79146db58afdca 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-126,7
+126,7
@@
QWidget* StdMeshersGUI_StdHypothesisCreator::getWidgetForParam( int i ) const
//================================================================================
/*!
//================================================================================
/*!
- * \brief Allow modifing myCustomWidgets in const methods
+ * \brief Allow modif
y
ing myCustomWidgets in const methods
* \retval ListOfWidgets* - non-const pointer to myCustomWidgets
*/
//================================================================================
* \retval ListOfWidgets* - non-const pointer to myCustomWidgets
*/
//================================================================================
@@
-423,10
+423,10
@@
bool StdMeshersGUI_StdHypothesisCreator::checkParams( QString& msg ) const
GEOM::GEOM_Object_var face = w->GetObject< GEOM::GEOM_Object >();
GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
GEOM::GEOM_Object_var face = w->GetObject< GEOM::GEOM_Object >();
GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
- _PTR(Study) aStudy = SMESH::
GetActiveStudyDocument
();
+ _PTR(Study) aStudy = SMESH::
getStudy
();
GEOM::GEOM_IShapesOperations_wrap shapeOp;
if ( !geomGen->_is_nil() && aStudy )
GEOM::GEOM_IShapesOperations_wrap shapeOp;
if ( !geomGen->_is_nil() && aStudy )
- shapeOp = geomGen->GetIShapesOperations(
aStudy->StudyId()
);
+ shapeOp = geomGen->GetIShapesOperations();
if ( !shapeOp->_is_nil() )
{
GEOM::ListOfLong_var vertices =
if ( !shapeOp->_is_nil() )
{
GEOM::ListOfLong_var vertices =
@@
-467,7
+467,7
@@
QString StdMeshersGUI_StdHypothesisCreator::storeParams() const
bool res = getStdParamFromDlg( params );
if( isCreation() )
{
bool res = getStdParamFromDlg( params );
if( isCreation() )
{
- SMESH::SetName( SMESH::FindSObject( hypothesis() ), params[0].myValue.toString().to
Latin1
().data() );
+ SMESH::SetName( SMESH::FindSObject( hypothesis() ), params[0].myValue.toString().to
Utf8
().data() );
params.erase( params.begin() );
}
params.erase( params.begin() );
}
@@
-1433,7
+1433,7
@@
QString StdMeshersGUI_StdHypothesisCreator::type() const
//================================================================================
/*!
* \brief String to insert in "SMESH_%1_HYPOTHESIS" to get hypothesis type name
//================================================================================
/*!
* \brief String to insert in "SMESH_%1_HYPOTHESIS" to get hypothesis type name
- * from message resouce file
+ * from message resou
r
ce file
* \param t - hypothesis type
* \retval QString - result string
*/
* \param t - hypothesis type
* \retval QString - result string
*/