From d2d25713a3b9935e6e34af1a5417488867ea7ae5 Mon Sep 17 00:00:00 2001 From: Jon Date: Thu, 16 Nov 2017 08:59:49 +1100 Subject: [PATCH] Minor fixes --- CMakeLists.txt | 2 +- src/ODNavObjectChanges.cpp | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 282aad80..f69a6067 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ SET(CPACK_PACKAGE_CONTACT "Jon Gough") SET(VERSION_MAJOR "1") SET(VERSION_MINOR "4") -SET(VERSION_PATCH "16") +SET(VERSION_PATCH "17") SET(VERSION_DATE "16/11/2017") SET(BUNDLE_DATA FALSE) diff --git a/src/ODNavObjectChanges.cpp b/src/ODNavObjectChanges.cpp index 0c35cd92..57dd8431 100644 --- a/src/ODNavObjectChanges.cpp +++ b/src/ODNavObjectChanges.cpp @@ -1201,6 +1201,16 @@ ODPoint * ODNavObjectChanges::GPXLoadODPoint1( pugi::xml_node &opt_node, pOP->m_lon = rlon; pOP->m_IconName = SymString; pOP->SetName( NameString ); + pOP->SetMarkDescription( DescString ); + pOP->m_sTypeString = TypeString; + pOP->SetODPointArrivalRadius( ArrivalRadius ); + pOP->SetODPointRangeRingsNumber( l_iODPointRangeRingsNumber ); + pOP->SetODPointRangeRingsStep( l_fODPointRangeRingsStep ); + pOP->SetODPointRangeRingsStepUnits( l_pODPointRangeRingsStepUnits ); + pOP->SetShowODPointRangeRings( l_bODPointRangeRingsVisible ); + pOP->SetODPointRangeRingsColour( l_wxcODPointRangeRingsColour ); + pOP->SetODPointRangeRingWidth( l_iODPointRangeRingWidth ); + pOP->SetODPointRangeRingStyle( l_iODPointRangeRingStyle ); } if( pTP && TypeString == _T("Text Point") ) { pTP->SetPointText( TextString ); @@ -1227,16 +1237,6 @@ ODPoint * ODNavObjectChanges::GPXLoadODPoint1( pugi::xml_node &opt_node, pBP -> m_uiBoundaryPointFillTransparency = l_uiBoundaryPointFillTransparency; } - pOP->SetMarkDescription( DescString ); - pOP->m_sTypeString = TypeString; - pOP->SetODPointArrivalRadius( ArrivalRadius ); - pOP->SetODPointRangeRingsNumber( l_iODPointRangeRingsNumber ); - pOP->SetODPointRangeRingsStep( l_fODPointRangeRingsStep ); - pOP->SetODPointRangeRingsStepUnits( l_pODPointRangeRingsStepUnits ); - pOP->SetShowODPointRangeRings( l_bODPointRangeRingsVisible ); - pOP->SetODPointRangeRingsColour( l_wxcODPointRangeRingsColour ); - pOP->SetODPointRangeRingWidth( l_iODPointRangeRingWidth ); - pOP->SetODPointRangeRingStyle( l_iODPointRangeRingStyle ); if( b_propvizname ) pOP->m_bShowName = bviz_name;