r5258 - trunk/gta02-core/kicad-patches

[werner at docs.openmoko.org]

Author: werner
Date: 2009-06-30 06:15:01 +0200 (Tue, 30 Jun 2009)
New Revision: 5258

Added:
   trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch
Removed:
   trunk/gta02-core/kicad-patches/fix-r1837-build.patch
Modified:
   trunk/gta02-core/kicad-patches/series
Log:
r1837 build failures were a local problem. Updated junction size fix for
r1846.



Deleted: trunk/gta02-core/kicad-patches/fix-r1837-build.patch
===================================================================
--- trunk/gta02-core/kicad-patches/fix-r1837-build.patch	2009-06-30 01:21:13 UTC (rev 5257)
+++ trunk/gta02-core/kicad-patches/fix-r1837-build.patch	2009-06-30 04:15:01 UTC (rev 5258)
@@ -1,45 +0,0 @@
-This fixes a number of build issues in r1837:
-
-- LibDrawPin now needs the parent to be passed
-- type inconsistency for g_PlotScaleX and g_PlotScaleY between declaration and
-  definition
-- g_DrawDefaultLineThickness vanished
-
----
-
-Index: kicad/eeschema/pinedit.cpp
-===================================================================
---- kicad.orig/eeschema/pinedit.cpp	2009-06-25 05:36:52.000000000 -0300
-+++ kicad/eeschema/pinedit.cpp	2009-06-25 05:36:52.000000000 -0300
-@@ -557,7 +557,7 @@
-     for( ; DrawItem != NULL; DrawItem = DrawItem->Next() )
-         DrawItem->m_Flags = 0;
- 
--    CurrentPin = new LibDrawPin();
-+    CurrentPin = new LibDrawPin( CurrentLibEntry );
- 
-     CurrentDrawItem = CurrentPin;
-     if( CurrentPin == NULL )
-Index: kicad/eeschema/eeschema.cpp
-===================================================================
---- kicad.orig/eeschema/eeschema.cpp	2009-06-25 05:36:52.000000000 -0300
-+++ kicad/eeschema/eeschema.cpp	2009-06-25 05:37:28.000000000 -0300
-@@ -68,8 +68,8 @@
- 
- int       g_PlotFormat;                  /* flag = TYPE_HPGL, TYPE_PS... */
- int       g_PlotMargin;                  /* Marge pour traces du cartouche */
--float     g_PlotScaleX;
--float     g_PlotScaleY; /* coeff d'echelle de trace en unites table tracante */
-+double    g_PlotScaleX;
-+double    g_PlotScaleY; /* coeff d'echelle de trace en unites table tracante */
- 
- HPGL_Pen_Descr_Struct g_HPGL_Pen_Descr;
- 
-@@ -93,6 +93,7 @@
- bool g_EditPinByPinIsOn = FALSE;
- 
- int g_LibSymbolDefaultLineWidth; /* default line width  (in EESCHEMA units) used when creating a new graphic item in libedit : 0 = default */
-+int g_DrawDefaultLineThickness; /* Default line (in EESCHEMA units) thickness */
- int g_DrawMinimunLineWidth;      /* Minimum line (in EESCHEMA units) thickness used to draw items on screen; 0 = single pixel line width */
- int g_PlotLine_Width;            /* Minimum line (in EESCHEMA units) thickness used to Plot/Print items */
- // Color to draw selected items

Added: trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch
===================================================================
--- trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch	                        (rev 0)
+++ trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch	2009-06-30 04:15:01 UTC (rev 5258)
@@ -0,0 +1,20 @@
+plotter->circle expects the diameter, but DRAWJUNCTION_SIZE is just the
+radius. This fix is originally by Alvaro Lopes <alvieboy at alvie.com>
+
+- Werner
+
+---
+
+Index: kicad/eeschema/plot.cpp
+===================================================================
+--- kicad.orig/eeschema/plot.cpp	2009-06-29 23:14:22.000000000 -0300
++++ kicad/eeschema/plot.cpp	2009-06-29 23:14:47.000000000 -0300
+@@ -761,7 +761,7 @@
+                 #undef STRUCT
+                 #define STRUCT ( (DrawJunctionStruct*) drawlist )
+             plotter->set_color( ReturnLayerColor( STRUCT->GetLayer() ) );
+-            plotter->circle( STRUCT->m_Pos, DRAWJUNCTION_SIZE, FILLED_SHAPE );
++            plotter->circle( STRUCT->m_Pos, DRAWJUNCTION_SIZE*2, FILLED_SHAPE );
+             break;
+ 
+         case TYPE_SCH_TEXT:

Modified: trunk/gta02-core/kicad-patches/series
===================================================================
--- trunk/gta02-core/kicad-patches/series	2009-06-30 01:21:13 UTC (rev 5257)
+++ trunk/gta02-core/kicad-patches/series	2009-06-30 04:15:01 UTC (rev 5258)
@@ -17,10 +17,6 @@
 #drag-override.patch
 #pcbnew-plot-only-mode.patch
 
+# updated for r1846
+#make-junctions-larger-in-plots.patch
 make-junctions-larger-on-plotps.patch
-
-# applied as of r1836
-##fix-eeschema-libs.patch
-
-# r1837 has a bewildering number of build issues. tentative fix.
-fix-r1837-build.patch