From cee9ab761079fff063e1300ffcd9c9f67ca45df6 Mon Sep 17 00:00:00 2001
From: jerryjacobs <Unknown>
Date: Sat, 9 Jan 2010 17:54:39 +0000
Subject: [PATCH] Applied Torsten PCBNew DRC patch and testcase, update email,
 update scripts

---
 AUTHORS.txt                                 |   4 +-
 common/about_kicad.cpp                      |   6 +-
 pcbnew/drc.cpp                              |   8 +-
 scripts/kicad-devel                         |   2 +-
 scripts/kicad-get-rss                       |   5 +-
 share/test-cases/pcbnew/pcbnew-drc-test.brd | 228 ++++++++++++++++++++
 6 files changed, 241 insertions(+), 12 deletions(-)
 create mode 100644 share/test-cases/pcbnew/pcbnew-drc-test.brd

diff --git a/AUTHORS.txt b/AUTHORS.txt
index b0850a3cc6..3f23a1444e 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -13,7 +13,7 @@ Saint Martin d'H
 
 == Contributors
 Dick Hollenbeck <dick@softplc.com>
-Jerry Jacobs <jerkejacobs@gmail.com>
+Jerry Jacobs <xor.gate.engineering@gmail.com>
 Jonas Diemer <diemer@gmx.de>
 KBool Library http://boolean.klaasholwerda.nl/bool.html
 Rok Markovic <rok@kanardia.eu>
@@ -29,7 +29,7 @@ Igor Plyatov <plyatov@gmail.com>
 
 == Translators
 Czech (CZ) Martin Kratoška <martin@ok1rr.com>
-Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>
+Dutch (NL) Jerry Jacobs <xor.gate.engineering@gmail.com>
 French (FR) Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 Polish (PL) Mateusz Skowro¿ski <skowri@gmail.com>
 Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>"
diff --git a/common/about_kicad.cpp b/common/about_kicad.cpp
index 4b1e46fca4..7be3aea541 100644
--- a/common/about_kicad.cpp
+++ b/common/about_kicad.cpp
@@ -97,7 +97,7 @@ void InitKiCadAbout( wxAboutDialogInfo& info )
     info.SetDescription( description );
 
     /* Set copyright dialog */
-    info.SetCopyright( _T( "(C) 1992-2009 KiCad Developers Team" ) );
+    info.SetCopyright( _T( "(C) 1992-2010 KiCad Developers Team" ) );
 
     /* Set license dialog */
     info.SetLicence( wxString::FromAscii
@@ -110,7 +110,7 @@ void InitKiCadAbout( wxAboutDialogInfo& info )
     info.AddDeveloper( wxT( "Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>" ) );
     info.AddDeveloper( SetMsg( wxT( "Dick Hollenbeck <dick@softplc.com>" ) ) );
     info.AddDeveloper( SetMsg( wxT( "Hauptmech <hauptmech@gmail.com>") ) );
-    info.AddDeveloper( SetMsg( wxT( "Jerry Jacobs <jerkejacobs@gmail.com>" ) ) );
+    info.AddDeveloper( SetMsg( wxT( "Jerry Jacobs <xor.gate.engineering@gmail.com>" ) ) );
     info.AddDeveloper( SetMsg( wxT( "Jonas Diemer <diemer@gmx.de>" ) ) );
     info.AddDeveloper( SetMsg( wxT( "KBool Library <http://boolean.klaasholwerda.nl/bool.html>" ) ) );
     info.AddDeveloper( SetMsg( wxT( "Lorenzo <lomarcan@tin.it>" ) ) );
@@ -126,7 +126,7 @@ void InitKiCadAbout( wxAboutDialogInfo& info )
 
     /* Add translators */
     info.AddTranslator( wxT( "Czech (CZ) Martin Kratoška <martin@ok1rr.com>" ) );
-    info.AddTranslator( SetMsg( wxT( "Dutch (NL) Jerry Jacobs <jerkejacobs@gmail.com>" ) ) );
+    info.AddTranslator( SetMsg( wxT( "Dutch (NL) Jerry Jacobs <xor.gate.engineering@gmail.com>" ) ) );
     info.AddTranslator( SetMsg( wxT( "French (FR) Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>" ) ) );
     info.AddTranslator( SetMsg( wxT( "Polish (PL) Mateusz Skowroński <skowri@gmail.com>" ) ) );
     info.AddTranslator( SetMsg( wxT( "Portuguese (PT) Renie Marquet <reniemarquet@uol.com.br>" ) ) );
diff --git a/pcbnew/drc.cpp b/pcbnew/drc.cpp
index 1d917a370e..6f85951fd3 100644
--- a/pcbnew/drc.cpp
+++ b/pcbnew/drc.cpp
@@ -1402,11 +1402,11 @@ bool DRC::checkClearancePadToPad( D_PAD* aRefPad, D_PAD* aPad )
 
         RotatePoint( &sx, &sy, m_segmAngle );       // True start point coordinate of the equivalent segment
 
-        m_spotcx = rel_pos.x + sx;
-        m_spotcy = rel_pos.y + sy;               // pad position / segment origin
+        m_spotcx = rel_pos.x - sx;
+        m_spotcy = rel_pos.y - sy;               // pad position / segment origin
 
-        m_finx = -sx;
-        m_finy = -sy;                             // end of segment coordinate
+        m_finx = - 2 * sx;
+        m_finy = - 2 * sy;                             // end of segment coordinate
         diag = checkClearanceSegmToPad( aPad, segm_width / 2, dist_min );
         break;
     }
