Fix merge conflict

BallAerospace · Nov 30, 2016 · d1d8a93 · d1d8a93
2 parents ea721cf + a47e3ff
commit d1d8a93
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/lib/cosmos/gui/utilities/screenshot.rb b/lib/cosmos/gui/utilities/screenshot.rb
@@ -15,6 +15,14 @@ class Screenshot
 
     # Take a screenshot of the given window
     def self.screenshot_window (window, filename)
+      if !Kernel.is_windows?()
+        # Delay for one second to allow any dialogs to fully clear first
+        start_time = Time.now
+        while ((Time.now - start_time) < 1.0)
+          Qt::CoreApplication.processEvents(Qt::EventLoop::AllEvents, 1000)
+        end
+      end
+
       # Create a Pixmap to save the screenshot into
       pixmap = Qt::Pixmap::grabWindow(window.winId())
       pixmap.save(filename)

diff --git a/lib/cosmos/tools/table_manager/table.rb b/lib/cosmos/tools/table_manager/table.rb
@@ -37,9 +37,9 @@ def initialize(name, description, type, endianness, table_id, filename)
 
     # Calls define_item in Packet but also incrememts @num_columns
     # if this table is a REPEATING table.
-    def create_param(name, bit_offset, bit_size, type, description, range, default, display_type, editable)
+    def create_param(name, bit_offset, bit_size, type, description, range, default, display_type, editable, endianness)
       @num_columns += 1 if @type == :TWO_DIMENSIONAL
-      item = define_item(name, bit_offset, bit_size, type)
+      item = define_item(name, bit_offset, bit_size, type, nil, endianness)
       item.description = description
       item.range = range
       item.default = default

diff --git a/lib/cosmos/tools/table_manager/table_config.rb b/lib/cosmos/tools/table_manager/table_config.rb
@@ -115,8 +115,8 @@ def process(filename)
             end
 
           when 'PARAMETER'
-            usage = "PARAMETER <Parameter Name> <Parameter Description> <Data Type> <Bit Size> <Display Type> <Minimum Value> <Maximum Value> <Default Value - Only in ONE_DIMENTIONAL>"
-            parser.verify_num_parameters(6, 8, usage)
+            usage = "PARAMETER <Parameter Name> <Parameter Description> <Data Type> <Bit Size> <Display Type> <Minimum Value> <Maximum Value> <Default Value (Only in ONE_DIMENTIONAL)> <ENDIANNESS (Optional)>"
+            parser.verify_num_parameters(6, 9, usage)
             finish_parameter()
             if @current_table
               @current_table.num_rows += 1
@@ -149,8 +149,14 @@ def process(filename)
                   default = 0
                 end
 
-                @current_parameter = @current_table.create_param(name, @cur_bit_offset,
-                  bit_size, type, description, range, default, display_type, editable)
+                endianness = parameters[-1].to_s.upcase.intern
+                if endianness != :BIG_ENDIAN && endianness != :LITTLE_ENDIAN
+                  endianness = @current_table.default_endianness
+                end
+
+                @current_parameter = @current_table.create_param(
+                  name, @cur_bit_offset, bit_size, type, description,
+                  range, default, display_type, editable, endianness)
                 @cur_bit_offset += parameters[3].to_i
               rescue ArgumentError => err
                 raise parser.error("#{err.message} with #{keyword}.\nUSAGE: #{usage}")