weft-qda 0.9.6 → 0.9.8

data/lib/weft/wxgui/inspectors/category.rb

@@ -3,18 +3,18 @@ module QDA
 	class CategoryWindow < InspectorWindow
       include Subscriber
 
-	  def initialize(cat, app, workarea, layout)
+	  def initialize(cat, client, workarea, layout)
 		@cat = cat
-		@app = app
+		@client = client
 
         super(workarea, @cat.name, layout) do | parent | 
-          text_box = CompositeText.new(parent, '', 0, @app)
-          text_box.populate( @app.app.get_text_at_category(@cat) )
+          text_box = CompositeText.new(parent, '', 0, @client)
+          text_box.populate( @client.app.get_text_at_category(@cat) )
           text_box
         end
 
         construct_details_panel()
-        if ! @cat.children.empty?
+        if false # ! @cat.children.empty?
           construct_explore_panel()
         end
 
@@ -22,11 +22,16 @@ module QDA
           on_change_page(e)
         end
 
-        set_icon( app.fetch_icon("category.xpm") )
+        set_icon( client.fetch_icon("category") )
 
-        subscribe(:document_deleted, :category_changed, :category_deleted)
+        subscribe(@client, 
+                  :document_deleted, :category_changed, :category_deleted)
 	  end
-
+	  
+      def object()
+        @cat
+      end
+      
       # just a mucky method to reduce the length of the initializer -
       # ideally i guess this would be done using XRC
       def construct_details_panel()
@@ -35,13 +40,12 @@ module QDA
 
         # the text entry box for the category's name
         name_box_label = Wx::StaticBox.new(panel2, -1, 'Name')
-        name_box_sizer = Wx::StaticBoxSizer.new(name_box_label,
-                                                Wx::VERTICAL)
+        name_box_sizer = Wx::StaticBoxSizer.new(name_box_label, Wx::VERTICAL)
         @name_field = Wx::TextCtrl.new(panel2, -1, @cat.name) 
         name_box_sizer.add(@name_field, 0, 
                            Wx::ADJUST_MINSIZE|Wx::ALL|Wx::GROW, 4)
         sizer2.add(name_box_sizer,0, Wx::ADJUST_MINSIZE|Wx::ALL|Wx::GROW, 4)
-
+        
         # Create the statistics panel
         info_panel = Wx::Panel.new(panel2, -1)
         info_box_label = Wx::StaticBox.new(info_panel, -1, 'Statistics')
@@ -100,10 +104,9 @@ module QDA
       # cf construct_details_panel
       def construct_explore_panel()
         panel = Wx::Panel.new(@notebook, -1)
-        # panel.set_font(GLOBAL_FONT)
         sizer = Wx::BoxSizer.new(Wx::VERTICAL)
         # create a local locked copy
-		@tree_list = CategoryTree.new(@app, panel, true)
+		@tree_list = CategoryTree.new(@client, panel, true)
 		@tree_list.populate([@cat])
         sizer.add(@tree_list, 10, Wx::GROW|Wx::ALL, 4)
         panel.set_sizer( sizer )
@@ -113,8 +116,7 @@ module QDA
       def on_save_memo(e)
         @cat.memo = @memo_box.value
         @cat.name = @name_field.value
-        Wx::BusyCursor.busy { @app.app.save_category( @cat ) }
-        $wxapp.broadcast(:category_changed, @cat)
+        Wx::BusyCursor.busy { @client.app.save_category( @cat ) }
       end
 
       def on_change_page(e)
@@ -138,8 +140,9 @@ module QDA
       def refresh()
         set_title( @cat.name )
         @text_box.value = ''
-        @text_box.populate( @app.app.get_text_at_category(@cat) )
+        @text_box.populate( @client.app.get_text_at_category(@cat) )
         @name_field.value = @cat.name
+        @memo_box.value = @cat.memo
         if curr_category = @drop_down.current_category()
           @text_box.highlight_codingtable(curr_category.codes)
         end

data/lib/weft/wxgui/inspectors/codereview.rb

@@ -1,16 +1,17 @@
 module QDA::GUI
   class CodeReviewWindow < WorkAreaWindow
-    include Subscriber
+    include QDA::Subscriber
 
     W_WINDOW_DEF_SIZE = [ 0.8, 0.6 ]
     BASE_COLOUR = Wx::Colour.new(255, 255, 255)
     HIGHLIGHT_COLOUR = Wx::Colour.new(255, 0, 0)
     GRID_COLOUR = Wx::Colour.new(223, 223, 233)
-
-    def initialize(obj, app, workarea, layout)
+    attr_reader :client
+    def initialize(obj, weft_client, workarea, layout)
       super(workarea, "Code Review #{obj.dbid}", nil)
-      @cols, @rows, @contents = [], [], []
-      @count_method = :num_of_docs
+      @client = weft_client
+      @cr  = obj
+      @cr.count_method = @count_method = :num_of_docs
 
       main_sizer = Wx::BoxSizer.new(Wx::VERTICAL)
       panel = Wx::Panel.new(self)
@@ -24,7 +25,7 @@ module QDA::GUI
       0.upto(11) { | i | @grid.set_row_label_value(i, '') }
 
       evt_grid_label_left_click() { | evt | on_label_clicked(evt) }
-      
+      evt_grid_cell_left_dclick() { | evt | on_cell_dclicked(evt) }
       # the controls panel
       main_sizer.add(@grid, 1, Wx::GROW|Wx::ALL, 4)
       # butt_panel = Wx::Panel.new(panel, -1)
@@ -32,7 +33,7 @@ module QDA::GUI
       bott_sizer = Wx::StaticBoxSizer.new(butt_box_label,
                                            Wx::HORIZONTAL)
       
-      @drop_down = CategoryDropDown.new(app, panel)
+      @drop_down = CategoryDropDown.new(@client, panel)
       bott_sizer.add(@drop_down, 3, Wx::ALL, 4)
 
       button = Wx::Button.new(panel, -1, 'Add as row')
@@ -79,9 +80,14 @@ module QDA::GUI
       panel.set_sizer(main_sizer)
       main_sizer.set_size_hints(panel)
 
-      subscribe(:category_deleted, :category_changed)
+      self.icon = client.fetch_icon("codereview")
+      subscribe(client, :category_deleted, :category_changed)
     end
-
+    
+    def object()
+      @cr
+    end
+    
     def associated_subscribers()
       [ @drop_down ]
     end
@@ -89,11 +95,11 @@ module QDA::GUI
     # set the currently highlighted row or column as the current item
     # in the dropdown
     def on_label_clicked(e)
-      if row = e.row and row >= 0 and @rows[row]
-        @drop_down.receive_focus_category( @rows[row] )
+      if row = e.row and row >= 0 and @cr.rows[row]
+        @drop_down.receive_focus_category( @cr.rows[row] )
       end
-      if col = e.col and col >= 0 and @cols[col]
-        @drop_down.receive_focus_category( @cols[col] )
+      if col = e.col and col >= 0 and @cr.cols[col]
+        @drop_down.receive_focus_category( @cr.cols[col] )
       end
     end
 
@@ -111,165 +117,117 @@ module QDA::GUI
       self.count_method = method
     end
 
-    def count_method=(method)
-      if method != @count_method
-        @count_method = method
-        0.upto(@rows.length - 1) { | i | calculate_row(i) }
-        recolour_table()
+    def count_method=(new_method)
+      if new_method != @count_method
+        @cr.count_method = new_method
+        @count_method = new_method
+        refresh()
       end
     end
 
     def on_add_col(e)
       category = @drop_down.current_category
-      return false unless category
-      return false if @cols.include?(category)
-
-      @cols.push(category)
-      @grid.append_cols(1) if @cols.length > @grid.number_cols
-      col = @cols.length - 1
-
-      @grid.set_col_label_value( col, category.name )
-      # @grid.set_col_format_number( col )
-      calculate_col(col)
-      recolour_table()
-    end
-
-    def calculate_col(i)
-      col = @cols[i]
-      @rows.each_with_index do | row_cat, j |
-        @contents[j][i] = row_cat.codes.dup.join(col.codes)
-        update_cell(j, i)
-      end
+      return unless @cr.add_col(category)
+      @grid.append_cols(1) if @cr.number_cols >= @grid.number_cols
+      refresh()
     end
 
+    # add an item to the CodeReview
     def on_add_row(e)
       category = @drop_down.current_category
-      return false unless category
-      # don't add twice
-      return false if @rows.include?(category)
-
-      @rows.push(category)
-      @grid.append_rows(1) if @rows.length > @grid.number_rows
-      row = @rows.length - 1
-
-      @grid.set_row_label_value( row, category.name )
-      @contents[row] = []
-      # @grid.set_row_format_number( row )
-      calculate_row(row)
-      recolour_table()
+      return unless @cr.add_row(category)
+      @grid.append_rows(1) if @cr.number_rows >= @grid.number_rows
+      refresh()
     end
 
-    def calculate_row(i)
-      row = @rows[i]
-      @cols.each_with_index do | col_cat, j |
-        @contents[i][j] = col_cat.codes.dup.join(row.codes)
-        update_cell(i, j)
-      end
-    end
-
-    # removes the selected category from both rows and colums
     def on_remove(e)
       on_remove_col(e)
       on_remove_row(e)
     end
 
+    # handler for removing a row, as selected in drop-down. Will remove the
+    # item from the underlying CodeReview, and redraw grid.
     def on_remove_col(e)
       category = @drop_down.current_category
-      return false unless category
-      return false unless idx = @cols.index(category)
-      remove_col(idx)
-      recolour_table()
-    end
-
-    def remove_col(idx)
-      @cols.delete_at(idx)
-      @contents.each { | row | row.delete_at(idx) }
-      @grid.delete_cols(idx, 1)
-      @grid.append_cols(1)
-      update_col_labels()
+      if idx = @cr.remove_col(category)
+        @grid.delete_cols(idx, 1)
+        @grid.append_cols(1)
+        refresh()
+      end
     end
 
+    # handler for removing a row, as selected in drop-down. Will remove the
+    # item from the underlying CodeReview, and redraw grid.
     def on_remove_row(e)
       category = @drop_down.current_category
-      return false unless category
-      return false unless idx = @rows.index(category)
-      remove_row(idx)
-      recolour_table()
+      if idx = @cr.remove_row(category)
+        @grid.delete_rows(idx, 1)
+        @grid.append_rows(1)
+        refresh()
+      end
     end
-
-    def remove_row(idx)
-      @rows.delete_at(idx)
-      @contents.delete_at(idx)
-      @grid.delete_rows(idx, 1)
-      @grid.append_rows(1)
-      update_row_labels()
+    
+    # repaints and recolours the content of the grid
+    
+    # 
+    def on_cell_dclicked(e)
+      q = @cr.to_query(@client.app, e.get_row, e.get_col)
+      if q
+        q_id = @client.app.get_preference('NextQuery') || 1
+        @client.app.save_preference('NextQuery', q_id + 1)
+        q.dbid = q_id 
+        @workarea.launch_window(QueryWindow, q)
+      end
     end
-
-    def update_cell(x, y)
-      content = @contents[x][y].send(@count_method)
-      @grid.set_cell_value( x, y, content.to_s )
+    
+    def refresh()
+      @grid.clear_grid()
+      
+      max = @cr.max()
+      @cr.each_cell_value() do | x, y, val |
+        @grid.set_cell_value(x, y, val.to_s)
+        tint = BASE_COLOUR.mix( HIGHLIGHT_COLOUR, max, val)
+        @grid.set_cell_background_colour(x, y, tint)
+      end
+      update_row_labels()
+      update_col_labels()
     end
-
+    
+    # when a column is added or deleted, Wx (2.4.2) doesn't seem to redraw the
+    # labels correctly without help
     def update_col_labels()
-      @cols.each_with_index do | c, i | 
-        @grid.set_col_label_value(i, c.name)
-      end
-      # check if we need to clean up deleted and now empty row labels
-      # at the end - Wx 2.4.2 doesn't seem to do this automatically
-      @grid.set_col_label_value(@cols.length, '')
-      return if @cols.length == @grid.number_cols()
-      for empty in ( @cols.length ... @grid.number_cols() )
+      @cr.each_col { | c, i | @grid.set_col_label_value(i, c.name) }
+      return if @cr.number_cols == @grid.number_cols
+      for empty in ( @cr.number_cols ... @grid.number_cols )
         @grid.set_col_label_value(empty, '')
       end
     end
 
+    # when a row is added or deleted, Wx (2.4.2) doesn't seem to redraw the
+    # labels correctly without help
     def update_row_labels()
-      @rows.each_with_index do | c, i | 
-        @grid.set_row_label_value(i, c.name)
-      end
+      @cr.each_row { | r, i | @grid.set_row_label_value(i, r.name) }
       # check if we need to clean up deleted and now empty row labels
       # at the end - Wx 2.4.2 doesn't seem to do this automatically
-      return if @rows.length == @grid.number_rows()
-      for empty in ( @rows.length ... @grid.number_rows() )
+      return if @cr.number_rows == @grid.number_rows
+      for empty in ( @cr.number_rows ... @grid.number_rows )
         @grid.set_row_label_value(empty, '')
       end
     end
-
-    def recolour_table()
-      max = @contents.flatten.collect { | x | x.send(@count_method) }.max
-      @contents.each_with_index do | row_items, row |
-        row_items.each_with_index do | code_table, col |
-          clr = BASE_COLOUR.mix( HIGHLIGHT_COLOUR, 
-                                 max, code_table.send(@count_method))
-          @grid.set_cell_background_colour(row, col, clr)
-        end
-      end
-    end
-
+    private :update_row_labels, :update_col_labels
+    
     def receive_category_changed(cat)
-      if idx = @cols.index(cat)
-        @cols[idx] = cat
-        calculate_col(idx)
-      end
-
-      if idx = @rows.index(cat)
-        @rows[idx] = cat
-        calculate_row(idx)
-      end
-
-      recolour_table()
+      changed = nil
+      changed = @cr.update_col(cat)
+      changed = @cr.update_row(cat)
+      refresh() if changed
     end
 
     def receive_category_deleted(cat)
-      if idx = @cols.index(cat)
-        remove_col(idx)
-      end
-
-      if idx = @rows.index(cat)
-        remove_row(idx)
-      end
-
-      recolour_table()
+      deleted = nil
+      deleted = @cr.remove_col(cat)
+      deleted = @cr.remove_row(cat)
+      refresh() if deleted
     end
   end
 end

data/lib/weft/wxgui/inspectors/document.rb

@@ -4,13 +4,13 @@ module QDA
 	class DocumentWindow < InspectorWindow
       include Subscriber
 
-      def initialize(doc, app, workarea, layout)
+      def initialize(doc, client, workarea, layout)
 		@doc = doc
-		@app = app
+		@client = client
 
         super(workarea, doc.title, layout) do | txt_parent | 
           text_box = DocTextViewer.new(txt_parent, @doc.dbid)
-          text_box.set_font(@app.display_font)
+          text_box.set_font(@client.display_font)
           text_box.append_text( @doc.text )
           text_box.evt_enter_window do | e | 
             set_cursor Wx::Cursor.new(Wx::CURSOR_IBEAM)
@@ -19,14 +19,19 @@ module QDA
             set_cursor Wx::Cursor.new(Wx::CURSOR_ARROW)
           end
           text_box.show_position(0)
+          text_box.insertion_point = 0
           text_box
         end
 
         construct_details_panel()
-        set_icon( app.fetch_icon("document.xpm") )
-        subscribe(:document_changed, :document_deleted)
+        set_icon( client.fetch_icon("document") )
+        subscribe(@client, :document_changed, :document_deleted)
       end
-
+      
+      def object()
+        @doc
+      end
+      
       def receive_document_deleted(doc)
         close() if doc.dbid == @doc.dbid
       end
@@ -53,8 +58,7 @@ module QDA
       def on_save_details(e)
         @doc.memo = @memo_box.value
         @doc.title = @title_box.value
-        Wx::BusyCursor.busy { @app.app.save_document( @doc ) }
-        $wxapp.broadcast(:document_changed, @doc)
+        Wx::BusyCursor.busy { @client.app.save_document( @doc ) }
       end
 
       # scroll the window's text box to the line containing the

