cosmos 4.4.0 → 4.5.1

data/demo/config/system/system.txt

@@ -10,15 +10,17 @@ DECLARE_TARGET DART
 DECLARE_TARGET SYSTEM
 
 # Listen Hosts - Ip addresses or hostnames to listen on when running the tools
+# Set these to 0.0.0.0 if you need external connections from other computers
 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 CTS_PREIDENTIFIED 127.0.0.1
+LISTEN_HOST CTS_CMD_ROUTER 127.0.0.1
 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
+LISTEN_HOST REPLAY_PREIDENTIFIED 127.0.0.1
+LISTEN_HOST REPLAY_CMD_ROUTER 127.0.0.1
+LISTEN_HOST DART_STREAM 127.0.0.1
+LISTEN_HOST DART_DECOM 127.0.0.1
+LISTEN_HOST DART_MASTER 127.0.0.1
 
 # Connect Hosts - Ip addresses or hostnames to connect to when running the tools
 CONNECT_HOST CTS_API 127.0.0.1
@@ -30,6 +32,7 @@ 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
+CONNECT_HOST DART_MASTER 127.0.0.1
 
 # Ethernet Ports
 PORT CTS_API 7777
@@ -41,6 +44,7 @@ PORT REPLAY_PREIDENTIFIED 7879
 PORT REPLAY_CMD_ROUTER 7880
 PORT DART_STREAM 8777
 PORT DART_DECOM 8779
+PORT DART_MASTER 8780
 
 # Default Packet Log Writer and Reader
 DEFAULT_PACKET_LOG_WRITER packet_log_writer.rb
@@ -77,3 +81,10 @@ ADD_HASH_FILE lib/user_version.rb
 
 # Create a banner using a RGB color values
 # CLASSIFICATION Secret 255 114 0
+
+# ALLOW_ROUTER_COMMANDING # Enable this to chain servers with commanding
+# ALLOW_HOST localhost:7777 # This is provided by default.  Add with HostIP:7777 for chaining
+# ALLOW_ORIGIN 1.2.3.4:8080 # Add this if you have a webserver that should be able to access the COSMOS API
+
+# *** IMPORTANT *** Change this value to a unique value for each project
+X_CSRF_TOKEN SuperSecret # Secret used to secure requests - Change for each project

data/demo/config/system/system2.txt

@@ -8,15 +8,17 @@ DECLARE_TARGET EXAMPLE
 DECLARE_TARGET SYSTEM
 
 # Listen Hosts - Ip addresses or hostnames to listen on when running the tools
+# Set these to 0.0.0.0 if you need external connections from other computers
 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 CTS_PREIDENTIFIED 127.0.0.1
+LISTEN_HOST CTS_CMD_ROUTER 127.0.0.1
 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
+LISTEN_HOST REPLAY_PREIDENTIFIED 127.0.0.1
+LISTEN_HOST REPLAY_CMD_ROUTER 127.0.0.1
+LISTEN_HOST DART_STREAM 127.0.0.1
+LISTEN_HOST DART_DECOM 127.0.0.1
+LISTEN_HOST DART_MASTER 127.0.0.1
 
 # Connect Hosts - Ip addresses or hostnames to connect to when running the tools
 CONNECT_HOST CTS_API 127.0.0.1
@@ -28,6 +30,7 @@ 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
+CONNECT_HOST DART_MASTER 127.0.0.1
 
 # Ethernet Ports
 PORT CTS_API 7777
@@ -39,6 +42,7 @@ PORT REPLAY_PREIDENTIFIED 7879
 PORT REPLAY_CMD_ROUTER 7880
 PORT DART_STREAM 8777
 PORT DART_DECOM 8779
+PORT DART_DECOM 8780
 
 # Default Packet Log Writer and Reader
 DEFAULT_PACKET_LOG_WRITER packet_log_writer.rb
@@ -62,3 +66,10 @@ ALLOW_ACCESS ALL
 
 # Initialize the metadata dialog using values from the following file:
 # META_INIT config/data/meta_init.txt
+
+# ALLOW_ROUTER_COMMANDING # Enable this to chain servers with commanding
+# ALLOW_HOST localhost:7777 # This is provided by default.  Add with HostIP:7777 for chaining
+# ALLOW_ORIGIN 1.2.3.4:8080 # Add this if you have a webserver that should be able to access the COSMOS API
+
+# *** IMPORTANT *** Change this value to a unique value for each project
+X_CSRF_TOKEN SuperSecret # Secret used to secure requests - Change for each project

data/demo/config/system/system_alt_ports.txt

@@ -10,15 +10,17 @@ DECLARE_TARGET DART
 DECLARE_TARGET SYSTEM
 
 # Listen Hosts - Ip addresses or hostnames to listen on when running the tools
+# Set these to 0.0.0.0 if you need external connections from other computers
 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 CTS_PREIDENTIFIED 127.0.0.1
+LISTEN_HOST CTS_CMD_ROUTER 127.0.0.1
 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
+LISTEN_HOST REPLAY_PREIDENTIFIED 127.0.0.1
+LISTEN_HOST REPLAY_CMD_ROUTER 127.0.0.1
+LISTEN_HOST DART_STREAM 127.0.0.1
+LISTEN_HOST DART_DECOM 127.0.0.1
+LISTEN_HOST DART_MASTER 127.0.0.1
 
 # Connect Hosts - Ip addresses or hostnames to connect to when running the tools
 CONNECT_HOST CTS_API 127.0.0.1
@@ -30,6 +32,7 @@ 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
+CONNECT_HOST DART_MASTER 127.0.0.1
 
 # Ethernet Ports
 PORT CTS_API 9777
@@ -41,6 +44,7 @@ PORT REPLAY_PREIDENTIFIED 9879
 PORT REPLAY_CMD_ROUTER 9880
 PORT DART_STREAM 10777
 PORT DART_DECOM 10779
+PORT DART_MASTER 10780
 
 # Default Packet Log Writer and Reader
 DEFAULT_PACKET_LOG_WRITER packet_log_writer.rb
@@ -67,3 +71,10 @@ ENABLE_SOUND
 META_INIT config/data/meta_init.txt
 
 ADD_HASH_FILE lib/user_version.rb
+
+# ALLOW_ROUTER_COMMANDING # Enable this to chain servers with commanding
+# ALLOW_HOST localhost:7777 # This is provided by default.  Add with HostIP:7777 for chaining
+# ALLOW_ORIGIN 1.2.3.4:8080 # Add this if you have a webserver that should be able to access the COSMOS API
+
+# *** IMPORTANT *** Change this value to a unique value for each project
+X_CSRF_TOKEN SuperSecret # Secret used to secure requests - Change for each project

data/demo/config/targets/INST/cmd_tlm/inst_cmds.txt

@@ -26,7 +26,7 @@ COMMAND INST SETPARAMS BIG_ENDIAN "Sets numbered parameters"
 
   # New more flexible ERB syntax:
   <% (1..5).each do |i| %>
-    APPEND_PARAMETER VALUE<%= i %> 16 UINT 0 5 0 "Value <%= i %> setting"
+    APPEND_PARAMETER VALUE<%= i %> 16 UINT 0 5 1 "Value <%= i %> setting"
   <% end %>
 
   SELECT_PARAMETER VALUE5
@@ -34,12 +34,12 @@ COMMAND INST SETPARAMS BIG_ENDIAN "Sets numbered parameters"
 
 COMMAND INST ASCIICMD BIG_ENDIAN "Enumerated ASCII command"
   <%= render "_ccsds_cmd.txt", locals: {id: 5} %>
-  PARAMETER    STRING         64  2048 STRING "NOOP"    "Enumerated string parameter"
+  APPEND_PARAMETER STRING 2048 STRING "NOOP" "Enumerated string parameter"
     STATE "NOOP" "NOOP"
