Skip to content

K
kicad-source-mirror
Commit 9ee8dac0 authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Pcbnew, python console: make it not dockable (workaround to avoid the fact... 

Pcbnew, python console: make it not dockable (workaround to avoid the fact accelerator keys which are used in the main menu are not sent to the console, in docked mode).
Minor cosmetic enhancement.
parents 2ff53e95 a2abb207
Show whitespace changes
Inline Side-by-side
Showing with 325 additions and 47 deletions
common/common_plotGERBER_functions.cpp
View file @ 9ee8dac0
...@@ -67,6 +67,12 @@ bool GERBER_PLOTTER::StartPlot() ...@@ -67,6 +67,12 @@ bool GERBER_PLOTTER::StartPlot()
if( outputFile == NULL ) if( outputFile == NULL )
return false; return false;
if( !attribFunction.IsEmpty() )
{
fputs( "%TF.GerberVersion,J1*%\n", outputFile );
fprintf( outputFile, "%%TF.FileFunction,%s*%%\n", TO_UTF8( attribFunction ) );
}
/* Set coordinate format to 3.4 absolute, leading zero omitted */ /* Set coordinate format to 3.4 absolute, leading zero omitted */
fputs( "%FSLAX34Y34*%\n", outputFile ); fputs( "%FSLAX34Y34*%\n", outputFile );
fputs( "G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*\n", outputFile ); fputs( "G04 Gerber Fmt 3.4, Leading zero omitted, Abs format*\n", outputFile );
......
common/pcb_plot_params.keywords
View file @ 9ee8dac0
...@@ -27,3 +27,4 @@ true ...@@ -27,3 +27,4 @@ true
useauxorigin useauxorigin
usegerberextensions usegerberextensions
viasonmask viasonmask
usegerberattributes
include/plot_common.h
View file @ 9ee8dac0
...@@ -285,6 +285,11 @@ public: ...@@ -285,6 +285,11 @@ public:
// NOP for most plotters // NOP for most plotters
} }
virtual void SetLayerAttribFunction( const wxString& function )
{
// NOP for most plotters
}
protected: protected:
// These are marker subcomponents // These are marker subcomponents
void markerCircle( const wxPoint& pos, int radius ); void markerCircle( const wxPoint& pos, int radius );
...@@ -769,6 +774,7 @@ public: ...@@ -769,6 +774,7 @@ public:
workFile = 0; workFile = 0;
finalFile = 0; finalFile = 0;
currentAperture = apertures.end(); currentAperture = apertures.end();
attribFunction = wxEmptyString;
} }
virtual PlotFormat GetPlotterType() const virtual PlotFormat GetPlotterType() const
...@@ -813,6 +819,11 @@ public: ...@@ -813,6 +819,11 @@ public:
virtual void SetLayerPolarity( bool aPositive ); virtual void SetLayerPolarity( bool aPositive );
virtual void SetLayerAttribFunction( const wxString& function )
{
attribFunction = function;
}
protected: protected:
void selectAperture( const wxSize& size, APERTURE::APERTURE_TYPE type ); void selectAperture( const wxSize& size, APERTURE::APERTURE_TYPE type );
void emitDcode( const DPOINT& pt, int dcode ); void emitDcode( const DPOINT& pt, int dcode );
...@@ -828,6 +839,8 @@ protected: ...@@ -828,6 +839,8 @@ protected:
std::vector<APERTURE> apertures; std::vector<APERTURE> apertures;
std::vector<APERTURE>::iterator currentAperture; std::vector<APERTURE>::iterator currentAperture;
wxString attribFunction; /* the layer "function", it is linked with the layer id */
}; };
......
include/wxPcbStruct.h
View file @ 9ee8dac0
...@@ -107,7 +107,7 @@ protected: ...@@ -107,7 +107,7 @@ protected:
#ifdef KICAD_SCRIPTING_WXPYTHON #ifdef KICAD_SCRIPTING_WXPYTHON
// Panel used to let user talk with internal scripting // Panel used to let user talk with internal scripting
wxWindow* m_pythonPanel; wxWindow* m_pythonPanel;
bool m_pythonPanelHidden; bool m_pythonPanelShow; ///< Visibility flag for Python Console
#endif #endif
PCB_LAYER_WIDGET* m_Layers; PCB_LAYER_WIDGET* m_Layers;
...@@ -1524,7 +1524,9 @@ public: ...@@ -1524,7 +1524,9 @@ public:
* Function ScriptingConsoleEnableDisable * Function ScriptingConsoleEnableDisable
* enables or disabled the scripting console * enables or disabled the scripting console
*/ */
void ScriptingConsoleEnableDisable( wxCommandEvent& event ); void ScriptingConsoleEnableDisable( wxCommandEvent& aEvent );
void OnUpdateScriptingConsoleState( wxUpdateUIEvent& aEvent );
void OnSelectAutoPlaceMode( wxCommandEvent& aEvent ); void OnSelectAutoPlaceMode( wxCommandEvent& aEvent );
......
pcbnew/dialogs/dialog_SVG_print.cpp
View file @ 9ee8dac0
...@@ -334,7 +334,9 @@ bool DIALOG_SVG_PRINT::CreateSVGFile( const wxString& aFullFileName ) ...@@ -334,7 +334,9 @@ bool DIALOG_SVG_PRINT::CreateSVGFile( const wxString& aFullFileName )
LOCALE_IO toggle; LOCALE_IO toggle;
SVG_PLOTTER* plotter = (SVG_PLOTTER*) StartPlotBoard( m_board, SVG_PLOTTER* plotter = (SVG_PLOTTER*) StartPlotBoard( m_board,
&m_plotOpts, aFullFileName, &m_plotOpts,
UNDEFINED_LAYER,
aFullFileName,
wxEmptyString ); wxEmptyString );
if( plotter ) if( plotter )
......
pcbnew/dialogs/dialog_plot.cpp
View file @ 9ee8dac0
...@@ -171,6 +171,9 @@ void DIALOG_PLOT::Init_Dialog() ...@@ -171,6 +171,9 @@ void DIALOG_PLOT::Init_Dialog()
// Option for using proper Gerber extensions // Option for using proper Gerber extensions
m_useGerberExtensions->SetValue( m_plotOpts.GetUseGerberExtensions() ); m_useGerberExtensions->SetValue( m_plotOpts.GetUseGerberExtensions() );
// Option for including Gerber attributes (from Gerber X2 format) in the output
m_useGerberAttributes->SetValue( m_plotOpts.GetUseGerberAttributes() );
// Option for excluding contents of "Edges Pcb" layer // Option for excluding contents of "Edges Pcb" layer
m_excludeEdgeLayerOpt->SetValue( m_plotOpts.GetExcludeEdgeLayer() ); m_excludeEdgeLayerOpt->SetValue( m_plotOpts.GetExcludeEdgeLayer() );
...@@ -379,6 +382,8 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event ) ...@@ -379,6 +382,8 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
m_subtractMaskFromSilk->SetValue( false ); m_subtractMaskFromSilk->SetValue( false );
m_useGerberExtensions->Enable( false ); m_useGerberExtensions->Enable( false );
m_useGerberExtensions->SetValue( false ); m_useGerberExtensions->SetValue( false );
m_useGerberAttributes->Enable( false );
m_useGerberAttributes->SetValue( false );
m_scaleOpt->Enable( false ); m_scaleOpt->Enable( false );
m_scaleOpt->SetSelection( 1 ); m_scaleOpt->SetSelection( 1 );
m_fineAdjustXscaleOpt->Enable( false ); m_fineAdjustXscaleOpt->Enable( false );
...@@ -407,6 +412,8 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event ) ...@@ -407,6 +412,8 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
m_subtractMaskFromSilk->SetValue( false ); m_subtractMaskFromSilk->SetValue( false );
m_useGerberExtensions->Enable( false ); m_useGerberExtensions->Enable( false );
m_useGerberExtensions->SetValue( false ); m_useGerberExtensions->SetValue( false );
m_useGerberAttributes->Enable( false );
m_useGerberAttributes->SetValue( false );
m_scaleOpt->Enable( true ); m_scaleOpt->Enable( true );
m_fineAdjustXscaleOpt->Enable( true ); m_fineAdjustXscaleOpt->Enable( true );
m_fineAdjustYscaleOpt->Enable( true ); m_fineAdjustYscaleOpt->Enable( true );
...@@ -433,6 +440,7 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event ) ...@@ -433,6 +440,7 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
m_excludeEdgeLayerOpt->Enable( true ); m_excludeEdgeLayerOpt->Enable( true );
m_subtractMaskFromSilk->Enable( true ); m_subtractMaskFromSilk->Enable( true );
m_useGerberExtensions->Enable( true ); m_useGerberExtensions->Enable( true );
m_useGerberAttributes->Enable( true );
m_scaleOpt->Enable( false ); m_scaleOpt->Enable( false );
m_scaleOpt->SetSelection( 1 ); m_scaleOpt->SetSelection( 1 );
m_fineAdjustXscaleOpt->Enable( false ); m_fineAdjustXscaleOpt->Enable( false );
...@@ -462,6 +470,8 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event ) ...@@ -462,6 +470,8 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
m_subtractMaskFromSilk->SetValue( false ); m_subtractMaskFromSilk->SetValue( false );
m_useGerberExtensions->Enable( false ); m_useGerberExtensions->Enable( false );
m_useGerberExtensions->SetValue( false ); m_useGerberExtensions->SetValue( false );
m_useGerberAttributes->Enable( false );
m_useGerberAttributes->SetValue( false );
m_scaleOpt->Enable( true ); m_scaleOpt->Enable( true );
m_fineAdjustXscaleOpt->Enable( false ); m_fineAdjustXscaleOpt->Enable( false );
m_fineAdjustYscaleOpt->Enable( false ); m_fineAdjustYscaleOpt->Enable( false );
...@@ -489,6 +499,8 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event ) ...@@ -489,6 +499,8 @@ void DIALOG_PLOT::SetPlotFormat( wxCommandEvent& event )
m_subtractMaskFromSilk->SetValue( false ); m_subtractMaskFromSilk->SetValue( false );
m_useGerberExtensions->Enable( false ); m_useGerberExtensions->Enable( false );
m_useGerberExtensions->SetValue( false ); m_useGerberExtensions->SetValue( false );
m_useGerberAttributes->Enable( false );
m_useGerberAttributes->SetValue( false );
m_scaleOpt->Enable( false ); m_scaleOpt->Enable( false );
m_scaleOpt->SetSelection( 1 ); m_scaleOpt->SetSelection( 1 );
m_fineAdjustXscaleOpt->Enable( false ); m_fineAdjustXscaleOpt->Enable( false );
...@@ -667,6 +679,8 @@ void DIALOG_PLOT::applyPlotSettings() ...@@ -667,6 +679,8 @@ void DIALOG_PLOT::applyPlotSettings()
tempOptions.SetUseGerberExtensions( m_useGerberExtensions->GetValue() ); tempOptions.SetUseGerberExtensions( m_useGerberExtensions->GetValue() );
tempOptions.SetUseGerberAttributes( m_useGerberAttributes->GetValue() );
tempOptions.SetFormat( GetPlotFormat() ); tempOptions.SetFormat( GetPlotFormat() );
long selectedLayers = 0; long selectedLayers = 0;
...@@ -794,7 +808,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event ) ...@@ -794,7 +808,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
LOCALE_IO toggle; LOCALE_IO toggle;
BOARD *board = m_parent->GetBoard(); BOARD *board = m_parent->GetBoard();
PLOTTER *plotter = StartPlotBoard( board, &m_plotOpts, PLOTTER *plotter = StartPlotBoard( board, &m_plotOpts,
fn.GetFullPath(), layer, fn.GetFullPath(),
wxEmptyString ); wxEmptyString );
// Print diags in messages box: // Print diags in messages box:
......
pcbnew/dialogs/dialog_plot_base.cpp
View file @ 9ee8dac0
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 6 2013) // C++ code generated with wxFormBuilder (version Feb 26 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -226,6 +226,11 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr ...@@ -226,6 +226,11 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
m_GerberOptionsSizer->Add( m_useGerberExtensions, 0, wxLEFT|wxRIGHT|wxTOP, 2 ); m_GerberOptionsSizer->Add( m_useGerberExtensions, 0, wxLEFT|wxRIGHT|wxTOP, 2 );
m_useGerberAttributes = new wxCheckBox( this, wxID_ANY, _("Include extended attributes"), wxDefaultPosition, wxDefaultSize, 0 );
m_useGerberAttributes->SetToolTip( _("Include extended attributes for non-image data in the Gerber file") );
m_GerberOptionsSizer->Add( m_useGerberAttributes, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
m_subtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 ); m_subtractMaskFromSilk = new wxCheckBox( this, wxID_ANY, _("Subtract soldermask from silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );
m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") ); m_subtractMaskFromSilk->SetToolTip( _("Remove silkscreen from areas without soldermask") );
......
pcbnew/dialogs/dialog_plot_base.fbp
View file @ 9ee8dac0
...@@ -2778,6 +2778,90 @@ ...@@ -2778,6 +2778,90 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1">
<property name="border">2</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Include extended attributes</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_useGerberAttributes</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Include extended attributes for non-image data in the Gerber file</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">2</property> <property name="border">2</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property> <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
......
pcbnew/dialogs/dialog_plot_base.h
View file @ 9ee8dac0
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 6 2013) // C++ code generated with wxFormBuilder (version Feb 26 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -89,6 +89,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM ...@@ -89,6 +89,7 @@ class DIALOG_PLOT_BASE : public DIALOG_SHIM
wxStaticText* m_SolderMaskMinWidthCurrValue; wxStaticText* m_SolderMaskMinWidthCurrValue;
wxStaticBoxSizer* m_GerberOptionsSizer; wxStaticBoxSizer* m_GerberOptionsSizer;
wxCheckBox* m_useGerberExtensions; wxCheckBox* m_useGerberExtensions;
wxCheckBox* m_useGerberAttributes;
wxCheckBox* m_subtractMaskFromSilk; wxCheckBox* m_subtractMaskFromSilk;
wxStaticBoxSizer* m_HPGLOptionsSizer; wxStaticBoxSizer* m_HPGLOptionsSizer;
wxStaticText* m_textPenSize; wxStaticText* m_textPenSize;
......
pcbnew/menubar_pcbframe.cpp
View file @ 9ee8dac0
...@@ -534,8 +534,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -534,8 +534,8 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
#if defined(KICAD_SCRIPTING_WXPYTHON) #if defined(KICAD_SCRIPTING_WXPYTHON)
AddMenuItem( toolsMenu, ID_TOOLBARH_PCB_SCRIPTING_CONSOLE, AddMenuItem( toolsMenu, ID_TOOLBARH_PCB_SCRIPTING_CONSOLE,
_( "&Scripting Console" ), _( "&Scripting Console" ),
_( "Show/Hide the Scripting console" ), _( "Show/Hide the Python Scripting console" ),
KiBitmap( book_xpm ) ); KiBitmap( py_script_xpm ) );
#endif #endif
wxMenu* designRulesMenu = new wxMenu; wxMenu* designRulesMenu = new wxMenu;
......
pcbnew/pcb_plot_params.cpp
View file @ 9ee8dac0
...@@ -79,6 +79,7 @@ PCB_PLOT_PARAMS::PCB_PLOT_PARAMS() ...@@ -79,6 +79,7 @@ PCB_PLOT_PARAMS::PCB_PLOT_PARAMS()
m_layerSelection = LAYER_BACK | LAYER_FRONT m_layerSelection = LAYER_BACK | LAYER_FRONT
| SILKSCREEN_LAYER_FRONT | SILKSCREEN_LAYER_BACK; | SILKSCREEN_LAYER_FRONT | SILKSCREEN_LAYER_BACK;
m_useGerberExtensions = true; m_useGerberExtensions = true;
m_useGerberAttributes = false;
m_excludeEdgeLayer = true; m_excludeEdgeLayer = true;
m_lineWidth = g_DrawDefaultLineThickness; m_lineWidth = g_DrawDefaultLineThickness;
m_plotFrameRef = false; m_plotFrameRef = false;
...@@ -129,6 +130,8 @@ void PCB_PLOT_PARAMS::Format( OUTPUTFORMATTER* aFormatter, ...@@ -129,6 +130,8 @@ void PCB_PLOT_PARAMS::Format( OUTPUTFORMATTER* aFormatter,
long(m_layerSelection) ); long(m_layerSelection) );
aFormatter->Print( aNestLevel+1, "(%s %s)\n", getTokenName( T_usegerberextensions ), aFormatter->Print( aNestLevel+1, "(%s %s)\n", getTokenName( T_usegerberextensions ),
m_useGerberExtensions ? trueStr : falseStr ); m_useGerberExtensions ? trueStr : falseStr );
aFormatter->Print( aNestLevel+1, "(%s %s)\n", getTokenName( T_usegerberattributes ),
m_useGerberAttributes ? trueStr : falseStr );
aFormatter->Print( aNestLevel+1, "(%s %s)\n", getTokenName( T_excludeedgelayer ), aFormatter->Print( aNestLevel+1, "(%s %s)\n", getTokenName( T_excludeedgelayer ),
m_excludeEdgeLayer ? trueStr : falseStr ); m_excludeEdgeLayer ? trueStr : falseStr );
aFormatter->Print( aNestLevel+1, "(%s %f)\n", getTokenName( T_linewidth ), aFormatter->Print( aNestLevel+1, "(%s %f)\n", getTokenName( T_linewidth ),
...@@ -194,6 +197,8 @@ bool PCB_PLOT_PARAMS::operator==( const PCB_PLOT_PARAMS &aPcbPlotParams ) const ...@@ -194,6 +197,8 @@ bool PCB_PLOT_PARAMS::operator==( const PCB_PLOT_PARAMS &aPcbPlotParams ) const
return false; return false;
if( m_useGerberExtensions != aPcbPlotParams.m_useGerberExtensions ) if( m_useGerberExtensions != aPcbPlotParams.m_useGerberExtensions )
return false; return false;
if( m_useGerberAttributes != aPcbPlotParams.m_useGerberAttributes )
return false;
if( m_excludeEdgeLayer != aPcbPlotParams.m_excludeEdgeLayer ) if( m_excludeEdgeLayer != aPcbPlotParams.m_excludeEdgeLayer )
return false; return false;
if( m_lineWidth != aPcbPlotParams.m_lineWidth ) if( m_lineWidth != aPcbPlotParams.m_lineWidth )
...@@ -329,6 +334,9 @@ void PCB_PLOT_PARAMS_PARSER::Parse( PCB_PLOT_PARAMS* aPcbPlotParams ) ...@@ -329,6 +334,9 @@ void PCB_PLOT_PARAMS_PARSER::Parse( PCB_PLOT_PARAMS* aPcbPlotParams )
case T_usegerberextensions: case T_usegerberextensions:
aPcbPlotParams->m_useGerberExtensions = parseBool(); aPcbPlotParams->m_useGerberExtensions = parseBool();
break; break;
case T_usegerberattributes:
aPcbPlotParams->m_useGerberAttributes = parseBool();
break;
case T_psa4output: case T_psa4output:
aPcbPlotParams->m_A4Output = parseBool(); aPcbPlotParams->m_A4Output = parseBool();
break; break;
......
pcbnew/pcb_plot_params.h
View file @ 9ee8dac0
...@@ -131,6 +131,9 @@ private: ...@@ -131,6 +131,9 @@ private:
* appending a suffix to the board name */ * appending a suffix to the board name */
bool m_useGerberExtensions; bool m_useGerberExtensions;
/// Include attributes from the Gerber X2 format (chapter 5 in revision J1)
bool m_useGerberAttributes;
/// Plot gerbers using auxiliary (drill) origin instead of page coordinates /// Plot gerbers using auxiliary (drill) origin instead of page coordinates
bool m_useAuxOrigin; bool m_useAuxOrigin;
...@@ -257,6 +260,9 @@ public: ...@@ -257,6 +260,9 @@ public:
void SetOutputDirectory( wxString aDir ) { m_outputDirectory = aDir; }; void SetOutputDirectory( wxString aDir ) { m_outputDirectory = aDir; };
wxString GetOutputDirectory() const { return m_outputDirectory; }; wxString GetOutputDirectory() const { return m_outputDirectory; };
void SetUseGerberAttributes( bool aUse ) { m_useGerberAttributes = aUse; };
bool GetUseGerberAttributes() const { return m_useGerberAttributes; };
void SetUseGerberExtensions( bool aUse ) { m_useGerberExtensions = aUse; }; void SetUseGerberExtensions( bool aUse ) { m_useGerberExtensions = aUse; };
bool GetUseGerberExtensions() const { return m_useGerberExtensions; }; bool GetUseGerberExtensions() const { return m_useGerberExtensions; };
......
pcbnew/pcbframe.cpp
View file @ 9ee8dac0
...@@ -72,6 +72,8 @@ ...@@ -72,6 +72,8 @@
#if defined(KICAD_SCRIPTING) || defined(KICAD_SCRIPTING_WXPYTHON) #if defined(KICAD_SCRIPTING) || defined(KICAD_SCRIPTING_WXPYTHON)
#include <python_scripting.h> #include <python_scripting.h>
// The name of the pane info handling the python console:
#define PYTHONCONSOLE_STRID wxT( "PythonPanel" )
#endif #endif
#include <class_draw_panel_gal.h> #include <class_draw_panel_gal.h>
...@@ -203,6 +205,8 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME ) ...@@ -203,6 +205,8 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
EVT_TOOL( ID_TOOLBARH_PCB_FREEROUTE_ACCESS, PCB_EDIT_FRAME::Access_to_External_Tool ) EVT_TOOL( ID_TOOLBARH_PCB_FREEROUTE_ACCESS, PCB_EDIT_FRAME::Access_to_External_Tool )
#ifdef KICAD_SCRIPTING_WXPYTHON #ifdef KICAD_SCRIPTING_WXPYTHON
EVT_TOOL( ID_TOOLBARH_PCB_SCRIPTING_CONSOLE, PCB_EDIT_FRAME::ScriptingConsoleEnableDisable ) EVT_TOOL( ID_TOOLBARH_PCB_SCRIPTING_CONSOLE, PCB_EDIT_FRAME::ScriptingConsoleEnableDisable )
EVT_UPDATE_UI( ID_TOOLBARH_PCB_SCRIPTING_CONSOLE,
PCB_EDIT_FRAME::OnUpdateScriptingConsoleState )
#endif #endif
// Option toolbar // Option toolbar
EVT_TOOL( ID_TB_OPTIONS_DRC_OFF, EVT_TOOL( ID_TB_OPTIONS_DRC_OFF,
...@@ -316,13 +320,13 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : ...@@ -316,13 +320,13 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_RecordingMacros = -1; m_RecordingMacros = -1;
m_microWaveToolBar = NULL; m_microWaveToolBar = NULL;
m_useCmpFileForFpNames = true; m_useCmpFileForFpNames = true;
#if defined(KICAD_SCRIPTING_WXPYTHON)
m_rotationAngle = 900;
#ifdef KICAD_SCRIPTING_WXPYTHON
m_pythonPanel = NULL; m_pythonPanel = NULL;
m_pythonPanelShow = false;
#endif #endif
m_rotationAngle = 900;
for ( int i = 0; i < 10; i++ ) for ( int i = 0; i < 10; i++ )
m_Macros[i].m_Record.clear(); m_Macros[i].m_Record.clear();
...@@ -415,7 +419,8 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : ...@@ -415,7 +419,8 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
if( m_microWaveToolBar ) // The auxiliary vertical right toolbar (currently microwave tools) if( m_microWaveToolBar ) // The auxiliary vertical right toolbar (currently microwave tools)
m_auimgr.AddPane( m_microWaveToolBar, m_auimgr.AddPane( m_microWaveToolBar,
wxAuiPaneInfo( vert ).Name( wxT( "m_microWaveToolBar" ) ).Right().Layer( 1 ).Position(1).Hide() ); wxAuiPaneInfo( vert ).Name( wxT( "m_microWaveToolBar" ) ).
Right().Layer( 1 ).Position(1).Hide() );
if( m_drawToolBar ) // The main right vertical toolbar if( m_drawToolBar ) // The main right vertical toolbar
m_auimgr.AddPane( m_drawToolBar, m_auimgr.AddPane( m_drawToolBar,
...@@ -445,23 +450,6 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : ...@@ -445,23 +450,6 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_auimgr.AddPane( m_messagePanel, m_auimgr.AddPane( m_messagePanel,
wxAuiPaneInfo( mesg ).Name( wxT( "MsgPanel" ) ).Bottom().Layer(10) ); wxAuiPaneInfo( mesg ).Name( wxT( "MsgPanel" ) ).Bottom().Layer(10) );
#if defined(KICAD_SCRIPTING_WXPYTHON)
// Add the scripting panel
EDA_PANEINFO pythonAuiInfo;
pythonAuiInfo.ScriptingToolbarPane();
pythonAuiInfo.Caption( wxT( "Python Scripting" ) );
pythonAuiInfo.MinSize( wxSize( 200, 100 ) );
pythonAuiInfo.BestSize( wxSize( GetClientSize().x/2, 200 ) );
pythonAuiInfo.Hide();
m_pythonPanel = CreatePythonShellWindow( this );
m_auimgr.AddPane( m_pythonPanel,
pythonAuiInfo.Name( wxT( "PythonPanel" ) ).Bottom().Layer(9) );
m_pythonPanelHidden = true;
#endif
ReFillLayerWidget(); // this is near end because contents establish size ReFillLayerWidget(); // this is near end because contents establish size
m_Layers->ReFillRender(); // Update colors in Render after the config is read m_Layers->ReFillRender(); // Update colors in Render after the config is read
...@@ -1093,19 +1081,39 @@ void PCB_EDIT_FRAME::UpdateTitle() ...@@ -1093,19 +1081,39 @@ void PCB_EDIT_FRAME::UpdateTitle()
#if defined(KICAD_SCRIPTING_WXPYTHON) #if defined(KICAD_SCRIPTING_WXPYTHON)
void PCB_EDIT_FRAME::ScriptingConsoleEnableDisable( wxCommandEvent& aEvent ) void PCB_EDIT_FRAME::ScriptingConsoleEnableDisable( wxCommandEvent& aEvent )
{ {
if ( m_pythonPanelHidden ) if( m_pythonPanel == NULL )
{
m_auimgr.GetPane( m_pythonPanel ).Show();
m_pythonPanelHidden = false;
}
else
{ {
m_auimgr.GetPane( m_pythonPanel ).Hide(); // Add the scripting panel
m_pythonPanelHidden = true; EDA_PANEINFO pythonAuiPane;
pythonAuiPane.ScriptingToolbarPane();
pythonAuiPane.Caption( wxT( "Python Scripting" ) );
pythonAuiPane.MinSize( 300, 150 );
#if 1 // Set to 0 to make the Python console dockable
// Currently the console is not dockable. Reasons:
// * When docked there is an issue with accelerator keys used in the main menu:
// these keys are not sent to the console, even if it has the focus
// * The console is more easy to move if it is not dockable
pythonAuiPane.Dockable( false ).Float();
// Gives a reasonnable position to the console
wxPoint pos = m_canvas->GetScreenPosition();
pythonAuiPane.FloatingPosition( pos.x + 10, pos.y + 10 );
pythonAuiPane.FloatingSize( 600, 200 );
#else
pythonAuiPane.BestSize( 600, 200 );
pythonAuiPane.LeftDockable( false ).RightDockable( false );
#endif
m_pythonPanel = CreatePythonShellWindow( this );
m_auimgr.AddPane( m_pythonPanel,
pythonAuiPane.Name( PYTHONCONSOLE_STRID ).Bottom().Layer(9) );
} }
m_auimgr.Update(); m_pythonPanelShow = ! m_pythonPanelShow;
m_auimgr.GetPane( PYTHONCONSOLE_STRID ).Show( m_pythonPanelShow );
m_auimgr.Update();
} }
#endif #endif
......
pcbnew/pcbplot.cpp
View file @ 9ee8dac0
...@@ -109,6 +109,112 @@ wxString GetGerberExtension( LAYER_NUM layer ) ...@@ -109,6 +109,112 @@ wxString GetGerberExtension( LAYER_NUM layer )
} }
wxString GetGerberFileFunction( const BOARD *aBoard, LAYER_NUM aLayer )
{
wxString attrib = wxEmptyString;
switch( aLayer )
{
case LAYER_N_BACK:
attrib = wxString::Format( wxT( "Copper,L%d" ), aBoard->GetCopperLayerCount() );
break;
case LAYER_N_2:
case LAYER_N_3:
case LAYER_N_4:
case LAYER_N_5:
case LAYER_N_6:
case LAYER_N_7:
case LAYER_N_8:
case LAYER_N_9:
case LAYER_N_10:
case LAYER_N_11:
case LAYER_N_12:
case LAYER_N_13:
case LAYER_N_14:
case LAYER_N_15:
// LAYER_N_2 is the first inner layer counting from the bottom; this
// must be converted to a 1-based number starting from the top
attrib = wxString::Format( wxT( "Copper,L%d" ),
aBoard->GetCopperLayerCount() - ( aLayer - LAYER_N_2 + 1 ) );
break;
case LAYER_N_FRONT:
attrib = wxString( wxT( "Copper,L1" ) );
break;
case ADHESIVE_N_FRONT:
attrib = wxString( wxT( "Glue,Top" ) );
break;
case ADHESIVE_N_BACK:
attrib = wxString( wxT( "Glue,Bot" ) );
break;
case SILKSCREEN_N_FRONT:
attrib = wxString( wxT( "Legend,Top" ) );
break;
case SILKSCREEN_N_BACK:
attrib = wxString( wxT( "Legend,Bot" ) );
break;
case SOLDERMASK_N_FRONT:
attrib = wxString( wxT( "Soldermask,Top" ) );
break;
case SOLDERMASK_N_BACK:
attrib = wxString( wxT( "Soldermask,Bot" ) );
break;
case SOLDERPASTE_N_FRONT:
attrib = wxString( wxT( "Paste,Top" ) );
break;
case SOLDERPASTE_N_BACK:
attrib = wxString( wxT( "Paste,Bot" ) );
break;
case EDGE_N:
attrib = wxString( wxT( "Profile" ) );
break;
case DRAW_N:
attrib = wxString( wxT( "Drawing" ) );
break;
case COMMENT_N:
attrib = wxString( wxT( "Other,Comment" ) );
break;
case ECO1_N:
case ECO2_N:
attrib = wxString::Format( wxT( "Other,ECO%d" ), aLayer - ECO1_N + 1 );
break;
}
// Add the signal type of the layer, if relevant
if( FIRST_COPPER_LAYER <= aLayer && aLayer <= LAST_COPPER_LAYER ) {
LAYER_T type = aBoard->GetLayerType( aLayer );
switch( type )
{
case LT_SIGNAL:
attrib += wxString( wxT( ",Signal" ) );
break;
case LT_POWER:
attrib += wxString( wxT( ",Plane" ) );
break;
case LT_MIXED:
attrib += wxString( wxT( ",Mixed" ) );
break;
default:
; // do nothing (but avoid a warning for unhandled LAYER_T values from GCC)
}
}
return attrib;
}
void BuildPlotFileName( wxFileName* aFilename, void BuildPlotFileName( wxFileName* aFilename,
const wxString& aOutputDir, const wxString& aOutputDir,
const wxString& aSuffix, const wxString& aSuffix,
...@@ -241,7 +347,7 @@ bool PLOT_CONTROLLER::OpenPlotfile( const wxString &aSuffix, ...@@ -241,7 +347,7 @@ bool PLOT_CONTROLLER::OpenPlotfile( const wxString &aSuffix,
wxFileName fn( boardFilename ); wxFileName fn( boardFilename );
BuildPlotFileName( &fn, outputDirName, aSuffix, GetDefaultPlotExtension( aFormat ) ); BuildPlotFileName( &fn, outputDirName, aSuffix, GetDefaultPlotExtension( aFormat ) );
m_plotter = StartPlotBoard( m_board, &m_plotOpts, fn.GetFullPath(), aSheetDesc ); m_plotter = StartPlotBoard( m_board, &m_plotOpts, UNDEFINED_LAYER, fn.GetFullPath(), aSheetDesc );
} }
return( m_plotter != NULL ); return( m_plotter != NULL );
......
pcbnew/pcbplot.h
View file @ 9ee8dac0
...@@ -164,6 +164,7 @@ private: ...@@ -164,6 +164,7 @@ private:
PLOTTER* StartPlotBoard( BOARD* aBoard, PLOTTER* StartPlotBoard( BOARD* aBoard,
PCB_PLOT_PARAMS* aPlotOpts, PCB_PLOT_PARAMS* aPlotOpts,
int aLayer,
const wxString& aFullFileName, const wxString& aFullFileName,
const wxString& aSheetDesc ); const wxString& aSheetDesc );
...@@ -265,6 +266,16 @@ void BuildPlotFileName( wxFileName* aFilename, ...@@ -265,6 +266,16 @@ void BuildPlotFileName( wxFileName* aFilename,
*/ */
extern wxString GetGerberExtension( LAYER_NUM aLayer ); extern wxString GetGerberExtension( LAYER_NUM aLayer );
/**
* Function GetGerberFileFunction
* Returns the "file function" attribute for \a aLayer, as defined in the
* Gerber file format specification J1 (chapter 5). The returned string excludes
* the "%TF.FileFunction" attribute prefix and the "*%" suffix.
* @param aBoard = the board, needed to get the total count of copper layers
* @param aLayer = the layer number to create the attribute for
* @return The attribute, as a text string
*/
extern wxString GetGerberFileFunction( const BOARD *aBoard, LAYER_NUM aLayer );
// PLOTGERB.CPP // PLOTGERB.CPP
void SelectD_CODE_For_LineDraw( PLOTTER* plotter, int aSize ); void SelectD_CODE_For_LineDraw( PLOTTER* plotter, int aSize );
......
pcbnew/plot_board_layers.cpp
View file @ 9ee8dac0
...@@ -877,6 +877,7 @@ static void ConfigureHPGLPenSizes( HPGL_PLOTTER *aPlotter, ...@@ -877,6 +877,7 @@ static void ConfigureHPGLPenSizes( HPGL_PLOTTER *aPlotter,
* (or has a problem) * (or has a problem)
*/ */
PLOTTER* StartPlotBoard( BOARD *aBoard, PCB_PLOT_PARAMS *aPlotOpts, PLOTTER* StartPlotBoard( BOARD *aBoard, PCB_PLOT_PARAMS *aPlotOpts,
int aLayer,
const wxString& aFullFileName, const wxString& aFullFileName,
const wxString& aSheetDesc ) const wxString& aSheetDesc )
{ {
...@@ -938,6 +939,10 @@ PLOTTER* StartPlotBoard( BOARD *aBoard, PCB_PLOT_PARAMS *aPlotOpts, ...@@ -938,6 +939,10 @@ PLOTTER* StartPlotBoard( BOARD *aBoard, PCB_PLOT_PARAMS *aPlotOpts,
if( plotter->OpenFile( aFullFileName ) ) if( plotter->OpenFile( aFullFileName ) )
{ {
// For the Gerber "file function" attribute, set the layer number
if( plotter->GetPlotterType() == PLOT_FORMAT_GERBER && plotOpts.GetUseGerberAttributes() )
plotter->SetLayerAttribFunction( GetGerberFileFunction( aBoard, aLayer ) );
plotter->StartPlot(); plotter->StartPlot();
// Plot the frame reference if requested // Plot the frame reference if requested
......
pcbnew/tool_pcb.cpp
View file @ 9ee8dac0
...@@ -307,16 +307,16 @@ void PCB_EDIT_FRAME::ReCreateHToolbar() ...@@ -307,16 +307,16 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
KiBitmap( web_support_xpm ), KiBitmap( web_support_xpm ),
_( "Fast access to the Web Based FreeROUTE advanced router" ) ); _( "Fast access to the Web Based FreeROUTE advanced router" ) );
m_mainToolBar->AddSeparator();
// Access to the scripting console // Access to the scripting console
#ifdef KICAD_SCRIPTING_WXPYTHON #ifdef KICAD_SCRIPTING_WXPYTHON
m_mainToolBar->AddSeparator();
m_mainToolBar->AddTool( ID_TOOLBARH_PCB_SCRIPTING_CONSOLE, wxEmptyString, m_mainToolBar->AddTool( ID_TOOLBARH_PCB_SCRIPTING_CONSOLE, wxEmptyString,
KiBitmap( py_script_xpm ), KiBitmap( py_script_xpm ),
_( "Show/Hide the Scripting console" ) ); _( "Show/Hide the Python Scripting console" ),
wxITEM_CHECK );
m_mainToolBar->AddSeparator();
#endif #endif
// after adding the buttons to the toolbar, must call Realize() to reflect the changes // after adding the buttons to the toolbar, must call Realize() to reflect the changes
m_mainToolBar->Realize(); m_mainToolBar->Realize();
} }
......
pcbnew/toolbars_update_user_interface.cpp
View file @ 9ee8dac0
...@@ -109,6 +109,12 @@ void PCB_EDIT_FRAME::OnUpdateLayerSelectBox( wxUpdateUIEvent& aEvent ) ...@@ -109,6 +109,12 @@ void PCB_EDIT_FRAME::OnUpdateLayerSelectBox( wxUpdateUIEvent& aEvent )
m_SelLayerBox->SetLayerSelection( GetActiveLayer() ); m_SelLayerBox->SetLayerSelection( GetActiveLayer() );
} }
#ifdef KICAD_SCRIPTING_WXPYTHON
void PCB_EDIT_FRAME::OnUpdateScriptingConsoleState( wxUpdateUIEvent& aEvent )
{
aEvent.Check( m_pythonPanelShow );
}
#endif
void PCB_EDIT_FRAME::OnUpdateZoneDisplayStyle( wxUpdateUIEvent& aEvent ) void PCB_EDIT_FRAME::OnUpdateZoneDisplayStyle( wxUpdateUIEvent& aEvent )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment