From a8e590fdc3a95b9225f054a1abac9d67389c790c Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 28 Jul 2008 13:47:42 +0000 Subject: [PATCH] Fix combo box model problems --- src/GUI/NETGENPluginGUI_HypothesisCreator.cxx | 14 +++++--------- src/GUI/NETGENPluginGUI_HypothesisCreator.h | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx index 660ec38..029bdf3 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx @@ -38,8 +38,8 @@ #include #include -#include +#include #include #include #include @@ -117,15 +117,11 @@ QFrame* NETGENPluginGUI_HypothesisCreator::buildFrame() row++; aGroupLayout->addWidget( new QLabel( tr( "NETGEN_FINENESS" ), GroupC1 ), row, 0 ); - myFineness = new QtxComboBox( GroupC1 ); + myFineness = new QComboBox( GroupC1 ); QStringList types; - types.append( QObject::tr( "NETGEN_VERYCOARSE" ) ); - types.append( QObject::tr( "NETGEN_COARSE" ) ); - types.append( QObject::tr( "NETGEN_MODERATE" ) ); - types.append( QObject::tr( "NETGEN_FINE" ) ); - types.append( QObject::tr( "NETGEN_VERYFINE" ) ); - types.append( QObject::tr( "NETGEN_CUSTOM" ) ); - myFineness->insertItems( myFineness->count(), types ); + types << tr( "NETGEN_VERYCOARSE" ) << tr( "NETGEN_COARSE" ) << tr( "NETGEN_MODERATE" ) << + tr( "NETGEN_FINE" ) << tr( "NETGEN_VERYFINE" ) << tr( "NETGEN_CUSTOM" ); + myFineness->addItems( types ); aGroupLayout->addWidget( myFineness, row, 1 ); row++; diff --git a/src/GUI/NETGENPluginGUI_HypothesisCreator.h b/src/GUI/NETGENPluginGUI_HypothesisCreator.h index 65c96e1..90678bc 100644 --- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h +++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h @@ -41,7 +41,7 @@ #include class QtxDoubleSpinBox; -class QtxComboBox; +class QComboBox; class QCheckBox; class QLineEdit; @@ -89,7 +89,7 @@ private: QtxDoubleSpinBox* myMaxSize; QCheckBox* mySecondOrder; QCheckBox* myOptimize; - QtxComboBox* myFineness; + QComboBox* myFineness; QtxDoubleSpinBox* myGrowthRate; QtxDoubleSpinBox* myNbSegPerEdge; QtxDoubleSpinBox* myNbSegPerRadius;