cosmos 4.2.4-java → 4.5.0-java

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

@@ -30,7 +30,8 @@ class Dart
   #      streamed from the packet log binary file
   # 4. Decom Server - JSON DRB server which handles requests for decommutated
   #      or reduced data from the database
-  # 5..n Worker - Decommutates data from the packet log binary file into the DB
+  # 5. Master - Hands out packets to be decommutated by workers
+  # 6..n Worker - Decommutates data from the packet log binary file into the DB
   def run
     Cosmos::Logger.level = Cosmos::Logger::INFO
     dart_logging = DartLogging.new('dart')
@@ -53,7 +54,8 @@ class Dart
       [ruby_process_name, File.join(__dir__, 'dart_ingester.rb')],
       [ruby_process_name, File.join(__dir__, 'dart_reducer.rb')],
       [ruby_process_name, File.join(__dir__, 'dart_stream_server.rb')],
-      [ruby_process_name, File.join(__dir__, 'dart_decom_server.rb')]
+      [ruby_process_name, File.join(__dir__, 'dart_decom_server.rb')],
+      [ruby_process_name, File.join(__dir__, 'dart_master.rb')]
     ]
 
     num_workers.times do |index|

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

@@ -25,9 +25,9 @@ Cosmos.catch_fatal_exception do
     json_drb.method_whitelist = ['query', 'item_names', 'dart_status', 'clear_errors']
     begin
       json_drb.start_service(Cosmos::System.listen_hosts['DART_DECOM'],
-        Cosmos::System.ports['DART_DECOM'], DartDecomQuery.new)
-    rescue Exception
-      raise Cosmos::FatalError.new("Error starting JsonDRb on port #{Cosmos::System.ports['DART_DECOM']}.\nPerhaps another DART Decom Server is already running?")
+        Cosmos::System.ports['DART_DECOM'], DartDecomQuery.new, 1000, Cosmos::System)
+    rescue Exception => error
+      raise Cosmos::FatalError.new("Error starting JsonDRb on port #{Cosmos::System.ports['DART_DECOM']}.\nPerhaps another DART Decom Server is already running?\n#{error.formatted}")
     end
     ["TERM", "INT"].each {|sig| Signal.trap(sig) {exit}}
     Cosmos::Logger.info("Dart Decom Server Started...")

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

@@ -16,18 +16,57 @@ require 'dart_logging'
 # Handles packets by writing them to the dart log file. New SYSTEM META packets
 # cause a new log file to be started.
 class DartInterfaceThread < Cosmos::InterfaceThread
+  include DartCommon
+  
   attr_writer :packet_log_writer
   attr_writer :log_type
-
+  
   def handle_packet(packet)
     if packet.target_name == 'SYSTEM'.freeze and packet.packet_name == 'META'.freeze
       Cosmos::Logger.info("#{@log_type}: #{packet.target_name} #{packet.packet_name}")
+      
+      # Manually read the configuration from the buffer because the packet might not be identified if
+      # identify_and_define is false
+      buffer = packet.buffer(false)
+      if buffer.length >= 33
+        system_config_name = Cosmos::BinaryAccessor.read(8, 256, :STRING, buffer, :BIG_ENDIAN)
+        # Switch to this system_config
+        begin
+          switch_and_get_system_config(system_config_name)
+        rescue Exception => e
+          Cosmos::Logger.error(e.formatted)
+          Cosmos::Logger.error("Could not load system_config: #{system_config_name}")
+        end
+      end      
+      
       # 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
+      # Define the packet so that packet_time will work correctly
+      begin
+        packet_data = packet.buffer(false)
+        received_time = packet.received_time
+        stored = packet.stored
+        extra = packet.extra
+        if @log_type == :TLM
+          packet = Cosmos::System.telemetry.packet(packet.target_name, packet.packet_name)
+        else
+          packet = Cosmos::System.commands.packet(packet.target_name, packet.packet_name)
+        end
+        packet.buffer = packet_data
+        packet.received_time = received_time
+        packet.stored = stored
+        packet.extra = extra
+      rescue Exception => error
+        # Could not find a definition for this packet
+        Cosmos::Logger.error "Unknown packet #{target_name} #{packet_name}"
+      end
       @packet_log_writer.write(packet)
     end
   end

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

@@ -0,0 +1,44 @@
+# 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
+
+ENV['RAILS_ENV'] = 'production'
+require File.expand_path('../../config/environment', __FILE__)
+require 'dart_common'
+require 'dart_master_query'
+
+ples_per_request = ENV['DART_PLE_REQ_SIZE']
+ples_per_request ||= 5
+ples_per_request = ples_per_request.to_i
+
+Cosmos.catch_fatal_exception do
+  DartCommon.handle_argv
+
+  Cosmos::Logger.level = Cosmos::Logger::INFO
+  dart_logging = DartLogging.new('dart_master')
+
+  json_drb = Cosmos::JsonDRb.new
+  json_drb.acl = Cosmos::System.acl if Cosmos::System.acl
+  begin
+    json_drb.method_whitelist = ['get_decom_ple_ids']
+    begin
+      json_drb.start_service(Cosmos::System.listen_hosts['DART_MASTER'],
+        Cosmos::System.ports['DART_MASTER'], DartMasterQuery.new(ples_per_request), 1000, Cosmos::System)
+    rescue Exception => error
+      raise Cosmos::FatalError.new("Error starting JsonDRb on port #{Cosmos::System.ports['DART_MASTER']}.\nPerhaps another DART Master is already running?\n#{error.formatted}")
+    end
+    ["TERM", "INT"].each {|sig| Signal.trap(sig) {exit}}
+    Cosmos::Logger.info("Dart Master Started...")
+    sleep(1) while true
+  rescue Interrupt
+    Cosmos::Logger.info("Dart Master Closing...")
+    json_drb.stop_service
+    dart_logging.stop
+  end
+end

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

@@ -56,6 +56,8 @@ ENV['RAILS_ENV'] = 'production'
 require File.expand_path('../../config/environment', __FILE__)
 require 'dart_database_cleaner'
 
+include DartCommon
+
 Cosmos.catch_fatal_exception do
   case action.downcase
   when 'showpleerrors'
@@ -77,6 +79,119 @@ Cosmos.catch_fatal_exception do
     Cosmos::Logger.level = Cosmos::Logger::INFO
     DartDatabaseCleaner.new.remove_packet_log(ARGV[1])
 