diff --git a/scripts/kicad-devel b/scripts/kicad-devel
index de065cdd0d..a33aa154da 100755
--- a/scripts/kicad-devel
+++ b/scripts/kicad-devel
@@ -44,7 +44,7 @@ my $no_options                = 0; # No options given
 # Commands
 ###
 my $command_silent     = '&> /dev/null';          # Nullify stderr and stdout from commands
-my $command_cmake      = "cmake -DCMAKE_BUILD_TYPE=Debug -DwxWidgets_USE_DEBUG=ON $svn_path_local"; # Where cmake looks for CMakeLists.txt
+my $command_cmake      = "cmake -DCMAKE_BUILD_TYPE=Debug -DwxWidgets_USE_DEBUG=ON -DKICAD_AUIMANAGER=ON -DKICAD_AUITOOLBAR=ON $svn_path_local"; # Where cmake looks for CMakeLists.txt
 my $command_svn_update = 'svn update';            # Subversion update command
 
 ###
diff --git a/scripts/kicad-get-rss b/scripts/kicad-get-rss
index 8a24a1479b..58f4144886 100755
--- a/scripts/kicad-get-rss
+++ b/scripts/kicad-get-rss
@@ -57,8 +57,9 @@ while read LINE
 do
 	curl -s "$LINE" | \
 	grep vc_log  | \
-	sed -e 's/<td><pre class=\"vc_log\">//' |\
-	sed -e 's/<\/pre><\/td>//'
+	sed -e 's/<td><pre class=\"vc_log\">//' | \
+	sed -e 's/<\/pre><\/td>//' | \
+	sed -e '/<style/d'
 done
 
 rm /tmp/kicad-svn-*
