haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pcbnew: plot dialog: minor enhancement and minor issue fix (could be a wxFromBuilder issue)

This commit is contained in:
jean-pierre charras 2011-02-01 19:37:32 +01:00
parent 85ae0373e3
commit 7bd85a393d
5 changed files with 3235 additions and 4404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
demos/interf_u/interf_u.pro
View File

@ -1,15 +1,47 @@
update=22/01/2011 11:10:15 update=01/02/2011 18:49:08
version=1 version=1
last_client=pcbnew last_client=eeschema
[common] [common]
NetDir= NetDir=
[general] [general]
version=1 version=1
RootSch=interf_u.sch RootSch=interf_u.sch
BoardNm=interf_u.brd BoardNm=interf_u.brd
[cvpcb]
version=1
NetIExt=net
[cvpcb/libraries]
EquName1=devcms
[pcbnew]
version=1
PadDrlX=354
PadDimH=550
PadDimV=550
BoardThickness=630
SgPcb45=1
TxtPcbV=800
TxtPcbH=600
TxtModV=600
TxtModH=600
TxtModW=120
VEgarde=100
DrawLar=150
EdgeLar=50
TxtLar=170
MSegLar=400
LastNetListRead=interf_u.net
[pcbnew/libraries]
LibDir=F:\\kicad\\share\\modules\\packages3d
LibName1=connect
LibName2=discret
LibName3=dip_sockets
LibName4=pin_array
LibName5=divers
LibName6=libcms
LibName7=display
[eeschema] [eeschema]
version=1 version=1
LibDir=F:\\kicad\\share\\library LibDir=
NetFmt=1 NetFmt=1
HPGLSpd=20 HPGLSpd=20
HPGLDm=15 HPGLDm=15
@ -50,35 +82,3 @@ LibName8=adc-dac
LibName9=memory LibName9=memory
LibName10=xilinx LibName10=xilinx
LibName11=special LibName11=special
[cvpcb]
version=1
NetIExt=net
[cvpcb/libraries]
EquName1=devcms
[pcbnew]
version=1
PadDrlX=354
PadDimH=550
PadDimV=550
BoardThickness=630
SgPcb45=1
TxtPcbV=800
TxtPcbH=600
TxtModV=600
TxtModH=600
TxtModW=120
VEgarde=100
DrawLar=150
EdgeLar=50
TxtLar=170
MSegLar=400
LastNetListRead=interf_u.net
[pcbnew/libraries]
LibDir=F:\\kicad\\share\\modules\\packages3d
LibName1=connect
LibName2=discret
LibName3=dip_sockets
LibName4=pin_array
LibName5=divers
LibName6=libcms
LibName7=display

6
pcbnew/dialogs/dialog_plot_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 18 2010) // C++ code generated with wxFormBuilder (version Sep 8 2010)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -24,8 +24,8 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("Postscript A4"), _("DXF") }; wxString m_plotFormatOptChoices[] = { _("HPGL"), _("Gerber"), _("Postscript"), _("Postscript A4"), _("DXF") };
int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString ); int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, 0 ); m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Format"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, wxRA_SPECIFY_ROWS );
m_plotFormatOpt->SetSelection( 0 ); m_plotFormatOpt->SetSelection( 1 );
bSizer181->Add( m_plotFormatOpt, 1, wxEXPAND, 5 ); bSizer181->Add( m_plotFormatOpt, 1, wxEXPAND, 5 );
bSizer12->Add( bSizer181, 0, wxEXPAND, 5 ); bSizer12->Add( bSizer181, 0, wxEXPAND, 5 );

1181
pcbnew/dialogs/dialog_plot_base.fbp
View File

File diff suppressed because it is too large Load Diff

2
pcbnew/dialogs/dialog_plot_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 18 2010) // C++ code generated with wxFormBuilder (version Sep 8 2010)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!

12
pcbnew/pcbplot.cpp
View File

@ -280,8 +280,16 @@ void DIALOG_PLOT::OnSetScaleOpt( wxCommandEvent& event )
void DIALOG_PLOT::OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) void DIALOG_PLOT::OnOutputDirectoryBrowseClicked( wxCommandEvent& event )
{ {
wxDirDialog dirDialog( this, _( "Select Output Directory" ), // Build the absolute path of current output plot directory
m_outputDirectoryName->GetValue() ); // to preselect it when opening the Di Dialog.
wxFileName fn( m_outputDirectoryName->GetValue() );
wxString path;
if( fn.IsRelative() )
path = wxGetCwd() + fn.GetPathSeparator() + m_outputDirectoryName->GetValue();
else
path = m_outputDirectoryName->GetValue();
wxDirDialog dirDialog( this, _( "Select Output Directory" ), path );
if( dirDialog.ShowModal() == wxID_CANCEL ) if( dirDialog.ShowModal() == wxID_CANCEL )
return; return;