[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-332-g0545db3)
The branch, master has been updated
via 0545db388236ea7a7aaa49d8911ad96481b4978e (commit)
from 27ce6d5531d9dac2bf6c1933df6ba6ff88c3d2ae (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
=========
gschem/src/o_arc.c | 17 ++++++-----------
gschem/src/o_box.c | 3 +--
gschem/src/o_bus.c | 4 +---
gschem/src/o_circle.c | 4 +---
gschem/src/o_line.c | 3 +--
gschem/src/o_net.c | 22 +++++++++-------------
gschem/src/o_pin.c | 4 +---
libgeda/include/struct.h | 24 ++++++++----------------
libgeda/src/o_arc_basic.c | 6 +++---
libgeda/src/o_box_basic.c | 27 +--------------------------
libgeda/src/o_line_basic.c | 2 +-
libgeda/src/o_picture.c | 3 ---
utils/src/convert_sym.c | 2 +-
utils/src/gmk_sym.c | 2 +-
utils/src/sarlacc_schem.c | 2 --
15 files changed, 35 insertions(+), 90 deletions(-)
=================
Commit Messages
=================
commit 0545db388236ea7a7aaa49d8911ad96481b4978e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Dec 7 17:33:46 2008 +0000
Remove some old comments better explained in commit history
Comments annotated with a dates and developers initials clutter the
code with historical details people may be reluctant to remove. Not
all of these are still relevant, and those which are should probably
could be kept in such a way as not to suggest code ownership. The
commit revision log is a better place for determining authorship.
Fix some whitespace in surrounding areas where I couldn't resist.
:100644 100644 5b44c70... c70221c... M gschem/src/o_arc.c
:100644 100644 ab4fb95... c72933b... M gschem/src/o_box.c
:100644 100644 e126a9f... bd37485... M gschem/src/o_bus.c
:100644 100644 562b261... 38f50c2... M gschem/src/o_circle.c
:100644 100644 3aff73b... 73e80d0... M gschem/src/o_line.c
:100644 100644 3c27c57... ee06e93... M gschem/src/o_net.c
:100644 100644 4273ad6... b6a3580... M gschem/src/o_pin.c
:100644 100644 2348f40... 9038027... M libgeda/include/struct.h
:100644 100644 338f996... 2d25f65... M libgeda/src/o_arc_basic.c
:100644 100644 7080c4c... 566aecb... M libgeda/src/o_box_basic.c
:100644 100644 b39e2eb... 340aec4... M libgeda/src/o_line_basic.c
:100644 100644 b61ff5c... e68b58c... M libgeda/src/o_picture.c
:100644 100644 a8ee933... 13f4f0d... M utils/src/convert_sym.c
:100644 100644 7e0db7a... c630c7d... M utils/src/gmk_sym.c
:100644 100644 a6c376f... f025b7a... M utils/src/sarlacc_schem.c
=========
Changes
=========
commit 0545db388236ea7a7aaa49d8911ad96481b4978e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Dec 7 17:33:46 2008 +0000
Remove some old comments better explained in commit history
Comments annotated with a dates and developers initials clutter the
code with historical details people may be reluctant to remove. Not
all of these are still relevant, and those which are should probably
could be kept in such a way as not to suggest code ownership. The
commit revision log is a better place for determining authorship.
Fix some whitespace in surrounding areas where I couldn't resist.
diff --git a/gschem/src/o_arc.c b/gschem/src/o_arc.c
index 5b44c70..c70221c 100644
--- a/gschem/src/o_arc.c
+++ b/gschem/src/o_arc.c
@@ -135,8 +135,7 @@ void o_arc_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
break;
case TYPE_DOTTED:
- length = -1; /* AVH changed o_arc_draw_dotted to use */
- /* space parameter only */
+ length = -1; /* o_arc_draw_dotted uses space parameter only */
draw_func = o_arc_draw_dotted;
break;
@@ -172,10 +171,8 @@ void o_arc_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
x, y, radius, start_angle, end_angle,
arc_width, length, space);
-
- if (o_current->draw_grips && w_current->draw_grips == TRUE) {
- /* pb29911903 - modified to use the new o_arc_[draw|erase]_grips() */
+ if (o_current->draw_grips && w_current->draw_grips == TRUE) {
if(!o_current->selected) {
/* object is no more selected, erase the grips */
o_current->draw_grips = FALSE;
@@ -184,10 +181,8 @@ void o_arc_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
/* object is selected, draw the grips on the arc */
o_arc_draw_grips(w_current, o_current);
}
-
}
-
#if DEBUG
printf("drawing arc\n");
#endif
@@ -284,7 +279,7 @@ void o_arc_draw_dotted(GdkWindow *w, GdkGC *gc,
* possible to distinguish a solid line from a dotted line because of
* zoom factor. The arc is therefore drawn solid.
*/
- /* PB inverting angle2 if < 0 and changing angle1 accordingly */
+ /* inverting angle2 if < 0 and changing angle1 accordingly */
/* the loop test assume that da > 0 */
if(angle2 < 0) {
angle1 = angle1 + angle2;
@@ -382,7 +377,7 @@ void o_arc_draw_dashed(GdkWindow *w, GdkGC *gc,
* a dashed line from a solid line because of current value of zoom.
*/
- /* PB inverting angle2 if < 0 and changing angle1 accordingly */
+ /* inverting angle2 if < 0 and changing angle1 accordingly */
/* the loop test assume that da > 0 */
if(angle2 < 0) {
angle1 = angle1 + angle2;
@@ -489,7 +484,7 @@ void o_arc_draw_center(GdkWindow *w, GdkGC *gc,
* a dashed line from a solid line because of current value of zoom.
*/
- /* PB inverting angle2 if < 0 and changing angle1 accordingly */
+ /* inverting angle2 if < 0 and changing angle1 accordingly */
/* the loop test assume that da > 0 */
if(angle2 < 0) {
angle1 = angle1 + angle2;
@@ -642,7 +637,7 @@ void o_arc_draw_phantom(GdkWindow *w, GdkGC *gc,
* a dashed line from a solid line because of current value of zoom.
*/
- /* PB inverting angle2 if < 0 and changing angle1 accordingly */
+ /* inverting angle2 if < 0 and changing angle1 accordingly */
/* the loop test assume that da > 0 */
if(angle2 < 0) {
angle1 = angle1 + angle2;
diff --git a/gschem/src/o_box.c b/gschem/src/o_box.c
index ab4fb95..c72933b 100644
--- a/gschem/src/o_box.c
+++ b/gschem/src/o_box.c
@@ -273,7 +273,6 @@ void o_box_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
fill_width, angle1, pitch1, angle2, pitch2);
if ((o_current->draw_grips == TRUE) && (w_current->draw_grips == TRUE)) {
- /* pb20011003 - modified to use the new o_box_[draw|erase]_grips() */
if (!o_current->selected) {
/* object is no more selected, erase the grips */
o_current->draw_grips = FALSE;
@@ -281,7 +280,7 @@ void o_box_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
} else {
/* object is selected, draw the grips on the box */
o_box_draw_grips(w_current, o_current);
- }
+ }
}
}
diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c
index e126a9f..bd37485 100644
--- a/gschem/src/o_bus.c
+++ b/gschem/src/o_bus.c
@@ -90,9 +90,7 @@ void o_bus_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
printf("drawing bus\n");
#endif
- if (o_current->draw_grips && w_current->draw_grips == TRUE) {
- /* pb20011109 - modified to use the new o_line_[draw|erase]_grips() */
- /* reuse the line functions */
+ if (o_current->draw_grips && w_current->draw_grips == TRUE) {
if (!o_current->selected) {
/* object is no more selected, erase the grips */
o_current->draw_grips = FALSE;
diff --git a/gschem/src/o_circle.c b/gschem/src/o_circle.c
index 562b261..38f50c2 100644
--- a/gschem/src/o_circle.c
+++ b/gschem/src/o_circle.c
@@ -260,9 +260,7 @@ void o_circle_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
printf("drawing circle\n");
#endif
- if (o_current->draw_grips && w_current->draw_grips == TRUE) {
-
- /* pb20011010 - modified to use the new o_circle_[draw|erase]_grips() */
+ if (o_current->draw_grips && w_current->draw_grips == TRUE) {
if (!o_current->selected) {
/* object is no more selected, erase the grips */
o_current->draw_grips = FALSE;
diff --git a/gschem/src/o_line.c b/gschem/src/o_line.c
index 3aff73b..73e80d0 100644
--- a/gschem/src/o_line.c
+++ b/gschem/src/o_line.c
@@ -165,8 +165,7 @@ void o_line_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
GDK_CAP_NOT_LAST,
GDK_JOIN_MITER);
- if (o_current->draw_grips && w_current->draw_grips == TRUE) {
- /* pb20011010 - modified to use the new o_line_[draw|erase]_grips() */
+ if (o_current->draw_grips && w_current->draw_grips == TRUE) {
if (!o_current->selected) {
/* object is no more selected, erase the grips */
o_current->draw_grips = FALSE;
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index 3c27c57..ee06e93 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -162,19 +162,15 @@ void o_net_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
GDK_JOIN_MITER);
}
- if (o_current->draw_grips && w_current->draw_grips == TRUE) {
-
- /* pb20011109 - modified to use the new o_line_[draw|erase]_grips() */
- /* reuse the line functions */
- if (!o_current->selected) {
- /* object is no more selected, erase the grips */
- o_current->draw_grips = FALSE;
- o_line_erase_grips(w_current, o_current);
- } else {
- /* object is selected, draw the grips */
- o_line_draw_grips(w_current, o_current);
- }
-
+ if (o_current->draw_grips && w_current->draw_grips == TRUE) {
+ if (!o_current->selected) {
+ /* object is no more selected, erase the grips */
+ o_current->draw_grips = FALSE;
+ o_line_erase_grips(w_current, o_current);
+ } else {
+ /* object is selected, draw the grips */
+ o_line_draw_grips(w_current, o_current);
+ }
}
}
diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index 4273ad6..b6a3580 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -89,9 +89,7 @@ void o_pin_draw(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
printf("drawing pin\n");
#endif
- if (o_current->draw_grips && w_current->draw_grips == TRUE) {
- /* pb20011109 - modified to use the new o_line_[draw|erase]_grips() */
- /* reuse the line functions */
+ if (o_current->draw_grips && w_current->draw_grips == TRUE) {
if (!o_current->selected) {
/* object is no more selected, erase the grips */
o_current->draw_grips = FALSE;
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index 2348f40..9038027 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -78,16 +78,14 @@ typedef enum { F_OPEN_RC = 1,
F_OPEN_RESTORE_CWD = 4,
} FOpenFlags;
-/* PB : change begin */
-/* PB : these enum are constant to define :
+/* these enum are constant to define :
- the end of open line of an object ;
- the type of the line of an object ;
- the filling of a closed object. */
-/* PB : used in struct st_object (predefined type OBJECT)*/
+/* used in struct st_object (predefined type OBJECT)*/
typedef enum {END_NONE, END_SQUARE, END_ROUND} OBJECT_END;
typedef enum {TYPE_SOLID, TYPE_DOTTED, TYPE_DASHED, TYPE_CENTER, TYPE_PHANTOM, TYPE_ERASE} OBJECT_TYPE;
typedef enum {FILLING_HOLLOW, FILLING_FILL, FILLING_MESH, FILLING_HATCH, FILLING_VOID} OBJECT_FILLING;
-/* PB : change end */
struct st_line {
@@ -96,7 +94,6 @@ struct st_line {
};
-/* pb20011014 - name the grips */
#define LINE_END1 0
#define LINE_END2 1
@@ -133,7 +130,7 @@ struct st_arc {
int start_angle;
int end_angle;
};
-/* pb20011014 - name the grips */
+
#define ARC_CENTER 0
#define ARC_RADIUS 1
#define ARC_START_ANGLE 2
@@ -145,7 +142,7 @@ struct st_box {
int lower_x, lower_y;
};
-/* pb20011014 - name the grips */
+
#define BOX_UPPER_LEFT 0
#define BOX_LOWER_RIGHT 1
#define BOX_UPPER_RIGHT 2
@@ -206,11 +203,8 @@ struct st_complex {
struct st_circle {
int center_x, center_y; /* world */
int radius;
-
-/* pb20011010 - removed : used only in o_circle_draw_xor() and
- meaning unclear */
};
-/* pb20011014 - name the grips */
+
#define CIRCLE_CENTER 0
#define CIRCLE_RADIUS 1
@@ -239,10 +233,9 @@ struct st_object {
GList *conn_list; /* List of connections */
/* to and from this object */
- /* PB : change begin */
- /* PB : every graphical primitive have more or less the same options. */
- /* PB : depending on its nature a primitive is concerned with one or more */
- /* PB : of these fields. If not, value must be ignored. */
+ /* every graphical primitive have more or less the same options. */
+ /* depending on its nature a primitive is concerned with one or more */
+ /* of these fields. If not, value must be ignored. */
OBJECT_END line_end;
OBJECT_TYPE line_type;
int line_width;
@@ -253,7 +246,6 @@ struct st_object {
int fill_width;
int fill_angle1, fill_pitch1;
int fill_angle2, fill_pitch2;
- /* PB : change end */
int visited; /* used in gnetlist for travesal purposes */
diff --git a/libgeda/src/o_arc_basic.c b/libgeda/src/o_arc_basic.c
index 338f996..2d25f65 100644
--- a/libgeda/src/o_arc_basic.c
+++ b/libgeda/src/o_arc_basic.c
@@ -91,7 +91,7 @@ OBJECT *o_arc_new(TOPLEVEL *toplevel,
new_node->arc->width = 2 * radius;
new_node->arc->height = 2 * radius;
- /* PB : must check the sign of start_angle, end_angle ... */
+ /* must check the sign of start_angle, end_angle ... */
if(end_angle < 0) {
start_angle = start_angle + end_angle;
end_angle = -end_angle;
@@ -470,7 +470,7 @@ void o_arc_mirror_world(TOPLEVEL *toplevel,
/* apply mirror to angles (vertical mirror) */
object->arc->start_angle = (180 - object->arc->start_angle) % 360;
- /* pb20011125 - start_angle *MUST* be positive */
+ /* start_angle *MUST* be positive */
if(object->arc->start_angle < 0) object->arc->start_angle += 360;
object->arc->end_angle = -object->arc->end_angle;
@@ -739,7 +739,7 @@ void o_arc_print_solid(TOPLEVEL *toplevel, FILE *fp,
f_print_set_color(fp, color);
}
- /* PB/AVH inverting angle2 if < 0 and changing angle1 accordingly */
+ /* inverting angle2 if < 0 and changing angle1 accordingly */
if (angle2 < 0) {
angle1 = angle1 + angle2;
angle2 = -angle2;
diff --git a/libgeda/src/o_box_basic.c b/libgeda/src/o_box_basic.c
index 7080c4c..566aecb 100644
--- a/libgeda/src/o_box_basic.c
+++ b/libgeda/src/o_box_basic.c
@@ -127,13 +127,11 @@ OBJECT *o_box_copy(TOPLEVEL *toplevel, OBJECT *o_current)
* #o_box_recalc().
*/
- /* modifying */
- /* pb20011002 - have to check if o_current is a box object */
new_obj->box->upper_x = o_current->box->upper_x;
new_obj->box->upper_y = o_current->box->upper_y;
new_obj->box->lower_x = o_current->box->lower_x;
new_obj->box->lower_y = o_current->box->lower_y;
-
+
o_set_line_options(toplevel, new_obj, o_current->line_end,
o_current->line_type, o_current->line_width,
o_current->line_length, o_current->line_space);
@@ -172,10 +170,6 @@ OBJECT *o_box_copy(TOPLEVEL *toplevel, OBJECT *o_current)
* <DT>*</DT><DD>BOX_UPPER_RIGHT
* <DT>*</DT><DD>BOX_LOWER_RIGHT
* </DL>
- *
- * \par Author's Note:
- * pb20011002 - rewritten : old one did not used <B>x</B>, <B>y</B> and
- * <B>whichone</B>
*/
void o_box_modify(TOPLEVEL *toplevel, OBJECT *object,
int x, int y, int whichone)
@@ -818,9 +812,6 @@ void o_box_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
* \param [in] space Amount of space between dashes.
* \param [in] origin_x Page x coordinate to place BOX OBJECT.
* \param [in] origin_y Page y coordinate to place BOX OBJECT.
- *
- * \par Author's Note
- * PB : parameter filled removed
*/
void
o_box_print_solid(TOPLEVEL *toplevel, FILE *fp,
@@ -887,10 +878,6 @@ o_box_print_solid(TOPLEVEL *toplevel, FILE *fp,
* \param [in] space Amount of space between dashes.
* \param [in] origin_x Page x coordinate to place BOX OBJECT.
* \param [in] origin_y Page y coordinate to place BOX OBJECT.
- *
- * \par Author's Note
- * PB : parameter filled removed
- * PB : parameter o_current removed
*/
void o_box_print_dotted(TOPLEVEL *toplevel, FILE *fp,
int x, int y,
@@ -955,10 +942,6 @@ void o_box_print_dotted(TOPLEVEL *toplevel, FILE *fp,
* \param [in] space Amount of space between dashes.
* \param [in] origin_x Page x coordinate to place BOX OBJECT.
* \param [in] origin_y Page y coordinate to place BOX OBJECT.
- *
- * \par Author's Note
- * PB : parameter filled removed
- * PB : parameter o_current removed
*/
void o_box_print_dashed(TOPLEVEL *toplevel, FILE *fp,
int x, int y,
@@ -1024,10 +1007,6 @@ void o_box_print_dashed(TOPLEVEL *toplevel, FILE *fp,
* \param [in] space Amount of space between dashes.
* \param [in] origin_x Page x coordinate to place BOX OBJECT.
* \param [in] origin_y Page y coordinate to place BOX OBJECT.
- *
- * \par Author's note
- * PB : parameter filled removed
- * PB : parameter o_current removed
*/
void o_box_print_center(TOPLEVEL *toplevel, FILE *fp,
int x, int y,
@@ -1092,10 +1071,6 @@ void o_box_print_center(TOPLEVEL *toplevel, FILE *fp,
* \param [in] space Amount of space between dashes.
* \param [in] origin_x Page x coordinate to place BOX OBJECT.
* \param [in] origin_y Page y coordinate to place BOX OBJECT.
- *
- * \par Author's note
- * PB : parameter filled removed
- * PB : parameter o_current removed
*/
void o_box_print_phantom(TOPLEVEL *toplevel, FILE *fp,
int x, int y,
diff --git a/libgeda/src/o_line_basic.c b/libgeda/src/o_line_basic.c
index b39e2eb..340aec4 100644
--- a/libgeda/src/o_line_basic.c
+++ b/libgeda/src/o_line_basic.c
@@ -698,7 +698,7 @@ void o_line_print_dotted(TOPLEVEL *toplevel, FILE *fp,
* beginnings of the array
*/
fprintf(fp,"[");
- /* PB : is the width relevant for a dot (circle) ? */
+ /* is the width relevant for a dot (circle) ? */
/* f_print_set_line_width(fp, line_width); */
/*
diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index b61ff5c..e68b58c 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -447,9 +447,6 @@ void world_get_picture_bounds(TOPLEVEL *toplevel, OBJECT *object,
* <DT>*</DT><DD>PICTURE_UPPER_RIGHT
* <DT>*</DT><DD>PICTURE_LOWER_RIGHT
* </DL>
- *
- * \par Author's note
- * pb20011002 - rewritten : old one did not used x, y and whichone
*/
void o_picture_modify(TOPLEVEL *toplevel, OBJECT *object,
int x, int y, int whichone)
diff --git a/utils/src/convert_sym.c b/utils/src/convert_sym.c
index a8ee933..13f4f0d 100644
--- a/utils/src/convert_sym.c
+++ b/utils/src/convert_sym.c
@@ -43,7 +43,7 @@
#include <ctype.h>
#include <math.h>
-#include <config.h> /* added by AVH for integration into the gEDA tarball */
+#include <config.h>
#include <libgeda/colors.h>
#ifdef HAVE_LIBDMALLOC
diff --git a/utils/src/gmk_sym.c b/utils/src/gmk_sym.c
index 7e0db7a..c630c7d 100644
--- a/utils/src/gmk_sym.c
+++ b/utils/src/gmk_sym.c
@@ -204,7 +204,7 @@ int main(int argc,char **argv)
}
line_nub=-1;
- printf("v 20030525\n"); /* The v character is the version of the file AVH */
+ printf("v 20030525\n"); /* The v character is the version of the file */
while (fgets(LineBuf,sizeof(LineBuf)-1,stream) != NULL)
{
diff --git a/utils/src/sarlacc_schem.c b/utils/src/sarlacc_schem.c
index a6c376f..f025b7a 100644
--- a/utils/src/sarlacc_schem.c
+++ b/utils/src/sarlacc_schem.c
@@ -87,7 +87,6 @@ int CONV16(char *base,int offset)
#define ADDR3 0x118
#define ADDR4 0x145
-/* change return type from int to void AVH */
void remove_spaces(char *src)
{
char *ptr=src;
@@ -141,7 +140,6 @@ unsigned read_string(char *dest, int dest_size, char *src)
return size;
}
-/* change return type from int to void AVH */
void read_string_file(int fd,char *dest, int dest_size)
{
unsigned char len;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs