Skip to content

K
kicad-source-mirror
Commit 82735251 authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Layers manager: add in popup menu option to hide all coppers layers but active layer. 

Design rules: increase number of vias and tracks sizes
Pcbnew: netlist reader: change from my recent commits to keep netnames in pads for footprints not in netlist
(allow an user to place some footprints by hand, set pads netnames and do not lost these netnames when loading a netlsit)
Fix other very minor issues.
parent ba689c10
Show whitespace changes
Inline Side-by-side
Showing with 245 additions and 61 deletions
common/drawframe.cpp
View file @ 82735251
...@@ -823,6 +823,9 @@ void EDA_DRAW_FRAME::UpdateStatusBar() ...@@ -823,6 +823,9 @@ void EDA_DRAW_FRAME::UpdateStatusBar()
// We already decided the formatter above // We already decided the formatter above
Line.Printf( locformatter, dXpos, dYpos ); Line.Printf( locformatter, dXpos, dYpos );
SetStatusText( Line, 3 ); SetStatusText( Line, 3 );
// refresh units display
DisplayUnitsMsg();
} }
......
eeschema/viewlib_frame.cpp
View file @ 82735251
...@@ -129,11 +129,6 @@ LIB_VIEW_FRAME::LIB_VIEW_FRAME( wxWindow* father, CMP_LIBRARY* Library, wxSemaph ...@@ -129,11 +129,6 @@ LIB_VIEW_FRAME::LIB_VIEW_FRAME( wxWindow* father, CMP_LIBRARY* Library, wxSemaph
GetScreen()->m_Center = true; // Center coordinate origins on screen. GetScreen()->m_Center = true; // Center coordinate origins on screen.
LoadSettings(); LoadSettings();
// Initialize grid id to a default value if not found in config or bad:
if( ( m_LastGridSizeId <= 0 ) ||
( m_LastGridSizeId < ( ID_POPUP_GRID_USER - ID_POPUP_GRID_LEVEL_1000 ) ) )
m_LastGridSizeId = ID_POPUP_GRID_LEVEL_50 - ID_POPUP_GRID_LEVEL_1000;
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId ); GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId );
......
gerbview/class_gerbview_layer_widget.cpp
View file @ 82735251
...@@ -67,7 +67,7 @@ GERBER_LAYER_WIDGET::GERBER_LAYER_WIDGET( GERBVIEW_FRAME* aParent, wxWindow* aFo ...@@ -67,7 +67,7 @@ GERBER_LAYER_WIDGET::GERBER_LAYER_WIDGET( GERBVIEW_FRAME* aParent, wxWindow* aFo
// since Popupmenu() calls this->ProcessEvent() we must call this->Connect() // since Popupmenu() calls this->ProcessEvent() we must call this->Connect()
// and not m_LayerScrolledWindow->Connect() // and not m_LayerScrolledWindow->Connect()
Connect( ID_SHOW_ALL_COPPERS, ID_SHOW_NO_COPPERS, wxEVT_COMMAND_MENU_SELECTED, Connect( ID_SHOW_ALL_COPPERS, ID_SHOW_NO_COPPERS_BUT_ACTIVE, wxEVT_COMMAND_MENU_SELECTED,
wxCommandEventHandler( GERBER_LAYER_WIDGET::onPopupSelection ), NULL, this ); wxCommandEventHandler( GERBER_LAYER_WIDGET::onPopupSelection ), NULL, this );
// install the right click handler into each control at end of ReFill() // install the right click handler into each control at end of ReFill()
...@@ -145,6 +145,9 @@ void GERBER_LAYER_WIDGET::onRightDownLayers( wxMouseEvent& event ) ...@@ -145,6 +145,9 @@ void GERBER_LAYER_WIDGET::onRightDownLayers( wxMouseEvent& event )
menu.Append( new wxMenuItem( &menu, ID_SHOW_ALL_COPPERS, menu.Append( new wxMenuItem( &menu, ID_SHOW_ALL_COPPERS,
_("Show All Layers") ) ); _("Show All Layers") ) );
menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS_BUT_ACTIVE,
_( "Hide All Layers But Active" ) ) );
menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS, menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS,
_( "Hide All Layers" ) ) ); _( "Hide All Layers" ) ) );
...@@ -164,12 +167,18 @@ void GERBER_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event ) ...@@ -164,12 +167,18 @@ void GERBER_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
{ {
case ID_SHOW_ALL_COPPERS: case ID_SHOW_ALL_COPPERS:
case ID_SHOW_NO_COPPERS: case ID_SHOW_NO_COPPERS:
case ID_SHOW_NO_COPPERS_BUT_ACTIVE:
rowCount = GetLayerRowCount(); rowCount = GetLayerRowCount();
for( int row=0; row < rowCount; ++row ) for( int row=0; row < rowCount; ++row )
{ {
bool loc_visible = visible;
if( (menuId == ID_SHOW_NO_COPPERS_BUT_ACTIVE ) &&
(row == m_CurrentRow ) )
loc_visible = true;
wxCheckBox* cb = (wxCheckBox*) getLayerComp( row, 3 ); wxCheckBox* cb = (wxCheckBox*) getLayerComp( row, 3 );
cb->SetValue( visible ); cb->SetValue( loc_visible );
if( visible ) if( loc_visible )
visibleLayers |= (1 << row); visibleLayers |= (1 << row);
else else
visibleLayers &= ~(1 << row); visibleLayers &= ~(1 << row);
......
gerbview/class_gerbview_layer_widget.h
View file @ 82735251
...@@ -46,6 +46,7 @@ class GERBER_LAYER_WIDGET : public LAYER_WIDGET ...@@ -46,6 +46,7 @@ class GERBER_LAYER_WIDGET : public LAYER_WIDGET
// popup menu ids. // popup menu ids.
#define ID_SHOW_ALL_COPPERS wxID_HIGHEST #define ID_SHOW_ALL_COPPERS wxID_HIGHEST
#define ID_SHOW_NO_COPPERS (wxID_HIGHEST+1) #define ID_SHOW_NO_COPPERS (wxID_HIGHEST+1)
#define ID_SHOW_NO_COPPERS_BUT_ACTIVE (wxID_HIGHEST+2)
/** /**
* Function OnRightDownLayers * Function OnRightDownLayers
......
pcbnew/class_module.h
View file @ 82735251
...@@ -78,12 +78,6 @@ public: ...@@ -78,12 +78,6 @@ public:
wxString m_LibRef; /* Name of the module in library (and wxString m_LibRef; /* Name of the module in library (and
* the default value when loading a * the default value when loading a
* module from the library) */ * module from the library) */
wxString m_AlternateReference; /* Used when m_Reference cannot
* be used to identify the
* footprint ( after a full
* reannotation of the schematic */
int m_Attributs; ///< Flag bits ( see Mod_Attribut ) int m_Attributs; ///< Flag bits ( see Mod_Attribut )
int flag; /* Use to trace ratsnest and auto routing. */ int flag; /* Use to trace ratsnest and auto routing. */
...@@ -340,6 +334,14 @@ public: ...@@ -340,6 +334,14 @@ public:
return m_Reference->m_Text; return m_Reference->m_Text;
} }
/**
* Function SetReference
* @param const wxString& - the reference designator text.
*/
void SetReference( const wxString& aReference)
{
m_Reference->m_Text = aReference;
}
/** /**
* Function GetValue * Function GetValue
...@@ -350,6 +352,14 @@ public: ...@@ -350,6 +352,14 @@ public:
return m_Value->m_Text; return m_Value->m_Text;
} }
/**
* Function SetValue
* @param const wxString& - the value text.
*/
void SetValue( const wxString& aValue )
{
m_Value->m_Text = aValue;
}
/** /**
* Function FindPadByName * Function FindPadByName
......
pcbnew/class_pcb_layer_widget.cpp
View file @ 82735251
...@@ -90,7 +90,7 @@ PCB_LAYER_WIDGET::PCB_LAYER_WIDGET( PCB_EDIT_FRAME* aParent, wxWindow* aFocusOwn ...@@ -90,7 +90,7 @@ PCB_LAYER_WIDGET::PCB_LAYER_WIDGET( PCB_EDIT_FRAME* aParent, wxWindow* aFocusOwn
// since Popupmenu() calls this->ProcessEvent() we must call this->Connect() // since Popupmenu() calls this->ProcessEvent() we must call this->Connect()
// and not m_LayerScrolledWindow->Connect() // and not m_LayerScrolledWindow->Connect()
Connect( ID_SHOW_ALL_COPPERS, ID_SHOW_NO_COPPERS, wxEVT_COMMAND_MENU_SELECTED, Connect( ID_SHOW_ALL_COPPERS, ID_SHOW_NO_COPPERS_BUT_ACTIVE, wxEVT_COMMAND_MENU_SELECTED,
wxCommandEventHandler( PCB_LAYER_WIDGET::onPopupSelection ), NULL, this ); wxCommandEventHandler( PCB_LAYER_WIDGET::onPopupSelection ), NULL, this );
// install the right click handler into each control at end of ReFill() // install the right click handler into each control at end of ReFill()
...@@ -121,7 +121,7 @@ void PCB_LAYER_WIDGET::onRightDownLayers( wxMouseEvent& event ) ...@@ -121,7 +121,7 @@ void PCB_LAYER_WIDGET::onRightDownLayers( wxMouseEvent& event )
// menu text is capitalized: // menu text is capitalized:
// http://library.gnome.org/devel/hig-book/2.20/design-text-labels.html.en#layout-capitalization // http://library.gnome.org/devel/hig-book/2.20/design-text-labels.html.en#layout-capitalization
menu.Append( new wxMenuItem( &menu, ID_SHOW_ALL_COPPERS, _( "Show All Copper Layers" ) ) ); menu.Append( new wxMenuItem( &menu, ID_SHOW_ALL_COPPERS, _( "Show All Copper Layers" ) ) );
menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS_BUT_ACTIVE, _( "Hide All Copper Layers But Active" ) ) );
menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS, _( "Hide All Copper Layers" ) ) ); menu.Append( new wxMenuItem( &menu, ID_SHOW_NO_COPPERS, _( "Hide All Copper Layers" ) ) );
PopupMenu( &menu ); PopupMenu( &menu );
...@@ -142,6 +142,7 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event ) ...@@ -142,6 +142,7 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
visible = true; visible = true;
goto L_change_coppers; goto L_change_coppers;
case ID_SHOW_NO_COPPERS_BUT_ACTIVE:
case ID_SHOW_NO_COPPERS: case ID_SHOW_NO_COPPERS:
visible = false; visible = false;
L_change_coppers: L_change_coppers:
...@@ -165,11 +166,16 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event ) ...@@ -165,11 +166,16 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
if( IsValidCopperLayerIndex( layer ) ) if( IsValidCopperLayerIndex( layer ) )
{ {
cb->SetValue( visible ); bool loc_visible = visible;
if( (menuId == ID_SHOW_NO_COPPERS_BUT_ACTIVE ) &&
(layer == myframe->getActiveLayer() ) )
loc_visible = true;
cb->SetValue( loc_visible );
bool isLastCopperLayer = (row==lastCu); bool isLastCopperLayer = (row==lastCu);
OnLayerVisible( layer, visible, isLastCopperLayer ); OnLayerVisible( layer, loc_visible, isLastCopperLayer );
if( isLastCopperLayer ) if( isLastCopperLayer )
break; break;
......
pcbnew/class_pcb_layer_widget.h
View file @ 82735251
...@@ -91,6 +91,7 @@ protected: ...@@ -91,6 +91,7 @@ protected:
// popup menu ids. // popup menu ids.
#define ID_SHOW_ALL_COPPERS wxID_HIGHEST #define ID_SHOW_ALL_COPPERS wxID_HIGHEST
#define ID_SHOW_NO_COPPERS (wxID_HIGHEST+1) #define ID_SHOW_NO_COPPERS (wxID_HIGHEST+1)
#define ID_SHOW_NO_COPPERS_BUT_ACTIVE (wxID_HIGHEST+2)
/** /**
* Function OnRightDownLayers * Function OnRightDownLayers
......
pcbnew/dialogs/dialog_design_rules_base.cpp
View file @ 82735251
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 17 2010) // C++ code generated with wxFormBuilder (version Jun 30 2011)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -250,7 +250,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID ...@@ -250,7 +250,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
m_gridViaSizeList = new wxGrid( m_panelGolbalDesignRules, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_gridViaSizeList = new wxGrid( m_panelGolbalDesignRules, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
// Grid // Grid
m_gridViaSizeList->CreateGrid( 7, 2 ); m_gridViaSizeList->CreateGrid( 12, 2 );
m_gridViaSizeList->EnableEditing( true ); m_gridViaSizeList->EnableEditing( true );
m_gridViaSizeList->EnableGridLines( true ); m_gridViaSizeList->EnableGridLines( true );
m_gridViaSizeList->EnableDragGridSize( false ); m_gridViaSizeList->EnableDragGridSize( false );
...@@ -274,6 +274,11 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID ...@@ -274,6 +274,11 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
m_gridViaSizeList->SetRowLabelValue( 4, _("Via 5") ); m_gridViaSizeList->SetRowLabelValue( 4, _("Via 5") );
m_gridViaSizeList->SetRowLabelValue( 5, _("Via 6") ); m_gridViaSizeList->SetRowLabelValue( 5, _("Via 6") );
m_gridViaSizeList->SetRowLabelValue( 6, _("Via 7") ); m_gridViaSizeList->SetRowLabelValue( 6, _("Via 7") );
m_gridViaSizeList->SetRowLabelValue( 7, _("Via 8") );
m_gridViaSizeList->SetRowLabelValue( 8, _("Via 9") );
m_gridViaSizeList->SetRowLabelValue( 9, _("Via 10") );
m_gridViaSizeList->SetRowLabelValue( 10, _("Via 11") );
m_gridViaSizeList->SetRowLabelValue( 11, _("Via 12") );
m_gridViaSizeList->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_gridViaSizeList->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
// Label Appearance // Label Appearance
...@@ -294,7 +299,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID ...@@ -294,7 +299,7 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
m_gridTrackWidthList = new wxGrid( m_panelGolbalDesignRules, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_gridTrackWidthList = new wxGrid( m_panelGolbalDesignRules, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
// Grid // Grid
m_gridTrackWidthList->CreateGrid( 7, 1 ); m_gridTrackWidthList->CreateGrid( 12, 1 );
m_gridTrackWidthList->EnableEditing( true ); m_gridTrackWidthList->EnableEditing( true );
m_gridTrackWidthList->EnableGridLines( true ); m_gridTrackWidthList->EnableGridLines( true );
m_gridTrackWidthList->EnableDragGridSize( false ); m_gridTrackWidthList->EnableDragGridSize( false );
...@@ -308,6 +313,18 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID ...@@ -308,6 +313,18 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
m_gridTrackWidthList->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_gridTrackWidthList->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
// Rows // Rows
m_gridTrackWidthList->SetRowSize( 0, 17 );
m_gridTrackWidthList->SetRowSize( 1, 17 );
m_gridTrackWidthList->SetRowSize( 2, 17 );
m_gridTrackWidthList->SetRowSize( 3, 17 );
m_gridTrackWidthList->SetRowSize( 4, 17 );
m_gridTrackWidthList->SetRowSize( 5, 17 );
m_gridTrackWidthList->SetRowSize( 6, 17 );
m_gridTrackWidthList->SetRowSize( 7, 17 );
m_gridTrackWidthList->SetRowSize( 8, 17 );
m_gridTrackWidthList->SetRowSize( 9, 17 );
m_gridTrackWidthList->SetRowSize( 10, 17 );
m_gridTrackWidthList->SetRowSize( 11, 17 );
m_gridTrackWidthList->EnableDragRowSize( true ); m_gridTrackWidthList->EnableDragRowSize( true );
m_gridTrackWidthList->SetRowLabelSize( 80 ); m_gridTrackWidthList->SetRowLabelSize( 80 );
m_gridTrackWidthList->SetRowLabelValue( 0, _("Track 1") ); m_gridTrackWidthList->SetRowLabelValue( 0, _("Track 1") );
...@@ -317,6 +334,11 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID ...@@ -317,6 +334,11 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
m_gridTrackWidthList->SetRowLabelValue( 4, _("Track 5") ); m_gridTrackWidthList->SetRowLabelValue( 4, _("Track 5") );
m_gridTrackWidthList->SetRowLabelValue( 5, _("Track 6") ); m_gridTrackWidthList->SetRowLabelValue( 5, _("Track 6") );
m_gridTrackWidthList->SetRowLabelValue( 6, _("Track 7") ); m_gridTrackWidthList->SetRowLabelValue( 6, _("Track 7") );
m_gridTrackWidthList->SetRowLabelValue( 7, _("Track 8") );
m_gridTrackWidthList->SetRowLabelValue( 8, _("Track 9") );
m_gridTrackWidthList->SetRowLabelValue( 9, _("Track 10") );
m_gridTrackWidthList->SetRowLabelValue( 10, _("Track 11") );
m_gridTrackWidthList->SetRowLabelValue( 11, _("Track 12") );
m_gridTrackWidthList->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_gridTrackWidthList->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
// Label Appearance // Label Appearance
......
pcbnew/dialogs/dialog_design_rules_base.fbp
View file @ 82735251
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<property name="disconnect_events">1</property> <property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property> <property name="disconnect_mode">source_name</property>
<property name="disconnect_python_events">0</property> <property name="disconnect_python_events">0</property>
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">connect</property> <property name="event_generation">connect</property>
<property name="file">dialog_design_rules_base</property> <property name="file">dialog_design_rules_base</property>
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_managed">0</property> <property name="aui_managed">0</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -50,8 +52,10 @@ ...@@ -50,8 +52,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size">-1,-1</property> <property name="minimum_size">-1,-1</property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -65,7 +69,7 @@ ...@@ -65,7 +69,7 @@
<property name="resize">Resizable</property> <property name="resize">Resizable</property>
<property name="row"></property> <property name="row"></property>
<property name="show">1</property> <property name="show">1</property>
<property name="size">777,640</property> <property name="size">777,697</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="title">Design Rules Editor</property> <property name="title">Design Rules Editor</property>
...@@ -80,6 +84,12 @@ ...@@ -80,6 +84,12 @@
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnActivate"></event> <event name="OnActivate"></event>
<event name="OnActivateApp"></event> <event name="OnActivateApp"></event>
<event name="OnAuiFindManager"></event>
<event name="OnAuiPaneButton"></event>
<event name="OnAuiPaneClose"></event>
<event name="OnAuiPaneMaximize"></event>
<event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnClose"></event> <event name="OnClose"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
...@@ -123,6 +133,7 @@ ...@@ -123,6 +133,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmapsize"></property> <property name="bitmapsize"></property>
<property name="caption"></property> <property name="caption"></property>
...@@ -143,8 +154,10 @@ ...@@ -143,8 +154,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -206,6 +219,7 @@ ...@@ -206,6 +219,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -225,8 +239,10 @@ ...@@ -225,8 +239,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -304,6 +320,7 @@ ...@@ -304,6 +320,7 @@
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="autosize_cols">0</property> <property name="autosize_cols">0</property>
<property name="autosize_rows">1</property> <property name="autosize_rows">1</property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -346,8 +363,10 @@ ...@@ -346,8 +363,10 @@
<property name="layer"></property> <property name="layer"></property>
<property name="margin_height">0</property> <property name="margin_height">0</property>
<property name="margin_width">0</property> <property name="margin_width">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size">-1,-1</property> <property name="minimum_size">-1,-1</property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -455,6 +474,7 @@ ...@@ -455,6 +474,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -476,8 +496,10 @@ ...@@ -476,8 +496,10 @@
<property name="id">wxID_ADD_NETCLASS</property> <property name="id">wxID_ADD_NETCLASS</property>
<property name="label">Add</property> <property name="label">Add</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -540,6 +562,7 @@ ...@@ -540,6 +562,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -561,8 +584,10 @@ ...@@ -561,8 +584,10 @@
<property name="id">wxID_REMOVE_NETCLASS</property> <property name="id">wxID_REMOVE_NETCLASS</property>
<property name="label">Remove</property> <property name="label">Remove</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -625,6 +650,7 @@ ...@@ -625,6 +650,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -646,8 +672,10 @@ ...@@ -646,8 +672,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Move Up</property> <property name="label">Move Up</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -735,6 +763,7 @@ ...@@ -735,6 +763,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -755,8 +784,10 @@ ...@@ -755,8 +784,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -822,6 +853,7 @@ ...@@ -822,6 +853,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -841,8 +873,10 @@ ...@@ -841,8 +873,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size">220,200</property> <property name="minimum_size">220,200</property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -935,6 +969,7 @@ ...@@ -935,6 +969,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -956,8 +991,10 @@ ...@@ -956,8 +991,10 @@
<property name="id">ID_LEFT_TO_RIGHT_COPY</property> <property name="id">ID_LEFT_TO_RIGHT_COPY</property>
<property name="label">&lt;&lt;&lt;</property> <property name="label">&lt;&lt;&lt;</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1020,6 +1057,7 @@ ...@@ -1020,6 +1057,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1041,8 +1079,10 @@ ...@@ -1041,8 +1079,10 @@
<property name="id">ID_RIGHT_TO_LEFT_COPY</property> <property name="id">ID_RIGHT_TO_LEFT_COPY</property>
<property name="label">&gt;&gt;&gt;</property> <property name="label">&gt;&gt;&gt;</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1105,6 +1145,7 @@ ...@@ -1105,6 +1145,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1126,8 +1167,10 @@ ...@@ -1126,8 +1167,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">&lt;&lt; Select All</property> <property name="label">&lt;&lt; Select All</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1190,6 +1233,7 @@ ...@@ -1190,6 +1233,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1211,8 +1255,10 @@ ...@@ -1211,8 +1255,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Select All &gt;&gt;</property> <property name="label">Select All &gt;&gt;</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1286,6 +1332,7 @@ ...@@ -1286,6 +1332,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1306,8 +1353,10 @@ ...@@ -1306,8 +1353,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1373,6 +1422,7 @@ ...@@ -1373,6 +1422,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1392,8 +1442,10 @@ ...@@ -1392,8 +1442,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size">220,-1</property> <property name="minimum_size">220,-1</property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1482,6 +1534,7 @@ ...@@ -1482,6 +1534,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1501,8 +1554,10 @@ ...@@ -1501,8 +1554,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1587,6 +1642,7 @@ ...@@ -1587,6 +1642,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1609,8 +1665,10 @@ ...@@ -1609,8 +1665,10 @@
<property name="label">Default Via Type</property> <property name="label">Default Via Type</property>
<property name="layer"></property> <property name="layer"></property>
<property name="majorDimension">1</property> <property name="majorDimension">1</property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1674,6 +1732,7 @@ ...@@ -1674,6 +1732,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1696,8 +1755,10 @@ ...@@ -1696,8 +1755,10 @@
<property name="label">Micro Vias:</property> <property name="label">Micro Vias:</property>
<property name="layer"></property> <property name="layer"></property>
<property name="majorDimension">1</property> <property name="majorDimension">1</property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1791,6 +1852,7 @@ ...@@ -1791,6 +1852,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1811,8 +1873,10 @@ ...@@ -1811,8 +1873,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Min track width</property> <property name="label">Min track width</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1875,6 +1939,7 @@ ...@@ -1875,6 +1939,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1894,9 +1959,11 @@ ...@@ -1894,9 +1959,11 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="maxlength">0</property> <property name="maxlength">0</property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -1963,6 +2030,7 @@ ...@@ -1963,6 +2030,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -1983,8 +2051,10 @@ ...@@ -1983,8 +2051,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Min via diameter</property> <property name="label">Min via diameter</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2047,6 +2117,7 @@ ...@@ -2047,6 +2117,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2066,9 +2137,11 @@ ...@@ -2066,9 +2137,11 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="maxlength">0</property> <property name="maxlength">0</property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2135,6 +2208,7 @@ ...@@ -2135,6 +2208,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2155,8 +2229,10 @@ ...@@ -2155,8 +2229,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Min via drill dia</property> <property name="label">Min via drill dia</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2219,6 +2295,7 @@ ...@@ -2219,6 +2295,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2238,9 +2315,11 @@ ...@@ -2238,9 +2315,11 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="maxlength">0</property> <property name="maxlength">0</property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2307,6 +2386,7 @@ ...@@ -2307,6 +2386,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2327,8 +2407,10 @@ ...@@ -2327,8 +2407,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Min uvia diameter</property> <property name="label">Min uvia diameter</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2391,6 +2473,7 @@ ...@@ -2391,6 +2473,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2410,9 +2493,11 @@ ...@@ -2410,9 +2493,11 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="maxlength">6</property> <property name="maxlength">6</property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2479,6 +2564,7 @@ ...@@ -2479,6 +2564,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2499,8 +2585,10 @@ ...@@ -2499,8 +2585,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Min uvia drill dia</property> <property name="label">Min uvia drill dia</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2563,6 +2651,7 @@ ...@@ -2563,6 +2651,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2582,9 +2671,11 @@ ...@@ -2582,9 +2671,11 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="maxlength">6</property> <property name="maxlength">6</property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2657,6 +2748,7 @@ ...@@ -2657,6 +2748,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2676,8 +2768,10 @@ ...@@ -2676,8 +2768,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2739,6 +2833,7 @@ ...@@ -2739,6 +2833,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2759,8 +2854,10 @@ ...@@ -2759,8 +2854,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Specific via diameters and track widths, which &#x0A;can be used to replace default Netclass values &#x0A;on demand, for arbitrary via or track segments.</property> <property name="label">Specific via diameters and track widths, which &#x0A;can be used to replace default Netclass values &#x0A;on demand, for arbitrary via or track segments.</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2844,6 +2941,7 @@ ...@@ -2844,6 +2941,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2864,8 +2962,10 @@ ...@@ -2864,8 +2962,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Drill value: a blank or 0 =&gt; default Netclass value</property> <property name="label">Drill value: a blank or 0 =&gt; default Netclass value</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2930,6 +3030,7 @@ ...@@ -2930,6 +3030,7 @@
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="autosize_cols">0</property> <property name="autosize_cols">0</property>
<property name="autosize_rows">0</property> <property name="autosize_rows">0</property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -2972,8 +3073,10 @@ ...@@ -2972,8 +3073,10 @@
<property name="layer"></property> <property name="layer"></property>
<property name="margin_height">0</property> <property name="margin_height">0</property>
<property name="margin_width">0</property> <property name="margin_width">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -2989,10 +3092,10 @@ ...@@ -2989,10 +3092,10 @@
<property name="row"></property> <property name="row"></property>
<property name="row_label_horiz_alignment">wxALIGN_CENTRE</property> <property name="row_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="row_label_size">80</property> <property name="row_label_size">80</property>
<property name="row_label_values">&quot;Via 1&quot; &quot;Via 2&quot; &quot;Via 3&quot; &quot;Via 4&quot; &quot;Via 5&quot; &quot;Via 6&quot; &quot;Via 7&quot;</property> <property name="row_label_values">&quot;Via 1&quot; &quot;Via 2&quot; &quot;Via 3&quot; &quot;Via 4&quot; &quot;Via 5&quot; &quot;Via 6&quot; &quot;Via 7&quot; &quot;Via 8&quot; &quot;Via 9&quot; &quot;Via 10&quot; &quot;Via 11&quot; &quot;Via 12&quot;</property>
<property name="row_label_vert_alignment">wxALIGN_CENTRE</property> <property name="row_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="row_sizes"></property> <property name="row_sizes"></property>
<property name="rows">7</property> <property name="rows">12</property>
<property name="show">1</property> <property name="show">1</property>
<property name="size"></property> <property name="size"></property>
<property name="subclass"></property> <property name="subclass"></property>
...@@ -3086,6 +3189,7 @@ ...@@ -3086,6 +3189,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -3106,8 +3210,10 @@ ...@@ -3106,8 +3210,10 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label"></property> <property name="label"></property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -3172,6 +3278,7 @@ ...@@ -3172,6 +3278,7 @@
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="autosize_cols">0</property> <property name="autosize_cols">0</property>
<property name="autosize_rows">0</property> <property name="autosize_rows">0</property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -3214,8 +3321,10 @@ ...@@ -3214,8 +3321,10 @@
<property name="layer"></property> <property name="layer"></property>
<property name="margin_height">0</property> <property name="margin_height">0</property>
<property name="margin_width">0</property> <property name="margin_width">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -3231,10 +3340,10 @@ ...@@ -3231,10 +3340,10 @@
<property name="row"></property> <property name="row"></property>
<property name="row_label_horiz_alignment">wxALIGN_CENTRE</property> <property name="row_label_horiz_alignment">wxALIGN_CENTRE</property>
<property name="row_label_size">80</property> <property name="row_label_size">80</property>
<property name="row_label_values">&quot;Track 1&quot; &quot;Track 2&quot; &quot;Track 3&quot; &quot;Track 4&quot; &quot;Track 5&quot; &quot;Track 6&quot; &quot;Track 7&quot;</property> <property name="row_label_values">&quot;Track 1&quot; &quot;Track 2&quot; &quot;Track 3&quot; &quot;Track 4&quot; &quot;Track 5&quot; &quot;Track 6&quot; &quot;Track 7&quot; &quot;Track 8&quot; &quot;Track 9&quot; &quot;Track 10&quot; &quot;Track 11&quot; &quot;Track 12&quot;</property>
<property name="row_label_vert_alignment">wxALIGN_CENTRE</property> <property name="row_label_vert_alignment">wxALIGN_CENTRE</property>
<property name="row_sizes"></property> <property name="row_sizes">17,17,17,17,17,17,17,17,17,17,17,17</property>
<property name="rows">7</property> <property name="rows">12</property>
<property name="show">1</property> <property name="show">1</property>
<property name="size"></property> <property name="size"></property>
<property name="subclass"></property> <property name="subclass"></property>
...@@ -3335,6 +3444,7 @@ ...@@ -3335,6 +3444,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -3354,8 +3464,10 @@ ...@@ -3354,8 +3464,10 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size">-1,90</property> <property name="minimum_size">-1,90</property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -3429,6 +3541,7 @@ ...@@ -3429,6 +3541,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -3450,8 +3563,10 @@ ...@@ -3450,8 +3563,10 @@
<property name="id">wxID_OK</property> <property name="id">wxID_OK</property>
<property name="label">OK</property> <property name="label">OK</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
...@@ -3514,6 +3629,7 @@ ...@@ -3514,6 +3629,7 @@
<property name="RightDockable">1</property> <property name="RightDockable">1</property>
<property name="TopDockable">1</property> <property name="TopDockable">1</property>
<property name="aui_name"></property> <property name="aui_name"></property>
<property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
...@@ -3535,8 +3651,10 @@ ...@@ -3535,8 +3651,10 @@
<property name="id">wxID_CANCEL</property> <property name="id">wxID_CANCEL</property>
<property name="label">Cancel</property> <property name="label">Cancel</property>
<property name="layer"></property> <property name="layer"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
......
pcbnew/dialogs/dialog_design_rules_base.h
View file @ 82735251
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 17 2010) // C++ code generated with wxFormBuilder (version Jun 30 2011)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_design_rules_base__ #ifndef __DIALOG_DESIGN_RULES_BASE_H__
#define __dialog_design_rules_base__ #define __DIALOG_DESIGN_RULES_BASE_H__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
class NETS_LIST_CTRL; class NETS_LIST_CTRL;
#include <wx/colour.h> #include <wx/colour.h>
...@@ -108,9 +109,9 @@ class DIALOG_DESIGN_RULES_BASE : public wxDialog ...@@ -108,9 +109,9 @@ class DIALOG_DESIGN_RULES_BASE : public wxDialog
public: public:
DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Design Rules Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 777,640 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Design Rules Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 777,697 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_DESIGN_RULES_BASE(); ~DIALOG_DESIGN_RULES_BASE();
}; };
#endif //__dialog_design_rules_base__ #endif //__DIALOG_DESIGN_RULES_BASE_H__
pcbnew/modview_frame.cpp
View file @ 82735251
...@@ -139,11 +139,6 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( wxWindow* parent, wxSemaphore* s ...@@ -139,11 +139,6 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( wxWindow* parent, wxSemaphore* s
GetScreen()->m_Center = true; // Center coordinate origins on screen. GetScreen()->m_Center = true; // Center coordinate origins on screen.
LoadSettings(); LoadSettings();
// Initialize grid id to a default value if not found in config or bad:
if( ( m_LastGridSizeId <= 0 ) ||
( m_LastGridSizeId < ( ID_POPUP_GRID_USER - ID_POPUP_GRID_LEVEL_1000 ) ) )
m_LastGridSizeId = ID_POPUP_GRID_LEVEL_50 - ID_POPUP_GRID_LEVEL_1000;
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId ); GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId );
......
pcbnew/netlist.cpp
View file @ 82735251
...@@ -169,7 +169,7 @@ bool PCB_EDIT_FRAME::ReadPcbNetlist( const wxString& aNetlistFullFilename, ...@@ -169,7 +169,7 @@ bool PCB_EDIT_FRAME::ReadPcbNetlist( const wxString& aNetlistFullFilename,
netList_Reader.m_UseCmpFile = useCmpfile; netList_Reader.m_UseCmpFile = useCmpfile;
netList_Reader.SetFilesnames( aNetlistFullFilename, aCmpFullFileName ); netList_Reader.SetFilesnames( aNetlistFullFilename, aCmpFullFileName );
// True to read footprint filters section: true for CvPcb, false pro Pcbnew // True to read footprint filters section: true for CvPcb, false for Pcbnew
netList_Reader.ReadLibpartSectionSetOpt( false ); netList_Reader.ReadLibpartSectionSetOpt( false );
bool success = netList_Reader.ReadNetList( netfile ); bool success = netList_Reader.ReadNetList( netfile );
......
pcbnew/netlist_reader_common.cpp
View file @ 82735251
...@@ -166,8 +166,8 @@ bool NETLIST_READER::InitializeModules() ...@@ -166,8 +166,8 @@ bool NETLIST_READER::InitializeModules()
if( module ) if( module )
{ {
// Update current module ( reference, value and "Time Stamp") // Update current module ( reference, value and "Time Stamp")
module->m_Reference->m_Text = currcmp_info->m_Reference; module->SetReference( currcmp_info->m_Reference );
module->m_Value->m_Text = currcmp_info->m_Value; module->SetValue(currcmp_info->m_Value );
module->SetPath( currcmp_info->m_TimeStamp ); module->SetPath( currcmp_info->m_TimeStamp );
} }
else // not existing else // not existing
...@@ -176,11 +176,33 @@ bool NETLIST_READER::InitializeModules() ...@@ -176,11 +176,33 @@ bool NETLIST_READER::InitializeModules()
} }
// clear pads netnames // clear pads netnames
#if 1
// Clear only footprints found in netlist:
// This allow to have some footprints added by hand to the board
// left initialized
for( unsigned ii = 0; ii < m_componentsInNetlist.size(); ii++ )
{
COMPONENT_INFO* currcmp_info = m_componentsInNetlist[ii];
// We can used the reference to find the footprint, because
// it is now updated
wxString * idMod = &currcmp_info->m_Reference;
MODULE* module = FindModule( *idMod );
if( module )
{
for( D_PAD* pad = module->m_Pads; pad; pad = pad->Next() )
pad->SetNetname( wxEmptyString );
}
}
#else
// Clear all footprints
for( MODULE* module = m_pcbframe->GetBoard()->m_Modules; module; module = module->Next() ) for( MODULE* module = m_pcbframe->GetBoard()->m_Modules; module; module = module->Next() )
{ {
for( D_PAD* pad = module->m_Pads; pad; pad = pad->Next() ) for( D_PAD* pad = module->m_Pads; pad; pad = pad->Next() )
pad->SetNetname( wxEmptyString ); pad->SetNetname( wxEmptyString );
} }
#endif
return success; return success;
} }
...@@ -310,7 +332,7 @@ void NETLIST_READER::RemoveExtraFootprints() ...@@ -310,7 +332,7 @@ void NETLIST_READER::RemoveExtraFootprints()
for( ii = 0; ii < m_componentsInNetlist.size(); ii++ ) for( ii = 0; ii < m_componentsInNetlist.size(); ii++ )
{ {
COMPONENT_INFO* cmp_info = m_componentsInNetlist[ii]; COMPONENT_INFO* cmp_info = m_componentsInNetlist[ii];
if( module->m_Reference->m_Text.CmpNoCase( cmp_info->m_Reference ) == 0 ) if( module->GetReference().CmpNoCase( cmp_info->m_Reference ) == 0 )
break; // Module is found in net list. break; // Module is found in net list.
} }
...@@ -337,7 +359,7 @@ MODULE* NETLIST_READER::FindModule( const wxString& aId ) ...@@ -337,7 +359,7 @@ MODULE* NETLIST_READER::FindModule( const wxString& aId )
} }
else // identification by Reference else // identification by Reference
{ {
if( aId.CmpNoCase( module->m_Reference->m_Text ) == 0 ) if( aId.CmpNoCase( module->GetReference() ) == 0 )
return module; return module;
} }
} }
...@@ -483,7 +505,7 @@ bool NETLIST_READER::loadNewModules() ...@@ -483,7 +505,7 @@ bool NETLIST_READER::loadNewModules()
{ {
bool success = true; bool success = true;
#ifdef PCBNEW #ifdef PCBNEW
COMPONENT_INFO* ref, * cmp; COMPONENT_INFO* ref_info, * cmp_info;
MODULE* Module = NULL; MODULE* Module = NULL;
wxPoint ModuleBestPosition; wxPoint ModuleBestPosition;
BOARD* pcb = m_pcbframe->GetBoard(); BOARD* pcb = m_pcbframe->GetBoard();
...@@ -502,17 +524,18 @@ bool NETLIST_READER::loadNewModules() ...@@ -502,17 +524,18 @@ bool NETLIST_READER::loadNewModules()
ModuleBestPosition.y += 5000; ModuleBestPosition.y += 5000;
} }
ref = cmp = m_newModulesList[0]; ref_info = cmp_info = m_newModulesList[0];
for( unsigned ii = 0; ii < m_newModulesList.size(); ii++ ) for( unsigned ii = 0; ii < m_newModulesList.size(); ii++ )
{ {
cmp = m_newModulesList[ii]; cmp_info = m_newModulesList[ii];
if( (ii == 0) || ( ref->m_Footprint != cmp->m_Footprint) ) if( (ii == 0) || ( ref_info->m_Footprint != cmp_info->m_Footprint) )
{ {
// New footprint : must be loaded from a library // New footprint : must be loaded from a library
Module = m_pcbframe->GetModuleLibrary( wxEmptyString, cmp->m_Footprint, false ); Module = m_pcbframe->GetModuleLibrary( wxEmptyString,
ref = cmp; cmp_info->m_Footprint, false );
ref_info = cmp_info;
if( Module == NULL ) if( Module == NULL )
{ {
...@@ -521,8 +544,8 @@ bool NETLIST_READER::loadNewModules() ...@@ -521,8 +544,8 @@ bool NETLIST_READER::loadNewModules()
{ {
wxString msg; wxString msg;
msg.Printf( _( "Component [%s]: footprint <%s> not found" ), msg.Printf( _( "Component [%s]: footprint <%s> not found" ),
GetChars( cmp->m_Reference ), GetChars( cmp_info->m_Reference ),
GetChars( cmp->m_Footprint ) ); GetChars( cmp_info->m_Footprint ) );
msg += wxT("\n"); msg += wxT("\n");
m_messageWindow->AppendText( msg ); m_messageWindow->AppendText( msg );
...@@ -534,9 +557,9 @@ bool NETLIST_READER::loadNewModules() ...@@ -534,9 +557,9 @@ bool NETLIST_READER::loadNewModules()
/* Update schematic links : reference "Time Stamp" and schematic /* Update schematic links : reference "Time Stamp" and schematic
* hierarchical path */ * hierarchical path */
Module->m_Reference->m_Text = cmp->m_Reference; Module->SetReference( cmp_info->m_Reference );
Module->SetTimeStamp( GetNewTimeStamp() ); Module->SetTimeStamp( GetNewTimeStamp() );
Module->SetPath( cmp->m_TimeStamp ); Module->SetPath( cmp_info->m_TimeStamp );
} }
else else
{ {
...@@ -550,9 +573,9 @@ bool NETLIST_READER::loadNewModules() ...@@ -550,9 +573,9 @@ bool NETLIST_READER::loadNewModules()
pcb->Add( newmodule, ADD_APPEND ); pcb->Add( newmodule, ADD_APPEND );
Module = newmodule; Module = newmodule;
Module->m_Reference->m_Text = cmp->m_Reference; Module->SetReference( cmp_info->m_Reference );
Module->SetTimeStamp( GetNewTimeStamp() ); Module->SetTimeStamp( GetNewTimeStamp() );
Module->SetPath( cmp->m_TimeStamp ); Module->SetPath( cmp_info->m_TimeStamp );
} }
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment