Changeset 5514

Timestamp:

08/21/09 20:20:37 (4 years ago)

Author:

werner

Message:

• measurement offsets can now use variables. We evaluate the offset during instantiation and create a partially formed instance. During measurement instantiation, we complete that instance.
• leak.supp: finally figured out how to write a valgrind suppression file
• fped.c: we don't need the FPED_NO_GUI kludge anymore
• fped.c: moved gui_cleanup_style to gui_main
• dereference icons (seems that this doesn't deallocate everything, though)

Location:

trunk/eda/fped

Files:

• TODO (modified) (1 diff)
• fped.c (modified) (2 diffs)
• gui.c (modified) (2 diffs)
• gui_style.c (modified) (1 diff)
• gui_style.h (modified) (1 diff)
• gui_tool.c (modified) (1 diff)
• gui_tool.h (modified) (1 diff)
• inst.c (modified) (2 diffs)
• inst.h (modified) (1 diff)
• leak.supp (added)
• leakcheck (modified) (1 diff)
• meas.c (modified) (2 diffs)
• obj.c (modified) (2 diffs)

trunk/eda/fped/TODO

@@ -35 +35 @@
 - can't edit measurement labels through the GUI
 - r of rpads is misleading, particularly if we have a circle
-- using variables in a measurement offset causes a crash because evaluation
-  takes place after all table entries have been visited
 
 Code cleanup:

trunk/eda/fped/fped.c

@@ -57 +57 @@
         int batch_write_kicad = 0, batch_write_ps = 0;
         int c;
-        int have_gui = !getenv("FPED_NO_GUI");
 
-        if (have_gui) {
-                error = gui_init(&argc, &argv);
-                if (error)
-                        return error;
-        }
+        error = gui_init(&argc, &argv);
+        if (error)
+                return error;
 
         while ((c = getopt(argc, argv, "kp")) != EOF)
@@ -107 +104 @@
         if (batch_write_ps)
                 write_ps();
-        if (have_gui && !batch_write_kicad && !batch_write_ps) {
+        if (!batch_write_kicad && !batch_write_ps) {
                 error = gui_main();
                 if (error)

trunk/eda/fped/gui.c

@@ -140 +140 @@
 
 
+static void cleanup_tool_bar(void)
+{
+        g_object_unref(stuff_image[0]);
+        g_object_unref(stuff_image[1]);
+        g_object_unref(meas_image[0]);
+        g_object_unref(meas_image[1]);
+}
+
+
 static void make_top_bar(GtkWidget *vbox)
 {
@@ -249 +258 @@
         gtk_main();
 
+        gui_cleanup_style();
+        gui_cleanup_tools();
+        cleanup_tool_bar();
+
         return 0;
 }

trunk/eda/fped/gui_style.c

@@ -75 +75 @@
         item_list_font = pango_font_description_from_string(ITEM_LIST_FONT);
 }
+
+
+void gui_cleanup_style(void)
+{
+        pango_font_description_free(item_list_font);
+}

trunk/eda/fped/gui_style.h

@@ -116 +116 @@
 
 void gui_setup_style(GdkDrawable *drawable);
+void gui_cleanup_style(void);
 
 #endif /* !GUI_STYLE_H */

trunk/eda/fped/gui_tool.c

@@ -1045 +1045 @@
         return bar;
 }
+
+
+void gui_cleanup_tools(void)
+{
+        g_object_unref(frame_image);
+        g_object_unref(frame_image_locked);
+        g_object_unref(frame_image_ready);
+        g_object_unref(delete_image[0]);
+        g_object_unref(delete_image[1]);
+}

trunk/eda/fped/gui_tool.h

@@ -78 +78 @@
 
 GtkWidget *gui_setup_tools(GdkDrawable *drawable);
+void gui_cleanup_tools(void);
 
 #endif /* !GUI_TOOL_H */

trunk/eda/fped/inst.c

@@ -804 +804 @@
 
 
-int inst_meas(struct obj *obj,
-    struct coord from, struct coord to, unit_type offset)
+static struct inst *find_meas_hint(const struct obj *obj)
+{
+        struct inst *inst;
+
+        for (inst = curr_pkg->insts[ip_meas]; inst; inst = inst->next)
+                if (inst->obj == obj)
+                        break;
+        return inst;
+}
+
+
+int inst_meas(struct obj *obj, struct coord from, struct coord to)
 {
         struct inst *inst;
         struct coord a1, b1;
 
-        inst = add_inst(&meas_ops, ip_meas, from);
-        inst->obj = obj;
+        inst = find_meas_hint(obj);
+        assert(inst);
+        inst->base = from;
         inst->u.meas.end = to;
-        inst->u.meas.offset = offset;
-        inst->active = 1; /* measurements are always active */
         /* @@@ we still need to consider the text size as well */
+        update_bbox(&inst->bbox, from);
         update_bbox(&inst->bbox, to);
         project_meas(inst, &a1, &b1);
@@ -822 +832 @@
         propagate_bbox(inst);
         return 1;
+}
+
+
+void inst_meas_hint(struct obj *obj, unit_type offset)
+{
+        static const struct coord zero = { 0, 0 };
+        struct inst *inst;
+
+        inst = find_meas_hint(obj);
+        if (inst)
+                return;
+        inst = add_inst(&meas_ops, ip_meas, zero);
+        inst->obj = obj;
+        inst->u.meas.offset = offset;
+        inst->active = 1; /* measurements are always active */
 }
 

trunk/eda/fped/inst.h

@@ -165 +165 @@
 int inst_arc(struct obj *obj, struct coord center, struct coord start,
     struct coord stop, unit_type width);
-int inst_meas(struct obj *obj, struct coord from, struct coord to,
-    unit_type offset);
+int inst_meas(struct obj *obj, struct coord from, struct coord to);
+void inst_meas_hint(struct obj *obj, unit_type offset);
 
 void inst_begin_active(int active);

trunk/eda/fped/leakcheck

@@ -1 +1 @@
 #!/bin/sh
-#valgrind --leak-check=full --show-reachable=yes --suppressions=leak.supp \
-#  ./fped "$@"
-
-#
-# Seems that we can't suppress warnings from gtk_init, so we use FPED_NO_GUI
-# to avoid bringing up Gtk+ at all.
-#
-FPED_NO_GUI=y valgrind --leak-check=full --show-reachable=yes \
+valgrind --leak-check=full --show-reachable=yes --num-callers=50 \
+  --suppressions=leak.supp \
   ./fped "$@"
-
-#valgrind --leak-check=full --show-reachable=no \
-#  ./fped "$@"

trunk/eda/fped/meas.c

@@ -232 +232 @@
         struct coord a0, b0;
         lt_op_type lt;
-        struct num offset;
 
         for (obj = root_frame->objs; obj; obj = obj->next) {
@@ -251 +250 @@
                             curr_pkg->samples[meas->high->n]);
 
-                if (!meas->offset)
-                        offset.n = 0;
-                else {
-                        offset = eval_unit(meas->offset, root_frame);
-                        if (is_undef(offset)) {
-                                instantiation_error = obj;
-                                return 0;
-                        }
-                }
                 inst_meas(obj,
-                    meas->inverted ? b0 : a0, meas->inverted ? a0 : b0,
-                    offset.n);
+                    meas->inverted ? b0 : a0, meas->inverted ? a0 : b0);
         }
         return 1;

trunk/eda/fped/obj.c

@@ -95 +95 @@
 static int generate_objs(struct frame *frame, struct coord base, int active)
 {
+        static const struct num zero_offset = {
+                .type = nt_mm,
+                .exponent = 0,
+                .n = 0,
+        };
         struct obj *obj;
         char *name;
         int ok;
-        struct num width;
+        struct num width, offset;
 
         for (obj = frame->objs; obj; obj = obj->next)
@@ -151 +156 @@
                         break;
                 case ot_meas:
+                        assert(frame == root_frame);
+                        offset = eval_unit_default(obj->u.meas.offset, frame,
+                            zero_offset);
+                        if (is_undef(offset))
+                                goto error;
+                        inst_meas_hint(obj, offset.n);
                         break;
                 default: