From 76fb598ac2853e1fe876a3b590c0b74ec6b49f70 Mon Sep 17 00:00:00 2001 From: Mike Williams Date: Tue, 14 Feb 2023 07:44:09 -0500 Subject: [PATCH] Annotate: cleanup to use enum values instead of numbers --- eeschema/dialogs/dialog_annotate.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eeschema/dialogs/dialog_annotate.cpp b/eeschema/dialogs/dialog_annotate.cpp index 5ec3161aae..fc13c0217f 100644 --- a/eeschema/dialogs/dialog_annotate.cpp +++ b/eeschema/dialogs/dialog_annotate.cpp @@ -148,9 +148,9 @@ void DIALOG_ANNOTATE::InitValues() switch( cfg->m_AnnotatePanel.scope ) { default: - case 0: m_rbScope_Schematic->SetValue( true ); break; - case 1: m_rbScope_Sheet->SetValue( true ); break; - case 2: m_rbScope_Selection->SetValue( true ); break; + case ANNOTATE_ALL: m_rbScope_Schematic->SetValue( true ); break; + case ANNOTATE_CURRENT_SHEET: m_rbScope_Sheet->SetValue( true ); break; + case ANNOTATE_SELECTION: m_rbScope_Selection->SetValue( true ); break; } m_checkRecursive->SetValue( cfg->m_AnnotatePanel.recursive ); @@ -164,8 +164,8 @@ void DIALOG_ANNOTATE::InitValues() switch( option ) { default: - case 0: m_rbSortBy_X_Position->SetValue( true ); break; - case 1: m_rbSortBy_Y_Position->SetValue( true ); break; + case SORT_BY_X_POSITION: m_rbSortBy_X_Position->SetValue( true ); break; + case SORT_BY_Y_POSITION: m_rbSortBy_Y_Position->SetValue( true ); break; } option = cfg->m_AnnotatePanel.method; @@ -173,9 +173,9 @@ void DIALOG_ANNOTATE::InitValues() switch( option ) { default: - case 0: m_rbFirstFree->SetValue( true ); break; - case 1: m_rbSheetX100->SetValue( true ); break; - case 2: m_rbSheetX1000->SetValue( true ); break; + case INCREMENTAL_BY_REF: m_rbFirstFree->SetValue( true ); break; + case SHEET_NUMBER_X_100: m_rbSheetX100->SetValue( true ); break; + case SHEET_NUMBER_X_1000: m_rbSheetX1000->SetValue( true ); break; } int annotateStartNum = 0; // Default "start after" value for annotation