Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
498f0c91
Commit
498f0c91
authored
Oct 07, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor problems fixed
parent
bc62df64
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
22 deletions
+28
-22
dialog_design_rules_base.cpp
pcbnew/dialog_design_rules_base.cpp
+11
-11
dialog_design_rules_base.fbp
pcbnew/dialog_design_rules_base.fbp
+1
-1
dialog_design_rules_base.h
pcbnew/dialog_design_rules_base.h
+3
-3
edit_track_width.cpp
pcbnew/edit_track_width.cpp
+2
-1
initpcb.cpp
pcbnew/initpcb.cpp
+8
-5
ioascii.cpp
pcbnew/ioascii.cpp
+1
-0
pcbframe.cpp
pcbnew/pcbframe.cpp
+2
-1
No files found.
pcbnew/dialog_design_rules_base.cpp
View file @
498f0c91
...
@@ -145,13 +145,13 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
...
@@ -145,13 +145,13 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
bMainSizer
->
Add
(
sbSizer2
,
0
,
wxALL
|
wxEXPAND
,
5
);
bMainSizer
->
Add
(
sbSizer2
,
0
,
wxALL
|
wxEXPAND
,
5
);
m_sdb
Sizer1
=
new
wxStdDialogButtonSizer
();
m_sdb
ButtonsSizer
=
new
wxStdDialogButtonSizer
();
m_sdb
Sizer1
OK
=
new
wxButton
(
this
,
wxID_OK
);
m_sdb
ButtonsSizer
OK
=
new
wxButton
(
this
,
wxID_OK
);
m_sdb
Sizer1
->
AddButton
(
m_sdbSizer1
OK
);
m_sdb
ButtonsSizer
->
AddButton
(
m_sdbButtonsSizer
OK
);
m_sdb
Sizer1
Cancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdb
ButtonsSizer
Cancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdb
Sizer1
->
AddButton
(
m_sdbSizer1
Cancel
);
m_sdb
ButtonsSizer
->
AddButton
(
m_sdbButtonsSizer
Cancel
);
m_sdb
Sizer1
->
Realize
();
m_sdb
ButtonsSizer
->
Realize
();
bMainSizer
->
Add
(
m_sdb
Sizer1
,
0
,
wxALL
|
wxALIGN_RIGHT
,
5
);
bMainSizer
->
Add
(
m_sdb
ButtonsSizer
,
0
,
wxALL
|
wxALIGN_RIGHT
,
5
);
this
->
SetSizer
(
bMainSizer
);
this
->
SetSizer
(
bMainSizer
);
this
->
Layout
();
this
->
Layout
();
...
@@ -168,8 +168,8 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
...
@@ -168,8 +168,8 @@ DIALOG_DESIGN_RULES_BASE::DIALOG_DESIGN_RULES_BASE( wxWindow* parent, wxWindowID
m_buttonLeftSelAll
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnLeftSelectAllButton
),
NULL
,
this
);
m_buttonLeftSelAll
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnLeftSelectAllButton
),
NULL
,
this
);
m_buttonRightSelAll
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnRightSelectAllButton
),
NULL
,
this
);
m_buttonRightSelAll
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnRightSelectAllButton
),
NULL
,
this
);
m_rightClassChoice
->
Connect
(
wxEVT_COMMAND_CHOICE_SELECTED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnRightCBSelection
),
NULL
,
this
);
m_rightClassChoice
->
Connect
(
wxEVT_COMMAND_CHOICE_SELECTED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnRightCBSelection
),
NULL
,
this
);
m_sdb
Sizer1
Cancel
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnCancelButtonClick
),
NULL
,
this
);
m_sdb
ButtonsSizer
Cancel
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnCancelButtonClick
),
NULL
,
this
);
m_sdb
Sizer1
OK
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnOkButtonClick
),
NULL
,
this
);
m_sdb
ButtonsSizer
OK
->
Connect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnOkButtonClick
),
NULL
,
this
);
}
}
DIALOG_DESIGN_RULES_BASE
::~
DIALOG_DESIGN_RULES_BASE
()
DIALOG_DESIGN_RULES_BASE
::~
DIALOG_DESIGN_RULES_BASE
()
...
@@ -186,6 +186,6 @@ DIALOG_DESIGN_RULES_BASE::~DIALOG_DESIGN_RULES_BASE()
...
@@ -186,6 +186,6 @@ DIALOG_DESIGN_RULES_BASE::~DIALOG_DESIGN_RULES_BASE()
m_buttonLeftSelAll
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnLeftSelectAllButton
),
NULL
,
this
);
m_buttonLeftSelAll
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnLeftSelectAllButton
),
NULL
,
this
);
m_buttonRightSelAll
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnRightSelectAllButton
),
NULL
,
this
);
m_buttonRightSelAll
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnRightSelectAllButton
),
NULL
,
this
);
m_rightClassChoice
->
Disconnect
(
wxEVT_COMMAND_CHOICE_SELECTED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnRightCBSelection
),
NULL
,
this
);
m_rightClassChoice
->
Disconnect
(
wxEVT_COMMAND_CHOICE_SELECTED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnRightCBSelection
),
NULL
,
this
);
m_sdb
Sizer1
Cancel
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnCancelButtonClick
),
NULL
,
this
);
m_sdb
ButtonsSizer
Cancel
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnCancelButtonClick
),
NULL
,
this
);
m_sdb
Sizer1
OK
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnOkButtonClick
),
NULL
,
this
);
m_sdb
ButtonsSizer
OK
->
Disconnect
(
wxEVT_COMMAND_BUTTON_CLICKED
,
wxCommandEventHandler
(
DIALOG_DESIGN_RULES_BASE
::
OnOkButtonClick
),
NULL
,
this
);
}
}
pcbnew/dialog_design_rules_base.fbp
View file @
498f0c91
...
@@ -942,7 +942,7 @@
...
@@ -942,7 +942,7 @@
<property
name=
"Save"
>
0
</property>
<property
name=
"Save"
>
0
</property>
<property
name=
"Yes"
>
0
</property>
<property
name=
"Yes"
>
0
</property>
<property
name=
"minimum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
m_sdb
Sizer1
</property>
<property
name=
"name"
>
m_sdb
ButtonsSizer
</property>
<property
name=
"permission"
>
protected
</property>
<property
name=
"permission"
>
protected
</property>
<event
name=
"OnApplyButtonClick"
></event>
<event
name=
"OnApplyButtonClick"
></event>
<event
name=
"OnCancelButtonClick"
>
OnCancelButtonClick
</event>
<event
name=
"OnCancelButtonClick"
>
OnCancelButtonClick
</event>
...
...
pcbnew/dialog_design_rules_base.h
View file @
498f0c91
...
@@ -57,9 +57,9 @@ class DIALOG_DESIGN_RULES_BASE : public wxDialog
...
@@ -57,9 +57,9 @@ class DIALOG_DESIGN_RULES_BASE : public wxDialog
wxChoice
*
m_rightClassChoice
;
wxChoice
*
m_rightClassChoice
;
wxListCtrl
*
m_rightListCtrl
;
wxListCtrl
*
m_rightListCtrl
;
wxHtmlWindow
*
m_MessagesList
;
wxHtmlWindow
*
m_MessagesList
;
wxStdDialogButtonSizer
*
m_sdb
Sizer1
;
wxStdDialogButtonSizer
*
m_sdb
ButtonsSizer
;
wxButton
*
m_sdb
Sizer1
OK
;
wxButton
*
m_sdb
ButtonsSizer
OK
;
wxButton
*
m_sdb
Sizer1
Cancel
;
wxButton
*
m_sdb
ButtonsSizer
Cancel
;
// Virtual event handlers, overide them in your derived class
// Virtual event handlers, overide them in your derived class
virtual
void
OnNetClassesNameLeftClick
(
wxGridEvent
&
event
){
event
.
Skip
();
}
virtual
void
OnNetClassesNameLeftClick
(
wxGridEvent
&
event
){
event
.
Skip
();
}
...
...
pcbnew/edit_track_width.cpp
View file @
498f0c91
...
@@ -81,9 +81,10 @@ void WinEDA_PcbFrame::Edit_TrackSegm_Width( wxDC* DC, TRACK* aTrackItem )
...
@@ -81,9 +81,10 @@ void WinEDA_PcbFrame::Edit_TrackSegm_Width( wxDC* DC, TRACK* aTrackItem )
return
;
// No change
return
;
// No change
// The segment has changed: redraw it and save it in undo list
// The segment has changed: redraw it and save it in undo list
TRACK
*
oldsegm
=
(
TRACK
*
)
itemsListPicker
.
GetPickedItem
(
0
);
if
(
DC
)
if
(
DC
)
{
{
TRACK
*
oldsegm
=
(
TRACK
*
)
itemsListPicker
.
GetPickedItemLink
(
0
);
wxASSERT
(
oldsegm
);
DrawPanel
->
CursorOff
(
DC
);
// Erase cursor shape
DrawPanel
->
CursorOff
(
DC
);
// Erase cursor shape
oldsegm
->
Draw
(
DrawPanel
,
DC
,
GR_XOR
);
// Erase old track shape
oldsegm
->
Draw
(
DrawPanel
,
DC
,
GR_XOR
);
// Erase old track shape
aTrackItem
->
Draw
(
DrawPanel
,
DC
,
GR_OR
);
// Display new track shape
aTrackItem
->
Draw
(
DrawPanel
,
DC
,
GR_OR
);
// Display new track shape
...
...
pcbnew/initpcb.cpp
View file @
498f0c91
...
@@ -163,20 +163,23 @@ bool WinEDA_PcbFrame::Clear_Pcb( bool aQuery )
...
@@ -163,20 +163,23 @@ bool WinEDA_PcbFrame::Clear_Pcb( bool aQuery )
// delete the old BOARD and create a new BOARD so that the default
// delete the old BOARD and create a new BOARD so that the default
// layer names are put into the BOARD.
// layer names are put into the BOARD.
SetBoard
(
new
BOARD
(
NULL
,
this
)
);
SetBoard
(
new
BOARD
(
NULL
,
this
)
);
m_TrackAndViasSizesList_Changed
=
true
;
SetCurItem
(
NULL
);
/*
init pointeurs et variables
*/
/*
clear filename, to avoid overwriting an old file
*/
GetScreen
()
->
m_FileName
.
Empty
();
GetScreen
()
->
m_FileName
.
Empty
();
SetCurItem
(
NULL
);
/* Init new grid size */
/* Init parametres de gestion */
wxRealPoint
gridsize
=
GetScreen
()
->
GetGrid
();
wxRealPoint
gridsize
=
GetScreen
()
->
GetGrid
();
GetScreen
()
->
Init
();
GetScreen
()
->
Init
();
GetScreen
()
->
SetGrid
(
gridsize
);
GetScreen
()
->
SetGrid
(
gridsize
);
g_HightLigt_Status
=
0
;
g_HightLigt_Status
=
0
;
g_DesignSettings
.
m_CopperLayerCount
=
2
;
// Default copper layers count set to 2: double layer board
// Default copper layers count set to 2: double layer board
g_DesignSettings
.
m_CopperLayerCount
=
2
;
// Update display:
SetToolbars
();
Zoom_Automatique
(
true
);
Zoom_Automatique
(
true
);
return
true
;
return
true
;
...
...
pcbnew/ioascii.cpp
View file @
498f0c91
...
@@ -964,6 +964,7 @@ int WinEDA_PcbFrame::ReadPcbFile( FILE* File, bool Append )
...
@@ -964,6 +964,7 @@ int WinEDA_PcbFrame::ReadPcbFile( FILE* File, bool Append )
board
->
SynchronizeNetsAndNetClasses
(
);
board
->
SynchronizeNetsAndNetClasses
(
);
board
->
m_Status_Pcb
=
0
;
board
->
m_Status_Pcb
=
0
;
m_TrackAndViasSizesList_Changed
=
true
;
SetToolbars
();
SetToolbars
();
return
1
;
return
1
;
}
}
...
...
pcbnew/pcbframe.cpp
View file @
498f0c91
...
@@ -223,7 +223,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father,
...
@@ -223,7 +223,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father,
wxConfig
*
config
=
wxGetApp
().
m_EDA_Config
;
wxConfig
*
config
=
wxGetApp
().
m_EDA_Config
;
m_FrameName
=
wxT
(
"PcbFrame"
);
m_FrameName
=
wxT
(
"PcbFrame"
);
m_Draw_Sheet_Ref
=
true
;
// true
pour avoir le cartouche dessine
m_Draw_Sheet_Ref
=
true
;
// true
to display sheet references
m_Draw_Auxiliary_Axis
=
true
;
m_Draw_Auxiliary_Axis
=
true
;
m_SelTrackWidthBox
=
NULL
;
m_SelTrackWidthBox
=
NULL
;
m_SelViaSizeBox
=
NULL
;
m_SelViaSizeBox
=
NULL
;
...
@@ -231,6 +231,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father,
...
@@ -231,6 +231,7 @@ WinEDA_PcbFrame::WinEDA_PcbFrame( wxWindow* father,
m_TrackAndViasSizesList_Changed
=
false
;
m_TrackAndViasSizesList_Changed
=
false
;
SetBoard
(
new
BOARD
(
NULL
,
this
)
);
SetBoard
(
new
BOARD
(
NULL
,
this
)
);
m_TrackAndViasSizesList_Changed
=
true
;
m_drc
=
new
DRC
(
this
);
// these 2 objects point to each other
m_drc
=
new
DRC
(
this
);
// these 2 objects point to each other
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment