Menu
▾
▴
pcb-src-changes — CVS commit mail for the 'pcb' module
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(4) |
Mar
(5) |
Apr
|
May
(5) |
Jun
(30) |
Jul
(2) |
Aug
(18) |
Sep
(14) |
Oct
(7) |
Nov
(21) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(63) |
Feb
(94) |
Mar
(54) |
Apr
(39) |
May
(34) |
Jun
(25) |
Jul
(10) |
Aug
(33) |
Sep
(16) |
Oct
(62) |
Nov
(12) |
Dec
(2) |
| 2005 |
Jan
(71) |
Feb
(8) |
Mar
(50) |
Apr
|
May
(2) |
Jun
(12) |
Jul
(19) |
Aug
(8) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
(8) |
| 2006 |
Jan
(10) |
Feb
(1) |
Mar
(301) |
Apr
(232) |
May
(26) |
Jun
(20) |
Jul
(26) |
Aug
(79) |
Sep
(92) |
Oct
(174) |
Nov
(17) |
Dec
(93) |
| 2007 |
Jan
(27) |
Feb
(179) |
Mar
(37) |
Apr
(81) |
May
(20) |
Jun
(5) |
Jul
|
Aug
(40) |
Sep
(68) |
Oct
(8) |
Nov
(47) |
Dec
(34) |
| 2008 |
Jan
(154) |
Feb
(15) |
Mar
(5) |
Apr
(21) |
May
(4) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(8) |
Oct
(9) |
Nov
(35) |
Dec
(50) |
| 2009 |
Jan
(8) |
Feb
(10) |
Mar
(6) |
Apr
(9) |
May
(7) |
Jun
(40) |
Jul
(7) |
Aug
(5) |
Sep
(2) |
Oct
(16) |
Nov
(42) |
Dec
(5) |
| 2010 |
Jan
(3) |
Feb
(15) |
Mar
(32) |
Apr
(18) |
May
(6) |
Jun
(9) |
Jul
|
Aug
(11) |
Sep
(16) |
Oct
|
Nov
(4) |
Dec
(35) |
| 2011 |
Jan
(24) |
Feb
(6) |
Mar
(27) |
Apr
(119) |
May
(72) |
Jun
(20) |
Jul
(31) |
Aug
(88) |
Sep
(86) |
Oct
(14) |
Nov
(11) |
Dec
(30) |
| 2012 |
Jan
(4) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gi...@gp...> - 2011-04-25 14:57:54
|
The branch, master has been updated
via a3d422a89dd7aa2f6298cc8c284896284a029838 (commit)
via bc21793c7a97ae345caabd95b15d1d372c9ba31e (commit)
via 790d9c935dc613c131dfd8dccc2450ab0956c27c (commit)
via 600e547d7542ce790c7cafd643eed3cd80146d72 (commit)
via 05dd97fdce05c6b7aeebe64cdcc8efaa220db71e (commit)
from 492990353cd3e53cdc77d5d72e25e6504a53ada5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/action.c | 39 ++++++++++++++-------------------------
src/autoplace.c | 2 +-
src/autoroute.c | 2 +-
src/draw.c | 41 +++--------------------------------------
src/draw.h | 4 +---
src/find.c | 2 +-
src/set.c | 2 +-
src/toporouter.c | 2 +-
src/vendor.c | 2 +-
9 files changed, 24 insertions(+), 72 deletions(-)
=================
Commit Messages
=================
commit a3d422a89dd7aa2f6298cc8c284896284a029838
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Remove API ClearAndRedrawOutput(), in favour of Redraw().
These do the same thing anyway.
:100644 100644 ed4ca24... 5dc544e... M src/action.c
:100644 100644 e1461c6... b9db528... M src/autoplace.c
:100644 100644 cecf9c0... 40b3cda... M src/autoroute.c
:100644 100644 7619d25... 8b73644... M src/draw.c
:100644 100644 d62ed7d... adfee36... M src/draw.h
:100644 100644 7620d85... 47bd68c... M src/find.c
:100644 100644 4d56243... 3590472... M src/toporouter.c
:100644 100644 5b7f5eb... 754f7d1... M src/vendor.c
commit bc21793c7a97ae345caabd95b15d1d372c9ba31e
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Remove UpdateAll() API, in favour of Redraw(), which is identical
:100644 100644 78df9fe... ed4ca24... M src/action.c
:100644 100644 10da1dd... 7619d25... M src/draw.c
:100644 100644 c60b6d9... d62ed7d... M src/draw.h
:100644 100644 17f7583... 90db719... M src/set.c
commit 790d9c935dc613c131dfd8dccc2450ab0956c27c
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Expose local Redraw() function, and remove wrapper RedrawOutput()
Within the one caller ActionDisplay, combine the F_ClearAndRedraw and
F_Redraw cases which have exactly the same effect.
:100644 100644 9bad677... 78df9fe... M src/action.c
:100644 100644 39605ca... 10da1dd... M src/draw.c
:100644 100644 fdd4c70... c60b6d9... M src/draw.h
commit 600e547d7542ce790c7cafd643eed3cd80146d72
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Drop unused area parameters from Redraw(...)
:100644 100644 1415b2e... 39605ca... M src/draw.c
commit 05dd97fdce05c6b7aeebe64cdcc8efaa220db71e
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Only set Gathering during hid_expose_callback()
Removes setting of Gathering to false prior to calling UpdateAll()
in ClearAndRedrawOutput(), and removes setting of Gathering to
true after calling gui->invalidate_all() in Redraw()
:100644 100644 c82f25a... 1415b2e... M src/draw.c
=========
Changes
=========
commit a3d422a89dd7aa2f6298cc8c284896284a029838
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Remove API ClearAndRedrawOutput(), in favour of Redraw().
These do the same thing anyway.
diff --git a/src/action.c b/src/action.c
index ed4ca24..5dc544e 100644
--- a/src/action.c
+++ b/src/action.c
@@ -2496,7 +2496,7 @@ ActionDisperseElements (int argc, char **argv, int x, int y)
/* done with our action so increment the undo # */
IncrementUndoSerialNumber ();
- ClearAndRedrawOutput ();
+ Redraw ();
SetChangedFlag (true);
return 0;
@@ -2769,12 +2769,12 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
case F_ToggleThindraw:
TOGGLE_FLAG (THINDRAWFLAG, PCB);
- ClearAndRedrawOutput ();
+ Redraw ();
break;
case F_ToggleThindrawPoly:
TOGGLE_FLAG (THINDRAWPOLYFLAG, PCB);
- ClearAndRedrawOutput ();
+ Redraw ();
break;
case F_ToggleLockNames:
@@ -2789,7 +2789,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
case F_ToggleHideNames:
TOGGLE_FLAG (HIDENAMESFLAG, PCB);
- ClearAndRedrawOutput ();
+ Redraw ();
break;
case F_ToggleShowDRC:
@@ -2820,7 +2820,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
case F_ToggleCheckPlanes:
TOGGLE_FLAG (CHECKPLANESFLAG, PCB);
- ClearAndRedrawOutput ();
+ Redraw ();
break;
case F_ToggleOrthoMove:
@@ -5944,7 +5944,7 @@ ActionNew (int argc, char **argv, int x, int y)
CreateDefaultFont ();
SetCrosshairRange (0, 0, PCB->MaxWidth, PCB->MaxHeight);
CenterDisplay (PCB->MaxWidth / 2, PCB->MaxHeight / 2, false);
- ClearAndRedrawOutput ();
+ Redraw ();
hid_action ("PCBChanged");
RestoreCrosshair ();
@@ -6643,7 +6643,7 @@ ActionSetSame (int argc, char **argv, int x, int y)
if (layer != CURRENT)
{
ChangeGroupVisibility (GetLayerNumber (PCB->Data, layer), true, true);
- ClearAndRedrawOutput ();
+ Redraw ();
}
return 0;
}
diff --git a/src/autoplace.c b/src/autoplace.c
index e1461c6..b9db528 100644
--- a/src/autoplace.c
+++ b/src/autoplace.c
@@ -856,7 +856,7 @@ done:
{
DeleteRats (false);
AddAllRats (false, NULL);
- ClearAndRedrawOutput ();
+ Redraw ();
}
FreePointerListMemory (&Selected);
return (changed);
diff --git a/src/autoroute.c b/src/autoroute.c
index cecf9c0..40b3cda 100644
--- a/src/autoroute.c
+++ b/src/autoroute.c
@@ -5314,7 +5314,7 @@ donerouting:
IncrementUndoSerialNumber ();
- ClearAndRedrawOutput ();
+ Redraw ();
}
RestoreFindFlag ();
#if defined (ROUTE_DEBUG)
diff --git a/src/draw.c b/src/draw.c
index 7619d25..8b73644 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -186,18 +186,6 @@ Draw (void)
Block.X2 = Block.Y2 = -MAXINT;
}
-/* ---------------------------------------------------------------------------
- * redraws the output area after clearing it
- */
-void
-ClearAndRedrawOutput (void)
-{
- Redraw ();
-}
-
-
-
-
/* ----------------------------------------------------------------------
* redraws all the data by the event handlers
*/
diff --git a/src/draw.h b/src/draw.h
index d62ed7d..adfee36 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -37,7 +37,6 @@
void Draw (void);
void Redraw (void);
-void ClearAndRedrawOutput (void);
void DrawVia (PinTypePtr);
void DrawRat (RatTypePtr);
void DrawViaName (PinTypePtr);
diff --git a/src/find.c b/src/find.c
index 7620d85..47bd68c 100644
--- a/src/find.c
+++ b/src/find.c
@@ -3258,7 +3258,7 @@ LookupConnectionsToAllElements (FILE * FP)
gui->beep ();
ResetConnections (false);
FreeConnectionLookupMemory ();
- ClearAndRedrawOutput ();
+ Redraw ();
}
/*---------------------------------------------------------------------------
diff --git a/src/toporouter.c b/src/toporouter.c
index 4d56243..3590472 100644
--- a/src/toporouter.c
+++ b/src/toporouter.c
@@ -7965,7 +7965,7 @@ toporouter (int argc, char **argv, int x, int y)
AddAllRats (false, NULL);
RestoreUndoSerialNumber ();
IncrementUndoSerialNumber ();
- ClearAndRedrawOutput ();
+ Redraw ();
return 0;
}
diff --git a/src/vendor.c b/src/vendor.c
index 5b7f5eb..754f7d1 100644
--- a/src/vendor.c
+++ b/src/vendor.c
@@ -610,7 +610,7 @@ apply_vendor_map (void)
if (changed)
{
SetChangedFlag (true);
- ClearAndRedrawOutput ();
+ Redraw ();
IncrementUndoSerialNumber ();
}
}
commit bc21793c7a97ae345caabd95b15d1d372c9ba31e
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Remove UpdateAll() API, in favour of Redraw(), which is identical
diff --git a/src/action.c b/src/action.c
index 78df9fe..ed4ca24 100644
--- a/src/action.c
+++ b/src/action.c
@@ -2829,12 +2829,12 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
case F_ToggleName:
TOGGLE_FLAG (SHOWNUMBERFLAG, PCB);
- UpdateAll ();
+ Redraw ();
break;
case F_ToggleMask:
TOGGLE_FLAG (SHOWMASKFLAG, PCB);
- UpdateAll ();
+ Redraw ();
break;
case F_ToggleClearLine:
@@ -2861,7 +2861,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
/* toggle displaying of the grid */
case F_Grid:
Settings.DrawGrid = !Settings.DrawGrid;
- UpdateAll ();
+ Redraw ();
break;
/* display the pinout of an element */
@@ -2970,7 +2970,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
PCB->GridOffsetX = atoi (argv[1]);
PCB->GridOffsetY = atoi (argv[2]);
if (Settings.DrawGrid)
- UpdateAll ();
+ Redraw ();
}
break;
diff --git a/src/draw.c b/src/draw.c
index 10da1dd..7619d25 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -165,15 +165,6 @@ AddPart (void *b)
}
/*
- * force the whole output to be updated
- */
-void
-UpdateAll (void)
-{
- gui->invalidate_all ();
-}
-
-/*
* initiate the actual drawing to the pixmap/screen
* make the update block slightly larger to handle round-off
* caused by the TO_SCREEN operation
@@ -201,7 +192,7 @@ Draw (void)
void
ClearAndRedrawOutput (void)
{
- UpdateAll ();
+ Redraw ();
}
diff --git a/src/draw.h b/src/draw.h
index c60b6d9..d62ed7d 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -72,7 +72,6 @@ void EraseElementPinsAndPads (ElementTypePtr);
void EraseElementName (ElementTypePtr);
void EraseObject (int, void *, void *);
void LoadBackgroundImage (char *);
-void UpdateAll (void);
/*GdkDrawable *draw_get_current_drawable(void);*/
diff --git a/src/set.c b/src/set.c
index 17f7583..90db719 100644
--- a/src/set.c
+++ b/src/set.c
@@ -82,7 +82,7 @@ SetGrid (double Grid, bool align)
}
PCB->Grid = Grid;
if (Settings.DrawGrid)
- UpdateAll ();
+ Redraw ();
}
}
commit 790d9c935dc613c131dfd8dccc2450ab0956c27c
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Expose local Redraw() function, and remove wrapper RedrawOutput()
Within the one caller ActionDisplay, combine the F_ClearAndRedraw and
F_Redraw cases which have exactly the same effect.
diff --git a/src/action.c b/src/action.c
index 9bad677..78df9fe 100644
--- a/src/action.c
+++ b/src/action.c
@@ -2678,22 +2678,11 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
switch (id = GetFunctionID (function))
{
- /* redraw layout with clearing the background */
+ /* redraw layout */
case F_ClearAndRedraw:
- gui->invalidate_all();
- break;
-
- /* redraw layout without clearing the background */
case F_Redraw:
- {
- BoxType area;
- area.X1 = 0;
- area.Y1 = 0;
- area.X2 = Output.Width;
- area.Y2 = Output.Height;
- RedrawOutput (&area);
- break;
- }
+ Redraw ();
+ break;
/* change the displayed name of elements */
case F_Value:
diff --git a/src/draw.c b/src/draw.c
index 39605ca..10da1dd 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -80,7 +80,6 @@ static const BoxType *clip_box = NULL;
/* ---------------------------------------------------------------------------
* some local prototypes
*/
-static void Redraw (void);
static void DrawEverything (BoxTypePtr);
static void DrawPPV (int group, const BoxType *);
static int DrawLayerGroup (int, const BoxType *);
@@ -197,15 +196,6 @@ Draw (void)
}
/* ---------------------------------------------------------------------------
- * redraws the output area without clearing it
- */
-void
-RedrawOutput (BoxTypePtr area)
-{
- Redraw ();
-}
-
-/* ---------------------------------------------------------------------------
* redraws the output area after clearing it
*/
void
@@ -220,7 +210,7 @@ ClearAndRedrawOutput (void)
/* ----------------------------------------------------------------------
* redraws all the data by the event handlers
*/
-static void
+void
Redraw (void)
{
gui->invalidate_all ();
diff --git a/src/draw.h b/src/draw.h
index fdd4c70..c60b6d9 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -36,7 +36,7 @@
/*bool SwitchDrawingWindow(double, GdkDrawable *, gboolean, gboolean);*/
void Draw (void);
-void RedrawOutput (BoxTypePtr area);
+void Redraw (void);
void ClearAndRedrawOutput (void);
void DrawVia (PinTypePtr);
void DrawRat (RatTypePtr);
commit 600e547d7542ce790c7cafd643eed3cd80146d72
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Drop unused area parameters from Redraw(...)
diff --git a/src/draw.c b/src/draw.c
index 1415b2e..39605ca 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -80,7 +80,7 @@ static const BoxType *clip_box = NULL;
/* ---------------------------------------------------------------------------
* some local prototypes
*/
-static void Redraw (bool, BoxTypePtr);
+static void Redraw (void);
static void DrawEverything (BoxTypePtr);
static void DrawPPV (int group, const BoxType *);
static int DrawLayerGroup (int, const BoxType *);
@@ -202,7 +202,7 @@ Draw (void)
void
RedrawOutput (BoxTypePtr area)
{
- Redraw (true, area);
+ Redraw ();
}
/* ---------------------------------------------------------------------------
@@ -218,12 +218,10 @@ ClearAndRedrawOutput (void)
/* ----------------------------------------------------------------------
- * redraws all the data
- * all necessary sizes are already set by the porthole widget and
- * by the event handlers
+ * redraws all the data by the event handlers
*/
static void
-Redraw (bool ClearWindow, BoxTypePtr screen_area)
+Redraw (void)
{
gui->invalidate_all ();
}
commit 05dd97fdce05c6b7aeebe64cdcc8efaa220db71e
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Only set Gathering during hid_expose_callback()
Removes setting of Gathering to false prior to calling UpdateAll()
in ClearAndRedrawOutput(), and removes setting of Gathering to
true after calling gui->invalidate_all() in Redraw()
diff --git a/src/draw.c b/src/draw.c
index c82f25a..1415b2e 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -211,7 +211,6 @@ RedrawOutput (BoxTypePtr area)
void
ClearAndRedrawOutput (void)
{
- Gathering = false;
UpdateAll ();
}
@@ -227,7 +226,6 @@ static void
Redraw (bool ClearWindow, BoxTypePtr screen_area)
{
gui->invalidate_all ();
- Gathering = true;
}
static int
|
|
From: <gi...@gp...> - 2011-04-25 13:07:01
|
The branch, master has been updated
discards c6c5857316967bdc495f5b9cfea0f4ac1b953b5b (commit)
via 492990353cd3e53cdc77d5d72e25e6504a53ada5 (commit)
from c6c5857316967bdc495f5b9cfea0f4ac1b953b5b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
tests/golden/hid_png1/gerber_oneline.png | Bin 218 -> 218 bytes
tests/golden/hid_png2/myfile.png | Bin 218 -> 218 bytes
tests/golden/hid_png3/gerber_oneline.png | Bin 844 -> 844 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
=================
Commit Messages
=================
commit 492990353cd3e53cdc77d5d72e25e6504a53ada5
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Regenerate test golden files for the png output hid
The colour drawn for vias changed due to the fix in
commit c095adf5ea890284cddc2730944b980ac1275109
(Build was broken due to the above commit until
commit c9b915d7f2f49f5ebde0abeb5756b1e11e756edc)
:100644 100644 be346ad... 6f30ea9... M tests/golden/hid_png1/gerber_oneline.png
:100644 100644 be346ad... 6f30ea9... M tests/golden/hid_png2/myfile.png
:100644 100644 3b30ed3... e863afb... M tests/golden/hid_png3/gerber_oneline.png
=========
Changes
=========
commit 492990353cd3e53cdc77d5d72e25e6504a53ada5
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Regenerate test golden files for the png output hid
The colour drawn for vias changed due to the fix in
commit c095adf5ea890284cddc2730944b980ac1275109
(Build was broken due to the above commit until
commit c9b915d7f2f49f5ebde0abeb5756b1e11e756edc)
diff --git a/tests/golden/hid_png1/gerber_oneline.png b/tests/golden/hid_png1/gerber_oneline.png
index be346ad..6f30ea9 100644
Binary files a/tests/golden/hid_png1/gerber_oneline.png and b/tests/golden/hid_png1/gerber_oneline.png differ
diff --git a/tests/golden/hid_png2/myfile.png b/tests/golden/hid_png2/myfile.png
index be346ad..6f30ea9 100644
Binary files a/tests/golden/hid_png2/myfile.png and b/tests/golden/hid_png2/myfile.png differ
diff --git a/tests/golden/hid_png3/gerber_oneline.png b/tests/golden/hid_png3/gerber_oneline.png
index 3b30ed3..e863afb 100644
Binary files a/tests/golden/hid_png3/gerber_oneline.png and b/tests/golden/hid_png3/gerber_oneline.png differ
|
|
From: <gi...@gp...> - 2011-04-25 13:06:22
|
The branch, master has been updated
via c6c5857316967bdc495f5b9cfea0f4ac1b953b5b (commit)
from 7239008494744b4834cd9dc41e3866949c3220e5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
=================
Commit Messages
=================
=========
Changes
=========
|
|
From: <gi...@gp...> - 2011-04-24 17:53:10
|
The branch, master has been updated
via 7239008494744b4834cd9dc41e3866949c3220e5 (commit)
from 2e29fd0c82c5ac586399446318f26efd33257645 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit 7239008494744b4834cd9dc41e3866949c3220e5
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Use the ON_SIDE() macro rather then open-code the test
:100644 100644 cb1b790... c82f25a... M src/draw.c
=========
Changes
=========
commit 7239008494744b4834cd9dc41e3866949c3220e5
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Use the ON_SIDE() macro rather then open-code the test
diff --git a/src/draw.c b/src/draw.c
index cb1b790..c82f25a 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -512,7 +512,7 @@ pad_callback (const BoxType * b, void *cl)
PadTypePtr pad = (PadTypePtr) b;
int *side = cl;
- if (TEST_FLAG (ONSOLDERFLAG, pad) == (*side == SOLDER_LAYER))
+ if (ON_SIDE (pad, *side))
DrawPad (pad);
return 1;
}
|
|
From: <gi...@gp...> - 2011-04-24 16:59:34
|
The branch, master has been updated
via 2e29fd0c82c5ac586399446318f26efd33257645 (commit)
via 85feb2ce0539bc462719d6efcdf28184dff9f61a (commit)
via 4f70768a4548612aad5a1a491889b32389f359c1 (commit)
from 2744a86d9d5dd34ab256b991c21ddd022e886dd0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 72 +++++++++++++++++++++++++---------------------------------
src/macro.h | 7 +++++
src/misc.c | 16 +++++++++++++
src/misc.h | 1 +
4 files changed, 55 insertions(+), 41 deletions(-)
=================
Commit Messages
=================
commit 2e29fd0c82c5ac586399446318f26efd33257645
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Add a DrawPaste() helper function for paste layers
:100644 100644 f12020d... cb1b790... M src/draw.c
commit 85feb2ce0539bc462719d6efcdf28184dff9f61a
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
misc.c: Add query function IsPasteEmpty() to query a paste layer is empty
:100644 100644 02a883f... d63aef1... M src/misc.c
:100644 100644 b46cad4... cd7eb3d... M src/misc.h
commit 4f70768a4548612aad5a1a491889b32389f359c1
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Make the ON_SIDE() macro global, not local do draw.c
:100644 100644 47db1fd... f12020d... M src/draw.c
:100644 100644 19f80b8... 6dcd0d1... M src/macro.h
=========
Changes
=========
commit 2e29fd0c82c5ac586399446318f26efd33257645
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Add a DrawPaste() helper function for paste layers
diff --git a/src/draw.c b/src/draw.c
index f12020d..cb1b790 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -102,6 +102,7 @@ static void DrawEMark (ElementTypePtr, LocationType, LocationType, bool);
static void ClearPad (PadTypePtr, bool);
static void DrawHole (PinTypePtr);
static void DrawMask (int side, BoxType *);
+static void DrawPaste (int side, BoxType *);
static void DrawRats (BoxType *);
static void DrawSilk (int side, const BoxType *);
static int via_callback (const BoxType * b, void *cl);
@@ -334,6 +335,7 @@ DrawEverything (BoxTypePtr drawn_area)
int do_group[MAX_LAYER];
/* This is the reverse of the order in which we draw them. */
int drawn_groups[MAX_LAYER];
+ bool paste_empty;
PCB->Data->SILKLAYER.Color = PCB->ElementColor;
PCB->Data->BACKSILKLAYER.Color = PCB->InvisibleObjectsColor;
@@ -434,44 +436,13 @@ DrawEverything (BoxTypePtr drawn_area)
DrawRats(drawn_area);
}
- for (side = 0; side <= 1; side++)
- {
- int doit;
- bool NoData = true;
- ALLPAD_LOOP (PCB->Data);
- {
- if ((TEST_FLAG (ONSOLDERFLAG, pad) && side == SOLDER_LAYER)
- || (!TEST_FLAG (ONSOLDERFLAG, pad) && side == COMPONENT_LAYER))
- {
- NoData = false;
- break;
- }
- }
- ENDALL_LOOP;
+ paste_empty = IsPasteEmpty (COMPONENT_LAYER);
+ if (gui->set_layer ("toppaste", SL (PASTE, TOP), paste_empty))
+ DrawPaste (COMPONENT_LAYER, drawn_area);
- if (side == SOLDER_LAYER)
- doit = gui->set_layer ("bottompaste", SL (PASTE, BOTTOM), NoData);
- else
- doit = gui->set_layer ("toppaste", SL (PASTE, TOP), NoData);
- if (doit)
- {
- gui->set_color (Output.fgGC, PCB->ElementColor);
- ALLPAD_LOOP (PCB->Data);
- {
- if ((TEST_FLAG (ONSOLDERFLAG, pad) && side == SOLDER_LAYER)
- || (!TEST_FLAG (ONSOLDERFLAG, pad)
- && side == COMPONENT_LAYER))
- if (!TEST_FLAG (NOPASTEFLAG, pad) && pad->Mask > 0)
- {
- if (pad->Mask < pad->Thickness)
- DrawPadLowLevel (Output.fgGC, pad, true, true);
- else
- DrawPadLowLevel (Output.fgGC, pad, false, false);
- }
- }
- ENDALL_LOOP;
- }
- }
+ paste_empty = IsPasteEmpty (SOLDER_LAYER);
+ if (gui->set_layer ("bottompaste", SL (PASTE, BOTTOM), paste_empty))
+ DrawPaste (SOLDER_LAYER, drawn_area);
doing_assy = true;
if (gui->set_layer ("topassembly", SL (ASSY, TOP), 0))
@@ -704,6 +675,26 @@ DrawMask (int side, BoxType * screen)
}
}
+/* ---------------------------------------------------------------------------
+ * draws solder paste layer for a given side of the board
+ */
+static void
+DrawPaste (int side, BoxType *drawn_area)
+{
+ gui->set_color (Output.fgGC, PCB->ElementColor);
+ ALLPAD_LOOP (PCB->Data);
+ {
+ if (ON_SIDE (pad, side) && !TEST_FLAG (NOPASTEFLAG, pad) && pad->Mask > 0)
+ {
+ if (pad->Mask < pad->Thickness)
+ DrawPadLowLevel (Output.fgGC, pad, true, true);
+ else
+ DrawPadLowLevel (Output.fgGC, pad, false, false);
+ }
+ }
+ ENDALL_LOOP;
+}
+
static void
DrawRats (BoxTypePtr drawn_area)
{
commit 85feb2ce0539bc462719d6efcdf28184dff9f61a
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
misc.c: Add query function IsPasteEmpty() to query a paste layer is empty
diff --git a/src/misc.c b/src/misc.c
index 02a883f..d63aef1 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -600,6 +600,22 @@ IsLayerGroupEmpty (int num)
return true;
}
+bool
+IsPasteEmpty (int side)
+{
+ bool paste_empty = true;
+ ALLPAD_LOOP (PCB->Data);
+ {
+ if (ON_SIDE (pad, side) && !TEST_FLAG (NOPASTEFLAG, pad) && pad->Mask > 0)
+ {
+ paste_empty = false;
+ break;
+ }
+ }
+ ENDALL_LOOP;
+ return paste_empty;
+}
+
/* ---------------------------------------------------------------------------
* gets minimum and maximum coordinates
* returns NULL if layout is empty
diff --git a/src/misc.h b/src/misc.h
index b46cad4..cd7eb3d 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -47,6 +47,7 @@ bool IsDataEmpty (DataTypePtr);
bool IsLayerEmpty (LayerTypePtr);
bool IsLayerNumEmpty (int);
bool IsLayerGroupEmpty (int);
+bool IsPasteEmpty (int);
BoxTypePtr GetDataBoundingBox (DataTypePtr);
void CenterDisplay (LocationType, LocationType, bool);
void SetFontInfo (FontTypePtr);
commit 4f70768a4548612aad5a1a491889b32389f359c1
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Make the ON_SIDE() macro global, not local do draw.c
diff --git a/src/draw.c b/src/draw.c
index 47db1fd..f12020d 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -66,7 +66,6 @@ RCSID ("$Id$");
#define LARGE_TEXT_SIZE 3
#define N_TEXT_SIZES 4
-#define ON_SIDE(element, side) (TEST_FLAG (ONSOLDERFLAG, element) == (*side == SOLDER_LAYER))
/* ---------------------------------------------------------------------------
* some local identifiers
@@ -236,7 +235,7 @@ element_callback (const BoxType * b, void *cl)
ElementTypePtr element = (ElementTypePtr) b;
int *side = cl;
- if (ON_SIDE (element, side))
+ if (ON_SIDE (element, *side))
DrawElementPackage (element);
return 1;
}
@@ -251,7 +250,7 @@ name_callback (const BoxType * b, void *cl)
if (TEST_FLAG (HIDENAMEFLAG, element))
return 0;
- if (ON_SIDE (element, side))
+ if (ON_SIDE (element, *side))
DrawElementName (element);
return 0;
}
@@ -611,7 +610,7 @@ clearPad_callback (const BoxType * b, void *cl)
{
PadTypePtr pad = (PadTypePtr) b;
int *side = cl;
- if (ON_SIDE (pad, side) && pad->Mask)
+ if (ON_SIDE (pad, *side) && pad->Mask)
ClearPad (pad, true);
return 1;
}
diff --git a/src/macro.h b/src/macro.h
index 19f80b8..6dcd0d1 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -162,6 +162,13 @@ extern int mem_any_set (unsigned char *, int);
((TEST_FLAG(ONSOLDERFLAG, (o)) != 0) == SWAP_IDENT)
/* ---------------------------------------------------------------------------
+ * Determines if an object is on the given side. side is either SOLDER_LAYER
+ * or COMPONENT_LAYER.
+ */
+#define ON_SIDE(element, side) \
+ (TEST_FLAG (ONSOLDERFLAG, element) == (side == SOLDER_LAYER))
+
+/* ---------------------------------------------------------------------------
* some loop shortcuts
* all object loops run backwards to prevent from errors when deleting objects
*
|
|
From: <gi...@gp...> - 2011-04-24 12:08:33
|
The branch, master has been updated
via 2744a86d9d5dd34ab256b991c21ddd022e886dd0 (commit)
from 7e918135ef6aba78aa051888f24c799b2d6cb4f2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/hid/common/draw_helpers.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit 2744a86d9d5dd34ab256b991c21ddd022e886dd0
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
hid/common: Fix common_thindraw_pcb_pad()'s handling of square pads
I made a mistake in a logic test when simplifying this routine in
commit 4efcedeeac06cd4d5e559a7fe0a0ee8685f2137a
This caused slanted rendering of horizontal or vertical pads.
:100644 100644 b043d92... 7d529ba... M src/hid/common/draw_helpers.c
=========
Changes
=========
commit 2744a86d9d5dd34ab256b991c21ddd022e886dd0
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
hid/common: Fix common_thindraw_pcb_pad()'s handling of square pads
I made a mistake in a logic test when simplifying this routine in
commit 4efcedeeac06cd4d5e559a7fe0a0ee8685f2137a
This caused slanted rendering of horizontal or vertical pads.
diff --git a/src/hid/common/draw_helpers.c b/src/hid/common/draw_helpers.c
index b043d92..7d529ba 100644
--- a/src/hid/common/draw_helpers.c
+++ b/src/hid/common/draw_helpers.c
@@ -225,7 +225,7 @@ common_thindraw_pcb_pad (hidGC gc, PadType *pad, bool clear, bool mask)
/* slanted square pad */
float tx, ty, theta;
- if (x1 == x2 || y1 == y2)
+ if (x1 == x2 && y1 == y2)
theta = 0;
else
theta = atan2 (y2 - y1, x2 - x1);
|
|
From: <gi...@gp...> - 2011-04-24 02:09:52
|
The branch, master has been updated
discards 3b8f37685d5c548ea444b3a8b41555268625b9c0 (commit)
via 7e918135ef6aba78aa051888f24c799b2d6cb4f2 (commit)
from 3b8f37685d5c548ea444b3a8b41555268625b9c0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
=================
Commit Messages
=================
commit 7e918135ef6aba78aa051888f24c799b2d6cb4f2
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Rename the "screen" parameter of DrawLayerGroup to "drawn_area"
(For consistency with other code in draw.c)
:100644 100644 b5be3dc... 47db1fd... M src/draw.c
=========
Changes
=========
commit 7e918135ef6aba78aa051888f24c799b2d6cb4f2
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Rename the "screen" parameter of DrawLayerGroup to "drawn_area"
(For consistency with other code in draw.c)
diff --git a/src/draw.c b/src/draw.c
index b5be3dc..47db1fd 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -794,7 +794,7 @@ DrawLayer (LayerTypePtr Layer, const BoxType * screen)
* drawn with this group.
*/
static int
-DrawLayerGroup (int group, const BoxType * screen)
+DrawLayerGroup (int group, const BoxType *drawn_area)
{
int i, rv = 1;
int layernum;
@@ -802,16 +802,16 @@ DrawLayerGroup (int group, const BoxType * screen)
int n_entries = PCB->LayerGroups.Number[group];
Cardinal *layers = PCB->LayerGroups.Entries[group];
- clip_box = screen;
+ clip_box = drawn_area;
for (i = n_entries - 1; i >= 0; i--)
{
layernum = layers[i];
Layer = PCB->Data->Layer + layers[i];
if (strcmp (Layer->Name, "outline") == 0 ||
- strcmp (Layer->Name, "route") == 0)
- rv = 0;
+ strcmp (Layer->Name, "route") == 0)
+ rv = 0;
if (layernum < max_copper_layer && Layer->On)
- DrawLayerCommon (Layer, screen, true);
+ DrawLayerCommon (Layer, drawn_area, true);
}
if (n_entries > 1)
rv = 1;
|
|
From: <gi...@gp...> - 2011-04-24 02:02:49
|
The branch, master has been updated
via 3b8f37685d5c548ea444b3a8b41555268625b9c0 (commit)
from de86bae3007b8b1f82d3ebb1d3bb8d59396dc08f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
=================
Commit Messages
=================
commit 3b8f37685d5c548ea444b3a8b41555268625b9c0
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Rename the "screen" parameter of DrawLayerGroup to "drawn_area"
(For consistency with other code in draw.c)
:100644 100644 b5be3dc... db38c81... M src/draw.c
=========
Changes
=========
commit 3b8f37685d5c548ea444b3a8b41555268625b9c0
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Rename the "screen" parameter of DrawLayerGroup to "drawn_area"
(For consistency with other code in draw.c)
diff --git a/src/draw.c b/src/draw.c
index b5be3dc..db38c81 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -794,7 +794,7 @@ DrawLayer (LayerTypePtr Layer, const BoxType * screen)
* drawn with this group.
*/
static int
-DrawLayerGroup (int group, const BoxType * screen)
+DrawLayerGroup (int group, const BoxType *draw_area)
{
int i, rv = 1;
int layernum;
@@ -802,16 +802,16 @@ DrawLayerGroup (int group, const BoxType * screen)
int n_entries = PCB->LayerGroups.Number[group];
Cardinal *layers = PCB->LayerGroups.Entries[group];
- clip_box = screen;
+ clip_box = draw_area;
for (i = n_entries - 1; i >= 0; i--)
{
layernum = layers[i];
Layer = PCB->Data->Layer + layers[i];
if (strcmp (Layer->Name, "outline") == 0 ||
- strcmp (Layer->Name, "route") == 0)
- rv = 0;
+ strcmp (Layer->Name, "route") == 0)
+ rv = 0;
if (layernum < max_copper_layer && Layer->On)
- DrawLayerCommon (Layer, screen, true);
+ DrawLayerCommon (Layer, draw_area, true);
}
if (n_entries > 1)
rv = 1;
|
|
From: <gi...@gp...> - 2011-04-24 01:56:32
|
The branch, master has been updated
via de86bae3007b8b1f82d3ebb1d3bb8d59396dc08f (commit)
from 658ad94902bb8055d0b858b7001f72bdb2ce8733 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
=================
Commit Messages
=================
commit de86bae3007b8b1f82d3ebb1d3bb8d59396dc08f
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Use DrawPPV() where we can to save duplication
:100644 100644 5a9bb1b... b5be3dc... M src/draw.c
=========
Changes
=========
commit de86bae3007b8b1f82d3ebb1d3bb8d59396dc08f
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Use DrawPPV() where we can to save duplication
diff --git a/src/draw.c b/src/draw.c
index 5a9bb1b..b5be3dc 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -376,25 +376,10 @@ DrawEverything (BoxTypePtr drawn_area)
int group = drawn_groups[i];
if (gui->set_layer (0, group, 0))
- {
- if (DrawLayerGroup (group, drawn_area) && !gui->gui)
- {
- r_search (PCB->Data->pin_tree, drawn_area, NULL, pin_callback, NULL);
- r_search (PCB->Data->via_tree, drawn_area, NULL, via_callback, NULL);
- /* draw element pads */
- if (group == component || group == solder)
- {
- side = (group == solder) ? SOLDER_LAYER : COMPONENT_LAYER;
- r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
- }
-
- /* draw holes */
- plated = -1;
- r_search (PCB->Data->pin_tree, drawn_area, NULL, hole_callback, &plated);
- r_search (PCB->Data->via_tree, drawn_area, NULL, hole_callback, &plated);
- }
- }
+ if (DrawLayerGroup (group, drawn_area) && !gui->gui)
+ DrawPPV (group, drawn_area);
}
+
if (TEST_FLAG (CHECKPLANESFLAG, PCB) && gui->gui)
return;
|
|
From: <gi...@gp...> - 2011-04-24 01:49:11
|
The branch, master has been updated
via 658ad94902bb8055d0b858b7001f72bdb2ce8733 (commit)
via 8da6c60efc2c86dd8e15adc5619d127649d95e65 (commit)
from 87c5f270c5d6c9d7ab1f5dac60e82b730f5d0870 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
=================
Commit Messages
=================
commit 658ad94902bb8055d0b858b7001f72bdb2ce8733
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Change PrintAssembly() to use a layer side parameter
Drops the "swap_ident" parameter in favour of a more explicit "side"
parameter. Also drops the side_group parameter, as we can easily
determine that from the requested side to draw.
:100644 100644 652fe86... 5a9bb1b... M src/draw.c
commit 8da6c60efc2c86dd8e15adc5619d127649d95e65
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Change DrawSilk() to use a layer side parameter, not SWAP_IDENT
:100644 100644 1cbc98b... 652fe86... M src/draw.c
=========
Changes
=========
commit 658ad94902bb8055d0b858b7001f72bdb2ce8733
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Change PrintAssembly() to use a layer side parameter
Drops the "swap_ident" parameter in favour of a more explicit "side"
parameter. Also drops the side_group parameter, as we can easily
determine that from the requested side to draw.
diff --git a/src/draw.c b/src/draw.c
index 652fe86..5a9bb1b 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -309,9 +309,9 @@ rat_callback (const BoxType * b, void *cl)
*/
static void
-PrintAssembly (const BoxType * drawn_area, int side_group, int swap_ident)
+PrintAssembly (int side, const BoxType * drawn_area)
{
- int side = swap_ident ? SOLDER_LAYER : COMPONENT_LAYER;
+ int side_group = GetLayerGroupNumberByNumber (max_copper_layer + side);
gui->set_draw_faded (Output.fgGC, 1);
DrawLayerGroup (side_group, drawn_area);
@@ -491,10 +491,10 @@ DrawEverything (BoxTypePtr drawn_area)
doing_assy = true;
if (gui->set_layer ("topassembly", SL (ASSY, TOP), 0))
- PrintAssembly (drawn_area, component, 0);
+ PrintAssembly (COMPONENT_LAYER, drawn_area);
if (gui->set_layer ("bottomassembly", SL (ASSY, BOTTOM), 0))
- PrintAssembly (drawn_area, solder, 1);
+ PrintAssembly (SOLDER_LAYER, drawn_area);
doing_assy = false;
if (gui->set_layer ("fab", SL (FAB, 0), 0))
commit 8da6c60efc2c86dd8e15adc5619d127649d95e65
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Change DrawSilk() to use a layer side parameter, not SWAP_IDENT
diff --git a/src/draw.c b/src/draw.c
index 1cbc98b..652fe86 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -104,7 +104,7 @@ static void ClearPad (PadTypePtr, bool);
static void DrawHole (PinTypePtr);
static void DrawMask (int side, BoxType *);
static void DrawRats (BoxType *);
-static void DrawSilk (int, int, const BoxType *);
+static void DrawSilk (int side, const BoxType *);
static int via_callback (const BoxType * b, void *cl);
static int pin_callback (const BoxType * b, void *cl);
static int pad_callback (const BoxType * b, void *cl);
@@ -311,7 +311,7 @@ rat_callback (const BoxType * b, void *cl)
static void
PrintAssembly (const BoxType * drawn_area, int side_group, int swap_ident)
{
- int save_swap = SWAP_IDENT;
+ int side = swap_ident ? SOLDER_LAYER : COMPONENT_LAYER;
gui->set_draw_faded (Output.fgGC, 1);
DrawLayerGroup (side_group, drawn_area);
@@ -319,11 +319,7 @@ PrintAssembly (const BoxType * drawn_area, int side_group, int swap_ident)
gui->set_draw_faded (Output.fgGC, 0);
/* draw package */
- SWAP_IDENT = swap_ident;
- DrawSilk (swap_ident,
- swap_ident ? solder_silk_layer : component_silk_layer,
- drawn_area);
- SWAP_IDENT = save_swap;
+ DrawSilk (side, drawn_area);
}
/* ---------------------------------------------------------------------------
@@ -437,11 +433,12 @@ DrawEverything (BoxTypePtr drawn_area)
if (gui->set_layer ("soldermask", SL (MASK, BOTTOM), 0))
DrawMask (SOLDER_LAYER, drawn_area);
- /* Draw top silkscreen */
if (gui->set_layer ("topsilk", SL (SILK, TOP), 0))
- DrawSilk (0, component_silk_layer, drawn_area);
+ DrawSilk (COMPONENT_LAYER, drawn_area);
+
if (gui->set_layer ("bottomsilk", SL (SILK, BOTTOM), 0))
- DrawSilk (1, solder_silk_layer, drawn_area);
+ DrawSilk (SOLDER_LAYER, drawn_area);
+
if (gui->gui)
{
/* Draw element Marks */
@@ -639,9 +636,8 @@ clearPad_callback (const BoxType * b, void *cl)
*/
static void
-DrawSilk (int new_swap, int layer, const BoxType * drawn_area)
+DrawSilk (int side, const BoxType * drawn_area)
{
- int side = new_swap ? SOLDER_LAYER : COMPONENT_LAYER;
#if 0
/* This code is used when you want to mask silk to avoid exposed
pins and pads. We decided it was a bad idea to do this
@@ -653,7 +649,7 @@ DrawSilk (int new_swap, int layer, const BoxType * drawn_area)
{
gui->use_mask (HID_MASK_BEFORE);
#endif
- DrawLayer (LAYER_PTR (layer), drawn_area);
+ DrawLayer (LAYER_PTR (max_copper_layer + side), drawn_area);
/* draw package */
r_search (PCB->Data->element_tree, drawn_area, NULL, element_callback, &side);
r_search (PCB->Data->name_tree[NAME_INDEX (PCB)], drawn_area, NULL, name_callback, &side);
|
|
From: <gi...@gp...> - 2011-04-24 01:38:30
|
The branch, master has been updated
via 87c5f270c5d6c9d7ab1f5dac60e82b730f5d0870 (commit)
from 47ccf7bcd762486e0a79c14ffc79fbcce4addc0a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
=================
Commit Messages
=================
commit 87c5f270c5d6c9d7ab1f5dac60e82b730f5d0870
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Make DrawPPV() always draw for non gui HIDs, rather than doing_assy
The gui HIDs don't accept the assembly drawaing, so testing for !gui->gui
will catch this case, and we can drop the doing_assy override for
PCB->PinOn and PCB->ViaOn
:100644 100644 7345912... 1cbc98b... M src/draw.c
=========
Changes
=========
commit 87c5f270c5d6c9d7ab1f5dac60e82b730f5d0870
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Make DrawPPV() always draw for non gui HIDs, rather than doing_assy
The gui HIDs don't accept the assembly drawaing, so testing for !gui->gui
will catch this case, and we can drop the doing_assy override for
PCB->PinOn and PCB->ViaOn
diff --git a/src/draw.c b/src/draw.c
index 7345912..1cbc98b 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -566,7 +566,8 @@ pad_callback (const BoxType * b, void *cl)
}
/* ---------------------------------------------------------------------------
- * draws pins pads and vias
+ * Draws pins pads and vias - Always draws for non-gui HIDs,
+ * otherwise drawing depends on PCB->PinOn and PCB->ViaOn
*/
static void
DrawPPV (int group, const BoxType *drawn_area)
@@ -575,7 +576,7 @@ DrawPPV (int group, const BoxType *drawn_area)
int solder_group = GetLayerGroupNumberByNumber (solder_silk_layer);
int side;
- if (PCB->PinOn || doing_assy)
+ if (PCB->PinOn || !gui->gui)
{
/* draw element pins */
r_search (PCB->Data->pin_tree, drawn_area, NULL, pin_callback, NULL);
@@ -595,7 +596,7 @@ DrawPPV (int group, const BoxType *drawn_area)
}
/* draw vias */
- if (PCB->ViaOn || doing_assy)
+ if (PCB->ViaOn || !gui->gui)
{
r_search (PCB->Data->via_tree, drawn_area, NULL, via_callback, NULL);
r_search (PCB->Data->via_tree, drawn_area, NULL, hole_callback, NULL);
|
|
From: <gi...@gp...> - 2011-04-24 01:29:15
|
The branch, master has been updated
discards 59bf31bf59cc0441176f43ff40cc8d31bf25b3f1 (commit)
via 47ccf7bcd762486e0a79c14ffc79fbcce4addc0a (commit)
from 59bf31bf59cc0441176f43ff40cc8d31bf25b3f1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
=================
Commit Messages
=================
commit 47ccf7bcd762486e0a79c14ffc79fbcce4addc0a
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Change DrawTop() to DrawPPV(), and teach it to work for any layer
(PPV stands for Pins, Pads and Vias). Extend its functionality to work
for pins and vias on any layer.
:100644 100644 994bea1... 7345912... M src/draw.c
=========
Changes
=========
commit 47ccf7bcd762486e0a79c14ffc79fbcce4addc0a
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Change DrawTop() to DrawPPV(), and teach it to work for any layer
(PPV stands for Pins, Pads and Vias). Extend its functionality to work
for pins and vias on any layer.
diff --git a/src/draw.c b/src/draw.c
index 994bea1..7345912 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -83,7 +83,7 @@ static const BoxType *clip_box = NULL;
*/
static void Redraw (bool, BoxTypePtr);
static void DrawEverything (BoxTypePtr);
-static void DrawTop (const BoxType *);
+static void DrawPPV (int group, const BoxType *);
static int DrawLayerGroup (int, const BoxType *);
static void DrawPinOrViaLowLevel (PinTypePtr, bool);
static void DrawPlainPin (PinTypePtr, bool);
@@ -314,12 +314,12 @@ PrintAssembly (const BoxType * drawn_area, int side_group, int swap_ident)
int save_swap = SWAP_IDENT;
gui->set_draw_faded (Output.fgGC, 1);
- SWAP_IDENT = swap_ident;
DrawLayerGroup (side_group, drawn_area);
- DrawTop (drawn_area);
+ DrawPPV (side_group, drawn_area);
gui->set_draw_faded (Output.fgGC, 0);
/* draw package */
+ SWAP_IDENT = swap_ident;
DrawSilk (swap_ident,
swap_ident ? solder_silk_layer : component_silk_layer,
drawn_area);
@@ -404,7 +404,7 @@ DrawEverything (BoxTypePtr drawn_area)
/* Draw pins, pads, vias below silk */
if (gui->gui)
- DrawTop (drawn_area);
+ DrawPPV (SWAP_IDENT ? solder : component, drawn_area);
else
{
HoleCountStruct hcs;
@@ -569,17 +569,31 @@ pad_callback (const BoxType * b, void *cl)
* draws pins pads and vias
*/
static void
-DrawTop (const BoxType *drawn_area)
+DrawPPV (int group, const BoxType *drawn_area)
{
- int side = SWAP_IDENT ? SOLDER_LAYER : COMPONENT_LAYER;
+ int component_group = GetLayerGroupNumberByNumber (component_silk_layer);
+ int solder_group = GetLayerGroupNumberByNumber (solder_silk_layer);
+ int side;
if (PCB->PinOn || doing_assy)
{
/* draw element pins */
r_search (PCB->Data->pin_tree, drawn_area, NULL, pin_callback, NULL);
+
/* draw element pads */
- r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
+ if (group == component_group)
+ {
+ side = COMPONENT_LAYER;
+ r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
+ }
+
+ if (group == solder_group)
+ {
+ side = SOLDER_LAYER;
+ r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
+ }
}
+
/* draw vias */
if (PCB->ViaOn || doing_assy)
{
|
|
From: <gi...@gp...> - 2011-04-24 01:25:15
|
The branch, master has been updated
via 59bf31bf59cc0441176f43ff40cc8d31bf25b3f1 (commit)
from 1bb09bf05ee3664b44a99cb8c2636f6471b4cd0b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
=================
Commit Messages
=================
=========
Changes
=========
|
|
From: <gi...@gp...> - 2011-04-24 01:18:12
|
The branch, master has been updated
via 1bb09bf05ee3664b44a99cb8c2636f6471b4cd0b (commit)
from bae5dc1520e812145f6db94e8543315f88bb5e96 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
=================
Commit Messages
=================
commit 1bb09bf05ee3664b44a99cb8c2636f6471b4cd0b
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Rename DrawTop() "screen" parameter "drawn_area"
For consistency with other code in draw.c
:100644 100644 7380beb... 994bea1... M src/draw.c
=========
Changes
=========
commit 1bb09bf05ee3664b44a99cb8c2636f6471b4cd0b
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Rename DrawTop() "screen" parameter "drawn_area"
For consistency with other code in draw.c
diff --git a/src/draw.c b/src/draw.c
index 7380beb..994bea1 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -569,25 +569,25 @@ pad_callback (const BoxType * b, void *cl)
* draws pins pads and vias
*/
static void
-DrawTop (const BoxType * screen)
+DrawTop (const BoxType *drawn_area)
{
int side = SWAP_IDENT ? SOLDER_LAYER : COMPONENT_LAYER;
if (PCB->PinOn || doing_assy)
{
/* draw element pins */
- r_search (PCB->Data->pin_tree, screen, NULL, pin_callback, NULL);
+ r_search (PCB->Data->pin_tree, drawn_area, NULL, pin_callback, NULL);
/* draw element pads */
- r_search (PCB->Data->pad_tree, screen, NULL, pad_callback, &side);
+ r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
}
/* draw vias */
if (PCB->ViaOn || doing_assy)
{
- r_search (PCB->Data->via_tree, screen, NULL, via_callback, NULL);
- r_search (PCB->Data->via_tree, screen, NULL, hole_callback, NULL);
+ r_search (PCB->Data->via_tree, drawn_area, NULL, via_callback, NULL);
+ r_search (PCB->Data->via_tree, drawn_area, NULL, hole_callback, NULL);
}
if (PCB->PinOn || doing_assy)
- r_search (PCB->Data->pin_tree, screen, NULL, hole_callback, NULL);
+ r_search (PCB->Data->pin_tree, drawn_area, NULL, hole_callback, NULL);
}
static int
|
|
From: <gi...@gp...> - 2011-04-23 22:04:33
|
The branch, master has been updated
via bae5dc1520e812145f6db94e8543315f88bb5e96 (commit)
from c9b915d7f2f49f5ebde0abeb5756b1e11e756edc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit bae5dc1520e812145f6db94e8543315f88bb5e96
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Fix order of farside object drawing
Backside silk should be drawn before bakside pads
:100644 100644 9f4a591... 7380beb... M src/draw.c
=========
Changes
=========
commit bae5dc1520e812145f6db94e8543315f88bb5e96
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Fix order of farside object drawing
Backside silk should be drawn before bakside pads
diff --git a/src/draw.c b/src/draw.c
index 9f4a591..7380beb 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -365,13 +365,13 @@ DrawEverything (BoxTypePtr drawn_area)
&& gui->set_layer ("invisible", SL (INVISIBLE, 0), 0))
{
side = SWAP_IDENT ? COMPONENT_LAYER : SOLDER_LAYER;
- r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
if (PCB->ElementOn)
{
r_search (PCB->Data->element_tree, drawn_area, NULL, element_callback, &side);
r_search (PCB->Data->name_tree[NAME_INDEX (PCB)], drawn_area, NULL, name_callback, &side);
DrawLayer (&(PCB->Data->Layer[max_copper_layer + side]), drawn_area);
}
+ r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
}
/* draw all layers in layerstack order */
|
|
From: <gi...@gp...> - 2011-04-23 16:59:46
|
The branch, master has been updated
discards f7248e59913557aff7419f005bba3f3210d4d869 (commit)
via c9b915d7f2f49f5ebde0abeb5756b1e11e756edc (commit)
from f7248e59913557aff7419f005bba3f3210d4d869 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
=================
Commit Messages
=================
commit c9b915d7f2f49f5ebde0abeb5756b1e11e756edc
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Add prototype for via_callback
Fixes breakage since commit c095adf5ea890284cddc2730944b980ac1275109
:100644 100644 9f7cf8b... 9f4a591... M src/draw.c
=========
Changes
=========
commit c9b915d7f2f49f5ebde0abeb5756b1e11e756edc
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Add prototype for via_callback
Fixes breakage since commit c095adf5ea890284cddc2730944b980ac1275109
diff --git a/src/draw.c b/src/draw.c
index 9f7cf8b..9f4a591 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -105,6 +105,7 @@ static void DrawHole (PinTypePtr);
static void DrawMask (int side, BoxType *);
static void DrawRats (BoxType *);
static void DrawSilk (int, int, const BoxType *);
+static int via_callback (const BoxType * b, void *cl);
static int pin_callback (const BoxType * b, void *cl);
static int pad_callback (const BoxType * b, void *cl);
|
|
From: <gi...@gp...> - 2011-04-23 16:59:20
|
The branch, master has been updated
via f7248e59913557aff7419f005bba3f3210d4d869 (commit)
from 86356b85ea41672e0e84e9b07e4e0fe7950190b8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
=================
Commit Messages
=================
=========
Changes
=========
|
|
From: <gi...@gp...> - 2011-04-23 16:48:20
|
The branch, master has been updated
via 86356b85ea41672e0e84e9b07e4e0fe7950190b8 (commit)
via c095adf5ea890284cddc2730944b980ac1275109 (commit)
from cbd7c001aa130c53bf04396d347b32f9d6bb9034 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
=================
Commit Messages
=================
commit 86356b85ea41672e0e84e9b07e4e0fe7950190b8
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Remove a couple of redundant if statements
The outer if statement already ensures this code-path isn't followed for
a gui hid.. don't repeat ourselves. One statement will always return
false, hence is dead code - the other is always true.
:100644 100644 f204fdc... 9f7cf8b... M src/draw.c
commit c095adf5ea890284cddc2730944b980ac1275109
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Use the via callback when drawing vias.
Since this code-path is only hit for exporters, (and the only difference
between the pin and via callback is the drawing colour) it is not likely
this matters, but lets be correct.
:100644 100644 8178e81... f204fdc... M src/draw.c
=========
Changes
=========
commit 86356b85ea41672e0e84e9b07e4e0fe7950190b8
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Remove a couple of redundant if statements
The outer if statement already ensures this code-path isn't followed for
a gui hid.. don't repeat ourselves. One statement will always return
false, hence is dead code - the other is always true.
diff --git a/src/draw.c b/src/draw.c
index f204fdc..9f7cf8b 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -382,12 +382,8 @@ DrawEverything (BoxTypePtr drawn_area)
{
if (DrawLayerGroup (group, drawn_area) && !gui->gui)
{
- if (TEST_FLAG (CHECKPLANESFLAG, PCB) && gui->gui)
- continue;
- r_search (PCB->Data->pin_tree, drawn_area, NULL, pin_callback,
- NULL);
- r_search (PCB->Data->via_tree, drawn_area, NULL, via_callback,
- NULL);
+ r_search (PCB->Data->pin_tree, drawn_area, NULL, pin_callback, NULL);
+ r_search (PCB->Data->via_tree, drawn_area, NULL, via_callback, NULL);
/* draw element pads */
if (group == component || group == solder)
{
@@ -395,15 +391,10 @@ DrawEverything (BoxTypePtr drawn_area)
r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
}
- if (!gui->gui)
- {
- /* draw holes */
- plated = -1;
- r_search (PCB->Data->pin_tree, drawn_area, NULL, hole_callback,
- &plated);
- r_search (PCB->Data->via_tree, drawn_area, NULL, hole_callback,
- &plated);
- }
+ /* draw holes */
+ plated = -1;
+ r_search (PCB->Data->pin_tree, drawn_area, NULL, hole_callback, &plated);
+ r_search (PCB->Data->via_tree, drawn_area, NULL, hole_callback, &plated);
}
}
}
commit c095adf5ea890284cddc2730944b980ac1275109
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Use the via callback when drawing vias.
Since this code-path is only hit for exporters, (and the only difference
between the pin and via callback is the drawing colour) it is not likely
this matters, but lets be correct.
diff --git a/src/draw.c b/src/draw.c
index 8178e81..f204fdc 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -386,7 +386,7 @@ DrawEverything (BoxTypePtr drawn_area)
continue;
r_search (PCB->Data->pin_tree, drawn_area, NULL, pin_callback,
NULL);
- r_search (PCB->Data->via_tree, drawn_area, NULL, pin_callback,
+ r_search (PCB->Data->via_tree, drawn_area, NULL, via_callback,
NULL);
/* draw element pads */
if (group == component || group == solder)
|
|
From: <gi...@gp...> - 2011-04-23 16:25:50
|
The branch, master has been updated
via cbd7c001aa130c53bf04396d347b32f9d6bb9034 (commit)
via ff9d14d989e2ca192e17a603e929e6a81b394486 (commit)
from 27a0dc452f95d5bcc4355b8ad674ec1c0291d2eb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/draw.c | 122 +++++++++++++++++++----------------------------------------
1 files changed, 39 insertions(+), 83 deletions(-)
=================
Commit Messages
=================
commit cbd7c001aa130c53bf04396d347b32f9d6bb9034
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Add layer side parameter to DrawMask()
Don't use the global variable SWAP_IDENT to choose which side to draw.
:100644 100644 ed798cc... 8178e81... M src/draw.c
commit ff9d14d989e2ca192e17a603e929e6a81b394486
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Combine front and back element and name callbacks
Pass an integer "side" parameter to determine which is desired
:100644 100644 665bf0c... ed798cc... M src/draw.c
=========
Changes
=========
commit cbd7c001aa130c53bf04396d347b32f9d6bb9034
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Add layer side parameter to DrawMask()
Don't use the global variable SWAP_IDENT to choose which side to draw.
diff --git a/src/draw.c b/src/draw.c
index ed798cc..8178e81 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -102,7 +102,7 @@ static void SetPVColor (PinTypePtr, int);
static void DrawEMark (ElementTypePtr, LocationType, LocationType, bool);
static void ClearPad (PadTypePtr, bool);
static void DrawHole (PinTypePtr);
-static void DrawMask (BoxType *);
+static void DrawMask (int side, BoxType *);
static void DrawRats (BoxType *);
static void DrawSilk (int, int, const BoxType *);
static int pin_callback (const BoxType * b, void *cl);
@@ -440,19 +440,11 @@ DrawEverything (BoxTypePtr drawn_area)
}
/* Draw the solder mask if turned on */
if (gui->set_layer ("componentmask", SL (MASK, TOP), 0))
- {
- int save_swap = SWAP_IDENT;
- SWAP_IDENT = 0;
- DrawMask (drawn_area);
- SWAP_IDENT = save_swap;
- }
+ DrawMask (COMPONENT_LAYER, drawn_area);
+
if (gui->set_layer ("soldermask", SL (MASK, BOTTOM), 0))
- {
- int save_swap = SWAP_IDENT;
- SWAP_IDENT = 1;
- DrawMask (drawn_area);
- SWAP_IDENT = save_swap;
- }
+ DrawMask (SOLDER_LAYER, drawn_area);
+
/* Draw top silkscreen */
if (gui->set_layer ("topsilk", SL (SILK, TOP), 0))
DrawSilk (0, component_silk_layer, drawn_area);
@@ -629,7 +621,8 @@ static int
clearPad_callback (const BoxType * b, void *cl)
{
PadTypePtr pad = (PadTypePtr) b;
- if (!XOR (TEST_FLAG (ONSOLDERFLAG, pad), SWAP_IDENT) && pad->Mask)
+ int *side = cl;
+ if (ON_SIDE (pad, side) && pad->Mask)
ClearPad (pad, true);
return 1;
}
@@ -647,8 +640,6 @@ DrawSilk (int new_swap, int layer, const BoxType * drawn_area)
pins and pads. We decided it was a bad idea to do this
unconditionally, but the code remains. */
#endif
- int save_swap = SWAP_IDENT;
- SWAP_IDENT = new_swap;
#if 0
if (gui->poly_before)
@@ -665,7 +656,7 @@ DrawSilk (int new_swap, int layer, const BoxType * drawn_area)
gui->use_mask (HID_MASK_CLEAR);
r_search (PCB->Data->pin_tree, drawn_area, NULL, clearPin_callback, NULL);
r_search (PCB->Data->via_tree, drawn_area, NULL, clearPin_callback, NULL);
- r_search (PCB->Data->pad_tree, drawn_area, NULL, clearPad_callback, NULL);
+ r_search (PCB->Data->pad_tree, drawn_area, NULL, clearPad_callback, &side);
if (gui->poly_after)
{
@@ -677,7 +668,6 @@ DrawSilk (int new_swap, int layer, const BoxType * drawn_area)
}
gui->use_mask (HID_MASK_OFF);
#endif
- SWAP_IDENT = save_swap;
}
@@ -702,7 +692,7 @@ DrawMaskBoardArea (int mask_type, BoxType *screen)
* draws solder mask layer - this will cover nearly everything
*/
static void
-DrawMask (BoxType * screen)
+DrawMask (int side, BoxType * screen)
{
int thin = TEST_FLAG(THINDRAWFLAG, PCB) || TEST_FLAG(THINDRAWPOLYFLAG, PCB);
@@ -716,7 +706,7 @@ DrawMask (BoxType * screen)
r_search (PCB->Data->pin_tree, screen, NULL, clearPin_callback, NULL);
r_search (PCB->Data->via_tree, screen, NULL, clearPin_callback, NULL);
- r_search (PCB->Data->pad_tree, screen, NULL, clearPad_callback, NULL);
+ r_search (PCB->Data->pad_tree, screen, NULL, clearPad_callback, &side);
if (thin)
gui->set_color (Output.pmGC, "erase");
commit ff9d14d989e2ca192e17a603e929e6a81b394486
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Combine front and back element and name callbacks
Pass an integer "side" parameter to determine which is desired
diff --git a/src/draw.c b/src/draw.c
index 665bf0c..ed798cc 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -66,6 +66,7 @@ RCSID ("$Id$");
#define LARGE_TEXT_SIZE 3
#define N_TEXT_SIZES 4
+#define ON_SIDE(element, side) (TEST_FLAG (ONSOLDERFLAG, element) == (*side == SOLDER_LAYER))
/* ---------------------------------------------------------------------------
* some local identifiers
@@ -229,51 +230,32 @@ Redraw (bool ClearWindow, BoxTypePtr screen_area)
}
static int
-backE_callback (const BoxType * b, void *cl)
+element_callback (const BoxType * b, void *cl)
{
ElementTypePtr element = (ElementTypePtr) b;
+ int *side = cl;
- if (!FRONT (element))
- {
- DrawElementPackage (element);
- }
+ if (ON_SIDE (element, side))
+ DrawElementPackage (element);
return 1;
}
static int
-backN_callback (const BoxType * b, void *cl)
+name_callback (const BoxType * b, void *cl)
{
TextTypePtr text = (TextTypePtr) b;
ElementTypePtr element = (ElementTypePtr) text->Element;
+ int *side = cl;
- if (!FRONT (element) && !TEST_FLAG (HIDENAMEFLAG, element))
+ if (TEST_FLAG (HIDENAMEFLAG, element))
+ return 0;
+
+ if (ON_SIDE (element, side))
DrawElementName (element);
return 0;
}
static int
-backPad_callback (const BoxType * b, void *cl)
-{
- PadTypePtr pad = (PadTypePtr) b;
-
- if (!FRONT (pad))
- DrawPad (pad);
- return 1;
-}
-
-static int
-frontE_callback (const BoxType * b, void *cl)
-{
- ElementTypePtr element = (ElementTypePtr) b;
-
- if (FRONT (element))
- {
- DrawElementPackage (element);
- }
- return 1;
-}
-
-static int
EMark_callback (const BoxType * b, void *cl)
{
ElementTypePtr element = (ElementTypePtr) b;
@@ -283,17 +265,6 @@ EMark_callback (const BoxType * b, void *cl)
}
static int
-frontN_callback (const BoxType * b, void *cl)
-{
- TextTypePtr text = (TextTypePtr) b;
- ElementTypePtr element = (ElementTypePtr) text->Element;
-
- if (FRONT (element) && !TEST_FLAG (HIDENAMEFLAG, element))
- DrawElementName (element);
- return 0;
-}
-
-static int
hole_callback (const BoxType * b, void *cl)
{
PinTypePtr pin = (PinTypePtr) b;
@@ -392,15 +363,13 @@ DrawEverything (BoxTypePtr drawn_area)
if (!TEST_FLAG (CHECKPLANESFLAG, PCB)
&& gui->set_layer ("invisible", SL (INVISIBLE, 0), 0))
{
- r_search (PCB->Data->pad_tree, drawn_area, NULL, backPad_callback,
- NULL);
+ side = SWAP_IDENT ? COMPONENT_LAYER : SOLDER_LAYER;
+ r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
if (PCB->ElementOn)
{
- r_search (PCB->Data->element_tree, drawn_area, NULL, backE_callback,
- NULL);
- r_search (PCB->Data->name_tree[NAME_INDEX (PCB)], drawn_area, NULL,
- backN_callback, NULL);
- DrawLayer (&(PCB->Data->BACKSILKLAYER), drawn_area);
+ r_search (PCB->Data->element_tree, drawn_area, NULL, element_callback, &side);
+ r_search (PCB->Data->name_tree[NAME_INDEX (PCB)], drawn_area, NULL, name_callback, &side);
+ DrawLayer (&(PCB->Data->Layer[max_copper_layer + side]), drawn_area);
}
}
@@ -413,8 +382,6 @@ DrawEverything (BoxTypePtr drawn_area)
{
if (DrawLayerGroup (group, drawn_area) && !gui->gui)
{
- int save_swap = SWAP_IDENT;
-
if (TEST_FLAG (CHECKPLANESFLAG, PCB) && gui->gui)
continue;
r_search (PCB->Data->pin_tree, drawn_area, NULL, pin_callback,
@@ -424,11 +391,9 @@ DrawEverything (BoxTypePtr drawn_area)
/* draw element pads */
if (group == component || group == solder)
{
- SWAP_IDENT = (group == solder);
- r_search (PCB->Data->pad_tree, drawn_area, NULL,
- pad_callback, NULL);
+ side = (group == solder) ? SOLDER_LAYER : COMPONENT_LAYER;
+ r_search (PCB->Data->pad_tree, drawn_area, NULL, pad_callback, &side);
}
- SWAP_IDENT = save_swap;
if (!gui->gui)
{
@@ -609,7 +574,9 @@ static int
pad_callback (const BoxType * b, void *cl)
{
PadTypePtr pad = (PadTypePtr) b;
- if (FRONT (pad))
+ int *side = cl;
+
+ if (TEST_FLAG (ONSOLDERFLAG, pad) == (*side == SOLDER_LAYER))
DrawPad (pad);
return 1;
}
@@ -620,12 +587,14 @@ pad_callback (const BoxType * b, void *cl)
static void
DrawTop (const BoxType * screen)
{
+ int side = SWAP_IDENT ? SOLDER_LAYER : COMPONENT_LAYER;
+
if (PCB->PinOn || doing_assy)
{
/* draw element pins */
r_search (PCB->Data->pin_tree, screen, NULL, pin_callback, NULL);
/* draw element pads */
- r_search (PCB->Data->pad_tree, screen, NULL, pad_callback, NULL);
+ r_search (PCB->Data->pad_tree, screen, NULL, pad_callback, &side);
}
/* draw vias */
if (PCB->ViaOn || doing_assy)
@@ -672,6 +641,7 @@ clearPad_callback (const BoxType * b, void *cl)
static void
DrawSilk (int new_swap, int layer, const BoxType * drawn_area)
{
+ int side = new_swap ? SOLDER_LAYER : COMPONENT_LAYER;
#if 0
/* This code is used when you want to mask silk to avoid exposed
pins and pads. We decided it was a bad idea to do this
@@ -687,10 +657,8 @@ DrawSilk (int new_swap, int layer, const BoxType * drawn_area)
#endif
DrawLayer (LAYER_PTR (layer), drawn_area);
/* draw package */
- r_search (PCB->Data->element_tree, drawn_area, NULL, frontE_callback,
- NULL);
- r_search (PCB->Data->name_tree[NAME_INDEX (PCB)], drawn_area, NULL,
- frontN_callback, NULL);
+ r_search (PCB->Data->element_tree, drawn_area, NULL, element_callback, &side);
+ r_search (PCB->Data->name_tree[NAME_INDEX (PCB)], drawn_area, NULL, name_callback, &side);
#if 0
}
@@ -704,10 +672,8 @@ DrawSilk (int new_swap, int layer, const BoxType * drawn_area)
gui->use_mask (HID_MASK_AFTER);
DrawLayer (LAYER_PTR (max_copper_layer + layer), drawn_area);
/* draw package */
- r_search (PCB->Data->element_tree, drawn_area, NULL, frontE_callback,
- NULL);
- r_search (PCB->Data->name_tree[NAME_INDEX (PCB)], drawn_area, NULL,
- frontN_callback, NULL);
+ r_search (PCB->Data->element_tree, drawn_area, NULL, element_callback, &side);
+ r_search (PCB->Data->name_tree[NAME_INDEX (PCB)], drawn_area, NULL, name_callback, &side);
}
gui->use_mask (HID_MASK_OFF);
#endif
|
|
From: <gi...@gp...> - 2011-04-23 15:44:28
|
The branch, master has been updated
via 27a0dc452f95d5bcc4355b8ad674ec1c0291d2eb (commit)
via 877332ecfc670834ca960869a843206ce0772c25 (commit)
from 145eb356bec5eb0ae57e66655af769bd0872b311 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/action.c | 46 ++++++++++----------
src/change.c | 74 ++++++++++++++++----------------
src/copy.c | 16 ++++----
src/draw.c | 94 +++++++++++++++++++++---------------------
src/draw.h | 32 +++++++-------
src/find.c | 54 ++++++++++++------------
src/hid/gtk/gui-drc-window.c | 16 ++++----
src/insert.c | 10 ++--
src/macro.h | 7 +---
src/move.c | 40 +++++++++---------
src/polygon.c | 6 +-
src/rats.c | 2 +-
src/remove.c | 4 +-
src/rotate.c | 16 ++++----
src/select.c | 78 +++++++++++++++++-----------------
src/toporouter.c | 4 +-
src/undo.c | 22 +++++-----
17 files changed, 258 insertions(+), 263 deletions(-)
=================
Commit Messages
=================
commit 27a0dc452f95d5bcc4355b8ad674ec1c0291d2eb
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Remove commented TEXT_IS_VISIBLE implementation
I'm cleaning up code which uses SWAP_IDENT, and this comment scored a hit.
:100644 100644 7cba5ac... 19f80b8... M src/macro.h
commit 877332ecfc670834ca960869a843206ce0772c25
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Remove unused parameter from various calls:
DrawObject
DrawVia
DrawViaName
DrawLine
DrawArc
DrawText
DrawRegularText
DrawPolygon
DrawElement
DrawElementPackage
DrawElementPackageLowLevel
DrawElementName
DrawElementPinsAndPads
DrawRat
DrawPin
DrawPinName
DrawPad
DrawPadName
:100644 100644 e5a463f... 9bad677... M src/action.c
:100644 100644 21e2bd9... 277717a... M src/change.c
:100644 100644 ee831b9... b93fcfb... M src/copy.c
:100644 100644 d6dce62... 665bf0c... M src/draw.c
:100644 100644 c0e23a3... fdd4c70... M src/draw.h
:100644 100644 5d2e92c... 7620d85... M src/find.c
:100644 100644 a708193... 70a097e... M src/hid/gtk/gui-drc-window.c
:100644 100644 7e9ebf2... efce2f0... M src/insert.c
:100644 100644 3ded0d0... c8d1938... M src/move.c
:100644 100644 37e0528... 2ff3433... M src/polygon.c
:100644 100644 24be309... c6cdb2d... M src/rats.c
:100644 100644 8defaf4... ab9aa5c... M src/remove.c
:100644 100644 9e19581... 017eb0c... M src/rotate.c
:100644 100644 3e978bb... e42d4bb... M src/select.c
:100644 100644 28a3764... 4d56243... M src/toporouter.c
:100644 100644 b14e3ec... 21b86f4... M src/undo.c
=========
Changes
=========
commit 27a0dc452f95d5bcc4355b8ad674ec1c0291d2eb
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Remove commented TEXT_IS_VISIBLE implementation
I'm cleaning up code which uses SWAP_IDENT, and this comment scored a hit.
diff --git a/src/macro.h b/src/macro.h
index 7cba5ac..19f80b8 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -151,12 +151,7 @@ extern int mem_any_set (unsigned char *, int);
/* ---------------------------------------------------------------------------
* Determines if text is actually visible
-#define TEXT_IS_VISIBLE(b, l, t) \
- (((l)->On && !TEST_FLAG(ONSILKFLAG, (t))) || \
- (TEST_FLAG(ONSILKFLAG, (t)) && (b)->ElementOn \
- && ((b)->InvisibleObjectsOn || \
- (TEST_FLAG(ONSOLDERFLAG, (t)) != 0) == SWAP_IDENT)))
-*/
+ */
#define TEXT_IS_VISIBLE(b, l, t) \
((l)->On)
commit 877332ecfc670834ca960869a843206ce0772c25
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
draw.c: Remove unused parameter from various calls:
DrawObject
DrawVia
DrawViaName
DrawLine
DrawArc
DrawText
DrawRegularText
DrawPolygon
DrawElement
DrawElementPackage
DrawElementPackageLowLevel
DrawElementName
DrawElementPinsAndPads
DrawRat
DrawPin
DrawPinName
DrawPad
DrawPadName
diff --git a/src/action.c b/src/action.c
index e5a463f..9bad677 100644
--- a/src/action.c
+++ b/src/action.c
@@ -586,7 +586,7 @@ ClearWarnings ()
if (TEST_FLAG (WARNFLAG, pin))
{
CLEAR_FLAG (WARNFLAG, pin);
- DrawPin (pin, 0);
+ DrawPin (pin);
}
}
ENDALL_LOOP;
@@ -595,7 +595,7 @@ ClearWarnings ()
if (TEST_FLAG (WARNFLAG, pad))
{
CLEAR_FLAG (WARNFLAG, pad);
- DrawPad (pad, 0);
+ DrawPad (pad);
}
}
ENDALL_LOOP;
@@ -1034,7 +1034,7 @@ NotifyMode (void)
if (gui->shift_is_pressed ())
ChangeObjectThermal (VIA_TYPE, via, via, via, PCB->ThermStyle);
IncrementUndoSerialNumber ();
- DrawVia (via, 0);
+ DrawVia (via);
Draw ();
}
break;
@@ -1118,7 +1118,7 @@ NotifyMode (void)
AddObjectToCreateUndoList (ARC_TYPE, CURRENT, arc, arc);
IncrementUndoSerialNumber ();
addedLines++;
- DrawArc (CURRENT, arc, 0);
+ DrawArc (CURRENT, arc);
Draw ();
Crosshair.AttachedBox.State = STATE_THIRD;
}
@@ -1151,7 +1151,7 @@ NotifyMode (void)
/* always re-draw it since I'm too lazy
* to tell if a selected flag changed
*/
- DrawElement (element, 0);
+ DrawElement (element);
Draw ();
hid_actionl ("Report", "Object", NULL);
}
@@ -1164,7 +1164,7 @@ NotifyMode (void)
{
/* this is not un-doable since LOCK isn't */
CLEAR_FLAG (SELECTEDFLAG, thing);
- DrawObject (type, ptr1, ptr2, 0);
+ DrawObject (type, ptr1, ptr2);
Draw ();
}
hid_actionl ("Report", "Object", NULL);
@@ -1222,7 +1222,7 @@ NotifyMode (void)
addedLines++;
AddObjectToCreateUndoList (RATLINE_TYPE, line, line, line);
IncrementUndoSerialNumber ();
- DrawRat (line, 0);
+ DrawRat (line);
Crosshair.AttachedLine.Point1.X =
Crosshair.AttachedLine.Point2.X;
Crosshair.AttachedLine.Point1.Y =
@@ -1275,7 +1275,7 @@ NotifyMode (void)
addedLines++;
AddObjectToCreateUndoList (LINE_TYPE, CURRENT, line, line);
- DrawLine (CURRENT, line, 0);
+ DrawLine (CURRENT, line);
/* place a via if vias are visible, the layer is
in a new group since the last line and there
isn't a pin already here */
@@ -1296,7 +1296,7 @@ NotifyMode (void)
NoFlags ())) != NULL)
{
AddObjectToCreateUndoList (VIA_TYPE, via, via, via);
- DrawVia (via, 0);
+ DrawVia (via);
}
/* copy the coordinates */
Crosshair.AttachedLine.Point1.X =
@@ -1327,7 +1327,7 @@ NotifyMode (void)
addedLines++;
AddObjectToCreateUndoList (LINE_TYPE, CURRENT, line, line);
IncrementUndoSerialNumber ();
- DrawLine (CURRENT, line, 0);
+ DrawLine (CURRENT, line);
/* move to new start point */
Crosshair.AttachedLine.Point1.X = Note.X;
Crosshair.AttachedLine.Point1.Y = Note.Y;
@@ -1374,7 +1374,7 @@ NotifyMode (void)
AddObjectToCreateUndoList (POLYGON_TYPE, CURRENT,
polygon, polygon);
IncrementUndoSerialNumber ();
- DrawPolygon (CURRENT, polygon, 0);
+ DrawPolygon (CURRENT, polygon);
Draw ();
}
@@ -1403,7 +1403,7 @@ NotifyMode (void)
{
AddObjectToCreateUndoList (TEXT_TYPE, CURRENT, text, text);
IncrementUndoSerialNumber ();
- DrawText (CURRENT, text, 0);
+ DrawText (CURRENT, text);
Draw ();
}
}
@@ -1594,7 +1594,7 @@ NotifyMode (void)
r_insert_entry (PCB->Data->name_tree[i],
(BoxType *) & (e->Name[i]), 0);
if (i == save_n)
- DrawElementName (e, 0);
+ DrawElementName (e);
}
}
}
@@ -2718,7 +2718,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
}
ELEMENT_LOOP (PCB->Data);
{
- DrawElementName (element, 0);
+ DrawElementName (element);
}
END_LOOP;
Draw ();
@@ -2909,7 +2909,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
if (TEST_FLAG (DISPLAYNAMEFLAG, pin))
ErasePinName (pin);
else
- DrawPinName (pin, 0);
+ DrawPinName (pin);
AddObjectToFlagUndoList (PIN_TYPE, ptr1, pin, pin);
TOGGLE_FLAG (DISPLAYNAMEFLAG, pin);
}
@@ -2919,7 +2919,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
if (TEST_FLAG (DISPLAYNAMEFLAG, pad))
ErasePadName (pad);
else
- DrawPadName (pad, 0);
+ DrawPadName (pad);
AddObjectToFlagUndoList (PAD_TYPE, ptr1, pad, pad);
TOGGLE_FLAG (DISPLAYNAMEFLAG, pad);
}
@@ -2933,7 +2933,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
if (TEST_FLAG (DISPLAYNAMEFLAG, (PinTypePtr) ptr2))
ErasePinName ((PinTypePtr) ptr2);
else
- DrawPinName ((PinTypePtr) ptr2, 0);
+ DrawPinName ((PinTypePtr) ptr2);
AddObjectToFlagUndoList (PIN_TYPE, ptr1, ptr2, ptr3);
TOGGLE_FLAG (DISPLAYNAMEFLAG, (PinTypePtr) ptr2);
SetChangedFlag (true);
@@ -2945,7 +2945,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
if (TEST_FLAG (DISPLAYNAMEFLAG, (PadTypePtr) ptr2))
ErasePadName ((PadTypePtr) ptr2);
else
- DrawPadName ((PadTypePtr) ptr2, 0);
+ DrawPadName ((PadTypePtr) ptr2);
AddObjectToFlagUndoList (PAD_TYPE, ptr1, ptr2, ptr3);
TOGGLE_FLAG (DISPLAYNAMEFLAG, (PadTypePtr) ptr2);
SetChangedFlag (true);
@@ -2956,7 +2956,7 @@ ActionDisplay (int argc, char **argv, int childX, int childY)
if (TEST_FLAG (DISPLAYNAMEFLAG, (PinTypePtr) ptr2))
EraseViaName ((PinTypePtr) ptr2);
else
- DrawViaName ((PinTypePtr) ptr2, 0);
+ DrawViaName ((PinTypePtr) ptr2);
AddObjectToFlagUndoList (VIA_TYPE, ptr1, ptr2, ptr3);
TOGGLE_FLAG (DISPLAYNAMEFLAG, (PinTypePtr) ptr2);
SetChangedFlag (true);
@@ -3833,7 +3833,7 @@ ActionAddRats (int argc, char **argv, int x, int y)
{
AddObjectToFlagUndoList (RATLINE_TYPE, shorty, shorty, shorty);
SET_FLAG (SELECTEDFLAG, shorty);
- DrawRat (shorty, 0);
+ DrawRat (shorty);
Draw ();
CenterDisplay ((shorty->Point2.X + shorty->Point1.X) / 2,
(shorty->Point2.Y + shorty->Point1.Y) / 2,
@@ -4772,7 +4772,7 @@ ActionToggleHideName (int argc, char **argv, int x, int y)
AddObjectToFlagUndoList (type, ptr1, ptr2, ptr3);
EraseElementName ((ElementTypePtr) ptr2);
TOGGLE_FLAG (HIDENAMEFLAG, (ElementTypePtr) ptr2);
- DrawElementName ((ElementTypePtr) ptr2, 0);
+ DrawElementName ((ElementTypePtr) ptr2);
Draw ();
IncrementUndoSerialNumber ();
}
@@ -4793,7 +4793,7 @@ ActionToggleHideName (int argc, char **argv, int x, int y)
element, element);
EraseElementName (element);
TOGGLE_FLAG (HIDENAMEFLAG, element);
- DrawElementName (element, 0);
+ DrawElementName (element);
changed = true;
}
}
@@ -6284,7 +6284,7 @@ ActionUndo (int argc, char **argv, int x, int y)
{
/* undo loses FOUNDFLAG */
SET_FLAG(FOUNDFLAG, ptr2);
- DrawLine (CURRENT, ptr2, 0);
+ DrawLine (CURRENT, ptr2);
}
Crosshair.AttachedLine.Point1.X =
Crosshair.AttachedLine.Point2.X = ptr2->Point2.X;
diff --git a/src/change.c b/src/change.c
index 21e2bd9..277717a 100644
--- a/src/change.c
+++ b/src/change.c
@@ -362,7 +362,7 @@ ChangeViaThermal (PinTypePtr Via)
ASSIGN_THERM (INDEXOFCURRENT, Delta, Via);
AddObjectToClearPolyUndoList (VIA_TYPE, Via, Via, Via, true);
ClearFromPolygon (PCB->Data, VIA_TYPE, CURRENT, Via);
- DrawVia (Via, 0);
+ DrawVia (Via);
return Via;
}
@@ -382,7 +382,7 @@ ChangePinThermal (ElementTypePtr element, PinTypePtr Pin)
ASSIGN_THERM (INDEXOFCURRENT, Delta, Pin);
AddObjectToClearPolyUndoList (PIN_TYPE, element, Pin, Pin, true);
ClearFromPolygon (PCB->Data, VIA_TYPE, CURRENT, Pin);
- DrawPin (Pin, 0);
+ DrawPin (Pin);
return Pin;
}
@@ -415,7 +415,7 @@ ChangeViaSize (PinTypePtr Via)
SetPinBoundingBox (Via);
r_insert_entry (PCB->Data->via_tree, (BoxType *) Via, 0);
ClearFromPolygon (PCB->Data, VIA_TYPE, Via, Via);
- DrawVia (Via, 0);
+ DrawVia (Via);
return (Via);
}
return (NULL);
@@ -448,7 +448,7 @@ ChangeVia2ndSize (PinTypePtr Via)
Via->Thickness = value;
}
ClearFromPolygon (PCB->Data, VIA_TYPE, Via, Via);
- DrawVia (Via, 0);
+ DrawVia (Via);
return (Via);
}
return (NULL);
@@ -482,7 +482,7 @@ ChangeViaClearSize (PinTypePtr Via)
SetPinBoundingBox (Via);
r_insert_entry (PCB->Data->via_tree, (BoxType *) Via, 0);
ClearFromPolygon (PCB->Data, VIA_TYPE, Via, Via);
- DrawVia (Via, 0);
+ DrawVia (Via);
Via->Element = NULL;
return (Via);
}
@@ -514,7 +514,7 @@ ChangePinSize (ElementTypePtr Element, PinTypePtr Pin)
/* SetElementBB updates all associated rtrees */
SetElementBoundingBox (PCB->Data, Element, &PCB->Font);
ClearFromPolygon (PCB->Data, PIN_TYPE, Element, Pin);
- DrawPin (Pin, 0);
+ DrawPin (Pin);
return (Pin);
}
return (NULL);
@@ -548,7 +548,7 @@ ChangePinClearSize (ElementTypePtr Element, PinTypePtr Pin)
/* SetElementBB updates all associated rtrees */
SetElementBoundingBox (PCB->Data, Element, &PCB->Font);
ClearFromPolygon (PCB->Data, PIN_TYPE, Element, Pin);
- DrawPin (Pin, 0);
+ DrawPin (Pin);
return (Pin);
}
@@ -575,7 +575,7 @@ ChangePadSize (ElementTypePtr Element, PadTypePtr Pad)
/* SetElementBB updates all associated rtrees */
SetElementBoundingBox (PCB->Data, Element, &PCB->Font);
ClearFromPolygon (PCB->Data, PAD_TYPE, Element, Pad);
- DrawPad (Pad, 0);
+ DrawPad (Pad);
return (Pad);
}
return (NULL);
@@ -609,7 +609,7 @@ ChangePadClearSize (ElementTypePtr Element, PadTypePtr Pad)
/* SetElementBB updates all associated rtrees */
SetElementBoundingBox (PCB->Data, Element, &PCB->Font);
ClearFromPolygon (PCB->Data, PAD_TYPE, Element, Pad);
- DrawPad (Pad, 0);
+ DrawPad (Pad);
return Pad;
}
@@ -646,7 +646,7 @@ ChangeElement2ndSize (ElementTypePtr Element)
pin->Thickness = value;
}
ClearFromPolygon (PCB->Data, PIN_TYPE, Element, pin);
- DrawPin (pin, 0);
+ DrawPin (pin);
}
}
END_LOOP;
@@ -683,7 +683,7 @@ ChangePin2ndSize (ElementTypePtr Element, PinTypePtr Pin)
Pin->Thickness = value;
}
ClearFromPolygon (PCB->Data, PIN_TYPE, Element, Pin);
- DrawPin (Pin, 0);
+ DrawPin (Pin);
return (Pin);
}
return (NULL);
@@ -711,7 +711,7 @@ ChangeLineSize (LayerTypePtr Layer, LineTypePtr Line)
SetLineBoundingBox (Line);
r_insert_entry (Layer->line_tree, (BoxTypePtr) Line, 0);
ClearFromPolygon (PCB->Data, LINE_TYPE, Layer, Line);
- DrawLine (Layer, Line, 0);
+ DrawLine (Layer, Line);
return (Line);
}
return (NULL);
@@ -744,7 +744,7 @@ ChangeLineClearSize (LayerTypePtr Layer, LineTypePtr Line)
SetLineBoundingBox (Line);
r_insert_entry (Layer->line_tree, (BoxTypePtr) Line, 0);
ClearFromPolygon (PCB->Data, LINE_TYPE, Layer, Line);
- DrawLine (Layer, Line, 0);
+ DrawLine (Layer, Line);
return (Line);
}
return (NULL);
@@ -792,7 +792,7 @@ ChangeArcSize (LayerTypePtr Layer, ArcTypePtr Arc)
SetArcBoundingBox (Arc);
r_insert_entry (Layer->arc_tree, (BoxTypePtr) Arc, 0);
ClearFromPolygon (PCB->Data, ARC_TYPE, Layer, Arc);
- DrawArc (Layer, Arc, 0);
+ DrawArc (Layer, Arc);
return (Arc);
}
return (NULL);
@@ -825,7 +825,7 @@ ChangeArcClearSize (LayerTypePtr Layer, ArcTypePtr Arc)
SetArcBoundingBox (Arc);
r_insert_entry (Layer->arc_tree, (BoxTypePtr) Arc, 0);
ClearFromPolygon (PCB->Data, ARC_TYPE, Layer, Arc);
- DrawArc (Layer, Arc, 0);
+ DrawArc (Layer, Arc);
return (Arc);
}
return (NULL);
@@ -853,7 +853,7 @@ ChangeTextSize (LayerTypePtr Layer, TextTypePtr Text)
SetTextBoundingBox (&PCB->Font, Text);
r_insert_entry (Layer->text_tree, (BoxTypePtr) Text, 0);
ClearFromPolygon (PCB->Data, TEXT_TYPE, Layer, Text);
- DrawText (Layer, Text, 0);
+ DrawText (Layer, Text);
return (Text);
}
return (NULL);
@@ -899,7 +899,7 @@ ChangeElementSize (ElementTypePtr Element)
END_LOOP;
if (PCB->ElementOn)
{
- DrawElement (Element, 0);
+ DrawElement (Element);
}
if (changed)
return (Element);
@@ -931,7 +931,7 @@ ChangeElementNameSize (ElementTypePtr Element)
r_insert_entry (PCB->Data->name_tree[n], (BoxType *) text, 0);
}
END_LOOP;
- DrawElementName (Element, 0);
+ DrawElementName (Element);
return (Element);
}
return (NULL);
@@ -949,7 +949,7 @@ ChangeViaName (PinTypePtr Via)
{
ErasePinName (Via);
Via->Name = NewName;
- DrawPinName (Via, 0);
+ DrawPinName (Via);
}
else
Via->Name = NewName;
@@ -969,7 +969,7 @@ ChangePinName (ElementTypePtr Element, PinTypePtr Pin)
{
ErasePinName (Pin);
Pin->Name = NewName;
- DrawPinName (Pin, 0);
+ DrawPinName (Pin);
}
else
Pin->Name = NewName;
@@ -989,7 +989,7 @@ ChangePadName (ElementTypePtr Element, PadTypePtr Pad)
{
ErasePadName (Pad);
Pad->Name = NewName;
- DrawPadName (Pad, 0);
+ DrawPadName (Pad);
}
else
Pad->Name = NewName;
@@ -1035,7 +1035,7 @@ ChangeElementText (PCBType *pcb, DataType *data, ElementTypePtr Element, int whi
& Element->Name[which].BoundingBox, 0);
if (pcb && which == NAME_INDEX (pcb))
- DrawElementName (Element, 0);
+ DrawElementName (Element);
return old;
}
@@ -1078,7 +1078,7 @@ ChangeTextName (LayerTypePtr Layer, TextTypePtr Text)
/* calculate size of the bounding box */
SetTextBoundingBox (&PCB->Font, Text);
ClearFromPolygon (PCB->Data, TEXT_TYPE, Layer, Text);
- DrawText (Layer, Text, 0);
+ DrawText (Layer, Text);
return (old);
}
@@ -1106,7 +1106,7 @@ ChangeElementSide (ElementTypePtr Element, LocationType yoff)
EraseElement (Element);
AddObjectToMirrorUndoList (ELEMENT_TYPE, Element, Element, Element, yoff);
MirrorElementCoordinates (PCB->Data, Element, yoff);
- DrawElement (Element, 0);
+ DrawElement (Element);
return (true);
}
@@ -1143,7 +1143,7 @@ ChangeLineJoin (LayerTypePtr Layer, LineTypePtr Line)
AddObjectToClearPolyUndoList (LINE_TYPE, Layer, Line, Line, true);
ClearFromPolygon (PCB->Data, LINE_TYPE, Layer, Line);
}
- DrawLine (Layer, Line, 0);
+ DrawLine (Layer, Line);
return (Line);
}
@@ -1190,7 +1190,7 @@ ChangeArcJoin (LayerTypePtr Layer, ArcTypePtr Arc)
ClearFromPolygon (PCB->Data, ARC_TYPE, Layer, Arc);
AddObjectToClearPolyUndoList (ARC_TYPE, Layer, Arc, Arc, true);
}
- DrawArc (Layer, Arc, 0);
+ DrawArc (Layer, Arc);
return (Arc);
}
@@ -1237,7 +1237,7 @@ ChangeTextJoin (LayerTypePtr Layer, TextTypePtr Text)
AddObjectToClearPolyUndoList (TEXT_TYPE, Layer, Text, Text, true);
ClearFromPolygon (PCB->Data, TEXT_TYPE, Layer, Text);
}
- DrawText (Layer, Text, 0);
+ DrawText (Layer, Text);
return (Text);
}
@@ -1404,7 +1404,7 @@ ChangePadSquare (ElementTypePtr Element, PadTypePtr Pad)
TOGGLE_FLAG (SQUAREFLAG, Pad);
AddObjectToClearPolyUndoList (PAD_TYPE, Element, Pad, Pad, true);
ClearFromPolygon (PCB->Data, PAD_TYPE, Element, Pad);
- DrawPad (Pad, 0);
+ DrawPad (Pad);
return (Pad);
}
@@ -1451,7 +1451,7 @@ ChangePinSquare (ElementTypePtr Element, PinTypePtr Pin)
TOGGLE_FLAG (SQUAREFLAG, Pin);
AddObjectToClearPolyUndoList (PIN_TYPE, Element, Pin, Pin, true);
ClearFromPolygon (PCB->Data, PIN_TYPE, Element, Pin);
- DrawPin (Pin, 0);
+ DrawPin (Pin);
return (Pin);
}
@@ -1494,7 +1494,7 @@ ChangeViaOctagon (PinTypePtr Via)
TOGGLE_FLAG (OCTAGONFLAG, Via);
AddObjectToClearPolyUndoList (VIA_TYPE, Via, Via, Via, true);
ClearFromPolygon (PCB->Data, VIA_TYPE, Via, Via);
- DrawVia (Via, 0);
+ DrawVia (Via);
return (Via);
}
@@ -1537,7 +1537,7 @@ ChangePinOctagon (ElementTypePtr Element, PinTypePtr Pin)
TOGGLE_FLAG (OCTAGONFLAG, Pin);
AddObjectToClearPolyUndoList (PIN_TYPE, Element, Pin, Pin, true);
ClearFromPolygon (PCB->Data, PIN_TYPE, Element, Pin);
- DrawPin (Pin, 0);
+ DrawPin (Pin);
return (Pin);
}
@@ -1588,7 +1588,7 @@ ChangeHole (PinTypePtr Via)
AddObjectTo2ndSizeUndoList (VIA_TYPE, Via, Via, Via);
Via->DrillingHole = Via->Thickness - MIN_PINORVIACOPPER;
}
- DrawVia (Via, 0);
+ DrawVia (Via);
Draw ();
return (true);
}
@@ -1604,7 +1604,7 @@ ChangePaste (PadTypePtr Pad)
ErasePad (Pad);
AddObjectToFlagUndoList (PAD_TYPE, Pad, Pad, Pad);
TOGGLE_FLAG (NOPASTEFLAG, Pad);
- DrawPad (Pad, 0);
+ DrawPad (Pad);
Draw ();
return (true);
}
@@ -1621,7 +1621,7 @@ ChangePolyClear (LayerTypePtr Layer, PolygonTypePtr Polygon)
AddObjectToFlagUndoList (POLYGON_TYPE, Layer, Polygon, Polygon);
TOGGLE_FLAG (CLEARPOLYFLAG, Polygon);
InitClip (PCB->Data, Layer, Polygon);
- DrawPolygon (Layer, Polygon, 0);
+ DrawPolygon (Layer, Polygon);
return (Polygon);
}
@@ -2354,7 +2354,7 @@ ChangePadMaskSize (ElementTypePtr Element, PadTypePtr Pad)
r_delete_entry (PCB->Data->pad_tree, &Pad->BoundingBox);
Pad->Mask = value;
SetElementBoundingBox (PCB->Data, Element, &PCB->Font);
- DrawPad (Pad, 0);
+ DrawPad (Pad);
return (Pad);
}
return (NULL);
@@ -2379,7 +2379,7 @@ ChangePinMaskSize (ElementTypePtr Element, PinTypePtr Pin)
r_delete_entry (PCB->Data->pin_tree, &Pin->BoundingBox);
Pin->Mask = value;
SetElementBoundingBox (PCB->Data, Element, &PCB->Font);
- DrawPin (Pin, 0);
+ DrawPin (Pin);
return (Pin);
}
return (NULL);
@@ -2404,7 +2404,7 @@ ChangeViaMaskSize (PinTypePtr Via)
Via->Mask = value;
SetPinBoundingBox (Via);
r_insert_entry (PCB->Data->via_tree, &Via->BoundingBox, 0);
- DrawVia (Via, 0);
+ DrawVia (Via);
return (Via);
}
return (NULL);
diff --git a/src/copy.c b/src/copy.c
index ee831b9..b93fcfb 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -198,7 +198,7 @@ CopyVia (PinTypePtr Via)
MaskFlags (Via->Flags, FOUNDFLAG));
if (!via)
return (via);
- DrawVia (via, 0);
+ DrawVia (via);
AddObjectToCreateUndoList (VIA_TYPE, via, via, via);
return (via);
}
@@ -221,7 +221,7 @@ CopyLine (LayerTypePtr Layer, LineTypePtr Line)
return (line);
if (Line->Number)
line->Number = strdup (Line->Number);
- DrawLine (Layer, line, 0);
+ DrawLine (Layer, line);
AddObjectToCreateUndoList (LINE_TYPE, Layer, line, line);
return (line);
}
@@ -240,7 +240,7 @@ CopyArc (LayerTypePtr Layer, ArcTypePtr Arc)
MaskFlags (Arc->Flags, FOUNDFLAG));
if (!arc)
return (arc);
- DrawArc (Layer, arc, 0);
+ DrawArc (Layer, arc);
AddObjectToCreateUndoList (ARC_TYPE, Layer, arc, arc);
return (arc);
}
@@ -257,7 +257,7 @@ CopyText (LayerTypePtr Layer, TextTypePtr Text)
Text->Y + DeltaY, Text->Direction,
Text->Scale, Text->TextString,
MaskFlags (Text->Flags, FOUNDFLAG));
- DrawText (Layer, text, 0);
+ DrawText (Layer, text);
AddObjectToCreateUndoList (TEXT_TYPE, Layer, text, text);
return (text);
}
@@ -277,7 +277,7 @@ CopyPolygon (LayerTypePtr Layer, PolygonTypePtr Polygon)
Layer->polygon_tree = r_create_tree (NULL, 0, 0);
r_insert_entry (Layer->polygon_tree, (BoxTypePtr) polygon, 0);
InitClip (PCB->Data, Layer, polygon);
- DrawPolygon (Layer, polygon, 0);
+ DrawPolygon (Layer, polygon);
AddObjectToCreateUndoList (POLYGON_TYPE, Layer, polygon, polygon);
return (polygon);
}
@@ -305,13 +305,13 @@ CopyElement (ElementTypePtr Element)
AddObjectToCreateUndoList (ELEMENT_TYPE, element, element, element);
if (PCB->ElementOn && (FRONT (element) || PCB->InvisibleObjectsOn))
{
- DrawElementName (element, 0);
- DrawElementPackage (element, 0);
+ DrawElementName (element);
+ DrawElementPackage (element);
didDraw = true;
}
if (PCB->PinOn)
{
- DrawElementPinsAndPads (element, 0);
+ DrawElementPinsAndPads (element);
didDraw = true;
}
#ifdef DEBUG
diff --git a/src/draw.c b/src/draw.c
index d6dce62..665bf0c 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -91,10 +91,10 @@ static void DrawPinOrViaNameLowLevel (PinTypePtr);
static void DrawPadLowLevel (hidGC, PadTypePtr, bool, bool);
static void DrawPadNameLowLevel (PadTypePtr);
static void DrawLineLowLevel (LineTypePtr);
-static void DrawRegularText (LayerTypePtr, TextTypePtr, int);
+static void DrawRegularText (LayerTypePtr, TextTypePtr);
static void DrawPolygonLowLevel (PolygonTypePtr);
static void DrawArcLowLevel (ArcTypePtr);
-static void DrawElementPackageLowLevel (ElementTypePtr Element, int);
+static void DrawElementPackageLowLevel (ElementTypePtr Element);
static void DrawPlainPolygon (LayerTypePtr Layer, PolygonTypePtr Polygon);
static void AddPart (void *);
static void SetPVColor (PinTypePtr, int);
@@ -235,7 +235,7 @@ backE_callback (const BoxType * b, void *cl)
if (!FRONT (element))
{
- DrawElementPackage (element, 0);
+ DrawElementPackage (element);
}
return 1;
}
@@ -247,7 +247,7 @@ backN_callback (const BoxType * b, void *cl)
ElementTypePtr element = (ElementTypePtr) text->Element;
if (!FRONT (element) && !TEST_FLAG (HIDENAMEFLAG, element))
- DrawElementName (element, 0);
+ DrawElementName (element);
return 0;
}
@@ -257,7 +257,7 @@ backPad_callback (const BoxType * b, void *cl)
PadTypePtr pad = (PadTypePtr) b;
if (!FRONT (pad))
- DrawPad (pad, 0);
+ DrawPad (pad);
return 1;
}
@@ -268,7 +268,7 @@ frontE_callback (const BoxType * b, void *cl)
if (FRONT (element))
{
- DrawElementPackage (element, 0);
+ DrawElementPackage (element);
}
return 1;
}
@@ -289,7 +289,7 @@ frontN_callback (const BoxType * b, void *cl)
ElementTypePtr element = (ElementTypePtr) text->Element;
if (FRONT (element) && !TEST_FLAG (HIDENAMEFLAG, element))
- DrawElementName (element, 0);
+ DrawElementName (element);
return 0;
}
@@ -328,7 +328,7 @@ hole_counting_callback (const BoxType * b, void *cl)
static int
rat_callback (const BoxType * b, void *cl)
{
- DrawRat ((RatTypePtr) b, 0);
+ DrawRat ((RatTypePtr) b);
return 1;
}
@@ -610,7 +610,7 @@ pad_callback (const BoxType * b, void *cl)
{
PadTypePtr pad = (PadTypePtr) b;
if (FRONT (pad))
- DrawPad (pad, 0);
+ DrawPad (pad);
return 1;
}
@@ -781,21 +781,21 @@ DrawRats (BoxTypePtr drawn_area)
static int
line_callback (const BoxType * b, void *cl)
{
- DrawLine ((LayerTypePtr) cl, (LineTypePtr) b, 0);
+ DrawLine ((LayerTypePtr) cl, (LineTypePtr) b);
return 1;
}
static int
arc_callback (const BoxType * b, void *cl)
{
- DrawArc ((LayerTypePtr) cl, (ArcTypePtr) b, 0);
+ DrawArc ((LayerTypePtr) cl, (ArcTypePtr) b);
return 1;
}
static int
text_callback (const BoxType * b, void *cl)
{
- DrawRegularText ((LayerTypePtr) cl, (TextTypePtr) b, 0);
+ DrawRegularText ((LayerTypePtr) cl, (TextTypePtr) b);
return 1;
}
@@ -1252,7 +1252,7 @@ DrawArcLowLevel (ArcTypePtr Arc)
* draws the package of an element
*/
static void
-DrawElementPackageLowLevel (ElementTypePtr Element, int unused)
+DrawElementPackageLowLevel (ElementTypePtr Element)
{
/* draw lines, arcs, text and pins */
ELEMENTLINE_LOOP (Element);
@@ -1271,7 +1271,7 @@ DrawElementPackageLowLevel (ElementTypePtr Element, int unused)
* draw a via object
*/
void
-DrawVia (PinTypePtr Via, int unused)
+DrawVia (PinTypePtr Via)
{
if (!Gathering)
SetPVColor (Via, VIA_TYPE);
@@ -1297,7 +1297,7 @@ DrawPlainVia (PinTypePtr Via, bool holeToo)
* draws the name of a via
*/
void
-DrawViaName (PinTypePtr Via, int unused)
+DrawViaName (PinTypePtr Via)
{
if (!Gathering)
{
@@ -1313,7 +1313,7 @@ DrawViaName (PinTypePtr Via, int unused)
* draw a pin object
*/
void
-DrawPin (PinTypePtr Pin, int unused)
+DrawPin (PinTypePtr Pin)
{
{
if (!Gathering)
@@ -1342,7 +1342,7 @@ DrawPlainPin (PinTypePtr Pin, bool holeToo)
* draws the name of a pin
*/
void
-DrawPinName (PinTypePtr Pin, int unused)
+DrawPinName (PinTypePtr Pin)
{
if (!Gathering)
{
@@ -1358,7 +1358,7 @@ DrawPinName (PinTypePtr Pin, int unused)
* draw a pad object
*/
void
-DrawPad (PadTypePtr Pad, int unused)
+DrawPad (PadTypePtr Pad)
{
if (!Gathering)
{
@@ -1387,7 +1387,7 @@ DrawPad (PadTypePtr Pad, int unused)
* draws the name of a pad
*/
void
-DrawPadName (PadTypePtr Pad, int unused)
+DrawPadName (PadTypePtr Pad)
{
if (!Gathering)
{
@@ -1405,7 +1405,7 @@ DrawPadName (PadTypePtr Pad, int unused)
* draws a line on a layer
*/
void
-DrawLine (LayerTypePtr Layer, LineTypePtr Line, int unused)
+DrawLine (LayerTypePtr Layer, LineTypePtr Line)
{
if (!Gathering)
{
@@ -1426,7 +1426,7 @@ DrawLine (LayerTypePtr Layer, LineTypePtr Line, int unused)
* draws a ratline
*/
void
-DrawRat (RatTypePtr Line, int unused)
+DrawRat (RatTypePtr Line)
{
if (!Gathering)
{
@@ -1475,7 +1475,7 @@ DrawRat (RatTypePtr Line, int unused)
* draws an arc on a layer
*/
void
-DrawArc (LayerTypePtr Layer, ArcTypePtr Arc, int unused)
+DrawArc (LayerTypePtr Layer, ArcTypePtr Arc)
{
if (!Arc->Thickness)
return;
@@ -1498,7 +1498,7 @@ DrawArc (LayerTypePtr Layer, ArcTypePtr Arc, int unused)
* draws a text on a layer
*/
void
-DrawText (LayerTypePtr Layer, TextTypePtr Text, int unused)
+DrawText (LayerTypePtr Layer, TextTypePtr Text)
{
int min_silk_line;
if (!Layer->On)
@@ -1519,7 +1519,7 @@ DrawText (LayerTypePtr Layer, TextTypePtr Text, int unused)
* draws text on a layer
*/
static void
-DrawRegularText (LayerTypePtr Layer, TextTypePtr Text, int unused)
+DrawRegularText (LayerTypePtr Layer, TextTypePtr Text)
{
int min_silk_line;
if (TEST_FLAG (SELECTEDFLAG, Text))
@@ -1538,7 +1538,7 @@ DrawRegularText (LayerTypePtr Layer, TextTypePtr Text, int unused)
* draws a polygon on a layer
*/
void
-DrawPolygon (LayerTypePtr Layer, PolygonTypePtr Polygon, int unused)
+DrawPolygon (LayerTypePtr Layer, PolygonTypePtr Polygon)
{
DrawPolygonLowLevel (Polygon);
}
@@ -1622,18 +1622,18 @@ DrawPlainPolygon (LayerTypePtr Layer, PolygonTypePtr Polygon)
* draws an element
*/
void
-DrawElement (ElementTypePtr Element, int unused)
+DrawElement (ElementTypePtr Element)
{
- DrawElementPackage (Element, unused);
- DrawElementName (Element, unused);
- DrawElementPinsAndPads (Element, unused);
+ DrawElementPackage (Element);
+ DrawElementName (Element);
+ DrawElementPinsAndPads (Element);
}
/* ---------------------------------------------------------------------------
* draws the name of an element
*/
void
-DrawElementName (ElementTypePtr Element, int unused)
+DrawElementName (ElementTypePtr Element)
{
if (gui->gui && TEST_FLAG (HIDENAMESFLAG, PCB))
return;
@@ -1654,7 +1654,7 @@ DrawElementName (ElementTypePtr Element, int unused)
* draws the package of an element
*/
void
-DrawElementPackage (ElementTypePtr Element, int unused)
+DrawElementPackage (ElementTypePtr Element)
{
/* set color and draw lines, arcs, text and pins */
if (doing_pinout || doing_assy)
@@ -1665,24 +1665,24 @@ DrawElementPackage (ElementTypePtr Element, int unused)
gui->set_color (Output.fgGC, PCB->ElementColor);
else
gui->set_color (Output.fgGC, PCB->InvisibleObjectsColor);
- DrawElementPackageLowLevel (Element, unused);
+ DrawElementPackageLowLevel (Element);
}
/* ---------------------------------------------------------------------------
* draw pins of an element
*/
void
-DrawElementPinsAndPads (ElementTypePtr Element, int unused)
+DrawElementPinsAndPads (ElementTypePtr Element)
{
PAD_LOOP (Element);
{
if (doing_pinout || doing_assy || FRONT (pad) || PCB->InvisibleObjectsOn)
- DrawPad (pad, unused);
+ DrawPad (pad);
}
END_LOOP;
PIN_LOOP (Element);
{
- DrawPin (pin, unused);
+ DrawPin (pin);
}
END_LOOP;
}
@@ -1907,51 +1907,51 @@ EraseObject (int type, void *lptr, void *ptr)
void
-DrawObject (int type, void *ptr1, void *ptr2, int unused)
+DrawObject (int type, void *ptr1, void *ptr2)
{
switch (type)
{
case VIA_TYPE:
if (PCB->ViaOn)
- DrawVia ((PinTypePtr) ptr2, 0);
+ DrawVia ((PinTypePtr) ptr2);
break;
case LINE_TYPE:
if (((LayerTypePtr) ptr1)->On)
- DrawLine ((LayerTypePtr) ptr1, (LineTypePtr) ptr2, 0);
+ DrawLine ((LayerTypePtr) ptr1, (LineTypePtr) ptr2);
break;
case ARC_TYPE:
if (((LayerTypePtr) ptr1)->On)
- DrawArc ((LayerTypePtr) ptr1, (ArcTypePtr) ptr2, 0);
+ DrawArc ((LayerTypePtr) ptr1, (ArcTypePtr) ptr2);
break;
case TEXT_TYPE:
if (((LayerTypePtr) ptr1)->On)
- DrawText ((LayerTypePtr) ptr1, (TextTypePtr) ptr2, 0);
+ DrawText ((LayerTypePtr) ptr1, (TextTypePtr) ptr2);
break;
case POLYGON_TYPE:
if (((LayerTypePtr) ptr1)->On)
- DrawPolygon ((LayerTypePtr) ptr1, (PolygonTypePtr) ptr2, 0);
+ DrawPolygon ((LayerTypePtr) ptr1, (PolygonTypePtr) ptr2);
break;
case ELEMENT_TYPE:
if (PCB->ElementOn &&
(FRONT ((ElementTypePtr) ptr2) || PCB->InvisibleObjectsOn))
- DrawElement ((ElementTypePtr) ptr2, 0);
+ DrawElement ((ElementTypePtr) ptr2);
break;
case RATLINE_TYPE:
if (PCB->RatOn)
- DrawRat ((RatTypePtr) ptr2, 0);
+ DrawRat ((RatTypePtr) ptr2);
break;
case PIN_TYPE:
if (PCB->PinOn)
- DrawPin ((PinTypePtr) ptr2, 0);
+ DrawPin ((PinTypePtr) ptr2);
break;
case PAD_TYPE:
if (PCB->PinOn)
- DrawPad ((PadTypePtr) ptr2, 0);
+ DrawPad ((PadTypePtr) ptr2);
break;
case ELEMENTNAME_TYPE:
if (PCB->ElementOn &&
(FRONT ((ElementTypePtr) ptr2) || PCB->InvisibleObjectsOn))
- DrawElementName ((ElementTypePtr) ptr1, 0);
+ DrawElementName ((ElementTypePtr) ptr1);
break;
}
}
@@ -1983,7 +1983,7 @@ hid_expose_callback (HID * hid, BoxType * region, void *item)
if (item)
{
doing_pinout = true;
- DrawElement ((ElementTypePtr)item, 0);
+ DrawElement ((ElementTypePtr)item);
doing_pinout = false;
}
else
diff --git a/src/draw.h b/src/draw.h
index c0e23a3..fdd4c70 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -38,23 +38,23 @@
void Draw (void);
void RedrawOutput (BoxTypePtr area);
void ClearAndRedrawOutput (void);
-void DrawVia (PinTypePtr, int);
-void DrawRat (RatTypePtr, int);
-void DrawViaName (PinTypePtr, int);
-void DrawPin (PinTypePtr, int);
-void DrawPinName (PinTypePtr, int);
-void DrawPad (PadTypePtr, int);
-void DrawPadName (PadTypePtr, int);
-void DrawLine (LayerTypePtr, LineTypePtr, int);
-void DrawArc (LayerTypePtr, ArcTypePtr, int);
-void DrawText (LayerTypePtr, TextTypePtr, int);
+void DrawVia (PinTypePtr);
+void DrawRat (RatTypePtr);
+void DrawViaName (PinTypePtr);
+void DrawPin (PinTypePtr);
+void DrawPinName (PinTypePtr);
+void DrawPad (PadTypePtr);
+void DrawPadName (PadTypePtr);
+void DrawLine (LayerTypePtr, LineTypePtr);
+void DrawArc (LayerTypePtr, ArcTypePtr);
+void DrawText (LayerTypePtr, TextTypePtr);
void DrawTextLowLevel (TextTypePtr, int);
-void DrawPolygon (LayerTypePtr, PolygonTypePtr, int);
-void DrawElement (ElementTypePtr, int);
-void DrawElementName (ElementTypePtr, int);
-void DrawElementPackage (ElementTypePtr, int);
-void DrawElementPinsAndPads (ElementTypePtr, int);
-void DrawObject (int, void *, void *, int);
+void DrawPolygon (LayerTypePtr, PolygonTypePtr);
+void DrawElement (ElementTypePtr);
+void DrawElementName (ElementTypePtr);
+void DrawElementPackage (ElementTypePtr);
+void DrawElementPinsAndPads (ElementTypePtr);
+void DrawObject (int, void *, void *);
void DrawLayer (LayerTypePtr, const BoxType *);
void EraseVia (PinTypePtr);
void EraseRat (RatTypePtr);
diff --git a/src/find.c b/src/find.c
index 5d2e92c..7620d85 100644
--- a/src/find.c
+++ b/src/find.c
@@ -2983,7 +2983,7 @@ PrintAndSelectUnusedPinsAndPadsOfElement (ElementTypePtr Element, FILE * FP)
CreateQuotedString (&oname, (char *)EMPTY (pin->Name));
fprintf (FP, "\t%s\n", oname.Data);
SET_FLAG (SELECTEDFLAG, pin);
- DrawPin (pin, 0);
+ DrawPin (pin);
}
/* reset found objects for the next pin */
@@ -3027,7 +3027,7 @@ PrintAndSelectUnusedPinsAndPadsOfElement (ElementTypePtr Element, FILE * FP)
CreateQuotedString (&oname, (char *)EMPTY (pad->Name));
fprintf (FP, "\t%s\n", oname.Data);
SET_FLAG (SELECTEDFLAG, pad);
- DrawPad (pad, 0);
+ DrawPad (pad);
}
/* reset found objects for the next pin */
@@ -3156,20 +3156,20 @@ DrawNewConnections (void)
/* draw all new lines */
position = LineList[layer].DrawLocation;
for (; position < LineList[layer].Number; position++)
- DrawLine (LAYER_PTR (layer), LINELIST_ENTRY (layer, position), 0);
+ DrawLine (LAYER_PTR (layer), LINELIST_ENTRY (layer, position));
LineList[layer].DrawLocation = LineList[layer].Number;
/* draw all new arcs */
position = ArcList[layer].DrawLocation;
for (; position < ArcList[layer].Number; position++)
- DrawArc (LAYER_PTR (layer), ARCLIST_ENTRY (layer, position), 0);
+ DrawArc (LAYER_PTR (layer), ARCLIST_ENTRY (layer, position));
ArcList[layer].DrawLocation = ArcList[layer].Number;
/* draw all new polygons */
position = PolygonList[layer].DrawLocation;
for (; position < PolygonList[layer].Number; position++)
DrawPolygon
- (LAYER_PTR (layer), POLYGONLIST_ENTRY (layer, position), 0);
+ (LAYER_PTR (layer), POLYGONLIST_ENTRY (layer, position));
PolygonList[layer].DrawLocation = PolygonList[layer].Number;
}
}
@@ -3181,7 +3181,7 @@ DrawNewConnections (void)
position = PadList[i].DrawLocation;
for (; position < PadList[i].Number; position++)
- DrawPad (PADLIST_ENTRY (i, position), 0);
+ DrawPad (PADLIST_ENTRY (i, position));
PadList[i].DrawLocation = PadList[i].Number;
}
@@ -3195,10 +3195,10 @@ DrawNewConnections (void)
if (TEST_FLAG (PINFLAG, pv))
{
if (PCB->PinOn)
- DrawPin (pv, 0);
+ DrawPin (pv);
}
else if (PCB->ViaOn)
- DrawVia (pv, 0);
+ DrawVia (pv);
PVList.DrawLocation++;
}
/* draw the new rat-lines */
@@ -3206,7 +3206,7 @@ DrawNewConnections (void)
{
position = RatList.DrawLocation;
for (; position < RatList.Number; position++)
- DrawRat (RATLIST_ENTRY (position), 0);
+ DrawRat (RATLIST_ENTRY (position));
RatList.DrawLocation = RatList.Number;
}
}
@@ -3453,7 +3453,7 @@ ResetFoundPinsViasAndPads (bool AndDraw)
AddObjectToFlagUndoList (VIA_TYPE, via, via, via);
CLEAR_FLAG (TheFlag, via);
if (AndDraw)
- DrawVia (via, 0);
+ DrawVia (via);
change = true;
}
}
@@ -3468,7 +3468,7 @@ ResetFoundPinsViasAndPads (bool AndDraw)
AddObjectToFlagUndoList (PIN_TYPE, element, pin, pin);
CLEAR_FLAG (TheFlag, pin);
if (AndDraw)
- DrawPin (pin, 0);
+ DrawPin (pin);
change = true;
}
}
@@ -3481,7 +3481,7 @@ ResetFoundPinsViasAndPads (bool AndDraw)
AddObjectToFlagUndoList (PAD_TYPE, element, pad, pad);
CLEAR_FLAG (TheFlag, pad);
if (AndDraw)
- DrawPad (pad, 0);
+ DrawPad (pad);
change = true;
}
}
@@ -3509,7 +3509,7 @@ ResetFoundLinesAndPolygons (bool AndDraw)
AddObjectToFlagUndoList (RATLINE_TYPE, line, line, line);
CLEAR_FLAG (TheFlag, line);
if (AndDraw)
- DrawRat (line, 0);
+ DrawRat (line);
change = true;
}
}
@@ -3522,7 +3522,7 @@ ResetFoundLinesAndPolygons (bool AndDraw)
AddObjectToFlagUndoList (LINE_TYPE, layer, line, line);
CLEAR_FLAG (TheFlag, line);
if (AndDraw)
- DrawLine (layer, line, 0);
+ DrawLine (layer, line);
change = true;
}
}
@@ -3535,7 +3535,7 @@ ResetFoundLinesAndPolygons (bool AndDraw)
AddObjectToFlagUndoList (ARC_TYPE, layer, arc, arc);
CLEAR_FLAG (TheFlag, arc);
if (AndDraw)
- DrawArc (layer, arc, 0);
+ DrawArc (layer, arc);
change = true;
}
}
@@ -3548,7 +3548,7 @@ ResetFoundLinesAndPolygons (bool AndDraw)
AddObjectToFlagUndoList (POLYGON_TYPE, layer, polygon, polygon);
CLEAR_FLAG (TheFlag, polygon);
if (AndDraw)
- DrawPolygon (layer, polygon, 0);
+ DrawPolygon (layer, polygon);
change = true;
}
}
@@ -3858,8 +3858,8 @@ drc_callback (DataTypePtr data, LayerTypePtr layer, PolygonTypePtr polygon,
doIsBad:
AddObjectToFlagUndoList (POLYGON_TYPE, layer, polygon, polygon);
SET_FLAG (FOUNDFLAG, polygon);
- DrawPolygon (layer, polygon, 0);
- DrawObject (type, ptr1, ptr2, 0);
+ DrawPolygon (layer, polygon);
+ DrawObject (type, ptr1, ptr2);
drcerr_count++;
LocateError (&x, &y);
BuildObjectList (&object_count, &object_id_list, &object_type_list);
@@ -3985,7 +3985,7 @@ DRCAll (void)
{
AddObjectToFlagUndoList (LINE_TYPE, layer, line, line);
SET_FLAG (TheFlag, line);
- DrawLine (layer, line, 0);
+ DrawLine (layer, line);
drcerr_count++;
SetThing (LINE_TYPE, layer, line, line);
LocateError (&x, &y);
@@ -4029,7 +4029,7 @@ DRCAll (void)
{
AddObjectToFlagUndoList (ARC_TYPE, layer, arc, arc);
SET_FLAG (TheFlag, arc);
- DrawArc (layer, arc, 0);
+ DrawArc (layer, arc);
drcerr_count++;
SetThing (ARC_TYPE, layer, arc, arc);
LocateError (&x, &y);
@@ -4074,7 +4074,7 @@ DRCAll (void)
{
AddObjectToFlagUndoList (PIN_TYPE, element, pin, pin);
SET_FLAG (TheFlag, pin);
- DrawPin (pin, 0);
+ DrawPin (pin);
drcerr_count++;
SetThing (PIN_TYPE, element, pin, pin);
LocateError (&x, &y);
@@ -4108,7 +4108,7 @@ DRCAll (void)
{
AddObjectToFlagUndoList (PIN_TYPE, element, pin, pin);
SET_FLAG (TheFlag, pin);
- DrawPin (pin, 0);
+ DrawPin (pin);
drcerr_count++;
SetThing (PIN_TYPE, element, pin, pin);
LocateError (&x, &y);
@@ -4151,7 +4151,7 @@ DRCAll (void)
{
AddObjectToFlagUndoList (PAD_TYPE, element, pad, pad);
SET_FLAG (TheFlag, pad);
- DrawPad (pad, 0);
+ DrawPad (pad);
drcerr_count++;
SetThing (PAD_TYPE, element, pad, pad);
LocateError (&x, &y);
@@ -4196,7 +4196,7 @@ DRCAll (void)
{
AddObjectToFlagUndoList (VIA_TYPE, via, via, via);
SET_FLAG (TheFlag, via);
- DrawVia (via, 0);
+ DrawVia (via);
drcerr_count++;
SetThing (VIA_TYPE, via, via, via);
LocateError (&x, &y);
@@ -4230,7 +4230,7 @@ DRCAll (void)
{
AddObjectToFlagUndoList (VIA_TYPE, via, via, via);
SET_FLAG (TheFlag, via);
- DrawVia (via, 0);
+ DrawVia (via);
drcerr_count++;
SetThing (VIA_TYPE, via, via, via);
LocateError (&x, &y);
@@ -4278,7 +4278,7 @@ DRCAll (void)
if (line->Thickness < PCB->minSlk)
{
SET_FLAG (TheFlag, line);
- DrawLine (layer, line, 0);
+ DrawLine (layer, line);
drcerr_count++;
SetThing (LINE_TYPE, layer, line, line);
LocateError (&x, &y);
@@ -4332,7 +4332,7 @@ DRCAll (void)
int buflen;
SET_FLAG (TheFlag, element);
- DrawElement (element, 0);
+ DrawElement (element);
drcerr_count++;
SetThing (ELEMENT_TYPE, element, element, element);
LocateError (&x, &y);
diff --git a/src/hid/gtk/gui-drc-window.c b/src/hid/gtk/gui-drc-window.c
index a708193..70a097e 100644
--- a/src/hid/gtk/gui-drc-window.c
+++ b/src/hid/gtk/gui-drc-window.c
@@ -102,7 +102,7 @@ unset_found_flags (int AndDraw)
{
AddObjectToFlagUndoList (VIA_TYPE, via, via, via);
CLEAR_FLAG (flag, via);
- DrawVia (via, 0);
+ DrawVia (via);
change = true;
}
}
@@ -115,7 +115,7 @@ unset_found_flags (int AndDraw)
{
AddObjectToFlagUndoList (PIN_TYPE, element, pin, pin);
CLEAR_FLAG (flag, pin);
- DrawPin (pin, 0);
+ DrawPin (pin);
change = true;
}
}
@@ -126,7 +126,7 @@ unset_found_flags (int AndDraw)
{
AddObjectToFlagUndoList (PAD_TYPE, element, pad, pad);
CLEAR_FLAG (flag, pad);
- DrawPad (pad, 0);
+ DrawPad (pad);
change = true;
}
}
@@ -139,7 +139,7 @@ unset_found_flags (int AndDraw)
{
AddObjectToFlagUndoList (RATLINE_TYPE, line, line, line);
CLEAR_FLAG (flag, line);
- DrawRat (line, 0);
+ DrawRat (line);
change = true;
}
}
@@ -150,7 +150,7 @@ unset_found_flags (int AndDraw)
{
AddObjectToFlagUndoList (LINE_TYPE, layer, line, line);
CLEAR_FLAG (flag, line);
- DrawLine (layer, line, 0);
+ DrawLine (layer, line);
change = true;
}
}
@@ -161,7 +161,7 @@ unset_found_flags (int AndDraw)
{
AddObjectToFlagUndoList (ARC_TYPE, layer, arc, arc);
CLEAR_FLAG (flag, arc);
- DrawArc (layer, arc, 0);
+ DrawArc (layer, arc);
change = true;
}
}
@@ -172,7 +172,7 @@ unset_found_flags (int AndDraw)
{
AddObjectToFlagUndoList (POLYGON_TYPE, layer, polygon, polygon);
CLEAR_FLAG (flag, polygon);
- DrawPolygon (layer, polygon, 0);
+ DrawPolygon (layer, polygon);
change = true;
}
}
@@ -238,7 +238,7 @@ selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
case POLYGON_TYPE:
ChangeGroupVisibility (GetLayerNumber (PCB->Data, (LayerTypePtr) ptr1), true, true);
}
- DrawObject (object_type, ptr1, ptr2, 0);
+ DrawObject (object_type, ptr1, ptr2);
}
SetChangedFlag (true);
IncrementUndoSerialNumber ();
diff --git a/src/insert.c b/src/insert.c
index 7e9ebf2..efce2f0 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -106,14 +106,14 @@ InsertPointIntoRat (RatTypePtr Rat)
return newone;
AddObjectToCreateUndoList (LINE_TYPE, CURRENT, newone, newone);
EraseRat (Rat);
- DrawLine (CURRENT, newone, 0);
+ DrawLine (CURRENT, newone);
newone = CreateDrawnLineOnLayer (CURRENT, Rat->Point2.X, Rat->Point2.Y,
InsertX, InsertY, Settings.LineThickness,
2 * Settings.Keepaway, Rat->Flags);
if (newone)
{
AddObjectToCreateUndoList (LINE_TYPE, CURRENT, newone, newone);
- DrawLine (CURRENT, newone, 0);
+ DrawLine (CURRENT, newone);
}
MoveObjectToRemoveUndoList (RATLINE_TYPE, Rat, Rat, Rat);
Draw ();
@@ -142,7 +142,7 @@ InsertPointIntoLine (LayerTypePtr Layer, LineTypePtr Line)
Line->Point2.Y = InsertY;
SetLineBoundingBox (Line);
r_insert_entry (Layer->line_tree, (BoxTypePtr) Line, 0);
- DrawLine (Layer, Line, 0);
+ DrawLine (Layer, Line);
/* we must create after playing with Line since creation may
* invalidate the line pointer
*/
@@ -152,7 +152,7 @@ InsertPointIntoLine (LayerTypePtr Layer, LineTypePtr Line)
Line->Flags)))
{
AddObjectToCreateUndoList (LINE_TYPE, Layer, line, line);
- DrawLine (Layer, line, 0);
+ DrawLine (Layer, line);
/* creation call adds it to the rtree */
}
Draw ();
@@ -205,7 +205,7 @@ InsertPointIntoPolygon (LayerTypePtr Layer, PolygonTypePtr Polygon)
InitClip (PCB->Data, Layer, Polygon);
if (Forcible || !RemoveExcessPolygonPoints (Layer, Polygon))
{
- DrawPolygon (Layer, Polygon, 0);
+ DrawPolygon (Layer, Polygon);
Draw ();
}
return (&Polygon->Points[InsertAt]);
diff --git a/src/move.c b/src/move.c
index 3ded0d0..c8d1938 100644
--- a/src/move.c
+++ b/src/move.c
@@ -192,7 +192,7 @@ MoveElementName (ElementTypePtr Element)
r_insert_entry (PCB->Data->name_tree[n], (BoxType *) text, 0);
}
END_LOOP;
- DrawElementName (Element, 0);
+ DrawElementName (Element);
Draw ();
}
else
@@ -222,8 +222,8 @@ MoveElement (ElementTypePtr Element)
{
EraseElement (Element);
MoveElementLowLevel (PCB->Data, Element, DeltaX, DeltaY);
- DrawElementName (Element, 0);
- DrawElementPackage (Element, 0);
+ DrawElementName (Element);
+ DrawElementPackage (Element);
didDraw = true;
}
else
@@ -234,7 +234,7 @@ MoveElement (ElementTypePtr Element)
}
if (PCB->PinOn)
{
- DrawElementPinsAndPads (Element, 0);
+ DrawElementPinsAndPads (Element);
didDraw = true;
}
if (didDraw)
@@ -257,7 +257,7 @@ MoveVia (PinTypePtr Via)
ClearFromPolygon (PCB->Data, VIA_TYPE, Via, Via);
if (PCB->ViaOn)
{
- DrawVia (Via, 0);
+ DrawVia (Via);
Draw ();
}
return (Via);
@@ -278,7 +278,7 @@ MoveLine (LayerTypePtr Layer, LineTypePtr Line)
ClearFromPolygon (PCB->Data, LINE_TYPE, Layer, Line);
if (Layer->On)
{
- DrawLine (Layer, Line, 0);
+ DrawLine (Layer, Line);
Draw ();
}
return (Line);
@@ -296,7 +296,7 @@ MoveArc (LayerTypePtr Layer, ArcTypePtr Arc)
{
EraseArc (Arc);
MOVE_ARC_LOWLEVEL (Arc, DeltaX, DeltaY);
- DrawArc (Layer, Arc, 0);
+ DrawArc (Layer, Arc);
Draw ();
}
else
@@ -320,7 +320,7 @@ MoveText (LayerTypePtr Layer, TextTypePtr Text)
{
EraseText (Layer, Text);
MOVE_TEXT_LOWLEVEL (Text, DeltaX, DeltaY);
- DrawText (Layer, Text, 0);
+ DrawText (Layer, Text);
Draw ();
}
else
@@ -361,7 +361,7 @@ MovePolygon (LayerTypePtr Layer, PolygonTypePtr Polygon)
InitClip (PCB->Data, Layer, Polygon);
if (Layer->On)
{
- DrawPolygon (Layer, Polygon, 0);
+ DrawPolygon (Layer, Polygon);
Draw ();
}
return (Polygon);
@@ -385,7 +385,7 @@ MoveLinePoint (LayerTypePtr Layer, LineTypePtr Line, PointTypePtr Point)
ClearFromPolygon (PCB->Data, LINE_TYPE, Layer, Line);
if (Layer->On)
{
- DrawLine (Layer, Line, 0);
+ DrawLine (Layer, Line);
Draw ();
}
return (Line);
@@ -400,7 +400,7 @@ MoveLinePoint (LayerTypePtr Layer, LineTypePtr Line, PointTypePtr Point)
r_insert_entry (PCB->Data->rat_tree, &Line->BoundingBox, 0);
if (PCB->RatOn)
{
- DrawRat ((RatTypePtr) Line, 0);
+ DrawRat ((RatTypePtr) Line);
Draw ();
}
return (Line);
@@ -426,7 +426,7 @@ MovePolygonPoint (LayerTypePtr Layer, PolygonTypePtr Polygon,
InitClip (PCB->Data, Layer, Polygon);
if (Layer->On)
{
- DrawPolygon (Layer, Polygon, 0);
+ DrawPolygon (Layer, Polygon);
Draw ();
}
return (Point);
@@ -492,7 +492,7 @@ MoveArcToLayer (LayerTypePtr Layer, ArcTypePtr Arc)
}
if (Dest == Layer && Layer->On)
{
- DrawArc (Layer, Arc, 0);
+ DrawArc (Layer, Arc);
Draw ();
}
if (((long int) Dest == -1) || Dest == Layer)
@@ -504,7 +504,7 @@ MoveArcToLayer (LayerTypePtr Layer, ArcTypePtr Arc)
newone = (ArcTypePtr)MoveArcToLayerLowLevel (Layer, Arc, Dest);
ClearFromPolygon (PCB->Data, ARC_TYPE, Dest, Arc);
if (Dest->On)
- DrawArc (Dest, newone, 0);
+ DrawArc (Dest, newone);
Draw ();
return (newone);
}
@@ -535,7 +535,7 @@ MoveRatToLayer (RatTypePtr Rat)
if (PCB->RatOn)
EraseRat (Rat);
MoveObjectToRemoveUndoList (RATLINE_TYPE, Rat, Rat, Rat);
- DrawLine (Dest, newone, 0);
+ DrawLine (Dest, newone);
Draw ();
return (newone);
}
@@ -563,7 +563,7 @@ moveline_callback (const BoxType * b, void *cl)
NoFlags ())) != NULL)
{
AddObjectToCreateUndoList (VIA_TYPE, via, via, via);
- DrawVia (via, 0);
+ DrawVia (via);
}
longjmp (i->env, 1);
}
@@ -583,7 +583,7 @@ MoveLineToLayer (LayerTypePtr Layer, LineTypePtr Line)
}
if (Dest == Layer && Layer->On)
{
- DrawLine (Layer, Line, 0);
+ DrawLine (Layer, Line);
Draw ();
}
if (((long int) Dest == -1) || Dest == Layer)
@@ -597,7 +597,7 @@ MoveLineToLayer (LayerTypePtr Layer, LineTypePtr Line)
Line = NULL;
ClearFromPolygon (PCB->Data, LINE_TYPE, Dest, newone);
if (Dest->On)
- DrawLine (Dest, newone, 0);
+ DrawLine (Dest, newone);
Draw ();
if (!PCB->ViaOn || MoreToCome ||
GetLayerGroupNumberByPointer (Layer) ==
@@ -688,7 +688,7 @@ MoveTextToLayer (LayerTypePtr Layer, TextTypePtr Text)
EraseText (Layer, Text);
newone = (TextTypePtr)MoveTextToLayerLowLevel (Layer, Text, Dest);
if (Dest->On)
- DrawText (Dest, newone, 0);
+ DrawText (Dest, newone);
if (Layer->On || Dest->On)
Draw ();
return (newone);
@@ -775,7 +775,7 @@ MovePolygonToLayer (LayerTypePtr Layer, PolygonTypePtr Polygon)
InitClip (PCB->Data, Dest, newone);
if (Dest->On)
{
- DrawPolygon (Dest, newone, 0);
+ DrawPolygon (Dest, newone);
Draw ();
}
return (newone);
diff --git a/src/polygon.c b/src/polygon.c
index 37e0528..2ff3433 100644
--- a/src/polygon.c
+++ b/src/polygon.c
@@ -1408,7 +1408,7 @@ CopyAttachedPolygonToLayer (void)
CURRENT->polygon_tree = r_create_tree (NULL, 0, 0);
r_insert_entry (CURRENT->polygon_tree, (BoxType *) polygon, 0);
InitClip (PCB->Data, CURRENT, polygon);
- DrawPolygon (CURRENT, polygon, 0);
+ DrawPolygon (CURRENT, polygon);
SetChangedFlag (true);
/* reset state of attached line */
@@ -1836,7 +1836,7 @@ MorphPolygon (LayerTypePtr layer, PolygonTypePtr poly)
p = p->f; /* go to next pline */
newone->Clipped->b = newone->Clipped->f = newone->Clipped; /* unlink from others */
r_insert_entry (layer->polygon_tree, (BoxType *) newone, 0);
- DrawPolygon (layer, newone, 0);
+ DrawPolygon (layer, newone);
}
else
{
@@ -1951,7 +1951,7 @@ PolyToPolygonsOnLayer (DataType *Destination, LayerType *Layer,
Layer->polygon_tree = r_create_tree (NULL, 0, 0);
r_insert_entry (Layer->polygon_tree, (BoxType *) Polygon, 0);
- DrawPolygon (Layer, Polygon, 0);
+ DrawPolygon (Layer, Polygon);
/* add to undo list */
AddObjectToCreateUndoList (POLYGON_TYPE, Layer, Polygon, Polygon);
}
diff --git a/src/rats.c b/src/rats.c
index 24be309..c6cdb2d 100644
--- a/src/rats.c
+++ b/src/rats.c
@@ -699,7 +699,7 @@ DrawShortestRats (NetListTypePtr Netl, void (*funcp) (register ConnectionTypePtr
if (distance == 0)
SET_FLAG (VIAFLAG, line);
AddObjectToCreateUndoList (RATLINE_TYPE, line, line, line);
- DrawRat (line, 0);
+ DrawRat (line);
changed = true;
}
}
diff --git a/src/remove.c b/src/remove.c
index 8defaf4..ab9aa5c 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -541,7 +541,7 @@ RemovePolygonContour (LayerTypePtr Layer,
/* redraw polygon if necessary */
if (Layer->On)
{
- DrawPolygon (Layer, Polygon, 0);
+ DrawPolygon (Layer, Polygon);
if (!Bulk)
Draw ();
}
@@ -595,7 +595,7 @@ RemovePolygonPoint (LayerTypePtr Layer,
/* redraw polygon if necessary */
if (Layer->On)
{
- DrawPolygon (Layer, Polygon, 0);
+ DrawPolygon (Layer, Polygon);
if (!Bulk)
Draw ();
}
diff --git a/src/rotate.c b/src/rotate.c
index 9e19581..017eb0c 100644
--- a/src/rotate.c
+++ b/src/rotate.c
@@ -184,7 +184,7 @@ RotateText (LayerTypePtr Layer, TextTypePtr Text)
RotateTextLowLevel (Text, CenterX, CenterY, Number);
r_insert_entry (Layer->text_tree, (BoxTypePtr) Text, 0);
ClearFromPolygon (PCB->Data, TEXT_TYPE, Layer, Text);
- DrawText (Layer, Text, 0);
+ DrawText (Layer, Text);
Draw ();
return (Text);
}
@@ -285,12 +285,12 @@ RotateLinePoint (LayerTypePtr Layer, LineTypePtr Line, PointTypePtr Point)
{
r_insert_entry (Layer->line_tree, (BoxTypePtr) Line, 0);
ClearFromPolygon (PCB->Data, LINE_TYPE, Layer, Line);
- DrawLine (Layer, Line, 0);
+ DrawLine (Layer, Line);
}
else
{
r_insert_entry (PCB->Data->rat_tree, (BoxTypePtr) Line, 0);
- DrawRat ((RatTypePtr) Line, 0);
+ DrawRat ((RatTypePtr) Line);
}
Draw ();
return (Line);
@@ -306,7 +306,7 @@ RotateArc (LayerTypePtr Layer, ArcTypePtr Arc)
r_delete_entry (Layer->arc_tree, (BoxTypePtr) Arc);
RotateArcLowLevel (Arc, CenterX, CenterY, Number);
r_insert_entry (Layer->arc_tree, (BoxTypePtr) Arc, 0);
- DrawArc (Layer, Arc, 0);
+ DrawArc (Layer, Arc);
Draw ();
return (Arc);
}
@@ -319,7 +319,7 @@ RotateElement (ElementTypePtr Element)
{
EraseElement (Element);
RotateElementLowLevel (PCB->Data, Element, CenterX, CenterY, Number);
- DrawElement (Element, 0);
+ DrawElement (Element);
Draw ();
return (Element);
}
@@ -338,7 +338,7 @@ RotateElementName (ElementTypePtr Element)
r_insert_entry (PCB->Data->name_tree[n], (BoxType *) text, 0);
}
END_LOOP;
- DrawElementName (Element, 0);
+ DrawElementName (Element);
Draw ();
return (Element);
}
@@ -399,12 +399,12 @@ RotateObject (int Type, void *Ptr1, void *Ptr2, void *Ptr3,
{
r_insert_entry (ptr->Layer->line_tree, (BoxType *) ptr->Line, 0);
ClearFromPolygon (PCB->Data, LINE_TYPE, ptr->Layer, ptr->Line);
- DrawLine (ptr->Layer, ptr->Line, 0);
+ DrawLine (ptr->Layer, ptr->Line);
}
else
{
r_insert_entry (PCB->Data->rat_tree, (BoxType *) ptr->Line, 0);
- DrawRat ((RatTypePtr) ptr->Line, 0);
+ DrawRat ((RatTypePtr) ptr->Line);
}
Crosshair.AttachedObject.RubberbandN--;
ptr++;
diff --git a/src/select.c b/src/select.c
index 3e978bb..e42d4bb 100644
--- a/src/select.c
+++ b/src/select.c
@@ -91,7 +91,7 @@ SelectPin (LibraryEntryTypePtr entry, bool toggle)
}
else
SET_FLAG (SELECTEDFLAG, pin);
- DrawPin (pin, 0);
+ DrawPin (pin);
break;
}
case PAD_TYPE:
@@ -107,7 +107,7 @@ SelectPin (LibraryEntryTypePtr entry, bool toggle)
}
else
SET_FLAG (SELECTEDFLAG, pad);
- DrawPad (pad, 0);
+ DrawPad (pad);
break;
}
}
@@ -137,7 +137,7 @@ SelectObject (void)
case VIA_TYPE:
AddObjectToFlagUndoList (VIA_TYPE, ptr1, ptr1, ptr1);
TOGGLE_FLAG (SELECTEDFLAG, (PinTypePtr) ptr1);
- DrawVia ((PinTypePtr) ptr1, 0);
+ DrawVia ((PinTypePtr) ptr1);
break;
case LINE_TYPE:
@@ -147,7 +147,7 @@ SelectObject (void)
layer = (LayerTypePtr) ptr1;
AddObjectToFlagUndoList (LINE_TYPE, ptr1, ptr2, ptr2);
TOGGLE_FLAG (SELECTEDFLAG, line);
- DrawLine (layer, line, 0);
+ DrawLine (layer, line);
break;
}
@@ -157,7 +157,7 @@ SelectObject (void)
AddObjectToFlagUndoList (RATLINE_TYPE, ptr1, ptr1, ptr1);
TOGGLE_FLAG (SELECTEDFLAG, rat);
- DrawRat (rat, 0);
+ DrawRat (rat);
break;
}
@@ -168,7 +168,7 @@ SelectObject (void)
layer = (LayerTypePtr) ptr1;
AddObjectToFlagUndoList (ARC_TYPE, ptr1, ptr2, ptr2);
TOGGLE_FLAG (SELECTEDFLAG, arc);
- DrawArc (layer, arc, 0);
+ DrawArc (layer, arc);
break;
}
@@ -179,7 +179,7 @@ SelectObject (void)
layer = (LayerTypePtr) ptr1;
AddObjectToFlagUndoList (TEXT_TYPE, ptr1, ptr2, ptr2);
TOGGLE_FLAG (SELECTEDFLAG, text);
- DrawText (layer, text, 0);
+ DrawText (layer, text);
break;
}
@@ -190,7 +190,7 @@ SelectObject (void)
layer = (LayerTypePtr) ptr1;
AddObjectToFlagUndoList (POLYGON_TYPE, ptr1, ptr2, ptr2);
TOGGLE_FLAG (SELECTEDFLAG, poly);
- DrawPolygon (layer, poly, 0);
+ DrawPolygon (layer, poly);
/* changing memory order no longer effects draw order */
break;
}
@@ -198,13 +198,13 @@ SelectObject (void)
case PIN_TYPE:
AddObjectToFlagUndoList...
[truncated message content] |
|
From: <gi...@gp...> - 2011-04-23 13:41:01
|
The branch, master has been updated
discards f1a3326da21adf354fd06c1cc72c8c58e863192e (commit)
via 145eb356bec5eb0ae57e66655af769bd0872b311 (commit)
from f1a3326da21adf354fd06c1cc72c8c58e863192e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/hid/png/png.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit 145eb356bec5eb0ae57e66655af769bd0872b311
Author: Andrew Poelstra <as...@sf...>
Commit: Peter Clifton <pc...@ca...>
hid/png: Fix incorrect um unit conversion in bloat parser.
(Split from a larger patch by Peter Clifton <pc...@ca...>)
:100644 100644 6c0f76b... ab64e5a... M src/hid/png/png.c
=========
Changes
=========
commit 145eb356bec5eb0ae57e66655af769bd0872b311
Author: Andrew Poelstra <as...@sf...>
Commit: Peter Clifton <pc...@ca...>
hid/png: Fix incorrect um unit conversion in bloat parser.
(Split from a larger patch by Peter Clifton <pc...@ca...>)
diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index 6c0f76b..ab64e5a 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -322,7 +322,7 @@ parse_bloat (char *str)
else if (strcasecmp (suf, "mm") == 0)
bloat = val * MM_TO_COOR;
else if (strcasecmp (suf, "um") == 0)
- bloat = val * MM_TO_COOR * 1000.0;
+ bloat = val * MM_TO_COOR / 1000.0;
else if (strcasecmp (suf, "pix") == 0
|| strcasecmp (suf, "px") == 0)
bloat = val * scale;
|
|
From: <gi...@gp...> - 2011-04-23 13:39:43
|
The branch, master has been updated
via f1a3326da21adf354fd06c1cc72c8c58e863192e (commit)
via 87ec3347384f68a8ab375e7228317902f4dea403 (commit)
from 66cdcef4302e5f521478e6a6d742c956cda26634 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
globalconst.h | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
=================
Commit Messages
=================
commit 87ec3347384f68a8ab375e7228317902f4dea403
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
globalconst.h: Remove some unused constants
:100755 100755 cd6f4f9... ff8e696... M globalconst.h
=========
Changes
=========
commit 87ec3347384f68a8ab375e7228317902f4dea403
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
globalconst.h: Remove some unused constants
diff --git a/globalconst.h b/globalconst.h
index cd6f4f9..ff8e696 100755
--- a/globalconst.h
+++ b/globalconst.h
@@ -86,9 +86,6 @@
#define MAX_DRC_RING 10000
#define MIN_GRID 1 /* min grid in 1/100 mils */
#define MAX_GRID 100000 /* max grid in 1/100 mils */
-#define CHUNK 100 /* step size for size sliders */
-#define MIN_ZOOM -12 /* min zoom */
-#define MAX_ZOOM 12 /* max zoom */
#define MAX_FONTPOSITION 255 /* upper limit of characters in my font */
#define MAX_COORD LARGE_VALUE /* coordinate limits */
|
|
From: <gi...@gp...> - 2011-04-23 12:38:16
|
The branch, master has been updated
via 66cdcef4302e5f521478e6a6d742c956cda26634 (commit)
from cf1a2e2aaff6fc60f2a7243f8e456f8605d1b55a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/hid/png/png.c | 64 ++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 27 deletions(-)
=================
Commit Messages
=================
commit 66cdcef4302e5f521478e6a6d742c956cda26634
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
hid/png: Fix segfault when no image formats are configured in.
Based on a patch by Felix Ruoff <Fe...@po...>
Catch the case where the selected image format is actually the NULL
terminator at the end of the format list. This happens when the
list is empty. Don't strcmp against that terminator!
Closes-bug: lp-699290 (sf-2669324)
:100644 100644 274741d... 6c0f76b... M src/hid/png/png.c
=========
Changes
=========
commit 66cdcef4302e5f521478e6a6d742c956cda26634
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
hid/png: Fix segfault when no image formats are configured in.
Based on a patch by Felix Ruoff <Fe...@po...>
Catch the case where the selected image format is actually the NULL
terminator at the end of the format list. This happens when the
list is empty. Don't strcmp against that terminator!
Closes-bug: lp-699290 (sf-2669324)
diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index 274741d..6c0f76b 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -230,17 +230,26 @@ static HID_Attr_Val png_values[NUM_OPTIONS];
static const char *get_file_suffix(void)
{
- const char *fmt;
- const char *result;
- fmt = filetypes[png_attribute_list[HA_filetype].default_val.int_value];
- if (strcmp (fmt, FMT_gif) == 0) result=".gif";
- else if (strcmp (fmt, FMT_jpg) == 0) result=".jpg";
- else if (strcmp (fmt, FMT_png) == 0) result=".png";
- else {
- fprintf (stderr, "Error: Invalid graphic file format\n");
- result=".???";
- }
- return result;
+ const char *result = NULL;
+ const char *fmt;
+
+ fmt = filetypes[png_attribute_list[HA_filetype].default_val.int_value];
+
+ if (fmt == NULL)
+ ; /* Do nothing */
+ else if (strcmp (fmt, FMT_gif) == 0)
+ result=".gif";
+ else if (strcmp (fmt, FMT_jpg) == 0)
+ result=".jpg";
+ else if (strcmp (fmt, FMT_png) == 0)
+ result=".png";
+
+ if (result == NULL)
+ {
+ fprintf (stderr, "Error: Invalid graphic file format\n");
+ result=".???";
+ }
+ return result;
}
static HID_Attribute *
@@ -249,7 +258,11 @@ png_get_export_options (int *n)
static char *last_made_filename = 0;
const char *suffix = get_file_suffix();
- if (PCB) derive_default_filename(PCB->Filename, &png_attribute_list[HA_pngfile], suffix, &last_made_filename);
+ if (PCB)
+ derive_default_filename (PCB->Filename,
+ &png_attribute_list[HA_pngfile],
+ suffix,
+ &last_made_filename);
if (n)
*n = NUM_OPTIONS;
@@ -506,6 +519,7 @@ png_do_export (HID_Attr_Val * options)
int w, h;
int xmax, ymax, dpi;
const char *fmt;
+ bool format_error = false;
if (color_cache)
{
@@ -843,37 +857,33 @@ png_do_export (HID_Attr_Val * options)
/* actually write out the image */
fmt = filetypes[options[HA_filetype].int_value];
-
- if (strcmp (fmt, FMT_gif) == 0)
+
+ if (fmt == NULL)
+ format_error = true;
+ else if (strcmp (fmt, FMT_gif) == 0)
#ifdef HAVE_GDIMAGEGIF
gdImageGif (im, f);
#else
- {
- gdImageDestroy (im);
- return;
- }
+ format_error = true;
#endif
else if (strcmp (fmt, FMT_jpg) == 0)
#ifdef HAVE_GDIMAGEJPEG
gdImageJpeg (im, f, -1);
#else
- {
- gdImageDestroy (im);
- return;
- }
+ format_error = true;
#endif
else if (strcmp (fmt, FMT_png) == 0)
#ifdef HAVE_GDIMAGEPNG
gdImagePng (im, f);
#else
- {
- gdImageDestroy (im);
- return;
- }
+ format_error = true;
#endif
else
+ format_error = true;
+
+ if (format_error)
fprintf (stderr, "Error: Invalid graphic file format."
- " This is a bug. Please report it.\n");
+ " This is a bug. Please report it.\n");
fclose (f);
|
|
From: <gi...@gp...> - 2011-04-23 12:01:39
|
The branch, master has been updated
discards 831d4889e7daef86552448bf6004abb14370d4e3 (commit)
via cf1a2e2aaff6fc60f2a7243f8e456f8605d1b55a (commit)
from 831d4889e7daef86552448bf6004abb14370d4e3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
=================
Commit Messages
=================
commit cf1a2e2aaff6fc60f2a7243f8e456f8605d1b55a
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Revert "Fix potential segfault"
This reverts commit 2d2040e92d5ebb069af42567855055b096532e71.
This patch causes segfaults in the GTK and Lesstif hids, so reverting,
as it removes the required NULL termination from an attribute
enumeration. Any code which can't deal with an empty enumeration list
should be fixed instead.
Reopens-bug: lp-699290 (sf-2669324)
Closes-bug: lp-769336
:100644 100644 3919a6e... 274741d... M src/hid/png/png.c
=========
Changes
=========
commit cf1a2e2aaff6fc60f2a7243f8e456f8605d1b55a
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Revert "Fix potential segfault"
This reverts commit 2d2040e92d5ebb069af42567855055b096532e71.
This patch causes segfaults in the GTK and Lesstif hids, so reverting,
as it removes the required NULL termination from an attribute
enumeration. Any code which can't deal with an empty enumeration list
should be fixed instead.
Reopens-bug: lp-699290 (sf-2669324)
Closes-bug: lp-769336
diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index 3919a6e..274741d 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -148,7 +148,7 @@ static const char *filetypes[] = {
FMT_jpg,
#endif
- ""
+ NULL
};
HID_Attribute png_attribute_list[] = {
|
|
From: <gi...@gp...> - 2011-04-23 12:00:20
|
The branch, master has been updated
via 831d4889e7daef86552448bf6004abb14370d4e3 (commit)
from 79417191949173c16579554dc8f8d5b9cbb22b3a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/hid/png/png.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit 831d4889e7daef86552448bf6004abb14370d4e3
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Revert "Fix potential segfault"
This reverts commit 2d2040e92d5ebb069af42567855055b096532e71.
This patch causes segfaults in the GTK and Lesstif hids, so reverting,
as it removes the required NULL termination from an attribute
enumeration. Any code which can't deal with an empty enumeration list
should be fixed instead.
Re-opens: lp-699290 (sf-2669324)
:100644 100644 3919a6e... 274741d... M src/hid/png/png.c
=========
Changes
=========
commit 831d4889e7daef86552448bf6004abb14370d4e3
Author: Peter Clifton <pc...@ca...>
Commit: Peter Clifton <pc...@ca...>
Revert "Fix potential segfault"
This reverts commit 2d2040e92d5ebb069af42567855055b096532e71.
This patch causes segfaults in the GTK and Lesstif hids, so reverting,
as it removes the required NULL termination from an attribute
enumeration. Any code which can't deal with an empty enumeration list
should be fixed instead.
Re-opens: lp-699290 (sf-2669324)
diff --git a/src/hid/png/png.c b/src/hid/png/png.c
index 3919a6e..274741d 100644
--- a/src/hid/png/png.c
+++ b/src/hid/png/png.c
@@ -148,7 +148,7 @@ static const char *filetypes[] = {
FMT_jpg,
#endif
- ""
+ NULL
};
HID_Attribute png_attribute_list[] = {
|
2 messages has been excluded from this view by a project administrator.
