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
Merge branch 'V8_4_BR'
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_QuadrangleParamWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
index 4d98ef2b91f00e23ef35d145373a9fef092f5cd7..d034a08d0ad7df74413e4dbd7ba15c038696c02f 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
@@
-1,9
+1,9
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// 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
@@
-24,12
+24,12
@@
#include "SMESHGUI.h"
#include "SMESHGUI_SpinBox.h"
#include "SMESHGUI.h"
#include "SMESHGUI_SpinBox.h"
+#include "SMESHGUI_Utils.h"
#include "StdMeshersGUI_SubShapeSelectorWdg.h"
#include <GEOMBase.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx>
#include "StdMeshersGUI_SubShapeSelectorWdg.h"
#include <GEOMBase.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
#include <SUIT_ResourceMgr.h>
// Qt includes
#include <SUIT_ResourceMgr.h>
// Qt includes
@@
-74,7
+74,7
@@
StdMeshersGUI_QuadrangleParamCreator::StdMeshersGUI_QuadrangleParamCreator(const
QString StdMeshersGUI_QuadrangleParamCreator::helpPage() const
{
QString StdMeshersGUI_QuadrangleParamCreator::helpPage() const
{
- return "
a2d_meshing_hypo_page.html#hypo_quad_params_
anchor";
+ return "
2d_meshing_hypo.html#hypo-quad-params-
anchor";
}
//=======================================================================
}
//=======================================================================
@@
-195,8
+195,7
@@
void StdMeshersGUI_QuadrangleParamCreator::retrieveParams() const
QString aMainEntry = SMESHGUI_GenericHypothesisCreator::getMainShapeEntry();
if ( anEntry.isEmpty() )
anEntry = h->GetObjectEntry();
QString aMainEntry = SMESHGUI_GenericHypothesisCreator::getMainShapeEntry();
if ( anEntry.isEmpty() )
anEntry = h->GetObjectEntry();
- myVertexSelWdg->SetGeomShapeEntry(anEntry);
- myVertexSelWdg->SetMainShapeEntry(aMainEntry);
+ myVertexSelWdg->SetGeomShapeEntry(anEntry,aMainEntry);
if ( !isCreation())
{
if ( !isCreation())
{
@@
-216,7
+215,7
@@
void StdMeshersGUI_QuadrangleParamCreator::retrieveParams() const
GEOM::ListOfGO_var shapes;
SMESH::nodes_array_var points;
h->GetEnforcedNodes( shapes, points );
GEOM::ListOfGO_var shapes;
SMESH::nodes_array_var points;
h->GetEnforcedNodes( shapes, points );
- for (
in
t i = 0; i < shapes->length(); ++i )
+ for (
size_
t i = 0; i < shapes->length(); ++i )
{
CORBA::String_var name = shapes[i]->GetName();
CORBA::String_var entry = shapes[i]->GetStudyEntry();
{
CORBA::String_var name = shapes[i]->GetName();
CORBA::String_var entry = shapes[i]->GetStudyEntry();
@@
-224,7
+223,7
@@
void StdMeshersGUI_QuadrangleParamCreator::retrieveParams() const
item->setData( Qt::UserRole, entry.in() );
myShapesList->addItem( item );
}
item->setData( Qt::UserRole, entry.in() );
myShapesList->addItem( item );
}
- for (
in
t i = 0; i < points->length(); ++i )
+ for (
size_
t i = 0; i < points->length(); ++i )
{
QTreeWidgetItem* item = new QTreeWidgetItem
( QStringList()
{
QTreeWidgetItem* item = new QTreeWidgetItem
( QStringList()
@@
-408,7
+407,7
@@
void StdMeshersGUI_QuadrangleParamCreator::onSelectionChanged()
void StdMeshersGUI_QuadrangleParamCreator::onTabChanged(int i)
{
void StdMeshersGUI_QuadrangleParamCreator::onTabChanged(int i)
{
- myVertexSelWdg->
s
howPreview( i == TAB_VERTEX );
+ myVertexSelWdg->
S
howPreview( i == TAB_VERTEX );
}
//================================================================================
}
//================================================================================