some changes in methods

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index c37c2b80b1a929733cce28c8c7f31a1109c8fda7..803b63511511371f704219104bd38f04ce67f0b1 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -555,17 +555,17 @@ def ExtractEvents(extractedEvents):
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "color":
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "color":

-                       event = open("eventSimulator/colorChangedEvent.groovy", "r")
+                       event = open("eventSimulator/colorChangeEvent.groovy", "r")

                        for line in event:
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "hue":
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "hue":

-                       event = open("eventSimulator/hueChangedEvent.groovy", "r")
+                       event = open("eventSimulator/hueChangeEvent.groovy", "r")

                        for line in event:
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "saturation":
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "saturation":

-                       event = open("eventSimulator/saturationChangedEvent.groovy", "r")
+                       event = open("eventSimulator/saturationChangeEvent.groovy", "r")

                        for line in event:
                                extractedEvents.write(line)
                        event.close()
                        for line in event:
                                extractedEvents.write(line)
                        event.close()

diff --git a/Methods/schedule.groovy b/Methods/schedule.groovy
index fef90b4f3e04cc9ccaa2f647af07191438f48fa7..6089a06ac3021c4b0add77c8b29d396bde3e87ff 100644 (file)
--- a/Methods/schedule.groovy
+++ b/Methods/schedule.groovy
@@ -1,50 +1,50 @@
 /////////////////////////////////////////////////////////////////////
 ////schedule(time, nameOfFunction as String)
 def schedule(String time, String nameOfFunction) {
 /////////////////////////////////////////////////////////////////////
 ////schedule(time, nameOfFunction as String)
 def schedule(String time, String nameOfFunction) {

-       def _inputTime = time.split(':')
-       Date date = new Date()  
-       def _currentTime = date.format("HH:mm:ss").split(':')
+       //def _inputTime = time.split(':')
+       //Date date = new Date()        
+       //def _currentTime = date.format("HH:mm:ss").split(':')

 
        //Convert input time and current time to minutes
 
        //Convert input time and current time to minutes

-       def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
-       def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
-       def delay
+       //def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
+       //def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
+       //def delay

 
 

-       if (inputTime < currentTime) {
-               delay = 24*60*60-inputTime+currentTime
-       } else {
-               delay = inputTime-currentTime
-       }
+       //if (inputTime < currentTime) {
+       //      delay = 24*60*60-inputTime+currentTime
+       //} else {
+       //      delay = inputTime-currentTime
+       //}

 
 

-       timersFuncList.add(nameOfFunction)
-       timersList.add(new SimulatedTimer())
-       def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(delay*1000*0) {
+       //timersFuncList.add(nameOfFunction)
+       //timersList.add(new SimulatedTimer())
+       def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(/*delay*1000*0*/0) {

                "$nameOfFunction"()
        }
 }
 ////schedule(time, nameOfFunction as Closure)
 def schedule(String time, Closure nameOfFunction) {
                "$nameOfFunction"()
        }
 }
 ////schedule(time, nameOfFunction as Closure)
 def schedule(String time, Closure nameOfFunction) {

-       def _inputTime = time.split(':')
-       Date date = new Date()  
+       //def _inputTime = time.split(':')
+       //Date date = new Date()        

        def _currentTime = date.format("HH:mm:ss").split(':')
 
        //Convert input time and current time to minutes
        def _currentTime = date.format("HH:mm:ss").split(':')
 
        //Convert input time and current time to minutes

-       def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
-       def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
-       def delay
+       //def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
+       //def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
+       //def delay

 
 

-       if (inputTime < currentTime) {
-               delay = 24*60*60-inputTime+currentTime
-       } else {
-               delay = inputTime-currentTime
-       }
+       //if (inputTime < currentTime) {
+       //      delay = 24*60*60-inputTime+currentTime
+       //} else {
+       //      delay = inputTime-currentTime
+       //}

 
        if (timersFuncList.contains(nameOfFunction)) {
                timersList[timersFuncList.indexOf(nameOfFunction)].cancel()
 
        if (timersFuncList.contains(nameOfFunction)) {
                timersList[timersFuncList.indexOf(nameOfFunction)].cancel()

-               def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(delay*0, nameOfFunction)
+               def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(/*delay*0*/0, nameOfFunction0)

        } else {
                timersFuncList.add(nameOfFunction)
                timersList.add(new SimulatedTimer())
        } else {
                timersFuncList.add(nameOfFunction)
                timersList.add(new SimulatedTimer())

-               def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(delay*0, nameOfFunction)
+               def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(/*delay*0*/0, nameOfFunction)

        }
 }
        }
 }