cosmos 3.0.1 → 3.1.0

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_data_object_editor.rb

@@ -1,107 +1,107 @@
-# 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
-
-require 'cosmos'
-require 'cosmos/tools/tlm_grapher/data_object_editors/data_object_editor'
-require 'cosmos/tools/tlm_grapher/data_object_editors/linegraph_data_object_editor'
-require 'cosmos/tools/tlm_grapher/data_object_editors/housekeeping_data_object_editor'
-require 'cosmos/tools/tlm_grapher/data_object_editors/xy_data_object_editor'
-require 'cosmos/tools/tlm_grapher/data_object_editors/singlexy_data_object_editor'
-
-module Cosmos
-
-  # Dialog which allows the user to edit the data object
-  class TabbedPlotsDataObjectEditor < Qt::Dialog
-
-    def initialize(parent, title, data_object_types, data_object = nil)
-      # Call base class constructor
-      super(parent)
-      setWindowTitle(title)
-
-      layout = Qt::VBoxLayout.new
-
-      unless data_object
-        # Create combobox to select data object type
-        @combobox = Qt::ComboBox.new(self)
-        data_object_types.each {|data_object_type| @combobox.addItem(data_object_type.to_s.upcase)}
-        @combobox.setMaxVisibleItems(data_object_types.length)
-        @combobox.connect(SIGNAL('currentIndexChanged(int)')) { handle_data_object_type_change(data_object) }
-        combo_layout = Qt::FormLayout.new()
-        combo_layout.addRow('Data Object Type:', @combobox)
-        layout.addLayout(combo_layout)
-
-        # Separator before actual editing dialog
-        sep1 = Qt::Frame.new
-        sep1.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
-        layout.addWidget(sep1)
-      else
-        setWindowTitle(title + " : #{data_object.data_object_type}")
-      end
-
-      # Create editor class for specific data object type
-      # Defaults to data_object_types[0] if a data object was not given
-      if data_object
-        data_object_type = data_object.class.to_s[0..-11].downcase
-        data_object_type = data_object_type.split('::')[-1] # Remove Cosmos:: if present
-      else
-        data_object_type = data_object_types[0].to_s.downcase
-      end
-      @editor_layout = Qt::VBoxLayout.new
-      layout.addLayout(@editor_layout)
-      @editor = Cosmos.require_class(data_object_type + '_data_object_editor.rb').new(self)
-      @editor.set_data_object(data_object)
-      @editor_layout.addWidget(@editor)
-
-      # Separator before buttons
-      sep2 = Qt::Frame.new
-      sep2.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
-      layout.addWidget(sep2)
-      layout.addStretch
-
-      # Create OK and Cancel buttons
-      ok_button = Qt::PushButton.new('Ok')
-      ok_button.setDefault(true)
-      connect(ok_button, SIGNAL('clicked()'), self, SLOT('accept()'))
-      cancel_button = Qt::PushButton.new('Cancel')
-      connect(cancel_button, SIGNAL('clicked()'), self, SLOT('reject()'))
-      button_layout = Qt::HBoxLayout.new()
-      button_layout.addWidget(ok_button)
-      button_layout.addWidget(cancel_button)
-      layout.addLayout(button_layout)
-
-      setLayout(layout)
-    end # def initialize
-
-    # Executes the dialog box
-    def execute
-      return_value = nil
-      result = exec()
-      if result == Qt::Dialog::Accepted
-        return_value = @editor.get_data_object
-      end
-      dispose()
-      return return_value
-    end # def execute
-
-    protected
-
-    # Handles the data object type changing
-    def handle_data_object_type_change(data_object)
-      data_object_type = @combobox.text.downcase
-      @editor_layout.removeWidget(@editor)
-      @editor.dispose
-      @editor = Cosmos.require_class(data_object_type + '_data_object_editor.rb').new(self)
-      @editor.set_data_object(data_object)
-      @editor_layout.addWidget(@editor)
-    end
-
-  end # class TabbedPlotsDataObjectEditor
-
-end # module Cosmos
+# 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
+
+require 'cosmos'
+require 'cosmos/tools/tlm_grapher/data_object_editors/data_object_editor'
+require 'cosmos/tools/tlm_grapher/data_object_editors/linegraph_data_object_editor'
+require 'cosmos/tools/tlm_grapher/data_object_editors/housekeeping_data_object_editor'
+require 'cosmos/tools/tlm_grapher/data_object_editors/xy_data_object_editor'
+require 'cosmos/tools/tlm_grapher/data_object_editors/singlexy_data_object_editor'
+
+module Cosmos
+
+  # Dialog which allows the user to edit the data object
+  class TabbedPlotsDataObjectEditor < Qt::Dialog
+
+    def initialize(parent, title, data_object_types, data_object = nil)
+      # Call base class constructor
+      super(parent)
+      setWindowTitle(title)
+
+      layout = Qt::VBoxLayout.new
+
+      unless data_object
+        # Create combobox to select data object type
+        @combobox = Qt::ComboBox.new(self)
+        data_object_types.each {|data_object_type| @combobox.addItem(data_object_type.to_s.upcase)}
+        @combobox.setMaxVisibleItems(data_object_types.length)
+        @combobox.connect(SIGNAL('currentIndexChanged(int)')) { handle_data_object_type_change(data_object) }
+        combo_layout = Qt::FormLayout.new()
+        combo_layout.addRow('Data Object Type:', @combobox)
+        layout.addLayout(combo_layout)
+
+        # Separator before actual editing dialog
+        sep1 = Qt::Frame.new
+        sep1.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
+        layout.addWidget(sep1)
+      else
+        setWindowTitle(title + " : #{data_object.data_object_type}")
+      end
+
+      # Create editor class for specific data object type
+      # Defaults to data_object_types[0] if a data object was not given
+      if data_object
+        data_object_type = data_object.class.to_s[0..-11].downcase
+        data_object_type = data_object_type.split('::')[-1] # Remove Cosmos:: if present
+      else
+        data_object_type = data_object_types[0].to_s.downcase
+      end
+      @editor_layout = Qt::VBoxLayout.new
+      layout.addLayout(@editor_layout)
+      @editor = Cosmos.require_class(data_object_type + '_data_object_editor.rb').new(self)
+      @editor.set_data_object(data_object)
+      @editor_layout.addWidget(@editor)
+
+      # Separator before buttons
+      sep2 = Qt::Frame.new
+      sep2.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
+      layout.addWidget(sep2)
+      layout.addStretch
+
+      # Create OK and Cancel buttons
+      ok_button = Qt::PushButton.new('Ok')
+      ok_button.setDefault(true)
+      connect(ok_button, SIGNAL('clicked()'), self, SLOT('accept()'))
+      cancel_button = Qt::PushButton.new('Cancel')
+      connect(cancel_button, SIGNAL('clicked()'), self, SLOT('reject()'))
+      button_layout = Qt::HBoxLayout.new()
+      button_layout.addWidget(ok_button)
+      button_layout.addWidget(cancel_button)
+      layout.addLayout(button_layout)
+
+      setLayout(layout)
+    end # def initialize
+
+    # Executes the dialog box
+    def execute
+      return_value = nil
+      result = exec()
+      if result == Qt::Dialog::Accepted
+        return_value = @editor.get_data_object
+      end
+      dispose()
+      return return_value
+    end # def execute
+
+    protected
+
+    # Handles the data object type changing
+    def handle_data_object_type_change(data_object)
+      data_object_type = @combobox.text.downcase
+      @editor_layout.removeWidget(@editor)
+      @editor.dispose
+      @editor = Cosmos.require_class(data_object_type + '_data_object_editor.rb').new(self)
+      @editor.set_data_object(data_object)
+      @editor_layout.addWidget(@editor)
+    end
+
+  end # class TabbedPlotsDataObjectEditor
+
+end # module Cosmos

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_logfile_thread.rb

@@ -1,95 +1,111 @@
-# 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
-
-require 'cosmos'
-require 'cosmos/gui/qt'
-
-module Cosmos
-
-  # Thread used to gather telemetry from log file(s) and process it using a TabbedPlotsDefinition
-  class TabbedPlotsLogfileThread
-    # Number of packets between updating the progress bar
-    PROGRESS_UPDATE_PACKET_COUNT = 100
-
-    # Array of exceptions that occurred processing the log file
-    attr_reader :errors
-
-    # Create a new TabbedPlotsLogfileThread
-    def initialize(log_files, packet_log_reader, tabbed_plots_config, progress_dialog = nil, time_start = nil, time_end = nil)
-      super()
-      @packet_log_reader = packet_log_reader
-      @tabbed_plots_config = tabbed_plots_config
-      @errors = []
-      @done = false
-      @cancel = false
-
-      if progress_dialog
-        progress_dialog.cancel_callback = method(:kill)
-        progress_dialog.enable_cancel_button
-      end
-
-      @thread = Thread.new do
-        begin
-          log_file_count = 1
-          log_files.each do |log_file|
-            break if @cancel
-            begin
-              file_size = File.size(log_file).to_f
-              progress_dialog.append_text("Procesing File #{log_file_count}/#{log_files.length}: #{log_file}\n") if progress_dialog
-              progress_dialog.set_step_progress(0) if progress_dialog
-              packet_count = 0
-              @packet_log_reader.each(log_file, true, time_start, time_end) do |packet|
-                break if @cancel
-                if progress_dialog and packet_count % PROGRESS_UPDATE_PACKET_COUNT == 0
-                  progress_dialog.set_step_progress(@packet_log_reader.bytes_read / file_size)
-                end
-                @tabbed_plots_config.process_packet(packet)
-                packet_count += 1
-              end
-              progress_dialog.set_step_progress(1.0) if progress_dialog and not @cancel
-              progress_dialog.set_overall_progress(log_file_count.to_f / log_files.length.to_f) if progress_dialog and not @cancel
-            rescue Exception => error
-              @errors << error
-              progress_dialog.append_text("Error processing #{log_file}:\n#{error.class} : #{error.message}\n#{error.backtrace.join("\n")}\n", 2) if progress_dialog
-              # If a progress dialog is shown we can't just bail on this error or
-              # it will close and the user will have no idea what happened
-              # Thus we'll spin here waiting for them to close the dialog
-              if progress_dialog
-                sleep(0.1) until progress_dialog.complete?
-              end
-              break # Bail out because something bad happened
-            end
-            log_file_count += 1
-          end
-        ensure
-          progress_dialog.complete if progress_dialog
-          sleep(0.1) # Give the user a chance to see something if we process really fast
-          @done = true
-        end
-      end
-    end # def initialize
-
-    # Indicates if processing is complete
-    def done?
-      @done
-    end
-
-    # Kills the log file processing thread
-    def kill(progress_dialog = nil)
-      @cancel = true
-      @thread.kill
-      @thread = nil
-      @done = true
-      return true, false
-    end # def kill
-
-  end # class TabbedPlotsLogfileThread
-
-end # module Cosmos
+# 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
+
+require 'cosmos'
+require 'cosmos/gui/qt'
+
+module Cosmos
+
+  # Thread used to gather telemetry from log file(s) and process it using a TabbedPlotsDefinition
+  class TabbedPlotsLogfileThread
+    # Number of packets between updating the progress bar
+    PROGRESS_UPDATE_PACKET_COUNT = 100
+
+    # Array of exceptions that occurred processing the log file
+    attr_reader :errors
+
+    # Create a new TabbedPlotsLogfileThread
+    def initialize(log_files, packet_log_reader, tabbed_plots_config, progress_dialog = nil, time_start = nil, time_end = nil)
+      super()
+      @packet_log_reader = packet_log_reader
+      @tabbed_plots_config = tabbed_plots_config
+      @errors = []
+      @done = false
+      @cancel = false
+
+      if progress_dialog
+        progress_dialog.cancel_callback = method(:kill)
+        progress_dialog.enable_cancel_button
+      end
+
+      @thread = Thread.new do
+        begin
+          log_file_count = 1
+          log_files.each do |log_file|
+            break if @cancel
+            begin
+              file_size = File.size(log_file).to_f
+              break if @cancel
+              progress_dialog.append_text("Procesing File #{log_file_count}/#{log_files.length}: #{log_file}\n") if progress_dialog
+              break if @cancel
+              progress_dialog.set_step_progress(0) if progress_dialog
+              break if @cancel
+              packet_count = 0
+              @packet_log_reader.each(log_file, true, time_start, time_end) do |packet|
+                break if @cancel
+                if progress_dialog and packet_count % PROGRESS_UPDATE_PACKET_COUNT == 0
+                  progress_dialog.set_step_progress(@packet_log_reader.bytes_read / file_size)
+                end
+                break if @cancel
+                @tabbed_plots_config.process_packet(packet)
+                packet_count += 1
+              end
+              break if @cancel
+              progress_dialog.set_step_progress(1.0) if progress_dialog and not @cancel
+              break if @cancel
+              progress_dialog.set_overall_progress(log_file_count.to_f / log_files.length.to_f) if progress_dialog and not @cancel
+              break if @cancel
+            rescue Exception => error
+              @errors << error
+              break if @cancel
+              progress_dialog.append_text("Error processing #{log_file}:\n#{error.class} : #{error.message}\n#{error.backtrace.join("\n")}\n", 2) if progress_dialog
+              # If a progress dialog is shown we can't just bail on this error or
+              # it will close and the user will have no idea what happened
+              # Thus we'll spin here waiting for them to close the dialog
+              break if @cancel
+              if progress_dialog
+                sleep(0.1) until progress_dialog.complete?
+              end
+              break # Bail out because something bad happened
+            end
+            log_file_count += 1
+          end
+        ensure
+          if !@cancel
+            progress_dialog.complete if progress_dialog
+            sleep(0.1) # Give the user a chance to see something if we process really fast
+          end
+          @done = true
+        end
+      end
+    end # def initialize
+
+    # Indicates if processing is complete
+    def done?
+      @done
+    end
+
+    # Kills the log file processing thread
+    def kill(progress_dialog = nil)
+      @cancel = true
+      Cosmos.kill_thread(self, @thread)
+      progress_dialog.complete if progress_dialog
+      @thread = nil
+      @done = true
+      return true, false
+    end # def kill
+
+    def graceful_kill
+      # Just to remove warnings
+    end
+
+  end # class TabbedPlotsLogfileThread
+
+end # module Cosmos

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_plot_editor.rb

@@ -1,101 +1,101 @@
-# 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
-
-require 'cosmos'
-require 'cosmos/tools/tlm_grapher/plot_editors/linegraph_plot_editor'
-require 'cosmos/tools/tlm_grapher/plot_editors/xy_plot_editor'
-require 'cosmos/tools/tlm_grapher/plot_editors/singlexy_plot_editor'
-
-module Cosmos
-
-  # Dialog to edit the plot
-  class TabbedPlotsPlotEditor < Qt::Dialog
-
-    def initialize(parent, title, plot_types, plot = nil)
-      super(parent)
-      setWindowTitle(title)
-
-      @layout = Qt::VBoxLayout.new
-
-      unless plot
-        # Create combobox to select plot type
-        @combobox = Qt::ComboBox.new(self)
-        plot_types.each {|plot_type| @combobox.addItem(plot_type.to_s.upcase)}
-        @combobox.setMaxVisibleItems(plot_types.length)
-        @combobox.connect(SIGNAL('currentIndexChanged(int)')) { handle_plot_type_change() }
-        @combo_layout = Qt::FormLayout.new()
-        @combo_layout.addRow('Plot Type:', @combobox)
-        @layout.addLayout(@combo_layout)
-
-        # Separator before actual editing dialog
-        @sep1 = Qt::Frame.new
-        @sep1.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
-        @layout.addWidget(@sep1)
-      else
-        setWindowTitle(title + " : #{plot.plot_type}")
-      end
-
-      # Create editor class for specific plot type
-      # Defaults to plot_types[0] if a plot was not given
-      if plot
-        plot_type = plot.class.to_s[0..-5].downcase
-        plot_type = plot_type.split('::')[-1] # Remove Cosmos:: if present
-      else
-        plot_type = plot_types[0].to_s.downcase
-      end
-      @editor_layout = Qt::VBoxLayout.new
-      @layout.addLayout(@editor_layout)
-      @editor = Cosmos.require_class(plot_type + '_plot_editor').new(self, plot)
-      @editor_layout.addWidget(@editor)
-
-      # Separator before buttons
-      @sep2 = Qt::Frame.new
-      @sep2.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
-      @layout.addWidget(@sep2)
-      @layout.addStretch
-
-      # Create OK and Cancel buttons
-      @ok_button = Qt::PushButton.new('Ok')
-      @ok_button.setDefault(true)
-      connect(@ok_button, SIGNAL('clicked()'), self, SLOT('accept()'))
-      @cancel_button = Qt::PushButton.new('Cancel')
-      connect(@cancel_button, SIGNAL('clicked()'), self, SLOT('reject()'))
-      @button_layout = Qt::HBoxLayout.new()
-      @button_layout.addWidget(@ok_button)
-      @button_layout.addWidget(@cancel_button)
-      @layout.addLayout(@button_layout)
-      @ok_button.setDefault(true)
-
-      setLayout(@layout)
-    end # def initialize
-
-    # Executes the plot editor dialog box
-    def execute
-      return_value = nil
-      result = exec()
-      if result == Qt::Dialog::Accepted
-        return_value = @editor.plot
-      end
-      return return_value
-    end # def execute
-
-    protected
-
-    # Handles plot type being changed
-    def handle_plot_type_change
-      plot_type = @combobox.currentText.downcase
-      @editor.dispose
-      @editor = Cosmos.require_class(plot_type.capitalize + '_plot_editor').new(self)
-      @editor_layout.addWidget(@editor)
-    end
-
-  end # class TabbedPlotsPlotEditor
-
-end # module Cosmos
+# 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
+
+require 'cosmos'
+require 'cosmos/tools/tlm_grapher/plot_editors/linegraph_plot_editor'
+require 'cosmos/tools/tlm_grapher/plot_editors/xy_plot_editor'
+require 'cosmos/tools/tlm_grapher/plot_editors/singlexy_plot_editor'
+
+module Cosmos
+
+  # Dialog to edit the plot
+  class TabbedPlotsPlotEditor < Qt::Dialog
+
+    def initialize(parent, title, plot_types, plot = nil)
+      super(parent)
+      setWindowTitle(title)
+
+      @layout = Qt::VBoxLayout.new
+
+      unless plot
+        # Create combobox to select plot type
+        @combobox = Qt::ComboBox.new(self)
+        plot_types.each {|plot_type| @combobox.addItem(plot_type.to_s.upcase)}
+        @combobox.setMaxVisibleItems(plot_types.length)
+        @combobox.connect(SIGNAL('currentIndexChanged(int)')) { handle_plot_type_change() }
+        @combo_layout = Qt::FormLayout.new()
+        @combo_layout.addRow('Plot Type:', @combobox)
+        @layout.addLayout(@combo_layout)
+
+        # Separator before actual editing dialog
+        @sep1 = Qt::Frame.new
+        @sep1.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
+        @layout.addWidget(@sep1)
+      else
+        setWindowTitle(title + " : #{plot.plot_type}")
+      end
+
+      # Create editor class for specific plot type
+      # Defaults to plot_types[0] if a plot was not given
+      if plot
+        plot_type = plot.class.to_s[0..-5].downcase
+        plot_type = plot_type.split('::')[-1] # Remove Cosmos:: if present
+      else
+        plot_type = plot_types[0].to_s.downcase
+      end
+      @editor_layout = Qt::VBoxLayout.new
+      @layout.addLayout(@editor_layout)
+      @editor = Cosmos.require_class(plot_type + '_plot_editor').new(self, plot)
+      @editor_layout.addWidget(@editor)
+
+      # Separator before buttons
+      @sep2 = Qt::Frame.new
+      @sep2.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
+      @layout.addWidget(@sep2)
+      @layout.addStretch
+
+      # Create OK and Cancel buttons
+      @ok_button = Qt::PushButton.new('Ok')
+      @ok_button.setDefault(true)
+      connect(@ok_button, SIGNAL('clicked()'), self, SLOT('accept()'))
+      @cancel_button = Qt::PushButton.new('Cancel')
+      connect(@cancel_button, SIGNAL('clicked()'), self, SLOT('reject()'))
+      @button_layout = Qt::HBoxLayout.new()
+      @button_layout.addWidget(@ok_button)
+      @button_layout.addWidget(@cancel_button)
+      @layout.addLayout(@button_layout)
+      @ok_button.setDefault(true)
+
+      setLayout(@layout)
+    end # def initialize
+
+    # Executes the plot editor dialog box
+    def execute
+      return_value = nil
+      result = exec()
+      if result == Qt::Dialog::Accepted
+        return_value = @editor.plot
+      end
+      return return_value
+    end # def execute
+
+    protected
+
+    # Handles plot type being changed
+    def handle_plot_type_change
+      plot_type = @combobox.currentText.downcase
+      @editor.dispose
+      @editor = Cosmos.require_class(plot_type.capitalize + '_plot_editor').new(self)
+      @editor_layout.addWidget(@editor)
+    end
+
+  end # class TabbedPlotsPlotEditor
+
+end # module Cosmos