data/lib/weft/wxgui/inspectors/imagedocument.rb

@@ -1,56 +1,56 @@
-module QDA
-module GUI
-
-	class ImageDocumentWindow < InspectorWindow
-	  Wx::init_all_image_handlers
-
-	  def initialize(image_file, *args)
-		@img = Wx::Image.new(image_file)
-        # magnifier
-		@bitmap = Wx::Bitmap.new( @img )
-        @zoom   = 0
-		# check height & widget to set size of child window
-		# @bitmap.get_height
-        # sizer = Wx::BoxSizer.new(Wx::VERTICAL)
-        # sizer.add(img, 1, Wx::SHAPED|Wx::GROW, 5)
-		super(*args) do
-          # client_size = Wx::Size.new(@bitmap.width, @bitmap.height)
-          set_client_size(Wx::Size.new(@bitmap.width, @bitmap.height))
-        end
-        self.set_cursor( Wx::Cursor.new(Wx::CURSOR_MAGNIFIER) )
-		evt_paint { on_paint }
-        evt_left_up { | e | zoom_in(e) }
-        evt_right_up { | e | zoom_out(e) }
-	  end
-
-	  def on_paint
-		paint do | dc |
-		  dc.clear
-		  dc.draw_bitmap(@bitmap, 0, 0, false)
-		end
-	  end
-
-      def zoom_in(*args)
-        @zoom += 1
-        zoom(*args)
-      end
-
-      def zoom_out(*args)
-        @zoom -= 1
-        zoom(*args)
-      end
-
-      def zoom(event)
-        img_x2 = @img.scale(@img.get_width * ( 2 ** @zoom ), 
-                            @img.get_height * ( 2 ** @zoom) )
-        #rotate90                             
-        @bitmap = Wx::Bitmap.new( img_x2 )
-        dc = Wx::ClientDC.new(self)
-        dc.clear
-        dc.draw_bitmap(@bitmap, 0, 0, false)
-        set_client_size(Wx::Size.new( @img.get_width * ( 2 ** @zoom ), 
-                                      @img.get_height * ( 2 ** @zoom) ) )
-      end
-	end
-end
-end
+module QDA
+module GUI
+
+	class ImageDocumentWindow < InspectorWindow
+	  Wx::init_all_image_handlers
+
+	  def initialize(image_file, *args)
+		@img = Wx::Image.new(image_file)
+        # magnifier
+		@bitmap = Wx::Bitmap.new( @img )
+        @zoom   = 0
+		# check height & widget to set size of child window
+		# @bitmap.get_height
+        # sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+        # sizer.add(img, 1, Wx::SHAPED|Wx::GROW, 5)
+		super(*args) do
+          # client_size = Wx::Size.new(@bitmap.width, @bitmap.height)
+          set_client_size(Wx::Size.new(@bitmap.width, @bitmap.height))
+        end
+        self.set_cursor( Wx::Cursor.new(Wx::CURSOR_MAGNIFIER) )
+		evt_paint { on_paint }
+        evt_left_up { | e | zoom_in(e) }
+        evt_right_up { | e | zoom_out(e) }
+	  end
+
+	  def on_paint
+		paint do | dc |
+		  dc.clear
+		  dc.draw_bitmap(@bitmap, 0, 0, false)
+		end
+	  end
+
+      def zoom_in(*args)
+        @zoom += 1
+        zoom(*args)
+      end
+
+      def zoom_out(*args)
+        @zoom -= 1
+        zoom(*args)
+      end
+
+      def zoom(event)
+        img_x2 = @img.scale(@img.get_width * ( 2 ** @zoom ), 
+                            @img.get_height * ( 2 ** @zoom) )
+        #rotate90                             
+        @bitmap = Wx::Bitmap.new( img_x2 )
+        dc = Wx::ClientDC.new(self)
+        dc.clear
+        dc.draw_bitmap(@bitmap, 0, 0, false)
+        set_client_size(Wx::Size.new( @img.get_width * ( 2 ** @zoom ), 
+                                      @img.get_height * ( 2 ** @zoom) ) )
+      end
+	end
+end
+end