Changeset 5552

Timestamp:

08/27/09 11:01:24 (4 years ago)

Author:

werner

Message:

Made interactive selection of measurement points a little less inefficient.

• vectors now have their own struct in inst.u and don't share inst.u.rect.end
• when selecting points for measurements, use the highlighting we've already done and don't redo all the O(n^{3) searching for each mouse pointer movement}
• removed debug code that printed what new measurements are like. We can now use the code view for that.

Location:

trunk/eda/fped

Files:

• gui_inst.c (modified) (4 diffs)
• gui_meas.c (modified) (8 diffs)
• gui_tool.c (modified) (2 diffs)
• inst.c (modified) (4 diffs)
• inst.h (modified) (2 diffs)

trunk/eda/fped/gui_inst.c

@@ -123 +123 @@
         unit_type d;
 
-        d = dist_point(pos, self->u.rect.end)/scale;
+        d = dist_point(pos, self->u.vec.end)/scale;
         return d > VEC_EYE_R ? -1 : d;
 }
@@ -139 +139 @@
         unit_type d;
 
-        d = dist_line(pos, self->base, self->u.rect.end)/scale;
+        d = dist_line(pos, self->base, self->u.vec.end)/scale;
         return d > SELECT_R ? -1 : d;
 }
@@ -146 +146 @@
 void gui_highlight_vec(struct inst *self)
 {
-        struct coord center = translate(self->u.rect.end);
+        struct coord center = translate(self->u.vec.end);
 
         draw_circle(DA, gc_highlight, FALSE, center.x, center.y, VEC_EYE_R);
@@ -155 +155 @@
 {
         struct coord from = translate(self->base);
-        struct coord to = translate(self->u.rect.end);
+        struct coord to = translate(self->u.vec.end);
         GdkGC *gc;
 

trunk/eda/fped/gui_meas.c

@@ -65 +65 @@
 
         min = meas_find_min(lt, active_pkg->samples[inst->vec->n]);
-        return coord_eq(inst->u.rect.end, min);
+        return coord_eq(inst->u.vec.end, min);
 }
 
@@ -75 +75 @@
 
         next = meas_find_next(lt, active_pkg->samples[inst->vec->n],
-            ref->u.rect.end);
-        return coord_eq(inst->u.rect.end, next);
+            ref->u.vec.end);
+        return coord_eq(inst->u.vec.end, next);
 }
 
@@ -85 +85 @@
 
         max = meas_find_max(lt, active_pkg->samples[inst->vec->n]);
-        return coord_eq(inst->u.rect.end, max);
+        return coord_eq(inst->u.vec.end, max);
 }
 
@@ -98 +98 @@
                 next = meas_find_next(lt, active_pkg->samples[inst->vec->n],
                     min);
-                if (coord_eq(next, inst->u.rect.end))
+                if (coord_eq(next, inst->u.vec.end))
                         return 1;
         }
@@ -113 +113 @@
         min = meas_find_min(lt, inst->vec->samples);
         next = meas_find_next(lt, ref->vec->samples, min);
-        return coord_eq(next, ref->u.rect.end);
+        return coord_eq(next, ref->u.vec.end);
 }
 #endif
@@ -235 +235 @@
 
 
+static int is_highlighted(struct inst *inst, void *user)
+{
+        return inst->u.vec.highlighted;
+}
+
+
 static struct inst *find_point_meas_new(struct coord pos)
 {
-        if (meas_inst)
-                return inst_find_vec(pos, meas_pick_vec_b, meas_inst);
-        else
-                return inst_find_vec(pos, meas_pick_vec_a, NULL);
+        return inst_find_vec(pos, is_highlighted, NULL);
 }
 
@@ -303 +306 @@
         meas->inverted =
             mode == min_to_next_or_max && is_min(meas_dsc->lt, to) ? 0 :
-            meas_dsc->lt(from->u.rect.end, to->u.rect.end) !=
+            meas_dsc->lt(from->u.vec.end, to->u.vec.end) !=
             (mode == min_to_next_or_max);
-{
-char *sm[] = { "min_to", "max_to", "next_to" };
-char *st[] = { "nxy", "nx", "ny", "mxy", "mx", "my" };
-fprintf(stderr, "mode %s type %s, inverted %d\n",
-sm[mode], st[meas->type], meas->inverted);
-}
         meas->offset = NULL;
         meas_dsc = NULL;
@@ -389 +386 @@
 struct inst *find_point_meas_move(struct inst *inst, struct coord pos)
 {
-        return inst_find_vec(pos, meas_pick_vec_b, meas_inst);
+        return inst_find_vec(pos, is_highlighted, NULL);
 }
 

trunk/eda/fped/gui_tool.c

@@ -275 +275 @@
 {
         return draw_move_line_common(inst,
-            add_vec(sub_vec(inst->u.rect.end, inst->base), pos), pos, i);
+            add_vec(sub_vec(inst->u.vec.end, inst->base), pos), pos, i);
 }
 
@@ -282 +282 @@
 {
         return hover_common(gc_vec[mode_hover],
-            self->u.rect.end, VEC_EYE_R);
+            self->u.vec.end, VEC_EYE_R);
 }
 

trunk/eda/fped/inst.c

@@ -354 +354 @@
 {
         if (inst->ops == &vec_ops)
-                return inst->u.rect.end;
+                return inst->u.vec.end;
         if (inst->ops == &frame_ops)
                 return inst->base;
@@ -576 +576 @@
         status_set_type_entry("ref =");
         status_set_name("%s", self->vec->name ? self->vec->name : "");
-        rect_status(self->base, self->u.rect.end, -1, 0);
+        rect_status(self->base, self->u.vec.end, -1, 0);
         vec_edit(self->vec);
 }
@@ -629 +629 @@
         inst = add_inst(&vec_ops, ip_vec, base);
         inst->vec = vec;
-        inst->u.rect.end = vec->pos;
+        inst->u.vec.end = vec->pos;
         update_bbox(&inst->bbox, vec->pos);
         propagate_bbox(inst);
@@ -1200 +1200 @@
         int i;
 
-        FOR_ALL_INSTS(i, ip_vec, inst)
-                if (pick(inst, user))
+        FOR_ALL_INSTS(i, ip_vec, inst) {
+                inst->u.vec.highlighted = pick(inst, user);
+                if (inst->u.vec.highlighted)
                         gui_highlight_vec(inst);
+        }
 }
 

trunk/eda/fped/inst.h

@@ -80 +80 @@
         union {
                 struct {
+                        int highlighted; /* for measurements */
+                        struct coord end;
+                } vec;
+                struct {
                         struct frame *ref;
                         int active;
@@ -85 +89 @@
                 const char *name;
                 struct {
+                        unit_type width;
                         struct coord end;
-                        unit_type width;
                 } rect;
                 struct {