Changeset 5527

Timestamp:

08/22/09 21:00:55 (4 years ago)

Author:

werner

Message:

• new visualization option: show all frames or show only current frame
• new visualization option: highlight pads and silk ("final" view)

Location:

trunk/eda/fped

Files:

• Makefile (modified) (1 diff)
• gui.c (modified) (6 diffs)
• gui.h (modified) (1 diff)
• gui_inst.c (modified) (1 diff)
• icons/all.fig (added)
• icons/all_off.fig (added)
• icons/bright.fig (added)
• icons/bright_off.fig (added)
• inst.c (modified) (5 diffs)
• inst.h (modified) (1 diff)

trunk/eda/fped/Makefile

@@ -23 +23 @@
        line.xpm rect.xpm pad.xpm rpad.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 \
+       bright.xpm bright_off.xpm all.xpm all_off.xpm
 
 SHELL = /bin/bash

trunk/eda/fped/gui.c

@@ -28 +28 @@
 #include "icons/meas.xpm"
 #include "icons/meas_off.xpm"
+#include "icons/all.xpm"
+#include "icons/all_off.xpm"
+#include "icons/bright.xpm"
+#include "icons/bright_off.xpm"
 
 
 GtkWidget *root;
+int show_all = 1;
 int show_stuff = 1;
 int show_meas = 1;
+int show_bright = 0;
 
 
 static GtkWidget *frames_box;
-static GtkWidget *ev_stuff, *ev_meas;
-static GtkWidget *stuff_image[2], *meas_image[2];
+static GtkWidget *ev_stuff, *ev_meas, *ev_all, *ev_bright;
+static GtkWidget *stuff_image[2], *meas_image[2], *all_image[2];
+static GtkWidget *bright_image[2];
 
 
@@ -88 +95 @@
 
 
+static gboolean toggle_all(GtkWidget *widget, GdkEventButton *event,
+    gpointer data)
+{
+        switch (event->button) {
+        case 1:
+                show_all = !show_all;
+                set_image(ev_all, all_image[show_all]);
+                inst_deselect();
+                redraw();
+                break;
+        }
+        return TRUE;
+}
+
+
 static gboolean toggle_stuff(GtkWidget *widget, GdkEventButton *event,
     gpointer data)
@@ -118 +140 @@
 
 
+static gboolean toggle_bright(GtkWidget *widget, GdkEventButton *event,
+    gpointer data)
+{
+        switch (event->button) {
+        case 1:
+                show_bright = !show_bright;
+                set_image(ev_bright, bright_image[show_bright]);
+                inst_deselect();
+                redraw();
+                break;
+        }
+        return TRUE;
+}
+
+
 static void make_tool_bar(GtkWidget *hbox, GdkDrawable *drawable)
 {
@@ -127 +164 @@
         gtk_toolbar_set_style(GTK_TOOLBAR(bar), GTK_TOOLBAR_ICONS);
 
+        ev_all = tool_button(bar, drawable, NULL, toggle_all, NULL);
         ev_stuff = tool_button(bar, drawable, NULL, toggle_stuff, NULL);
         ev_meas = tool_button(bar, drawable, NULL, toggle_meas, NULL);
+        ev_bright = tool_button(bar, drawable, NULL, toggle_bright, NULL);
 
         stuff_image[0] = gtk_widget_ref(make_image(drawable, xpm_stuff_off));
@@ -134 +173 @@
         meas_image[0] = gtk_widget_ref(make_image(drawable, xpm_meas_off));
         meas_image[1] = gtk_widget_ref(make_image(drawable, xpm_meas));
+        all_image[0] = gtk_widget_ref(make_image(drawable, xpm_all_off));
+        all_image[1] = gtk_widget_ref(make_image(drawable, xpm_all));
+        bright_image[0] = gtk_widget_ref(make_image(drawable, xpm_bright_off));
+        bright_image[1] = gtk_widget_ref(make_image(drawable, xpm_bright));
 
         set_image(ev_stuff, stuff_image[show_stuff]);
         set_image(ev_meas, meas_image[show_meas]);
+        set_image(ev_all, all_image[show_all]);
+        set_image(ev_bright, bright_image[show_bright]);
 }
 
@@ -146 +191 @@
         g_object_unref(meas_image[0]);
         g_object_unref(meas_image[1]);
+        g_object_unref(all_image[0]);
+        g_object_unref(all_image[1]);
+        g_object_unref(bright_image[0]);
+        g_object_unref(bright_image[1]);
 }
 

trunk/eda/fped/gui.h

@@ -19 +19 @@
 
 extern GtkWidget *root;
+extern int show_all;
 extern int show_stuff;
 extern int show_meas;
+extern int show_bright;
 
 

trunk/eda/fped/gui_inst.c

@@ -112 +112 @@
         if (selected_inst == self)
                 return mode_selected;
-        return self->active ? mode_active : mode_inactive;
+        return self->active || bright(self) ? mode_active : mode_inactive;
 }
 

trunk/eda/fped/inst.c

@@ -42 +42 @@
 static struct inst_ops vec_ops;
 static struct inst_ops frame_ops;
+static struct inst_ops meas_ops;
 
 
@@ -61 +62 @@
                 return 1;
         }
+}
+
+
+int bright(const struct inst *inst)
+{
+        if (!show_bright)
+                return 0;
+        return inst->ops != &vec_ops && inst->ops != &frame_ops &&
+            inst->ops != &meas_ops;
+}
+
+
+static int show_this(const struct inst *inst)
+{
+        if (show_all)
+                return 1;
+        if (inst->ops == &frame_ops && inst->u.frame.ref == active_frame)
+                return 1;
+        if (!inst->outer)
+                return active_frame == root_frame;
+        return inst->outer->u.frame.ref == active_frame;
 }
 
@@ -177 +199 @@
                         continue;
                 FOR_ALL_INSTS(i, prio, inst) {
+                        if (!show_this(inst))
+                                continue;
                         if (!inst->ops->distance)
                                 continue;
@@ -229 +253 @@
         }
 
+        if (!show_all)
+                return 0;
+
         if (any_same_frame) {
                 if (activate_item(any_same_frame))
@@ -1149 +1176 @@
         FOR_INST_PRIOS_UP(prio)
                 FOR_ALL_INSTS(i, prio, inst)
-                        if (show(prio) && !inst->active && inst->ops->draw)
-                                inst->ops->draw(inst);
+                        if (show_this(inst))
+                                if (show(prio) && !inst->active &&
+                                    inst->ops->draw)
+                                        inst->ops->draw(inst);
         FOR_INST_PRIOS_UP(prio)
                 FOR_ALL_INSTS(i, prio, inst)

trunk/eda/fped/inst.h

@@ -148 +148 @@
 
 
+int bright(const struct inst *inst);
+
 void inst_select_outside(void *item, void (*deselect)(void *item));
 int inst_select(struct coord pos);