cosmos 4.0.0 → 4.0.1

data/lib/cosmos/tools/config_editor/config_editor_frame.rb

@@ -23,6 +23,13 @@ require 'cosmos/gui/choosers/file_chooser'
 require 'cosmos/config/meta_config_parser'
 
 module Cosmos
+  class FocusComboBox < Qt::ComboBox
+    signals 'focus_in()'
+    def focusInEvent(event)
+      emit focus_in
+    end
+  end
+
   class ConfigEditorFrame < Qt::Widget
     slots 'context_menu(const QPoint&)'
     slots 'undo_available(bool)'
@@ -576,7 +583,7 @@ module Cosmos
                 process_parameters(attribute_value[current_value]['parameters'], parameter_index + 1)
               end
             elsif attribute_value.is_a? Array # Just a bunch of strings
-              value_widget = Qt::ComboBox.new()
+              value_widget = FocusComboBox.new()
               value_widget.addItems(attribute_value)
               if required && current_value.nil?
                 value_widget.setStyleSheet("border: 1px solid red")
@@ -585,6 +592,14 @@ module Cosmos
                 value_widget.addItem(current_value) unless attribute_value.include?(current_value)
                 value_widget.setCurrentText(current_value)
               end
+              # If a user is typing in a line from scratch and tabs to a ComboBox
+              # field we want to insert the current value as it gets focus so
+              # something gets populated. This will happen even in a fully populated
+              # line as well but has no effect since we're replacing with the currentText.
+              value_widget.connect(SIGNAL('focus_in()')) do |event|
+                value_widget.setStyleSheet("")
+                insert_word(value_widget.currentText(), parameter_index)
+              end
               value_widget.connect(SIGNAL('currentIndexChanged(const QString&)')) do |word|
                 value_widget.setStyleSheet("")
                 insert_word(word, parameter_index)

data/lib/cosmos/tools/packet_viewer/packet_viewer.rb

@@ -276,7 +276,7 @@ module Cosmos
         file = File.read(filename)
         # Wild card the target name because it is not used and is often aliased
         if file =~ /TELEMETRY\s+.*\s+#{@packet_select.text}/
-          Cosmos.open_in_text_editor(filename)
+          Cosmos.run_cosmos_tool('ConfigEditor', "-f #{filename}")
           found = true
           break
         end
@@ -556,13 +556,6 @@ module Cosmos
           graph_action.statusTip = tr("Create a new COSMOS graph of #{target_name} #{packet_name} #{item_name}")
           graph_action.connect(SIGNAL('triggered()')) do
             @table.clearSelection
-            if Kernel.is_windows?
-              Cosmos.run_process("rubyw tools/TlmGrapher -i \"#{target_name} #{packet_name} #{item_name}\" --system #{File.basename(System.initial_filename)}")
-            elsif Kernel.is_mac? and File.exist?("tools/mac/TlmGrapher.app")
-              Cosmos.run_process("open tools/mac/TlmGrapher.app --args -i \"#{target_name} #{packet_name} #{item_name}\" --system #{File.basename(System.initial_filename)}")
-            else
-              Cosmos.run_process("ruby tools/TlmGrapher -i \"#{target_name} #{packet_name} #{item_name}\" --system #{File.basename(System.initial_filename)}")
-            end
             TlmGraphDialog.new(self, target_name, packet_name, item_name)
           end
           menu.addAction(graph_action)
@@ -613,4 +606,3 @@ module Cosmos
   end # class PacketViewer
 
 end # module Cosmos
-

data/lib/cosmos/tools/tlm_viewer/tlm_viewer.rb

@@ -258,7 +258,7 @@ module Cosmos
               # Access the variant we created for this screen name
               string = combo.itemData(combo.currentIndex)
               # The second part of the variant after the semicolon is the screen filename
-              Cosmos.open_in_text_editor(string.value.split(';')[1])
+              Cosmos.run_cosmos_tool('ConfigEditor', "-f #{string.value.split(';')[1]}")
             end
             grid.addWidget(edit_button, row, 3)
           end

data/lib/cosmos/tools/tlm_viewer/widgets/canvas_clickable.rb

@@ -0,0 +1,33 @@
+# encoding: ascii-8bit
+
+# Copyright 2014 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+module Cosmos
+  module CanvasClickable
+    # Requires @x, @y, @x_end, and @y_end to be defined
+    def on_click(event, x, y)
+      return false unless @screen_settings
+      if (x < @x_end) && (x > @x) && (y < @y_end) && (y > @y)
+        display(@screen_settings[0], @screen_settings[1].to_i, @screen_settings[2].to_i)
+        true
+      else
+        false
+      end
+    end
+
+    def set_setting(setting_name, setting_values)
+      case setting_name.upcase
+      when 'SCREEN'
+        @screen_settings = setting_values
+      else
+        super(setting_name, setting_values)
+      end
+    end
+  end
+end

data/lib/cosmos/tools/tlm_viewer/widgets/canvas_widget.rb

@@ -17,14 +17,13 @@ require 'cosmos/tools/tlm_viewer/widgets/widget'
 require 'cosmos/tools/tlm_viewer/widgets/layout_widget'
 
 module Cosmos
-
   class CanvasWidget < Qt::Widget
     include Widget
     include LayoutWidget
 
     def initialize(parent_layout, width, height)
       super()
-      @repaintObjects = []
+      @repaint_objects = []
       self.minimumWidth = width.to_i
       self.minimumHeight = height.to_i
       parent_layout.addWidget(self) if parent_layout
@@ -35,7 +34,7 @@ module Cosmos
     # the order in which child widgets are painted is the order in which they
     # are created.
     def add_repaint(obj)
-      @repaintObjects << obj
+      @repaint_objects << obj
     end
 
     def paintEvent(event)
@@ -44,7 +43,7 @@ module Cosmos
         painter.begin(self)
         painter.setBackgroundMode(Qt::OpaqueMode)
         painter.setBackground(Cosmos.getBrush(Qt::white))
-        @repaintObjects.each do |obj|
+        @repaint_objects.each do |obj|
           obj.paint(painter)
         end
         painter.end
@@ -54,9 +53,18 @@ module Cosmos
       end
     end
 
+    def mouseReleaseEvent(event)
+      cur_x = mapFromGlobal(self.cursor.pos).x
+      cur_y = mapFromGlobal(self.cursor.pos).y
+      @repaint_objects.each do |obj|
+        if obj.respond_to?(:on_click)
+          break if obj.on_click(event, cur_x, cur_y)
+        end
+      end
+    end
+
     def update_widget
       self.update
     end
   end
-
-end # module Cosmos
+end

data/lib/cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb

@@ -11,47 +11,46 @@
 require 'cosmos/tools/tlm_viewer/widgets/widget'
 
 module Cosmos
-
   class CanvasdotWidget
     include Widget
-    
-    def initialize(parent_layout, x, y, color='black', width=3)
+
+    def initialize(parent_layout, x, y, color = 'black', width = 3)
       super()
       if is_numeric?(x)
         @x = x.to_i
       else
         @x = x.to_s
       end
-    
+
       if is_numeric?(y)
         @y = y.to_i
       else
         @y = y.to_s
       end
-    
+
       @point = Qt::Point.new(0, 0)
       update_point
-    
+
       @width = width.to_i
       @color = Cosmos::getColor(color)
       parent_layout.add_repaint(self)
-    end # initialize
-    
+    end
+
     def update_point
       if is_numeric?(@x)
         @point.x = @x
       else
         @point.x = eval_str(@x)
       end
-      
+
       if is_numeric?(@y)
         @point.y = @y
       else
         @point.y = eval_str(@y)
       end
-    end # update_point
-  
-    def is_numeric?(obj) 
+    end
+
+    def is_numeric?(obj)
       obj.to_s.match(/\A[+-]?\d+?(\.\d+)?\Z/) == nil ? false : true
     end
 
@@ -61,11 +60,11 @@ module Cosmos
       painter.drawEllipse(@point, @width, @width)
       painter.restore
     end
-  
+
     def eval_str(string_to_eval)
       @screen.instance_eval(string_to_eval)
     end
-  
+
     def update_widget
       update_point
     end
@@ -74,6 +73,5 @@ module Cosmos
       super()
       @point.dispose
     end
-  end # CanvasdotWidget
-
-end # module Cosmos
+  end
+end

data/lib/cosmos/tools/tlm_viewer/widgets/canvasimage_widget.rb

@@ -9,11 +9,12 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'cosmos/tools/tlm_viewer/widgets/widget'
+require 'cosmos/tools/tlm_viewer/widgets/canvas_clickable'
 
 module Cosmos
-
   class CanvasimageWidget
     include Widget
+    include CanvasClickable
 
     def initialize(parent_layout, filename, x, y)
       super()
@@ -26,6 +27,8 @@ module Cosmos
       end
       @image = Qt::Image.new(filename)
       parent_layout.add_repaint(self)
+      @x_end = @x + @image.width
+      @y_end = @y + @image.height
     end
 
     def paint(painter)
@@ -37,5 +40,4 @@ module Cosmos
       @image.dispose
     end
   end
-
-end # module Cosmos
+end

data/lib/cosmos/tools/tlm_viewer/widgets/canvasimagevalue_widget.rb

@@ -14,44 +14,46 @@
 # telemetry point value of 1 or 0 respectively.
 
 require 'cosmos/tools/tlm_viewer/widgets/canvasvalue_widget'
+require 'cosmos/tools/tlm_viewer/widgets/canvas_clickable'
 
 module Cosmos
-
   class CanvasimagevalueWidget < CanvasvalueWidget
-
-    def initialize(parent_layout, target_name, packet_name, item_name, filename, x, y, value_type=:RAW)
+    include CanvasClickable
+    
+    def initialize(parent_layout, target_name, packet_name, item_name, filename, x, y, value_type = :RAW)
       super(parent_layout, target_name, packet_name, item_name, value_type)
       @x = x.to_i
       @y = y.to_i
-      @imageOn = nil
-      @imageOff = nil
+      @image_on = nil
+      @image_off = nil
 
-      filenameOn = File.join(::Cosmos::USERPATH, 'config', 'data', filename+'on.gif')
+      filenameOn = Dir[File.join(::Cosmos::USERPATH, 'config', 'data', filename + 'on.*')][0]
       unless File.exist?(filenameOn)
         raise "Can't find the file #{filenameOn} in #{::Cosmos::USERPATH}/config/data"
       end
-      @imageOn = Qt::Image.new(filenameOn)
+      @image_on = Qt::Image.new(filenameOn)
 
-      filenameOff = File.join(::Cosmos::USERPATH, 'config', 'data', filename+'off.gif')
+      filenameOff = Dir[File.join(::Cosmos::USERPATH, 'config', 'data', filename + 'off.*')][0]
       unless File.exist?(filenameOff)
         raise "Can't find the file #{filenameOff} in #{::Cosmos::USERPATH}/config/data"
       end
-      @imageOff = Qt::Image.new(filenameOff)
+      @image_off = Qt::Image.new(filenameOff)
+      @x_end = @x + [@image_on.width, @image_off.width].max
+      @y_end = @y + [@image_on.height, @image_off.height].max
     end
 
     def draw_widget(painter, on_value)
       if on_value
-        painter.drawImage(@x, @y, @imageOn) if @imageOn
+        painter.drawImage(@x, @y, @image_on) if @image_on
       else
-        painter.drawImage(@x, @y, @imageOff) if @imageOff
+        painter.drawImage(@x, @y, @image_off) if @image_off
       end
     end
 
     def dispose
       super()
-      @imageOn.dispose
-      @imageOff.dispose
+      @image_on.dispose
+      @image_off.dispose
     end
   end
-
-end # module Cosmos
+end

data/lib/cosmos/tools/tlm_viewer/widgets/canvaslabel_widget.rb

@@ -9,19 +9,27 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'cosmos/tools/tlm_viewer/widgets/widget'
+require 'cosmos/tools/tlm_viewer/widgets/canvas_clickable'
 
 module Cosmos
-
   class CanvaslabelWidget
     include Widget
+    include CanvasClickable
 
-    def initialize(parent_layout, x, y, text, font_size = 12, color='black')
+    def initialize(parent_layout, x, y, text, font_size = 12, color = 'black')
       super()
       @x = x.to_i
-      @y = y.to_i
+      @paint_y = y.to_i
       @text = text
       @color = Cosmos::getColor(color)
       @font = Cosmos.getFont("helvetica", font_size.to_i)
+      fm = Qt::FontMetrics.new(@font)
+      @x_end = @x + fm.width(text)
+      # drawText uses the y value as the bottom of the text
+      # Thus for the clickable area we need to set the y_end to the y value
+      # and calculate the top y value by subtracting the font height
+      @y_end = y.to_i
+      @y = @y_end - fm.height()
       parent_layout.add_repaint(self)
     end
 
@@ -29,9 +37,8 @@ module Cosmos
       painter.save
       painter.setPen(@color)
       painter.setFont(@font)
-      painter.drawText(@x, @y, @text)
+      painter.drawText(@x, @paint_y, @text)
       painter.restore
     end
   end
-
-end # module Cosmos
+end

data/lib/cosmos/tools/tlm_viewer/widgets/canvaslabelvalue_widget.rb

@@ -14,7 +14,6 @@ require 'cosmos/tools/tlm_viewer/widgets/canvasvalue_widget'
 module Cosmos
 
   class CanvaslabelvalueWidget < CanvasvalueWidget
-
     def initialize(parent_layout, target_name, packet_name, item_name, x1, y1, font_size = 12, color = 'black', frame = true, frame_width = 3, value_type = :CONVERTED)
       super(parent_layout, target_name, packet_name, item_name, value_type)
       @x = x1.to_i
@@ -44,13 +43,12 @@ module Cosmos
         h = @fm.height
         w = @fm.width(@value.to_s)
         @pen.setWidth(@frame_width)
-        painter.drawLine(@x-5, @y+5, @x+w+10, @y+5) # bottom line
-        painter.drawLine(@x-5, @y+5, @x-5, @y-h-5) # left line
-        painter.drawLine(@x-5, @y-h-5, @x+w+10, @y-h-5) # top line
-        painter.drawLine(@x+w+10, @y+5, @x+w+10, @y-h-5) # right line
+        painter.drawLine(@x - 5, @y + 5, @x + w + 10, @y + 5) # bottom line
+        painter.drawLine(@x - 5, @y + 5, @x - 5, @y - h - 5) # left line
+        painter.drawLine(@x - 5, @y - h - 5, @x + w + 10, @y - h - 5) # top line
+        painter.drawLine(@x + w + 10, @y + 5, @x + w + 10, @y - h - 5) # right line
       end
       painter.restore
     end
   end
-
-end # module Cosmos
+end

data/lib/cosmos/tools/tlm_viewer/widgets/canvasline_widget.rb

@@ -11,11 +11,10 @@
 require 'cosmos/tools/tlm_viewer/widgets/widget'
 
 module Cosmos
-
   class CanvaslineWidget
     include Widget
 
-    def initialize(parent_layout, x1, y1, x2, y2, color='black', width=1, connector='NO_CONNECTOR')
+    def initialize(parent_layout, x1, y1, x2, y2, color = 'black', width = 1, connector = 'NO_CONNECTOR')
       super()
       @x1 = x1.to_i
       @y1 = y1.to_i
@@ -51,5 +50,4 @@ module Cosmos
       @point.dispose
     end
   end
-
-end # module Cosmos
+end

data/lib/cosmos/tools/tlm_viewer/widgets/canvaslinevalue_widget.rb

@@ -15,10 +15,8 @@
 require 'cosmos/tools/tlm_viewer/widgets/canvasvalue_widget'
 
 module Cosmos
-
   class CanvaslinevalueWidget < CanvasvalueWidget
-
-    def initialize (parent_layout, target_name, packet_name, item_name, x1, y1, x2, y2, coloron='green', coloroff='blue', width=3, connector='NO_CONNECTOR', value_type = :RAW)
+    def initialize(parent_layout, target_name, packet_name, item_name, x1, y1, x2, y2, color_on = 'green', color_off = 'blue', width = 3, connector = 'NO_CONNECTOR', value_type = :RAW)
       super(parent_layout, target_name, packet_name, item_name, value_type)
       @x1 = x1.to_i
       @y1 = y1.to_i
@@ -30,10 +28,10 @@ module Cosmos
       else
         @connector = false
       end
-      @coloron = Cosmos::getColor(coloron)
-      @coloroff = Cosmos::getColor(coloroff)
-      @pen_on = Cosmos::getPen(coloron)
-      @pen_off = Cosmos::getPen(coloroff)
+      @color_on = Cosmos::getColor(color_on)
+      @color_off = Cosmos::getColor(color_off)
+      @pen_on = Cosmos::getPen(color_on)
+      @pen_off = Cosmos::getPen(color_off)
       @width = width.to_i
     end
 
@@ -41,10 +39,10 @@ module Cosmos
       painter.save
       if (on_state == true)
         pen = @pen_on
-        color = @coloron
+        color = @color_on
       else
         pen = @pen_off
-        color = @coloroff
+        color = @color_off
       end
 
       pen.setWidth(@width)
@@ -62,5 +60,4 @@ module Cosmos
       @point.dispose
     end
   end
-
-end # module Cosmos
+end