cosmos 3.8.0 → 3.8.1

data/install/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 gem 'ruby-termios', '~> 0.9' if RbConfig::CONFIG['target_os'] !~ /mswin|mingw|cygwin/i
 if ENV['COSMOS_DEVEL']
-  gem 'cosmos', :path => "../"
+  gem 'cosmos', :path => ENV['COSMOS_DEVEL']
 else
   gem 'cosmos'
 end

data/install/config/data/crc.txt

@@ -1,151 +1,151 @@
 "lib/user_version.rb" 0x8F282EE9
-"config/data/README.txt" 0x93B2C07E
-"config/system/system.txt" 0x9178EE79
-"config/targets/COSMOS/cmd_tlm/cosmos_server_cmds.txt" 0xE2F62B11
-"config/targets/COSMOS/cmd_tlm/cosmos_server_tlm.txt" 0xC667CCD6
-"config/targets/COSMOS/cmd_tlm_server.txt" 0xE53A4164
+"config/targets/SYSTEM/README.txt" 0x93B2C07E
+"config/targets/COSMOS/target.txt" 0x6C6F9A95
 "config/targets/COSMOS/screens/limits_change.txt" 0xE8C47C54
 "config/targets/COSMOS/screens/version.txt" 0x393D4F72
-"config/targets/COSMOS/target.txt" 0x6C6F9A95
-"config/targets/SYSTEM/README.txt" 0x93B2C07E
-"config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0xC6819D73
+"config/targets/COSMOS/cmd_tlm_server.txt" 0xE53A4164
+"config/targets/COSMOS/cmd_tlm/cosmos_server_tlm.txt" 0xC667CCD6
+"config/targets/COSMOS/cmd_tlm/cosmos_server_cmds.txt" 0xE2F62B11
+"config/data/README.txt" 0x93B2C07E
+"config/system/system.txt" 0x9178EE79
+"config/tools/launcher/launcher.txt" 0x2F6ABBDB
+"config/tools/table_manager/README.txt" 0x93B2C07E
+"config/tools/tlm_viewer/tlm_viewer.txt" 0xD9071527
 "config/tools/data_viewer/data_viewer.txt" 0xAEE0B7DF
-"config/tools/handbook_creator/default_toc.xsl" 0x4122A040
-"config/tools/handbook_creator/handbook_creator.txt" 0x64E4B5CC
-"config/tools/handbook_creator/templates/command_packets.html.erb" 0x9897CA7A
+"config/tools/test_runner/test_runner.txt" 0xD24409D2
+"config/tools/tlm_extractor/README.txt" 0x93B2C07E
+"config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0xC6819D73
+"config/tools/tlm_grapher/README.txt" 0x93B2C07E
+"config/tools/opengl_builder/README.txt" 0x93B2C07E
+"config/tools/limits_monitor/README.txt" 0x93B2C07E
+"config/tools/handbook_creator/templates/header.html.erb" 0x1E490C2A
 "config/tools/handbook_creator/templates/command_toc.html.erb" 0x9159BCF9
 "config/tools/handbook_creator/templates/footer.html.erb" 0x0E1F9800
-"config/tools/handbook_creator/templates/header.html.erb" 0x1E490C2A
-"config/tools/handbook_creator/templates/limits_groups.html.erb" 0x40FDF34C
-"config/tools/handbook_creator/templates/nav.html.erb" 0xDF65AAEA
 "config/tools/handbook_creator/templates/overview.html.erb" 0xDC4DD2B8
+"config/tools/handbook_creator/templates/command_packets.html.erb" 0x9897CA7A
+"config/tools/handbook_creator/templates/limits_groups.html.erb" 0x40FDF34C
 "config/tools/handbook_creator/templates/pdf_cover.html.erb" 0x7AAB9A42
-"config/tools/handbook_creator/templates/pdf_footer.html.erb" 0xF0D3EB77
-"config/tools/handbook_creator/templates/pdf_header.html.erb" 0x3020FEE1
-"config/tools/handbook_creator/templates/telemetry_packets.html.erb" 0x44BD9695
 "config/tools/handbook_creator/templates/telemetry_toc.html.erb" 0x610E3BC5
