Changeset 1174

Timestamp:

Oct 24, 2011 11:06:34 PM (11 years ago)

Author:

toby

Message:

Revise routine for loading rbimport_*.tcl files; update MacroRecord? for parameters with lists as values

File:

• branches/sandbox/rigid.tcl (modified) (4 diffs)

branches/sandbox/rigid.tcl

@@ -100 +100 @@
 # Procedure to determine possible RB file formats available
 
+set rbtypelist ""
 proc RB_Import_Data_Type {args} {
     global expgui tcl_platform
     # only needs to be done once
-    set ::rbtypelist ""
-
-    set files [glob -nocomplain [file join $expgui(scriptdir) rbimport_*.tcl]]
-    foreach filetype $files {
-          set temp [lindex [string map {_ " "} $filetype] 1]
-          lappend ::rbtypelist $temp
-    }
-    if {$::rbtypelist == ""} {lappend ::rbtypelist "no rigid body file types available"}
-    foreach filetype $::rbtypelist {
-            source $::expgui(scriptdir)/rbimport_$filetype
-    }
-    return $::rbtypelist
+    if {$::rbtypelist != ""} return
+
+    set ::rbtypelist [glob -nocomplain [file join $expgui(scriptdir) rbimport_*.tcl]]
+    if {$::rbtypelist == ""} {
+        MyMessageBox -parent . -title "Installation error" -icon warning \
+            -message "No rigid body import routines were found.\nSomething is wrong with the EXPGUI installation" 
+        set ::rbtypelist " "
+    }
+    foreach file $::rbtypelist {
+        source $file
+    }
 }
 
@@ -365 +365 @@
 #     puts "cartesian coords:   $temp_car"
      AddRigidBody $temp_mat $temp_car
-     RecordMacroEntry "AddRigidBody $temp_mat $temp_car" 0
+    RecordMacroEntry "AddRigidBody $temp_mat [list $temp_car]" 0
     RecordMacroEntry "incr expgui(changed)" 0
      incr ::expgui(changed)
@@ -802 +802 @@
 #   puts "Euler = $euler"
     MapRigidBody $::rb_phase $::body_type $::rb_firstatom $origin $euler
-    RecordMacroEntry "MapRigidBody $::rb_phase $::body_type $::rb_firstatom $origin $euler" 0
+    RecordMacroEntry "MapRigidBody $::rb_phase $::body_type $::rb_firstatom [list $origin] [list $euler]" 0
    incr ::rb_map($::body_type)
    set curpage [$::rb_notebook raise]
@@ -1283 +1283 @@
 #     puts "Matrix vars = $temp_var"
      SetRigidBodyVar $bodnum $temp_var $temp_damp
-     RecordMacroEntry "SetRigidBodyVar $bodnum $temp_var $temp_damp" 0
+    RecordMacroEntry "SetRigidBodyVar $bodnum [list $temp_var] [list $temp_damp]" 0
      ReplaceRigidBody $bodnum $temp_mat $temp_car $temp_var $temp_damp
-     RecordMacroEntry "ReplaceRigidBody $bodnum $temp_mat $temp_car $temp_var $temp_damp" 0
+    RecordMacroEntry "ReplaceRigidBody $bodnum [list $temp_mat] [list $temp_car] [list $temp_var] [list $temp_damp]" 0
      #SetRigidBodyVar $bodnum $temp_var $temp_damp
      incr ::expgui(changed)