cosmos 4.2.4-java → 4.3.0-java

data/ext/mkrf_conf.rb

@@ -26,9 +26,9 @@ end
 inst = Gem::DependencyInstaller.new
 begin
   if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i
-    unless gem_installed?("ruby-termios", "~> 0.9")
+    unless gem_installed?("ruby-termios", ">= 0.9")
       STDOUT.puts "Attempting to install ruby-termios... If this fails please manually \"gem install ruby-termios\" and try again."
-      inst.install "ruby-termios", "~> 0.9"
+      inst.install "ruby-termios", ">= 0.9"
     end
   end
 rescue

data/install/config/dart/Gemfile

@@ -50,5 +50,5 @@ gem 'childprocess'
 if RUBY_ENGINE == 'ruby'
   gem 'pg', '~> 1.0'
 else
- gem 'activerecord-jdbcpostgresql-adapter', :github => 'jruby/activerecord-jdbc-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter', '~> 51.1'
 end

data/install/config/data/crc.txt

@@ -2,7 +2,7 @@
 "config/targets/SYSTEM/target.txt" 0x07E82776
 "config/targets/SYSTEM/cmd_tlm/meta_tlm.txt" 0x07CDABCB
 "config/data/README.txt" 0x93B2C07E
-"config/system/system.txt" 0xD95B7058
+"config/system/system.txt" 0x390C8677
 "config/tools/launcher/launcher.txt" 0x6A3047DB
 "config/tools/table_manager/README.txt" 0x93B2C07E
 "config/tools/tlm_viewer/tlm_viewer.txt" 0xD9071527
@@ -29,7 +29,7 @@
 "config/tools/handbook_creator/default_toc.xsl" 0x4122A040
 "config/tools/handbook_creator/handbook_creator.txt" 0x64E4B5CC
 "config/tools/script_runner/script_runner.txt" 0x1EECD803
-"config/dart/Gemfile" 0x011A23A3
+"config/dart/Gemfile" 0xE089EDB7
 "tools/TlmExtractor.bat" 0x2B98E027
 "tools/Launcher" 0xFD4E356C
 "tools/CmdSequence" 0x4A13C82C

data/install/config/system/system.txt

@@ -9,18 +9,33 @@ LISTEN_HOST CTS_API 127.0.0.1
 LISTEN_HOST TLMVIEWER_API 127.0.0.1
 LISTEN_HOST CTS_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
 LISTEN_HOST CTS_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST REPLAY_API 127.0.0.1
+LISTEN_HOST REPLAY_PREIDENTIFIED 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST REPLAY_CMD_ROUTER 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST DART_STREAM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
+LISTEN_HOST DART_DECOM 0.0.0.0 # 127.0.0.1 is more secure if you don't need external connections
 
 # Connect Hosts - Ip addresses or hostnames to connect to when running the tools
 CONNECT_HOST CTS_API 127.0.0.1
 CONNECT_HOST TLMVIEWER_API 127.0.0.1
 CONNECT_HOST CTS_PREIDENTIFIED 127.0.0.1
 CONNECT_HOST CTS_CMD_ROUTER 127.0.0.1
+CONNECT_HOST REPLAY_API 127.0.0.1
+CONNECT_HOST REPLAY_PREIDENTIFIED 127.0.0.1
+CONNECT_HOST REPLAY_CMD_ROUTER 127.0.0.1
+CONNECT_HOST DART_STREAM 127.0.0.1
+CONNECT_HOST DART_DECOM 127.0.0.1
 
 # Ethernet Ports
 PORT CTS_API 7777
 PORT TLMVIEWER_API 7778
 PORT CTS_PREIDENTIFIED 7779
 PORT CTS_CMD_ROUTER 7780
+PORT REPLAY_API 7877
+PORT REPLAY_PREIDENTIFIED 7879
+PORT REPLAY_CMD_ROUTER 7880
+PORT DART_STREAM 8777
+PORT DART_DECOM 8779
 
 # Default Packet Log Writer and Reader
 DEFAULT_PACKET_LOG_WRITER packet_log_writer.rb
@@ -33,10 +48,17 @@ PATH SAVED_CONFIG ./outputs/saved_config
 PATH TABLES ./outputs/tables
 PATH HANDBOOKS ./outputs/handbooks
 PATH PROCEDURES ./procedures
+PATH SEQUENCES ./outputs/sequences
+PATH DART_DATA ./outputs/dart/data
+PATH DART_LOGS ./outputs/dart/logs
 
+ALLOW_ACCESS ALL
+
+# ENABLE_SOUND
 # DISABLE_DNS
+# STALENESS_SECONDS 30
 
 # Initialize the metadata dialog using values from the following file:
 # META_INIT config/data/meta_init.txt
 
-ALLOW_ACCESS ALL
+# ADD_MD5_FILE lib/user_version.rb

data/lib/cosmos/conversions.rb

@@ -3,6 +3,8 @@
 require 'cosmos/conversions/conversion'
 require 'cosmos/conversions/generic_conversion'
 require 'cosmos/conversions/new_packet_log_conversion'
+require 'cosmos/conversions/packet_time_formatted_conversion'
+require 'cosmos/conversions/packet_time_seconds_conversion'
 require 'cosmos/conversions/polynomial_conversion'
 require 'cosmos/conversions/processor_conversion'
 require 'cosmos/conversions/received_count_conversion'

data/lib/cosmos/conversions/packet_time_formatted_conversion.rb

@@ -0,0 +1,38 @@
+# encoding: ascii-8bit
+
+# Copyright 2018 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/conversions/conversion'
+
+module Cosmos
+
+  # Converts the packet received time object into a formatted string.
+  class PacketTimeFormattedConversion < Conversion
+
+    # Initializes converted_type to :STRING and converted_bit_size to 0
+    def initialize
+      super()
+      @converted_type = :STRING
+      @converted_bit_size = 0
+    end
+
+    # @param (see Conversion#call)
+    # @return [String] Formatted packet time
+    def call(value, packet, buffer)
+      packet_time = packet.packet_time
+      if packet_time
+        return packet_time.formatted
+      else
+        return 'No Packet Time'
+      end
+    end
+
+  end # class PacketTimeFormattedConversion
+
+end # module Cosmos

data/lib/cosmos/conversions/packet_time_seconds_conversion.rb

@@ -0,0 +1,38 @@
+# encoding: ascii-8bit
+
+# Copyright 2018 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/conversions/conversion'
+
+module Cosmos
+
+  # Converts the packet received time into floating point seconds.
+  class PacketTimeSecondsConversion < Conversion
+
+    # Initializes converted_type to :FLOAT and converted_bit_size to 64
+    def initialize
+      super()
+      @converted_type = :FLOAT
+      @converted_bit_size = 64
+    end
+
+    # @param (see Conversion#call)
+    # @return [Float] Packet received time in seconds
+    def call(value, packet, buffer)
+      packet_time = packet.packet_time
+      if packet_time
+        return packet_time.to_f
+      else
+        return 0.0
+      end
+    end
+
+  end # class PacketTimeSecondsConversion
+
+end # module Cosmos

data/lib/cosmos/core_ext/cosmos_io.rb

@@ -27,7 +27,7 @@ module CosmosIO
     #
     # @param length_num_bytes [Integer] Number of bytes in the length field
     # @return [String] A String of "length field" number of bytes
-    def read_length_bytes(length_num_bytes)
+    def read_length_bytes(length_num_bytes, max_read_size = nil)
       return nil unless (length_num_bytes == 1) || (length_num_bytes == 2) or (length_num_bytes == 4)
 
       # Read bytes for string length
@@ -36,6 +36,7 @@ module CosmosIO
       string_length = Cosmos::BinaryAccessor.read(0, length_num_bytes * 8, :UINT, temp_string_length, :BIG_ENDIAN)
 
       # Read String
+      return nil if max_read_size and string_length > max_read_size
       string = self.read(string_length)
       return nil if (string.nil?) || (string.length != string_length)
       return string

data/lib/cosmos/dart/Gemfile

@@ -59,7 +59,7 @@ gem 'childprocess'
 if RUBY_ENGINE == 'ruby'
   gem 'pg', '~> 0.21'
 else
- gem 'activerecord-jdbcpostgresql-adapter', :github => 'jruby/activerecord-jdbc-adapter'
+ gem 'activerecord-jdbcpostgresql-adapter', '~> 51.1'
 end
 
 if ENV['COSMOS_DEVEL']

data/lib/cosmos/dart/examples/dart_stream_client.rb

@@ -30,8 +30,8 @@ request['meta_filters'] = ["OPERATOR_NAME == 'Unspecified'"]
 request_packet.write('REQUEST', JSON.dump(request))
 
 interface = Cosmos::TcpipClientInterface.new(
-  Cosmos::System.connect_hosts['DART_STREAM'], 
-  Cosmos::System.ports['DART_STREAM'], 
+  Cosmos::System.connect_hosts['DART_STREAM'],
+  Cosmos::System.ports['DART_STREAM'],
   Cosmos::System.ports['DART_STREAM'],
   10, 10, 'PREIDENTIFIED')
 puts "Connecting to Dart Stream Server..."
@@ -70,10 +70,14 @@ while true
 
   if identified_packet
     identified_packet.received_time = packet.received_time
+    identified_packet.stored = packet.stored
+    identified_packet.extra = packet.extra
     packet = identified_packet
   else
     unknown_packet = Cosmos::System.telemetry.update!('UNKNOWN', 'UNKNOWN', packet.buffer)
     unknown_packet.received_time = packet.received_time
+    unknown_packet.stored = packet.stored
+    unknown_packet.extra = packet.extra
     packet = unknown_packet
     data_length = packet.length
     string = "#{@interface.name} - Unknown #{data_length} byte packet starting: "

data/lib/cosmos/dart/lib/dart_common.rb

@@ -271,7 +271,7 @@ module DartCommon
   # @return [ActiveRecord] PacketLogEntry ActiveRecord object
   def find_packet_log_entry(packet, is_tlm)
     target_id, packet_id = lookup_target_and_packet_id(packet.target_name, packet.packet_name, is_tlm)
-    return PacketLogEntry.where("target_id = ? and packet_id = ? and is_tlm = ? and time = ?", target_id, packet_id, is_tlm, packet.received_time).first
+    return PacketLogEntry.where("target_id = ? and packet_id = ? and is_tlm = ? and time = ?", target_id, packet_id, is_tlm, packet.packet_time).first
   end
 
   # Read a Packet from the binary file by using the PacketLogEntry

data/lib/cosmos/dart/lib/dart_database_cleaner.rb

@@ -48,8 +48,8 @@ class DartDatabaseCleaner
         begin
           first_packet = reader.first
           last_packet = reader.last
-          start_time = first_packet.received_time
-          end_time = last_packet.received_time
+          start_time = first_packet.packet_time
+          end_time = last_packet.packet_time
         rescue
           if size == Cosmos::PacketLogReader::COSMOS2_HEADER_LENGTH or size == 0
             Cosmos::Logger::error("File contains no packets: #{filename}")

data/lib/cosmos/dart/lib/dart_decommutator.rb

@@ -239,12 +239,12 @@ class DartDecommutator
 
   def decom_packet(ple, packet, packet_config)
     # Update packet config times
-    if !packet_config.start_time or (packet.received_time < packet_config.start_time)
-      packet_config.start_time = packet.received_time
+    if !packet_config.start_time or (packet.packet_time < packet_config.start_time)
+      packet_config.start_time = packet.packet_time
       packet_config.save!
     end
-    if !packet_config.end_time or (packet.received_time > packet_config.end_time)
-      packet_config.end_time = packet.received_time
+    if !packet_config.end_time or (packet.packet_time > packet_config.end_time)
+      packet_config.end_time = packet.packet_time
       packet_config.save!
     end
 

data/lib/cosmos/dart/lib/dart_importer.rb

@@ -80,7 +80,7 @@ class DartImporter
       Cosmos::Logger.info("First and Last Packet in File not in database")
 
       # Check if time range of packets is not present in database
-      ple = PacketLogEntry.where("time >= ? and time <= ?", first_packet.received_time, last_packet.received_time).first
+      ple = PacketLogEntry.where("time >= ? and time <= ?", first_packet.packet_time, last_packet.packet_time).first
       if !ple # Can go fast if not present at all
         Cosmos::Logger.info("  Fast Import Enabled...")
         fast = true
@@ -134,7 +134,7 @@ class DartImporter
           ple = PacketLogEntry.new
           ple.target_id = target_id
           ple.packet_id = packet_id
-          ple.time = packet.received_time
+          ple.time = packet.packet_time
           ple.packet_log_id = packet_log.id
           ple.data_offset = data_offset
           ple.meta_id = meta_id
@@ -149,7 +149,7 @@ class DartImporter
           ple.save!(validate: false)
         else
           ple_data << "," if ple_data.length > 0
-          ple_data << "(#{target_id},#{packet_id},'#{packet.received_time.dup.utc.iso8601(6)}',#{packet_log.id},#{data_offset},#{meta_id},#{is_tlm},true)"
+          ple_data << "(#{target_id},#{packet_id},'#{packet.packet_time.dup.utc.iso8601(6)}',#{packet_log.id},#{data_offset},#{meta_id},#{is_tlm},true)"
           ple_data_count += 1
         end
 