+"config/tools/handbook_creator/templates/nav.html.erb" 0xDF65AAEA
 "config/tools/handbook_creator/templates/title.html.erb" 0xBC66E2BC
-"config/tools/launcher/launcher.txt" 0x2F6ABBDB
-"config/tools/limits_monitor/README.txt" 0x93B2C07E
-"config/tools/opengl_builder/README.txt" 0x93B2C07E
+"config/tools/handbook_creator/templates/telemetry_packets.html.erb" 0x44BD9695
+"config/tools/handbook_creator/templates/pdf_footer.html.erb" 0xF0D3EB77
+"config/tools/handbook_creator/templates/pdf_header.html.erb" 0x3020FEE1
+"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/tools/table_manager/README.txt" 0x93B2C07E
-"config/tools/test_runner/test_runner.txt" 0xD24409D2
-"config/tools/tlm_extractor/README.txt" 0x93B2C07E
-"config/tools/tlm_grapher/README.txt" 0x93B2C07E
-"config/tools/tlm_viewer/tlm_viewer.txt" 0xD9071527
-"tools/CmdExtractor" 0x96E82AC3
-"tools/CmdExtractor.bat" 0x09A34857
-"tools/CmdSender" 0x10346CF4
-"tools/CmdSender.bat" 0x09A34857
+"tools/TlmExtractor.bat" 0x09A34857
+"tools/Launcher" 0xFD4E356C
+"tools/TlmViewer" 0xFE723189
 "tools/CmdTlmServer" 0x4C7A4FCB
-"tools/CmdTlmServer.bat" 0x09A34857
+"tools/ScriptRunner" 0x20F38758
+"tools/tool_launch.rb" 0x0BDB6696
+"tools/LimitsMonitor" 0x04FD96D8
+"tools/Replay.bat" 0x09A34857
+"tools/CmdExtractor.bat" 0x09A34857
+"tools/TlmViewer.bat" 0x09A34857
 "tools/DataViewer" 0x9D20734C
-"tools/DataViewer.bat" 0x09A34857
-"tools/HandbookCreator" 0xD927814C
+"tools/ScriptRunner.bat" 0x09A34857
+"tools/CmdTlmServer.bat" 0x09A34857
+"tools/Replay" 0xAC00D2AD
 "tools/HandbookCreator.bat" 0x09A34857
-"tools/Launcher" 0xFD4E356C
-"tools/Launcher.bat" 0x09A34857
-"tools/LimitsMonitor" 0x04FD96D8
+"tools/PacketViewer" 0xF23A40BB
+"tools/TlmGrapher" 0x9464F502
+"tools/DataViewer.bat" 0x09A34857
 "tools/LimitsMonitor.bat" 0x09A34857
+"tools/mac/TestRunner.app/Contents/Info.plist" 0x482B3BA5
+"tools/mac/TestRunner.app/Contents/Resources/appIcon.icns" 0xC8D32D55
+"tools/mac/TestRunner.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/TestRunner.app/Contents/MacOS/TestRunner.rb" 0x0B0E0B8B
+"tools/mac/TestRunner.app/Contents/MacOS/main.sh" 0x5A8D958C
 "tools/mac/CmdExtractor.app/Contents/Info.plist" 0x0E89084D
+"tools/mac/CmdExtractor.app/Contents/Resources/appIcon.icns" 0x39862FA7
+"tools/mac/CmdExtractor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/CmdExtractor.app/Contents/MacOS/CmdExtractor.rb" 0x96E82AC3
 "tools/mac/CmdExtractor.app/Contents/MacOS/main.sh" 0xEE3EC072
