(pcluster.py) still trying stuff

[hooke.git] / viewer.py

diff --git a/viewer.py b/viewer.py
index cf8bc0114a2894fbc877d112674b43b3915d1157..42f4b6d38c3ae62da449931394fa297302e704e7 100644 (file)
--- a/viewer.py
+++ b/viewer.py
@@ -10,7 +10,7 @@ This program is released under the GNU General Public License version 2.
 
 
 import libviewer as lview
-import libinput as limput
+import libinput as linput
 
 class viewerCommands:
        
@@ -23,7 +23,8 @@ class viewerCommands:
     def do_vwnew(self,args):
         #creates a new viewer
         self.viewerlist.append(lview.Ascii(self.outlet))
-        dt=limput.alphainput('What type of data will this viewer handle? (force/distance/all)','',1,['force', 'distance', 'all']) #TODO update types, make a list somewhere?
+        dt=linput.safeinput('What type of data will this viewer handle? (force/distance/all)',['force', 'distance', 'all']) 
+                    #TODO update types, make a list somewhere?
         print dt
         self.viewerlist[-1].setdtype(dt)
 
@@ -35,4 +36,4 @@ class viewerCommands:
 
         if len(args)==0:
             args=0
-        self.viewerlist[int(args)].action()
+        self.viewerlist[int(args)].action()
\ No newline at end of file