Changeset 2135

Timestamp:

Mar 14, 2011, 11:00:49 AM (13 years ago)

Author:

mmc

Message:

Changes for the regression tester. Fixed the Diffview widget to show
the highlight properly as the window is widened. Also, fixed the way
changes are handled at the very end after the last common line.

Added an "xml" method to the Tool object, so we can access the underlying
XML data for each run.

Location:

trunk/gui

Files:

• scripts/diffview.tcl (modified) (1 diff)
• scripts/tool.tcl (modified) (2 diffs)
• src/RpDiffview.c (modified) (3 diffs)

trunk/gui/scripts/diffview.tcl

@@ -14 +14 @@
 # ======================================================================
 namespace eval Rappture { # forward declaration }
+
+# ----------------------------------------------------------------------
+# Code for "usual" itk options
+# ----------------------------------------------------------------------
+if {[catch {package require Itk}] == 0} {
+    itk::usual Diffview {
+        keep -background -foreground -cursor
+        keep -addedbackground -addedforeground
+        keep -deletedbackground -deletedforeground -overstrike
+        keep -changedbackground -changedforeground
+        keep -highlightcolor -highlightthickness
+        rename -highlightbackground -background background Background
+    }
+}
+
 
 # ----------------------------------------------------------------------

trunk/gui/scripts/tool.tcl

@@ -29 +29 @@
     public method abort {}
     public method reset {}
+    public method xml {args}
 
     protected method _mkdir {dir}
@@ -337 +338 @@
         if {[$_xmlobj element -as type $path.default] ne ""} {
             set defval [$_xmlobj get $path.default]
-            $_xmlobj put $path $defval
-        }
-    }
-}
-
+            $_xmlobj put $path.current $defval
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: xml ?<option> <arg> <arg>...?
+#
+# Used to access the XML specification for this tool.  With no extra
+# args, it returns the Rappture XML object.  Otherwise, it applies
+# the option/args to the object and returns the result.  The <option>
+# might be something like "children" or "element" or any other
+# operation supported by a Rappture::library object.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Tool::xml {args} {
+    if {[llength $args] == 0} {
+        return $_xmlobj
+    }
+    return [eval $_xmlobj $args]
+}
 
 # ----------------------------------------------------------------------

trunk/gui/src/RpDiffview.c

@@ -1583 +1583 @@
           - dvPtr->yOffset;
     x = dvPtr->inset - dvPtr->xOffset;
-    width = Tk_Width(tkwin);
+
+    if (Tk_Width(tkwin) > dvPtr->maxWidth) {
+        width = Tk_Width(tkwin)+10;
+    } else {
+        width = dvPtr->maxWidth+10;
+    }
 
     for (i=dvPtr->topLine;
@@ -2346 +2351 @@
     DiffviewLines *lineLimitsPtr;   /* data structure being freed */
 {
-    if (lineLimitsPtr->startPtr) {
-        ckfree((char*)lineLimitsPtr->startPtr);
-    }
-    if (lineLimitsPtr->lenPtr) {
-        ckfree((char*)lineLimitsPtr->lenPtr);
-    }
-    ckfree((char*)lineLimitsPtr);
+    if (lineLimitsPtr) {
+        if (lineLimitsPtr->startPtr) {
+            ckfree((char*)lineLimitsPtr->startPtr);
+        }
+        if (lineLimitsPtr->lenPtr) {
+            ckfree((char*)lineLimitsPtr->lenPtr);
+        }
+        ckfree((char*)lineLimitsPtr);
+    }
 }
 
@@ -2594 +2601 @@
         i++; j++;
     }
+
+    /* lines left over? mark as many "changed" as possible */
+    if (limsPtr1->numLines-i > 0 && limsPtr2->numLines-j > 0) {
+        del = (limsPtr1->numLines-i < limsPtr2->numLines-j)
+                ? limsPtr1->numLines-i : limsPtr2->numLines-j;
+        DiffviewDiffsAppend(diffPtr, 'c', i, i+del-1, j, j+del-1);
+        i += del;
+        j += del;
+    }
+
+    /* still have lines left over? then mark them added or deleted */
     if (i < limsPtr1->numLines) {
         del = limsPtr1->numLines - i;