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
cfb354cb
Commit
cfb354cb
authored
Apr 26, 2011
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Plain Diff
Gerbview: export to pcbnew enhancements and fixes.
parents
e3505ff5
57604b0a
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
1579 additions
and
407 deletions
+1579
-407
build_version.cpp
common/build_version.cpp
+1
-1
CMakeLists.txt
gerbview/CMakeLists.txt
+1
-0
class_gerber_draw_item.cpp
gerbview/class_gerber_draw_item.cpp
+1
-1
dialog_layers_select_to_pcb_base.cpp
gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp
+111
-0
dialog_layers_select_to_pcb_base.fbp
gerbview/dialogs/dialog_layers_select_to_pcb_base.fbp
+821
-0
dialog_layers_select_to_pcb_base.h
gerbview/dialogs/dialog_layers_select_to_pcb_base.h
+87
-0
export_to_pcbnew.cpp
gerbview/export_to_pcbnew.cpp
+244
-137
gerbview_frame.h
gerbview/gerbview_frame.h
+0
-8
select_layers_to_pcb.cpp
gerbview/select_layers_to_pcb.cpp
+230
-229
select_layers_to_pcb.h
gerbview/select_layers_to_pcb.h
+57
-0
install.nsi
packaging/windows/nsis/install.nsi
+1
-1
sel_layer.cpp
pcbnew/sel_layer.cpp
+23
-28
version.txt
version.txt
+2
-2
No files found.
common/build_version.cpp
View file @
cfb354cb
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
#endif
#endif
#ifndef KICAD_BUILD_VERSION
#ifndef KICAD_BUILD_VERSION
#define KICAD_BUILD_VERSION "(2011-04-
17
)"
#define KICAD_BUILD_VERSION "(2011-04-
24
)"
#endif
#endif
...
...
gerbview/CMakeLists.txt
View file @
cfb354cb
...
@@ -17,6 +17,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
...
@@ -17,6 +17,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
set
(
DIALOGS_SRCS
set
(
DIALOGS_SRCS
dialogs/gerbview_dialog_display_options_frame_base.cpp
dialogs/gerbview_dialog_display_options_frame_base.cpp
dialogs/gerbview_dialog_display_options_frame.cpp
dialogs/gerbview_dialog_display_options_frame.cpp
dialogs/dialog_layers_select_to_pcb_base.cpp
dialogs/dialog_print_using_printer.cpp
dialogs/dialog_print_using_printer.cpp
dialogs/dialog_print_using_printer_base.cpp
dialogs/dialog_print_using_printer_base.cpp
)
)
...
...
gerbview/class_gerber_draw_item.cpp
View file @
cfb354cb
...
@@ -419,7 +419,7 @@ void GERBER_DRAW_ITEM::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, int aDrawMode,
...
@@ -419,7 +419,7 @@ void GERBER_DRAW_ITEM::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, int aDrawMode,
break
;
break
;
case
GBR_ARC
:
case
GBR_ARC
:
// Currently, arcs plotted witha rectangular aperture are not supported.
// Currently, arcs plotted with
a rectangular aperture are not supported.
// a round pen only is expected.
// a round pen only is expected.
#if 0 // for arc debug only
#if 0 // for arc debug only
GRLine( &aPanel->m_ClipBox, aDC, GetABPosition( m_Start ),
GRLine( &aPanel->m_ClipBox, aDC, GetABPosition( m_Start ),
...
...
gerbview/dialogs/dialog_layers_select_to_pcb_base.cpp
0 → 100644
View file @
cfb354cb
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 17 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "dialog_layers_select_to_pcb_base.h"
///////////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE
(
LAYERS_MAP_DIALOG_BASE
,
wxDialog
)
EVT_COMBOBOX
(
ID_M_COMBOCOPPERLAYERSCOUNT
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnBrdLayersCountSelection
)
EVT_BUTTON
(
ID_STORE_CHOICE
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnStoreSetup
)
EVT_BUTTON
(
ID_GET_PREVIOUS_CHOICE
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnGetSetup
)
EVT_BUTTON
(
ID_RESET_CHOICE
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnResetClick
)
EVT_BUTTON
(
wxID_CANCEL
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnCancelClick
)
EVT_BUTTON
(
wxID_OK
,
LAYERS_MAP_DIALOG_BASE
::
_wxFB_OnOkClick
)
END_EVENT_TABLE
()
LAYERS_MAP_DIALOG_BASE
::
LAYERS_MAP_DIALOG_BASE
(
wxWindow
*
parent
,
wxWindowID
id
,
const
wxString
&
title
,
const
wxPoint
&
pos
,
const
wxSize
&
size
,
long
style
)
:
wxDialog
(
parent
,
id
,
title
,
pos
,
size
,
style
)
{
this
->
SetSizeHints
(
wxDefaultSize
,
wxDefaultSize
);
wxBoxSizer
*
bSizerMain
;
bSizerMain
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
sbUpperSizer
;
sbUpperSizer
=
new
wxBoxSizer
(
wxHORIZONTAL
);
sbSizerLayersTable
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Layers selection:"
)
),
wxHORIZONTAL
);
m_flexLeftColumnBoxSizer
=
new
wxFlexGridSizer
(
16
,
4
,
0
,
0
);
m_flexLeftColumnBoxSizer
->
AddGrowableCol
(
0
);
m_flexLeftColumnBoxSizer
->
AddGrowableCol
(
1
);
m_flexLeftColumnBoxSizer
->
AddGrowableCol
(
2
);
m_flexLeftColumnBoxSizer
->
AddGrowableCol
(
3
);
m_flexLeftColumnBoxSizer
->
SetFlexibleDirection
(
wxBOTH
);
m_flexLeftColumnBoxSizer
->
SetNonFlexibleGrowMode
(
wxFLEX_GROWMODE_SPECIFIED
);
sbSizerLayersTable
->
Add
(
m_flexLeftColumnBoxSizer
,
1
,
wxEXPAND
,
5
);
m_staticlineSep
=
new
wxStaticLine
(
this
,
ID_M_STATICLINESEP
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_VERTICAL
);
sbSizerLayersTable
->
Add
(
m_staticlineSep
,
0
,
wxEXPAND
|
wxALL
,
5
);
sbUpperSizer
->
Add
(
sbSizerLayersTable
,
1
,
wxEXPAND
,
5
);
wxBoxSizer
*
bRightSizer
;
bRightSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxBoxSizer
*
bSizerLyrCnt
;
bSizerLyrCnt
=
new
wxBoxSizer
(
wxVERTICAL
);
m_staticTextCopperlayerCount
=
new
wxStaticText
(
this
,
ID_M_STATICTEXTCOPPERLAYERCOUNT
,
_
(
"Copper layers count:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_staticTextCopperlayerCount
->
Wrap
(
-
1
);
bSizerLyrCnt
->
Add
(
m_staticTextCopperlayerCount
,
0
,
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_comboCopperLayersCount
=
new
wxComboBox
(
this
,
ID_M_COMBOCOPPERLAYERSCOUNT
,
_
(
"2 Layers"
),
wxDefaultPosition
,
wxDefaultSize
,
0
,
NULL
,
0
);
m_comboCopperLayersCount
->
Append
(
_
(
"2 Layers"
)
);
m_comboCopperLayersCount
->
Append
(
_
(
"4 Layers"
)
);
m_comboCopperLayersCount
->
Append
(
_
(
"6 Layers"
)
);
m_comboCopperLayersCount
->
Append
(
_
(
"8 Layers"
)
);
m_comboCopperLayersCount
->
Append
(
_
(
"10 Layers"
)
);
m_comboCopperLayersCount
->
Append
(
_
(
"12 Layers"
)
);
m_comboCopperLayersCount
->
Append
(
_
(
"14 Layers"
)
);
m_comboCopperLayersCount
->
Append
(
_
(
"16 Layers"
)
);
bSizerLyrCnt
->
Add
(
m_comboCopperLayersCount
,
0
,
wxEXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
bRightSizer
->
Add
(
bSizerLyrCnt
,
0
,
wxEXPAND
,
5
);
bRightSizer
->
Add
(
5
,
15
,
1
,
wxEXPAND
,
5
);
wxBoxSizer
*
bSizerButtons
;
bSizerButtons
=
new
wxBoxSizer
(
wxVERTICAL
);
m_buttonStore
=
new
wxButton
(
this
,
ID_STORE_CHOICE
,
_
(
"Store Choice"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizerButtons
->
Add
(
m_buttonStore
,
0
,
wxALL
|
wxEXPAND
,
5
);
m_buttonRetrieve
=
new
wxButton
(
this
,
ID_GET_PREVIOUS_CHOICE
,
_
(
"Get Stored Choice"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizerButtons
->
Add
(
m_buttonRetrieve
,
0
,
wxALL
|
wxEXPAND
,
5
);
m_buttonReset
=
new
wxButton
(
this
,
ID_RESET_CHOICE
,
_
(
"Reset"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
bSizerButtons
->
Add
(
m_buttonReset
,
0
,
wxALL
|
wxEXPAND
,
5
);
bRightSizer
->
Add
(
bSizerButtons
,
0
,
wxEXPAND
,
5
);
sbUpperSizer
->
Add
(
bRightSizer
,
0
,
wxALIGN_CENTER_VERTICAL
,
5
);
bSizerMain
->
Add
(
sbUpperSizer
,
1
,
wxEXPAND
,
5
);
m_staticline1
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
bSizerMain
->
Add
(
m_staticline1
,
0
,
wxEXPAND
|
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_sdbSizerButtons
=
new
wxStdDialogButtonSizer
();
m_sdbSizerButtonsOK
=
new
wxButton
(
this
,
wxID_OK
);
m_sdbSizerButtons
->
AddButton
(
m_sdbSizerButtonsOK
);
m_sdbSizerButtonsCancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizerButtons
->
AddButton
(
m_sdbSizerButtonsCancel
);
m_sdbSizerButtons
->
Realize
();
bSizerMain
->
Add
(
m_sdbSizerButtons
,
0
,
wxALIGN_RIGHT
|
wxALL
,
5
);
this
->
SetSizer
(
bSizerMain
);
this
->
Layout
();
this
->
Centre
(
wxBOTH
);
}
LAYERS_MAP_DIALOG_BASE
::~
LAYERS_MAP_DIALOG_BASE
()
{
}
gerbview/dialogs/dialog_layers_select_to_pcb_base.fbp
0 → 100644
View file @
cfb354cb
This diff is collapsed.
Click to expand it.
gerbview/dialogs/dialog_layers_select_to_pcb_base.h
0 → 100644
View file @
cfb354cb
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 17 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_layers_select_to_pcb_base__
#define __dialog_layers_select_to_pcb_base__
#include <wx/intl.h>
#include <wx/sizer.h>
#include <wx/gdicmn.h>
#include <wx/statline.h>
#include <wx/string.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/statbox.h>
#include <wx/stattext.h>
#include <wx/combobox.h>
#include <wx/button.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class LAYERS_MAP_DIALOG_BASE
///////////////////////////////////////////////////////////////////////////////
class
LAYERS_MAP_DIALOG_BASE
:
public
wxDialog
{
DECLARE_EVENT_TABLE
()
private
:
// Private event handlers
void
_wxFB_OnBrdLayersCountSelection
(
wxCommandEvent
&
event
){
OnBrdLayersCountSelection
(
event
);
}
void
_wxFB_OnStoreSetup
(
wxCommandEvent
&
event
){
OnStoreSetup
(
event
);
}
void
_wxFB_OnGetSetup
(
wxCommandEvent
&
event
){
OnGetSetup
(
event
);
}
void
_wxFB_OnResetClick
(
wxCommandEvent
&
event
){
OnResetClick
(
event
);
}
void
_wxFB_OnCancelClick
(
wxCommandEvent
&
event
){
OnCancelClick
(
event
);
}
void
_wxFB_OnOkClick
(
wxCommandEvent
&
event
){
OnOkClick
(
event
);
}
protected
:
enum
{
ID_LAYERS_MAP_DIALOG_BASE
=
1000
,
ID_M_STATICLINESEP
,
ID_M_STATICTEXTCOPPERLAYERCOUNT
,
ID_M_COMBOCOPPERLAYERSCOUNT
,
ID_STORE_CHOICE
,
ID_GET_PREVIOUS_CHOICE
,
ID_RESET_CHOICE
,
};
wxStaticBoxSizer
*
sbSizerLayersTable
;
wxFlexGridSizer
*
m_flexLeftColumnBoxSizer
;
wxStaticLine
*
m_staticlineSep
;
wxStaticText
*
m_staticTextCopperlayerCount
;
wxComboBox
*
m_comboCopperLayersCount
;
wxButton
*
m_buttonStore
;
wxButton
*
m_buttonRetrieve
;
wxButton
*
m_buttonReset
;
wxStaticLine
*
m_staticline1
;
wxStdDialogButtonSizer
*
m_sdbSizerButtons
;
wxButton
*
m_sdbSizerButtonsOK
;
wxButton
*
m_sdbSizerButtonsCancel
;
// Virtual event handlers, overide them in your derived class
virtual
void
OnBrdLayersCountSelection
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnStoreSetup
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnGetSetup
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnResetClick
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnCancelClick
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
virtual
void
OnOkClick
(
wxCommandEvent
&
event
)
{
event
.
Skip
();
}
public
:
LAYERS_MAP_DIALOG_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
ID_LAYERS_MAP_DIALOG_BASE
,
const
wxString
&
title
=
_
(
"Layer selection:"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
400
,
286
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
LAYERS_MAP_DIALOG_BASE
();
};
#endif //__dialog_layers_select_to_pcb_base__
gerbview/export_to_pcbnew.cpp
View file @
cfb354cb
This diff is collapsed.
Click to expand it.
gerbview/gerbview_frame.h
View file @
cfb354cb
...
@@ -509,14 +509,6 @@ public: GERBVIEW_FRAME( wxWindow* father, const wxString& title,
...
@@ -509,14 +509,6 @@ public: GERBVIEW_FRAME( wxWindow* father, const wxString& title,
virtual
void
PrintPage
(
wxDC
*
aDC
,
int
aPrintMasklayer
,
bool
aPrintMirrorMode
,
virtual
void
PrintPage
(
wxDC
*
aDC
,
int
aPrintMasklayer
,
bool
aPrintMirrorMode
,
void
*
aData
=
NULL
);
void
*
aData
=
NULL
);
/**
* Function InstallDialogLayerPairChoice
* Install a dialog frame to choose the equivalence
* between gerber layers and pcbnew layers
* @return the "lookup table" if ok, or NULL
*/
int
*
InstallDialogLayerPairChoice
();
/**
/**
* Function DrawItemsDCodeID
* Function DrawItemsDCodeID
* Draw the DCode value (if exists) corresponding to gerber item
* Draw the DCode value (if exists) corresponding to gerber item
...
...
gerbview/select_layers_to_pcb.cpp
View file @
cfb354cb
This diff is collapsed.
Click to expand it.
gerbview/select_layers_to_pcb.h
0 → 100644
View file @
cfb354cb
/*******************************************************/
/* Dialog frame to choose gerber layers and pcb layers */
/*******************************************************/
/**
* @file select_layers_to_pcb.h
*/
#ifndef _SELECT_LAYERS_TO_PCB_H_
#define _SELECT_LAYERS_TO_PCB_H_
#include "wx/statline.h"
#include "dialogs/dialog_layers_select_to_pcb_base.h"
#define LAYER_UNSELECTED NB_LAYERS
/*
* This dialog shows the gerber files loaded, and allows user to choose:
* what gerber file and what board layer are used
* the number of copper layers
*/
class
LAYERS_MAP_DIALOG
:
public
LAYERS_MAP_DIALOG_BASE
{
private
:
GERBVIEW_FRAME
*
m_Parent
;
int
m_itemsCount
;
int
m_exportBoardCopperLayersCount
;
wxFlexGridSizer
*
m_flexRightColumnBoxSizer
;
// An extra wxFlexGridSizer used
// when we have more than 16 gerber files loaded
int
m_layersLookUpTable
[
32
+
1
];
// Indexes Gerber layers to PCB file layers
// the last value in table is the number of copper layers
int
m_buttonTable
[
32
];
// Indexes buttons to Gerber layers
wxStaticText
*
m_layersList
[
32
];
// Indexes text strings to buttons
public
:
LAYERS_MAP_DIALOG
(
GERBVIEW_FRAME
*
parent
);
~
LAYERS_MAP_DIALOG
()
{};
int
*
GetLayersLookUpTable
()
{
return
m_layersLookUpTable
;
}
int
GetCopperLayersCount
()
{
return
m_exportBoardCopperLayersCount
;
}
private
:
void
initDialog
();
void
normalizeBrdLayersCount
();
void
OnBrdLayersCountSelection
(
wxCommandEvent
&
event
);
void
OnSelectLayer
(
wxCommandEvent
&
event
);
void
OnOkClick
(
wxCommandEvent
&
event
);
void
OnCancelClick
(
wxCommandEvent
&
event
);
void
OnStoreSetup
(
wxCommandEvent
&
event
);
void
OnGetSetup
(
wxCommandEvent
&
event
);
void
OnResetClick
(
wxCommandEvent
&
event
);
DECLARE_EVENT_TABLE
()
};
#endif // _SELECT_LAYERS_TO_PCB_H_
packaging/windows/nsis/install.nsi
View file @
cfb354cb
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
; General Product Description Definitions
; General Product Description Definitions
!define PRODUCT_NAME "KiCad"
!define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2011.04.
17
"
!define PRODUCT_VERSION "2011.04.
24
"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME ""
!define COMPANY_NAME ""
...
...
pcbnew/sel_layer.cpp
View file @
cfb354cb
/* Set up the basic primitives for Layer control */
/* Set up the basic primitives for Layer control */
#include "fctsys.h"
#include "fctsys.h"
#include "gr_basic.h"
#include "common.h"
#include "common.h"
#include "class_drawpanel.h"
#include "class_drawpanel.h"
#include "confirm.h"
#include "confirm.h"
#include "pcbnew.h"
#include "pcbnew.h"
#include "class_board_design_settings.h"
#include "class_board_design_settings.h"
#include "protos.h"
enum
layer_sel_id
{
enum
layer_sel_id
{
...
@@ -18,7 +16,7 @@ enum layer_sel_id {
...
@@ -18,7 +16,7 @@ enum layer_sel_id {
};
};
class
WinEDA_SelLayerFrame
:
public
wxDialog
class
SELECT_LAYER_DIALOG
:
public
wxDialog
{
{
private
:
private
:
PCB_BASE_FRAME
*
m_Parent
;
PCB_BASE_FRAME
*
m_Parent
;
...
@@ -28,9 +26,9 @@ private:
...
@@ -28,9 +26,9 @@ private:
public
:
public
:
// Constructor and destructor
// Constructor and destructor
WinEDA_SelLayerFrame
(
PCB_BASE_FRAME
*
parent
,
int
default_layer
,
SELECT_LAYER_DIALOG
(
PCB_BASE_FRAME
*
parent
,
int
default_layer
,
int
min_layer
,
int
max_layer
,
bool
null_layer
);
int
min_layer
,
int
max_layer
,
bool
null_layer
);
~
WinEDA_SelLayerFrame
()
{
};
~
SELECT_LAYER_DIALOG
()
{
};
private
:
private
:
void
Sel_Layer
(
wxCommandEvent
&
event
);
void
Sel_Layer
(
wxCommandEvent
&
event
);
...
@@ -40,10 +38,10 @@ private:
...
@@ -40,10 +38,10 @@ private:
};
};
BEGIN_EVENT_TABLE
(
WinEDA_SelLayerFrame
,
wxDialog
)
BEGIN_EVENT_TABLE
(
SELECT_LAYER_DIALOG
,
wxDialog
)
EVT_BUTTON
(
wxID_OK
,
WinEDA_SelLayerFrame
::
Sel_Layer
)
EVT_BUTTON
(
wxID_OK
,
SELECT_LAYER_DIALOG
::
Sel_Layer
)
EVT_BUTTON
(
wxID_CANCEL
,
WinEDA_SelLayerFrame
::
OnCancelClick
)
EVT_BUTTON
(
wxID_CANCEL
,
SELECT_LAYER_DIALOG
::
OnCancelClick
)
EVT_RADIOBOX
(
ID_LAYER_SELECT
,
WinEDA_SelLayerFrame
::
Sel_Layer
)
EVT_RADIOBOX
(
ID_LAYER_SELECT
,
SELECT_LAYER_DIALOG
::
Sel_Layer
)
END_EVENT_TABLE
()
END_EVENT_TABLE
()
...
@@ -70,7 +68,7 @@ int PCB_BASE_FRAME::SelectLayer( int default_layer,
...
@@ -70,7 +68,7 @@ int PCB_BASE_FRAME::SelectLayer( int default_layer,
bool
null_layer
)
bool
null_layer
)
{
{
int
layer
;
int
layer
;
WinEDA_SelLayerFrame
*
frame
=
new
WinEDA_SelLayerFrame
(
this
,
SELECT_LAYER_DIALOG
*
frame
=
new
SELECT_LAYER_DIALOG
(
this
,
default_layer
,
default_layer
,
min_layer
,
min_layer
,
max_layer
,
max_layer
,
...
@@ -88,7 +86,7 @@ int PCB_BASE_FRAME::SelectLayer( int default_layer,
...
@@ -88,7 +86,7 @@ int PCB_BASE_FRAME::SelectLayer( int default_layer,
* radiobuttons, in which case they are positioned (in a vertical line)
* radiobuttons, in which case they are positioned (in a vertical line)
* to the right of that radiobox.
* to the right of that radiobox.
*/
*/
WinEDA_SelLayerFrame
::
WinEDA_SelLayerFrame
(
PCB_BASE_FRAME
*
parent
,
SELECT_LAYER_DIALOG
::
SELECT_LAYER_DIALOG
(
PCB_BASE_FRAME
*
parent
,
int
default_layer
,
int
min_layer
,
int
default_layer
,
int
min_layer
,
int
max_layer
,
bool
null_layer
)
:
int
max_layer
,
bool
null_layer
)
:
wxDialog
(
parent
,
-
1
,
_
(
"Select Layer:"
),
wxPoint
(
-
1
,
-
1
),
wxDialog
(
parent
,
-
1
,
_
(
"Select Layer:"
),
wxPoint
(
-
1
,
-
1
),
...
@@ -165,14 +163,11 @@ WinEDA_SelLayerFrame::WinEDA_SelLayerFrame( PCB_BASE_FRAME* parent,
...
@@ -165,14 +163,11 @@ WinEDA_SelLayerFrame::WinEDA_SelLayerFrame( PCB_BASE_FRAME* parent,
Button
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Cancel"
)
);
Button
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Cancel"
)
);
ButtonBoxSizer
->
Add
(
Button
,
0
,
wxGROW
|
wxALL
,
5
);
ButtonBoxSizer
->
Add
(
Button
,
0
,
wxGROW
|
wxALL
,
5
);
if
(
GetSizer
()
)
GetSizer
()
->
SetSizeHints
(
this
);
{
GetSizer
()
->
SetSizeHints
(
this
);
}
}
}
void
WinEDA_SelLayerFrame
::
Sel_Layer
(
wxCommandEvent
&
event
)
void
SELECT_LAYER_DIALOG
::
Sel_Layer
(
wxCommandEvent
&
event
)
{
{
int
ii
=
m_LayerId
[
m_LayerList
->
GetSelection
()];
int
ii
=
m_LayerId
[
m_LayerList
->
GetSelection
()];
...
@@ -180,7 +175,7 @@ void WinEDA_SelLayerFrame::Sel_Layer( wxCommandEvent& event )
...
@@ -180,7 +175,7 @@ void WinEDA_SelLayerFrame::Sel_Layer( wxCommandEvent& event )
}
}
void
WinEDA_SelLayerFrame
::
OnCancelClick
(
wxCommandEvent
&
event
)
void
SELECT_LAYER_DIALOG
::
OnCancelClick
(
wxCommandEvent
&
event
)
{
{
EndModal
(
-
1
);
EndModal
(
-
1
);
}
}
...
@@ -190,7 +185,7 @@ void WinEDA_SelLayerFrame::OnCancelClick( wxCommandEvent& event )
...
@@ -190,7 +185,7 @@ void WinEDA_SelLayerFrame::OnCancelClick( wxCommandEvent& event )
/* Dialog for the selecting pairs of layers. */
/* Dialog for the selecting pairs of layers. */
/*********************************************/
/*********************************************/
class
WinEDA_SelLayerPairFrame
:
public
wxDialog
class
SELECT_LAYERS_PAIR_DIALOG
:
public
wxDialog
{
{
private
:
private
:
PCB_BASE_FRAME
*
m_Parent
;
PCB_BASE_FRAME
*
m_Parent
;
...
@@ -198,8 +193,8 @@ private:
...
@@ -198,8 +193,8 @@ private:
wxRadioBox
*
m_LayerListBOTTOM
;
wxRadioBox
*
m_LayerListBOTTOM
;
int
m_LayerId
[
NB_COPPER_LAYERS
];
int
m_LayerId
[
NB_COPPER_LAYERS
];
public
:
WinEDA_SelLayerPairFrame
(
PCB_BASE_FRAME
*
parent
);
public
:
SELECT_LAYERS_PAIR_DIALOG
(
PCB_BASE_FRAME
*
parent
);
~
WinEDA_SelLayerPairFrame
()
{
};
~
SELECT_LAYERS_PAIR_DIALOG
()
{
};
private
:
private
:
void
OnOkClick
(
wxCommandEvent
&
event
);
void
OnOkClick
(
wxCommandEvent
&
event
);
...
@@ -209,9 +204,9 @@ private:
...
@@ -209,9 +204,9 @@ private:
};
};
BEGIN_EVENT_TABLE
(
WinEDA_SelLayerPairFrame
,
wxDialog
)
BEGIN_EVENT_TABLE
(
SELECT_LAYERS_PAIR_DIALOG
,
wxDialog
)
EVT_BUTTON
(
wxID_OK
,
WinEDA_SelLayerPairFrame
::
OnOkClick
)
EVT_BUTTON
(
wxID_OK
,
SELECT_LAYERS_PAIR_DIALOG
::
OnOkClick
)
EVT_BUTTON
(
wxID_CANCEL
,
WinEDA_SelLayerPairFrame
::
OnCancelClick
)
EVT_BUTTON
(
wxID_CANCEL
,
SELECT_LAYERS_PAIR_DIALOG
::
OnCancelClick
)
END_EVENT_TABLE
()
END_EVENT_TABLE
()
...
@@ -232,8 +227,8 @@ void PCB_BASE_FRAME::SelectLayerPair()
...
@@ -232,8 +227,8 @@ void PCB_BASE_FRAME::SelectLayerPair()
return
;
return
;
}
}
WinEDA_SelLayerPairFrame
*
frame
=
SELECT_LAYERS_PAIR_DIALOG
*
frame
=
new
WinEDA_SelLayerPairFrame
(
this
);
new
SELECT_LAYERS_PAIR_DIALOG
(
this
);
int
result
=
frame
->
ShowModal
();
int
result
=
frame
->
ShowModal
();
frame
->
Destroy
();
frame
->
Destroy
();
...
@@ -248,7 +243,7 @@ void PCB_BASE_FRAME::SelectLayerPair()
...
@@ -248,7 +243,7 @@ void PCB_BASE_FRAME::SelectLayerPair()
}
}
WinEDA_SelLayerPairFrame
::
WinEDA_SelLayerPairFrame
(
PCB_BASE_FRAME
*
parent
)
:
SELECT_LAYERS_PAIR_DIALOG
::
SELECT_LAYERS_PAIR_DIALOG
(
PCB_BASE_FRAME
*
parent
)
:
wxDialog
(
parent
,
-
1
,
_
(
"Select Layer Pair:"
),
wxPoint
(
-
1
,
-
1
),
wxDialog
(
parent
,
-
1
,
_
(
"Select Layer Pair:"
),
wxPoint
(
-
1
,
-
1
),
wxSize
(
470
,
250
),
DIALOG_STYLE
)
wxSize
(
470
,
250
),
DIALOG_STYLE
)
{
{
...
@@ -325,7 +320,7 @@ WinEDA_SelLayerPairFrame::WinEDA_SelLayerPairFrame( PCB_BASE_FRAME* parent ) :
...
@@ -325,7 +320,7 @@ WinEDA_SelLayerPairFrame::WinEDA_SelLayerPairFrame( PCB_BASE_FRAME* parent ) :
}
}
void
WinEDA_SelLayerPairFrame
::
OnOkClick
(
wxCommandEvent
&
event
)
void
SELECT_LAYERS_PAIR_DIALOG
::
OnOkClick
(
wxCommandEvent
&
event
)
{
{
// select the same layer for top and bottom is allowed (normal in some
// select the same layer for top and bottom is allowed (normal in some
// boards)
// boards)
...
@@ -343,7 +338,7 @@ void WinEDA_SelLayerPairFrame::OnOkClick( wxCommandEvent& event )
...
@@ -343,7 +338,7 @@ void WinEDA_SelLayerPairFrame::OnOkClick( wxCommandEvent& event )
}
}
void
WinEDA_SelLayerPairFrame
::
OnCancelClick
(
wxCommandEvent
&
event
)
void
SELECT_LAYERS_PAIR_DIALOG
::
OnCancelClick
(
wxCommandEvent
&
event
)
{
{
EndModal
(
-
1
);
EndModal
(
-
1
);
}
}
version.txt
View file @
cfb354cb
release version:
release version:
2011 apr
17
2011 apr
24
files (.zip,.tgz):
files (.zip,.tgz):
kicad-2011-04-
17
kicad-2011-04-
24
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