Changeset 2175 for trunk/gui/scripts

Timestamp:

Mar 30, 2011, 1:45:19 PM (14 years ago)

Author:

gah

Message:

updates to makefiles

Location:

trunk/gui/scripts

Files:

• Makefile.in (modified) (2 diffs)
• analyzer.tcl (modified) (7 diffs)
• controls.tcl (modified) (1 diff)

trunk/gui/scripts/Makefile.in

@@ -150 +150 @@
         @for i in $(FILES); do \
             echo "Installing $$i" ; \
-            $(INSTALL) -m 444 $$i $(destdir) ; \
+            $(INSTALL) -m 0444 $$i $(destdir) ; \
         done 
-        $(INSTALL) -m 444 tclIndex $(destdir)
+        $(INSTALL) -m 0444 tclIndex $(destdir)
 
 install_images:
@@ -158 +158 @@
         @for i in $(srcdir)/images/*.gif $(srcdir)/images/*.png $(srcdir)/images/*.xbm; do \
             echo "Installing $$i" ; \
-            $(INSTALL) -m 444 $$i $(destdir)/images ; \
+            $(INSTALL) -m 0444 $$i $(destdir)/images ; \
         done 
 

trunk/gui/scripts/analyzer.tcl

@@ -1155 +1155 @@
 #
 # Used internally to determine whether pdb or lammps data represents a
-# trajectory rather than a single model 
+# trajectory rather than a single frame
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::_isPdbTrajectory {data} {
@@ -1179 +1179 @@
 #
 # Used internally to determine whether pdb or lammps data represents a
-# trajectory rather than a single model 
+# trajectory rather than a single frame
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::_isLammpsTrajectory { data } {
@@ -1219 +1219 @@
     $xmlobj put ${sequence}.about.label $seqLabel
     $xmlobj put ${sequence}.about.description $descr
-    $xmlobj put ${sequence}.index.label "Model"
-
-    set modelNum 1
+    $xmlobj put ${sequence}.index.label "Frame"
+
+    set frameNum 0
     set numLines [llength $data]
     for { set i 0 } { $i < $numLines } { incr i } {
@@ -1240 +1240 @@
                 append contents $line\n
             }
-            set model ${sequence}.element($modelNum)
-            $xmlobj put ${model}.index $modelNum
+            set frame ${sequence}.element($frameNum)
+            $xmlobj put ${frame}.index $frameNum
             
-            set molecule ${model}.structure.components.molecule
+            set molecule ${frame}.structure.components.molecule
             $xmlobj put ${molecule}.pdb $contents
             $xmlobj put ${molecule}.formula $formula
-            incr modelNum
+            incr frameNum
         }
     }
@@ -1271 +1271 @@
     $xmlobj put ${sequence}.about.label $seqLabel
     $xmlobj put ${sequence}.about.description $descr
-    $xmlobj put ${sequence}.index.label "Model"
-
-    set modelNum 1
-    set modelContents ""
+    $xmlobj put ${sequence}.index.label "Frame"
+
+    set frameNum 0
+    set frameContents ""
     set inModel 0
     foreach line $data {
@@ -1282 +1282 @@
         }
         if {[regexp {^[\t ]*ITEM:[ \t]+ATOMS} $line] } {
-            if { $inModel && $modelContents != "" } {
-                set model ${sequence}.element($modelNum)
-                $xmlobj put ${model}.index $modelNum
+            if { $inModel && $frameContents != "" } {
+                set frame ${sequence}.element($frameNum)
+                $xmlobj put ${frame}.index $frameNum
                 
-                set molecule ${model}.structure.components.molecule
-                $xmlobj put ${molecule}.lammps $modelContents
+                set molecule ${frame}.structure.components.molecule
+                $xmlobj put ${molecule}.lammps $frameContents
                 $xmlobj put ${molecule}.lammpstypemap $typemap
                 
-                incr modelNum
-                set modelContents ""
+                incr frameNum
+                set frameContents ""
             }
             set inModel 1
@@ -1299 +1299 @@
                 set inModel 1
             }
-            append modelContents $line\n
-        }
-    }
-    if { $modelContents != "" } {
-        set model ${sequence}.element($modelNum)
-        $xmlobj put ${model}.index $modelNum
+            append frameContents $line\n
+        }
+    }
+    if { $frameContents != "" } {
+        set frame ${sequence}.element($frameNum)
+        $xmlobj put ${frame}.index $frameNum
         
-        set molecule ${model}.structure.components.molecule
-        $xmlobj put ${molecule}.lammps $modelContents
+        set molecule ${frame}.structure.components.molecule
+        $xmlobj put ${molecule}.lammps $frameContents
         $xmlobj put ${molecule}.lammpstypemap $typemap
     }

trunk/gui/scripts/controls.tcl

@@ -184 +184 @@
         }
     }
+
+    #
+    # If this element has an <enable> expression, then register
+    # its controlling widget here.
+    #
+    set notify [string trim [$_owner xml get $path.about.notify]]
 
     #