Changeset 1955 for branches/blt4/gui

Timestamp:

Nov 16, 2010, 3:35:20 PM (14 years ago)

Author:

gah

Message:

add unit cell to molvisviewer

File:

• branches/blt4/gui/scripts/molvisviewer.tcl (modified) (7 diffs)

branches/blt4/gui/scripts/molvisviewer.tcl

@@ -135 +135 @@
     private method Representation {option {model "all"} }
     private method CartoonTrace {option {model "all"}}
-    private method ComputeParallelPipedVertices { dataobj }
+    private method ComputeParallelepipedVertices { dataobj }
     private method Cell {option}
     private method Rock {option}
@@ -506 +506 @@
         "Set cartoon representation of bonds (sticks)."
 
-    checkbutton $inner.cell -text "Parallelpiped" \
+    checkbutton $inner.cell -text "Parallelepiped" \
         -command [itcl::code $this Cell toggle] \
         -font "Arial 9 bold"
@@ -873 +873 @@
             set _active($model) $dataobj
         }
-        set vector [$dataobj get components.parallelpiped.vector]
+        set vector [$dataobj get components.parallelepiped.vector]
         if { $vector != "" } {
-            set vertices [ComputeParallelPipedVertices $dataobj]
+            set vertices [ComputeParallelepipedVertices $dataobj]
     puts stderr "vertices=$vertices"
             SendCmd "raw -defer {verts = \[$vertices\]\n}"
@@ -2042 +2042 @@
 }
 
-itcl::body Rappture::MolvisViewer::ComputeParallelPipedVertices { dataobj } {
+itcl::body Rappture::MolvisViewer::ComputeParallelepipedVertices { dataobj } {
     # Create a vector for every 3D point
     blt::vector p0(3) p1(3) p2(3) p3(3) p4(3) p5(3) p6(3) p7(3)
 
     set count 0
-    set parent [$dataobj element -as object "components.parallelpiped"]
+    set parent [$dataobj element -as object "components.parallelepiped"]
  puts stderr "parent=$parent"
     foreach child [$parent children] {
@@ -2060 +2060 @@
     }
     if { $count < 1 || $count > 3 } {
-        error "bad number of vectors supplied to paralledpiped"
-    }
-
-    set scale [$dataobj get components.parallelpiped.scale]
+        error "bad number of vectors supplied to paralledepiped"
+    }
+
+    set scale [$dataobj get components.parallelepiped.scale]
     set n [llength $scale]
     set sx 1.0 
@@ -2080 +2080 @@
         set sz [lindex $scale 2]
     }
-    set origin [$dataobj get components.parallelpiped.origin]
+    set origin [$dataobj get components.parallelepiped.origin]
     set n [llength $origin]
     p0 set { 0.0 0.0 0.0 }
@@ -2093 +2093 @@
         set p0(2) [lindex $origin 2]
     }
+    p1 expr {p1 + p0}
+    p2 expr {p2 + p0}
+    p3 expr {p3 + p0}
     p4 expr {p2 + p1}
     p5 expr {p4 + p3}