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

gEDA-cvs: CVS update: prototype.h



  User: sdb     
  Date: 05/07/14 13:29:24

  Modified:    .        prototype.h struct.h x_menu.h
  Log:
  Numerous changes made to implement ability to change attribute
  
  visibility settings from within gattrib.
  
  
  
  
  Revision  Changes    Path
  1.10      +33 -14    eda/geda/devel/gattrib/include/prototype.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: prototype.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gattrib/include/prototype.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- prototype.h	21 Feb 2005 05:29:33 -0000	1.9
  +++ prototype.h	14 Jul 2005 17:29:24 -0000	1.10
  @@ -108,19 +108,30 @@
   
   
   /* ------------- s_object.c ------------- */
  -void s_object_add_comp_attrib_to_object(OBJECT *o_current, char *new_attrib_name, 
  +void s_object_add_comp_attrib_to_object(OBJECT *o_current, 
  +					char *new_attrib_name, 
  +					char *new_attrib_value,
  +					gint visibility,
  +					gint show_name_value);
  +void s_object_add_net_attrib_to_object(OBJECT *o_current, 
  +				       char *new_attrib_name, 
   				char *new_attrib_value);
  -void s_object_add_net_attrib_to_object(OBJECT *o_current, char *new_attrib_name, 
  +void s_object_add_pin_attrib_to_object(OBJECT *o_current, 
  +				       char *new_attrib_name, 
   				char *new_attrib_value);
  -void s_object_add_pin_attrib_to_object(OBJECT *o_current, char *new_attrib_name, 
  -				char *new_attrib_value);
  -
  -void s_object_replace_attrib_in_object(OBJECT *o_current, char *new_attrib_name, 
  -			       char *new_attrib_value);
  -void s_object_remove_attrib_in_object(OBJECT *o_current, char *new_attrib_name);
   
  -OBJECT *s_object_attrib_add_attrib_in_object(TOPLEVEL * w_current, char *text_string,
  -				     int visibility, int show_name_value,
  +void s_object_replace_attrib_in_object(OBJECT *o_current, 
  +				       char *new_attrib_name, 
  +				       char *new_attrib_value,
  +				       gint visibility,
  +				       gint show_name_value);
  +void s_object_remove_attrib_in_object(OBJECT *o_current, 
  +				      char *new_attrib_name);
  +
  +OBJECT *s_object_attrib_add_attrib_in_object(TOPLEVEL * w_current, 
  +					     char *text_string,
  +					     gint visibility, 
  +					     gint show_name_value,
   				     OBJECT * object);
   void s_object_delete_text_object_in_object(TOPLEVEL *w_current, OBJECT *test_object);
   int s_object_has_sym_file(OBJECT *object);
  @@ -140,6 +151,14 @@
   void verbose_done(void);
   void verbose_reset_index(void);
   
  +/* ------------- s_visibility.c ------------- */
  +void s_visibility_set_invisible();
  +void s_visibility_set_name_only();
  +void s_visibility_set_value_only();
  +void s_visibility_set_name_and_value();
  +void s_visibility_set_cell(gint cur_page, gint row, gint col, 
  +			   gint visibility, gint show_name_value);
  +
   /* ------------- i_vars.c ------------- */
   void i_vars_set(TOPLEVEL * pr_current);
   void i_window_vars_set(TOPLEVEL * w_current);
  
  
  
  1.5       +2 -6      eda/geda/devel/gattrib/include/struct.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: struct.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gattrib/include/struct.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- struct.h	21 Feb 2005 05:29:33 -0000	1.4
  +++ struct.h	14 Jul 2005 17:29:24 -0000	1.5
  @@ -109,18 +109,14 @@
    * refdes/netname string held in the TOPLEVEL data structure, so that 
    * when SHEET_DATA is manipulated, so is TOPLEVEL.
    * -------------------------------------------------------------------- */
  -#define ATTRIB_VIS_INVISIBLE 0
  -#define ATTRIB_VIS_VALUE_ONLY 1
  -#define ATTRIB_VIS_NAME_ONLY 2
  -#define ATTRIB_VIS_BOTH 3
   struct st_table {
     int row;                       /* location on spreadsheet */
     int col;                       /* location on spreadsheet */
     gchar *row_name;               /* comp, net, or refdes:pin name */
     gchar *col_name;               /* attrib name */
     gchar *attrib_value;           /* attrib value */
  -  int visibility;         /* 0 = invisible, 1 = value only, 2 = name only, 
  -			   * 3 = both name & value visible  */
  +  gint visibility;
  +  gint show_name_value;
   
   };
   
  
  
  
  1.5       +25 -18    eda/geda/devel/gattrib/include/x_menu.h
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: x_menu.h
  ===================================================================
  RCS file: /home/cvspsrv/cvsroot/eda/geda/devel/gattrib/include/x_menu.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- x_menu.h	21 Feb 2005 05:29:33 -0000	1.4
  +++ x_menu.h	14 Jul 2005 17:29:24 -0000	1.5
  @@ -64,43 +64,51 @@
     /* ------- File menu ------- */
     { "/_File", 
       NULL,
  -    NULL, 0, 
  +    NULL, 
  +    0, 
       "<Branch>" 
     },
  +
     { "/File/_Open",
       "<control>O", 
       s_toplevel_menubar_file_open, 
       0, 
       NULL 
     },
  +
     { "/File/_Save",
       "<control>S", 
       s_toplevel_menubar_file_save, 
       0, 
       NULL },
  +
     { "/File/sep1",    
       NULL,    
       NULL,
       0, 
       "<Separator>"
     },
  +
     { "/File/Print setup",
       NULL,
       s_toplevel_menubar_unimplemented_feature,
       0, 
       NULL 
     },
  +
     { "/File/Print",
       NULL,
       s_toplevel_menubar_unimplemented_feature,
       0, 
       NULL },
  +
     { "/File/sep1",    
       NULL,    
       NULL,
       0, 
       "<Separator>"
     },
  +
     { "/File/Quit",   
       "<control>Q", 
       gattrib_really_quit,
  @@ -114,70 +122,69 @@
       0, 
       "<Branch>" 
     },
  +
     { "/Edit/Add new attrib column",      
       NULL,  
       s_toplevel_menubar_edit_newattrib, 
       0, 
       NULL
     },
  +
     { "/Edit/Delete attrib column",  
       NULL,  
       s_toplevel_menubar_edit_delattrib,
       0,
       NULL 
     },
  +
     { "/Edit/Search for attrib value",
       NULL,
       s_toplevel_menubar_unimplemented_feature,
       0, 
       NULL 
     },
  +
     { "/Edit/Search and replace attrib value", 
       NULL, 
       s_toplevel_menubar_unimplemented_feature,
       0, 
       NULL 
     },
  +
     { "/Edit/Search for refdes", 
       NULL,
       s_toplevel_menubar_unimplemented_feature,
       0,
       NULL 
     },
  -  /* ------- Options menu ------- */
  -  { "/_Options",    
  +  /* ------- Visibility menu ------- */
  +  { "/_Visibility",    
       NULL,
       NULL,
       0, 
       "<Branch>" 
     },
  -  { "/Options/Set attrib visibility",
  -    NULL,
  +  { "/Visibility/Set selected invisible",
       NULL,
  -    0,
  -    "<Branch>"
  -  },
  -  { "/Options/Set attrib visibility/invisible",
  -    NULL,
  -    s_toplevel_menubar_unimplemented_feature,
  +    s_visibility_set_invisible,
       0,
       NULL
     },
  -  { "/Options/Set attrib visibility/value only",
  +  { "/Visibility/Set selected name visible only",
       NULL,
  -    s_toplevel_menubar_unimplemented_feature,
  +    s_visibility_set_name_only,
       0,
       NULL
     },
  -  { "/Options/Set attrib visibility/name only",
  +  { "/Visibility/Set selected value visible only",
       NULL,
  -    s_toplevel_menubar_unimplemented_feature,
  +    s_visibility_set_value_only,
       0, 
       NULL
     },
  -  { "/Options/Set attrib visibility/name and value visible", 
  +  { "/Visibility/Set selected name and value visible",
       NULL,
  -    s_toplevel_menubar_unimplemented_feature,
  +    s_visibility_set_name_and_value,
       0,
       NULL
     },