cosmos 4.2.2-java → 4.2.3-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +7 -3
- data/autohotkey/tools/cmd_sender.ahk +35 -35
- data/bin/dart_import +3 -1
- data/cosmos.gemspec +4 -3
- data/data/crc.txt +14 -14
- data/demo/config/dart/Gemfile +2 -2
- data/demo/config/data/crc.txt +1 -1
- data/install/config/dart/Gemfile +2 -2
- data/install/config/data/crc.txt +3 -3
- data/lib/cosmos/dart/lib/dart_common.rb +1 -1
- data/lib/cosmos/gui/opengl/gl_scene.rb +3 -3
- data/lib/cosmos/gui/opengl/gl_shape.rb +27 -29
- data/lib/cosmos/gui/opengl/gl_viewer.rb +127 -124
- data/lib/cosmos/gui/opengl/opengl.rb +6 -0
- data/lib/cosmos/gui/opengl/stl_reader.rb +7 -7
- data/lib/cosmos/gui/opengl/stl_shape.rb +16 -16
- data/lib/cosmos/gui/opengl/texture_mapped_sphere.rb +53 -51
- data/lib/cosmos/packets/commands.rb +22 -0
- data/lib/cosmos/tools/cmd_sender/cmd_sender.rb +20 -0
- data/lib/cosmos/tools/script_runner/script_runner_frame.rb +6 -2
- data/lib/cosmos/tools/tlm_viewer/widgets/timegraph_widget.rb +1 -1
- data/lib/cosmos/utilities/ruby_lex_utils.rb +1 -6
- data/lib/cosmos/version.rb +4 -4
- metadata +2 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 168d12f64cd3babfdf1df0dd885e20b25c0810e12d660935f5f2f3d8121113fc
|
4
|
+
data.tar.gz: 218aa870e25cef9aaa45d8535013b2adcba73a0e7d3c506255d69ebf83c9bc35
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4400b6f9f2418138e0ab709246dd0701a20d4a1f977636ba5d73ae0e9361c3146d5d72447fba1f4e1481fe4b3a06ef978aec1593c8802430a6b07ff498367f37
|
7
|
+
data.tar.gz: fff150054bc49036d1c75857948ac23c72753ab1620d63a230545ae776aa84f7317717bcee8d718460791131031b22fec6939f8b8f73f3add8c699c4a10a8939
|
data/.travis.yml
CHANGED
@@ -32,36 +32,36 @@ WinActivate Send Raw
|
|
32
32
|
Click 310 105 ; Click OK CMD-10
|
33
33
|
WinWaitActive Command Sender
|
34
34
|
Sleep 500
|
35
|
-
Click 85
|
35
|
+
Click 85 100 ; Target dropdown CMD-1
|
36
36
|
Sleep 500
|
37
|
-
Click 610
|
37
|
+
Click 610 100 ; Send CMD-2
|
38
38
|
Sleep 500
|
39
|
-
Click 365
|
39
|
+
Click 365 100 ; Command dropdown CMD-1
|
40
40
|
Sleep 500
|
41
|
-
Click 365
|
41
|
+
Click 365 165 ; Collect command CMD-3
|
42
42
|
Sleep 500
|
43
|
-
Click 610
|
43
|
+
Click 610 100 ; Send should fail due to TYPE required CMD-6
|
44
44
|
Sleep 500
|
45
45
|
WinWaitActive Error
|
46
46
|
Sleep 500
|
47
47
|
Send {Enter}
|
48
|
-
Click 240
|
48
|
+
Click 240 210 ; Click in the TYPE parameter CMD-5
|
49
49
|
Sleep 500
|
50
50
|
Send 5{Enter}
|
51
51
|
Sleep 500
|
52
|
-
Click 610
|
52
|
+
Click 610 100 ; Send CMD-2
|
53
53
|
Sleep 500
|
54
|
-
Click 150
|
54
|
+
Click 150 275 ; Click in the TEMP parameter
|
55
55
|
Sleep 500
|
56
56
|
Send 100{Enter}
|
57
57
|
Sleep 500
|
58
|
-
Click 150
|
58
|
+
Click 150 210 ; Click on the TYPE parameter
|
59
59
|
Sleep 500
|
60
|
-
Click 150
|
60
|
+
Click 150 210 ; Click on the TYPE parameter
|
61
61
|
Sleep 500
|
62
|
-
Click 150
|
62
|
+
Click 150 225 ; Click on NORMAL CMD-4
|
63
63
|
Sleep 500
|
64
|
-
Click 610
|
64
|
+
Click 610 100 ; Send should fail due to out of range
|
65
65
|
WinWaitActive Error
|
66
66
|
Sleep 500
|
67
67
|
Send {Enter}
|
@@ -71,9 +71,9 @@ Send !m ; Mode
|
|
71
71
|
Sleep 500
|
72
72
|
Send i ; Ignore Range Checks
|
73
73
|
Sleep 500
|
74
|
-
Click 610
|
74
|
+
Click 610 100 ; Send should succeed
|
75
75
|
Sleep 500
|
76
|
-
Click 150
|
76
|
+
Click 150 275 ; Click in the TEMP parameter
|
77
77
|
Sleep 500
|
78
78
|
Send 10{Enter} ; Set it to an allowable value
|
79
79
|
Sleep 500
|
@@ -81,27 +81,27 @@ Send !m ; Mode
|
|
81
81
|
Sleep 500
|
82
82
|
Send p ; Disable parameter conversions
|
83
83
|
Sleep 500
|
84
|
-
Click 610
|
84
|
+
Click 610 100 ; Send should succeed
|
85
85
|
Sleep 500
|
86
86
|
Send !m ; Mode
|
87
87
|
Sleep 500
|
88
88
|
Send i ; Ignore Range Checks CMD-7
|
89
89
|
Sleep 500
|
90
|
-
Click 610
|
90
|
+
Click 610 100 ; Send should succeed CMD-7
|
91
91
|
Sleep 500
|
92
|
-
Click 150
|
92
|
+
Click 150 210 ; Click on the TYPE parameter
|
93
93
|
Sleep 500
|
94
|
-
Click 150
|
94
|
+
Click 150 210 ; Click on the TYPE parameter
|
95
95
|
Sleep 500
|
96
|
-
Click 150
|
96
|
+
Click 150 239 ; Click on SPECIAL CMD-4
|
97
97
|
Sleep 500
|
98
|
-
Click 610
|
98
|
+
Click 610 100 ; Send
|
99
99
|
WinWaitActive Hazardous Command
|
100
100
|
Sleep 500
|
101
101
|
Click 290 110 ; Cancel CMD-11
|
102
102
|
WinWaitActive Command Sender
|
103
103
|
Sleep 500
|
104
|
-
Click 610
|
104
|
+
Click 610 100 ; Send
|
105
105
|
WinWaitActive Hazardous Command
|
106
106
|
Sleep 500
|
107
107
|
Send {Enter} ; Confirm send because hazardous CMD-11
|
@@ -115,41 +115,41 @@ Send !m ; Mode
|
|
115
115
|
Sleep 500
|
116
116
|
Send s ; Show Ignored CMD-9
|
117
117
|
Sleep 500
|
118
|
-
Click 275
|
118
|
+
Click 275 390 ; Click in the TYPE parameter
|
119
119
|
Sleep 500
|
120
120
|
Send 5{Enter}
|
121
121
|
Sleep 500
|
122
|
-
Click 610
|
122
|
+
Click 610 100 ; Send
|
123
123
|
Sleep 500
|
124
|
-
Click right 500
|
124
|
+
Click right 500 390 ; Right Click in the TYPE parameter
|
125
125
|
Sleep 500
|
126
|
-
Click right 515
|
126
|
+
Click right 515 375 ; Details
|
127
127
|
WinWaitActive INST COLLECT
|
128
128
|
Sleep 500
|
129
129
|
Send {Enter}
|
130
130
|
WinWaitActive Command Sender
|
131
131
|
Sleep 500
|
132
|
-
Click right 200
|
132
|
+
Click right 200 460 ; Click in TEMP
|
133
133
|
Sleep 500
|
134
|
-
Click 215
|
134
|
+
Click 215 475 ; Select File
|
135
135
|
WinWaitActive Insert
|
136
136
|
Sleep 500
|
137
137
|
Send cmd.bin{Enter}
|
138
138
|
WinWaitActive Command Sender
|
139
139
|
Sleep 500
|
140
|
-
Click 85
|
140
|
+
Click 85 100 ; Target dropdown
|
141
141
|
Sleep 500
|
142
|
-
Click 75
|
142
|
+
Click 75 128 ; INST2
|
143
143
|
Sleep 500
|
144
|
-
Click 365
|
144
|
+
Click 365 100 ; Command dropdown
|
145
145
|
Sleep 500
|
146
|
-
Click 365
|
146
|
+
Click 365 165 ; Collect command
|
147
147
|
Sleep 500
|
148
|
-
Click 180
|
148
|
+
Click 180 390 ; Click on Type
|
149
149
|
Sleep 500
|
150
|
-
Click 180
|
150
|
+
Click 180 390 ; Click on Type
|
151
151
|
Sleep 500
|
152
|
-
Click 180
|
152
|
+
Click 180 425 ; Click on Special
|
153
153
|
Sleep 500
|
154
154
|
Send !m ; Mode
|
155
155
|
Sleep 500
|
@@ -163,7 +163,7 @@ Send !m ; Mode
|
|
163
163
|
Sleep 500
|
164
164
|
Send s ; Show Ignored
|
165
165
|
Sleep 500
|
166
|
-
Click 60
|
166
|
+
Click 60 625 ; Click in the Command History
|
167
167
|
Sleep 500
|
168
168
|
Send {Down 6}{Up}{Enter}
|
169
169
|
|
data/bin/dart_import
CHANGED
data/cosmos.gemspec
CHANGED
@@ -78,7 +78,7 @@ spec = Gem::Specification.new do |s|
|
|
78
78
|
|
79
79
|
# Runtime Dependencies
|
80
80
|
s.add_runtime_dependency 'bundler', '~> 1.3'
|
81
|
-
s.add_runtime_dependency 'rdoc', '>= 4'
|
81
|
+
s.add_runtime_dependency 'rdoc', '>= 4' # qtbindings doesn't parse in 6.0.0, fixed in 6.0.1
|
82
82
|
s.add_runtime_dependency 'rake', '>= 10.0' # 10.0 released Nov 12, 2012
|
83
83
|
s.add_runtime_dependency 'json', '>= 1.5', '< 3' # 2.0+ works with COSMOS
|
84
84
|
s.add_runtime_dependency 'pry', '~> 0.9'
|
@@ -88,7 +88,7 @@ spec = Gem::Specification.new do |s|
|
|
88
88
|
s.add_runtime_dependency 'snmp', '~> 1.0'
|
89
89
|
s.add_runtime_dependency 'rubyzip', '~> 1.2'
|
90
90
|
s.add_runtime_dependency 'nokogiri', '~> 1.6'
|
91
|
-
s.add_runtime_dependency 'opengl', '~>
|
91
|
+
s.add_runtime_dependency 'opengl-bindings', '~> 1.6' if RUBY_ENGINE == 'ruby' # MRI Only
|
92
92
|
s.add_runtime_dependency 'qtbindings', '~> 4.8.6', '>= 4.8.6.2' if RUBY_ENGINE == 'ruby' # MRI Only
|
93
93
|
s.add_runtime_dependency 'puma', '~> 3.10'
|
94
94
|
s.add_runtime_dependency 'rack', '~> 2.0'
|
@@ -98,7 +98,8 @@ spec = Gem::Specification.new do |s|
|
|
98
98
|
# "For MRI versions 2.2.7, 2.2.8, 2.3.4 and 2.4.1, you may see stream closed in
|
99
99
|
# another thread (IOError). It may be caused by a Ruby bug. It can be
|
100
100
|
# fixed with the gem https://rubygems.org/gems/stopgap_13632"
|
101
|
-
|
101
|
+
# This is commented out because the gemspec is only evaluated at gem build time
|
102
|
+
# s.add_runtime_dependency 'stopgap_13632', '~> 1.1.1' if RUBY_ENGINE == 'ruby' and %w(2.2.7 2.2.8 2.3.4 2.4.1).include? RUBY_VERSION # MRI Only
|
102
103
|
|
103
104
|
# Development Dependencies
|
104
105
|
s.add_development_dependency 'diff-lcs', '~> 1.3' if RUBY_ENGINE == 'ruby' # Get latest for MRI
|
data/data/crc.txt
CHANGED
@@ -18,7 +18,7 @@
|
|
18
18
|
"lib/cosmos/processors/processor.rb" 0x1FEB7030
|
19
19
|
"lib/cosmos/processors/statistics_processor.rb" 0x514E4788
|
20
20
|
"lib/cosmos/processors/watermark_processor.rb" 0x8829E260
|
21
|
-
"lib/cosmos/version.rb"
|
21
|
+
"lib/cosmos/version.rb" 0x609CF1DC
|
22
22
|
"lib/cosmos/conversions/new_packet_log_conversion.rb" 0x4AA03555
|
23
23
|
"lib/cosmos/conversions/segmented_polynomial_conversion.rb" 0xC498CE81
|
24
24
|
"lib/cosmos/conversions/processor_conversion.rb" 0xC72B73BD
|
@@ -70,18 +70,18 @@
|
|
70
70
|
"lib/cosmos/gui/text/completion_text_edit.rb" 0x09A88429
|
71
71
|
"lib/cosmos/gui/text/completion.rb" 0xB55DB949
|
72
72
|
"lib/cosmos/gui/opengl/moon_model.rb" 0x9C1D696C
|
73
|
-
"lib/cosmos/gui/opengl/opengl.rb"
|
74
|
-
"lib/cosmos/gui/opengl/gl_scene.rb"
|
73
|
+
"lib/cosmos/gui/opengl/opengl.rb" 0x4165DA92
|
74
|
+
"lib/cosmos/gui/opengl/gl_scene.rb" 0x24F22BA7
|
75
75
|
"lib/cosmos/gui/opengl/earth_model.rb" 0x50D04F1F
|
76
|
-
"lib/cosmos/gui/opengl/stl_reader.rb"
|
76
|
+
"lib/cosmos/gui/opengl/stl_reader.rb" 0x05C1E979
|
77
77
|
"lib/cosmos/gui/opengl/gl_bounds.rb" 0x3C40A91B
|
78
78
|
"lib/cosmos/gui/opengl/gl_light.rb" 0x9B198652
|
79
|
-
"lib/cosmos/gui/opengl/texture_mapped_sphere.rb"
|
80
|
-
"lib/cosmos/gui/opengl/stl_shape.rb"
|
81
|
-
"lib/cosmos/gui/opengl/gl_viewer.rb"
|
79
|
+
"lib/cosmos/gui/opengl/texture_mapped_sphere.rb" 0x2FAA909F
|
80
|
+
"lib/cosmos/gui/opengl/stl_shape.rb" 0xAF328018
|
81
|
+
"lib/cosmos/gui/opengl/gl_viewer.rb" 0xA50C5544
|
82
82
|
"lib/cosmos/gui/opengl/gl_viewport.rb" 0xDCA4C43E
|
83
83
|
"lib/cosmos/gui/opengl/gl_material.rb" 0xA9335A05
|
84
|
-
"lib/cosmos/gui/opengl/gl_shape.rb"
|
84
|
+
"lib/cosmos/gui/opengl/gl_shape.rb" 0xB1531BE7
|
85
85
|
"lib/cosmos/gui/qt_tool.rb" 0x59F988CD
|
86
86
|
"lib/cosmos/gui/qt.rb" 0x10480645
|
87
87
|
"lib/cosmos/gui/utilities/analyze_log.rb" 0x5E13ABB0
|
@@ -108,7 +108,7 @@
|
|
108
108
|
"lib/cosmos/packets/binary_accessor.rb" 0xCD678EF6
|
109
109
|
"lib/cosmos/packets/packet.rb" 0x71A44396
|
110
110
|
"lib/cosmos/packets/structure.rb" 0x4FB5B8D5
|
111
|
-
"lib/cosmos/packets/commands.rb"
|
111
|
+
"lib/cosmos/packets/commands.rb" 0x36F95A2A
|
112
112
|
"lib/cosmos/packets/limits_response.rb" 0xB836D388
|
113
113
|
"lib/cosmos/packets/packet_config.rb" 0x9500DA95
|
114
114
|
"lib/cosmos/packets/packet_item.rb" 0xE0789E45
|
@@ -224,7 +224,7 @@
|
|
224
224
|
"lib/cosmos/tools/tlm_viewer/widgets/trendlimitsbar_widget.rb" 0xF812A1CC
|
225
225
|
"lib/cosmos/tools/tlm_viewer/widgets/spacer_widget.rb" 0x2BBFF4CF
|
226
226
|
"lib/cosmos/tools/tlm_viewer/widgets/labelvaluelimitscolumn_widget.rb" 0x83106C3B
|
227
|
-
"lib/cosmos/tools/tlm_viewer/widgets/timegraph_widget.rb"
|
227
|
+
"lib/cosmos/tools/tlm_viewer/widgets/timegraph_widget.rb" 0xA7D69022
|
228
228
|
"lib/cosmos/tools/tlm_viewer/widgets/label_widget.rb" 0x5158C883
|
229
229
|
"lib/cosmos/tools/tlm_viewer/widgets/sectionheader_widget.rb" 0x0CDABB7D
|
230
230
|
"lib/cosmos/tools/tlm_viewer/widgets/valuerangebar_widget.rb" 0xFD9A6967
|
@@ -298,7 +298,7 @@
|
|
298
298
|
"lib/cosmos/tools/cmd_tlm_server/router_thread.rb" 0x5070D428
|
299
299
|
"lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x3F3BDB60
|
300
300
|
"lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0xDFD9701E
|
301
|
-
"lib/cosmos/tools/cmd_sender/cmd_sender.rb"
|
301
|
+
"lib/cosmos/tools/cmd_sender/cmd_sender.rb" 0x04BACB04
|
302
302
|
"lib/cosmos/tools/cmd_sender/cmd_param_table_item_delegate.rb" 0xE80FAD0A
|
303
303
|
"lib/cosmos/tools/cmd_sender/cmd_sender_text_edit.rb" 0xB192AF6E
|
304
304
|
"lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb" 0x0FE62D7A
|
@@ -342,7 +342,7 @@
|
|
342
342
|
"lib/cosmos/tools/handbook_creator/handbook_creator_config.rb" 0x9706590F
|
343
343
|
"lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0x729A16C4
|
344
344
|
"lib/cosmos/tools/script_runner/script_runner.rb" 0x648F80BE
|
345
|
-
"lib/cosmos/tools/script_runner/script_runner_frame.rb"
|
345
|
+
"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0x0C54F330
|
346
346
|
"lib/cosmos/tools/script_runner/script_audit.rb" 0xAAEFBDF7
|
347
347
|
"lib/cosmos/tools/script_runner/script_runner_config.rb" 0xD5A30025
|
348
348
|
"lib/cosmos/dart/db/seeds.rb" 0xA69E6A23
|
@@ -428,7 +428,7 @@
|
|
428
428
|
"lib/cosmos/dart/lib/dart_reducer_worker_thread.rb" 0x25A4631B
|
429
429
|
"lib/cosmos/dart/lib/dart_decommutator.rb" 0x1B82D21E
|
430
430
|
"lib/cosmos/dart/lib/dart_tcpip_server_interface.rb" 0xF3A295D4
|
431
|
-
"lib/cosmos/dart/lib/dart_common.rb"
|
431
|
+
"lib/cosmos/dart/lib/dart_common.rb" 0x91514597
|
432
432
|
"lib/cosmos/dart/lib/dart_database_cleaner.rb" 0xA67479FD
|
433
433
|
"lib/cosmos/dart/lib/dart_packet_log_writer.rb" 0x968E3CF5
|
434
434
|
"lib/cosmos/dart/lib/dart_decom_query.rb" 0x72B29872
|
@@ -439,7 +439,7 @@
|
|
439
439
|
"lib/cosmos/config/config_parser.rb" 0x3CCA586C
|
440
440
|
"lib/cosmos/config/meta_config_parser.rb" 0xE4521B6B
|
441
441
|
"lib/cosmos/utilities/csv.rb" 0xF79582B8
|
442
|
-
"lib/cosmos/utilities/ruby_lex_utils.rb"
|
442
|
+
"lib/cosmos/utilities/ruby_lex_utils.rb" 0x839105B3
|
443
443
|
"lib/cosmos/utilities/crc.rb" 0xD9581AD2
|
444
444
|
"lib/cosmos/utilities/low_fragmentation_array.rb" 0x265263E1
|
445
445
|
"lib/cosmos/utilities/logger.rb" 0xDD74C6BE
|
data/demo/config/dart/Gemfile
CHANGED
@@ -7,7 +7,7 @@ end
|
|
7
7
|
|
8
8
|
|
9
9
|
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
10
|
-
gem 'rails', '~> 5.1.
|
10
|
+
gem 'rails', '~> 5.1.6'
|
11
11
|
# Use sqlite3 as the database for Active Record
|
12
12
|
# gem 'sqlite3'
|
13
13
|
# Use Puma as the app server
|
@@ -48,7 +48,7 @@ gem 'rest-client' # For examples
|
|
48
48
|
gem 'childprocess'
|
49
49
|
|
50
50
|
if RUBY_ENGINE == 'ruby'
|
51
|
-
gem 'pg', '~> 0
|
51
|
+
gem 'pg', '~> 1.0'
|
52
52
|
else
|
53
53
|
gem 'activerecord-jdbcpostgresql-adapter', :github => 'jruby/activerecord-jdbc-adapter'
|
54
54
|
end
|
data/demo/config/data/crc.txt
CHANGED
@@ -122,7 +122,7 @@
|
|
122
122
|
"config/tools/handbook_creator/default_toc.xsl" 0x4122A040
|
123
123
|
"config/tools/handbook_creator/handbook_creator.txt" 0xAA806C94
|
124
124
|
"config/tools/script_runner/script_runner.txt" 0x1EECD803
|
125
|
-
"config/dart/Gemfile"
|
125
|
+
"config/dart/Gemfile" 0x69694DA8
|
126
126
|
"tools/TlmExtractor.bat" 0x2B98E027
|
127
127
|
"tools/Launcher" 0xFD4E356C
|
128
128
|
"tools/CmdSequence" 0x4A13C82C
|
data/install/config/dart/Gemfile
CHANGED
@@ -7,7 +7,7 @@ end
|
|
7
7
|
|
8
8
|
|
9
9
|
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
10
|
-
gem 'rails', '~> 5.1.
|
10
|
+
gem 'rails', '~> 5.1.6'
|
11
11
|
# Use sqlite3 as the database for Active Record
|
12
12
|
# em 'sqlite3'
|
13
13
|
# Use Puma as the app server
|
@@ -48,7 +48,7 @@ gem 'rest-client' # For examples
|
|
48
48
|
gem 'childprocess'
|
49
49
|
|
50
50
|
if RUBY_ENGINE == 'ruby'
|
51
|
-
gem 'pg', '~> 0
|
51
|
+
gem 'pg', '~> 1.0'
|
52
52
|
else
|
53
53
|
gem 'activerecord-jdbcpostgresql-adapter', :github => 'jruby/activerecord-jdbc-adapter'
|
54
54
|
end
|
data/install/config/data/crc.txt
CHANGED
@@ -3,13 +3,13 @@
|
|
3
3
|
"config/targets/SYSTEM/cmd_tlm/meta_tlm.txt" 0x07CDABCB
|
4
4
|
"config/data/README.txt" 0x93B2C07E
|
5
5
|
"config/system/system.txt" 0xD95B7058
|
6
|
-
"config/tools/launcher/launcher.txt"
|
6
|
+
"config/tools/launcher/launcher.txt" 0x6A3047DB
|
7
7
|
"config/tools/table_manager/README.txt" 0x93B2C07E
|
8
8
|
"config/tools/tlm_viewer/tlm_viewer.txt" 0xD9071527
|
9
9
|
"config/tools/data_viewer/data_viewer.txt" 0xAEE0B7DF
|
10
10
|
"config/tools/test_runner/test_runner.txt" 0xD24409D2
|
11
11
|
"config/tools/tlm_extractor/README.txt" 0x93B2C07E
|
12
|
-
"config/tools/cmd_tlm_server/cmd_tlm_server.txt"
|
12
|
+
"config/tools/cmd_tlm_server/cmd_tlm_server.txt" 0x2A39E69F
|
13
13
|
"config/tools/tlm_grapher/README.txt" 0x93B2C07E
|
14
14
|
"config/tools/opengl_builder/README.txt" 0x93B2C07E
|
15
15
|
"config/tools/limits_monitor/README.txt" 0x93B2C07E
|
@@ -29,7 +29,7 @@
|
|
29
29
|
"config/tools/handbook_creator/default_toc.xsl" 0x4122A040
|
30
30
|
"config/tools/handbook_creator/handbook_creator.txt" 0x64E4B5CC
|
31
31
|
"config/tools/script_runner/script_runner.txt" 0x1EECD803
|
32
|
-
"config/dart/Gemfile"
|
32
|
+
"config/dart/Gemfile" 0x011A23A3
|
33
33
|
"tools/TlmExtractor.bat" 0x2B98E027
|
34
34
|
"tools/Launcher" 0xFD4E356C
|
35
35
|
"tools/CmdSequence" 0x4A13C82C
|
@@ -258,7 +258,7 @@ module DartCommon
|
|
258
258
|
end
|
259
259
|
packet_id = packet_name_hash[packet_name] # Check cache
|
260
260
|
unless packet_id
|
261
|
-
packet = sync_packet(
|
261
|
+
packet = sync_packet(target_id, packet_name, is_tlm)
|
262
262
|
packet_id = packet.id
|
263
263
|
packet_name_hash[packet_name] = packet.id # Update cache
|
264
264
|
end
|
@@ -50,12 +50,12 @@ module Cosmos
|
|
50
50
|
end
|
51
51
|
|
52
52
|
def hit(viewer)
|
53
|
-
|
53
|
+
glPushName(0xffffffff);
|
54
54
|
@shapes.each_with_index do |shape, index|
|
55
|
-
|
55
|
+
glLoadName(index)
|
56
56
|
shape.hit(viewer)
|
57
57
|
end
|
58
|
-
|
58
|
+
glPopName()
|
59
59
|
end
|
60
60
|
|
61
61
|
def identify(index)
|
@@ -45,45 +45,45 @@ module Cosmos
|
|
45
45
|
end
|
46
46
|
|
47
47
|
def draw(viewer)
|
48
|
-
|
49
|
-
|
48
|
+
glPushAttrib(OpenGL::GL_CURRENT_BIT | OpenGL::GL_LIGHTING_BIT | OpenGL::GL_POINT_BIT | OpenGL::GL_LINE_BIT)
|
49
|
+
glPushMatrix
|
50
50
|
|
51
51
|
# Object position
|
52
|
-
|
52
|
+
glTranslatef(@position[0], @position[1], @position[2])
|
53
53
|
|
54
54
|
# Shading
|
55
|
-
|
56
|
-
|
57
|
-
|
55
|
+
glEnable(OpenGL::GL_LIGHTING)
|
56
|
+
glEnable(OpenGL::GL_AUTO_NORMAL)
|
57
|
+
glShadeModel(OpenGL::GL_SMOOTH)
|
58
58
|
|
59
59
|
# Material
|
60
60
|
if @back_material
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
61
|
+
glMaterialfv(OpenGL::GL_FRONT, OpenGL::GL_AMBIENT, @front_material.ambient.pack('F*'))
|
62
|
+
glMaterialfv(OpenGL::GL_FRONT, OpenGL::GL_DIFFUSE, @front_material.diffuse.pack('F*'))
|
63
|
+
glMaterialfv(OpenGL::GL_FRONT, OpenGL::GL_SPECULAR, @front_material.specular.pack('F*'))
|
64
|
+
glMaterialfv(OpenGL::GL_FRONT, OpenGL::GL_EMISSION, @front_material.emission.pack('F*'))
|
65
|
+
glMaterialfvf(OpenGL::GL_FRONT, OpenGL::GL_SHININESS, @front_material.shininess)
|
66
|
+
glMaterialfv(OpenGL::GL_BACK, OpenGL::GL_AMBIENT, @back_material.ambient.pack('F*'))
|
67
|
+
glMaterialfv(OpenGL::GL_BACK, OpenGL::GL_DIFFUSE, @back_material.diffuse.pack('F*'))
|
68
|
+
glMaterialfv(OpenGL::GL_BACK, OpenGL::GL_SPECULAR, @back_material.specular.pack('F*'))
|
69
|
+
glMaterialfv(OpenGL::GL_BACK, OpenGL::GL_EMISSION, @back_material.emission.pack('F*'))
|
70
|
+
glMaterialf(OpenGL::GL_BACK, OpenGL::GL_SHININESS, @back_material.shininess)
|
71
71
|
else
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
72
|
+
glMaterialfv(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_AMBIENT, @front_material.ambient.pack('F*'))
|
73
|
+
glMaterialfv(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_DIFFUSE, @front_material.diffuse.pack('F*'))
|
74
|
+
glMaterialfv(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_SPECULAR, @front_material.specular.pack('F*'))
|
75
|
+
glMaterialfv(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_EMISSION, @front_material.emission.pack('F*'))
|
76
|
+
glMaterialf(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_SHININESS, @front_material.shininess)
|
77
77
|
end
|
78
78
|
|
79
79
|
# Surface
|
80
|
-
|
81
|
-
|
80
|
+
glPolygonMode(OpenGL::GL_FRONT_AND_BACK, OpenGL::GL_FILL)
|
81
|
+
glDisable(OpenGL::GL_CULL_FACE);
|
82
82
|
drawshape(viewer)
|
83
83
|
|
84
84
|
# Restore attributes and matrix
|
85
|
-
|
86
|
-
|
85
|
+
glPopMatrix
|
86
|
+
glPopAttrib
|
87
87
|
end
|
88
88
|
|
89
89
|
# Draw the StlShape
|
@@ -144,7 +144,5 @@ module Cosmos
|
|
144
144
|
def export
|
145
145
|
raise "export must be defined by subclass"
|
146
146
|
end
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
end # module Cosmos
|
147
|
+
end
|
148
|
+
end
|