Browse Source

fOpenEnded -> openEnded

David Rose 23 years ago
parent
commit
c0e01760ec

+ 2 - 2
direct/src/interval/FunctionInterval.py

@@ -35,8 +35,8 @@ class FunctionInterval(Interval.Interval):
         # Initialize superclass
         # Initialize superclass
         # Set openEnded true if IVAL_INIT calls after end time cause interval
         # Set openEnded true if IVAL_INIT calls after end time cause interval
         # function to be called.  If false, IVAL_INIT calls have no effect
         # function to be called.  If false, IVAL_INIT calls have no effect
-        # Event, Accept, Ignore intervals default to fOpenEnded = 0
-        # Parent, Pos, Hpr, etc intervals default to fOpenEnded = 1
+        # Event, Accept, Ignore intervals default to openEnded = 0
+        # Parent, Pos, Hpr, etc intervals default to openEnded = 1
         Interval.Interval.__init__(self, name, duration = 0.0, openEnded = openEnded)
         Interval.Interval.__init__(self, name, duration = 0.0, openEnded = openEnded)
     
     
     def updateFunc(self, t, event = Interval.IVAL_NONE):
     def updateFunc(self, t, event = Interval.IVAL_NONE):

+ 7 - 7
direct/src/interval/Interval.py

@@ -28,7 +28,7 @@ class Interval(DirectObject):
         self.stopEventList = []
         self.stopEventList = []
         self.setTHooks = []
         self.setTHooks = []
         # Set true if interval responds to setT(t): t>duration
         # Set true if interval responds to setT(t): t>duration
-        self.fOpenEnded = openEnded
+        self.openEnded = openEnded
         self.reverse = reverse
         self.reverse = reverse
 
 
     def getName(self):
     def getName(self):
@@ -41,15 +41,15 @@ class Interval(DirectObject):
         """
         """
         return self.duration
         return self.duration
 
 
-    def setfOpenEnded(self, openEnded):
-        """ setfOpenEnded(openEnded)
+    def setOpenEnded(self, openEnded):
+        """ setOpenEnded(openEnded)
         """
         """
-        self.fOpenEnded = openEnded
+        self.openEnded = openEnded
 
 
-    def getfOpenEnded(self):
-        """ getfOpenEnded()
+    def getOpenEnded(self):
+        """ getOpenEnded()
         """
         """
-        return self.fOpenEnded
+        return self.openEnded
 
 
     def setT(self, t, event = IVAL_NONE):
     def setT(self, t, event = IVAL_NONE):
         """ setT(t, event)
         """ setT(t, event)

+ 1 - 1
direct/src/interval/Track.py

@@ -237,7 +237,7 @@ class Track(Interval.Interval):
                         # execute the interval at its end time
                         # execute the interval at its end time
                         # and flag event as Interval.IVAL_DONE
                         # and flag event as Interval.IVAL_DONE
                         ival.setT(ival.getDuration(), Interval.IVAL_DONE)
                         ival.setT(ival.getDuration(), Interval.IVAL_DONE)
-                    elif ((event == Interval.IVAL_INIT) and ival.getfOpenEnded()):
+                    elif ((event == Interval.IVAL_INIT) and ival.getOpenEnded()):
                         # or its an INIT event after the interval's end
                         # or its an INIT event after the interval's end
                         # and the interval is openended,
                         # and the interval is openended,
                         # then execute the interval at its end time
                         # then execute the interval at its end time