WxVanaClock 1.0.0 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 1.0.2 / 2007-09-08
+
+* rewritten to make use of VanaTime 2.0.0
+
 == 1.0.0 / 2007-09-04
 
 * initial version, ported over to wxWidgets

data/WxVanaClock.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Wxvanaclock-1.0.0
+# Gem::Specification for Wxvanaclock-1.0.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{WxVanaClock}
-  s.version = "1.0.0"
-  s.date = %q{2007-09-04}
+  s.version = "1.0.2"
+  s.date = %q{2007-09-08}
   s.summary = %q{WxVanaClock is a clock for Final Fantasy Online written using wxWidgets.}
   s.email = %q{ttilley@gmail.com}
   s.homepage = %q{http://vanatime.rubyforge.org/}
@@ -16,14 +16,14 @@ Gem::Specification.new do |s|
   s.authors = ["Travis Tilley"]
   s.files = ["README", "Manifest", "LICENSE", "lib/wxvc-xrc.xml", "lib/wx_vana_clock.rb", "CHANGELOG", "bin/WxVanaClock", "WxVanaClock.gemspec"]
   s.executables = ["WxVanaClock"]
-  s.add_dependency(%q<VanaTime>, [">= 1.2.1"])
+  s.add_dependency(%q<VanaTime>, [">= 2.0.0"])
   s.add_dependency(%q<wxruby>, [">= 1.9.0"])
 end
 
 
 # # Original Rakefile source (requires the Echoe gem):
 # 
-# version = "1.0.0"
+# version = "1.0.2"
 # 
 # ENV['RUBY_FLAGS'] = ""
 # 
@@ -39,7 +39,7 @@ end
 #     p.url = "http://vanatime.rubyforge.org/"
 #     p.author = 'Travis Tilley'
 #     p.email = "ttilley@gmail.com"
-#     p.dependencies = ["VanaTime >=1.2.1", "wxruby >=1.9.0"]
+#     p.dependencies = ["VanaTime >=2.0.0", "wxruby >=1.9.0"]
 #   end
 # 
 # rescue LoadError => boom

data/lib/wx_vana_clock.rb

@@ -1,16 +1,16 @@
-gem 'VanaTime', '>=1.2.1'
+gem 'VanaTime', '>=2.0.0'
 require 'vana_time'
 gem 'wxruby', '>=1.9.0'
 require 'wx'
 
 module WxVanaClock
   class ClockFrame < Wx::Frame
+    include FFXI::Constants
+
     def initialize(parent)
       super()
       $xrc.load_frame_subclass(self, nil, 'ClockFrame')
 
-      @parent = parent
-
       # get all the text controls
       @vana_day =
         Wx::Window.find_window_by_id(Wx::xrcid('VanaDay'), self)
@@ -31,6 +31,55 @@ module WxVanaClock
       @optimal_phase_name =
         Wx::Window.find_window_by_id(Wx::xrcid('OptimalPhaseName'), self)
 
+      # create the procs that update UI elements
+      on_second = lambda do |time|
+        @vana_time.change_value time.to_s
+      end
+      on_day = lambda do |day|
+        @vana_day.change_value day.to_s
+      end
+      on_moon_percent = lambda do |moon|
+        @moon_percent.change_value moon.percent
+      end
+      on_moon_phase = lambda do |moon|
+        @phase_name.change_value moon.phase
+        @next_phase_name.change_value moon.next_phase
+      end
+      on_optimal_phase = lambda do |moon|
+        @optimal_phase_name.change_value moon.optimal_phase
+      end
+      on_phase_count = lambda do |countdown|
+        @next_phase_countdown.change_value countdown.to_next
+      end
+      on_optimal_count = lambda do |countdown|
+        @optimal_phase_countdown.change_value countdown.to_optimal
+      end
+
+      # create time, day, and moon objects
+      vt = FFXI::VanaTime.now
+      vd = FFXI::VanaDay.new(vt)
+      vm = FFXI::VanaMoon.new(vt.earth_time)
+
+      # draw the UI
+      on_second.call vt
+      on_day.call vd
+      on_moon_percent.call vm
+      on_moon_phase.call vm
+      on_optimal_phase.call vm
+
+      # manage the above
+      @time_manager = FFXI::TimeManager.new
+      @time_manager.manage(vt, vd, vm)
+
+      # register callbacks
+      @time_manager.callback_proc(MS_SECOND, on_second)
+      @time_manager.callback_proc("day", on_day)
+      @time_manager.callback_proc("moon_percent", on_moon_percent)
+      @time_manager.callback_proc("moon_phase", on_moon_phase)
+      @time_manager.callback_proc("next_optimal_phase", on_optimal_phase)
+      @time_manager.callback_proc("next_phase_countdown", on_phase_count)
+      @time_manager.callback_proc("optimal_phase_countdown", on_optimal_count)
+
       # create timer object, give it ID of 9000 and set owner to self
       @timer = Wx::Timer.new(self, 9000)
       # register the timer as an event
@@ -40,24 +89,13 @@ module WxVanaClock
     end
 
     def notify(event)
-      vt = @parent.vana_time
-      vt.earth_time = Time.now
-
-      @vana_day.change_value vt.day.to_s
-      @vana_time.change_value vt.to_s
-      @earth_time.change_value vt.earth_time.to_s
-      @moon_percent.change_value vt.moon.percent
-      @phase_name.change_value vt.moon.phase
-      @next_phase_countdown.change_value vt.moon.to_next
-      @next_phase_name.change_value vt.moon.next_phase
-      @optimal_phase_countdown.change_value vt.moon.to_optimal
-      @optimal_phase_name.change_value vt.moon.optimal_phase
+      now = Time.now
+      @time_manager.earth_time = now
+      @earth_time.change_value now.to_s
     end
   end
 
   class ClockApp < Wx::App
-    attr_accessor :vana_time
-
     def on_init
       # create a resource handler
       $xrc = Wx::XmlResource.get()
@@ -67,8 +105,6 @@ module WxVanaClock
       xrc_file = File.join(File.dirname(__FILE__), 'wxvc-xrc.xml')
       $xrc.load(xrc_file)
 
-      @vana_time = FFXI::VanaTime.now
-
       # show the main frame
       @clock = ClockFrame.new(self)
       @clock.show(true)

data/lib/wxvc-xrc.xml

@@ -106,7 +106,7 @@
           </object>
           <object class="sizeritem">
             <object class="wxTextCtrl" name="NextPhaseCountdown">
-              <value>04:18:23</value>
+              <value>moo</value>
               <size>86, 22</size>
               <style>wxTE_READONLY|wxTE_RIGHT</style>
             </object>
@@ -139,7 +139,7 @@
           </object>
           <object class="sizeritem">
             <object class="wxTextCtrl" name="OptimalPhaseCountdown">
-              <value>01:27:59</value>
+              <value>cows</value>
               <size>86, 22</size>
               <style>wxTE_READONLY|wxTE_RIGHT</style>
             </object>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: WxVanaClock
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-09-04 00:00:00 -04:00
+  version: 1.0.2
+date: 2007-09-08 00:00:00 -04:00
 summary: WxVanaClock is a clock for Final Fantasy Online written using wxWidgets.
 require_paths: 
 - lib
@@ -57,7 +57,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: wxruby