diff --git a/common/advanced_config.cpp b/common/advanced_config.cpp index 7887d10bc9..99435ca90d 100644 --- a/common/advanced_config.cpp +++ b/common/advanced_config.cpp @@ -312,8 +312,6 @@ ADVANCED_CFG::ADVANCED_CFG() m_MaxPastedTextLength = 100; - m_hopOverArcRadius = 2.5; - loadFromConfigFile(); } diff --git a/common/jobs/job_export_sch_plot.cpp b/common/jobs/job_export_sch_plot.cpp index 621ba57521..edf7adcaea 100644 --- a/common/jobs/job_export_sch_plot.cpp +++ b/common/jobs/job_export_sch_plot.cpp @@ -71,7 +71,7 @@ JOB_EXPORT_SCH_PLOT::JOB_EXPORT_SCH_PLOT( bool aOutputIsDirectory ) : &m_blackAndWhite, m_blackAndWhite ) ); m_params.emplace_back( new JOB_PARAM( "show_hop_over", - &m_blackAndWhite, m_show_hop_over ) ); + &m_show_hop_over, m_show_hop_over ) ); m_params.emplace_back( new JOB_PARAM( "page_size", &m_pageSizeSelect, m_pageSizeSelect ) ); diff --git a/eeschema/dialogs/dialog_plot_schematic.cpp b/eeschema/dialogs/dialog_plot_schematic.cpp index 4c442f1ed0..da496091e8 100644 --- a/eeschema/dialogs/dialog_plot_schematic.cpp +++ b/eeschema/dialogs/dialog_plot_schematic.cpp @@ -432,7 +432,7 @@ void DIALOG_PLOT_SCHEMATIC::plotSchematic( bool aPlotAll ) plotOpts.m_PDFMetadata = m_plotPDFMetadata->GetValue(); plotOpts.m_outputDirectory = getOutputPath(); plotOpts.m_pageSizeSelect = m_pageSizeSelect; - plotOpts.m_plotHopOver = cfg ? cfg->m_Appearance.show_hop_over : false; + plotOpts.m_plotHopOver = m_editFrame->Schematic().Settings().m_HopOverScale > 0.0; schPlotter->Plot( GetPlotFileFormat(), plotOpts, &renderSettings, &m_MessagesBox->Reporter() ); diff --git a/eeschema/dialogs/panel_eeschema_display_options.cpp b/eeschema/dialogs/panel_eeschema_display_options.cpp index 5a4831bb97..e23bb63645 100644 --- a/eeschema/dialogs/panel_eeschema_display_options.cpp +++ b/eeschema/dialogs/panel_eeschema_display_options.cpp @@ -62,7 +62,6 @@ void PANEL_EESCHEMA_DISPLAY_OPTIONS::loadEEschemaSettings( EESCHEMA_SETTINGS* cf m_checkShowOPVoltages->SetValue( cfg->m_Appearance.show_op_voltages ); m_checkShowPinAltModeIcons->SetValue( cfg->m_Appearance.show_op_currents ); m_checkPageLimits->SetValue( cfg->m_Appearance.show_page_limits ); - m_cbHopOver->SetValue( cfg->m_Appearance.show_hop_over ); m_checkSelDrawChildItems->SetValue( cfg->m_Selection.draw_selected_children ); m_checkSelFillShapes->SetValue( cfg->m_Selection.fill_shapes ); @@ -91,34 +90,33 @@ bool PANEL_EESCHEMA_DISPLAY_OPTIONS::TransferDataFromWindow() { if( EESCHEMA_SETTINGS* cfg = GetAppSettings( "eeschema" ) ) { - cfg->m_Appearance.default_font = m_defaultFontCtrl->GetSelection() <= 0 - // This is a keyword. Do not translate. - ? wxString( KICAD_FONT_NAME ) - : m_defaultFontCtrl->GetStringSelection(); - cfg->m_Appearance.show_hidden_pins = m_checkShowHiddenPins->GetValue(); - cfg->m_Appearance.show_hidden_fields = m_checkShowHiddenFields->GetValue(); - cfg->m_Appearance.show_erc_warnings = m_checkShowERCWarnings->GetValue(); - cfg->m_Appearance.show_erc_errors = m_checkShowERCErrors->GetValue(); - cfg->m_Appearance.show_erc_exclusions = m_checkShowERCExclusions->GetValue(); - cfg->m_Appearance.mark_sim_exclusions = m_cbMarkSimExclusions->GetValue(); - cfg->m_Appearance.show_op_voltages = m_checkShowOPVoltages->GetValue(); - cfg->m_Appearance.show_op_currents = m_checkShowOPCurrents->GetValue(); - cfg->m_Appearance.show_pin_alt_icons = m_checkShowPinAltModeIcons->GetValue(); - cfg->m_Appearance.show_page_limits = m_checkPageLimits->GetValue(); - cfg->m_Appearance.show_hop_over = m_cbHopOver->GetValue(); + cfg->m_Appearance.default_font = m_defaultFontCtrl->GetSelection() <= 0 + // This is a keyword. Do not translate. + ? wxString( KICAD_FONT_NAME ) + : m_defaultFontCtrl->GetStringSelection(); + cfg->m_Appearance.show_hidden_pins = m_checkShowHiddenPins->GetValue(); + cfg->m_Appearance.show_hidden_fields = m_checkShowHiddenFields->GetValue(); + cfg->m_Appearance.show_erc_warnings = m_checkShowERCWarnings->GetValue(); + cfg->m_Appearance.show_erc_errors = m_checkShowERCErrors->GetValue(); + cfg->m_Appearance.show_erc_exclusions = m_checkShowERCExclusions->GetValue(); + cfg->m_Appearance.mark_sim_exclusions = m_cbMarkSimExclusions->GetValue(); + cfg->m_Appearance.show_op_voltages = m_checkShowOPVoltages->GetValue(); + cfg->m_Appearance.show_op_currents = m_checkShowOPCurrents->GetValue(); + cfg->m_Appearance.show_pin_alt_icons = m_checkShowPinAltModeIcons->GetValue(); + cfg->m_Appearance.show_page_limits = m_checkPageLimits->GetValue(); - cfg->m_Selection.draw_selected_children = m_checkSelDrawChildItems->GetValue(); - cfg->m_Selection.fill_shapes = m_checkSelFillShapes->GetValue(); - cfg->m_Selection.selection_thickness = KiROUND( m_selWidthCtrl->GetValue() ); - cfg->m_Selection.highlight_thickness = KiROUND( m_highlightWidthCtrl->GetValue() ); - cfg->m_Selection.highlight_netclass_colors = m_highlightNetclassColors->GetValue(); - cfg->m_Selection.highlight_netclass_colors_thickness = m_colHighlightThickness->GetValue(); + cfg->m_Selection.draw_selected_children = m_checkSelDrawChildItems->GetValue(); + cfg->m_Selection.fill_shapes = m_checkSelFillShapes->GetValue(); + cfg->m_Selection.selection_thickness = KiROUND( m_selWidthCtrl->GetValue() ); + cfg->m_Selection.highlight_thickness = KiROUND( m_highlightWidthCtrl->GetValue() ); + cfg->m_Selection.highlight_netclass_colors = m_highlightNetclassColors->GetValue(); + cfg->m_Selection.highlight_netclass_colors_thickness = m_colHighlightThickness->GetValue(); cfg->m_Selection.highlight_netclass_colors_alpha = m_colHighlightTransparency->GetValue() / 100.0; - cfg->m_CrossProbing.on_selection = m_checkCrossProbeOnSelection->GetValue(); - cfg->m_CrossProbing.center_on_items = m_checkCrossProbeCenter->GetValue(); - cfg->m_CrossProbing.zoom_to_fit = m_checkCrossProbeZoom->GetValue(); - cfg->m_CrossProbing.auto_highlight = m_checkCrossProbeAutoHighlight->GetValue(); + cfg->m_CrossProbing.on_selection = m_checkCrossProbeOnSelection->GetValue(); + cfg->m_CrossProbing.center_on_items = m_checkCrossProbeCenter->GetValue(); + cfg->m_CrossProbing.zoom_to_fit = m_checkCrossProbeZoom->GetValue(); + cfg->m_CrossProbing.auto_highlight = m_checkCrossProbeAutoHighlight->GetValue(); } m_galOptsPanel->TransferDataFromWindow(); diff --git a/eeschema/dialogs/panel_eeschema_display_options_base.cpp b/eeschema/dialogs/panel_eeschema_display_options_base.cpp index b46257895b..08dd32d47a 100644 --- a/eeschema/dialogs/panel_eeschema_display_options_base.cpp +++ b/eeschema/dialogs/panel_eeschema_display_options_base.cpp @@ -135,11 +135,6 @@ PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE::PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE( wxWind m_checkPageLimits->SetValue(true); bAppearanceSizer->Add( m_checkPageLimits, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_cbHopOver = new wxCheckBox( this, wxID_ANY, _("Hop hover on wire crossing"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbHopOver->SetToolTip( _("Show a hop hover when two wires are crossing") ); - - bAppearanceSizer->Add( m_cbHopOver, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - bRightColumn->Add( bAppearanceSizer, 0, wxEXPAND|wxTOP|wxLEFT, 5 ); diff --git a/eeschema/dialogs/panel_eeschema_display_options_base.fbp b/eeschema/dialogs/panel_eeschema_display_options_base.fbp index 189048b51f..26bc72dc79 100644 --- a/eeschema/dialogs/panel_eeschema_display_options_base.fbp +++ b/eeschema/dialogs/panel_eeschema_display_options_base.fbp @@ -1432,71 +1432,6 @@ - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - 0 - - 0 - 0 - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 0 - 1 - - 1 - - 0 - 0 - wxID_ANY - Hop hover on wire crossing - - 0 - - - 0 - - 1 - m_cbHopOver - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Show a hop hover when two wires are crossing - - wxFILTER_NONE - wxDefaultValidator - - - - - - diff --git a/eeschema/dialogs/panel_eeschema_display_options_base.h b/eeschema/dialogs/panel_eeschema_display_options_base.h index 8b32f120a1..9cee0d27a5 100644 --- a/eeschema/dialogs/panel_eeschema_display_options_base.h +++ b/eeschema/dialogs/panel_eeschema_display_options_base.h @@ -58,7 +58,6 @@ class PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE : public RESETTABLE_PANEL wxCheckBox* m_checkShowOPCurrents; wxCheckBox* m_checkShowPinAltModeIcons; wxCheckBox* m_checkPageLimits; - wxCheckBox* m_cbHopOver; wxStaticText* m_selectionLabel; wxStaticLine* m_staticline2; wxCheckBox* m_checkSelDrawChildItems; diff --git a/eeschema/dialogs/panel_setup_formatting.cpp b/eeschema/dialogs/panel_setup_formatting.cpp index 531fff07b9..2b0218f632 100644 --- a/eeschema/dialogs/panel_setup_formatting.cpp +++ b/eeschema/dialogs/panel_setup_formatting.cpp @@ -95,6 +95,7 @@ bool PANEL_SETUP_FORMATTING::TransferDataToWindow() m_lineWidth.SetValue( settings.m_DefaultLineWidth ); m_pinSymbolSize.SetValue( settings.m_PinSymbolSize ); m_choiceJunctionDotSize->SetSelection( settings.m_JunctionSizeChoice ); + m_choiceHopOverSize->SetSelection( settings.m_HopOverSizeChoice ); m_connectionGridSize.SetValue( settings.m_ConnectionGridSize ); m_showIntersheetsReferences->SetValue( settings.m_IntersheetRefsShow ); @@ -162,6 +163,9 @@ bool PANEL_SETUP_FORMATTING::TransferDataFromWindow() if( m_choiceJunctionDotSize->GetSelection() != wxNOT_FOUND ) settings.m_JunctionSizeChoice = m_choiceJunctionDotSize->GetSelection(); + if( m_choiceHopOverSize->GetSelection() != wxNOT_FOUND ) + settings.m_HopOverSizeChoice = m_choiceHopOverSize->GetSelection(); + settings.m_IntersheetRefsShow = m_showIntersheetsReferences->GetValue(); settings.m_IntersheetRefsFormatShort = !m_radioFormatStandard->GetValue(); settings.m_IntersheetRefsPrefix = m_prefixCtrl->GetValue(); diff --git a/eeschema/dialogs/panel_setup_formatting_base.cpp b/eeschema/dialogs/panel_setup_formatting_base.cpp index 9c089aeb43..65bdb60f19 100644 --- a/eeschema/dialogs/panel_setup_formatting_base.cpp +++ b/eeschema/dialogs/panel_setup_formatting_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -155,9 +155,9 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi gbSizer1->SetFlexibleDirection( wxBOTH ); gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText261 = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Junction dot size:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText261->Wrap( -1 ); - gbSizer1->Add( m_staticText261, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_junctionDotLabel = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Junction dot size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_junctionDotLabel->Wrap( -1 ); + gbSizer1->Add( m_junctionDotLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); wxString m_choiceJunctionDotSizeChoices[] = { _("None"), _("Smallest"), _("Small"), _("Default"), _("Large"), _("Largest") }; int m_choiceJunctionDotSizeNChoices = sizeof( m_choiceJunctionDotSizeChoices ) / sizeof( wxString ); @@ -165,16 +165,26 @@ PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWi m_choiceJunctionDotSize->SetSelection( 3 ); gbSizer1->Add( m_choiceJunctionDotSize, wxGBPosition( 0, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + m_hopOverLabel = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Hop-over size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_hopOverLabel->Wrap( -1 ); + gbSizer1->Add( m_hopOverLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + + wxString m_choiceHopOverSizeChoices[] = { _("None"), _("Smallest"), _("Small"), _("Medium"), _("Large"), _("Largest") }; + int m_choiceHopOverSizeNChoices = sizeof( m_choiceHopOverSizeChoices ) / sizeof( wxString ); + m_choiceHopOverSize = new wxChoice( sbSizer2->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHopOverSizeNChoices, m_choiceHopOverSizeChoices, 0 ); + m_choiceHopOverSize->SetSelection( 0 ); + gbSizer1->Add( m_choiceHopOverSize, wxGBPosition( 1, 1 ), wxGBSpan( 1, 2 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + m_connectionGridLabel = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Connection grid:"), wxDefaultPosition, wxDefaultSize, 0 ); m_connectionGridLabel->Wrap( -1 ); - gbSizer1->Add( m_connectionGridLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + gbSizer1->Add( m_connectionGridLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); m_connectionGridCtrl = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - gbSizer1->Add( m_connectionGridCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + gbSizer1->Add( m_connectionGridCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_connectionGridUnits = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 ); m_connectionGridUnits->Wrap( -1 ); - gbSizer1->Add( m_connectionGridUnits, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + gbSizer1->Add( m_connectionGridUnits, wxGBPosition( 2, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); gbSizer1->AddGrowableCol( 1 ); diff --git a/eeschema/dialogs/panel_setup_formatting_base.fbp b/eeschema/dialogs/panel_setup_formatting_base.fbp index 950e56fd95..0abb43825d 100644 --- a/eeschema/dialogs/panel_setup_formatting_base.fbp +++ b/eeschema/dialogs/panel_setup_formatting_base.fbp @@ -1,3193 +1,3375 @@ - + - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - table - panel_setup_formatting_base - 1000 - none - - - 1 - PanelSetupFormatting - - . - - 1 - 1 - 1 - 1 - UI - 0 - 1 - 0 - - 0 - wxAUI_MGR_DEFAULT - - - 1 - 1 - impl_virtual - - - 0 - wxID_ANY - + + + C++ + + 1 + table + none + + + 0 + 1 + res + UTF-8 + panel_setup_formatting_base + 1000 + 1 + 1 + UI + PanelSetupFormatting + . + 0 + source_name + 1 + 0 + source_name + + + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 0 + 1 + impl_virtual + + + 0 + wxID_ANY + + + PANEL_SETUP_FORMATTING_BASE + + -1,-1 + ; forward_declare + + 0 + + + wxTAB_TRAVERSAL + + + bPanelSizer + wxHORIZONTAL + none + + 5 + wxEXPAND|wxBOTTOM|wxLEFT + 1 + - PANEL_SETUP_FORMATTING_BASE - - -1,-1 - ; forward_declare - - 0 - - - wxTAB_TRAVERSAL - + bLeftColumn + wxVERTICAL + none + + 5 + wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT + 0 + + wxID_ANY + Annotations - bPanelSizer - wxHORIZONTAL + sbSizer1 + wxVERTICAL + 1 none - - 5 - wxEXPAND|wxBOTTOM|wxLEFT - 1 - + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT + 0 + + + bSizer6 + wxHORIZONTAL + none + + 5 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Symbol unit notation: + 0 + + 0 + + + 0 - bLeftColumn - wxVERTICAL - none - - 5 - wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT - 0 - - wxID_ANY - Annotations - - sbSizer1 - wxVERTICAL - 1 - none - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT - 0 - - - bSizer6 - wxHORIZONTAL - none - - 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Symbol unit notation: - 0 - - 0 - - - 0 - - 1 - m_staticText26 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxRIGHT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "A" ".A" "-A" "_A" ".1" "-1" "_1" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceSeparatorRefId - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT - 0 - - wxID_ANY - Text - - sbSizer4 - wxVERTICAL - 1 - none - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 3 - wxHORIZONTAL - 1 - - 5 - - fgSizer2 - wxFLEX_GROWMODE_NONE - none - 0 - 5 - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Default text size: - 0 - - 0 - - - 0 - - 1 - m_textSizeLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textSizeCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - 0 - - 0 - - - 0 - - 1 - m_textSizeUnits - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Overbar offset ratio: - 0 - - 0 - - - 0 - - 1 - m_overbarHieghtLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_overbarHeightCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - % - 0 - - 0 - - - 0 - - 1 - m_overbarHeightUnits - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Label offset ratio: - 0 - - 0 - - - 0 - - 1 - m_textOffsetRatioLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Percentage of the text size to offset labels above (or below) a wire, bus, or pin - - - - -1 - - - - 5 - wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_textOffsetRatioCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Percentage of the text size to offset labels above (or below) a wire, bus, or pin - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - % - 0 - - 0 - - - 0 - - 1 - m_offsetRatioUnits - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Global label margin ratio: - 0 - - 0 - - - 0 - - 1 - m_labelSizeRatioLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Percentage of the text size to use as space around a global label - - - - -1 - - - - 5 - wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_labelSizeRatioCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - Percentage of the text size to use as space around a global label - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - % - 0 - - 0 - - - 0 - - 1 - m_labelSizeRatioUnits - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT - 0 - - wxID_ANY - Symbols - - sbSizer41 - wxVERTICAL - 1 - none - - 5 - wxEXPAND|wxBOTTOM - 1 - - 3 - wxBOTH - 1 - - 0 - -1,-1 - fgSizer321 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 5 - - 5 - wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Default line width: - 0 - - 0 - - - 0 - - 1 - m_lineWidthLabel - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_lineWidthCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - 0 - - 0 - - - 0 - - 1 - m_lineWidthUnits - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Pin symbol size: - 0 - - 0 - - - 0 - - 1 - m_pinSymbolSizeLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_pinSymbolSizeCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - 0 - - 0 - - - 0 - - 1 - m_pinSymbolSizeUnits - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - - - 5 - wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT - 1 - - wxID_ANY - Connections - - sbSizer2 - wxVERTICAL - 1 - none - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 1 - - - wxBOTH - 1 - - 5 - - gbSizer1 - wxFLEX_GROWMODE_SPECIFIED - none - 5 - - 5 - 1 - 0 - wxALIGN_CENTER_VERTICAL - 0 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Junction dot size: - 0 - - 0 - - - 0 - - 1 - m_staticText261 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - 2 - 1 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "None" "Smallest" "Small" "Default" "Large" "Largest" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_choiceJunctionDotSize - 1 - - - protected - 1 - - Resizable - 3 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - 1 - 0 - wxALIGN_CENTER_VERTICAL - 1 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Connection grid: - 0 - - 0 - - - 0 - - 1 - m_connectionGridLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - 1 - 1 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 1 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_connectionGridCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - 1 - 2 - wxALIGN_CENTER_VERTICAL - 1 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - mils - 0 - - 0 - - - 0 - - 1 - m_connectionGridUnits - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - + 1 + m_staticText26 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + - - - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT - 1 - + + 5 + wxEXPAND|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "A" ".A" "-A" "_A" ".1" "-1" "_1" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 - bRightColumn - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - wxID_ANY - Inter-sheet References - - sbSizerIREf - wxVERTICAL - 1 - none - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show inter-sheet references - - 0 - - - 0 - - 1 - m_showIntersheetsReferences - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onCheckBoxIref - - - - 15 - wxEXPAND|wxLEFT - 1 - - - bSizerMargins - wxVERTICAL - none - - 5 - wxBOTTOM|wxLEFT|wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show own page reference - - 0 - - - 0 - - 1 - m_listOwnPage - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Standard (1,2,3) - - 0 - - - 0 - - 1 - m_radioFormatStandard - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 1 - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Abbreviated (1..3) - - 0 - - - 0 - - 1 - m_radioFormatAbbreviated - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - 5 - wxEXPAND - 1 - - 2 - wxBOTH - 1 - - 0 - - fgSizer4 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Prefix: - 0 - - 0 - - - 0 - - 1 - m_prefixLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 160,-1 - 1 - m_prefixCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - [ - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Suffix: - 0 - - 0 - - - 0 - - 1 - m_suffixLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - 160,-1 - 1 - m_suffixCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - ] - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - wxID_ANY - Dashed Lines - - sbSizer6 - wxVERTICAL - 1 - none - - 5 - wxEXPAND|wxBOTTOM - 0 - - 2 - wxBOTH - - - 0 - - fgSizer41 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 5 - - 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Dash length: - 0 - - 0 - - - 0 - - 1 - dashLengthLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_dashLengthCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - 5 - wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Gap length: - 0 - - 0 - - - 0 - - 1 - gapLengthLabel - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_gapLengthCtrl - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Dash and dot lengths are ratios of the line width. - 0 - - 0 - - - 0 - - 1 - m_dashedLineHelp - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - - - 5 - wxEXPAND|wxALL - 1 - - wxID_ANY - Operating-point Overlay - - sbSizer7 - wxVERTICAL - 1 - none - - 5 - wxEXPAND - 1 - - 2 - wxBOTH - 1 - - 0 - - fgSizer - wxFLEX_GROWMODE_SPECIFIED - none - 4 - 6 - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Significant digits (voltages): - 0 - - 0 - - - 0 - - 1 - vPrecisionLabel - 1 - - - none - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 3 - 10 - - 0 - - 1 - - 0 - - 1 - m_vPrecisionCtrl - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Range (voltages): - 0 - - 0 - - - 0 - - 1 - vRangeLabel - 1 - - - none - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Auto" "fV" "pV" "nV" "uV" "mV" "V" "KV" "MV" "GV" "TV" "PV" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_vRangeCtrl - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxLEFT|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Significant digits (currents): - 0 - - 0 - - - 0 - - 1 - iPrecisionLabel - 1 - - - none - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 3 - 10 - - 0 - - 1 - - 0 - - 1 - m_iPrecisionCtrl - 1 - - - protected - 1 - - Resizable - 1 - - wxSP_ARROW_KEYS - ; ; forward_declare - 0 - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Range (currents): - 0 - - 0 - - - 0 - - 1 - iRangeLabel - 1 - - - none - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Auto" "fA" "pA" "nA" "uA" "mA" "A" "KA" "MA" "GA" "TA" "PA" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_iRangeCtrl - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - + 1 + m_choiceSeparatorRefId + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT + 0 + + wxID_ANY + Text + + sbSizer4 + wxVERTICAL + 1 + none + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 3 + wxHORIZONTAL + 1 + + 5 + + fgSizer2 + wxFLEX_GROWMODE_NONE + none + 0 + 5 + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Default text size: + 0 + + 0 + + + 0 + + 1 + m_textSizeLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_textSizeCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + 0 + + 0 + + + 0 + + 1 + m_textSizeUnits + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Overbar offset ratio: + 0 + + 0 + + + 0 + + 1 + m_overbarHieghtLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_overbarHeightCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + % + 0 + + 0 + + + 0 + + 1 + m_overbarHeightUnits + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Label offset ratio: + 0 + + 0 + + + 0 + + 1 + m_textOffsetRatioLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Percentage of the text size to offset labels above (or below) a wire, bus, or pin + + + + -1 + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_textOffsetRatioCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Percentage of the text size to offset labels above (or below) a wire, bus, or pin + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + % + 0 + + 0 + + + 0 + + 1 + m_offsetRatioUnits + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Global label margin ratio: + 0 + + 0 + + + 0 + + 1 + m_labelSizeRatioLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Percentage of the text size to use as space around a global label + + + + -1 + + + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_labelSizeRatioCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + Percentage of the text size to use as space around a global label + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + % + 0 + + 0 + + + 0 + + 1 + m_labelSizeRatioUnits + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + + + 5 + wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT + 0 + + wxID_ANY + Symbols + + sbSizer41 + wxVERTICAL + 1 + none + + 5 + wxEXPAND|wxBOTTOM + 1 + + 3 + wxBOTH + 1 + + 0 + -1,-1 + fgSizer321 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 5 + + 5 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Default line width: + 0 + + 0 + + + 0 + + 1 + m_lineWidthLabel + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_lineWidthCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + 0 + + 0 + + + 0 + + 1 + m_lineWidthUnits + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Pin symbol size: + 0 + + 0 + + + 0 + + 1 + m_pinSymbolSizeLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_pinSymbolSizeCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxFIXED_MINSIZE|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + 0 + + 0 + + + 0 + + 1 + m_pinSymbolSizeUnits + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + + + 5 + wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT + 1 + + wxID_ANY + Connections + + sbSizer2 + wxVERTICAL + 1 + none + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 1 + + + wxBOTH + 1 + + 5 + + gbSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 5 + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL + 0 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Junction dot size: + 0 + + 0 + + + 0 + + 1 + m_junctionDotLabel + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + 5 + 2 + 1 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "None" "Smallest" "Small" "Default" "Large" "Largest" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceJunctionDotSize + 1 + + + protected + 1 + + Resizable + 3 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL + 1 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Hop-over size: + 0 + + 0 + + + 0 + + 1 + m_hopOverLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 2 + 1 + wxEXPAND|wxALIGN_CENTER_VERTICAL + 1 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "None" "Smallest" "Small" "Medium" "Large" "Largest" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_choiceHopOverSize + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + 1 + 0 + wxALIGN_CENTER_VERTICAL + 2 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Connection grid: + 0 + + 0 + + + 0 + + 1 + m_connectionGridLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + 1 + 1 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 2 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_connectionGridCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + 1 + 2 + wxALIGN_CENTER_VERTICAL + 2 + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + mils + 0 + + 0 + + + 0 + + 1 + m_connectionGridUnits + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + + + + 5 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + + bRightColumn + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + wxID_ANY + Inter-sheet References + + sbSizerIREf + wxVERTICAL + 1 + none + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Show inter-sheet references + + 0 + + + 0 + + 1 + m_showIntersheetsReferences + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onCheckBoxIref + + + + 15 + wxEXPAND|wxLEFT + 1 + + + bSizerMargins + wxVERTICAL + none + + 5 + wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Show own page reference + + 0 + + + 0 + + 1 + m_listOwnPage + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Standard (1,2,3) + + 0 + + + 0 + + 1 + m_radioFormatStandard + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + 5 + wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Abbreviated (1..3) + + 0 + + + 0 + + 1 + m_radioFormatAbbreviated + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + 5 + wxEXPAND + 1 + + 2 + wxBOTH + 1 + + 0 + + fgSizer4 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Prefix: + 0 + + 0 + + + 0 + + 1 + m_prefixLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 160,-1 + 1 + m_prefixCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + [ + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Suffix: + 0 + + 0 + + + 0 + + 1 + m_suffixLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 1 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + 160,-1 + 1 + m_suffixCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + ] + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + wxID_ANY + Dashed Lines + + sbSizer6 + wxVERTICAL + 1 + none + + 5 + wxEXPAND|wxBOTTOM + 0 + + 2 + wxBOTH + + + 0 + + fgSizer41 + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 5 + + 5 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Dash length: + 0 + + 0 + + + 0 + + 1 + dashLengthLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_dashLengthCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + 5 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Gap length: + 0 + + 0 + + + 0 + + 1 + gapLengthLabel + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + 0 + + 0 + + 1 + m_gapLengthCtrl + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Dash and dot lengths are ratios of the line width. + 0 + + 0 + + + 0 + + 1 + m_dashedLineHelp + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + + + 5 + wxEXPAND|wxALL + 1 + + wxID_ANY + Operating-point Overlay + + sbSizer7 + wxVERTICAL + 1 + none + + 5 + wxEXPAND + 1 + + 2 + wxBOTH + 1 + + 0 + + fgSizer + wxFLEX_GROWMODE_SPECIFIED + none + 4 + 6 + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Significant digits (voltages): + 0 + + 0 + + + 0 + + 1 + vPrecisionLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + 3 + 10 + + 0 + + 1 + + 0 + + 1 + m_vPrecisionCtrl + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Range (voltages): + 0 + + 0 + + + 0 + + 1 + vRangeLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Auto" "fV" "pV" "nV" "uV" "mV" "V" "KV" "MV" "GV" "TV" "PV" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_vRangeCtrl + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Significant digits (currents): + 0 + + 0 + + + 0 + + 1 + iPrecisionLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + 3 + 10 + + 0 + + 1 + + 0 + + 1 + m_iPrecisionCtrl + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS + ; ; forward_declare + 0 + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + Range (currents): + 0 + + 0 + + + 0 + + 1 + iRangeLabel + 1 + + + none + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + + + -1 + + + + 5 + wxBOTTOM|wxEXPAND|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + 0 + + 0 + 0 + + + + 1 + 0 + "Auto" "fA" "pA" "nA" "uA" "mA" "A" "KA" "MA" "GA" "TA" "PA" + 1 + + 1 + 0 + Dock + 0 + Left + 0 + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_iRangeCtrl + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + diff --git a/eeschema/dialogs/panel_setup_formatting_base.h b/eeschema/dialogs/panel_setup_formatting_base.h index d573f1f88e..8dec17f6b4 100644 --- a/eeschema/dialogs/panel_setup_formatting_base.h +++ b/eeschema/dialogs/panel_setup_formatting_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b) +// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -61,8 +61,10 @@ class PANEL_SETUP_FORMATTING_BASE : public wxPanel wxStaticText* m_pinSymbolSizeLabel; wxTextCtrl* m_pinSymbolSizeCtrl; wxStaticText* m_pinSymbolSizeUnits; - wxStaticText* m_staticText261; + wxStaticText* m_junctionDotLabel; wxChoice* m_choiceJunctionDotSize; + wxStaticText* m_hopOverLabel; + wxChoice* m_choiceHopOverSize; wxStaticText* m_connectionGridLabel; wxTextCtrl* m_connectionGridCtrl; wxStaticText* m_connectionGridUnits; diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index b1aa50bf19..f4cb3c21d5 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -60,6 +60,7 @@ bool SCH_EDIT_FRAME::LoadProjectSettings() { SCHEMATIC_SETTINGS& settings = Schematic().Settings(); settings.m_JunctionSize = GetSchematicJunctionSize(); + settings.m_HopOverScale = GetSchematicHopOverScale(); GetRenderSettings()->SetDefaultPenWidth( settings.m_DefaultLineWidth ); GetRenderSettings()->m_LabelSizeRatio = settings.m_LabelSizeRatio; @@ -192,6 +193,14 @@ int SCH_EDIT_FRAME::GetSchematicJunctionSize() } +double SCH_EDIT_FRAME::GetSchematicHopOverScale() +{ + std::vector& sizeMultipliers = eeconfig()->m_Drawing.junction_size_mult_list; + + return sizeMultipliers[Schematic().Settings().m_HopOverSizeChoice]; +} + + void SCH_EDIT_FRAME::saveProjectSettings() { wxFileName fn = Schematic().RootScreen()->GetFileName(); //ConfigFileName diff --git a/eeschema/eeschema_settings.cpp b/eeschema/eeschema_settings.cpp index ef1b4853b0..d00e6af164 100644 --- a/eeschema/eeschema_settings.cpp +++ b/eeschema/eeschema_settings.cpp @@ -244,9 +244,6 @@ EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() : m_params.emplace_back( new PARAM( "appearance.show_page_limits", &m_Appearance.show_page_limits, true ) ); - m_params.emplace_back( new PARAM( "appearance.show_hop_over", - &m_Appearance.show_hop_over, false ) ); - m_params.emplace_back( new PARAM( "appearance.show_sexpr_file_convert_warning", &m_Appearance.show_sexpr_file_convert_warning, true ) ); @@ -385,9 +382,12 @@ EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() : m_params.emplace_back( new PARAM_LIST( "drawing.junction_size_mult_list", &m_Drawing.junction_size_mult_list, { 0.0, 1.7, 4.0, 6.0, 9.0, 12.0 } ) ); - m_params.emplace_back(new PARAM ( "drawing.junction_size_choice", + m_params.emplace_back( new PARAM( "drawing.junction_size_choice", &m_Drawing.junction_size_choice, 3 ) ); + m_params.emplace_back( new PARAM( "drawing.hop_over_size_choice", + &m_Drawing.hop_over_size_choice, 0 ) ); + m_params.emplace_back( new PARAM( "find_replace.search_all_fields", &m_FindReplaceExtra.search_all_fields, false ) ); diff --git a/eeschema/eeschema_settings.h b/eeschema/eeschema_settings.h index 715f7b2cbd..fe6cc30644 100644 --- a/eeschema/eeschema_settings.h +++ b/eeschema/eeschema_settings.h @@ -87,7 +87,6 @@ public: bool show_pin_alt_icons; bool show_illegal_symbol_lib_dialog; bool show_page_limits; - bool show_hop_over; bool show_sexpr_file_convert_warning; bool show_sheet_filename_case_sensitivity_dialog; }; @@ -179,8 +178,9 @@ public: bool auto_start_wires; std::vector junction_size_mult_list; - // Pulldown index for user default junction dot size (e.g. smallest = 0, small = 1, etc) - int junction_size_choice; + // Pulldown index for user default junction dot size (e.g. none = 0, smallest = 1, small = 2, etc) + int junction_size_choice; + int hop_over_size_choice; }; struct INPUT diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp index 2781f59edc..08f4b9c38f 100644 --- a/eeschema/sch_edit_frame.cpp +++ b/eeschema/sch_edit_frame.cpp @@ -1903,6 +1903,7 @@ void SCH_EDIT_FRAME::CommonSettingsChanged( int aFlags ) SCHEMATIC_SETTINGS& settings = Schematic().Settings(); settings.m_JunctionSize = GetSchematicJunctionSize(); + settings.m_HopOverScale = GetSchematicHopOverScale(); ShowAllIntersheetRefs( settings.m_IntersheetRefsShow ); @@ -1929,8 +1930,18 @@ void SCH_EDIT_FRAME::CommonSettingsChanged( int aFlags ) SCH_SCREEN* screen = GetCurrentSheet().LastScreen(); for( SCH_ITEM* item : screen->Items() ) + { item->ClearCaches(); + if( item->Type() == SCH_LINE_T ) + { + SCH_LINE* line = static_cast( item ); + + if( line->IsWire() ) + UpdateHopOveredWires( line ); + } + } + for( const auto& [ libItemName, libSymbol ] : screen->GetLibSymbols() ) libSymbol->ClearCaches(); diff --git a/eeschema/sch_edit_frame.h b/eeschema/sch_edit_frame.h index 5b888f6297..e70772a7b6 100644 --- a/eeschema/sch_edit_frame.h +++ b/eeschema/sch_edit_frame.h @@ -767,6 +767,7 @@ public: const BOX2I GetDocumentExtents( bool aIncludeAllVisible = true ) const override; int GetSchematicJunctionSize(); + double GetSchematicHopOverScale(); void FocusOnItem( EDA_ITEM* aItem ) override; diff --git a/eeschema/sch_line.cpp b/eeschema/sch_line.cpp index 1fea7b9cb2..bac4a89036 100644 --- a/eeschema/sch_line.cpp +++ b/eeschema/sch_line.cpp @@ -1096,10 +1096,11 @@ std::vector SCH_LINE::BuildWireWithHopShape( const SCH_SCREEN* aScreen } else { - auto getDistance = []( const VECTOR2I& a, const VECTOR2I& b ) -> double - { - return std::sqrt( std::pow( a.x - b.x, 2 ) + std::pow( a.y - b.y, 2 ) ); - }; + auto getDistance = + []( const VECTOR2I& a, const VECTOR2I& b ) -> double + { + return std::sqrt( std::pow( a.x - b.x, 2 ) + std::pow( a.y - b.y, 2 ) ); + }; std::sort( intersections.begin(), intersections.end(), [&]( const VECTOR2I& a, const VECTOR2I& b ) @@ -1137,14 +1138,14 @@ std::vector SCH_LINE::BuildWireWithHopShape( const SCH_SCREEN* aScreen VECTOR2I arcMidPoint = { hopMid.x + static_cast( arcRadius * cos( ( startAngleRad + endAngleRad ) / 2.0f ) ), - hopMid.y + static_cast( arcRadius + hopMid.y - static_cast( arcRadius * sin( ( startAngleRad + endAngleRad ) / 2.0f ) ) }; VECTOR2I beforeHop = hopMid - VECTOR2I( arcRadius * std::cos( lineAngle ), - arcRadius * std::sin( lineAngle ) ); + arcRadius * std::sin( lineAngle ) ); VECTOR2I afterHop = hopMid + VECTOR2I( arcRadius * std::cos( lineAngle ), - arcRadius * std::sin( lineAngle ) ); + arcRadius * std::sin( lineAngle ) ); // Draw the line from the current start point to the before-hop point wire_shape.emplace_back( currentStart.x, currentStart.y, 0 ); diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp index 88bb91b562..6987175bc9 100644 --- a/eeschema/sch_painter.cpp +++ b/eeschema/sch_painter.cpp @@ -1364,11 +1364,10 @@ void SCH_PAINTER::draw( const SCH_LINE* aLine, int aLayer ) bool highlightNetclassColors = false; double highlightAlpha = 0.6; EESCHEMA_SETTINGS* eeschemaCfg = eeconfig(); - bool showHopOver = false; + double hopOverScale = aLine->Schematic()->Settings().m_HopOverScale; if( eeschemaCfg ) { - showHopOver = eeschemaCfg->m_Appearance.show_hop_over; highlightNetclassColors = eeschemaCfg->m_Selection.highlight_netclass_colors; highlightAlpha = eeschemaCfg->m_Selection.highlight_netclass_colors_alpha; } @@ -1485,10 +1484,10 @@ void SCH_PAINTER::draw( const SCH_LINE* aLine, int aLayer ) std::vector curr_wire_shape; - if( aLine->IsWire() && showHopOver ) + if( aLine->IsWire() && hopOverScale > 0.0 ) { double lineWidth = getLineWidth( aLine, false, drawingNetColorHighlights ); - double arcRadius = lineWidth * ADVANCED_CFG::GetCfg().m_hopOverArcRadius; + double arcRadius = lineWidth * hopOverScale; curr_wire_shape = aLine->BuildWireWithHopShape( m_schematic->GetCurrentScreen(), arcRadius ); } else diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp index ef5567ff49..46a31b3dfe 100644 --- a/eeschema/sch_screen.cpp +++ b/eeschema/sch_screen.cpp @@ -925,10 +925,12 @@ void SCH_SCREEN::Plot( PLOTTER* aPlotter, const SCH_PLOT_OPTS& aPlotOpts ) const SCH_LINE* aLine = static_cast( item ); if( !aLine->IsWire() || !aPlotOpts.m_plotHopOver ) + { item->Plot( aPlotter, !background, aPlotOpts, 0, 0, { 0, 0 }, false ); + } else { - double arcRadius = lineWidth * ADVANCED_CFG::GetCfg().m_hopOverArcRadius; + double arcRadius = lineWidth * aLine->Schematic()->Settings().m_HopOverScale; std::vector curr_wire_shape = aLine->BuildWireWithHopShape( this, arcRadius ); for( size_t ii = 1; ii < curr_wire_shape.size(); ii++ ) diff --git a/eeschema/schematic_settings.cpp b/eeschema/schematic_settings.cpp index 1d935566f2..941792c5a7 100644 --- a/eeschema/schematic_settings.cpp +++ b/eeschema/schematic_settings.cpp @@ -45,6 +45,8 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin m_PinSymbolSize( DEFAULT_TEXT_SIZE * schIUScale.IU_PER_MILS / 2 ), m_JunctionSizeChoice( 3 ), m_JunctionSize( DEFAULT_JUNCTION_DIAM * schIUScale.IU_PER_MILS ), + m_HopOverSizeChoice( 0 ), + m_HopOverScale( 0.0 ), m_ConnectionGridSize( DEFAULT_CONNECTION_GRID_MILS * schIUScale.IU_PER_MILS ), m_AnnotateStartNum( 0 ), m_IntersheetRefsShow( false ), @@ -73,6 +75,7 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin int defaultTextSize = cfg ? cfg->m_Drawing.default_text_size : DEFAULT_TEXT_SIZE; int defaultPinSymbolSize = cfg ? cfg->m_Drawing.pin_symbol_size : DEFAULT_TEXT_SIZE / 2; int defaultJunctionSizeChoice = cfg ? cfg->m_Drawing.junction_size_choice : 3; + int defaultHopOverSizeChoice = cfg ? cfg->m_Drawing.hop_over_size_choice : 0; bool defaultIntersheetsRefShow = cfg ? cfg->m_Drawing.intersheets_ref_show : false; bool defaultIntersheetsRefOwnPage = cfg ? cfg->m_Drawing.intersheets_ref_own_page : true; bool defaultIntersheetsRefFormatShort = cfg ? cfg->m_Drawing.intersheets_ref_short : false; @@ -146,6 +149,9 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin m_params.emplace_back( new PARAM( "drawing.junction_size_choice", &m_JunctionSizeChoice, defaultJunctionSizeChoice ) ); + m_params.emplace_back( new PARAM( "drawing.hop_over_size_choice", + &m_HopOverSizeChoice, defaultHopOverSizeChoice ) ); + m_params.emplace_back( new PARAM_LAMBDA( "drawing.field_names", [&]() -> nlohmann::json { diff --git a/eeschema/schematic_settings.h b/eeschema/schematic_settings.h index 3403ff408f..bab0765021 100644 --- a/eeschema/schematic_settings.h +++ b/eeschema/schematic_settings.h @@ -62,6 +62,9 @@ public: int m_JunctionSizeChoice; // none = 0, smallest = 1, small = 2, etc. int m_JunctionSize; // a runtime cache of the calculated size + int m_HopOverSizeChoice; // none = 0, smallest = 1, etc. + double m_HopOverScale; // a runtime cache of the calculated lineWidth multiplier + int m_ConnectionGridSize; // usually 50mils (IU internally; mils in the JSON file) int m_AnnotateStartNum; // Starting value for annotation diff --git a/eeschema/schematic_undo_redo.cpp b/eeschema/schematic_undo_redo.cpp index edcf670ea8..776e2d0e7d 100644 --- a/eeschema/schematic_undo_redo.cpp +++ b/eeschema/schematic_undo_redo.cpp @@ -559,7 +559,7 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList ) SetSheetNumberAndCount(); // Restore hop over shapes of wires, if any - if( eeconfig()->m_Appearance.show_hop_over ) + if( m_schematic->Settings().m_HopOverScale > 0.0 ) { for( SCH_ITEM* item : GetScreen()->Items() ) { diff --git a/include/advanced_config.h b/include/advanced_config.h index 0fa6e8631e..e8aae7e75c 100644 --- a/include/advanced_config.h +++ b/include/advanced_config.h @@ -713,15 +713,6 @@ public: */ double m_MinimumMarkerSeparationDistance; - /** - * Default value for the Hop-Over Arc Radius, used to calculate the arc radius by multiplying - * the line width when drawing a hop-over in scenarios where a wire crosses another. - * - * Setting name: "HopOverArcRadius" - * Default value: 2.5 - */ - double m_hopOverArcRadius; - /** * When updating the net inspector, it either recalculates all nets or iterates through items * one-by-one. This value controls the threshold at which all nets are recalculated rather than