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
4cd4990b
Commit
4cd4990b
authored
Jun 20, 2014
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compil issue with KICAD_SCRIPTING_WXPYTHON option ON.
Minor enhancements.
parent
7c99a242
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
123 additions
and
32 deletions
+123
-32
draw_frame.cpp
common/draw_frame.cpp
+1
-1
draw_panel.cpp
common/draw_panel.cpp
+1
-1
dialog_pns_settings_base.cpp
pcbnew/dialogs/dialog_pns_settings_base.cpp
+16
-13
dialog_pns_settings_base.fbp
pcbnew/dialogs/dialog_pns_settings_base.fbp
+96
-13
dialog_pns_settings_base.h
pcbnew/dialogs/dialog_pns_settings_base.h
+8
-3
pcbframe.cpp
pcbnew/pcbframe.cpp
+1
-1
No files found.
common/draw_frame.cpp
View file @
4cd4990b
...
...
@@ -119,7 +119,7 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent,
m_GridColor
=
DARKGRAY
;
// Grid color
m_showPageLimits
=
false
;
m_drawBgColor
=
BLACK
;
// the background color of the draw canvas:
// BLACK for Pcbnew, BLACK or WHIT
eE
for eeschema
// BLACK for Pcbnew, BLACK or WHIT
E
for eeschema
m_snapToGrid
=
true
;
m_MsgFrameHeight
=
EDA_MSG_PANEL
::
GetRequiredHeight
();
m_movingCursorWithKeyboard
=
false
;
...
...
common/draw_panel.cpp
View file @
4cd4990b
...
...
@@ -114,7 +114,7 @@ EDA_DRAW_PANEL::EDA_DRAW_PANEL( EDA_DRAW_FRAME* parent, int id,
m_ClipBox
.
SetY
(
0
);
m_canStartBlock
=
-
1
;
// Command block can start if >= 0
m_abortRequest
=
false
;
m_enableMiddleButtonPan
=
fals
e
;
m_enableMiddleButtonPan
=
tru
e
;
m_enableZoomNoCenter
=
false
;
m_panScrollbarLimits
=
false
;
m_enableAutoPan
=
true
;
...
...
pcbnew/dialogs/dialog_pns_settings_base.cpp
View file @
4cd4990b
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 30
2013)
// C++ code generated with wxFormBuilder (version
Nov 6
2013)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -9,7 +9,7 @@
///////////////////////////////////////////////////////////////////////////
DIALOG_PNS_SETTINGS_BASE
::
DIALOG_PNS_SETTINGS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
DIALOG_PNS_SETTINGS_BASE
::
DIALOG_PNS_SETTINGS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
DIALOG_SHIM
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
...
...
@@ -19,29 +19,29 @@ DIALOG_PNS_SETTINGS_BASE::DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID
wxString
m_modeChoices
[]
=
{
_
(
"Highlight collisions"
),
_
(
"Shove"
),
_
(
"Walk around"
),
_
(
"Figure out what's best"
)
};
int
m_modeNChoices
=
sizeof
(
m_modeChoices
)
/
sizeof
(
wxString
);
m_mode
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"Mode"
),
wxDefaultPosition
,
wxDefaultSize
,
m_modeNChoices
,
m_modeChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_mode
->
SetSelection
(
1
);
bMainSizer
->
Add
(
m_mode
,
0
,
wxALL
,
5
);
m_mode
->
SetSelection
(
0
);
bMainSizer
->
Add
(
m_mode
,
0
,
wxALL
|
wxEXPAND
,
5
);
wxStaticBoxSizer
*
bOptions
;
bOptions
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Options"
)
),
wxVERTICAL
);
m_shoveVias
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Shove vias"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bOptions
->
Add
(
m_shoveVias
,
0
,
wx
ALL
,
5
);
bOptions
->
Add
(
m_shoveVias
,
0
,
wx
TOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_backPressure
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Jump over obstacles"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bOptions
->
Add
(
m_backPressure
,
0
,
wx
ALL
,
5
);
bOptions
->
Add
(
m_backPressure
,
0
,
wx
TOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_removeLoops
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Remove redundant tracks"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bOptions
->
Add
(
m_removeLoops
,
0
,
wx
ALL
,
5
);
bOptions
->
Add
(
m_removeLoops
,
0
,
wx
TOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_autoNeckdown
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Automatic neckdown"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bOptions
->
Add
(
m_autoNeckdown
,
0
,
wx
ALL
,
5
);
bOptions
->
Add
(
m_autoNeckdown
,
0
,
wx
TOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_smoothDragged
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Smooth dragged segments"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bOptions
->
Add
(
m_smoothDragged
,
0
,
wx
ALL
,
5
);
bOptions
->
Add
(
m_smoothDragged
,
0
,
wx
TOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_violateDrc
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Allow DRC violations"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bOptions
->
Add
(
m_violateDrc
,
0
,
wx
ALL
,
5
);
bOptions
->
Add
(
m_violateDrc
,
0
,
wx
TOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_suggestEnding
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"Suggest track finish"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_suggestEnding
->
Enable
(
false
);
...
...
@@ -89,7 +89,10 @@ DIALOG_PNS_SETTINGS_BASE::DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID
bEffort
->
Add
(
bSlider
,
1
,
wxEXPAND
,
5
);
bOptions
->
Add
(
bEffort
,
1
,
wxEXPAND
,
5
);
bOptions
->
Add
(
bEffort
,
0
,
wxEXPAND
,
5
);
m_staticline1
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
bOptions
->
Add
(
m_staticline1
,
0
,
wxEXPAND
|
wxALL
,
5
);
m_stdButtons
=
new
wxStdDialogButtonSizer
();
m_stdButtonsOK
=
new
wxButton
(
this
,
wxID_OK
);
...
...
@@ -98,10 +101,10 @@ DIALOG_PNS_SETTINGS_BASE::DIALOG_PNS_SETTINGS_BASE( wxWindow* parent, wxWindowID
m_stdButtons
->
AddButton
(
m_stdButtonsCancel
);
m_stdButtons
->
Realize
();
bOptions
->
Add
(
m_stdButtons
,
1
,
wxEXPAND
,
5
);
bOptions
->
Add
(
m_stdButtons
,
0
,
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bOptions
,
1
,
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bOptions
,
1
,
wxEXPAND
|
wxALL
,
5
);
this
->
SetSizer
(
bMainSizer
);
...
...
pcbnew/dialogs/dialog_pns_settings_base.fbp
View file @
4cd4990b
This diff is collapsed.
Click to expand it.
pcbnew/dialogs/dialog_pns_settings_base.h
View file @
4cd4990b
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Apr 30
2013)
// C++ code generated with wxFormBuilder (version
Nov 6
2013)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -11,6 +11,9 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
class
DIALOG_SHIM
;
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/radiobox.h>
#include <wx/gdicmn.h>
...
...
@@ -21,6 +24,7 @@
#include <wx/stattext.h>
#include <wx/slider.h>
#include <wx/sizer.h>
#include <wx/statline.h>
#include <wx/button.h>
#include <wx/statbox.h>
#include <wx/dialog.h>
...
...
@@ -31,7 +35,7 @@
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PNS_SETTINGS_BASE
///////////////////////////////////////////////////////////////////////////////
class
DIALOG_PNS_SETTINGS_BASE
:
public
wxDialog
class
DIALOG_PNS_SETTINGS_BASE
:
public
DIALOG_SHIM
{
private
:
...
...
@@ -48,6 +52,7 @@ class DIALOG_PNS_SETTINGS_BASE : public wxDialog
wxSlider
*
m_effort
;
wxStaticText
*
m_lowLabel
;
wxStaticText
*
m_highLabel
;
wxStaticLine
*
m_staticline1
;
wxStdDialogButtonSizer
*
m_stdButtons
;
wxButton
*
m_stdButtonsOK
;
wxButton
*
m_stdButtonsCancel
;
...
...
@@ -60,7 +65,7 @@ class DIALOG_PNS_SETTINGS_BASE : public wxDialog
public
:
DIALOG_PNS_SETTINGS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Interactive Router settings"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
313
,
528
),
long
style
=
wxDEFAULT_DIALOG_STYLE
);
DIALOG_PNS_SETTINGS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Interactive Router settings"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
277
,
404
),
long
style
=
wxDEFAULT_DIALOG_STYLE
);
~
DIALOG_PNS_SETTINGS_BASE
();
};
...
...
pcbnew/pcbframe.cpp
View file @
4cd4990b
...
...
@@ -1085,7 +1085,7 @@ void PCB_EDIT_FRAME::ScriptingConsoleEnableDisable( wxCommandEvent& aEvent )
{
// Add the scripting panel
EDA_PANEINFO
pythonAuiPane
;
pythonAuiPane
.
Scripting
Toolbar
Pane
();
pythonAuiPane
.
Scripting
Console
Pane
();
pythonAuiPane
.
Caption
(
wxT
(
"Python Scripting"
)
);
pythonAuiPane
.
MinSize
(
300
,
150
);
...
...
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