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
f9b3ecc4
Commit
f9b3ecc4
authored
Jul 30, 2010
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug 611580 (EESchema: Negative Repeat Insert Impossible)
parent
92676ee0
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2912 additions
and
3089 deletions
+2912
-3089
CHANGELOG.txt
CHANGELOG.txt
+1
-1
dialog_eeschema_options_base.cpp
eeschema/dialog_eeschema_options_base.cpp
+267
-262
dialog_eeschema_options_base.fbp
eeschema/dialog_eeschema_options_base.fbp
+2536
-2717
dialog_eeschema_options_base.h
eeschema/dialog_eeschema_options_base.h
+108
-109
No files found.
CHANGELOG.txt
View file @
f9b3ecc4
...
...
@@ -7,7 +7,7 @@ email address.
2010-jul-27, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================
++all:
Updated boost to version 1.
34
Updated boost to version 1.
43
Added boost::polygon (experimental)
++pcbnew:
Added experimental zone fill calculations with boost::polygon
...
...
eeschema/dialog_eeschema_options_base.cpp
View file @
f9b3ecc4
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Dec 21 2009)
// C++ code generated with wxFormBuilder (version
Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -20,8 +20,8 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
wxBoxSizer
*
mainSizer
;
mainSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
b
Sizer5
;
b
Sizer5
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
b
OptionsSizer
;
b
OptionsSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
m_notebook1
=
new
wxNotebook
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_panel1
=
new
wxPanel
(
m_notebook1
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxTAB_TRAVERSAL
);
...
...
@@ -90,7 +90,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
m_staticText9
->
Wrap
(
-
1
);
fgSizer1
->
Add
(
m_staticText9
,
1
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
3
);
m_spinRepeatHorizontal
=
new
wxSpinCtrl
(
m_panel1
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxSP_ARROW_KEYS
|
wxSP_WRAP
,
0
,
500
,
0
);
m_spinRepeatHorizontal
=
new
wxSpinCtrl
(
m_panel1
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxSP_ARROW_KEYS
|
wxSP_WRAP
,
-
500
,
500
,
0
);
fgSizer1
->
Add
(
m_spinRepeatHorizontal
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
|
wxEXPAND
,
3
);
m_staticRepeatXUnits
=
new
wxStaticText
(
m_panel1
,
wxID_ANY
,
_
(
"mils"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
...
...
@@ -101,7 +101,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
m_staticText12
->
Wrap
(
-
1
);
fgSizer1
->
Add
(
m_staticText12
,
1
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
3
);
m_spinRepeatVertical
=
new
wxSpinCtrl
(
m_panel1
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxSP_ARROW_KEYS
|
wxSP_WRAP
,
0
,
500
,
100
);
m_spinRepeatVertical
=
new
wxSpinCtrl
(
m_panel1
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
wxSP_ARROW_KEYS
|
wxSP_WRAP
,
-
500
,
500
,
100
);
fgSizer1
->
Add
(
m_spinRepeatVertical
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
|
wxEXPAND
,
3
);
m_staticRepeatYUnits
=
new
wxStaticText
(
m_panel1
,
wxID_ANY
,
_
(
"mils"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
...
...
@@ -124,18 +124,23 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
bSizer2
=
new
wxBoxSizer
(
wxVERTICAL
);
m_checkShowGrid
=
new
wxCheckBox
(
m_panel1
,
wxID_ANY
,
_
(
"Show g&rid"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizer2
->
Add
(
m_checkShowGrid
,
0
,
wxALL
|
wxEXPAND
,
3
);
m_checkShowHiddenPins
=
new
wxCheckBox
(
m_panel1
,
wxID_ANY
,
_
(
"Show hi&dden pins"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizer2
->
Add
(
m_checkShowHiddenPins
,
0
,
wxALL
|
wxEXPAND
,
3
);
m_checkAutoPan
=
new
wxCheckBox
(
m_panel1
,
wxID_ANY
,
_
(
"Enable automatic &panning"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizer2
->
Add
(
m_checkAutoPan
,
0
,
wxALL
|
wxEXPAND
,
3
);
m_checkHVOrientation
=
new
wxCheckBox
(
m_panel1
,
wxID_ANY
,
_
(
"Allow buses and wires to be placed in H or V &orientation only"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizer2
->
Add
(
m_checkHVOrientation
,
0
,
wxALL
|
wxEXPAND
,
3
);
m_checkPageLimits
=
new
wxCheckBox
(
m_panel1
,
wxID_ANY
,
_
(
"Show p&age limits"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizer2
->
Add
(
m_checkPageLimits
,
0
,
wxALL
|
wxEXPAND
,
3
);
bSizer3
->
Add
(
bSizer2
,
0
,
wxEXPAND
,
0
);
...
...
@@ -238,7 +243,7 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
bSizer6
->
Fit
(
m_panel2
);
m_notebook1
->
AddPage
(
m_panel2
,
_
(
"Template Field Names"
),
false
);
b
Sizer5
->
Add
(
m_notebook1
,
1
,
wxEXPAND
,
0
);
b
OptionsSizer
->
Add
(
m_notebook1
,
1
,
wxEXPAND
,
0
);
m_sdbSizer1
=
new
wxStdDialogButtonSizer
();
m_sdbSizer1OK
=
new
wxButton
(
this
,
wxID_OK
);
...
...
@@ -246,9 +251,9 @@ DIALOG_EESCHEMA_OPTIONS_BASE::DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wx
m_sdbSizer1Cancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizer1
->
AddButton
(
m_sdbSizer1Cancel
);
m_sdbSizer1
->
Realize
();
b
Sizer5
->
Add
(
m_sdbSizer1
,
0
,
wxALL
|
wxEXPAND
,
12
);
b
OptionsSizer
->
Add
(
m_sdbSizer1
,
0
,
wxALL
|
wxEXPAND
,
12
);
mainSizer
->
Add
(
b
Sizer5
,
1
,
0
,
12
);
mainSizer
->
Add
(
b
OptionsSizer
,
1
,
0
,
12
);
this
->
SetSizer
(
mainSizer
);
this
->
Layout
();
...
...
eeschema/dialog_eeschema_options_base.fbp
View file @
f9b3ecc4
This diff is collapsed.
Click to expand it.
eeschema/dialog_eeschema_options_base.h
View file @
f9b3ecc4
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Dec 21 2009)
// C++ code generated with wxFormBuilder (version
Apr 16 2008)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
@@ -96,11 +96,10 @@ class DIALOG_EESCHEMA_OPTIONS_BASE : public wxDialog
wxButton
*
m_sdbSizer1Cancel
;
// Virtual event handlers, overide them in your derived class
virtual
void
OnChooseUnits
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnChooseUnits
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
public
:
DIALOG_EESCHEMA_OPTIONS_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Schematic Editor Options"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxDefaultSize
,
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_EESCHEMA_OPTIONS_BASE
();
...
...
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