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 remote branch 'origin/V7_dev' into V8_0_0_BR
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_QuadrangleParamWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
index 0823ba24bdb09e5ba10910082c8489d19bd9adb8..b1112e7864e30c16fd1923816991319a597c8de2 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx
@@
-24,6
+24,7
@@
#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 "StdMeshersGUI_SubShapeSelectorWdg.h"
#include <GEOMBase.h>
@@
-194,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())
{
@@
-215,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();
@@
-223,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()
@@
-407,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 );
}
//================================================================================
}
//================================================================================