-    STATE "ARM LASER" "ARM LASER" HAZARDOUS "Arming the laser poses an eye safety hazard."
+    STATE "ARM LASER" "ARM LASER" HAZARDOUS "Arming the laser poses an eye safety hazard so anyone without laser safety training needs to leave."
     STATE "FIRE LASER" "FIRE LASER" HAZARDOUS "WARNING Laser will be fired!"
   APPEND_PARAMETER BINARY 32 STRING 0xDEADBEEF "Binary string"
-  APPEND_PARAMETER STRING 80 STRING "0xDEADBEEF" "ASCII string"
+  APPEND_PARAMETER ASCII 80 STRING "0xDEADBEEF" "ASCII string"
 
 COMMAND INST FLTCMD BIG_ENDIAN "Command with float parameters"
   <%= render "_ccsds_cmd.txt", locals: {id: 6} %>

data/demo/config/targets/INST/cmd_tlm/inst_tlm.txt

@@ -139,7 +139,10 @@ TELEMETRY INST PARAMS BIG_ENDIAN "Params set by SETPARAMS command"
 
 TELEMETRY INST IMAGE BIG_ENDIAN "Packet with image data"
   <%= render "_ccsds_tlm.txt", locals: {apid: 4} %>
+  ITEM BYTES 128 32 UINT "First bytes"
+    FORMAT_STRING '0x%08x'
   ITEM IMAGE 128 131072 BLOCK   "10x10 Image Data"
+    OVERLAP # Notify COSMOS that this is intentionally overlapping the BYTES field
   ITEM TIMESECONDS 0 0 DERIVED "Derived floating-point time since epoch in seconds"
     READ_CONVERSION unix_time_seconds_conversion.rb TIMESEC TIMEUS
     FORMAT_STRING '%0.6f'
@@ -148,6 +151,7 @@ TELEMETRY INST IMAGE BIG_ENDIAN "Packet with image data"
 
 TELEMETRY INST MECH BIG_ENDIAN "Mechanism status"
   <%= render "_ccsds_tlm.txt", locals: {apid: 5} %>
+  APPEND_ITEM EXTRA         32 FLOAT    "Extra item to be deleted"
   APPEND_ITEM SLRPNL1       32 FLOAT    "Solar panel 1 angle"
     UNITS DEGREES DEG
   APPEND_ITEM SLRPNL2       32 FLOAT    "Solar panel 2 angle"

data/demo/config/targets/INST/cmd_tlm/inst_tlm_override.txt

@@ -0,0 +1,12 @@
+# NOTE: Telemetry definitions are processed in alphabetical order by default.
+#   However, this can be overridden by explicitly calling them out in target.txt.
+#   Thus it's recommended to create a file like this with an extension
+#   such as inst_tlm_override.txt which will be processed AFTER inst_tlm.txt.
+
+# Existing telemetry packets can be selected and items modified
+SELECT_TELEMETRY INST MECH
+  # Existing items can be selected and modified by adding conversions, limits, etc
+  SELECT_ITEM SLRPNL1
+    LIMITS DEFAULT 1 ENABLED -180.0 -170.0 170.0 180.0
+  # Delete an item so it doesn't appear in the packet
+  DELETE_ITEM EXTRA

data/demo/config/targets/INST/lib/sim_inst.rb

@@ -304,8 +304,8 @@ module Cosmos
           # Create an Array the size of the packet and then initialize
           # using a sample of all possible hex values (0..15)
           # finally pack it into binary using the Character 'C' specifier
-          data = Array.new(packet.length) { Array(0..15).sample }.pack("C*")
-          packet.buffer = data
+          data = Array.new(packet.image.length) { Array(0..15).sample }.pack("C*")
+          packet.image = data
           packet.ccsdsseqcnt += 1
 
         when 'MECH'

data/demo/config/targets/INST/target.txt

@@ -32,6 +32,7 @@ IGNORE_ITEM RECEIVED_TIMEFORMATTED
 # alphabetical order
 COMMANDS inst_cmds.txt
 TELEMETRY inst_tlm.txt