data/lib/cosmos/dart/lib/dart_packet_log_writer.rb

@@ -114,7 +114,7 @@ class DartPacketLogWriter < Cosmos::PacketLogWriter
       ple = PacketLogEntry.new
       ple.target_id = target_id
       ple.packet_id = packet_id
-      ple.time = packet.received_time
+      ple.time = packet.packet_time
       ple.packet_log_id = @packet_log_id
       ple.data_offset = @file_size
       ple.meta_id = @meta_id
@@ -134,7 +134,7 @@ class DartPacketLogWriter < Cosmos::PacketLogWriter
         @sync_count = 0
       end
       @ple_data << "," if @ple_data.length > 0
-      @ple_data << "(#{target_id},#{packet_id},'#{packet.received_time.dup.utc.iso8601(6)}',#{@packet_log_id},#{@file_size},#{@meta_id},#{@is_tlm},true)"
+      @ple_data << "(#{target_id},#{packet_id},'#{packet.packet_time.dup.utc.iso8601(6)}',#{@packet_log_id},#{@file_size},#{@meta_id},#{@is_tlm},true)"
     end
   end
 

data/lib/cosmos/dart/processes/dart_ingester.rb

@@ -25,6 +25,8 @@ class DartInterfaceThread < Cosmos::InterfaceThread
       # Update Current Value Table Used By Packet Log Writer
       cvt_packet = Cosmos::System.telemetry.update!(packet.target_name, packet.packet_name, packet.buffer)
       cvt_packet.received_time = packet.received_time
+      cvt_packet.stored = packet.stored
+      cvt_packet.extra = packet.extra
       @packet_log_writer.start
       @packet_log_writer.write(cvt_packet)
     else

data/lib/cosmos/dart/processes/dart_util.rb

@@ -91,8 +91,8 @@ Cosmos.catch_fatal_exception do
         begin
           first_packet = reader.first
           last_packet = reader.last
-          start_time = first_packet.received_time.formatted
-          end_time = last_packet.received_time.formatted
+          start_time = first_packet.packet_time.formatted
+          end_time = last_packet.packet_time.formatted
         rescue
           if size == 128 or size == 0
             start_time = "EMPTY                  "
@@ -124,8 +124,8 @@ Cosmos.catch_fatal_exception do
         begin
           first_packet = reader.first
           last_packet = reader.last
-          start_time = first_packet.received_time.formatted
-          end_time = last_packet.received_time.formatted
+          start_time = first_packet.packet_time.formatted
+          end_time = last_packet.packet_time.formatted
         rescue
           if size == 128 or size == 0
             start_time = "EMPTY                  "

data/lib/cosmos/dart/spec/dart/dart_reducer_manager_spec.rb

@@ -29,9 +29,9 @@ describe DartReducerManager do
     meta = Cosmos::System.telemetry.packet("SYSTEM", "META")
     meta.received_time = time
     hs_packet = Cosmos::System.telemetry.packet("INST", "HEALTH_STATUS")