+  when 'showdatabase'
+    puts "Status:"
+    status = Status.last
+    puts "  Updated At: #{status.updated_at.formatted}"
+    puts "  Decom Count: #{status.decom_count}"
+    puts "  Decom Error Count: #{status.decom_error_count}"
+    puts "  Decom Message: #{status.decom_message}"
+    puts "  Decom Message Time: #{status.decom_message_time.formatted}"
+    puts "  Reduction Count: #{status.reduction_count}"
+    puts "  Reduction Error Count: #{status.reduction_error_count}"
+    puts "  Reduction Message: #{status.reduction_message}"
+    puts "  Reduction Message Time: #{status.reduction_message_time}"
+    puts ""
+
+    puts "System Configs:"
+    SystemConfig.all.each do |system_config|
+      puts "  #{sprintf("%6d", system_config.id)} #{system_config.name}"
+    end
+    puts ""
+
+    puts "Targets:"
+    Target.all.each do |target|
+      puts "  #{sprintf("%6d", target.id)} #{target.name}"
+    end
+    puts ""
+    
+    puts "Packets:"
+    Packet.all.each do |packet|
+      target = Target.find(packet.target_id)
+      puts "  #{sprintf("%6d", packet.id)} #{target.name} #{packet.name} (#{packet.is_tlm ? "TLM" : "CMD"})"
+    end
+    puts ""
+
+    puts "Items:"
+    Item.find_each do |item|
+      packet = Packet.find(item.packet_id)
+      target = Target.find(packet.target_id)
+      puts "  #{sprintf("%6d", item.id)} #{target.name} #{packet.name} #{item.name}"
+    end
+    puts ""
+
+    puts "Packet Logs:"
+    PacketLog.all.each do |packet_log|
+      puts "  #{sprintf("%6d", packet_log.id)} #{packet_log.filename} (#{packet_log.is_tlm ? "TLM" : "CMD"}) #{packet_log.created_at.formatted}"
+    end
+    puts ""
+    
+    puts "Packet Log Entry Count: #{PacketLogEntry.count}"
+    puts ""
+    
+    puts "Packet Configs:"
+    PacketConfig.all.each do |packet_config|
+      packet = Packet.find(packet_config.packet_id)
+      target = Target.find(packet.target_id)
+      puts "  #{sprintf("%6d", packet_config.id)} #{target.name} #{packet.name} (#{packet_config.name}) sysconfig:#{packet_config.first_system_config_id} maxindex:#{packet_config.max_table_index} ready:#{packet_config.ready} start:#{packet_config.start_time.formatted} end:#{packet_config.end_time.formatted}"
+    end
+    puts ""
+    
+    value_type_lookup = {0 => "RAW", 1 => "CONVERTED", 2 => "RAW_CON"}
+    puts "Item to Decom Table Mappings:"
+    ItemToDecomTableMapping.find_each do |itdtm|
+      item = Item.find(itdtm.item_id)
+      packet = Packet.find(item.packet_id)
+      target = Target.find(packet.target_id)
+      puts "  #{sprintf("%6d", itdtm.id)} #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]} packet_config:#{itdtm.packet_config_id} item_index:#{itdtm.item_index} table_index:#{itdtm.table_index} reduced:#{itdtm.reduced}"
+    end
+    puts ""
+    
+    puts "Decom and Reduced Tables:"
+    each_decom_and_reduced_table do |packet_config_id, table_index, decom_model, minute_model, hour_model, day_model|
+      puts "  t#{decom_model.name.split("::")[1][1..-1]}: (#{decom_model.count} entries)"
+      ItemToDecomTableMapping.where("packet_config_id = ? and table_index = ?", packet_config_id, table_index).order("item_index ASC").each do |itdtm|
+        item = Item.find(itdtm.item_id)
+        packet = Packet.find(item.packet_id)
+        target = Target.find(packet.target_id)
+        puts "    i#{itdtm.item_index} #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+      end
+      puts ""
+      puts "  t#{minute_model.name.split("::")[1][1..-1]}: (#{minute_model.count} entries)"
+      ItemToDecomTableMapping.where("packet_config_id = ? and table_index = ? and reduced = true", packet_config_id, table_index).order("item_index ASC").each do |itdtm|
+        item = Item.find(itdtm.item_id)
+        packet = Packet.find(item.packet_id)
+        target = Target.find(packet.target_id)
+        puts "    i#{itdtm.item_index}max #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}min #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}avg #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}stddev #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+      end      
+      puts ""
+      puts "  t#{hour_model.name.split("::")[1][1..-1]}: (#{hour_model.count} entries)"
+      ItemToDecomTableMapping.where("packet_config_id = ? and table_index = ? and reduced = true", packet_config_id, table_index).order("item_index ASC").each do |itdtm|
+        item = Item.find(itdtm.item_id)
+        packet = Packet.find(item.packet_id)
+        target = Target.find(packet.target_id)
+        puts "    i#{itdtm.item_index}max #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}min #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}avg #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}stddev #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+      end    
+      puts ""      
+      puts "  t#{day_model.name.split("::")[1][1..-1]}: (#{day_model.count} entries)"
+      ItemToDecomTableMapping.where("packet_config_id = ? and table_index = ? and reduced = true", packet_config_id, table_index).order("item_index ASC").each do |itdtm|
+        item = Item.find(itdtm.item_id)
+        packet = Packet.find(item.packet_id)
+        target = Target.find(packet.target_id)
+        puts "    i#{itdtm.item_index}max #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}min #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}avg #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+        puts "    i#{itdtm.item_index}stddev #{target.name} #{packet.name} #{item.name} #{value_type_lookup[itdtm.value_type]}"
+      end      
+      puts ""
+    end
+    
   when 'showpacketlogs'
     total_size = 0
     packet_logs = PacketLog.all
@@ -91,8 +206,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 +239,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

@@ -36,56 +36,71 @@ module Cosmos
       @@instances << self
     end
 
+    def update_limits_checking
+      return unless @limits_checking_enabled_label
+      begin
+        limits_enabled = limits_enabled?(@target_name, @packet_name, @item_name)
+      rescue RuntimeError
+        # Error most likely due to LATEST packet - Ignore
+        limits_enabled = nil
+      end
+      # Check for nil because true and false are both valid values
+      unless limits_enabled.nil?
+        @limits_checking_enabled_label.setText("#{show_nil(limits_enabled)}")
+      end
+    end
+
     protected
 
     # 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)}")))
+          @limits_checking_enabled_label = Qt::Label.new("#{show_nil(item.limits.enabled)}")
+          details_layout.addRow("Limits Checking Enabled:", @limits_checking_enabled_label)
         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 +109,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 +119,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 +139,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 +148,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