+TELEMETRY inst_tlm_override.txt
 
 # Automatically substitute the target name in screen definitions
 AUTO_SCREEN_SUBSTITUTE

data/demo/config/tools/handbook_creator/default_toc.xsl

@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
-                xmlns="http://www.w3.org/1999/xhtml">
-  <xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-              indent="yes" />
-  <xsl:template match="outline:outline">
-    <html>
-      <head>
-        <title>Table of Contents</title>
-        <style>
-          h1 {
-            text-align: center;
-            font-size: 20px;
-            font-family: arial;
-          }
-          div {border-bottom: 1px dashed rgb(200,200,200);}
-          span {float: right;}
-          li {list-style: none;}
-          ul {
-            font-size: 20px;
-            font-family: arial;
-          }
-          ul ul {font-size: 80%; }
-          ul {padding-left: 0em;}
-          ul ul {padding-left: 1em;}
-          a {text-decoration:none; color: black;}
-        </style>
-      </head>
-      <body>
-        <h1>Table of Contents</h1>
-        <ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
-      </body>
-    </html>
-  </xsl:template>
-  <xsl:template match="outline:item">
-    <li>
-      <xsl:if test="@title!=''">
-        <div>
-          <a>
-            <xsl:if test="@link">
-              <xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
-            </xsl:if>
-            <xsl:if test="@backLink">
-              <xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="@title" /> 
-          </a>
-          <span> <xsl:value-of select="@page" /> </span>
-        </div>
-      </xsl:if>
-      <ul>
-        <xsl:apply-templates select="outline:item"/>
-      </ul>
-    </li>
-  </xsl:template>
-</xsl:stylesheet>
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
+                xmlns="http://www.w3.org/1999/xhtml">
+  <xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+              indent="yes" />
+  <xsl:template match="outline:outline">
+    <html>
+      <head>
+        <title>Table of Contents</title>
+        <style>
+          h1 {
+            text-align: center;
+            font-size: 20px;
+            font-family: arial;
+          }
+          div {border-bottom: 1px dashed rgb(200,200,200);}
+          span {float: right;}
+          li {list-style: none;}
+          ul {
+            font-size: 20px;
+            font-family: arial;
+          }
+          ul ul {font-size: 80%; }
+          ul {padding-left: 0em;}
+          ul ul {padding-left: 1em;}
+          a {text-decoration:none; color: black;}
+        </style>
+      </head>
+      <body>
+        <h1>Table of Contents</h1>
+        <ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
+      </body>
+    </html>
+  </xsl:template>
+  <xsl:template match="outline:item">
+    <li>
+      <xsl:if test="@title!=''">
+        <div>
+          <a>
+            <xsl:if test="@link">
+              <xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
+            </xsl:if>
+            <xsl:if test="@backLink">
+              <xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
+            </xsl:if>
+            <xsl:value-of select="@title" />
+          </a>
+          <span> <xsl:value-of select="@page" /> </span>
+        </div>
+      </xsl:if>
+      <ul>
+        <xsl:apply-templates select="outline:item"/>
+      </ul>
+    </li>
+  </xsl:template>
+</xsl:stylesheet>

data/demo/procedures/cosmos_api_test.rb

@@ -184,14 +184,14 @@ get_cmd_param_list("INST", "BOB")
 get_cmd_param_list("INST", "COLLECT", "DURATION")
 
 # get_cmd_hazardous
-hazardous, hazardous_description = get_cmd_hazardous("INST", "COLLECT", "TYPE" => "SPECIAL")
-puts "#{hazardous}:#{hazardous_description}"
-hazardous, hazardous_description = get_cmd_hazardous("INST", "COLLECT", "TYPE" => "NORMAL")
-puts "#{hazardous}:#{hazardous_description}"
-hazardous, hazardous_description = get_cmd_hazardous("INST", "ABORT")
-puts "#{hazardous}:#{hazardous_description}"
-hazardous, hazardous_description = get_cmd_hazardous("INST", "CLEAR")
-puts "#{hazardous}:#{hazardous_description}"
+hazardous = get_cmd_hazardous("INST", "COLLECT", "TYPE" => "SPECIAL")
+puts hazardous
+hazardous = get_cmd_hazardous("INST", "COLLECT", "TYPE" => "NORMAL")
+puts hazardous
+hazardous = get_cmd_hazardous("INST", "ABORT")
+puts hazardous
+hazardous = get_cmd_hazardous("INST", "CLEAR")
+puts hazardous
 
 # get_cmd_hazardous should fail
 get_cmd_hazardous()

data/ext/cosmos/ext/buffered_file/buffered_file.c

@@ -56,7 +56,7 @@ static VALUE buffered_file_read(VALUE self, VALUE arg_length) {
         rb_funcall(buffer, id_method_slice_bang, 1, rb_range_new(INT2FIX(0), INT2FIX(buffer_index - 1), Qfalse));
         buffer_length = RSTRING_LEN(buffer);
         buffer_index = 0;
-        rb_ivar_set(self, id_ivar_buffer_index, INT2FIX(0));
+        rb_ivar_set(self, id_ivar_buffer_index, INT2FIX(buffer_index));
       }
       super_arg = INT2FIX(length - buffer_length);
       rb_str_append(buffer, rb_funcall(rb_call_super(1, (VALUE*) &super_arg), id_method_to_s, 0));
@@ -70,7 +70,7 @@ static VALUE buffered_file_read(VALUE self, VALUE arg_length) {
       rb_funcall(buffer, id_method_slice_bang, 1, rb_range_new(INT2FIX(0), INT2FIX(buffer_index - 1), Qfalse));
       buffer_length = RSTRING_LEN(buffer);
       buffer_index = 0;
-      rb_ivar_set(self, id_ivar_buffer_index, INT2FIX(0));
+      rb_ivar_set(self, id_ivar_buffer_index, INT2FIX(buffer_index));
     }
     super_arg = INT2FIX(BUFFER_SIZE - buffer_length);
     rb_str_append(buffer, rb_funcall(rb_call_super(1, (VALUE*) &super_arg), id_method_to_s, 0));

data/ext/cosmos/ext/config_parser/config_parser.c

