[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-370-g136efaf)



The branch, master has been updated
       via  136efaf13287e97165bf511f146714ec94796d9a (commit)
      from  77541e1ec2efdc989b0a17864c1c0802080ff835 (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
=========

 libgeda/include/prototype.h |    2 +-
 libgeda/src/o_bus_basic.c   |    2 +-
 libgeda/src/o_net_basic.c   |    2 +-
 libgeda/src/o_pin_basic.c   |    2 +-
 libgeda/src/s_tile.c        |   25 ++++++++++++++++++++++---
 5 files changed, 26 insertions(+), 7 deletions(-)


=================
 Commit Messages
=================

commit 136efaf13287e97165bf511f146714ec94796d9a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Fri Dec 12 15:26:43 2008 +0000

    Replace calls to s_tile_add_line_object() with a non-specialised version
    
    s_tile_add_object() can then call s_tile_add_line_object() as needed.

:100644 100644 5029919... be2c005... M	libgeda/include/prototype.h
:100644 100644 c5247c7... 80142c1... M	libgeda/src/o_bus_basic.c
:100644 100644 80b16df... 17e1825... M	libgeda/src/o_net_basic.c
:100644 100644 20d3561... 2adc918... M	libgeda/src/o_pin_basic.c
:100644 100644 0e88fd6... 7f1a528... M	libgeda/src/s_tile.c

=========
 Changes
=========

commit 136efaf13287e97165bf511f146714ec94796d9a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Fri Dec 12 15:26:43 2008 +0000

    Replace calls to s_tile_add_line_object() with a non-specialised version
    
    s_tile_add_object() can then call s_tile_add_line_object() as needed.

diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 5029919..be2c005 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -462,7 +462,7 @@ void s_stretch_destroy_all(STRETCH *head);
 
 /* s_tile.c */
 void s_tile_init(TOPLEVEL *toplevel, PAGE *p_current);
-void s_tile_add_line_object(TOPLEVEL *toplevel, OBJECT *object);
+void s_tile_add_object(TOPLEVEL *toplevel, OBJECT *object);
 void s_tile_remove_object(OBJECT *object);
 void s_tile_update_object(TOPLEVEL *toplevel, OBJECT *object);
 GList *s_tile_get_objectlists(TOPLEVEL *toplevel, int world_x1, int world_y1, int world_x2, int world_y2);
diff --git a/libgeda/src/o_bus_basic.c b/libgeda/src/o_bus_basic.c
index c5247c7..80142c1 100644
--- a/libgeda/src/o_bus_basic.c
+++ b/libgeda/src/o_bus_basic.c
@@ -93,7 +93,7 @@ OBJECT *o_bus_new(TOPLEVEL *toplevel,
   new_node->sel_func = select_func;  
 
   if (!toplevel->ADDING_SEL) {
-    s_tile_add_line_object(toplevel, new_node);
+    s_tile_add_object (toplevel, new_node);
     s_conn_update_object (toplevel, new_node);
   }
 
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index 80b16df..17e1825 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -88,7 +88,7 @@ OBJECT *o_net_new(TOPLEVEL *toplevel, char type,
   new_node->sel_func = select_func;
 
   if (!toplevel->ADDING_SEL) {
-    s_tile_add_line_object(toplevel, new_node);
+    s_tile_add_object (toplevel, new_node);
     s_conn_update_object (toplevel, new_node);
   }
 
diff --git a/libgeda/src/o_pin_basic.c b/libgeda/src/o_pin_basic.c
index 20d3561..2adc918 100644
--- a/libgeda/src/o_pin_basic.c
+++ b/libgeda/src/o_pin_basic.c
@@ -93,7 +93,7 @@ OBJECT *o_pin_new(TOPLEVEL *toplevel,
   new_node->whichend = whichend;
   
   if (!toplevel->ADDING_SEL) {
-    s_tile_add_line_object(toplevel, new_node);
+    s_tile_add_object (toplevel, new_node);
     s_conn_update_object (toplevel, new_node);
   }
 
diff --git a/libgeda/src/s_tile.c b/libgeda/src/s_tile.c
index 0e88fd6..7f1a528 100644
--- a/libgeda/src/s_tile.c
+++ b/libgeda/src/s_tile.c
@@ -109,7 +109,7 @@ void s_tile_init(TOPLEVEL * toplevel, PAGE * p_current)
  *  \param toplevel The TOPLEVEL structure
  *  \param object The line OBJECT to add
  */
-void s_tile_add_line_object (TOPLEVEL *toplevel, OBJECT *object)
+static void s_tile_add_line_object (TOPLEVEL *toplevel, OBJECT *object)
 {
   TILE *t_current;
   PAGE *p_current;
@@ -299,6 +299,25 @@ void s_tile_add_line_object (TOPLEVEL *toplevel, OBJECT *object)
   }
 }
 
+/*! \brief add an object to the tile ssytem
+ *  \par Function Description
+ *  This function takes dispatches the object to the correct
+ *  function, depending on its type.
+ *
+ *  \param toplevel The TOPLEVEL structure
+ *  \param object The line OBJECT to add
+ */
+void s_tile_add_object (TOPLEVEL *toplevel, OBJECT *object)
+{
+  switch (object->type) {
+    case OBJ_NET:
+    case OBJ_PIN:
+    case OBJ_BUS:
+      s_tile_add_line_object (toplevel, object);
+      break;
+  }
+}
+
 /*! \brief remove an object from the tiles
  *  \par Function Description
  *  This function remose an object from all tiles that are refered by the object.
@@ -332,8 +351,8 @@ void s_tile_remove_object(OBJECT *object)
  */
 void s_tile_update_object(TOPLEVEL * toplevel, OBJECT * object)
 {
-  s_tile_remove_object(object);
-  s_tile_add_line_object(toplevel, object);
+  s_tile_remove_object (object);
+  s_tile_add_object (toplevel, object);
 }
 
 




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs