cosmos 3.6.3 → 3.7.0

data/ext/cosmos/ext/low_fragmentation_array/low_fragmentation_array.c

@@ -89,7 +89,7 @@ static VALUE my_ary_alloc (VALUE klass)
  */
 static VALUE my_ary_new (VALUE klass, long capa)
 {
-  VALUE ary;
+  volatile VALUE ary;
 
   if (capa < 0)
   {
@@ -126,8 +126,8 @@ static VALUE initialize (VALUE self, VALUE size)
  */
 static VALUE my_ary_subseq (VALUE ary, long beg, long len)
 {
-  VALUE klass = Qnil;
-  VALUE ary2  = Qnil;
+  volatile VALUE klass = Qnil;
+  volatile VALUE ary2  = Qnil;
 
   if (beg > RARRAY_LEN(ary))
   {
@@ -162,7 +162,7 @@ static VALUE my_ary_subseq (VALUE ary, long beg, long len)
  */
 static VALUE ary_aref(int argc, VALUE *argv, VALUE ary)
 {
-  VALUE arg;
+  volatile VALUE arg;
   long beg, len;
 
   if (argc == 2)

data/ext/cosmos/ext/packet/packet.c

@@ -44,15 +44,13 @@ static ID id_ivar_target_name = 0;
 static ID id_ivar_packet_name = 0;
 static ID id_ivar_description = 0;
 
-static ID id_const_ASCII_8BIT_STRING = 0;
-
 /* Wraps read_item_internal so that it can be called by rb_protect in protected_read_item_internal */
 static VALUE wrap_read_item_internal(VALUE args)
 {
-  VALUE *values = (VALUE *)args;
-  VALUE self = values[0];
-  VALUE item = values[1];
-  VALUE buffer = values[2];
+  volatile VALUE *values = (VALUE *)args;
+  volatile VALUE self = values[0];
+  volatile VALUE item = values[1];
+  volatile VALUE buffer = values[2];
   return read_item_internal(self, item, buffer);
 }
 
@@ -60,8 +58,8 @@ static VALUE wrap_read_item_internal(VALUE args)
 static VALUE protected_read_item_internal(VALUE self, VALUE item, VALUE buffer)
 {
   int error = 0;
-  VALUE result = Qnil;
-  VALUE args[3];
+  volatile VALUE result = Qnil;
+  volatile VALUE args[3];
 
   args[0] = self;
   args[1] = item;
@@ -91,10 +89,10 @@ static VALUE protected_read_item_internal(VALUE self, VALUE item, VALUE buffer)
  */
 static VALUE identify(VALUE self, VALUE buffer)
 {
-  VALUE id_items = rb_ivar_get(self, id_ivar_id_items);
-  VALUE item = Qnil;
-  VALUE id_value = Qnil;
-  VALUE raw_value = Qnil;
+  volatile VALUE id_items = rb_ivar_get(self, id_ivar_id_items);
+  volatile VALUE item = Qnil;
+  volatile VALUE id_value = Qnil;
+  volatile VALUE raw_value = Qnil;
   long id_items_length = 0;
   int index = 0;
 
@@ -205,13 +203,13 @@ static VALUE received_count_equals(VALUE self, VALUE received_count) {
  *   subclass of PacketItem)
  */
 static VALUE packet_initialize(int argc, VALUE* argv, VALUE self) {
-  VALUE target_name = Qnil;
-  VALUE packet_name = Qnil;
-  VALUE default_endianness = Qnil;
-  VALUE description = Qnil;
-  VALUE buffer = Qnil;
-  VALUE item_class = Qnil;
-  VALUE super_args[3] = {Qnil, Qnil, Qnil};
+  volatile VALUE target_name = Qnil;
+  volatile VALUE packet_name = Qnil;
+  volatile VALUE default_endianness = Qnil;
+  volatile VALUE description = Qnil;
+  volatile VALUE buffer = Qnil;
+  volatile VALUE item_class = Qnil;
+  volatile VALUE super_args[3] = {Qnil, Qnil, Qnil};
 
   switch (argc)
   {
@@ -264,7 +262,7 @@ static VALUE packet_initialize(int argc, VALUE* argv, VALUE self) {
   super_args[0] = default_endianness;
   super_args[1] = buffer;
   super_args[2] = item_class;
-  rb_call_super(3, super_args);
+  rb_call_super(3, (VALUE*) super_args);
   target_name_equals(self, target_name);
   packet_name_equals(self, packet_name);
   description_equals(self, description);
@@ -302,8 +300,6 @@ void Init_packet (void)
   id_method_upcase = rb_intern("upcase");
   id_method_clone = rb_intern("clone");
 
-  id_const_ASCII_8BIT_STRING = rb_intern("ASCII_8BIT_STRING");
-
   id_ivar_id_items = rb_intern("@id_items");
   id_ivar_id_value = rb_intern("@id_value");
   id_ivar_received_time = rb_intern("@received_time");
@@ -326,7 +322,6 @@ void Init_packet (void)
   id_ivar_description = rb_intern("@description");
 
   cPacket = rb_define_class_under(mCosmos, "Packet", cStructure);
-  rb_const_set(cPacket, id_const_ASCII_8BIT_STRING, ASCII_8BIT_STRING);
   rb_define_method(cPacket, "initialize", packet_initialize, -1);
   rb_define_method(cPacket, "identify?", identify, 1);
   rb_define_method(cPacket, "packet_name=", packet_name_equals, 1);

data/ext/cosmos/ext/platform/platform.c

@@ -69,7 +69,7 @@ static VALUE segfault(VALUE self) {
  */
 void Init_platform (void) {
 #ifdef _WIN32
-  VALUE ruby_version = rb_const_get(rb_cObject, rb_intern("RUBY_VERSION"));
+  volatile VALUE ruby_version = rb_const_get(rb_cObject, rb_intern("RUBY_VERSION"));
   char* rversion = RSTRING_PTR(ruby_version);
 
 #if __x86_64__

data/ext/cosmos/ext/polynomial_conversion/polynomial_conversion.c

@@ -30,7 +30,7 @@ static ID id_method_to_f = 0;
  */
 static VALUE polynomial_conversion_call(VALUE self, VALUE value, VALUE myself, VALUE buffer)
 {
-  VALUE coeffs = Qnil;
+  volatile VALUE coeffs = Qnil;
   long coeffs_length = 0;
   int index = 0;
   double double_value = 0.0;

data/ext/cosmos/ext/structure/structure.c

@@ -65,6 +65,7 @@ static ID id_ivar_fixed_size = 0;
 static ID id_ivar_short_buffer_allowed = 0;
 static ID id_ivar_mutex = 0;
 
+static ID id_const_ASCII_8BIT_STRING = 0;
 static ID id_const_ZERO_STRING = 0;
 
 static VALUE symbol_LITTLE_ENDIAN = Qnil;
@@ -453,8 +454,8 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
   int num_words = 0;
   int upper_bound = 0;
   int lower_bound = 0;
-  VALUE temp_value = Qnil;
-  VALUE return_value = Qnil;
+  volatile VALUE temp_value = Qnil;
+  volatile VALUE return_value = Qnil;
 
   unsigned char* buffer = NULL;
   long buffer_length = 0;
@@ -712,9 +713,9 @@ static VALUE binary_accessor_read(VALUE self, VALUE param_bit_offset, VALUE para
 
 static VALUE check_overflow(VALUE value, int bit_size, VALUE data_type, VALUE overflow)
 {
-  VALUE hex_max_value = Qnil;
-  VALUE max_value = Qnil;
-  VALUE min_value = INT2NUM(0); /* Default for UINT cases */
+  volatile VALUE hex_max_value = Qnil;
+  volatile VALUE max_value = Qnil;
+  volatile VALUE min_value = INT2NUM(0); /* Default for UINT cases */
 
   switch (bit_size) {
     case 8:
@@ -845,9 +846,9 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
   unsigned char* buffer = NULL;
   long buffer_length = 0;
   long value_length = 0;
-  VALUE temp_shift = Qnil;
-  VALUE temp_mask = Qnil;
-  VALUE temp_result = Qnil;
+  volatile VALUE temp_shift = Qnil;
+  volatile VALUE temp_mask = Qnil;
+  volatile VALUE temp_result = Qnil;
 
   int string_length = 0;
   unsigned char* unsigned_char_array = NULL;
@@ -1099,7 +1100,7 @@ static VALUE binary_accessor_write(VALUE self, VALUE value, VALUE param_bit_offs
  */
 static int get_int_length(VALUE self)
 {
-  VALUE buffer = rb_ivar_get(self, id_ivar_buffer);
+  volatile VALUE buffer = rb_ivar_get(self, id_ivar_buffer);
   if (RTEST(buffer)) {
     return (int)RSTRING_LEN(buffer);
   } else {
@@ -1117,11 +1118,11 @@ static VALUE structure_length(VALUE self) {
 }
 
 static VALUE read_item_internal(VALUE self, VALUE item, VALUE buffer) {
-  VALUE bit_offset = Qnil;
-  VALUE bit_size = Qnil;
-  VALUE data_type = Qnil;
-  VALUE array_size = Qnil;
-  VALUE endianness = Qnil;
+  volatile VALUE bit_offset = Qnil;
+  volatile VALUE bit_size = Qnil;
+  volatile VALUE data_type = Qnil;
+  volatile VALUE array_size = Qnil;
+  volatile VALUE endianness = Qnil;
 
   data_type = rb_ivar_get(item, id_ivar_data_type);
   if (data_type == symbol_DERIVED) {
@@ -1155,8 +1156,8 @@ static VALUE read_item_internal(VALUE self, VALUE item, VALUE buffer) {
  */
 static VALUE read_item(int argc, VALUE* argv, VALUE self)
 {
-  VALUE item = Qnil;
-  VALUE buffer = Qnil;
+  volatile VALUE item = Qnil;
+  volatile VALUE buffer = Qnil;
 
   switch (argc)
   {
@@ -1237,9 +1238,9 @@ static VALUE structure_item_spaceship(VALUE self, VALUE other_item) {
  *   Must be StructureItem or one of its subclasses.
  */
 static VALUE structure_initialize(int argc, VALUE* argv, VALUE self) {
-  VALUE default_endianness = Qnil;
-  VALUE buffer = Qnil;
-  VALUE item_class = Qnil;
+  volatile VALUE default_endianness = Qnil;
+  volatile VALUE buffer = Qnil;
+  volatile VALUE item_class = Qnil;
 
   switch (argc)
   {
@@ -1300,9 +1301,9 @@ static VALUE structure_initialize(int argc, VALUE* argv, VALUE self) {
  */
 static VALUE resize_buffer(VALUE self)
 {
-  VALUE buffer = rb_ivar_get(self, id_ivar_buffer);
+  volatile VALUE buffer = rb_ivar_get(self, id_ivar_buffer);
   if (RTEST(buffer)) {
-    VALUE value_defined_length = rb_ivar_get(self, id_ivar_defined_length);
+    volatile VALUE value_defined_length = rb_ivar_get(self, id_ivar_defined_length);
     long defined_length = FIX2INT(value_defined_length);
     long current_length = RSTRING_LEN(buffer);
 
@@ -1322,6 +1323,8 @@ static VALUE resize_buffer(VALUE self)
 void Init_structure (void)
 {
   int zero = 0;
+  volatile VALUE zero_string = Qnil;
+  volatile VALUE ascii_8bit_string = Qnil;
 
   mCosmos = rb_define_module("Cosmos");
   cBinaryAccessor = rb_define_class_under(mCosmos, "BinaryAccessor", rb_cObject);
@@ -1336,13 +1339,6 @@ void Init_structure (void)
   id_method_Integer = rb_intern("Integer");
   id_method_Float = rb_intern("Float");
 
-  ASCII_8BIT_STRING = rb_str_new2("ASCII-8BIT");
-  rb_funcall(ASCII_8BIT_STRING, id_method_freeze, 0);
-
-  ZERO_STRING = rb_str_new((char*) &zero, 1);
-  rb_funcall(ZERO_STRING, id_method_freeze, 0);
-  id_const_ZERO_STRING = rb_intern("ZERO_STRING");
-
   MIN_INT8 = INT2NUM(-128);
   MAX_INT8 = INT2NUM(127);
   MAX_UINT8 = INT2NUM(255);
@@ -1417,7 +1413,16 @@ void Init_structure (void)
   rb_define_singleton_method(cBinaryAccessor, "write", binary_accessor_write, 7);
 
   cStructure = rb_define_class_under(mCosmos, "Structure", rb_cObject);
-  rb_const_set(cStructure, id_const_ZERO_STRING, ZERO_STRING);
+  id_const_ZERO_STRING = rb_intern("ZERO_STRING");
+  zero_string = rb_str_new((char*) &zero, 1);
+  rb_funcall(zero_string, id_method_freeze, 0);
+  rb_const_set(cStructure, id_const_ZERO_STRING, zero_string);
+  ZERO_STRING = rb_const_get(cStructure, id_const_ZERO_STRING);
+  id_const_ASCII_8BIT_STRING = rb_intern("ASCII_8BIT_STRING");
+  ascii_8bit_string = rb_str_new2("ASCII-8BIT");
+  rb_funcall(ascii_8bit_string, id_method_freeze, 0);
+  rb_const_set(cStructure, id_const_ASCII_8BIT_STRING, ascii_8bit_string);
+  ASCII_8BIT_STRING = rb_const_get(cStructure, id_const_ASCII_8BIT_STRING);
   rb_define_method(cStructure, "initialize", structure_initialize, -1);
   rb_define_method(cStructure, "length", structure_length, 0);
   rb_define_method(cStructure, "read_item", read_item, -1);

data/ext/cosmos/ext/tabbed_plots_config/tabbed_plots_config.c

@@ -23,7 +23,7 @@ static VALUE process_packet_in_each_data_object (VALUE self, VALUE data_objects,
 {
   int index = 0;
   long length = 0;
-  VALUE data_object = Qnil;
+  volatile VALUE data_object = Qnil;
 
   length = RARRAY_LEN(data_objects);
   if (length > 0)

data/ext/cosmos/ext/telemetry/telemetry.c

@@ -35,9 +35,9 @@ static VALUE symbol_CONVERTED = Qnil;
  *  target name keyed by the packet name
  */
 static VALUE packets(VALUE self, VALUE target_name) {
-  VALUE target_packets = Qnil;
-  VALUE upcase_target_name = Qnil;
-  VALUE telemetry = Qnil;
+  volatile VALUE target_packets = Qnil;
+  volatile VALUE upcase_target_name = Qnil;
+  volatile VALUE telemetry = Qnil;
 
   upcase_target_name = rb_funcall(target_name, id_method_to_s, 0);
   upcase_target_name = rb_funcall(upcase_target_name, id_method_upcase, 0);
@@ -59,10 +59,10 @@ static VALUE packets(VALUE self, VALUE target_name) {
  */
 static VALUE packet(VALUE self, VALUE target_name, VALUE packet_name)
 {
-  VALUE packet = Qnil;
-  VALUE target_packets = Qnil;
-  VALUE upcase_target_name = Qnil;
-  VALUE upcase_packet_name = Qnil;
+  volatile VALUE packet = Qnil;
+  volatile VALUE target_packets = Qnil;
+  volatile VALUE upcase_target_name = Qnil;
+  volatile VALUE upcase_packet_name = Qnil;
 
   target_packets = packets(self, target_name);
 
@@ -89,10 +89,10 @@ static VALUE packet(VALUE self, VALUE target_name, VALUE packet_name)
  */
 static VALUE packet_and_item(VALUE self, VALUE target_name, VALUE packet_name, VALUE item_name)
 {
-  VALUE upcase_packet_name = Qnil;
-  VALUE return_packet = Qnil;
-  VALUE item = Qnil;
-  VALUE return_value = Qnil;
+  volatile VALUE upcase_packet_name = Qnil;
+  volatile VALUE return_packet = Qnil;
+  volatile VALUE item = Qnil;
+  volatile VALUE return_value = Qnil;
   char * string_packet_name = NULL;
 
   upcase_packet_name = rb_funcall(packet_name, id_method_upcase, 0);
@@ -128,12 +128,12 @@ static VALUE packet_and_item(VALUE self, VALUE target_name, VALUE packet_name, V
  */
 static VALUE value(int argc, VALUE* argv, VALUE self)
 {
-  VALUE target_name = Qnil;
-  VALUE packet_name = Qnil;
-  VALUE item_name = Qnil;
-  VALUE value_type = Qnil;
-  VALUE result = Qnil;
-  VALUE packet = Qnil;
+  volatile VALUE target_name = Qnil;
+  volatile VALUE packet_name = Qnil;
+  volatile VALUE item_name = Qnil;
+  volatile VALUE value_type = Qnil;
+  volatile VALUE result = Qnil;
+  volatile VALUE packet = Qnil;
 
   switch (argc)
   {
@@ -176,22 +176,22 @@ static VALUE value(int argc, VALUE* argv, VALUE self)
  *   red, yellow, and green (if given) limits values.
  */
 static VALUE values_and_limits_states(int argc, VALUE* argv, VALUE self) {
-  VALUE item_array = Qnil;
-  VALUE value_types = Qnil;
-  VALUE items = Qnil;
-  VALUE states = Qnil;
-  VALUE settings = Qnil;
-  VALUE entry = Qnil;
-  VALUE target_name = Qnil;
-  VALUE packet_name = Qnil;
-  VALUE item_name = Qnil;
-  VALUE value_type = Qnil;
-  VALUE result = Qnil;
-  VALUE return_value = Qnil;
-  VALUE limits = Qnil;
-  VALUE limits_set = Qnil;
-  VALUE limits_values = Qnil;
-  VALUE limits_settings = Qnil;
+  volatile VALUE item_array = Qnil;
+  volatile VALUE value_types = Qnil;
+  volatile VALUE items = Qnil;
+  volatile VALUE states = Qnil;
+  volatile VALUE settings = Qnil;
+  volatile VALUE entry = Qnil;
+  volatile VALUE target_name = Qnil;
+  volatile VALUE packet_name = Qnil;
+  volatile VALUE item_name = Qnil;
+  volatile VALUE value_type = Qnil;
+  volatile VALUE result = Qnil;
+  volatile VALUE return_value = Qnil;
+  volatile VALUE limits = Qnil;
+  volatile VALUE limits_set = Qnil;
+  volatile VALUE limits_values = Qnil;
+  volatile VALUE limits_settings = Qnil;
   long length = 0;
   long value_types_length = 0;
   int index = 0;

data/lib/cosmos/gui/line_graph/line_graph.rb

@@ -81,6 +81,8 @@ module Cosmos
     attr_accessor_with_redraw :unix_epoch_x_values
     # Display x_value as UTC timestamp
     attr_accessor_with_redraw :utc_time
+    # Display legend on bottom or right side
+    attr_accessor_with_redraw :legend_position
 
     #########################################################################
     # Callback attributes
@@ -148,6 +150,7 @@ module Cosmos
       @show_popup_x_y = false
       @unix_epoch_x_values = true
       @utc_time = false
+      @legend_position = :bottom # :bottom or :right
 
       # Initialize the callbacks
       @draw_cursor_line_callback = nil
@@ -249,6 +252,9 @@ module Cosmos
       # Time of previous left button release
       @previous_left_button_release_time = Time.now
 
+      # List of line colors to use
+      @color_list = ['blue','red','green','darkorange', 'gold', 'purple', 'hotpink', 'lime', 'cornflowerblue', 'brown', 'coral', 'crimson', 'indigo', 'tan', 'lightblue', 'cyan', 'peru', 'maroon','orange','navy','teal','black']
+
       @redraw_needed = true
 
       setContentsMargins(0,0,0,0)
@@ -369,9 +375,27 @@ module Cosmos
     end # def clear_lines
 
     # Adds a line to the graph - Afterwards the graph is ready to be drawn
-    def add_line(legend_text, y, x = nil, y_labels = nil, x_labels = nil, y_states = nil, x_states = nil, color = 'blue', axis = :LEFT, max_points_plotted = nil)
+    #  color = 'auto' automatically determines color from index based lookup
+    def add_line(legend_text, y, x = nil, y_labels = nil, x_labels = nil, y_states = nil, x_states = nil, color = 'auto', axis = :LEFT, max_points_plotted = nil)
       @unix_epoch_x_values = false unless x
 
+      # if color specified as auto, do lookup
+      if (color == 'auto')
+        # If the number of lines is less than number of available colors,
+        #   choose an unused color
+        if (@lines.num_lines < @color_list.length)
+          unused_colors = @color_list.dup
+          @lines.legend.each do |name, line_color, axis|
+            unused_colors.delete(line_color)
+          end
+          color = unused_colors[0]
+        else
+          # Get an index within the color list for the next line index
+          line_color_idx = @lines.num_lines % (@color_list.length)
+          color = @color_list[line_color_idx]
+        end
+      end
+
       @lines.add_line(legend_text, y, x, y_labels, x_labels, y_states, x_states, color, axis, max_points_plotted)
 
       # Adding a line implies a redraw is needed

data/lib/cosmos/gui/line_graph/line_graph_dialog.rb

@@ -18,7 +18,7 @@ module Cosmos
 
     attr_accessor :line_graph
 
-    def initialize(title)
+    def initialize (title, width=400, height=300) 
       super(Qt::CoreApplication.instance.activeWindow)
       self.window_title = title
       @layout = Qt::VBoxLayout.new
@@ -27,7 +27,7 @@ module Cosmos
       @line_graph = LineGraph.new(self)
       layout.addWidget(@line_graph)
 
-      resize(400, 300)
+      resize(width, height)
     end
   end