Commit 4343eb5b authored by jean-pierre charras's avatar jean-pierre charras

Fix Bug #1132416. Minor update in templates.

parent af433f80
......@@ -263,12 +263,12 @@ void EDA_DRAW_FRAME::AddMenuZoomAndGrid( wxMenu* MasterMenu )
switch( g_UserUnit )
{
case INCHES:
msg.Printf( wxT( "%.1f mils, (%.3f mm)" ),
msg.Printf( wxT( "%.1f mils, (%.4f mm)" ),
gridValueInch * 1000, gridValue_mm );
break;
case MILLIMETRES:
msg.Printf( wxT( "%.3f mm, (%.1f mils)" ),
msg.Printf( wxT( "%.4f mm, (%.1f mils)" ),
gridValue_mm, gridValueInch * 1000 );
break;
......
......@@ -814,11 +814,11 @@ void GERBVIEW_FRAME::UpdateStatusBar()
switch( g_UserUnit )
{
case INCHES:
formatter = wxT( "Ro %.4f Th %.1f" );
formatter = wxT( "Ro %.6f Th %.1f" );
break;
case MILLIMETRES:
formatter = wxT( "Ro %.3f Th %.1f" );
formatter = wxT( "Ro %.5f Th %.1f" );
break;
case UNSCALED_UNITS:
......@@ -835,25 +835,19 @@ void GERBVIEW_FRAME::UpdateStatusBar()
dXpos = To_User_Unit( g_UserUnit, screen->GetCrossHairPosition().x );
dYpos = To_User_Unit( g_UserUnit, screen->GetCrossHairPosition().y );
if ( g_UserUnit == MILLIMETRES )
{
dXpos = RoundTo0( dXpos, 1000.0 );
dYpos = RoundTo0( dYpos, 1000.0 );
}
// The following sadly is an if Eeschema/if Pcbnew
wxString absformatter;
switch( g_UserUnit )
{
case INCHES:
absformatter = wxT( "X %.4f Y %.4f" );
locformatter = wxT( "dx %.4f dy %.4f d %.4f" );
absformatter = wxT( "X %.6f Y %.6f" );
locformatter = wxT( "dx %.6f dy %.6f d %.6f" );
break;
case MILLIMETRES:
absformatter = wxT( "X %.3f Y %.3f" );
locformatter = wxT( "dx %.3f dy %.3f d %.3f" );
absformatter = wxT( "X %.5f Y %.5f" );
locformatter = wxT( "dx %.5f dy %.5f d %.5f" );
break;
case UNSCALED_UNITS:
......@@ -873,12 +867,6 @@ void GERBVIEW_FRAME::UpdateStatusBar()
dXpos = To_User_Unit( g_UserUnit, dx );
dYpos = To_User_Unit( g_UserUnit, dy );
if ( g_UserUnit == MILLIMETRES )
{
dXpos = RoundTo0( dXpos, 1000.0 );
dYpos = RoundTo0( dYpos, 1000.0 );
}
// We already decided the formatter above
line.Printf( locformatter, dXpos, dYpos, sqrt( dXpos * dXpos + dYpos * dYpos ) );
SetStatusText( line, 3 );
......
......@@ -606,12 +606,6 @@ void PCB_BASE_FRAME::UpdateStatusBar()
dXpos = To_User_Unit( g_UserUnit, screen->GetCrossHairPosition().x );
dYpos = To_User_Unit( g_UserUnit, screen->GetCrossHairPosition().y );
if ( g_UserUnit == MILLIMETRES )
{
dXpos = RoundTo0( dXpos, 1000.0 );
dYpos = RoundTo0( dYpos, 1000.0 );
}
// The following sadly is an if Eeschema/if Pcbnew
wxString absformatter;
......@@ -634,6 +628,8 @@ void PCB_BASE_FRAME::UpdateStatusBar()
break;
case MILLIMETRES:
dXpos = RoundTo0( dXpos, 1000.0 );
dYpos = RoundTo0( dYpos, 1000.0 );
absformatter = wxT( "X %.3f Y %.3f" );
locformatter = wxT( "dx %.3f dy %.3f d %.3f" );
break;
......@@ -656,11 +652,13 @@ void PCB_BASE_FRAME::UpdateStatusBar()
dXpos = To_User_Unit( g_UserUnit, dx );
dYpos = To_User_Unit( g_UserUnit, dy );
#ifndef USE_PCBNEW_NANOMETRES
if ( g_UserUnit == MILLIMETRES )
{
dXpos = RoundTo0( dXpos, 1000.0 );
dYpos = RoundTo0( dYpos, 1000.0 );
}
#endif
// We already decided the formatter above
line.Printf( locformatter, dXpos, dYpos, sqrt( dXpos * dXpos + dYpos * dYpos ) );
......@@ -772,7 +770,7 @@ void PCB_BASE_FRAME::updateGridSelectBox()
break;
case MILLIMETRES:
format += wxT( " %.3f" );
format += wxT( " %.4f" );
break;
case UNSCALED_UNITS:
......
......@@ -445,7 +445,7 @@ MODULE* GPCB_FPL_CACHE::parseMODULE( LINE_READER* aLineReader ) throw( IO_ERROR,
{
if( paramCnt != 8 )
{
msg.Printf( _( "ElementLine token contains %d parameters." ), paramCnt );
msg.Printf( wxT( "ElementLine token contains %d parameters." ), paramCnt );
THROW_PARSE_ERROR( msg, aLineReader->GetSource(), (const char *)aLineReader,
aLineReader->LineNumber(), 0 );
}
......@@ -468,7 +468,7 @@ MODULE* GPCB_FPL_CACHE::parseMODULE( LINE_READER* aLineReader ) throw( IO_ERROR,
{
if( paramCnt != 10 )
{
msg.Printf( _( "ElementArc token contains %d parameters." ), paramCnt );
msg.Printf( wxT( "ElementArc token contains %d parameters." ), paramCnt );
THROW_PARSE_ERROR( msg, aLineReader->GetSource(), (const char *)aLineReader,
aLineReader->LineNumber(), 0 );
}
......@@ -520,7 +520,7 @@ MODULE* GPCB_FPL_CACHE::parseMODULE( LINE_READER* aLineReader ) throw( IO_ERROR,
{
if( paramCnt < 10 || paramCnt > 13 )
{
msg.Printf( _( "Pad token contains %d parameters." ), paramCnt );
msg.Printf( wxT( "Pad token contains %d parameters." ), paramCnt );
THROW_PARSE_ERROR( msg, aLineReader->GetSource(), (const char *)aLineReader,
aLineReader->LineNumber(), 0 );
}
......@@ -593,7 +593,7 @@ MODULE* GPCB_FPL_CACHE::parseMODULE( LINE_READER* aLineReader ) throw( IO_ERROR,
{
if( paramCnt < 8 || paramCnt > 12 )
{
msg.Printf( _( "Pin token contains %d parameters." ), paramCnt );
msg.Printf( wxT( "Pin token contains %d parameters." ), paramCnt );
THROW_PARSE_ERROR( msg, aLineReader->GetSource(), (const char *)aLineReader,
aLineReader->LineNumber(), 0 );
}
......
......@@ -78,10 +78,11 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar()
m_mainToolBar->AddTool( ID_MODEDIT_NEW_MODULE, wxEmptyString, KiBitmap( new_footprint_xpm ),
_( "New module" ) );
#ifdef KICAD_SCRIPTING_WXPYTHON
m_mainToolBar->AddTool( ID_MODEDIT_NEW_MODULE_FROM_WIZARD, wxEmptyString,
KiBitmap( module_wizard_xpm ),
_( "New module from footprint wizard" ) );
#endif
m_mainToolBar->AddTool( ID_MODEDIT_LOAD_MODULE, wxEmptyString,
......
This diff is collapsed.
PCBNEW-BOARD Version 2 date Thu 18 Oct 2012 10:11:06 PM PDT
# Created by Pcbnew(2011-nov-30)-testing
$GENERAL
encoding utf-8
Units mm
LayerCount 2
EnabledLayers 1FFF8001
Links 1
NoConn 1
Di 172.984525 104.605002 242.305477 149.137511
Ndraw 7
Ntrack 0
Nzone 0
BoardThickness 1.6
Nmodule 4
Nnets 4
$EndGENERAL
$SHEETDESCR
Sheet A3 16535 11693
Title ""
Date "19 oct 2012"
Rev ""
Comp ""
Comment1 ""
Comment2 ""
Comment3 ""
Comment4 ""
$EndSHEETDESCR
$SETUP
Layers 2
Layer[0] Back signal
Layer[15] Front signal
TrackWidth 0.254
TrackClearence 0.254
ZoneClearence 0.508
Zone_45_Only 0
TrackMinWidth 0.254
DrawSegmWidth 0.20066
EdgeSegmWidth 0.14986
ViaSize 0.889
ViaDrill 0.635
ViaMinSize 0.889
ViaMinDrill 0.508
MicroViaSize 0.508
MicroViaDrill 0.127
MicroViasAllowed 0
MicroViaMinSize 0.508
MicroViaMinDrill 0.127
TextPcbWidth 0.3
TextPcbSize 1 1
EdgeModWidth 0.14986
TextModSize 1 1
TextModWidth 0.15
PadSize 1 1
PadDrill 0.6
Pad2MaskClearance 0
AuxiliaryAxisOrg 0 0
VisibleElements FFFFFFBF
PcbPlotParams (pcbplotparams (layerselection 3178497) (usegerberextensions true) (excludeedgelayer true) (linewidth 152400) (plotframeref false) (viasonmask false) (mode 1) (useauxorigin false) (hpglpennumber 1) (hpglpenspeed 20) (hpglpendiameter 15) (hpglpenoverlay 2) (psnegative false) (psa4output false) (plotreference true) (plotvalue true) (plotothertext true) (plotinvisibletext false) (padsonsilk false) (subtractmaskfromsilk false) (outputformat 1) (mirror false) (drillshape 1) (scaleselection 1) (outputdirectory ""))
$EndSETUP
$EQUIPOT
Na 0 ""
St ~
$EndEQUIPOT
$EQUIPOT
Na 1 "+5V"
St ~
$EndEQUIPOT
$EQUIPOT
Na 2 "GND"
St ~
$EndEQUIPOT
$EQUIPOT
Na 3 "VCC"
St ~
$EndEQUIPOT
$NCLASS
Name "Default"
Desc "This is the default net class."
Clearance 0.254
TrackWidth 0.254
ViaDia 0.889
ViaDrill 0.635
uViaDia 0.508
uViaDrill 0.127
AddNet ""
AddNet "+5V"
AddNet "GND"
AddNet "VCC"
$EndNCLASS
$MODULE SIL-10
Po 231.14 133.35 2700 15 5080DEE6 5080DE37 ~~
Li SIL-10
Cd Connecteur 10 pins
Kw CONN DEV
Sc 5080DE37
AR /5080DBF4
Op 0 0 0
T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J2"
T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J2"
DS -12.7 1.27 -12.7 -1.27 0.3048 21
DS -12.7 -1.27 12.7 -1.27 0.3048 21
DS 12.7 -1.27 12.7 1.27 0.3048 21
DS 12.7 1.27 -12.7 1.27 0.3048 21
DS -10.16 1.27 -10.16 -1.27 0.3048 21
$PAD
Sh "1" R 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 2 "GND"
Po -11.43 0
$EndPAD
$PAD
Sh "2" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -8.89 0
$EndPAD
$PAD
Sh "3" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -6.35 0
$EndPAD
$PAD
Sh "4" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -3.81 0
$EndPAD
$PAD
Sh "5" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -1.27 0
$EndPAD
$PAD
Sh "6" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 1.27 0
$EndPAD
$PAD
Sh "7" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 3.81 0
$EndPAD
$PAD
Sh "8" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 6.35 0
$EndPAD
$PAD
Sh "9" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 8.89 0
$EndPAD
$PAD
Sh "10" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 11.43 0
$EndPAD
$EndMODULE SIL-10
$MODULE SIL-10
Po 228.6 133.35 2700 15 5080DEED 5080DE4A ~~
Li SIL-10
Cd Connecteur 10 pins
Kw CONN DEV
Sc 5080DE4A
AR /5080DC12
Op 0 0 0
T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J4"
T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J4"
DS -12.7 1.27 -12.7 -1.27 0.3048 21
DS -12.7 -1.27 12.7 -1.27 0.3048 21
DS 12.7 -1.27 12.7 1.27 0.3048 21
DS 12.7 1.27 -12.7 1.27 0.3048 21
DS -10.16 1.27 -10.16 -1.27 0.3048 21
$PAD
Sh "1" R 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -11.43 0
$EndPAD
$PAD
Sh "2" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -8.89 0
$EndPAD
$PAD
Sh "3" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -6.35 0
$EndPAD
$PAD
Sh "4" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -3.81 0
$EndPAD
$PAD
Sh "5" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -1.27 0
$EndPAD
$PAD
Sh "6" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 1.27 0
$EndPAD
$PAD
Sh "7" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 3.81 0
$EndPAD
$PAD
Sh "8" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 6.35 0
$EndPAD
$PAD
Sh "9" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 8.89 0
$EndPAD
$PAD
Sh "10" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 11.43 0
$EndPAD
$EndMODULE SIL-10
$MODULE SIL-10
Po 187.96 133.35 2700 15 5080DEE0 5080AB71 ~~
Li SIL-10
Cd Connecteur 10 pins
Kw CONN DEV
Sc 5080AB71
AR /5080DC03
Op 0 0 0
T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J3"
T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J3"
DS -12.7 1.27 -12.7 -1.27 0.3048 21
DS -12.7 -1.27 12.7 -1.27 0.3048 21
DS 12.7 -1.27 12.7 1.27 0.3048 21
DS 12.7 1.27 -12.7 1.27 0.3048 21
DS -10.16 1.27 -10.16 -1.27 0.3048 21
$PAD
Sh "1" R 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 1 "+5V"
Po -11.43 0
$EndPAD
$PAD
Sh "2" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 2 "GND"
Po -8.89 0
$EndPAD
$PAD
Sh "3" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -6.35 0
$EndPAD
$PAD
Sh "4" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -3.81 0
$EndPAD
$PAD
Sh "5" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -1.27 0
$EndPAD
$PAD
Sh "6" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 1.27 0
$EndPAD
$PAD
Sh "7" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 3.81 0
$EndPAD
$PAD
Sh "8" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 6.35 0
$EndPAD
$PAD
Sh "9" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 8.89 0
$EndPAD
$PAD
Sh "10" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 11.43 0
$EndPAD
$EndMODULE SIL-10
$MODULE SIL-10
Po 185.42 133.35 2700 15 5080DEDC 5080AB8D ~~
Li SIL-10
Cd Connecteur 10 pins
Kw CONN DEV
Sc 5080AB8D
AR /5080DB5C
Op 0 0 0
T0 -13.97 0 1.72974 1.08712 3600 0.3048 N V 21 N "J1"
T1 6.35 -2.54 1.524 1.016 2700 0.3048 N V 21 N "TI_BOOSTER_40_J1"
DS -12.7 1.27 -12.7 -1.27 0.3048 21
DS -12.7 -1.27 12.7 -1.27 0.3048 21
DS 12.7 -1.27 12.7 1.27 0.3048 21
DS 12.7 1.27 -12.7 1.27 0.3048 21
DS -10.16 1.27 -10.16 -1.27 0.3048 21
$PAD
Sh "1" R 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 3 "VCC"
Po -11.43 0
$EndPAD
$PAD
Sh "2" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -8.89 0
$EndPAD
$PAD
Sh "3" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -6.35 0
$EndPAD
$PAD
Sh "4" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -3.81 0
$EndPAD
$PAD
Sh "5" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po -1.27 0
$EndPAD
$PAD
Sh "6" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 1.27 0
$EndPAD
$PAD
Sh "7" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 3.81 0
$EndPAD
$PAD
Sh "8" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 6.35 0
$EndPAD
$PAD
Sh "9" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 8.89 0
$EndPAD
$PAD
Sh "10" C 1.397 1.397 0 0 2700
Dr 0.8128 0 0
At STD N 00E0FFFF
Ne 0 ""
Po 11.43 0
$EndPAD
$EndMODULE SIL-10
$COTATION
Ge 0 24 0
Va 34.29
Te "1.3500 in"
Po 176.800001 130.175 1 1 0.25 2700 1
Sb 0 177.800001 113.03 177.800001 147.32 0.25
Sd 0 182.88 147.32 175.800001 147.32 0.25
Sg 0 182.88 113.03 175.800001 113.03 0.25
S1 0 177.800001 147.32 177.213581 146.193497 0.25
S2 0 177.800001 147.32 178.386421 146.193497 0.25
S3 0 177.800001 113.03 177.213581 114.156503 0.25
S4 0 177.800001 113.03 178.386421 114.156503 0.25
$endCOTATION
$COTATION
Ge 0 24 0
Va 8.89
Te "0.3500 in"
Po 238.49 117.475 1 1 0.25 900 1
Sb 0 237.49 121.92 237.49 113.03 0.25
Sd 0 231.14 113.03 239.49 113.03 0.25
Sg 0 231.14 121.92 239.49 121.92 0.25
S1 0 237.49 113.03 238.07642 114.156503 0.25
S2 0 237.49 113.03 236.90358 114.156503 0.25
S3 0 237.49 121.92 238.07642 120.793497 0.25
S4 0 237.49 121.92 236.90358 120.793497 0.25
$endCOTATION
$DRAWSEGMENT
Po 0 233.68 147.32 182.88 147.32 0.15
De 28 0 900 0 0
$EndDRAWSEGMENT
$COTATION
Ge 0 24 0
Va 50.8
Te "2.0000 in"
Po 208.28 105.680002 1 1 0.25 -0 1
Sb 0 182.88 106.680002 233.68 106.680002 0.25
Sd 0 233.68 113.03 233.68 104.680002 0.25
Sg 0 182.88 113.03 182.88 104.680002 0.25
S1 0 233.68 106.680002 232.553497 107.266422 0.25
S2 0 233.68 106.680002 232.553497 106.093582 0.25
S3 0 182.88 106.680002 184.006503 107.266422 0.25
S4 0 182.88 106.680002 184.006503 106.093582 0.25
$endCOTATION
$DRAWSEGMENT
Po 0 182.88 147.32 182.88 113.03 0.14986
De 28 0 900 0 0
$EndDRAWSEGMENT
$DRAWSEGMENT
Po 0 233.68 113.03 233.68 147.32 0.14986
De 28 0 900 0 0
$EndDRAWSEGMENT
$DRAWSEGMENT
Po 0 182.88 113.03 233.68 113.03 0.15
De 28 0 900 0 0
$EndDRAWSEGMENT
$TRACK
$EndTRACK
$ZONE
$EndZONE
$EndBOARD
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