diff --git a/share/test-cases/pcbnew/pcbnew-drc-test.brd b/share/test-cases/pcbnew/pcbnew-drc-test.brd
new file mode 100644
index 0000000000..8bd30d5002
--- /dev/null
+++ b/share/test-cases/pcbnew/pcbnew-drc-test.brd
@@ -0,0 +1,228 @@
+PCBNEW-BOARD Version 1 date Sat 09 Jan 2010 15:29:16 CET
+
+# Created by Pcbnew(20100109 SVN-R2201)-unstable
+
+$GENERAL
+LayerCount 2
+Ly 1FFF8001
+EnabledLayers 1FFF8001
+VisibleLayers 1FFF8001
+VisibleElements 00000FFF
+Links 0
+NoConn 0
+Di 11772 5924 32076 15517
+Ndraw 11
+Ntrack 0
+Nzone 0
+LayerThickness 630
+Nmodule 2
+Nnets 1
+$EndGENERAL
+
+$SHEETDESCR
+Sheet A4 11700 8267
+Title ""
+Date "9 jan 2010"
+Rev ""
+Comp ""
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndSHEETDESCR
+
+$SETUP
+InternalUnit 0.000100 INCH
+ZoneGridSize 250
+Layers 2
+Layer[0] Back signal
+Layer[15] Front signal
+TrackWidth 59
+TrackClearence 59
+ZoneClearence 200
+TrackMinWidth 59
+DrawSegmWidth 79
+EdgeSegmWidth 150
+ViaSize 236
+ViaDrill 118
+ViaMinSize 236
+ViaMinDrill 118
+MicroViaSize 118
+MicroViaDrill 59
+MicroViasAllowed 0
+MicroViaMinSize 118
+MicroViaMinDrill 59
+TextPcbWidth 120
+TextPcbSize 600 800
+EdgeModWidth 150
+TextModSize 600 600
+TextModWidth 120
+PadSize 591 118
+PadDrill 0
+Pad2MaskClearance 39
+AuxiliaryAxisOrg 0 0
+$EndSETUP
+
+$EQUIPOT
+Na 0 ""
+St ~
+$EndEQUIPOT
+$NCLASS
+Name "Default"
+Desc "Dies ist die voreingestellte Netzklasse."
+Clearance 59
+TrackWidth 59
+ViaDia 236
+ViaDrill 118
+uViaDia 118
+uViaDrill 59
+AddNet ""
+$EndNCLASS
+$MODULE OvalPads
+Po 13267 14243 0 15 4B40B409 4B408F2F ~~
+Li OvalPads
+Sc 4B408F2F
+AR 
+Op 0 0 0
+T0 3886 -4 600 600 0 120 N V 21 N"RectPads"
+T1 7350 -24 600 600 0 120 N V 21 N"VAL**"
+$PAD
+Sh "1" R 591 591 0 0 0
+Dr 236 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po -591 0
+$EndPAD
+$PAD
+Sh "2" R 591 591 0 0 0
+Dr 236 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 197 0
+$EndPAD
+$PAD
+Sh "3" R 591 591 0 0 0
+Dr 236 0 0
+At STD N 00E0FFFF
+Ne 0 ""
+Po 984 0
+$EndPAD
+$EndMODULE  OvalPads
+$MODULE OvalPads
+Po 13359 15017 0 15 4B4892B7 4B408EC9 ~~
+Li OvalPads
+Sc 4B408EC9
+AR 
+Op 0 0 0
+T0 3727 53 600 600 0 120 N V 21 N"OvalPads"
+T1 7231 53 600 600 0 120 N V 21 N"VAL**"
+$PAD
+Sh "1" O 118 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -700 -1400
+$EndPAD
+$PAD
+Sh "2" O 591 118 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -1292 -686
+$EndPAD
+$PAD
+Sh "3" O 118 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 263 -1769
+$EndPAD
+$PAD
+Sh "4" O 118 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 1405 -1237
+$EndPAD
+$PAD
+Sh "5" O 118 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po 1287 -529
+$EndPAD
+$PAD
+Sh "6" O 118 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -485 -37
+$EndPAD
+$PAD
+Sh "7" O 118 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -268 -37
+$EndPAD
+$PAD
+Sh "8" O 118 591 0 0 0
+Dr 0 0 0
+At SMD N 00888000
+Ne 0 ""
+Po -52 -37
+$EndPAD
+$EndMODULE  OvalPads
+$DRAWSEGMENT
+Po 3 14527 14488 14882 14528 79
+De 25 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 3 12263 14311 12657 14370 79
+De 25 0 900 0 0
+$EndDRAWSEGMENT
+$TEXTPCB
+Te "Pad-Pad"
+nl "Rect-Oval"
+Po 8307 13740 600 800 120 0
+De 24 1 0 Normal
+$EndTEXTPCB
+$DRAWSEGMENT
+Po 3 12657 13878 13031 13917 79
+De 25 0 900 0 0
+$EndDRAWSEGMENT
+$TEXTPCB
+Te "Marker for DRC violations"
+Po 19500 11000 600 800 120 0
+De 24 1 0 Normal
+$EndTEXTPCB
+$DRAWSEGMENT
+Po 3 12500 11000 13000 11000 150
+De 25 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 12000 9000 12000 6000 150
+De 24 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 32000 9000 12000 9000 150
+De 24 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 32000 6000 32000 9000 150
+De 24 0 900 0 0
+$EndDRAWSEGMENT
+$DRAWSEGMENT
+Po 0 12000 6000 32000 6000 150
+De 24 0 900 0 0
+$EndDRAWSEGMENT
+$TEXTPCB
+Te "DRC Test Cases"
+Po 22000 7500 1575 1575 315 0
+De 24 1 0 Italic
+$EndTEXTPCB
+$TRACK
+$EndTRACK
+$ZONE
+$EndZONE
+$EndBOARD