-"tools/mac/CmdExtractor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/CmdExtractor.app/Contents/Resources/appIcon.icns" 0x39862FA7
-"tools/mac/CmdSender.app/Contents/Info.plist" 0x87039019
-"tools/mac/CmdSender.app/Contents/MacOS/CmdSender.rb" 0x10346CF4
-"tools/mac/CmdSender.app/Contents/MacOS/main.sh" 0x707CA873
-"tools/mac/CmdSender.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/CmdSender.app/Contents/Resources/appIcon.icns" 0xEC403A52
-"tools/mac/CmdTlmServer.app/Contents/Info.plist" 0x97E53674
-"tools/mac/CmdTlmServer.app/Contents/MacOS/CmdTlmServer.rb" 0x4C7A4FCB
-"tools/mac/CmdTlmServer.app/Contents/MacOS/main.sh" 0x1F1443E6
-"tools/mac/CmdTlmServer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/CmdTlmServer.app/Contents/Resources/appIcon.icns" 0x972CDCC6
-"tools/mac/DataViewer.app/Contents/Info.plist" 0xB79CA16B
-"tools/mac/DataViewer.app/Contents/MacOS/DataViewer.rb" 0x9D20734C
-"tools/mac/DataViewer.app/Contents/MacOS/main.sh" 0xD40D9D6C
-"tools/mac/DataViewer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/DataViewer.app/Contents/Resources/appIcon.icns" 0x3EC9B207
-"tools/mac/HandbookCreator.app/Contents/Info.plist" 0x7591A548
-"tools/mac/HandbookCreator.app/Contents/MacOS/HandbookCreator.rb" 0xD927814C
-"tools/mac/HandbookCreator.app/Contents/MacOS/main.sh" 0x358F92E1
-"tools/mac/HandbookCreator.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/HandbookCreator.app/Contents/Resources/appIcon.icns" 0xCEA7C465
-"tools/mac/Launcher.app/Contents/Info.plist" 0x32A1EF14
-"tools/mac/Launcher.app/Contents/MacOS/Launcher.rb" 0xFD4E356C
-"tools/mac/Launcher.app/Contents/MacOS/main.sh" 0x0B32DAE8
-"tools/mac/Launcher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/Launcher.app/Contents/Resources/appIcon.icns" 0x8857CD2B
+"tools/mac/TableManager.app/Contents/Info.plist" 0xF6A5877F
+"tools/mac/TableManager.app/Contents/Resources/appIcon.icns" 0xEBF5074E
+"tools/mac/TableManager.app/Contents/MacOS/TableManager.rb" 0x71F21C88
+"tools/mac/TableManager.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/TableManager.app/Contents/MacOS/main.sh" 0x68092BA9
 "tools/mac/LimitsMonitor.app/Contents/Info.plist" 0xAF650287
+"tools/mac/LimitsMonitor.app/Contents/Resources/appIcon.icns" 0xC98BF799
+"tools/mac/LimitsMonitor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/LimitsMonitor.app/Contents/MacOS/LimitsMonitor.rb" 0x04FD96D8
 "tools/mac/LimitsMonitor.app/Contents/MacOS/main.sh" 0xAAF1493C
-"tools/mac/LimitsMonitor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/LimitsMonitor.app/Contents/Resources/appIcon.icns" 0xC98BF799
-"tools/mac/OpenGLBuilder.app/Contents/Info.plist" 0x3C2E542D
-"tools/mac/OpenGLBuilder.app/Contents/MacOS/main.sh" 0xAD05D35B
-"tools/mac/OpenGLBuilder.app/Contents/MacOS/OpenGLBuilder.rb" 0x585EA691
-"tools/mac/OpenGLBuilder.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/OpenGLBuilder.app/Contents/Resources/appIcon.icns" 0x8DDBD837
+"tools/mac/CmdTlmServer.app/Contents/Info.plist" 0x97E53674
+"tools/mac/CmdTlmServer.app/Contents/Resources/appIcon.icns" 0x972CDCC6
+"tools/mac/CmdTlmServer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/CmdTlmServer.app/Contents/MacOS/main.sh" 0x1F1443E6
+"tools/mac/CmdTlmServer.app/Contents/MacOS/CmdTlmServer.rb" 0x4C7A4FCB
 "tools/mac/PacketViewer.app/Contents/Info.plist" 0x6934BF89
-"tools/mac/PacketViewer.app/Contents/MacOS/main.sh" 0x47F54F98
+"tools/mac/PacketViewer.app/Contents/Resources/appIcon.icns" 0xDF373DAE
 "tools/mac/PacketViewer.app/Contents/MacOS/PacketViewer.rb" 0xF23A40BB
 "tools/mac/PacketViewer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/PacketViewer.app/Contents/Resources/appIcon.icns" 0xDF373DAE
+"tools/mac/PacketViewer.app/Contents/MacOS/main.sh" 0x47F54F98
+"tools/mac/CmdSender.app/Contents/Info.plist" 0x87039019
+"tools/mac/CmdSender.app/Contents/Resources/appIcon.icns" 0xEC403A52
+"tools/mac/CmdSender.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/CmdSender.app/Contents/MacOS/CmdSender.rb" 0x10346CF4
+"tools/mac/CmdSender.app/Contents/MacOS/main.sh" 0x707CA873
+"tools/mac/TlmViewer.app/Contents/Info.plist" 0x821041E0
+"tools/mac/TlmViewer.app/Contents/Resources/appIcon.icns" 0x1CBA8EB3
+"tools/mac/TlmViewer.app/Contents/MacOS/TlmViewer.rb" 0xFE723189
+"tools/mac/TlmViewer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/TlmViewer.app/Contents/MacOS/main.sh" 0xE2F1EAFE
+"tools/mac/ScriptRunner.app/Contents/Info.plist" 0x1BC8C5E9
+"tools/mac/ScriptRunner.app/Contents/Resources/appIcon.icns" 0x9246743E
+"tools/mac/ScriptRunner.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/ScriptRunner.app/Contents/MacOS/ScriptRunner.rb" 0x20F38758
+"tools/mac/ScriptRunner.app/Contents/MacOS/main.sh" 0xCE8AE11F
+"tools/mac/OpenGLBuilder.app/Contents/Info.plist" 0x3C2E542D
+"tools/mac/OpenGLBuilder.app/Contents/Resources/appIcon.icns" 0x8DDBD837
+"tools/mac/OpenGLBuilder.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/OpenGLBuilder.app/Contents/MacOS/main.sh" 0xAD05D35B
+"tools/mac/OpenGLBuilder.app/Contents/MacOS/OpenGLBuilder.rb" 0x585EA691
 "tools/mac/Replay.app/Contents/Info.plist" 0x894AC4CF
-"tools/mac/Replay.app/Contents/MacOS/main.sh" 0x42370A6F
+"tools/mac/Replay.app/Contents/Resources/appIcon.icns" 0x0E6B32E5
 "tools/mac/Replay.app/Contents/MacOS/Replay.rb" 0xAC00D2AD
 "tools/mac/Replay.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/Replay.app/Contents/Resources/appIcon.icns" 0x0E6B32E5
-"tools/mac/ScriptRunner.app/Contents/Info.plist" 0x1BC8C5E9
-"tools/mac/ScriptRunner.app/Contents/MacOS/main.sh" 0xCE8AE11F
-"tools/mac/ScriptRunner.app/Contents/MacOS/ScriptRunner.rb" 0x20F38758
-"tools/mac/ScriptRunner.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/ScriptRunner.app/Contents/Resources/appIcon.icns" 0x9246743E
-"tools/mac/TableManager.app/Contents/Info.plist" 0xF6A5877F
-"tools/mac/TableManager.app/Contents/MacOS/main.sh" 0x68092BA9
-"tools/mac/TableManager.app/Contents/MacOS/TableManager.rb" 0x71F21C88
-"tools/mac/TableManager.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/TableManager.app/Contents/Resources/appIcon.icns" 0xEBF5074E
-"tools/mac/TestRunner.app/Contents/Info.plist" 0x482B3BA5
-"tools/mac/TestRunner.app/Contents/MacOS/main.sh" 0x5A8D958C
-"tools/mac/TestRunner.app/Contents/MacOS/TestRunner.rb" 0x0B0E0B8B
-"tools/mac/TestRunner.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/TestRunner.app/Contents/Resources/appIcon.icns" 0xC8D32D55
+"tools/mac/Replay.app/Contents/MacOS/main.sh" 0x42370A6F
 "tools/mac/TlmExtractor.app/Contents/Info.plist" 0x343784F4
-"tools/mac/TlmExtractor.app/Contents/MacOS/main.sh" 0x348F7440
+"tools/mac/TlmExtractor.app/Contents/Resources/appIcon.icns" 0x0AC88876
 "tools/mac/TlmExtractor.app/Contents/MacOS/TlmExtractor.rb" 0x1EC4639A
 "tools/mac/TlmExtractor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/TlmExtractor.app/Contents/Resources/appIcon.icns" 0x0AC88876
+"tools/mac/TlmExtractor.app/Contents/MacOS/main.sh" 0x348F7440
+"tools/mac/HandbookCreator.app/Contents/Info.plist" 0x7591A548
+"tools/mac/HandbookCreator.app/Contents/Resources/appIcon.icns" 0xCEA7C465
+"tools/mac/HandbookCreator.app/Contents/MacOS/HandbookCreator.rb" 0xD927814C
+"tools/mac/HandbookCreator.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/HandbookCreator.app/Contents/MacOS/main.sh" 0x358F92E1
+"tools/mac/Launcher.app/Contents/Info.plist" 0x32A1EF14
+"tools/mac/Launcher.app/Contents/Resources/appIcon.icns" 0x8857CD2B
+"tools/mac/Launcher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/Launcher.app/Contents/MacOS/main.sh" 0x0B32DAE8
+"tools/mac/Launcher.app/Contents/MacOS/Launcher.rb" 0xFD4E356C
 "tools/mac/TlmGrapher.app/Contents/Info.plist" 0x3623B978
+"tools/mac/TlmGrapher.app/Contents/Resources/appIcon.icns" 0xCA324F50
+"tools/mac/TlmGrapher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/TlmGrapher.app/Contents/MacOS/main.sh" 0x7BE28DE6
 "tools/mac/TlmGrapher.app/Contents/MacOS/TlmGrapher.rb" 0x9464F502
-"tools/mac/TlmGrapher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/TlmGrapher.app/Contents/Resources/appIcon.icns" 0xCA324F50
-"tools/mac/TlmViewer.app/Contents/Info.plist" 0x821041E0
-"tools/mac/TlmViewer.app/Contents/MacOS/main.sh" 0xE2F1EAFE
-"tools/mac/TlmViewer.app/Contents/MacOS/TlmViewer.rb" 0xFE723189
-"tools/mac/TlmViewer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
-"tools/mac/TlmViewer.app/Contents/Resources/appIcon.icns" 0x1CBA8EB3
-"tools/OpenGLBuilder" 0x585EA691
+"tools/mac/DataViewer.app/Contents/Info.plist" 0xB79CA16B
+"tools/mac/DataViewer.app/Contents/Resources/appIcon.icns" 0x3EC9B207
+"tools/mac/DataViewer.app/Contents/MacOS/DataViewer.rb" 0x9D20734C
+"tools/mac/DataViewer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/DataViewer.app/Contents/MacOS/main.sh" 0xD40D9D6C
+"tools/TableManager.bat" 0x09A34857
+"tools/HandbookCreator" 0xD927814C
+"tools/TestRunner.bat" 0x09A34857
+"tools/CmdSender" 0x10346CF4
 "tools/OpenGLBuilder.bat" 0x09A34857
-"tools/PacketViewer" 0xF23A40BB
-"tools/PacketViewer.bat" 0x09A34857
-"tools/Replay" 0xAC00D2AD
-"tools/Replay.bat" 0x09A34857
-"tools/ScriptRunner" 0x20F38758
-"tools/ScriptRunner.bat" 0x09A34857
 "tools/TableManager" 0x71F21C88
-"tools/TableManager.bat" 0x09A34857
 "tools/TestRunner" 0x0B0E0B8B
-"tools/TestRunner.bat" 0x09A34857
-"tools/TlmExtractor" 0x1EC4639A
-"tools/TlmExtractor.bat" 0x09A34857
-"tools/TlmGrapher" 0x9464F502
 "tools/TlmGrapher.bat" 0x09A34857
-"tools/TlmViewer" 0xFE723189
-"tools/TlmViewer.bat" 0x09A34857
-"tools/tool_launch.rb" 0x0BDB6696
+"tools/TlmExtractor" 0x1EC4639A
+"tools/PacketViewer.bat" 0x09A34857
+"tools/Launcher.bat" 0x09A34857
 "tools/ToolLaunch.bat" 0x7896E14C
+"tools/CmdExtractor" 0x96E82AC3
+"tools/OpenGLBuilder" 0x585EA691
+"tools/CmdSender.bat" 0x09A34857
 "procedures/README.txt" 0x93B2C07E

data/lib/cosmos/config/config_parser.rb

@@ -287,9 +287,11 @@ module Cosmos
     #
     # @param value [Object] Can be anything
     # @return [Numeric] The converted value. Either a Fixnum or Float.
-    def self.handle_defined_constants(value)
+    def self.handle_defined_constants(value, data_type = nil, bit_size = nil)
       if value.class == String
         case value.upcase
+        when 'MIN', 'MAX'
+          return self.calculate_range_value(value.upcase, data_type, bit_size)
         when 'MIN_INT8'
           return -128
         when 'MAX_INT8'
@@ -363,6 +365,38 @@ module Cosmos
       debug_file
     end
 
+    def self.calculate_range_value(type, data_type, bit_size)
+      value = 0 # Default for UINT minimum
+
+      case data_type
+      when :INT
+        if type == 'MIN'
+          value = -2**(bit_size-1)
+        else # 'MAX'
+          value = 2**(bit_size-1) - 1
+        end
+      when :UINT
+        # Default is 0 for 'MIN'
+        if type == 'MAX'
+          value = 2**bit_size - 1
+        end
+      when :FLOAT
+        case bit_size
+        when 32
+          value = 3.402823e38
+          value *= -1 if type == 'MIN'
+        when 64
+          value = Float::MAX
+          value *= -1 if type == 'MIN'
+        else
+          raise ArgumentError, "Invalid bit size #{bit_size} for FLOAT type."
+        end
+      else
+        raise ArgumentError, "Invalid data type #{data_type} when calculating range."
+      end
+      value
+    end
+
     # Iterates over each line of the io object and yields the keyword and
     # parameters
     #~ def parse_loop(

data/lib/cosmos/core_ext/string.rb

@@ -17,16 +17,16 @@ class String
   # The printable range of ASCII characters
   PRINTABLE_RANGE = 32..126
   # Regular expression to identify a String as a floating point number
-  FLOAT_CHECK_REGEX = /^\s*[-+]?\d*\.\d+\s*$/
+  FLOAT_CHECK_REGEX = /\A\s*[-+]?\d*\.\d+\s*\z/
   # Regular expression to identify a String as a floating point number in
   # scientific notation
-  SCIENTIFIC_CHECK_REGEX = /^\s*[-+]?(\d+((\.\d+)?)|(\.\d+))[eE][-+]?\d+\s*$/
+  SCIENTIFIC_CHECK_REGEX = /\A\s*[-+]?(\d+((\.\d+)?)|(\.\d+))[eE][-+]?\d+\s*\z/
   # Regular expression to identify a String as an integer
-  INT_CHECK_REGEX = /^\s*[-+]?\d+\s*$/
+  INT_CHECK_REGEX = /\A\s*[-+]?\d+\s*\z/
   # Regular expression to identify a String as an integer in hexadecimal format
-  HEX_CHECK_REGEX = /^\s*0[xX][\dabcdefABCDEF]+\s*$/
+  HEX_CHECK_REGEX = /\A\s*0[xX][\dabcdefABCDEF]+\s*\z/
   # Regular expression to identify a String as an Array of numbers
-  ARRAY_CHECK_REGEX = /^\s*\[.*\]\s*$/
+  ARRAY_CHECK_REGEX = /\A\s*\[.*\]\s*\z/
 
   # Displays a String containing binary data in a human readable format by
   # converting each byte to the hex representation.
@@ -191,18 +191,22 @@ class String
   # any of the above then the original String is returned.
   def convert_to_value
     return_value = self
-    if self.is_float?
-      # Floating Point in normal or scientific notation
-      return_value = self.to_f
-    elsif self.is_int?
-      # Integer
-      return_value = self.to_i
-    elsif self.is_hex?
-      # Hex
-      return_value = Integer(self)
-    elsif self.is_array?
-      # Array
-      return_value = eval(self)
+    begin
+      if self.is_float?
+        # Floating Point in normal or scientific notation
+        return_value = self.to_f
+      elsif self.is_int?
+        # Integer
+        return_value = self.to_i
+      elsif self.is_hex?
+        # Hex
+        return_value = Integer(self)
+      elsif self.is_array?
+        # Array
+        return_value = eval(self)
+      end
+    rescue Exception
+      # Something went wrong so just return the string as is
     end
     return return_value
   end

data/lib/cosmos/core_ext/time.rb

@@ -211,10 +211,14 @@ class Time
 
   # @return [String] Date formatted as YYYY/MM/DD HH:MM:SS.US
   def formatted(include_year = true, fractional_digits = 3)
-    if include_year
+    if include_year && fractional_digits > 0
       self.strftime("%Y/%m/%d %H:%M:%S.%#{fractional_digits}N")
-    else
+    elsif include_year && fractional_digits == 0
+      self.strftime("%Y/%m/%d %H:%M:%S")
+    elsif fractional_digits > 0 # no year
       self.strftime("%H:%M:%S.%#{fractional_digits}N")
+    else # no year and no fractional digits
+      self.strftime("%H:%M:%S")
     end
   end
 

data/lib/cosmos/gui/opengl/gl_viewer.rb

@@ -25,6 +25,8 @@ module Cosmos
     RTOD = 57.295779513082320876798154814
 
     attr_accessor :projection # :PARALLEL or :PERSPECTIVE
+    attr_accessor :top_background
+    attr_accessor :bottom_background
     attr_reader :zoom
     attr_reader :fov
     attr_reader :wvt
@@ -36,8 +38,6 @@ module Cosmos
     attr_reader :transform
     attr_reader :itransform
     attr_reader :maxhits
-    attr_reader :top_background
-    attr_reader :bottom_background
     attr_reader :ambient
     attr_reader :light
     attr_reader :material
@@ -49,8 +49,8 @@ module Cosmos
 
     attr_accessor :selection_callback
     attr_accessor :draw_axis
-    def initialize(parent)
-      super(parent)
+    def initialize(parent, share_widget=nil)
+      super(parent, share_widget)
 
       @defaultCursor = nil
       @dragCursor = nil

data/lib/cosmos/gui/opengl/stl_shape.rb

@@ -47,7 +47,11 @@ module Cosmos
             @progress_dialog.set_overall_progress(progress)
           end
         end
-        @progress_dialog.dispose if @progress_dialog
+        if @progress_dialog
+          Qt.execute_in_main_thread(true) do
+            @progress_dialog.dispose
+          end
+        end
         @progress_dialog = nil
       else
         @mystl.process(@stl_file, @stl_scaling_factor)

data/lib/cosmos/gui/qt.rb

@@ -255,32 +255,6 @@ module Cosmos
   end
 end
 
-#### TEMPORARY UNTIL INCLUDED IN QTBINDINGS ####
-class Qt::Application
-  def exec
-    begin
-      method_missing(:exec)
-    ensure
-      disable_threading()
-      self.dispose
-      Qt::Internal.application_terminated = true
-    end
-  end
-end
-
-class Qt::CoreApplication
-  def exec
-    begin
-      method_missing(:exec)
-    ensure
-      disable_threading()
-      self.dispose
-      Qt::Internal.application_terminated = true
-    end
-  end
-end
-#### END TEMPORARY UNTIL INCLUDED IN QTBINDINGS ####
-
 class Qt::Icon
   def initialize(param = nil)
     if param