cosmos 4.2.2-java → 4.2.3-java

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

@@ -91,31 +91,31 @@ module Cosmos
         lon_value[2] = (lon_value[1] + lon_value[0]) / 2.0
       end
 
-      #GL::TexCoord(lon_value, lat_value)
+      #glTexCoord(lon_value, lat_value)
       return [[lon_value[0], lat_value[0]], [lon_value[1], lat_value[1]], [lon_value[2], lat_value[2]]]
     end
 
     def draw_triangle(v1, v2, v3)
-      GL.Enable(GL::TEXTURE_2D)
-      GL.PolygonMode(GL::FRONT_AND_BACK, GL::FILL)
-      GL::Begin(GL::TRIANGLES)
+      glEnable(OpenGL::GL_TEXTURE_2D)
+      glPolygonMode(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_FILL)
+      glBegin(OpenGL::GL_TRIANGLES)
         tc1, tc2, tc3 = gen_tex_coords(v1, v2, v3)
-        GL::TexCoord(tc1[0], tc1[1])
-        GL::Vertex(v1)
-        GL::TexCoord(tc2[0], tc2[1])
-        GL::Vertex(v2)
-        GL::TexCoord(tc3[0], tc3[1])
-        GL::Vertex(v3)
-      GL::End()
-      GL.Disable(GL::TEXTURE_2D);
+        glTexCoord2f(tc1[0], tc1[1])
+        glVertex3f(v1[0], v1[1], v1[2])
+        glTexCoord2f(tc2[0], tc2[1])
+        glVertex3f(v2[0], v2[1], v2[2])
+        glTexCoord2f(tc3[0], tc3[1])
+        glVertex3f(v3[0], v3[1], v3[2])
+      glEnd()
+      glDisable(OpenGL::GL_TEXTURE_2D);
 
       #Show Triangles
-      #GL.PolygonMode(GL::FRONT_AND_BACK, GL::LINE)
-      #GL::Begin(GL::TRIANGLES)
-      #  GL::Vertex(v1)
-      #  GL::Vertex(v2)
-      #  GL::Vertex(v3)
-      #GL::End()
+      #glPolygonMode(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_LINE)
+      #glBegin(OpenGL::GL_TRIANGLES)
+      #  glVertex(v1)
+      #  glVertex(v2)
+      #  glVertex(v3)
+      #glEnd()
     end
 
     def subdivide_triangle(v1, v2, v3, depth)
@@ -144,49 +144,51 @@ module Cosmos
     end
 
     def drawshape(viewer)
-      GL.PushMatrix
-      GL.ShadeModel(GL::FLAT);
-      GL.Enable(GL::DEPTH_TEST);
+      glPushMatrix()
+      glShadeModel(OpenGL::GL_FLAT);
+      glEnable(OpenGL::GL_DEPTH_TEST);
       if @first == true
-        GL.PixelStore(GL::UNPACK_ALIGNMENT, 1)
-        texName = GL::GenTextures(1)
-        GL::BindTexture(GL::TEXTURE_2D, texName[0])
-        GL.TexParameter(GL::TEXTURE_2D, GL::TEXTURE_WRAP_S, GL::REPEAT);
-        GL.TexParameter(GL::TEXTURE_2D, GL::TEXTURE_WRAP_T, GL::REPEAT);
-        GL.TexParameter(GL::TEXTURE_2D, GL::TEXTURE_MAG_FILTER, GL::NEAREST);
-        GL.TexParameter(GL::TEXTURE_2D, GL::TEXTURE_MIN_FILTER, GL::NEAREST);
-        GL::TexImage2D(GL::TEXTURE_2D, 0, GL::RGBA, @image.width, @image.height, 0, GL::RGBA, GL::UNSIGNED_BYTE, @image_data)
-
-        GL::TexEnv(GL::TEXTURE_ENV, GL::TEXTURE_ENV_MODE, GL::DECAL)
-
-        @drawing_list = GL.GenLists(1)
-        GL.NewList(@drawing_list, GL::COMPILE)
-        GL.Enable(GL::TEXTURE_2D);
-        GL.TexEnvf(GL::TEXTURE_ENV, GL::TEXTURE_ENV_MODE, GL::DECAL);
-        GL::BindTexture(GL::TEXTURE_2D, texName[0])
+        glPixelStorei(OpenGL::GL_UNPACK_ALIGNMENT, 1)
+        tex_name_buf = ' ' * 8 # Buffer to hold texture names
+        glGenTextures(1, tex_name_buf)
+        texName = tex_name_buf.unpack('L2')[0]
+        glBindTexture(OpenGL::GL_TEXTURE_2D, texName)
+        glTexParameteri(OpenGL::GL_TEXTURE_2D, OpenGL::GL_TEXTURE_WRAP_S, OpenGL::GL_REPEAT)
+        glTexParameteri(OpenGL::GL_TEXTURE_2D, OpenGL::GL_TEXTURE_WRAP_T, OpenGL::GL_REPEAT)
+        glTexParameteri(OpenGL::GL_TEXTURE_2D, OpenGL::GL_TEXTURE_MAG_FILTER, OpenGL::GL_NEAREST)
+        glTexParameteri(OpenGL::GL_TEXTURE_2D, OpenGL::GL_TEXTURE_MIN_FILTER, OpenGL::GL_NEAREST)
+        glTexImage2D(OpenGL::GL_TEXTURE_2D, 0, OpenGL::GL_RGBA, @image.width, @image.height, 0, OpenGL::GL_RGBA, OpenGL::GL_UNSIGNED_BYTE, @image_data)
+
+        glTexEnvi(OpenGL::GL_TEXTURE_ENV, OpenGL::GL_TEXTURE_ENV_MODE, OpenGL::GL_DECAL)
+
+        @drawing_list = glGenLists(1)
+        glNewList(@drawing_list, OpenGL::GL_COMPILE)
+        glEnable(OpenGL::GL_TEXTURE_2D)
+        glTexEnvf(OpenGL::GL_TEXTURE_ENV, OpenGL::GL_TEXTURE_ENV_MODE, OpenGL::GL_DECAL)
+        glBindTexture(OpenGL::GL_TEXTURE_2D, texName)
         8.times do |index|
           subdivide_triangle(@vdata[@tindices[index][0]], @vdata[@tindices[index][1]], @vdata[@tindices[index][2]], 4)
         end
-        GL.Disable(GL::TEXTURE_2D);
-        GL.EndList
+        glDisable(OpenGL::GL_TEXTURE_2D);
+        glEndList()
 
         @first = false
       end
 
-      GL.CallList(@drawing_list)
+      glCallList(@drawing_list)
 
       #Draw Axises
-      #GL::Begin(GL::LINES)
-      #  GL::Color3f(1.0, 0.0, 0.0)
-      #  GL::Vertex([-2.0,  0.0,  0.0])
-      #  GL::Vertex([ 2.0,  0.0,  0.0])
-      #  GL::Vertex([ 0.0, -2.0,  0.0])
-      #  GL::Vertex([ 0.0,  2.0,  0.0])
-      #  GL::Vertex([ 0.0,  0.0, -2.0])
-      #  GL::Vertex([ 0.0,  0.0,  2.0])
-      #GL::End()
-
-      GL.PopMatrix
+      #glBegin(OpenGL::GL_LINES)
+      #  glColor3f(1.0, 0.0, 0.0)
+      #  glVertex([-2.0,  0.0,  0.0])
+      #  glVertex([ 2.0,  0.0,  0.0])
+      #  glVertex([ 0.0, -2.0,  0.0])
+      #  glVertex([ 0.0,  2.0,  0.0])
+      #  glVertex([ 0.0,  0.0, -2.0])
+      #  glVertex([ 0.0,  0.0,  2.0])
+      #glEnd()
+
+      glPopMatrix()
     end
 
     def export

data/lib/cosmos/packets/commands.rb

@@ -261,6 +261,28 @@ module Cosmos
       end
     end
 
+    # Returns an array with a "TARGET_NAME PACKET_NAME" string for every command in the system (PACKET_NAME == command name)
+    def all_packet_strings(include_hidden = false, splash = nil)
+      strings = []
+      tnames = target_names()
+      total = tnames.length.to_f
+      tnames.each_with_index do |target_name, index|
+        if splash
+          splash.message = "Processing #{target_name} command"
+          splash.progress = index / total
+        end
+
+        ignored_items = System.targets[target_name].ignored_items
+
+        packets(target_name).each do |command_name, packet|
+          # We don't audit against hidden or disabled packets/commands
+          next if !include_hidden and (packet.hidden || packet.disabled)
+          strings << "#{target_name} #{command_name}"
+        end
+      end
+      strings
+    end
+
     def all
       @config.commands
     end

data/lib/cosmos/tools/cmd_sender/cmd_sender.rb

@@ -19,6 +19,7 @@ Cosmos.catch_fatal_exception do
   require 'cosmos/gui/dialogs/cmd_details_dialog'
   require 'cosmos/tools/cmd_sender/cmd_sender_text_edit'
   require 'cosmos/tools/cmd_sender/cmd_param_table_item_delegate'
+  require 'cosmos/gui/widgets/full_text_search_line_edit'
 end
 
 module Cosmos
@@ -109,6 +110,21 @@ module Cosmos
           update_commands()
           @cmd_select.setCurrentText(options.packet[1]) if options.packet
           update_cmd_params()
+
+          # Handle searching entries
+          @search_box.completion_list = System.commands.all_packet_strings(true, splash)
+          @search_box.callback = lambda do |cmd|
+            split_cmd = cmd.split(" ")
+            if split_cmd.length == 2
+              target_name = split_cmd[0].upcase
+              @target_select.setCurrentText(target_name)
+              update_commands()
+              command_name = split_cmd[1]
+              @cmd_select.setCurrentText(command_name)
+              update_cmd_params()
+            end
+          end
+
         end
 
         # Unconfigure CosmosConfig to interact with splash screen
@@ -220,6 +236,10 @@ module Cosmos
       # If this is not set then when we refresh the command parameters they'll all be squished
       top_layout.setSizeConstraint(Qt::Layout::SetMinimumSize)
 
+      # Mnemonic Search Box
+      @search_box = FullTextSearchLineEdit.new(self)
+      top_layout.addWidget(@search_box)
+
       # Set the target combobox selection
       @target_select = Qt::ComboBox.new
       @target_select.setMaxVisibleItems(6)

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -1140,14 +1140,18 @@ module Cosmos
       dialog_layout.addLayout(button_layout)
 
       dialog.setLayout(dialog_layout)
+      my_parent = self.parent
+      while my_parent.parent
+        my_parent = my_parent.parent
+      end
       if dialog.exec == Qt::Dialog::Accepted
         if targets.empty?
           clear_disconnected_targets()
-          self.parent.parent.parent.statusBar.showMessage("")
+          my_parent.statusBar.showMessage("")
           self.setPalette(Qt::Palette.new(Cosmos::DEFAULT_PALETTE))
         else
           config_file = chooser.filename
-          self.parent.parent.parent.statusBar.showMessage("Targets disconnected: #{targets.join(" ")}")
+          my_parent.statusBar.showMessage("Targets disconnected: #{targets.join(" ")}")
           self.setPalette(Qt::Palette.new(Cosmos::RED_PALETTE))
           Splash.execute(self) do |splash|
             ConfigParser.splash = splash

data/lib/cosmos/tools/tlm_viewer/widgets/timegraph_widget.rb

@@ -67,7 +67,7 @@ module Cosmos
       return if @time[-1] == t_sec
 
       data2 = data.to_f
-      if data2.infinite? or data2.nan?
+      if !(data2.infinite? or data2.nan?)
         # create time array
         @time << t_sec
 

data/lib/cosmos/utilities/ruby_lex_utils.rb

@@ -290,7 +290,7 @@ class RubyLexUtils
           else
             yield lexed, false, inside_begin, line_no
           end
-        else
+        elsif !lexed.empty?
           num_left_brackets  = lexed.count('{')
           num_right_brackets = lexed.count('}')
           if num_left_brackets != num_right_brackets
@@ -300,14 +300,9 @@ class RubyLexUtils
             yield lexed, true, inside_begin, line_no
           end
         end
-
         lex.exp_line_no = lex.line_no
-
         break
       end # loop do
-
     end # while lexed
-
   end # def each_lexed_segment
-
 end

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '4.2.2'
+COSMOS_VERSION = '4.2.3'
 module Cosmos
   module Version
     MAJOR = '4'
     MINOR = '2'
-    PATCH = '2'
-    BUILD = '6c929b5a65fd9dc0631cdab312e71f65630fceff'
+    PATCH = '3'
+    BUILD = '90c87a409582104777955b2fb791e79da5d04e28'
   end
-  VERSION = '4.2.2'
+  VERSION = '4.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: java
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -31,9 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   name: rdoc
   prerelease: false
   type: :runtime
@@ -42,9 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: