Changeset 5419

Timestamp:

08/11/09 22:52:33 (4 years ago)

Author:

werner

Message:

Make delete feel "safer".

• objects are now deleted by selecting them, then clicking on the delete icon
• removed tool_ops.click, which was only there because of delete

Location:

trunk/eda/fped

Files:

• Makefile (modified) (1 diff)
• TODO (modified) (3 diffs)
• gui_tool.c (modified) (7 diffs)
• gui_tool.h (modified) (2 diffs)
• icons/delete.fig (modified) (1 diff)
• icons/delete_off.fig (added)
• inst.c (modified) (3 diffs)

trunk/eda/fped/Makefile

@@ -19 +19 @@
 XPMS = point.xpm delete.xpm vec.xpm frame.xpm frame_locked.xpm frame_ready.xpm \
        line.xpm rect.xpm pad.xpm circ.xpm meas.xpm meas_x.xpm meas_y.xpm \
-       stuff.xpm stuff_off.xpm meas_off.xpm
+       stuff.xpm stuff_off.xpm meas_off.xpm delete_off.xpm
 
 CFLAGS_GTK = `pkg-config --cflags gtk+-2.0`

trunk/eda/fped/TODO

@@ -3 +3 @@
 - add default unit (combine with grid unit selection ?)
 - consider adding auto/mm/mil selection for each dimension
-- add postscript output
+- add postscript output (partially done)
 - add option to include/omit helper vecs and frames (done for display, still
-  need postscript)
+  need postscript). Better idea: in PS, print the component 10x, 1x, and then
+  each individual frame 10x.
 
 Minor missing features:
@@ -36 +37 @@
   list of points at each stage, then handle the highlighting and hovering
   inside a dragging module.
+- code organization is very poor. E.g., functions belonging to the different
+  items (pads, silk objects, vectors, etc.) should be grouped by item, not by
+  type of function, similar to how some things are now with gui_meas.c
 
 Open decisions:
@@ -61 +65 @@
 - future: when encountering an error after a change, we could try to find the
   same element in the old instance, and select it
-- future: consider editing off-canvas items in place
+- idea: run the sort algorithm of dump.c to generate a list of objects per
+  frame, then show the list per frame in the GUI, e.g., as an alternative to
+  the variables. Allow selection.
+- future: consider editing non-canvas items in place
 - near future: treat part name as pattern

trunk/eda/fped/gui_tool.c

@@ -42 +42 @@
 #include "icons/point.xpm"
 #include "icons/delete.xpm"
+#include "icons/delete_off.xpm"
 #include "icons/rect.xpm"
 #include "icons/vec.xpm"
 
 
-static GtkWidget *ev_point, *ev_frame;
+static GtkWidget *ev_point, *ev_delete, *ev_frame;
 static GtkWidget *active_tool;
 static struct tool_ops *active_ops = NULL;
 static struct inst *hover_inst = NULL;
 static GtkWidget *frame_image, *frame_image_locked, *frame_image_ready;
+static GtkWidget *delete_image[2];
 
 static struct drag_state {
@@ -168 +170 @@
 
 
-static void click_delete(struct coord pos)
-{
-        inst_deselect();
-        inst_select(pos);
+static void tool_selected_delete(void)
+{
         if (selected_inst) {
                 tool_dehover();
                 inst_delete(selected_inst);
-        }
-        change_world();
+                change_world();
+        }
         tool_reset();
 }
@@ -182 +182 @@
 
 static struct tool_ops delete_ops = {
-        .click          = click_delete,
+        .tool_selected  = tool_selected_delete,
 };
+
+
+void tool_selected_inst(struct inst *inst)
+{
+        set_image(ev_delete, delete_image[inst != NULL]);
+}
 
 
@@ -773 +779 @@
  * N  N  don't
  * Y  -  if we could drag, drag_new/end_new, else fall over to tool
- * N  Y  click, else single-click creation, else drag_new/end_new
+ * N  Y  else single-click creation, else drag_new/end_new
  */
 
@@ -801 +807 @@
         if (!active_ops)
                 return 0;
-        if (active_ops->click) {
-                active_ops->click(pos);
-                return 0;
-        }
 
         curr = get_hover_inst(pos);
@@ -962 +964 @@
         ev_point = tool_button(bar, drawable, xpm_point,
             tool_button_press_event, NULL);
-        tool_button(bar, drawable, xpm_delete,
-            tool_button_press_event, &delete_ops);
+        ev_delete = tool_button(bar, drawable, NULL,
+             tool_button_press_event, &delete_ops);
         tool_separator(bar);
         tool_button(bar, drawable, xpm_vec,
@@ -992 +994 @@
         set_frame_image(frame_image);
 
+        delete_image[0] = gtk_widget_ref(make_image(drawable, xpm_delete_off));
+        delete_image[1] = gtk_widget_ref(make_image(drawable, xpm_delete));
+        set_image(ev_delete, delete_image[0]);
+
         tool_reset();
 

trunk/eda/fped/gui_tool.h

@@ -24 +24 @@
         void (*tool_deselected)(void);
         struct inst *(*find_point)(struct coord pos);
-        void (*click)(struct coord pos);
         void (*begin_drag_new)(struct inst *from);
         struct pix_buf *(*drag_new)(struct inst *from, struct coord to);
@@ -72 +71 @@
 void tool_frame_deleted(const struct frame *frame);
 
+void tool_selected_inst(struct inst *inst);
+
 void tool_reset(void);
 

trunk/eda/fped/icons/delete.fig

@@ -10 +10 @@
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
          3600 2400 6000 2400 6000 4800 3600 4800 3600 2400
-2 1 0 15 18 7 50 -1 -1 0.000 0 1 -1 0 0 2
+2 1 0 15 19 7 50 -1 -1 0.000 0 1 -1 0 0 2
          4125 2925 5475 4275
-2 1 0 15 18 7 50 -1 -1 0.000 0 1 -1 0 0 2
+2 1 0 15 19 7 50 -1 -1 0.000 0 1 -1 0 0 2
          4125 4275 5475 2925

trunk/eda/fped/inst.c

@@ -119 +119 @@
         edit_nothing();
         selected_inst = NULL;
+        if (selected_inst)
+                tool_selected_inst(NULL);
         FOR_INST_PRIOS_DOWN(prio) {
                 if (!show(prio))
@@ -155 +157 @@
 selected:
         set_path(1);
+        tool_selected_inst(selected_inst);
         if (selected_inst->ops->select)
                 selected_inst->ops->select(selected_inst);
@@ -264 +267 @@
 void inst_deselect(void)
 {
-        if (selected_inst)
+        if (selected_inst) {
                 set_path(0);
+                tool_selected_inst(NULL);
+        }
         deselect_outside();
         status_set_type_x("");