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
a35a0836
Commit
a35a0836
authored
May 01, 2010
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert gendrill dialog from Dialogblocks to wxFormBuilder. Minor fixes.
parent
7e7f101a
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
148 additions
and
148 deletions
+148
-148
dialog_export_3Dfiles_base.cpp
pcbnew/dialog_export_3Dfiles_base.cpp
+2
-2
dialog_export_3Dfiles_base.fbp
pcbnew/dialog_export_3Dfiles_base.fbp
+2
-2
dialog_gendrill_base.cpp
pcbnew/dialog_gendrill_base.cpp
+14
-14
dialog_gendrill_base.fbp
pcbnew/dialog_gendrill_base.fbp
+123
-123
dialog_gendrill_base.h
pcbnew/dialog_gendrill_base.h
+1
-1
dialog_general_options.cpp
pcbnew/dialog_general_options.cpp
+2
-2
editrack.cpp
pcbnew/editrack.cpp
+1
-1
pcbnew.cpp
pcbnew/pcbnew.cpp
+2
-2
pcbnew.h
pcbnew/pcbnew.h
+1
-1
No files found.
pcbnew/dialog_export_3Dfiles_base.cpp
View file @
a35a0836
...
...
@@ -45,10 +45,10 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow
m_rbSelectUnits
->
SetSelection
(
0
);
bLowerSizer
->
Add
(
m_rbSelectUnits
,
1
,
wxALL
|
wxEXPAND
,
5
);
wxString
m_rb3DFilesOptionChoices
[]
=
{
_
(
"Copy 3D Shapes Files in Subdir"
),
_
(
"Use Absolute Path in
W
rml File "
)
};
wxString
m_rb3DFilesOptionChoices
[]
=
{
_
(
"Copy 3D Shapes Files in Subdir"
),
_
(
"Use Absolute Path in
V
rml File "
)
};
int
m_rb3DFilesOptionNChoices
=
sizeof
(
m_rb3DFilesOptionChoices
)
/
sizeof
(
wxString
);
m_rb3DFilesOption
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"3D Shapes Files Option:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_rb3DFilesOptionNChoices
,
m_rb3DFilesOptionChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_rb3DFilesOption
->
SetSelection
(
0
);
m_rb3DFilesOption
->
SetSelection
(
1
);
bLowerSizer
->
Add
(
m_rb3DFilesOption
,
1
,
wxALL
|
wxEXPAND
,
5
);
bSizer1
->
Add
(
bLowerSizer
,
1
,
wxEXPAND
,
5
);
...
...
pcbnew/dialog_export_3Dfiles_base.fbp
View file @
a35a0836
...
...
@@ -365,7 +365,7 @@
<property
name=
"proportion"
>
1
</property>
<object
class=
"wxRadioBox"
expanded=
"1"
>
<property
name=
"bg"
></property>
<property
name=
"choices"
>
"
Copy 3D Shapes Files in Subdir
"
"
Use Absolute Path in
W
rml File
"
</property>
<property
name=
"choices"
>
"
Copy 3D Shapes Files in Subdir
"
"
Use Absolute Path in
V
rml File
"
</property>
<property
name=
"context_help"
></property>
<property
name=
"enabled"
>
1
</property>
<property
name=
"fg"
></property>
...
...
@@ -379,7 +379,7 @@
<property
name=
"name"
>
m_rb3DFilesOption
</property>
<property
name=
"permission"
>
protected
</property>
<property
name=
"pos"
></property>
<property
name=
"selection"
>
0
</property>
<property
name=
"selection"
>
1
</property>
<property
name=
"size"
></property>
<property
name=
"style"
>
wxRA_SPECIFY_COLS
</property>
<property
name=
"subclass"
></property>
...
...
pcbnew/dialog_gendrill_base.cpp
View file @
a35a0836
...
...
@@ -25,7 +25,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con
m_Choice_Unit
->
SetSelection
(
1
);
m_LeftBoxSizer
->
Add
(
m_Choice_Unit
,
0
,
wxALL
|
wxEXPAND
,
5
);
wxString
m_Choice_Zeros_FormatChoices
[]
=
{
_
(
"
decimal format"
),
_
(
"suppress leading zeros"
),
_
(
"suppress trailing zeros"
),
_
(
"k
eep zeros"
)
};
wxString
m_Choice_Zeros_FormatChoices
[]
=
{
_
(
"
Decimal format"
),
_
(
"Suppress leading zeros"
),
_
(
"Suppress trailing zeros"
),
_
(
"K
eep zeros"
)
};
int
m_Choice_Zeros_FormatNChoices
=
sizeof
(
m_Choice_Zeros_FormatChoices
)
/
sizeof
(
wxString
);
m_Choice_Zeros_Format
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"Zeros Format"
),
wxDefaultPosition
,
wxDefaultSize
,
m_Choice_Zeros_FormatNChoices
,
m_Choice_Zeros_FormatChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_Choice_Zeros_Format
->
SetSelection
(
0
);
...
...
@@ -41,7 +41,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con
m_LeftBoxSizer
->
Add
(
m_Choice_Precision
,
0
,
wxALL
|
wxEXPAND
,
5
);
wxString
m_Choice_Drill_OffsetChoices
[]
=
{
_
(
"
absolute"
),
_
(
"a
uxiliary axis"
)
};
wxString
m_Choice_Drill_OffsetChoices
[]
=
{
_
(
"
Absolute"
),
_
(
"A
uxiliary axis"
)
};
int
m_Choice_Drill_OffsetNChoices
=
sizeof
(
m_Choice_Drill_OffsetChoices
)
/
sizeof
(
wxString
);
m_Choice_Drill_Offset
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"Drill Origin:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_Choice_Drill_OffsetNChoices
,
m_Choice_Drill_OffsetChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_Choice_Drill_Offset
->
SetSelection
(
0
);
...
...
@@ -54,7 +54,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con
wxBoxSizer
*
bMiddleBoxSizer
;
bMiddleBoxSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxString
m_Choice_Drill_MapChoices
[]
=
{
_
(
"None"
),
_
(
"
drill sheet (HPGL)"
),
_
(
"drill sheet (PostScript)"
),
_
(
"Drill sheet (Gerber)"
),
_
(
"Drill sheet
(DXF)"
)
};
wxString
m_Choice_Drill_MapChoices
[]
=
{
_
(
"None"
),
_
(
"
Drill map (HPGL)"
),
_
(
"Drill map (PostScript)"
),
_
(
"Drill map (Gerber)"
),
_
(
"Drill map
(DXF)"
)
};
int
m_Choice_Drill_MapNChoices
=
sizeof
(
m_Choice_Drill_MapChoices
)
/
sizeof
(
wxString
);
m_Choice_Drill_Map
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"Drill Sheet:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_Choice_Drill_MapNChoices
,
m_Choice_Drill_MapChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_Choice_Drill_Map
->
SetSelection
(
0
);
...
...
@@ -87,20 +87,20 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con
m_PenNum
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
sbHPGOptionsSizer
->
Add
(
m_PenNum
,
0
,
wxBOTTOM
|
wxRIGHT
|
wxLEFT
|
wxEXPAND
,
5
);
bMiddleBoxSizer
->
Add
(
sbHPGOptionsSizer
,
1
,
wxEXPAND
,
5
);
bMiddleBoxSizer
->
Add
(
sbHPGOptionsSizer
,
0
,
wxEXPAND
,
5
);
wxStaticBoxSizer
*
sbOptSizer
;
sbOptSizer
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Options:"
)
),
wxVERTICAL
);
m_Check_Mirror
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"
m
irror y axis"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_Check_Mirror
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"
M
irror y axis"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
sbOptSizer
->
Add
(
m_Check_Mirror
,
0
,
wxALL
,
5
);
m_Check_Minimal
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"
m
inimal header"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_Check_Minimal
=
new
wxCheckBox
(
this
,
wxID_ANY
,
_
(
"
M
inimal header"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
sbOptSizer
->
Add
(
m_Check_Minimal
,
0
,
wxALL
,
5
);
bMiddleBoxSizer
->
Add
(
sbOptSizer
,
1
,
wxEXPAND
,
5
);
bMiddleBoxSizer
->
Add
(
sbOptSizer
,
0
,
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bMiddleBoxSizer
,
1
,
wxEXPAND
,
5
);
...
...
@@ -145,19 +145,19 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con
m_BuriedViasInfoMsg
->
Wrap
(
-
1
);
sbSizerHoles
->
Add
(
m_BuriedViasInfoMsg
,
0
,
wxALL
,
5
);
sbSizerInfo
->
Add
(
sbSizerHoles
,
1
,
wxEXPAND
|
wxTOP
|
wxBOTTOM
,
5
);
bRightBoxSizer
->
Add
(
sbSizerInfo
,
0
,
wxEXPAND
|
wxTOP
,
5
);
sbSizerHoles
->
Add
(
10
,
10
,
1
,
wxEXPAND
,
5
);
bRightBoxSizer
->
Add
(
10
,
10
,
1
,
wxEXPAND
|
wxALIGN_CENTER_HORIZONTAL
,
5
);
m_OkButton
=
new
wxButton
(
this
,
wxID_OK
,
_
(
"OK"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_OkButton
->
SetDefault
();
sbSizerHoles
->
Add
(
m_OkButton
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
bRightBoxSizer
->
Add
(
m_OkButton
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
m_CancelButton
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Cancel"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
sbSizerHoles
->
Add
(
m_CancelButton
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
sbSizerInfo
->
Add
(
sbSizerHoles
,
1
,
wxEXPAND
|
wxTOP
|
wxBOTTOM
,
5
);
bRightBoxSizer
->
Add
(
sbSizerInfo
,
1
,
wxEXPAND
|
wxTOP
,
5
);
bRightBoxSizer
->
Add
(
m_CancelButton
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
|
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bRightBoxSizer
,
1
,
wxEXPAND
,
5
);
...
...
pcbnew/dialog_gendrill_base.fbp
View file @
a35a0836
This diff is collapsed.
Click to expand it.
pcbnew/dialog_gendrill_base.h
View file @
a35a0836
...
...
@@ -67,7 +67,7 @@ class DIALOG_GENDRILL_BASE : public wxDialog
public
:
DIALOG_GENDRILL_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Drill Files Generation"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
447
,
4
39
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
DIALOG_GENDRILL_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Drill Files Generation"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
447
,
4
12
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_GENDRILL_BASE
();
};
...
...
pcbnew/dialog_general_options.cpp
View file @
a35a0836
...
...
@@ -50,7 +50,7 @@ void Dialog_GeneralOptions::init()
m_ShowModuleRatsnest
->
SetValue
(
g_Show_Module_Ratsnest
);
m_ShowGlobalRatsnest
->
SetValue
(
m_Board
->
IsElementVisible
(
RATSNEST_VISIBLE
)
);
m_TrackAutodel
->
SetValue
(
g_AutoDeleteOldTrack
);
m_Track_45_Only_Ctrl
->
SetValue
(
Track_45_Only
);
m_Track_45_Only_Ctrl
->
SetValue
(
g_Track_45_Only_Allowed
);
m_Segments_45_Only_Ctrl
->
SetValue
(
Segments_45_Only
);
m_AutoPANOpt
->
SetValue
(
m_Parent
->
DrawPanel
->
m_AutoPAN_Enable
);
m_Segments_45_Only_Ctrl
->
SetValue
(
Segments_45_Only
);
...
...
@@ -92,7 +92,7 @@ void Dialog_GeneralOptions::OnOkClick( wxCommandEvent& event )
g_Show_Module_Ratsnest
=
m_ShowModuleRatsnest
->
GetValue
();
g_AutoDeleteOldTrack
=
m_TrackAutodel
->
GetValue
();
Segments_45_Only
=
m_Segments_45_Only_Ctrl
->
GetValue
();
Track_45_Only
=
m_Track_45_Only_Ctrl
->
GetValue
();
g_Track_45_Only_Allowed
=
m_Track_45_Only_Ctrl
->
GetValue
();
m_Parent
->
DrawPanel
->
m_AutoPAN_Enable
=
m_AutoPANOpt
->
GetValue
();
g_TwoSegmentTrackBuild
=
m_Track_DoubleSegm_Ctrl
->
GetValue
();
...
...
pcbnew/editrack.cpp
View file @
a35a0836
...
...
@@ -736,7 +736,7 @@ void ShowNewTrackWhenMovingCursor( WinEDA_DrawPanel* panel,
}
}
if
(
Track_45_Only
)
if
(
g_Track_45_Only_Allowed
)
{
if
(
g_TwoSegmentTrackBuild
)
{
...
...
pcbnew/pcbnew.cpp
View file @
a35a0836
...
...
@@ -43,8 +43,8 @@ bool g_Drag_Pistes_On;
bool
g_Show_Module_Ratsnest
;
bool
g_Show_Pads_Module_in_Move
=
true
;
bool
g_Raccord_45_Auto
=
true
;
bool
Track_45_Only
;
bool
Segments_45_Only
;
bool
g_Track_45_Only_Allowed
=
true
;
// True to allow horiz, vert. and 45deg only tracks
bool
Segments_45_Only
;
// True to allow horiz, vert. and 45deg only graphic segments
bool
g_TwoSegmentTrackBuild
=
true
;
bool
g_HighLight_Status
;
...
...
pcbnew/pcbnew.h
View file @
a35a0836
...
...
@@ -60,7 +60,7 @@ extern bool g_Raccord_45_Auto;
extern
const
wxString
g_FootprintLibFileWildcard
;
// Wildcard for footprint libraries filesnames
extern
bool
Track_45_Only
;
extern
bool
g_Track_45_Only_Allowed
;
extern
bool
Segments_45_Only
;
extern
wxString
g_Shapes3DExtBuffer
;
extern
wxString
g_DocModulesFileName
;
...
...
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