@@ -74,7 +74,6 @@ static VALUE parse_loop(VALUE self, VALUE io, VALUE yield_non_keyword_lines, VAL
   int result = 0;
   long length = 0;
   int index = 0;
-  double float_pos = 0.0;
   double float_size = NUM2DBL(size);
   volatile VALUE progress_callback = rb_cvar_get(cConfigParser, id_cvar_progress_callback);
   volatile VALUE line = Qnil;
@@ -98,7 +97,7 @@ static VALUE parse_loop(VALUE self, VALUE io, VALUE yield_non_keyword_lines, VAL
 
     if (RTEST(progress_callback) && ((line_number % 10) == 0)) {
       if (float_size > 0.0) {
-        float_pos = NUM2DBL(rb_funcall(io, id_method_pos, 0));
+        double float_pos = NUM2DBL(rb_funcall(io, id_method_pos, 0));
         rb_funcall(progress_callback, id_method_call, 1, rb_float_new(float_pos / float_size));
       }
     }

data/ext/cosmos/ext/line_graph/line_graph.c

@@ -95,8 +95,6 @@ static VALUE line_clip_internal(double x0, double y0, double x1, double y1, doub
   volatile VALUE done = Qfalse;
   volatile VALUE clipped0 = Qfalse;
   volatile VALUE clipped1 = Qfalse;
-  double x = 0.0;
-  double y = 0.0;
 
   code0 = cal_code(x0, y0, xmin, ymin, xmax, ymax);
   code1 = cal_code(x1, y1, xmin, ymin, xmax, ymax);
@@ -117,8 +115,8 @@ static VALUE line_clip_internal(double x0, double y0, double x1, double y1, doub
     } else {
       /* Part of the line is inside the viewable area.  Figure out which part
        * of the line can be drawn. */
-      x = 0.0;
-      y = 0.0;
+      double x;
+      double y;
 
       if (code0 != 0) {
         codeout = code0;
@@ -178,28 +176,19 @@ static VALUE line_clip(VALUE self, VALUE x0, VALUE y0, VALUE x1, VALUE y1, VALUE
   volatile VALUE result_clipped0 = Qnil;
   volatile VALUE result_clipped1 = Qnil;
   volatile VALUE return_value = Qnil;
-  double double_x0 = 0.0;
-  double double_y0 = 0.0;
-  double double_x1 = 0.0;
-  double double_y1 = 0.0;
-  double double_xmin = 0.0;
-  double double_ymin = 0.0;
-  double double_xmax = 0.0;
-  double double_ymax = 0.0;
+  double double_x0 = RFLOAT_VALUE(rb_funcall(x0, id_method_to_f, 0));
+  double double_y0 = RFLOAT_VALUE(rb_funcall(y0, id_method_to_f, 0));
+  double double_x1 = RFLOAT_VALUE(rb_funcall(x1, id_method_to_f, 0));
+  double double_y1 = RFLOAT_VALUE(rb_funcall(y1, id_method_to_f, 0));
+  double double_xmin = RFLOAT_VALUE(rb_funcall(xmin, id_method_to_f, 0));
+  double double_ymin = RFLOAT_VALUE(rb_funcall(ymin, id_method_to_f, 0));
+  double double_xmax = RFLOAT_VALUE(rb_funcall(xmax, id_method_to_f, 0));
+  double double_ymax = RFLOAT_VALUE(rb_funcall(ymax, id_method_to_f, 0));
   double result_x0 = 0.0;
   double result_y0 = 0.0;
   double result_x1 = 0.0;
   double result_y1 = 0.0;
 
-  double_x0 = RFLOAT_VALUE(rb_funcall(x0, id_method_to_f, 0));
-  double_y0 = RFLOAT_VALUE(rb_funcall(y0, id_method_to_f, 0));
-  double_x1 = RFLOAT_VALUE(rb_funcall(x1, id_method_to_f, 0));
-  double_y1 = RFLOAT_VALUE(rb_funcall(y1, id_method_to_f, 0));
-  double_xmin = RFLOAT_VALUE(rb_funcall(xmin, id_method_to_f, 0));
-  double_ymin = RFLOAT_VALUE(rb_funcall(ymin, id_method_to_f, 0));
-  double_xmax = RFLOAT_VALUE(rb_funcall(xmax, id_method_to_f, 0));
-  double_ymax = RFLOAT_VALUE(rb_funcall(ymax, id_method_to_f, 0));
-
   result = line_clip_internal(double_x0, double_y0, double_x1, double_y1, double_xmin, double_ymin, double_xmax, double_ymax, &result_x0, &result_y0, &result_x1, &result_y1, &result_clipped0, &result_clipped1);
 
   if (result == Qtrue)
@@ -236,10 +225,8 @@ static long scale_value_to_graph_y_internal (double y, double y_max, double y_sc
 static VALUE scale_value_to_graph_y(int argc, VALUE* argv, VALUE self) {
   volatile VALUE y = Qnil;
   ID id_axis = 0;
-  long long_graph_top_y = 0;
-  double double_y = 0.0;
-  double double_y_max = 0.0;
-  double double_y_scale = 0.0;
+  double double_y_max;
+  double double_y_scale;
 
   switch (argc) {
     case 1:
@@ -256,8 +243,8 @@ static VALUE scale_value_to_graph_y(int argc, VALUE* argv, VALUE self) {
       break;
   };
 
-  long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
-  double_y = RFLOAT_VALUE(rb_funcall(y, id_method_to_f, 0));
+  long long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
+  double double_y = RFLOAT_VALUE(rb_funcall(y, id_method_to_f, 0));
 
   if (id_axis == id_LEFT) {
     double_y_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_left_y_max),   id_method_to_f, 0));
@@ -281,15 +268,10 @@ static long scale_value_to_graph_x_internal (double x, double x_min, double x_sc
  * This function converts an x value to an x coordinate on the graph
  */
 static VALUE scale_value_to_graph_x(VALUE self, VALUE x) {
-  long long_graph_left_x = 0;
-  double double_x = 0.0;
-  double double_x_min = 0.0;
-  double double_x_scale = 0.0;
-
-  long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
-  double_x = RFLOAT_VALUE(rb_funcall(x, id_method_to_f, 0));
-  double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
-  double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
+  long long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
+  double double_x = RFLOAT_VALUE(rb_funcall(x, id_method_to_f, 0));
+  double double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
+  double double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
 
   return INT2FIX(scale_value_to_graph_x_internal(double_x, double_x_min, double_x_scale, long_graph_left_x));
 }
@@ -301,10 +283,6 @@ static void draw_line_internal(VALUE dc, double x1, double y1, double x2, double
   volatile VALUE result = Qnil;
   volatile VALUE clipped1 = Qnil;
   volatile VALUE clipped2 = Qnil;
-  long x1_scaled = 0;
-  long y1_scaled = 0;
-  long x2_scaled = 0;
-  long y2_scaled = 0;
   double clipped_x1 = 0.0;
   double clipped_y1 = 0.0;
   double clipped_x2 = 0.0;
@@ -315,10 +293,10 @@ static void draw_line_internal(VALUE dc, double x1, double y1, double x2, double
 
   if (result == Qtrue) /* Line is visible so draw it */ {
     /* Scale to graph coordinates */
-    x1_scaled = scale_value_to_graph_x_internal(clipped_x1, x_min, x_scale, graph_left_x);
-    y1_scaled = scale_value_to_graph_y_internal(clipped_y1, y_max, y_scale, graph_top_y);
-    x2_scaled = scale_value_to_graph_x_internal(clipped_x2, x_min, x_scale, graph_left_x);
-    y2_scaled = scale_value_to_graph_y_internal(clipped_y2, y_max, y_scale, graph_top_y);
+    double x1_scaled = scale_value_to_graph_x_internal(clipped_x1, x_min, x_scale, graph_left_x);
+    double y1_scaled = scale_value_to_graph_y_internal(clipped_y1, y_max, y_scale, graph_top_y);
+    double x2_scaled = scale_value_to_graph_x_internal(clipped_x2, x_min, x_scale, graph_left_x);
+    double y2_scaled = scale_value_to_graph_y_internal(clipped_y2, y_max, y_scale, graph_top_y);
 
     /* Draw the line */
     if (RTEST(show_line)) {
@@ -339,30 +317,20 @@ static void draw_line_internal(VALUE dc, double x1, double y1, double x2, double
  * Draws a line between two points that is clipped to fit the visible graph if necessary
  */
 static VALUE draw_line(VALUE self, VALUE dc, VALUE x1, VALUE y1, VALUE x2, VALUE y2, VALUE show_line, VALUE point_size, VALUE axis, VALUE color) {
-  long long_graph_left_x = 0;
-  long long_graph_top_y = 0;
-  ID id_axis = 0;
-  double double_x1 = 0.0;
-  double double_y1 = 0.0;
-  double double_x2 = 0.0;
-  double double_y2 = 0.0;
-  double double_x_min = 0.0;
-  double double_y_min = 0.0;
-  double double_x_max = 0.0;
-  double double_y_max = 0.0;
-  double double_x_scale = 0.0;
-  double double_y_scale = 0.0;
-
-  id_axis = SYM2ID(axis);
-  double_x_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_max), id_method_to_f, 0));
-  double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
-  double_x1 = RFLOAT_VALUE(rb_funcall(x1, id_method_to_f, 0));
-  double_y1 = RFLOAT_VALUE(rb_funcall(y1, id_method_to_f, 0));
-  double_x2 = RFLOAT_VALUE(rb_funcall(x2, id_method_to_f, 0));
-  double_y2 = RFLOAT_VALUE(rb_funcall(y2, id_method_to_f, 0));
-  double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
-  long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
-  long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
+  double double_y_min;
+  double double_y_max;
+  double double_y_scale;
+
+  ID id_axis = SYM2ID(axis);
+  double double_x_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_max), id_method_to_f, 0));
+  double double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
+  double double_x1 = RFLOAT_VALUE(rb_funcall(x1, id_method_to_f, 0));
+  double double_y1 = RFLOAT_VALUE(rb_funcall(y1, id_method_to_f, 0));
+  double double_x2 = RFLOAT_VALUE(rb_funcall(x2, id_method_to_f, 0));
+  double double_y2 = RFLOAT_VALUE(rb_funcall(y2, id_method_to_f, 0));
+  double double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
+  long long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
+  long long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
 
   if (id_axis == id_LEFT) {
     double_y_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_left_y_max), id_method_to_f, 0));
@@ -383,37 +351,28 @@ static VALUE draw_line(VALUE self, VALUE dc, VALUE x1, VALUE y1, VALUE x2, VALUE
  * Draws all lines for the given axis
  */
 static VALUE draw_lines (VALUE self, VALUE dc, VALUE axis) {
-  long long_graph_left_x = 0;
-  long long_graph_top_y = 0;
-  long num_lines = 0;
   long line_index = 0;
   long line_length = 0;
   long point_index = 0;
-  ID id_axis = 0;
   volatile VALUE lines = Qnil;
   volatile VALUE line = Qnil;
   volatile VALUE x_values = Qnil;
   volatile VALUE y_values = Qnil;
   volatile VALUE color = Qnil;
-  volatile VALUE show_lines = Qnil;
-  volatile VALUE point_size = Qnil;
-  double double_x1 = 0.0;
-  double double_y1 = 0.0;
-  double double_x2 = 0.0;
-  double double_y2 = 0.0;
-  double double_x_min = 0.0;
-  double double_y_min = 0.0;
-  double double_x_max = 0.0;
-  double double_y_max = 0.0;
-  double double_x_scale = 0.0;
-  double double_y_scale = 0.0;
-
-  id_axis = SYM2ID(axis);
-  double_x_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_max), id_method_to_f, 0));
-  double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
-  double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
-  long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
-  long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
+  double double_x1;
+  double double_y1;
+  double double_x2;
+  double double_y2;
+  double double_y_min;
+  double double_y_max;
+  double double_y_scale;
+
+  ID id_axis = SYM2ID(axis);
+  double double_x_max = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_max), id_method_to_f, 0));
+  double double_x_min = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_min), id_method_to_f, 0));
+  double double_x_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_x_scale), id_method_to_f, 0));
+  long long_graph_left_x = FIX2INT(rb_ivar_get(self, id_ivar_graph_left_x));
+  long long_graph_top_y = FIX2INT(rb_ivar_get(self, id_ivar_graph_top_y));
 
   if (id_axis == id_LEFT) {
     lines = rb_funcall(rb_ivar_get(self, id_ivar_lines), id_method_left, 0);
@@ -427,10 +386,10 @@ static VALUE draw_lines (VALUE self, VALUE dc, VALUE axis) {
     double_y_scale = RFLOAT_VALUE(rb_funcall(rb_ivar_get(self, id_ivar_right_y_scale), id_method_to_f, 0));
   }
 
-  show_lines = rb_ivar_get(self, id_ivar_show_lines);
-  point_size = rb_ivar_get(self, id_ivar_point_size);
+  volatile VALUE show_lines = rb_ivar_get(self, id_ivar_show_lines);
+  volatile VALUE point_size = rb_ivar_get(self, id_ivar_point_size);
 
-  num_lines = RARRAY_LEN(lines);
+  long num_lines = RARRAY_LEN(lines);
   for (line_index = 0; line_index < num_lines; line_index++) {
     line = rb_ary_entry(lines, line_index);
     x_values = rb_ary_entry(line, 0);