StatisticsWindow.rb in jldrill-0.6.0.1

- old
+ new

@@ -1,5 +1,6 @@
+# encoding: utf-8
 require 'Context/Gtk/Widget'
 require 'jldrill/model/Quiz/Counter'
 require 'gtk2'
 
 module JLDrill::Gtk
@@ -67,39 +68,88 @@
                    column + 1, column + 2,      row + 1, row + 2,
                    Gtk::EXPAND | Gtk::FILL, 0,
                    0,                       0)
         end
     end
-    
-    class StatisticsWindow < Gtk::Window
-        include Context::Gtk::Widget
+   
+    class StatisticsPage
 
-        attr_reader :accel
-        
+        attr_reader :widget, :durationTable, :rateTable
+
         def initialize(view)
             @view = view
-            @closed = false
-            super("Statistics")
-            connectSignals unless @view.nil?
+            @widget = Gtk::HBox.new()
             
-            hbox = Gtk::HBox.new()
-            add(hbox)
             ## Layout everything in a vertical table
             counter = JLDrill::Counter.new
             rows = []
             0.upto(7) do |i|
                 rows = rows.push(counter.levelString(i))
             end
             columns = [" Duration ", " Correct ", " Tried ",]
             @durationTable = StatisticsTable.new(rows, columns)
-            hbox.add(@durationTable)
+            @widget.add(@durationTable)
             rows = ["Reviewed", "Learned", " Time to review ", 
                       "Time to learn", "Total Accuracy", " Learn Time % ", 
                       " Curr Rate ", " Avg Rate "]
             columns = [" "]
             @rateTable = StatisticsTable.new(rows, columns)
-            hbox.add(@rateTable)
+            @widget.add(@rateTable)
+        end
+
+        def updateDuration(counter)
+            table = counter.table
+            0.upto(6) do |i|
+                @durationTable.values[i][0].text = table[i].to_s
+            end
+            @durationTable.values[7][0].text = table[7].to_s
+        end
+        
+        def updateAccuracy(stats)
+            0.upto(7) do |i|
+                acc = stats.levels[i].accuracy
+                if !acc.nil?
+                    @durationTable.values[i][1].text = acc.to_s + "% "
+                    @durationTable.values[i][2].text = stats.levels[i].total.to_s
+                else
+                    @durationTable.values[i][1].text = " - "
+                    @durationTable.values[i][2].text = " - "
+                end
+            end
+        end
+        
+        def updateRate(stats)
+            @rateTable.values[0][0].text = stats.reviewed.to_s 
+            @rateTable.values[1][0].text = stats.learned.to_s
+            @rateTable.values[2][0].text = stats.reviewPace.to_s + "s "
+            @rateTable.values[3][0].text = stats.learnPace.to_s + "s "
+            @rateTable.values[4][0].text = stats.accuracy.to_s + "% "
+            @rateTable.values[5][0].text = stats.learnTimePercent.to_s + "% "
+            @rateTable.values[6][0].text = stats.currentReviewRate.to_s + "x "
+            @rateTable.values[7][0].text = stats.averageReviewRate.to_s + "x "
+        end
+    end
+
+    class StatisticsWindow < Gtk::Window
+        include Context::Gtk::Widget
+
+        attr_reader :accel
+        
+        def initialize(view)
+            @view = view
+            @closed = false
+            super("Statistics")
+            connectSignals unless @view.nil?
+
+            tabs = Gtk::Notebook.new()
+            add(tabs)
+            reviewSetLabel = Gtk::Label.new("Review Set")
+            @reviewStats = StatisticsPage.new(view)
+            tabs.append_page(@reviewStats.widget, reviewSetLabel)
+            forgottenSetLabel = Gtk::Label.new("Forgotten Set")
+            @forgottenStats = StatisticsPage.new(view)
+            tabs.append_page(@forgottenStats.widget, forgottenSetLabel)
         end  
         
         def connectSignals
             @accel = Gtk::AccelGroup.new
             @accel.connect(Gdk::Keyval::GDK_Escape, 0,
@@ -126,39 +176,40 @@
         
         def explicitDestroy
             @closed = true
             self.destroy
         end
-        
-        def updateDuration(counter)
-            table = counter.table
-            0.upto(6) do |i|
-                @durationTable.values[i][0].text = table[i].to_s
-            end
-            @durationTable.values[7][0].text = table[7].to_s
+
+        def updateReviewDuration(counter)
+            @reviewStats.updateDuration(counter)
         end
+
+        def updateReviewAccuracy(stats)
+            @reviewStats.updateAccuracy(stats)
+        end
+
+        def updateReviewRate(stats)
+            @reviewStats.updateRate(stats)
+        end
         
-        def updateAccuracy(stats)
-            0.upto(7) do |i|
-                acc = stats.levels[i].accuracy
-                if !acc.nil?
-                    @durationTable.values[i][1].text = acc.to_s + "% "
-                    @durationTable.values[i][2].text = stats.levels[i].total.to_s
-                else
-                    @durationTable.values[i][1].text = " - "
-                    @durationTable.values[i][2].text = " - "
-                end
-            end
+        def updateForgottenDuration(counter)
+            @forgottenStats.updateDuration(counter)
         end
+
+        def updateForgottenAccuracy(stats)
+            @forgottenStats.updateAccuracy(stats)
+        end
+
+        def updateForgottenRate(stats)
+            @forgottenStats.updateRate(stats)
+        end
         
-        def updateRate(stats)
-            @rateTable.values[0][0].text = stats.reviewed.to_s 
-            @rateTable.values[1][0].text = stats.learned.to_s
-            @rateTable.values[2][0].text = stats.reviewPace.to_s + "s "
-            @rateTable.values[3][0].text = stats.learnPace.to_s + "s "
-            @rateTable.values[4][0].text = stats.accuracy.to_s + "% "
-            @rateTable.values[5][0].text = stats.learnTimePercent.to_s + "% "
-            @rateTable.values[6][0].text = stats.currentReviewRate.to_s + "x "
-            @rateTable.values[7][0].text = stats.averageReviewRate.to_s + "x "
+        def showBusy(bool)
+            if bool
+                self.window.set_cursor(Gdk::Cursor.new(Gdk::Cursor::WATCH))
+            else
+                self.window.set_cursor(nil)
+            end
+            Gdk::flush()
         end
     end
 end