r5430 - trunk/gta02-core/kicad-patches
werner at docs.openmoko.org
werner at docs.openmoko.org
Thu Aug 13 02:29:47 CEST 2009
Author: werner
Date: 2009-08-13 02:29:47 +0200 (Thu, 13 Aug 2009)
New Revision: 5430
Removed:
trunk/gta02-core/kicad-patches/eeschema-fix-relative-path.patch
trunk/gta02-core/kicad-patches/gerbview-export-arcs.patch
trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch
trunk/gta02-core/kicad-patches/make-junctions-larger-on-plotps.patch
Modified:
trunk/gta02-core/kicad-patches/series
Log:
- removed patches that have already made it upstream
Deleted: trunk/gta02-core/kicad-patches/eeschema-fix-relative-path.patch
===================================================================
--- trunk/gta02-core/kicad-patches/eeschema-fix-relative-path.patch 2009-08-13 00:16:43 UTC (rev 5429)
+++ trunk/gta02-core/kicad-patches/eeschema-fix-relative-path.patch 2009-08-13 00:29:47 UTC (rev 5430)
@@ -1,121 +0,0 @@
-make command-line invocation with relative paths work
-
-When eeschema et al. are invoked with a file name, they change the current
-directory to where this file lives. However, this only works reliably if
-an absolute path is given.
-
-Relative paths may or may not work. The reason for this is that GetSettings
-always sets the current directory to the last recorded location, which in
-turn affects how the relative paths are interpreted.
-
-This patch suppresses directory changes in GetSettings if a file name is
-given on the command line.
-
-This patch is only lightly tested. Please let me know if this is going in
-the right direction.
-
-- Werner
-
----
-
-Index: kicad/common/edaappl.cpp
-===================================================================
---- kicad.orig/common/edaappl.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/common/edaappl.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -594,7 +594,7 @@
- *
- * @return none
- */
--void WinEDA_App::GetSettings()
-+void WinEDA_App::GetSettings( bool change_cwd )
- {
- wxASSERT( m_EDA_Config != NULL && m_EDA_CommonConfig != NULL );
-
-@@ -613,7 +613,8 @@
-
- m_EDA_Config->Read( wxT( "ShowPageLimits" ), &g_ShowPageLimits );
-
-- if( m_EDA_Config->Read( wxT( "WorkingDir" ), &Line ) && wxDirExists( Line ) )
-+ if( change_cwd && m_EDA_Config->Read( wxT( "WorkingDir" ), &Line ) &&
-+ wxDirExists( Line ) )
- {
- wxSetWorkingDirectory( Line );
- }
-Index: kicad/cvpcb/cvpcb.cpp
-===================================================================
---- kicad.orig/cvpcb/cvpcb.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/cvpcb/cvpcb.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -54,7 +54,7 @@
- return false;
- }
-
-- GetSettings(); // read current setup
-+ GetSettings( argc == 1); // read current setup
-
- wxSetWorkingDirectory( currCWD ); // mofifie par GetSetting
-
-Index: kicad/eeschema/eeschema.cpp
-===================================================================
---- kicad.orig/eeschema/eeschema.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/eeschema/eeschema.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -151,7 +151,7 @@
-
- /* init EESCHEMA */
- SeedLayers();
-- GetSettings();
-+ GetSettings( !fn.IsOk() );
- Read_Hotkey_Config( frame, false ); /* Must be called before creating
- * the main frame in order to
- * display the real hotkeys in menus
-Index: kicad/gerbview/gerbview.cpp
-===================================================================
---- kicad.orig/gerbview/gerbview.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/gerbview/gerbview.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -45,7 +45,7 @@
- ScreenPcb->m_CurrentSheetDesc = &g_Sheet_GERBER;
-
- ActiveScreen = ScreenPcb;
-- GetSettings();
-+ GetSettings( argc == 1);
- extern PARAM_CFG_BASE* ParamCfgList[];
- wxGetApp().ReadCurrentSetupValues( ParamCfgList );
-
-Index: kicad/include/appl_wxstruct.h
-===================================================================
---- kicad.orig/include/appl_wxstruct.h 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/include/appl_wxstruct.h 2009-07-01 23:14:44.000000000 -0300
-@@ -115,7 +115,7 @@
- void InitOnLineHelp();
-
- // Sauvegarde de configurations et options:
-- void GetSettings();
-+ void GetSettings( bool change_cwd );
- void SaveSettings();
-
- void WriteProjectConfig( const wxString& local_config_filename,
-Index: kicad/kicad/kicad.cpp
-===================================================================
---- kicad.orig/kicad/kicad.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/kicad/kicad.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -372,7 +372,7 @@
- InitEDA_Appl( wxT( "KiCad" ), APP_TYPE_KICAD );
-
- /* init kicad */
-- GetSettings(); // read current setup
-+ GetSettings( argc == 1 ); // read current setup
-
- /* Make nameless project translatable */
- wxFileName namelessProject( wxGetCwd(), _( "noname" ), ProjectFileExtension );
-Index: kicad/pcbnew/pcbnew.cpp
-===================================================================
---- kicad.orig/pcbnew/pcbnew.cpp 2009-07-01 23:14:33.000000000 -0300
-+++ kicad/pcbnew/pcbnew.cpp 2009-07-01 23:14:44.000000000 -0300
-@@ -83,7 +83,7 @@
- }
-
- ScreenPcb = new PCB_SCREEN();
-- GetSettings();
-+ GetSettings( argc == 1 );
-
- if( argc > 1 )
- {
Deleted: trunk/gta02-core/kicad-patches/gerbview-export-arcs.patch
===================================================================
--- trunk/gta02-core/kicad-patches/gerbview-export-arcs.patch 2009-08-13 00:16:43 UTC (rev 5429)
+++ trunk/gta02-core/kicad-patches/gerbview-export-arcs.patch 2009-08-13 00:29:47 UTC (rev 5430)
@@ -1,30 +0,0 @@
-Add support for exporting arcs in non-copper layers to gerbview.
-
-- Werner
-
----
-
-Index: kicad/gerbview/export_to_pcbnew.cpp
-===================================================================
---- kicad.orig/gerbview/export_to_pcbnew.cpp 2009-05-22 01:42:54.000000000 -0300
-+++ kicad/gerbview/export_to_pcbnew.cpp 2009-05-22 03:18:00.000000000 -0300
-@@ -165,6 +165,19 @@
- drawitem->m_End = track->m_End;
- drawitem->m_Width = track->m_Width;
-
-+ if( track->m_Shape == S_ARC )
-+ {
-+ double cx = track->m_Param;
-+ double cy = track->GetSubNet();
-+ double a = atan2( track->m_Start.y-cy, track->m_Start.x-cx );
-+ double b = atan2( track->m_End.y-cy, track->m_End.x-cx );
-+
-+ drawitem->m_Shape = S_ARC;
-+ drawitem->m_Angle = fmod( (a-b)/M_PI*1800.0+3600.0, 3600.0 );
-+ drawitem->m_Start.x = cx;
-+ drawitem->m_Start.y = cy;
-+ }
-+
- pcb->Add( drawitem );
- }
- else
Deleted: trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch
===================================================================
--- trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch 2009-08-13 00:16:43 UTC (rev 5429)
+++ trunk/gta02-core/kicad-patches/make-junctions-larger-in-plots.patch 2009-08-13 00:29:47 UTC (rev 5430)
@@ -1,21 +0,0 @@
-plotter->circle expects the diameter, but DRAWJUNCTION_SIZE is just the
-radius. This fix is originally by Alvaro Lopes <alvieboy at alvie.com>
-For SVN revsion 1853.
-
-- 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:
Deleted: trunk/gta02-core/kicad-patches/make-junctions-larger-on-plotps.patch
===================================================================
--- trunk/gta02-core/kicad-patches/make-junctions-larger-on-plotps.patch 2009-08-13 00:16:43 UTC (rev 5429)
+++ trunk/gta02-core/kicad-patches/make-junctions-larger-on-plotps.patch 2009-08-13 00:29:47 UTC (rev 5430)
@@ -1,17 +0,0 @@
-Enlarge junction circles in Postscript "Plot" of schematics.
-
-From: Alvaro Lopes <alvieboy at alvie.com>
-
----
-
---- kicad.orig/eeschema/plotps.cpp.orig 2009-06-18 09:04:51.779811920 +0100
-+++ kicad/eeschema/plotps.cpp 2009-06-18 09:05:24.726650982 +0100
-@@ -515,7 +515,7 @@
- #define STRUCT ( (DrawJunctionStruct*) DrawList )
- if( g_PlotPSColorOpt )
- SetColorMapPS( ReturnLayerColor( STRUCT->GetLayer() ) );
-- PlotCercle( STRUCT->m_Pos, DRAWJUNCTION_SIZE, 1 );
-+ PlotCercle( STRUCT->m_Pos, DRAWJUNCTION_SIZE*2, 1 );
- break;
-
- case TYPE_SCH_TEXT:
Modified: trunk/gta02-core/kicad-patches/series
===================================================================
--- trunk/gta02-core/kicad-patches/series 2009-08-13 00:16:43 UTC (rev 5429)
+++ trunk/gta02-core/kicad-patches/series 2009-08-13 00:29:47 UTC (rev 5430)
@@ -1,26 +1,15 @@
# Based on SVN revision 1857
-# tentative fix for making command-line invocation with relative paths work
-# functionality has been added into 1857
-#eeschema-fix-relative-path.patch
-
# eeschema --plot extension, pending
eeschema-plot-only-mode.patch
# under discussion
fix-pinedit-collision.patch
-# accepted as of r1783
-##gerbview-export-arcs.patch
-
# Work in progress
#drag-override.patch
#pcbnew-plot-only-mode.patch
-# accepted as of r1854
-#make-junctions-larger-in-plots.patch
-#make-junctions-larger-on-plotps.patch
-
# ERC pin exceptions
streamline-erc.patch
erc-exceptions.patch
More information about the commitlog
mailing list
