Changeset 2991 for branches/blt4

Timestamp:

May 2, 2012, 11:51:22 AM (12 years ago)

Author:

gah

Message:

 

Location:

branches/blt4

Files:

• gui/scripts/drawingcontrols.tcl (modified) (1 diff)
• gui/scripts/drawingentry.tcl (modified) (7 diffs)
• packages/vizservers/start_nanoscale.sh.in (modified) (1 diff)

branches/blt4/gui/scripts/drawingcontrols.tcl

@@ -56 +56 @@
     $_dispatcher dispatch $this !layout "[itcl::code $this Rebuild]; list"
     
-    set _frame $itk_interior
     set _owner $owner
     set _frame $itk_interior.frame

branches/blt4/gui/scripts/drawingentry.tcl

@@ -92 +92 @@
     #
     itk_component add drawing {
-        canvas $itk_interior.canvas -background white -relief sunken -bd 1
+        canvas $itk_interior.canvas -background white -relief sunken -bd 1 \
+            -width 800 -height 600
     } {
         ignore -background
@@ -315 +316 @@
             set value [XmlGet $cpath.$attr]
             lappend _cname2controls($cname) $value
-            puts stderr "$_owner xml put $value.hide 1"
             $_owner xml put $value.hide 1
         }
@@ -437 +437 @@
         }
     }
+    set contents [XmlGet $cpath.contents]
+    set img ""
+    if { [string compare -length 5 $contents "file:"] == 0 } {
+        set fileName [string range $contents 5 end]
+        if { [file exists $fileName] } {
+            set img [image create picture -file $fileName]
+        }
+    } elseif { [string compare -length 5 $contents "http:"] == 0 } {
+        puts stderr  "don't know how to handle http"
+        return
+    } else {
+        set img [image create picture -data $contents]
+    }
+    if { $img == "" } {
+        return
+    }
     # Coordinates
-    set coords {}
     set coords [XmlGet $cpath.coords]
     set coords [ScreenCoords $coords]
@@ -491 +506 @@
         set y1 0
     }
-    set contents [$XmlGet $cpath.contents]
-    if { [string compare -length 5 $contents "file:"] } {
-        set fileName [string range $contents 5 end]
-        set img [image create picture -file $fileName]
-    } elseif { [string compare -length 5 $contents "http:"] } {
-        puts stderr  "don't know how to handle http"
-    } else {
-        set img [image create picture -data $contents]
-    }
     set options(-tags) $cname
     set options(-image) $img
-    set id [eval $itk_component(drawing) create oval $coords]
+    set id [$itk_component(drawing) create image $x1 $y1]
     set _cname2image($cname) $img
     set _cname2id($cname) $id
@@ -522 +528 @@
     }
     # Coords
-    set coords [$XmlGet $cpath.coords]
+    set coords [XmlGet $cpath.coords]
     set coords [string trim $coords]
     if { $coords == "" } {
@@ -748 +754 @@
                 ParseScreenCoordinates $value
             }
+            "width*" {
+                set width [XmlGet $_path.background.$elem]
+                $itk_component(drawing) configure -width $width
+            }
+            "height*" {
+                set height [XmlGet $_path.background.$elem]
+                $itk_component(drawing) configure -height $height
+            }
         }
     }
@@ -771 +785 @@
                 "map*" {
                     set from [XmlGet $varPath.$elem.from]
-                    set to [Xmlget $varPath.$elem.to]
+                    set to [XmlGet $varPath.$elem.to]
                     if { $from == "" || $to == "" } {
                         puts stderr "empty translation in map table \"$varPath\""

branches/blt4/packages/vizservers/start_nanoscale.sh.in

@@ -1 +1 @@
 #! /bin/sh
-
-DISPLAY=:0
-export DISPLAY
 
 # Fail on errors