[Teem-commit] teem-vtk/camAnim anim.tcl,1.2,1.3 camAnim.tcl,1.2,1.3

[Gordon K. <kin...@us...>]

Update of /cvsroot/teem/teem-vtk/camAnim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32720/camAnim

Modified Files:
	anim.tcl camAnim.tcl 
Log Message:
I now believe that limnCameraPathMake works correctly

Index: anim.tcl
===================================================================
RCS file: /cvsroot/teem/teem-vtk/camAnim/anim.tcl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** anim.tcl	10 May 2004 10:47:20 -0000	1.2
--- anim.tcl	10 May 2004 23:22:37 -0000	1.3
***************
*** 77,81 ****
    .an.whichKeyS config -to [expr $numberKeys-1]
    set whichKey 0
!   newWhichKey
  
    return 
--- 77,81 ----
    .an.whichKeyS config -to [expr $numberKeys-1]
    set whichKey 0
!   newWhichKey blah
  
    return 
***************
*** 112,116 ****
  }
  proc setCamState {allState} {
!   global camera cursor cursorX cursorY cursorZ
    global viewAngle
  
--- 112,116 ----
  }
  proc setCamState {allState} {
!   global camera cursor cursorX cursorY cursorZ upVector
    global viewAngle
  
***************
*** 127,130 ****
--- 127,131 ----
    eval $camera SetFocalPoint $at
    eval $camera SetViewUp $up
+   set upVector $up
    eval $camera SetPosition $fr
    $camera SetClippingRange $dn $df
***************
*** 138,161 ****
  }
  proc getState {} {
-   global isoValue
    global relDwell
  
    # allHash simplifies construction of even-length list describing state
    array set allHash [getCamState]
-   array set allHash "isoValue $isoValue"
    array set allHash "relDwell $relDwell"
    return [array get allHash]
  }
  proc setState {allState} {
-   global isoValue
    global relDwell
  
    array set allHash $allState
    setCamState $allState
-   set isoValue [lindex [array get allHash "isoValue"] 1]
-   newIsoValue
    set relDwell [lindex [array get allHash "relDwell"] 1]
  }
! proc newWhichKey {} {
    global whichKey
    global masterKey
--- 139,157 ----
  }
  proc getState {} {
    global relDwell
  
    # allHash simplifies construction of even-length list describing state
    array set allHash [getCamState]
    array set allHash "relDwell $relDwell"
    return [array get allHash]
  }
  proc setState {allState} {
    global relDwell
  
    array set allHash $allState
    setCamState $allState
    set relDwell [lindex [array get allHash "relDwell"] 1]
  }
! proc newWhichKey {blah} {
    global whichKey
    global masterKey
***************
*** 192,196 ****
    set numberKeys [llength $masterKey]
    .an.whichKeyS config -to [expr $numberKeys-1]
!   newWhichKey
  }
  proc initKeys {} {
--- 188,192 ----
    set numberKeys [llength $masterKey]
    .an.whichKeyS config -to [expr $numberKeys-1]
!   newWhichKey blah
  }
  proc initKeys {} {
***************
*** 203,207 ****
    set numberKeys [llength $masterKey]
    set whichKey 0
!   newWhichKey
  }
  proc nukeKeys {} {
--- 199,203 ----
    set numberKeys [llength $masterKey]
    set whichKey 0
!   newWhichKey blah
  }
  proc nukeKeys {} {
***************
*** 280,285 ****
  label .an.whichKeyL -text "Current Keyframe"
  scale .an.whichKeyS -len $scaleLen -from 0 -to [expr $numberKeys-1] \
!   -res 1 -ori h -var whichKey
! bind .an.whichKeyS <ButtonRelease> newWhichKey
  grid .an.whichKeyL -s e -row $row -column 0
  grid .an.whichKeyS -s w -row $row -column 1 -columnspan 3
--- 276,280 ----
  label .an.whichKeyL -text "Current Keyframe"
  scale .an.whichKeyS -len $scaleLen -from 0 -to [expr $numberKeys-1] \
!   -res 1 -ori h -var whichKey -command newWhichKey
  grid .an.whichKeyL -s e -row $row -column 0
  grid .an.whichKeyS -s w -row $row -column 1 -columnspan 3
***************
*** 361,365 ****
    foreach key $masterKey {
      array set allHash $key
-     lappend isoValueList [lindex [array get allHash "isoValue"] 1]
      set dn [lindex [array get allHash "cam.dn"] 1]
      set di [lindex [array get allHash "cam.di"] 1]
--- 356,359 ----
***************
*** 371,380 ****
      lappend fratupList [concat $fr $at $up]
    }
-   puts "isoValueList = $isoValueList"
    puts "dndidfList = $dndidfList"
    puts "fratupList = $fratupList"
    
    saveList "time.txt" $timeList
-   saveList "isovalue.txt" $isoValueList
    saveList "dndidf.txt" $dndidfList
    saveList "fratup.txt" $fratupList
--- 365,372 ----

Index: camAnim.tcl
===================================================================
RCS file: /cvsroot/teem/teem-vtk/camAnim/camAnim.tcl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** camAnim.tcl	10 May 2004 10:47:20 -0000	1.2
--- camAnim.tcl	10 May 2004 23:22:37 -0000	1.3
***************
*** 34,37 ****
--- 34,39 ----
  
  set frameShown 0
+ set cursorShown 1
+ 
  set cubeWidth 0.04
  set cursorX 0
***************
*** 445,448 ****
--- 447,467 ----
    .top.buttPng config -text "Save $fname"
  }
+ proc toggleCursor {} {
+   global cursorShown
+ 
+   puts "toggleCursor $cursorShown"
+   if {$cursorShown} {
+     ren RemoveActor cubeActor
+   } else {
+     ren AddActor cubeActor
+   }
+   if {$cursorShown} {
+     .top.c.but config -text "Show Cursor"
+   } else {
+     .top.c.but config -text "Hide Cursor"
+   }
+   render
+   set cursorShown [expr 1 - $cursorShown]
+ }
  proc toggleFrame {} {
    global frameShown