From 450c2e437109684a23ed9a1e5042290f253dbbde Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 11 Feb 2016 16:02:37 +0100 Subject: [PATCH] fix Tickness typo --- 3d-viewer/3d_draw_helper_functions.cpp | 2 +- pcbnew/class_text_mod.cpp | 2 +- .../dialog_global_modules_fields_edition.cpp | 6 ++-- ...log_global_modules_fields_edition_base.cpp | 36 +++++++++---------- ...log_global_modules_fields_edition_base.fbp | 4 +-- ...ialog_global_modules_fields_edition_base.h | 6 ++-- .../plugins/FPC_(SMD_type)_footprintwizard.py | 2 +- .../plugins/FootprintWizardDrawingAids.py | 19 +++++++--- pcbnew/scripting/plugins/bga_wizard.py | 6 ++-- .../plugins/circular_pad_array_wizard.py | 4 +-- pcbnew/scripting/plugins/qfp_wizard.py | 6 ++-- pcbnew/scripting/plugins/sdip_wizard.py | 8 ++--- .../scripting/plugins/touch_slider_wizard.py | 2 +- pcbnew/scripting/plugins/uss39_barcode.py | 6 ++-- pcbnew/scripting/plugins/zip_wizard.py | 8 ++--- 15 files changed, 61 insertions(+), 56 deletions(-) diff --git a/3d-viewer/3d_draw_helper_functions.cpp b/3d-viewer/3d_draw_helper_functions.cpp index 39db1c2e80..34fc009604 100644 --- a/3d-viewer/3d_draw_helper_functions.cpp +++ b/3d-viewer/3d_draw_helper_functions.cpp @@ -419,7 +419,7 @@ void EDA_3D_CANVAS::draw3DViaHole( const VIA* aVia ) { LAYER_ID top_layer, bottom_layer; int thickness = GetPrm3DVisu().GetCopperThicknessBIU(); - int inner_radius = (int)((float)aVia->GetDrillValue() * 1.01f) / 2.0f; // This add a bit more in order to correct a draw artifact while using tickness + int inner_radius = (int)((float)aVia->GetDrillValue() * 1.01f) / 2.0f; // This add a bit more in order to correct a draw artifact while using thickness aVia->LayerPair( &top_layer, &bottom_layer ); diff --git a/pcbnew/class_text_mod.cpp b/pcbnew/class_text_mod.cpp index a51963f1c1..09cd57a0dd 100644 --- a/pcbnew/class_text_mod.cpp +++ b/pcbnew/class_text_mod.cpp @@ -56,7 +56,7 @@ TEXTE_MODULE::TEXTE_MODULE( MODULE* parent, TEXT_TYPE text_type ) : m_Type = text_type; m_NoShow = false; - // Set text tickness to a default value + // Set text thickness to a default value m_Thickness = Millimeter2iu( 0.15 ); SetLayer( F_SilkS ); diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp index e342141000..355d8a5ef5 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition.cpp @@ -95,12 +95,12 @@ void DIALOG_GLOBAL_MODULES_FIELDS_EDITION::initDialog() m_ModuleFilter->SetValue(m_filterString); m_SizeXunit->SetLabel( GetAbbreviatedUnitsLabel() ); m_SizeYunit->SetLabel( GetAbbreviatedUnitsLabel() ); - m_Ticknessunit->SetLabel( GetAbbreviatedUnitsLabel() ); + m_ThicknessUnit->SetLabel( GetAbbreviatedUnitsLabel() ); m_SizeX_Value->SetValue( StringFromValue( g_UserUnit, m_brdSettings->m_ModuleTextSize.x ) ); m_SizeY_Value->SetValue( StringFromValue( g_UserUnit, m_brdSettings->m_ModuleTextSize.y ) ); - m_TicknessValue->SetValue( + m_ThicknessValue->SetValue( StringFromValue( g_UserUnit, m_brdSettings->m_ModuleTextWidth) ); Layout(); @@ -118,7 +118,7 @@ void DIALOG_GLOBAL_MODULES_FIELDS_EDITION::OnOKClick( wxCommandEvent& event ) m_brdSettings->m_ModuleTextSize.x = ValueFromTextCtrl( *m_SizeX_Value ); m_brdSettings->m_ModuleTextSize.y = ValueFromTextCtrl( *m_SizeY_Value ); - m_brdSettings->m_ModuleTextWidth = ValueFromTextCtrl( *m_TicknessValue ); + m_brdSettings->m_ModuleTextWidth = ValueFromTextCtrl( *m_ThicknessValue ); // clip m_ModuleTextWidth to the 1/4 of min size, to keep it always readable int minsize = std::min( m_brdSettings->m_ModuleTextSize.x, diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp index 33ce483723..ea999d3236 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 9 2015) +// C++ code generated with wxFormBuilder (version Jan 1 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -25,13 +25,13 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ wxStaticBoxSizer* sbSizer1; sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Footprint Fields") ), wxVERTICAL ); - m_ReferenceOpt = new wxCheckBox( this, wxID_ANY, _("Reference designator"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ReferenceOpt = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Reference designator"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_ReferenceOpt, 0, wxALL|wxEXPAND, 5 ); - m_ValueOpt = new wxCheckBox( this, wxID_ANY, _("Value"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ValueOpt = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("Value"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_ValueOpt, 0, wxALL|wxEXPAND, 5 ); - m_OtherFields = new wxCheckBox( this, wxID_ANY, _("User defined"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OtherFields = new wxCheckBox( sbSizer1->GetStaticBox(), wxID_ANY, _("User defined"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer1->Add( m_OtherFields, 0, wxALL|wxEXPAND, 5 ); @@ -44,7 +44,6 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ bLeftSizer->Add( m_staticTextFilter, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_ModuleFilter = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_ModuleFilter->SetMaxLength( 0 ); bLeftSizer->Add( m_ModuleFilter, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); @@ -62,41 +61,38 @@ DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE::DIALOG_GLOBAL_MODULES_FIELDS_EDITION_ fgSizerCurrSettings->SetFlexibleDirection( wxBOTH ); fgSizerCurrSettings->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticText3 = new wxStaticText( this, wxID_ANY, _("Width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText3 = new wxStaticText( sbSizerSettings->GetStaticBox(), wxID_ANY, _("Width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3->Wrap( -1 ); fgSizerCurrSettings->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 ); - m_SizeX_Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_SizeX_Value->SetMaxLength( 0 ); + m_SizeX_Value = new wxTextCtrl( sbSizerSettings->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerCurrSettings->Add( m_SizeX_Value, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - m_SizeXunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SizeXunit = new wxStaticText( sbSizerSettings->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXunit->Wrap( -1 ); fgSizerCurrSettings->Add( m_SizeXunit, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - m_staticText6 = new wxStaticText( this, wxID_ANY, _("Height:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText6 = new wxStaticText( sbSizerSettings->GetStaticBox(), wxID_ANY, _("Height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText6->Wrap( -1 ); fgSizerCurrSettings->Add( m_staticText6, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT|wxALIGN_RIGHT, 5 ); - m_SizeY_Value = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_SizeY_Value->SetMaxLength( 0 ); + m_SizeY_Value = new wxTextCtrl( sbSizerSettings->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizerCurrSettings->Add( m_SizeY_Value, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); - m_SizeYunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SizeYunit = new wxStaticText( sbSizerSettings->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYunit->Wrap( -1 ); fgSizerCurrSettings->Add( m_SizeYunit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); - m_staticText9 = new wxStaticText( this, wxID_ANY, _("Thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText9 = new wxStaticText( sbSizerSettings->GetStaticBox(), wxID_ANY, _("Thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText9->Wrap( -1 ); fgSizerCurrSettings->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); - m_TicknessValue = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TicknessValue->SetMaxLength( 0 ); - fgSizerCurrSettings->Add( m_TicknessValue, 0, wxALL|wxEXPAND, 5 ); + m_ThicknessValue = new wxTextCtrl( sbSizerSettings->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerCurrSettings->Add( m_ThicknessValue, 0, wxALL|wxEXPAND, 5 ); - m_Ticknessunit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); - m_Ticknessunit->Wrap( -1 ); - fgSizerCurrSettings->Add( m_Ticknessunit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + m_ThicknessUnit = new wxStaticText( sbSizerSettings->GetStaticBox(), wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ThicknessUnit->Wrap( -1 ); + fgSizerCurrSettings->Add( m_ThicknessUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); sbSizerSettings->Add( fgSizerCurrSettings, 1, wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp index 3276eb7e0e..ee0727cac7 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.fbp @@ -1239,7 +1239,7 @@ 0 1 - m_TicknessValue + m_ThicknessValue 1 @@ -1330,7 +1330,7 @@ 0 1 - m_Ticknessunit + m_ThicknessUnit 1 diff --git a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h index 809771e716..230f2504ff 100644 --- a/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h +++ b/pcbnew/dialogs/dialog_global_modules_fields_edition_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 9 2015) +// C++ code generated with wxFormBuilder (version Jan 1 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -51,8 +51,8 @@ class DIALOG_GLOBAL_MODULES_FIELDS_EDITION_BASE : public DIALOG_SHIM wxTextCtrl* m_SizeY_Value; wxStaticText* m_SizeYunit; wxStaticText* m_staticText9; - wxTextCtrl* m_TicknessValue; - wxStaticText* m_Ticknessunit; + wxTextCtrl* m_ThicknessValue; + wxStaticText* m_ThicknessUnit; wxStaticLine* m_staticline1; wxStdDialogButtonSizer* m_sdbSizerButtons; wxButton* m_sdbSizerButtonsOK; diff --git a/pcbnew/scripting/plugins/FPC_(SMD_type)_footprintwizard.py b/pcbnew/scripting/plugins/FPC_(SMD_type)_footprintwizard.py index 8526b45e2f..2d0fd36798 100644 --- a/pcbnew/scripting/plugins/FPC_(SMD_type)_footprintwizard.py +++ b/pcbnew/scripting/plugins/FPC_(SMD_type)_footprintwizard.py @@ -102,7 +102,7 @@ class FPC_FootprintWizard(HFPW.HelpfulFootprintWizardPlugin): self.module.Add(pad_s1) # add footprint outline - linewidth = self.draw.GetLineTickness() + linewidth = self.draw.GetLineThickness() margin = linewidth # upper line diff --git a/pcbnew/scripting/plugins/FootprintWizardDrawingAids.py b/pcbnew/scripting/plugins/FootprintWizardDrawingAids.py index 058fe1e48f..036f09a616 100644 --- a/pcbnew/scripting/plugins/FootprintWizardDrawingAids.py +++ b/pcbnew/scripting/plugins/FootprintWizardDrawingAids.py @@ -26,7 +26,7 @@ class FootprintWizardDrawingAids: footprint wizards A "drawing context" is provided which can be used to set and retain - settings such as line tickness and layer + settings such as line thickness and layer """ # directions (in degrees, compass-like) @@ -240,16 +240,25 @@ class FootprintWizardDrawingAids: return pcbnew.wxPoint(x * mat[0] + y * mat[1] + mat[2], x * mat[3] + y * mat[4] + mat[5]) - def SetLineTickness(self, lineThickness): + def SetLineThickness(self, lineThickness): """ Set the current pen lineThickness used for subsequent drawing operations """ self.dc['lineThickness'] = lineThickness - def GetLineTickness(self): + def SetLineTickness(self, lineThickness): """ - Get the current drawing context line tickness + Old version of SetLineThickness. + Does the same thing, but is is only here for compatibility with old scripts + Set the current pen lineThickness used for subsequent drawing + operations + """ + self.dc['lineThickness'] = lineThickness + + def GetLineThickness(self): + """ + Get the current drawing context line thickness """ return self.dc['lineThickness'] @@ -271,7 +280,7 @@ class FootprintWizardDrawingAids: Draw a line from (x1, y1) to (x2, y2) """ outline = pcbnew.EDGE_MODULE(self.module) - outline.SetWidth(self.GetLineTickness()) + outline.SetWidth(self.GetLineThickness()) outline.SetLayer(self.GetLayer()) outline.SetShape(pcbnew.S_SEGMENT) start = self.TransformPoint(x1, y1) diff --git a/pcbnew/scripting/plugins/bga_wizard.py b/pcbnew/scripting/plugins/bga_wizard.py index ea9552f42b..a9e3d775cf 100644 --- a/pcbnew/scripting/plugins/bga_wizard.py +++ b/pcbnew/scripting/plugins/bga_wizard.py @@ -82,15 +82,15 @@ class BGAWizard(HFPW.HelpfulFootprintWizardPlugin): pads["outline x margin"]) # Courtyard - cmargin = self.draw.GetLineTickness() + cmargin = self.draw.GetLineThickness() self.draw.SetLayer(pcbnew.F_CrtYd) sizex = (ssx + cmargin) * 2 sizey = (ssy + cmargin) * 2 # set courtyard line thickness to the one defined in KLC - self.draw.SetLineTickness(pcbnew.FromMM(0.05)) + self.draw.SetLineThickness(pcbnew.FromMM(0.05)) self.draw.Box(0, 0, sizex, sizey) # restore line thickness to previous value - self.draw.SetLineTickness(pcbnew.FromMM(cmargin)) + self.draw.SetLineThickness(pcbnew.FromMM(cmargin)) #reference and value text_size = self.GetTextSize() # IPC nominal diff --git a/pcbnew/scripting/plugins/circular_pad_array_wizard.py b/pcbnew/scripting/plugins/circular_pad_array_wizard.py index 0b2a280ab4..7a42c8fe84 100644 --- a/pcbnew/scripting/plugins/circular_pad_array_wizard.py +++ b/pcbnew/scripting/plugins/circular_pad_array_wizard.py @@ -69,12 +69,12 @@ class circular_pad_array_wizard(HFPW.HelpfulFootprintWizardPlugin): array.AddPadsToModule(self.draw) - body_radius = (prm['circle diameter'] + prm['pad width'])/2 + self.draw.GetLineTickness() + body_radius = (prm['circle diameter'] + prm['pad width'])/2 + self.draw.GetLineThickness() self.draw.Circle(0, 0, body_radius) text_size = self.GetTextSize() # IPC nominal thickness = self.GetTextThickness() - textposy = body_radius + self.draw.GetLineTickness()/2 + self.GetTextSize()/2 + thickness + textposy = body_radius + self.draw.GetLineThickness()/2 + self.GetTextSize()/2 + thickness self.draw.Value( 0, textposy, text_size ) self.draw.Reference( 0, -textposy, text_size ) diff --git a/pcbnew/scripting/plugins/qfp_wizard.py b/pcbnew/scripting/plugins/qfp_wizard.py index 761f41246c..c24478a25d 100644 --- a/pcbnew/scripting/plugins/qfp_wizard.py +++ b/pcbnew/scripting/plugins/qfp_wizard.py @@ -114,11 +114,11 @@ class QFPWizard(HelpfulFootprintWizardPlugin.HelpfulFootprintWizardPlugin): sizex = (lim_x + cmargin) * 2 + pad_length sizey = (lim_y + cmargin) * 2 + pad_length # set courtyard line thickness to the one defined in KLC - thick = self.draw.GetLineTickness() - self.draw.SetLineTickness(pcbnew.FromMM(0.05)) + thick = self.draw.GetLineThickness() + self.draw.SetLineThickness(pcbnew.FromMM(0.05)) self.draw.Box(0, 0, sizex, sizey) # restore line thickness to previous value - self.draw.SetLineTickness(pcbnew.FromMM(thick)) + self.draw.SetLineThickness(pcbnew.FromMM(thick)) #reference and value text_size = self.GetTextSize() # IPC nominal diff --git a/pcbnew/scripting/plugins/sdip_wizard.py b/pcbnew/scripting/plugins/sdip_wizard.py index 825446c9a5..078d3158a0 100644 --- a/pcbnew/scripting/plugins/sdip_wizard.py +++ b/pcbnew/scripting/plugins/sdip_wizard.py @@ -105,15 +105,15 @@ class RowedFootprint(HFPW.HelpfulFootprintWizardPlugin): self.DrawBox(ssx, ssy) # Courtyard - cmargin = self.draw.GetLineTickness() + cmargin = self.draw.GetLineThickness() self.draw.SetLayer(pcbnew.F_CrtYd) sizex = (ssx + cmargin) * 2 sizey = (ssy + cmargin) * 2 # set courtyard line thickness to the one defined in KLC - self.draw.SetLineTickness(pcbnew.FromMM(0.05)) + self.draw.SetLineThickness(pcbnew.FromMM(0.05)) self.draw.Box(0, 0, sizex, sizey) # restore line thickness to previous value - self.draw.SetLineTickness(pcbnew.FromMM(cmargin)) + self.draw.SetLineThickness(pcbnew.FromMM(cmargin)) #reference and value text_size = self.GetTextSize() # IPC nominal @@ -187,7 +187,7 @@ class SDIPWizard(RowedFootprint): # draw the notch notchWidth = ssy/1.5 - notchHeight = self.draw.GetLineTickness()*3 + notchHeight = self.draw.GetLineThickness()*3 # NotchedBox draws the notch on top. Rotate the box 90 degrees # to have it on the left diff --git a/pcbnew/scripting/plugins/touch_slider_wizard.py b/pcbnew/scripting/plugins/touch_slider_wizard.py index ee2ae534bf..8e23997743 100644 --- a/pcbnew/scripting/plugins/touch_slider_wizard.py +++ b/pcbnew/scripting/plugins/touch_slider_wizard.py @@ -187,7 +187,7 @@ class TouchSliderWizard(HFPW.HelpfulFootprintWizardPlugin): step_length = float(touch_length) / float(steps) t_size = self.GetTextSize() - w_text = self.draw.GetLineTickness() + w_text = self.draw.GetLineThickness() ypos = touch_width/(bands*2) + t_size/2 + w_text self.draw.Value(0, -ypos, t_size) ypos += t_size + w_text*2 diff --git a/pcbnew/scripting/plugins/uss39_barcode.py b/pcbnew/scripting/plugins/uss39_barcode.py index 846a2bc538..ee867758f1 100644 --- a/pcbnew/scripting/plugins/uss39_barcode.py +++ b/pcbnew/scripting/plugins/uss39_barcode.py @@ -97,7 +97,7 @@ class Uss39Wizard(HelpfulFootprintWizardPlugin.HelpfulFootprintWizardPlugin): def __drawSpace__(self, bit, x): self.draw.SetLayer(B.F_SilkS) - self.draw.SetLineTickness(self.X) + self.draw.SetLineThickness(self.X) self.draw.Line(x, 0, x, self.H) if (bit == 1): self.draw.Line(x + self.X, 0, x + self.X, self.H) @@ -122,7 +122,7 @@ class Uss39Wizard(HelpfulFootprintWizardPlugin.HelpfulFootprintWizardPlugin): def drawQuietZone(self, x0, y0, width, height): self.draw.SetLayer(B.F_SilkS) - self.draw.SetLineTickness(self.X) + self.draw.SetLineThickness(self.X) for offset in range(0, int(self.Q), int(self.X/2)): xoffset = offset + self.X @@ -139,7 +139,7 @@ class Uss39Wizard(HelpfulFootprintWizardPlugin.HelpfulFootprintWizardPlugin): self.drawQuietZone(0, 0, x, self.H) # Draw courtyard origin self.draw.SetLayer(B.F_CrtYd) - self.draw.SetLineTickness(self.CourtyardLineWidth) + self.draw.SetLineThickness(self.CourtyardLineWidth) ch_lim = B.FromMM(0.35) self.draw.Line(-ch_lim, 0, ch_lim, 0) self.draw.Line(0, -ch_lim, 0, ch_lim) diff --git a/pcbnew/scripting/plugins/zip_wizard.py b/pcbnew/scripting/plugins/zip_wizard.py index ec10f4445d..c97ebd1418 100644 --- a/pcbnew/scripting/plugins/zip_wizard.py +++ b/pcbnew/scripting/plugins/zip_wizard.py @@ -90,7 +90,7 @@ class RowedFootprint(HFPW.HelpfulFootprintWizardPlugin): # body inside pads is possible only for 2 rows. # for other values, there is no room - linew = self.draw.GetLineTickness() + linew = self.draw.GetLineThickness() if body['*'+self.silkscreen_inside_key] and line_count == 2: cornery = pin1posY - ssy_offset if cornery < linew: @@ -103,13 +103,13 @@ class RowedFootprint(HFPW.HelpfulFootprintWizardPlugin): cmarginy = body[self.courtyard_y_margin_key] self.draw.SetLayer(pcbnew.F_CrtYd) # set courtyard line thickness to the one defined in KLC - thick = self.draw.GetLineTickness() + thick = self.draw.GetLineThickness() sizex = (pin1posX + cmarginx) * 2 + pad_Hsize + thick sizey = (pin1posY + cmarginy) * 2 + pad_Vsize + thick - self.draw.SetLineTickness(pcbnew.FromMM(0.05)) + self.draw.SetLineThickness(pcbnew.FromMM(0.05)) self.draw.Box(0, 0, sizex, sizey) # restore line thickness to previous value - self.draw.SetLineTickness(pcbnew.FromMM(thick)) + self.draw.SetLineThickness(pcbnew.FromMM(thick)) #reference and value text_size = self.GetTextSize() # IPC nominal