Changeset 752 for trunk/macosx/Controller.m

Timestamp:

Aug 11, 2006, 10:58:14 PM (16 years ago)

Author:

livings124

Message:

Scheduler is now more automatic.

File:

• trunk/macosx/Controller.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -306 +306 @@
                     name: @"RatioGlobalChange" object: nil];
     
+    [nc addObserver: self selector: @selector(autoSpeedLimit:)
+                    name: @"AutoSpeedLimitChange" object: nil];
+    
     [nc addObserver: self selector: @selector(autoImportChange:)
                     name: @"AutoImportSettingChange" object: nil];
@@ -352 +355 @@
     
     //timer to auto toggle speed limit
+    [self autoSpeedLimit: nil];
     fSpeedLimitTimer = [NSTimer scheduledTimerWithTimeInterval: AUTO_SPEED_LIMIT_SECONDS target: self 
         selector: @selector(autoSpeedLimit:) userInfo: nil repeats: YES];
@@ -1252 +1256 @@
 }
 
-- (void) autoSpeedLimit: (NSTimer *) timer
-{
-    BOOL autoOn, autoOff;
-    if (!(autoOn = [fDefaults boolForKey: @"SpeedLimitAutoOn"])
-            && !(autoOff = [fDefaults boolForKey: @"SpeedLimitAutoOff"]))
+- (void) autoSpeedLimit: (id) sender
+{
+    if (![fDefaults boolForKey: @"SpeedLimitAuto"])
         return;
  
@@ -1262 +1264 @@
     int onHour, offHour;
     if ((onHour = [fDefaults integerForKey: @"SpeedLimitAutoOnHour"])
-            == (offHour = [fDefaults integerForKey: @"SpeedLimitAutoOffHour"]) && autoOn && autoOff)
+            == (offHour = [fDefaults integerForKey: @"SpeedLimitAutoOffHour"]))
         return;
     
-    NSCalendarDate * currentDate = [NSCalendarDate calendarDate];
-    //toggle if within first few seconds of hour
-    if ([currentDate minuteOfHour] == 0 && [currentDate secondOfMinute] < AUTO_SPEED_LIMIT_SECONDS
-            && [currentDate hourOfDay] == (fSpeedLimitEnabled ? offHour : onHour))
+    BOOL rangeForOn = onHour < offHour;
+    int min, max;
+    if (rangeForOn)
+    {
+        min = onHour;
+        max = offHour;
+    }
+    else
+    {
+        min = offHour;
+        max = onHour;
+    }
+    
+    int hour = [[NSCalendarDate calendarDate] hourOfDay];
+    BOOL inRange = hour >= min && hour < max;
+    
+    if ((!fSpeedLimitEnabled && (rangeForOn == inRange)) || (fSpeedLimitEnabled && (rangeForOn != inRange)))
     {
         [self toggleSpeedLimit: nil];