X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI_QuadrangleParamWdg.cxx;h=b1112e7864e30c16fd1923816991319a597c8de2;hp=a99177bceb2ed0d32217f38da14ffdc21e646316;hb=5482b99d07dd144fd5be299e722f39a81de3b5be;hpb=b0a908c0d20341651771d0249fb10882f54b2aad diff --git a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx index a99177bce..b1112e786 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_QuadrangleParamWdg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -24,12 +24,12 @@ #include "SMESHGUI.h" #include "SMESHGUI_SpinBox.h" +#include "SMESHGUI_Utils.h" #include "StdMeshersGUI_SubShapeSelectorWdg.h" #include #include #include -#include #include // Qt includes @@ -195,8 +195,7 @@ void StdMeshersGUI_QuadrangleParamCreator::retrieveParams() const QString aMainEntry = SMESHGUI_GenericHypothesisCreator::getMainShapeEntry(); if ( anEntry.isEmpty() ) anEntry = h->GetObjectEntry(); - myVertexSelWdg->SetGeomShapeEntry(anEntry); - myVertexSelWdg->SetMainShapeEntry(aMainEntry); + myVertexSelWdg->SetGeomShapeEntry(anEntry,aMainEntry); if ( !isCreation()) { @@ -216,7 +215,7 @@ void StdMeshersGUI_QuadrangleParamCreator::retrieveParams() const GEOM::ListOfGO_var shapes; SMESH::nodes_array_var points; h->GetEnforcedNodes( shapes, points ); - for ( int 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(); @@ -224,7 +223,7 @@ void StdMeshersGUI_QuadrangleParamCreator::retrieveParams() const item->setData( Qt::UserRole, entry.in() ); myShapesList->addItem( item ); } - for ( int i = 0; i < points->length(); ++i ) + for ( size_t i = 0; i < points->length(); ++i ) { QTreeWidgetItem* item = new QTreeWidgetItem ( QStringList() @@ -408,7 +407,7 @@ void StdMeshersGUI_QuadrangleParamCreator::onSelectionChanged() void StdMeshersGUI_QuadrangleParamCreator::onTabChanged(int i) { - myVertexSelWdg->showPreview( i == TAB_VERTEX ); + myVertexSelWdg->ShowPreview( i == TAB_VERTEX ); } //================================================================================