From 6990353c79383998801365828fe0f16a42b2c825 Mon Sep 17 00:00:00 2001 From: stv Date: Fri, 23 Dec 2005 08:12:36 +0000 Subject: [PATCH] no message --- src/DDS/DDS_DicGroup.cxx | 7 +++---- src/DDS/DDS_DicItem.cxx | 2 +- src/QDS/QDS_Datum.cxx | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/DDS/DDS_DicGroup.cxx b/src/DDS/DDS_DicGroup.cxx index a9cba4ebe..40f42a317 100644 --- a/src/DDS/DDS_DicGroup.cxx +++ b/src/DDS/DDS_DicGroup.cxx @@ -68,8 +68,6 @@ void DDS_DicGroup::operator=( const DDS_DicGroup& ) void DDS_DicGroup::FillDataMap( const LDOM_Element& theComponentData, const LDOM_Element& theDocElement ) { - TColStd_SequenceOfAsciiString unitSystems; - TCollection_AsciiString aCompName = theComponentData.getAttribute( DDS_Dictionary::KeyWord( "COMPONENT_NAME" ) ); LDOM_Element systems = theComponentData.GetChildByTagName( DDS_Dictionary::KeyWord( "UNIT_SYSTEMS" ) ); @@ -87,8 +85,6 @@ void DDS_DicGroup::FillDataMap( const LDOM_Element& theComponentData, const LDOM if ( !myUnitSystem.IsBound( aName ) ) myUnitSystem.Bind( aName, aLabel ); - - unitSystems.Append( aName ); } } @@ -98,6 +94,9 @@ void DDS_DicGroup::FillDataMap( const LDOM_Element& theComponentData, const LDOM myUnitSystem.Bind( UNIT_SYSTEM_SI, TCollection_ExtendedString( "System international" ) ); } + TColStd_SequenceOfAsciiString unitSystems; + GetUnitSystems( unitSystems ); + LDOM_NodeList aData = theComponentData.getElementsByTagName( DDS_Dictionary::KeyWord( "DATUM" ) ); if ( !aData.getLength() ) return; diff --git a/src/DDS/DDS_DicItem.cxx b/src/DDS/DDS_DicItem.cxx index b7a0e1bad..868ce89a6 100644 --- a/src/DDS/DDS_DicItem.cxx +++ b/src/DDS/DDS_DicItem.cxx @@ -318,7 +318,7 @@ void DDS_DicItem::FillDataMap( TCollection_AsciiString theID, const LDOM_Element TCollection_AsciiString aBaseKeyWord = DDS_Dictionary::KeyWord( "DATUM_UNITS" ); - for ( Standard_Integer j = 0; j < theSystems.Length(); j++ ) + for ( Standard_Integer j = 1; j <= theSystems.Length(); j++ ) { UnitSystem anUnitSystem = theSystems.Value( j ); if ( !anUnitSystem.Length() ) diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx index 0d2369e18..1af7d56d6 100644 --- a/src/QDS/QDS_Datum.cxx +++ b/src/QDS/QDS_Datum.cxx @@ -922,7 +922,6 @@ void QDS_Datum::unitSystemChanged( const QString& unitSystem ) if ( labelWidget() ) labelWidget()->setText( labText ); - if ( unitsWidget() ) unitsWidget()->setText( unitText ); -- 2.30.2