-    # 128 byte file header, SYSTEM META has 14 byte header + length of SYSTEM & META
-    # INST HEALTH_STATUS has 14 byte header + length of INST & HEALTH_STATUS
-    length = 128 + 24 + meta.length + entries * (31 + hs_packet.length)
+    # 128 byte file header, SYSTEM META has 15 byte header + length of SYSTEM & META
+    # INST HEALTH_STATUS has 15 byte header + length of INST & HEALTH_STATUS
+    length = 128 + 25 + meta.length + entries * (32 + hs_packet.length)
 
     writer = DartPacketLogWriter.new(
       :TLM,    # Log telemetry

data/lib/cosmos/gui/dialogs/cmd_tlm_raw_dialog.rb

@@ -59,14 +59,16 @@ module Cosmos
         top_layout = Qt::HBoxLayout.new
         text_layout = Qt::VBoxLayout.new
 
-        title_label = Qt::Label.new(tr(title))
+        title_label = Qt::Label.new(title)
         text_layout.addWidget(title_label)
-        @packet_time = Qt::Label.new("Packet Received Time: ")
+        @packet_time = Qt::Label.new("Packet Time: ")
         text_layout.addWidget(@packet_time)
+        @received_time = Qt::Label.new("Received Time: ")
+        text_layout.addWidget(@received_time)
         top_layout.addLayout(text_layout)
         top_layout.addStretch(1)
 
-        button = Qt::PushButton.new(tr("Pause"))
+        button = Qt::PushButton.new("Pause")
         top_layout.addWidget(button)
         button.connect(SIGNAL('clicked()')) do
           if button.text == "Pause"
@@ -113,8 +115,10 @@ module Cosmos
         packet = System.telemetry.packet(@target_name, @packet_name)
       end
       packet_data = packet.buffer
-      packet_time = packet.received_time
-      @packet_time.setText("Received Time: #{packet_time.formatted}") if packet_time
+      packet_time = packet.packet_time
+      @packet_time.setText("Packet Time: #{packet_time.formatted}") if packet_time
+      received_time = packet.received_time
+      @received_time.setText("Received Time: #{received_time.formatted}") if received_time
       position_x = @packet_data.horizontalScrollBar.value
       position_y = @packet_data.verticalScrollBar.value
       @packet_data.setPlainText(HEADER + packet_data.formatted)

data/lib/cosmos/gui/dialogs/details_dialog.rb

@@ -41,51 +41,51 @@ module Cosmos
     # Creates and populates the layout for the dialog
     def build_details_layout(item, cmd_tlm)
       details_layout = Qt::FormLayout.new
-      details_layout.addRow("Bit Offset:", Qt::Label.new(tr("#{show_nil(item.bit_offset)}")))
-      details_layout.addRow("Bit Size:", Qt::Label.new(tr("#{show_nil(item.bit_size)}")))
-      details_layout.addRow("Data Type:", Qt::Label.new(tr("#{show_data_type(item.data_type)}")))
-      details_layout.addRow("Array Size:", Qt::Label.new(tr("#{show_nil(item.array_size)}")))
+      details_layout.addRow("Bit Offset:", Qt::Label.new("#{show_nil(item.bit_offset)}"))
+      details_layout.addRow("Bit Size:", Qt::Label.new("#{show_nil(item.bit_size)}"))
+      details_layout.addRow("Data Type:", Qt::Label.new("#{show_data_type(item.data_type)}"))
+      details_layout.addRow("Array Size:", Qt::Label.new("#{show_nil(item.array_size)}"))
       if cmd_tlm == :CMD
         if item.range
-          details_layout.addRow("Minimum:", Qt::Label.new(tr(item.range.first.to_s)))
-          details_layout.addRow("Maximum:", Qt::Label.new(tr(item.range.last.to_s)))
+          details_layout.addRow("Minimum:", Qt::Label.new(item.range.first.to_s))
+          details_layout.addRow("Maximum:", Qt::Label.new(item.range.last.to_s))
         end
-        details_layout.addRow("Default:", Qt::Label.new(tr("#{show_nil(item.default)}"))) if item.default
+        details_layout.addRow("Default:", Qt::Label.new("#{show_nil(item.default)}")) if item.default
       end
-      details_layout.addRow("Format String:", Qt::Label.new(tr("#{show_nil(item.format_string)}")))
-      details_layout.addRow("Read_Conversion:", Qt::Label.new(tr("#{show_conversion(item.read_conversion)}")))
-      details_layout.addRow("Write_Conversion:", Qt::Label.new(tr("#{show_conversion(item.write_conversion)}")))
-      details_layout.addRow("Id Value:", Qt::Label.new(tr("#{show_nil(item.id_value)}")))
-      details_layout.addRow("Description:", Qt::Label.new(tr("#{show_nil(item.description)}")))
-      details_layout.addRow("Units Full:", Qt::Label.new(tr("#{show_nil(item.units_full)}")))
-      details_layout.addRow("Units Abbreviation:", Qt::Label.new(tr("#{show_nil(item.units)}")))
-      details_layout.addRow("Endianness:", Qt::Label.new(tr("#{show_endianness(item.endianness)}")))
+      details_layout.addRow("Format String:", Qt::Label.new("#{show_nil(item.format_string)}"))
+      details_layout.addRow("Read_Conversion:", Qt::Label.new("#{show_conversion(item.read_conversion)}"))
+      details_layout.addRow("Write_Conversion:", Qt::Label.new("#{show_conversion(item.write_conversion)}"))
+      details_layout.addRow("Id Value:", Qt::Label.new("#{show_nil(item.id_value)}"))
+      details_layout.addRow("Description:", Qt::Label.new("#{show_nil(item.description)}"))
+      details_layout.addRow("Units Full:", Qt::Label.new("#{show_nil(item.units_full)}"))
+      details_layout.addRow("Units Abbreviation:", Qt::Label.new("#{show_nil(item.units)}"))
+      details_layout.addRow("Endianness:", Qt::Label.new("#{show_endianness(item.endianness)}"))
       if item.states
         details_layout.addRow(build_states_details(item))
       else
-        details_layout.addRow("States:", Qt::Label.new(tr("None")))
+        details_layout.addRow("States:", Qt::Label.new("None"))
       end
       if cmd_tlm == :CMD
-        details_layout.addRow("Required:", Qt::Label.new(tr(item.required.to_s)))
+        details_layout.addRow("Required:", Qt::Label.new(item.required.to_s))
       else
         limits = item.limits.values
         if limits
           details_layout.addRow(build_limits_details(limits))
         else
-          details_layout.addRow(tr("Limits:"), Qt::Label.new("None"))
+          details_layout.addRow("Limits:", Qt::Label.new("None"))
         end
         if limits || item.state_colors
-          details_layout.addRow(tr("Limits Checking Enabled:"), Qt::Label.new(tr("#{show_nil(item.limits.enabled)}")))
+          details_layout.addRow("Limits Checking Enabled:", Qt::Label.new("#{show_nil(item.limits.enabled)}"))
         end
         if limits
-          details_layout.addRow(tr("Limits Persistence Setting:"), Qt::Label.new(tr("#{show_nil(item.limits.persistence_setting)}")))
-          details_layout.addRow(tr("Limits Persistence Count:"), Qt::Label.new(tr("#{show_nil(item.limits.persistence_count)}")))
+          details_layout.addRow("Limits Persistence Setting:", Qt::Label.new("#{show_nil(item.limits.persistence_setting)}"))
+          details_layout.addRow("Limits Persistence Count:", Qt::Label.new("#{show_nil(item.limits.persistence_count)}"))
         end
         if item.meta.empty?
-          details_layout.addRow(tr("Meta:"), Qt::Label.new("None"))
+          details_layout.addRow("Meta:", Qt::Label.new("None"))
         else
           item.meta.each do |key, value|
-            details_layout.addRow(tr("Meta[#{key}]:"), Qt::Label.new(value.to_s))
+            details_layout.addRow("Meta[#{key}]:", Qt::Label.new(value.to_s))
           end
         end
       end
@@ -94,7 +94,7 @@ module Cosmos
 
     # Create the states details layout
     def build_states_details(item)
-      states_details = Qt::GroupBox.new(tr("States"))
+      states_details = Qt::GroupBox.new("States")
       scroll_layout = Qt::VBoxLayout.new
       states_details.setLayout(scroll_layout)
       scroll_area = Qt::ScrollArea.new
@@ -104,11 +104,11 @@ module Cosmos
       scroll_area.setWidget(scroll_widget)
       states_layout = Qt::FormLayout.new
       scroll_widget.setLayout(states_layout)
-      item.states.sort {|a, b| a[1] <=> b[1]}.each do |state_name, state_value|
+      item.states.sort {|a, b| a[1].to_i <=> b[1].to_i }.each do |state_name, state_value|
         if item.state_colors
-          states_layout.addRow(tr("#{state_name}:"), Qt::Label.new(tr("#{state_value} #{item.state_colors[state_name]}")))
+          states_layout.addRow("#{state_name}:", Qt::Label.new("#{state_value} #{item.state_colors[state_name]}"))
         else
-          states_layout.addRow(tr("#{state_name}:"), Qt::Label.new(tr("#{state_value}")))
+          states_layout.addRow("#{state_name}:", Qt::Label.new("#{state_value}"))
         end
       end
       # Figure out the how big the states layout wants to be and set the
@@ -124,7 +124,7 @@ module Cosmos
 
     # Create the limits details layout
     def build_limits_details(limits)
-      limits_details = Qt::GroupBox.new(tr("Limits"))
+      limits_details = Qt::GroupBox.new("Limits")
       @limits_layout = Qt::FormLayout.new
       limits.each do |limits_set_name, limits_settings|
         if limits_settings[4] && limits_settings[5]
@@ -133,7 +133,7 @@ module Cosmos
           label = Qt::Label.new("RL/#{limits_settings[0]} YL/#{limits_settings[1]} YH/#{limits_settings[2]} RH/#{limits_settings[3]}")
         end
         @limits_labels[limits_set_name] = label
-        @limits_layout.addRow(tr("#{limits_set_name}:"), label)
+        @limits_layout.addRow("#{limits_set_name}:", label)
       end
       limits_details.setLayout(@limits_layout)
       limits_details