cosmos 4.2.4 → 4.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.dockerignore +2 -0
- data/.github/ISSUE_TEMPLATE/bug_report.md +30 -0
- data/.github/ISSUE_TEMPLATE/feature_request.md +19 -0
- data/.github/ISSUE_TEMPLATE/help---usage---general-question.md +12 -0
- data/.gitignore +2 -0
- data/.travis.yml +6 -6
- data/Dockerfile +69 -0
- data/Gemfile +1 -1
- data/Manifest.txt +130 -46
- data/README.md +9 -0
- data/Rakefile +57 -0
- data/appveyor.yml +18 -7
- data/autohotkey/config/targets/INST/cmd_tlm/inst_cmds.txt +1 -1
- data/autohotkey/config/targets/INST/cmd_tlm/inst_tlm.txt +5 -5
- data/autohotkey/config/targets/INST/lib/sim_inst.rb +3 -1
- data/autohotkey/config/tools/cmd_sequence/cmd_sequence.txt +2 -0
- data/autohotkey/config/tools/handbook_creator/assets/css/bootstrap-theme.css +397 -0
- data/autohotkey/config/tools/handbook_creator/assets/css/bootstrap-theme.min.css +7 -0
- data/autohotkey/config/tools/handbook_creator/assets/css/bootstrap.css +7118 -0
- data/autohotkey/config/tools/handbook_creator/assets/css/bootstrap.min.css +7 -0
- data/autohotkey/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.eot +0 -0
- data/autohotkey/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.svg +229 -0
- data/autohotkey/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
- data/autohotkey/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.woff +0 -0
- data/autohotkey/config/tools/handbook_creator/assets/js/bootstrap.js +2006 -0
- data/autohotkey/config/tools/handbook_creator/assets/js/bootstrap.min.js +7 -0
- data/autohotkey/config/tools/table_manager/ConfigTables_def.txt +2 -4
- data/autohotkey/config/tools/table_manager/SubTables/OneDimensionalSubTable_def.txt +31 -0
- data/autohotkey/config/tools/table_manager/SubTables/TwoDimensionalSubTable_def.txt +28 -0
- data/autohotkey/config/tools/test_runner/test_runner.txt +1 -1
- data/autohotkey/config/tools/test_runner/test_runner2.txt +1 -1
- data/autohotkey/config/tools/test_runner/test_runner3.txt +1 -1
- data/autohotkey/config/tools/test_runner/test_runner4.txt +1 -1
- data/autohotkey/lib/cmd_sequence_exporter.rb +52 -0
- data/autohotkey/procedures/collect.rb +2 -2
- data/autohotkey/procedures/collect_util.rb +1 -1
- data/autohotkey/procedures/script_test.rb +1 -1
- data/autohotkey/tools/CmdSenderAHK2 +18 -0
- data/autohotkey/tools/cmd_sender.ahk +34 -6
- data/autohotkey/tools/cmd_sender2.ahk +4 -0
- data/autohotkey/tools/cmd_sequence.ahk +36 -22
- data/autohotkey/tools/cmd_sequence2.ahk +1 -1
- data/autohotkey/tools/config_editor.ahk +5 -5
- data/autohotkey/tools/launcher.ahk +1 -0
- data/autohotkey/tools/limits_monitor.ahk +1 -1
- data/autohotkey/tools/packet_viewer.ahk +7 -6
- data/autohotkey/tools/script_runner.ahk +16 -4
- data/autohotkey/tools/test_runner.ahk +8 -8
- data/bin/cosmos +38 -1
- data/bin/cstol_converter +1 -1
- data/bin/dart_util +0 -0
- data/bin/rubysloc +73 -28
- data/bin/xtce_converter +1 -1
- data/cosmos.gemspec +7 -9
- data/data/config/_interfaces.yaml +4 -0
- data/data/config/cmd_sequence.yaml +14 -0
- data/data/config/command_modifiers.yaml +16 -1
- data/data/config/housekeeping_params.yaml +14 -0
- data/data/config/interface_modifiers.yaml +14 -2
- data/data/config/item_modifiers.yaml +11 -1
- data/data/config/launcher.yaml +12 -2
- data/data/config/param_item_modifiers.yaml +7 -2
- data/data/config/parameter_modifiers.yaml +20 -0
- data/data/config/screen.yaml +2 -0
- data/data/config/script_runner.yaml +9 -0
- data/data/config/system.yaml +152 -28
- data/data/config/table_manager.yaml +7 -0
- data/data/config/target.yaml +12 -0
- data/data/config/telemetry_modifiers.yaml +19 -2
- data/data/config/test_runner.yaml +10 -9
- data/data/config/widgets.yaml +174 -11
- data/data/crc.txt +428 -415
- data/demo/Gemfile +1 -1
- data/demo/Launcher.bat +1 -9
- data/demo/Launcher2.bat +1 -0
- data/demo/LauncherMini.bat +1 -0
- data/demo/Rakefile +2 -0
- data/demo/config/dart/Gemfile +2 -7
- data/demo/config/data/crc.txt +243 -219
- data/demo/config/system/system.txt +42 -3
- data/demo/config/system/system2.txt +34 -5
- data/demo/config/system/system_alt_ports.txt +80 -0
- data/demo/config/targets/EXAMPLE/cmd_tlm_server.txt +1 -0
- data/demo/config/targets/INST/cmd_tlm/inst_cmds.txt +5 -4
- data/demo/config/targets/INST/cmd_tlm/inst_tlm.txt +12 -7
- data/demo/config/targets/INST/cmd_tlm/inst_tlm_override.txt +12 -0
- data/demo/config/targets/INST/cmd_tlm_server.txt +2 -0
- data/demo/config/targets/INST/lib/sim_inst.rb +15 -3
- data/demo/config/targets/INST/screens/adcs.txt +2 -2
- data/demo/config/targets/INST/screens/block.txt +1 -1
- data/demo/config/targets/INST/screens/commanding.txt +1 -1
- data/demo/config/targets/INST/screens/ground.txt +27 -5
- data/demo/config/targets/INST/screens/ground_error.gif +0 -0
- data/demo/config/{data/groundoff.gif → targets/INST/screens/ground_off.gif} +0 -0
- data/demo/config/{data/groundon.gif → targets/INST/screens/ground_on.gif} +0 -0
- data/demo/config/targets/INST/screens/limits.txt +69 -31
- data/demo/config/targets/INST/screens/other.txt +13 -3
- data/demo/config/targets/INST/screens/params.txt +54 -0
- data/demo/config/targets/INST/screens/satellite.gif +0 -0
- data/demo/config/targets/INST/target.txt +1 -0
- data/demo/config/tools/cmd_tlm_server/cmd_tlm_server_chain.txt +18 -0
- data/demo/config/tools/data_viewer/data_viewer.txt +3 -0
- data/demo/config/tools/handbook_creator/assets/css/bootstrap-theme.css +397 -0
- data/demo/config/tools/handbook_creator/assets/css/bootstrap-theme.min.css +7 -0
- data/demo/config/tools/handbook_creator/assets/css/bootstrap.css +7118 -0
- data/demo/config/tools/handbook_creator/assets/css/bootstrap.min.css +7 -0
- data/demo/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.eot +0 -0
- data/demo/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.svg +229 -0
- data/demo/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
- data/demo/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.woff +0 -0
- data/demo/config/tools/handbook_creator/assets/img/ball_logo.bmp +0 -0
- data/demo/config/tools/handbook_creator/assets/img/ball_logo.gif +0 -0
- data/demo/config/tools/handbook_creator/assets/img/ball_logo.jpg +0 -0
- data/demo/config/tools/handbook_creator/assets/js/bootstrap.js +2006 -0
- data/demo/config/tools/handbook_creator/assets/js/bootstrap.min.js +7 -0
- data/demo/config/tools/handbook_creator/assets/js/html5shiv.js +8 -0
- data/demo/config/tools/handbook_creator/assets/js/jquery-1.10.2.min.js +6 -0
- data/demo/config/tools/handbook_creator/assets/js/respond.min.js +6 -0
- data/demo/config/tools/handbook_creator/default_toc.xsl +59 -59
- data/demo/config/tools/script_runner/script_runner.txt +1 -2
- data/demo/config/tools/test_runner/test_runner.txt +3 -1
- data/demo/lib/example_background_task.rb +1 -0
- data/demo/procedures/cosmos_api_test.rb +26 -22
- data/demo/procedures/interactive.rb +22 -0
- data/demo/procedures/local_screen_example.rb +51 -0
- data/ext/cosmos/ext/cosmos_io/cosmos_io.c +32 -4
- data/ext/cosmos/ext/packet/packet.c +6 -77
- data/ext/mkrf_conf.rb +2 -2
- data/extensions/vscode/.gitignore +4 -0
- data/extensions/vscode/.vscode/launch.json +32 -0
- data/extensions/vscode/.vscode/settings.json +13 -0
- data/extensions/vscode/.vscode/tasks.json +79 -0
- data/extensions/vscode/License.txt +879 -0
- data/extensions/vscode/README.md +9 -0
- data/extensions/vscode/client/License.txt +879 -0
- data/extensions/vscode/client/README.md +39 -0
- data/extensions/vscode/client/cosmos.configuration.json +23 -0
- data/extensions/vscode/client/images/icon.png +0 -0
- data/extensions/vscode/client/package-lock.json +414 -0
- data/extensions/vscode/client/package.json +105 -0
- data/extensions/vscode/client/src/extension.ts +132 -0
- data/extensions/vscode/client/src/screen_preview.rb +25 -0
- data/extensions/vscode/client/syntaxes/cosmos.tmLanguage.json +219 -0
- data/extensions/vscode/client/tsconfig.json +17 -0
- data/extensions/vscode/package-lock.json +26 -0
- data/extensions/vscode/package.json +35 -0
- data/extensions/vscode/server/License.txt +879 -0
- data/extensions/vscode/server/package-lock.json +236 -0
- data/extensions/vscode/server/package.json +29 -0
- data/extensions/vscode/server/src/server.ts +59 -0
- data/extensions/vscode/server/tsconfig.json +16 -0
- data/install/Gemfile +1 -1
- data/install/Launcher.bat +1 -9
- data/install/config/dart/Gemfile +3 -8
- data/install/config/data/crc.txt +148 -132
- data/install/config/system/system.txt +36 -3
- data/install/config/tools/handbook_creator/assets/css/bootstrap-theme.css +397 -0
- data/install/config/tools/handbook_creator/assets/css/bootstrap-theme.min.css +7 -0
- data/install/config/tools/handbook_creator/assets/css/bootstrap.css +7118 -0
- data/install/config/tools/handbook_creator/assets/css/bootstrap.min.css +7 -0
- data/install/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.eot +0 -0
- data/install/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.svg +229 -0
- data/install/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
- data/install/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.woff +0 -0
- data/install/config/tools/handbook_creator/assets/img/ball_logo.bmp +0 -0
- data/install/config/tools/handbook_creator/assets/img/ball_logo.gif +0 -0
- data/install/config/tools/handbook_creator/assets/img/ball_logo.jpg +0 -0
- data/install/config/tools/handbook_creator/assets/js/bootstrap.js +2006 -0
- data/install/config/tools/handbook_creator/assets/js/bootstrap.min.js +7 -0
- data/install/config/tools/handbook_creator/assets/js/html5shiv.js +8 -0
- data/install/config/tools/handbook_creator/assets/js/jquery-1.10.2.min.js +6 -0
- data/install/config/tools/handbook_creator/assets/js/respond.min.js +6 -0
- data/install/config/tools/handbook_creator/default_toc.xsl +59 -59
- data/lib/cosmos/config/config_parser.rb +4 -5
- data/lib/cosmos/conversions.rb +2 -0
- data/lib/cosmos/conversions/packet_time_formatted_conversion.rb +38 -0
- data/lib/cosmos/conversions/packet_time_seconds_conversion.rb +38 -0
- data/lib/cosmos/core_ext/cosmos_io.rb +2 -1
- data/lib/cosmos/core_ext/time.rb +3 -1
- data/lib/cosmos/dart/config/boot.rb +1 -1
- data/lib/cosmos/dart/config/database.yml +2 -0
- data/lib/cosmos/dart/examples/dart_decom_client.rb +1 -1
- data/lib/cosmos/dart/examples/dart_stream_client.rb +6 -2
- data/lib/cosmos/dart/lib/dart_common.rb +13 -6
- data/lib/cosmos/dart/lib/dart_constants.rb +15 -0
- data/lib/cosmos/dart/lib/dart_database_cleaner.rb +2 -2
- data/lib/cosmos/dart/lib/dart_decom_query.rb +5 -6
- data/lib/cosmos/dart/lib/dart_decommutator.rb +64 -54
- data/lib/cosmos/dart/lib/dart_importer.rb +3 -3
- data/lib/cosmos/dart/lib/dart_master_query.rb +71 -0
- data/lib/cosmos/dart/lib/dart_packet_log_writer.rb +2 -2
- data/lib/cosmos/dart/lib/dart_reducer_worker_thread.rb +165 -134
- data/lib/cosmos/dart/processes/dart.rb +4 -2
- data/lib/cosmos/dart/processes/dart_decom_server.rb +3 -3
- data/lib/cosmos/dart/processes/dart_ingester.rb +40 -1
- data/lib/cosmos/dart/processes/dart_master.rb +44 -0
- data/lib/cosmos/dart/processes/dart_util.rb +119 -4
- data/lib/cosmos/dart/spec/dart/dart_reducer_manager_spec.rb +3 -3
- data/lib/cosmos/gui/dialogs/cmd_tlm_raw_dialog.rb +9 -5
- data/lib/cosmos/gui/dialogs/details_dialog.rb +44 -29
- data/lib/cosmos/gui/dialogs/exception_list_dialog.rb +1 -1
- data/lib/cosmos/gui/dialogs/find_replace_dialog.rb +3 -3
- data/lib/cosmos/gui/dialogs/interface_raw_dialog.rb +2 -2
- data/lib/cosmos/gui/dialogs/set_tlm_dialog.rb +1 -1
- data/lib/cosmos/gui/dialogs/tlm_details_dialog.rb +11 -10
- data/lib/cosmos/gui/dialogs/tlm_graph_dialog.rb +4 -2
- data/lib/cosmos/gui/opengl/earth_model.rb +1 -1
- data/lib/cosmos/gui/qt.rb +13 -2
- data/lib/cosmos/gui/qt_tool.rb +71 -43
- data/lib/cosmos/gui/text/ruby_editor.rb +91 -49
- data/lib/cosmos/gui/utilities/classification_banner.rb +60 -0
- data/lib/cosmos/gui/utilities/screenshot.rb +1 -1
- data/lib/cosmos/gui/utilities/script_module_gui.rb +117 -91
- data/lib/cosmos/gui/widgets/dart_meta_frame.rb +22 -3
- data/lib/cosmos/interfaces.rb +2 -0
- data/lib/cosmos/interfaces/dart_status_interface.rb +1 -1
- data/lib/cosmos/interfaces/interface.rb +9 -1
- data/lib/cosmos/interfaces/linc_interface.rb +3 -3
- data/lib/cosmos/interfaces/protocols/burst_protocol.rb +1 -1
- data/lib/cosmos/interfaces/protocols/crc_protocol.rb +1 -1
- data/lib/cosmos/interfaces/protocols/fixed_protocol.rb +40 -18
- data/lib/cosmos/interfaces/protocols/ignore_packet_protocol.rb +46 -0
- data/lib/cosmos/interfaces/protocols/length_protocol.rb +5 -0
- data/lib/cosmos/interfaces/protocols/preidentified_protocol.rb +68 -23
- data/lib/cosmos/interfaces/protocols/template_protocol.rb +9 -4
- data/lib/cosmos/interfaces/serial_interface.rb +7 -1
- data/lib/cosmos/interfaces/simulated_target_interface.rb +14 -5
- data/lib/cosmos/interfaces/stream_interface.rb +1 -1
- data/lib/cosmos/interfaces/tcpip_server_interface.rb +13 -13
- data/lib/cosmos/io/json_drb.rb +16 -12
- data/lib/cosmos/io/json_drb_object.rb +7 -2
- data/lib/cosmos/io/json_drb_rack.rb +25 -5
- data/lib/cosmos/io/json_rpc.rb +1 -1
- data/lib/cosmos/io/posix_serial_driver.rb +60 -22
- data/lib/cosmos/io/serial_driver.rb +11 -8
- data/lib/cosmos/io/win32_serial_driver.rb +31 -3
- data/lib/cosmos/packet_logs/packet_log_reader.rb +71 -28
- data/lib/cosmos/packet_logs/packet_log_writer.rb +13 -1
- data/lib/cosmos/packets/commands.rb +30 -9
- data/lib/cosmos/packets/packet.rb +105 -34
- data/lib/cosmos/packets/packet_config.rb +60 -10
- data/lib/cosmos/packets/parsers/format_string_parser.rb +0 -1
- data/lib/cosmos/packets/parsers/state_parser.rb +0 -1
- data/lib/cosmos/packets/parsers/xtce_converter.rb +2 -0
- data/lib/cosmos/packets/parsers/xtce_parser.rb +5 -4
- data/lib/cosmos/packets/structure.rb +32 -4
- data/lib/cosmos/packets/structure_item.rb +5 -1
- data/lib/cosmos/packets/telemetry.rb +30 -4
- data/lib/cosmos/script/api_shared.rb +22 -10
- data/lib/cosmos/script/extract.rb +1 -1
- data/lib/cosmos/script/limits.rb +4 -0
- data/lib/cosmos/script/script.rb +29 -20
- data/lib/cosmos/script/scripting.rb +16 -14
- data/lib/cosmos/script/telemetry.rb +3 -1
- data/lib/cosmos/script/tools.rb +18 -8
- data/lib/cosmos/streams/serial_stream.rb +11 -6
- data/lib/cosmos/system/system.rb +214 -76
- data/lib/cosmos/system/target.rb +39 -9
- data/lib/cosmos/tools/cmd_extractor/cmd_extractor.rb +116 -55
- data/lib/cosmos/tools/cmd_sender/cmd_param_table_item_delegate.rb +15 -0
- data/lib/cosmos/tools/cmd_sender/cmd_params.rb +382 -0
- data/lib/cosmos/tools/cmd_sender/cmd_sender.rb +54 -340
- data/lib/cosmos/tools/cmd_sequence/cmd_sequence.rb +74 -52
- data/lib/cosmos/tools/cmd_sequence/sequence_item.rb +40 -333
- data/lib/cosmos/tools/cmd_sequence/sequence_list.rb +16 -11
- data/lib/cosmos/tools/cmd_tlm_server/api.rb +13 -0
- data/lib/cosmos/tools/cmd_tlm_server/background_tasks.rb +2 -0
- data/lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server.rb +44 -15
- data/lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb +8 -1
- data/lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb +18 -20
- data/lib/cosmos/tools/cmd_tlm_server/commanding.rb +13 -2
- data/lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb +2 -2
- data/lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb +13 -13
- data/lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb +9 -6
- data/lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb +8 -8
- data/lib/cosmos/tools/cmd_tlm_server/gui/targets_tab.rb +5 -5
- data/lib/cosmos/tools/cmd_tlm_server/interface_thread.rb +35 -20
- data/lib/cosmos/tools/cmd_tlm_server/replay_backend.rb +15 -11
- data/lib/cosmos/tools/cmd_tlm_server/router_thread.rb +5 -0
- data/lib/cosmos/tools/cmd_tlm_server/routers.rb +2 -0
- data/lib/cosmos/tools/config_editor/config_editor.rb +181 -94
- data/lib/cosmos/tools/config_editor/config_editor_frame.rb +10 -9
- data/lib/cosmos/tools/config_editor/system_config_dialog.rb +158 -0
- data/lib/cosmos/tools/data_viewer/data_viewer.rb +57 -47
- data/lib/cosmos/tools/data_viewer/data_viewer_component.rb +1 -0
- data/lib/cosmos/tools/data_viewer/dump_component.rb +3 -9
- data/lib/cosmos/tools/data_viewer/text_component.rb +77 -0
- data/lib/cosmos/tools/handbook_creator/handbook_creator.rb +68 -42
- data/lib/cosmos/tools/handbook_creator/handbook_creator_config.rb +1 -1
- data/lib/cosmos/tools/launcher/launcher.rb +2 -1
- data/lib/cosmos/tools/limits_monitor/limits_monitor.rb +59 -41
- data/lib/cosmos/tools/opengl_builder/opengl_builder.rb +42 -42
- data/lib/cosmos/tools/packet_viewer/packet_viewer.rb +64 -59
- data/lib/cosmos/tools/script_runner/script_runner.rb +198 -123
- data/lib/cosmos/tools/script_runner/script_runner_config.rb +14 -0
- data/lib/cosmos/tools/script_runner/script_runner_frame.rb +87 -35
- data/lib/cosmos/tools/table_manager/table_config.rb +5 -3
- data/lib/cosmos/tools/table_manager/table_manager.rb +48 -45
- data/lib/cosmos/tools/test_runner/test.rb +5 -2
- data/lib/cosmos/tools/test_runner/test_runner.rb +61 -38
- data/lib/cosmos/tools/test_runner/test_runner_chooser.rb +24 -12
- data/lib/cosmos/tools/tlm_extractor/tlm_extractor.rb +48 -48
- data/lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb +5 -8
- data/lib/cosmos/tools/tlm_extractor/tlm_extractor_processor.rb +20 -16
- data/lib/cosmos/tools/tlm_grapher/data_object_adders/xy_data_object_adder.rb +3 -3
- data/lib/cosmos/tools/tlm_grapher/data_object_editors/housekeeping_data_object_editor.rb +7 -7
- data/lib/cosmos/tools/tlm_grapher/data_object_editors/xy_data_object_editor.rb +10 -10
- data/lib/cosmos/tools/tlm_grapher/data_objects/housekeeping_data_object.rb +10 -3
- data/lib/cosmos/tools/tlm_grapher/data_objects/xy_data_object.rb +6 -6
- data/lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb +14 -14
- data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_dart_thread.rb +21 -17
- data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_realtime_thread.rb +5 -8
- data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tool.rb +94 -91
- data/lib/cosmos/tools/tlm_grapher/tlm_grapher.rb +27 -26
- data/lib/cosmos/tools/tlm_viewer/screen.rb +76 -14
- data/lib/cosmos/tools/tlm_viewer/tlm_viewer.rb +51 -34
- data/lib/cosmos/tools/tlm_viewer/widgets.rb +3 -0
- data/lib/cosmos/tools/tlm_viewer/widgets/aging_widget.rb +4 -5
- data/lib/cosmos/tools/tlm_viewer/widgets/array_widget.rb +3 -4
- data/lib/cosmos/tools/tlm_viewer/widgets/block_widget.rb +4 -5
- data/lib/cosmos/tools/tlm_viewer/widgets/canvas_clickable.rb +16 -2
- data/lib/cosmos/tools/tlm_viewer/widgets/canvas_widget.rb +17 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb +1 -2
- data/lib/cosmos/tools/tlm_viewer/widgets/canvasellipse_widget.rb +40 -0
- data/lib/cosmos/tools/tlm_viewer/widgets/canvasimage_widget.rb +12 -7
- data/lib/cosmos/tools/tlm_viewer/widgets/canvasimagevalue_widget.rb +79 -29
- data/lib/cosmos/tools/tlm_viewer/widgets/canvaslabel_widget.rb +1 -0
- data/lib/cosmos/tools/tlm_viewer/widgets/canvaslabelvalue_widget.rb +2 -1
- data/lib/cosmos/tools/tlm_viewer/widgets/canvasline_widget.rb +2 -0
- data/lib/cosmos/tools/tlm_viewer/widgets/canvaslinevalue_widget.rb +4 -0
- data/lib/cosmos/tools/tlm_viewer/widgets/canvasvalue_widget.rb +33 -25
- data/lib/cosmos/tools/tlm_viewer/widgets/checkbutton_widget.rb +5 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/combobox_widget.rb +5 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/formatfontvalue_widget.rb +1 -1
- data/lib/cosmos/tools/tlm_viewer/widgets/formatvalue_widget.rb +4 -7
- data/lib/cosmos/tools/tlm_viewer/widgets/horizontal_widget.rb +5 -5
- data/lib/cosmos/tools/tlm_viewer/widgets/horizontalbox_widget.rb +6 -7
- data/lib/cosmos/tools/tlm_viewer/widgets/horizontalline_widget.rb +2 -4
- data/lib/cosmos/tools/tlm_viewer/widgets/label_widget.rb +10 -8
- data/lib/cosmos/tools/tlm_viewer/widgets/labelformatvalue_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/labelled_widget.rb +58 -0
- data/lib/cosmos/tools/tlm_viewer/widgets/labelprogressbar_widget.rb +3 -4
- data/lib/cosmos/tools/tlm_viewer/widgets/labeltrendlimitsbar_widget.rb +2 -4
- data/lib/cosmos/tools/tlm_viewer/widgets/labelvalue_widget.rb +2 -1
- data/lib/cosmos/tools/tlm_viewer/widgets/labelvaluedesc_widget.rb +3 -5
- data/lib/cosmos/tools/tlm_viewer/widgets/labelvaluelimitsbar_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/labelvaluelimitscolumn_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/labelvaluerangebar_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/labelvaluerangecolumn_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/layout_widget.rb +3 -5
- data/lib/cosmos/tools/tlm_viewer/widgets/led_widget.rb +108 -0
- data/lib/cosmos/tools/tlm_viewer/widgets/limits_widget.rb +60 -10
- data/lib/cosmos/tools/tlm_viewer/widgets/limitsbar_widget.rb +22 -8
- data/lib/cosmos/tools/tlm_viewer/widgets/limitscolor_widget.rb +19 -13
- data/lib/cosmos/tools/tlm_viewer/widgets/limitscolumn_widget.rb +22 -8
- data/lib/cosmos/tools/tlm_viewer/widgets/linegraph_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/matrixbycolumns_widget.rb +4 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/multi_widget.rb +1 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/progressbar_widget.rb +10 -5
- data/lib/cosmos/tools/tlm_viewer/widgets/radiobutton_widget.rb +7 -4
- data/lib/cosmos/tools/tlm_viewer/widgets/rangebar_widget.rb +4 -6
- data/lib/cosmos/tools/tlm_viewer/widgets/rangecolumn_widget.rb +3 -5
- data/lib/cosmos/tools/tlm_viewer/widgets/screenshotbutton_widget.rb +4 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/scrollwindow_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/sectionheader_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/spacer_widget.rb +4 -6
- data/lib/cosmos/tools/tlm_viewer/widgets/tabbook_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/tabitem_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/textbox_widget.rb +13 -4
- data/lib/cosmos/tools/tlm_viewer/widgets/textfield_widget.rb +3 -4
- data/lib/cosmos/tools/tlm_viewer/widgets/timegraph_widget.rb +3 -8
- data/lib/cosmos/tools/tlm_viewer/widgets/title_widget.rb +6 -12
- data/lib/cosmos/tools/tlm_viewer/widgets/trendbar_widget.rb +5 -10
- data/lib/cosmos/tools/tlm_viewer/widgets/trendlimitsbar_widget.rb +5 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/value_widget.rb +4 -4
- data/lib/cosmos/tools/tlm_viewer/widgets/valuelimitsbar_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/valuelimitscolumn_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/valuerangebar_widget.rb +3 -4
- data/lib/cosmos/tools/tlm_viewer/widgets/valuerangecolumn_widget.rb +2 -3
- data/lib/cosmos/tools/tlm_viewer/widgets/vertical_widget.rb +8 -7
- data/lib/cosmos/tools/tlm_viewer/widgets/verticalbox_widget.rb +9 -7
- data/lib/cosmos/tools/tlm_viewer/widgets/widget.rb +60 -47
- data/lib/cosmos/top_level.rb +37 -13
- data/lib/cosmos/utilities/ruby_lex_utils.rb +34 -30
- data/lib/cosmos/version.rb +5 -5
- data/lib/cosmos/win32/excel.rb +81 -24
- data/make_gems.sh +10 -0
- data/run_gui_tests.bat +1 -0
- data/spec/conversions/packet_time_formatted_conversion_spec.rb +58 -0
- data/spec/conversions/packet_time_seconds_conversion_spec.rb +60 -0
- data/spec/core_ext/socket_spec.rb +1 -1
- data/spec/core_ext/time_spec.rb +4 -0
- data/spec/gui/utilities/script_module_gui_spec.rb +44 -63
- data/spec/install/config/targets/INST/cmd_tlm/inst_cmds.txt +1 -1
- data/spec/install/config/targets/INST/cmd_tlm/inst_tlm.txt +5 -5
- data/spec/install/yaml_docs_spec.rb +132 -0
- data/spec/interfaces/linc_interface_spec.rb +1 -1
- data/spec/interfaces/protocols/fixed_protocol_spec.rb +20 -9
- data/spec/interfaces/protocols/ignore_packet_protocol_spec.rb +243 -0
- data/spec/interfaces/protocols/length_protocol_spec.rb +39 -0
- data/spec/interfaces/protocols/preidentified_protocol_spec.rb +227 -4
- data/spec/interfaces/protocols/template_protocol_spec.rb +78 -25
- data/spec/io/json_drb_rack_spec.rb +166 -0
- data/spec/io/json_drb_spec.rb +14 -0
- data/spec/io/json_rpc_spec.rb +4 -5
- data/spec/io/posix_serial_driver_spec.rb +81 -0
- data/spec/io/serial_driver_spec.rb +15 -13
- data/spec/io/win32_serial_driver_spec.rb +33 -3
- data/spec/packet_logs/packet_log_reader_spec.rb +106 -52
- data/spec/packets/commands_spec.rb +22 -0
- data/spec/packets/packet_config_spec.rb +29 -16
- data/spec/packets/packet_item_spec.rb +2 -2
- data/spec/packets/packet_spec.rb +39 -6
- data/spec/packets/parsers/format_string_parser_spec.rb +0 -11
- data/spec/packets/parsers/macro_parser_spec.rb +36 -36
- data/spec/packets/parsers/state_parser_spec.rb +69 -11
- data/spec/packets/structure_spec.rb +93 -2
- data/spec/packets/telemetry_spec.rb +63 -10
- data/spec/script/extract_spec.rb +4 -1
- data/spec/script/script_spec.rb +2 -3
- data/spec/script/scripting_spec.rb +2 -1
- data/spec/script/tools_spec.rb +0 -1
- data/spec/streams/tcpip_socket_stream_spec.rb +32 -27
- data/spec/system/system_spec.rb +187 -4
- data/spec/system/target_spec.rb +62 -1
- data/spec/tools/cmd_tlm_server/api_spec.rb +29 -21
- data/spec/tools/cmd_tlm_server/background_tasks_spec.rb +15 -7
- data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb +33 -0
- data/spec/tools/cmd_tlm_server/commanding_spec.rb +25 -1
- data/spec/tools/cmd_tlm_server/interface_thread_spec.rb +15 -0
- data/spec/tools/cmd_tlm_server/router_thread_spec.rb +2 -3
- data/spec/top_level/top_level_spec.rb +29 -5
- data/spec/utilities/message_log_spec.rb +6 -3
- data/tasks/gemfile_stats.rake +38 -14
- data/test/performance/config/system/system.txt +0 -0
- data/test/performance/config/targets/PACKET/cmd_tlm/packet_tlm.txt +5 -5
- data/test/performance/config/tools/handbook_creator/assets/css/bootstrap-theme.css +397 -0
- data/test/performance/config/tools/handbook_creator/assets/css/bootstrap-theme.min.css +7 -0
- data/test/performance/config/tools/handbook_creator/assets/css/bootstrap.css +7118 -0
- data/test/performance/config/tools/handbook_creator/assets/css/bootstrap.min.css +7 -0
- data/test/performance/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.eot +0 -0
- data/test/performance/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.svg +229 -0
- data/test/performance/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
- data/test/performance/config/tools/handbook_creator/assets/fonts/glyphicons-halflings-regular.woff +0 -0
- data/test/performance/config/tools/handbook_creator/assets/img/ball_logo.bmp +0 -0
- data/test/performance/config/tools/handbook_creator/assets/img/ball_logo.gif +0 -0
- data/test/performance/config/tools/handbook_creator/assets/img/ball_logo.jpg +0 -0
- data/test/performance/config/tools/handbook_creator/assets/js/bootstrap.js +2006 -0
- data/test/performance/config/tools/handbook_creator/assets/js/bootstrap.min.js +7 -0
- data/test/performance/config/tools/handbook_creator/assets/js/html5shiv.js +8 -0
- data/test/performance/config/tools/handbook_creator/assets/js/jquery-1.10.2.min.js +6 -0
- data/test/performance/config/tools/handbook_creator/assets/js/respond.min.js +6 -0
- data/test/performance/config/tools/test_runner/test_runner.txt +1 -1
- data/test/performance/procedures/cosmos_api_test.rb +1 -1
- data/test/performance/tools/identify_performance.rb +82 -0
- metadata +154 -64
- data/lib/cosmos/dart/Gemfile +0 -69
@@ -0,0 +1,60 @@
|
|
1
|
+
# encoding: ascii-8bit
|
2
|
+
|
3
|
+
# Copyright 2014 Ball Aerospace & Technologies Corp.
|
4
|
+
# All Rights Reserved.
|
5
|
+
#
|
6
|
+
# This program is free software; you can modify and/or redistribute it
|
7
|
+
# under the terms of the GNU General Public License
|
8
|
+
# as published by the Free Software Foundation; version 3 with
|
9
|
+
# attribution addendums as found in the LICENSE.txt
|
10
|
+
|
11
|
+
module ClassificationBanner
|
12
|
+
|
13
|
+
# Add to Qt::MainWindow the ability to display a classification banner. Typically used on every QtTool and Screen
|
14
|
+
class Qt::MainWindow
|
15
|
+
|
16
|
+
def add_classification_banner
|
17
|
+
# Add a classification banner if the system configuration called for one
|
18
|
+
classification_banner = Cosmos::System.instance.classificiation_banner
|
19
|
+
unless classification_banner.nil?
|
20
|
+
# Get the RGB color information from the classification_banner
|
21
|
+
color_red = classification_banner['color'].red
|
22
|
+
color_green = classification_banner['color'].green
|
23
|
+
color_blue = classification_banner['color'].blue
|
24
|
+
color_rgb = "#{color_red},#{color_green},#{color_blue}"
|
25
|
+
|
26
|
+
# Create a classification toolbar
|
27
|
+
classification_toolbar = Qt::ToolBar.new
|
28
|
+
# Disable right clicking on the bar (prevents it from being hidden unintentionally)
|
29
|
+
classification_toolbar.setContextMenuPolicy(Qt::PreventContextMenu)
|
30
|
+
# Freeze the bar at the top
|
31
|
+
classification_toolbar.setFloatable(false)
|
32
|
+
classification_toolbar.setMovable(false)
|
33
|
+
# Specify sizes and set the style (background = background color, color = text color)
|
34
|
+
classification_toolbar.minimumHeight = 20
|
35
|
+
classification_toolbar.maximumHeight = 20
|
36
|
+
classification_toolbar.setStyleSheet("background:rgb(#{color_rgb});color:white;text-align:center;border:none;")
|
37
|
+
|
38
|
+
# Create a frame that will hold a horizontal layout
|
39
|
+
label_frame = Qt::Frame.new
|
40
|
+
label_layout = Qt::HBoxLayout.new(label_frame)
|
41
|
+
label_layout.setContentsMargins(0,1,0,0) # Centers the text nicely inside the horizontal layout
|
42
|
+
|
43
|
+
# Create a label of the classification and add it the horizontal layout
|
44
|
+
label = Qt::Label.new("#{classification_banner['display_text']}")
|
45
|
+
label.setStyleSheet("margin:0px;")
|
46
|
+
|
47
|
+
# Add stretchers on either side so it is always in the middle and looks nice
|
48
|
+
label_layout.addStretch(1)
|
49
|
+
label_layout.addWidget(label)
|
50
|
+
label_layout.addStretch(1)
|
51
|
+
|
52
|
+
# Add the frame to the main toolbar, then add the toolbar to the MainWindow
|
53
|
+
classification_toolbar.addWidget(label_frame)
|
54
|
+
self.addToolBar(classification_toolbar)
|
55
|
+
end
|
56
|
+
|
57
|
+
end
|
58
|
+
|
59
|
+
end
|
60
|
+
end
|
@@ -10,6 +10,7 @@
|
|
10
10
|
|
11
11
|
require 'cosmos/script/script'
|
12
12
|
require 'cosmos/gui/choosers/combobox_chooser'
|
13
|
+
require 'cosmos/tools/tlm_viewer/screen'
|
13
14
|
|
14
15
|
$cmd_tlm_gui_window = nil
|
15
16
|
|
@@ -163,90 +164,116 @@ module Cosmos
|
|
163
164
|
return true # Aborted - Don't retry
|
164
165
|
end
|
165
166
|
|
166
|
-
def prompt_to_continue(string)
|
167
|
+
def prompt_to_continue(string, text_color: nil, background_color: nil, font_size: nil, font_family: nil, informative: 'Ok to Continue?', details: nil, combo: nil)
|
168
|
+
result = 'Success'
|
167
169
|
loop do
|
168
|
-
stop = false
|
169
170
|
_get_main_thread_gui do |window|
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
171
|
+
box = Qt::MessageBox.new(window)
|
172
|
+
box.setIcon(Qt::MessageBox::Question)
|
173
|
+
box.setWindowTitle("Prompt")
|
174
|
+
box.setText(string)
|
175
|
+
if informative
|
176
|
+
box.setInformativeText(informative)
|
177
|
+
elsif combo
|
178
|
+
box.setInformativeText(' ') # Added to ensure consistent layout when adding combo
|
179
|
+
end
|
180
|
+
box.setStandardButtons(Qt::MessageBox::Ok | Qt::MessageBox::Cancel)
|
181
|
+
box.setDefaultButton(Qt::MessageBox::Ok)
|
182
|
+
box.setDetailedText(details) if details
|
183
|
+
text_color = 'black' unless text_color
|
184
|
+
background_color = 'white' unless background_color
|
185
|
+
font = box.font()
|
186
|
+
font_size = font.pointSize unless font_size
|
187
|
+
font_family = font.family unless font_family
|
188
|
+
box.setStyleSheet("QMessageBox { background-color: #{background_color}; }\
|
189
|
+
QMessageBox QLabel { color: #{text_color}; font: #{font_size}pt '#{font_family}'}")
|
190
|
+
|
191
|
+
if combo
|
192
|
+
result = combo[0].clone
|
193
|
+
# Remove the items in the layout starting with the buttons so we can insert the combo
|
194
|
+
items = []
|
195
|
+
(2...box.layout.count).each do |x|
|
196
|
+
items << box.layout.takeAt(x)
|
197
|
+
end
|
198
|
+
chooser = ComboboxChooser.new(box, "Select:", combo)
|
199
|
+
chooser.setContentsMargins(11,11,11,11)
|
200
|
+
chooser.sel_command_callback = lambda { |value| result = value }
|
201
|
+
# Insert the combo right where we removed the existing items
|
202
|
+
box.layout.addWidget(chooser, 2, 0, 1, 2)
|
203
|
+
# Add back all the items we removed
|
204
|
+
items.each do |item|
|
205
|
+
widget = item && item.widget ? item.widget : nil
|
206
|
+
next unless item && item.widget
|
207
|
+
if item.widget.is_a? Qt::DialogButtonBox
|
208
|
+
box.layout.addItem(item, 3, 0, 1, 2)
|
209
|
+
elsif item.widget.is_a? Qt::Widget
|
210
|
+
box.layout.addItem(item, 4, 0, 1, 2)
|
211
|
+
end
|
212
|
+
end
|
213
|
+
end
|
214
|
+
box.exec()
|
215
|
+
if box.clickedButton.text == "Cancel"
|
179
216
|
Logger.warn "User pressed 'Cancel' for '#{string}'"
|
217
|
+
result = 'Cancel'
|
218
|
+
else
|
219
|
+
if combo
|
220
|
+
Logger.info "User selected '#{result}' for '#{string}'"
|
221
|
+
else
|
222
|
+
Logger.info "User pressed 'Ok' for '#{string}'"
|
223
|
+
result = 'Ok'
|
224
|
+
end
|
180
225
|
end
|
226
|
+
box.dispose
|
181
227
|
end
|
182
|
-
if
|
228
|
+
if result == "Cancel"
|
183
229
|
prompt_for_script_abort()
|
184
230
|
else
|
185
231
|
break
|
186
232
|
end
|
187
233
|
end
|
234
|
+
result
|
235
|
+
end
|
236
|
+
|
237
|
+
def prompt_combo_box(string, items, options)
|
238
|
+
options[:combo] = items
|
239
|
+
prompt_to_continue(string, options)
|
188
240
|
end
|
189
241
|
|
190
|
-
def prompt_message_box(string, buttons)
|
242
|
+
def prompt_message_box(string, buttons, text_color: nil, background_color: nil, font_size: nil, font_family: nil, informative: nil, details: nil, vertical: false)
|
191
243
|
loop do
|
192
244
|
result = nil
|
193
245
|
_get_main_thread_gui do |window|
|
194
|
-
|
195
|
-
|
196
|
-
|
246
|
+
box = Qt::MessageBox.new(window)
|
247
|
+
box.setIcon(Qt::MessageBox::Question)
|
248
|
+
box.setWindowTitle("Message Box")
|
249
|
+
box.setText(string)
|
250
|
+
box.setInformativeText(informative) if informative
|
197
251
|
# Check if the last parameter is false which means they don't want
|
198
252
|
# the Cancel button to be displayed
|
199
253
|
if buttons[-1] == false
|
200
|
-
buttons[0..-2].each {|text|
|
254
|
+
buttons[0..-2].each {|text| box.addButton(text, Qt::MessageBox::AcceptRole)}
|
201
255
|
else
|
202
|
-
buttons.each {|text|
|
203
|
-
|
256
|
+
buttons.each {|text| box.addButton(text, Qt::MessageBox::AcceptRole)}
|
257
|
+
box.addButton("Cancel", Qt::MessageBox::RejectRole)
|
204
258
|
end
|
205
|
-
|
206
|
-
|
259
|
+
box.setDetailedText(details) if details
|
260
|
+
text_color = 'black' unless text_color
|
261
|
+
background_color = 'white' unless background_color
|
262
|
+
font = box.font()
|
263
|
+
font_size = font.pointSize unless font_size
|
264
|
+
font_family = font.family unless font_family
|
265
|
+
box.setStyleSheet("QMessageBox { background-color: #{background_color}; }\
|
266
|
+
QMessageBox QLabel { color: #{text_color}; font: #{font_size}pt '#{font_family}'}")
|
267
|
+
# Change the layout of the buttons to vertical if necessary
|
268
|
+
box.layout.itemAt(2).widget.setOrientation(Qt::Vertical) if vertical
|
269
|
+
box.exec()
|
270
|
+
result = box.clickedButton.text
|
271
|
+
if result == "Cancel"
|
207
272
|
Logger.warn "User pressed 'Cancel' for '#{string}'"
|
208
273
|
else
|
209
|
-
Logger.info "User pressed '#{
|
210
|
-
end
|
211
|
-
result = msg.clickedButton.text
|
212
|
-
msg.dispose
|
213
|
-
end
|
214
|
-
if result == "Cancel"
|
215
|
-
prompt_for_script_abort()
|
216
|
-
else
|
217
|
-
return result
|
218
|
-
end
|
219
|
-
end
|
220
|
-
end
|
221
|
-
|
222
|
-
def prompt_vertical_message_box(string, buttons)
|
223
|
-
loop do
|
224
|
-
result = buttons[0].clone
|
225
|
-
Qt.execute_in_main_thread(true, 0.05) do
|
226
|
-
dialog = _build_dialog(string)
|
227
|
-
|
228
|
-
# Check if the last parameter is false which means they don't want
|
229
|
-
# the Cancel button to be displayed
|
230
|
-
if buttons[-1] == false
|
231
|
-
cancel = false
|
232
|
-
display_buttons = buttons[0..-2]
|
233
|
-
else
|
234
|
-
cancel = true
|
235
|
-
display_buttons = buttons
|
274
|
+
Logger.info "User pressed '#{box.clickedButton.text}' for '#{string}'"
|
236
275
|
end
|
237
|
-
|
238
|
-
button_layout.setContentsMargins(11,11,11,11)
|
239
|
-
display_buttons.each do |button_text|
|
240
|
-
button = Qt::PushButton.new(button_text)
|
241
|
-
button.connect(SIGNAL('clicked()')) do
|
242
|
-
result.replace(button_text)
|
243
|
-
dialog.accept()
|
244
|
-
end
|
245
|
-
button_layout.addWidget(button)
|
246
|
-
end
|
247
|
-
dialog.layout.addLayout(button_layout)
|
248
|
-
dialog.layout.addWidget(_build_dialog_buttons(dialog, false, cancel))
|
249
|
-
result = "Cancel" unless _exec_dialog(dialog, string, result)
|
276
|
+
box.dispose
|
250
277
|
end
|
251
278
|
if result == "Cancel"
|
252
279
|
prompt_for_script_abort()
|
@@ -256,33 +283,9 @@ module Cosmos
|
|
256
283
|
end
|
257
284
|
end
|
258
285
|
|
259
|
-
def
|
260
|
-
|
261
|
-
|
262
|
-
Qt.execute_in_main_thread(true, 0.05) do
|
263
|
-
dialog = _build_dialog(string)
|
264
|
-
# Check if the last parameter is false which means they don't want
|
265
|
-
# the Cancel button to be displayed
|
266
|
-
if options[-1] == false
|
267
|
-
cancel = false
|
268
|
-
display_options = options[0..-2]
|
269
|
-
else
|
270
|
-
cancel = true
|
271
|
-
display_options = options
|
272
|
-
end
|
273
|
-
chooser = ComboboxChooser.new(dialog, "Select:", display_options)
|
274
|
-
chooser.setContentsMargins(11,11,11,11)
|
275
|
-
chooser.sel_command_callback = lambda { |value| result.replace(value) }
|
276
|
-
dialog.layout.addWidget(chooser)
|
277
|
-
dialog.layout.addWidget(_build_dialog_buttons(dialog, true, cancel))
|
278
|
-
result = "Cancel" unless _exec_dialog(dialog, string, result)
|
279
|
-
end
|
280
|
-
if result == "Cancel"
|
281
|
-
prompt_for_script_abort()
|
282
|
-
else
|
283
|
-
return result
|
284
|
-
end
|
285
|
-
end
|
286
|
+
def prompt_vertical_message_box(string, buttons, options)
|
287
|
+
options[:vertical] = true
|
288
|
+
prompt_message_box(string, buttons, options)
|
286
289
|
end
|
287
290
|
|
288
291
|
def _build_dialog(message)
|
@@ -358,7 +361,30 @@ module Cosmos
|
|
358
361
|
$cmd_tlm_gui_window
|
359
362
|
end
|
360
363
|
|
361
|
-
|
362
|
-
|
364
|
+
def local_screen(title = "Local Screen", screen_def = nil, x_pos = nil, y_pos = nil, &block)
|
365
|
+
screen = nil
|
366
|
+
if block_given?
|
367
|
+
screen_def = yield
|
368
|
+
end
|
369
|
+
|
370
|
+
Qt.execute_in_main_thread(true) do
|
371
|
+
begin
|
372
|
+
if block_given?
|
373
|
+
screen = Screen.new(title, screen_def, nil, :REALTIME, x_pos, y_pos, nil, nil, false, false, block.binding )
|
374
|
+
else
|
375
|
+
screen = Screen.new(title, screen_def, nil, :REALTIME, x_pos, y_pos, nil, nil, false, false)
|
376
|
+
end
|
377
|
+
rescue Exception => err
|
378
|
+
puts err.formatted
|
379
|
+
end
|
380
|
+
end
|
363
381
|
|
364
|
-
|
382
|
+
screen
|
383
|
+
end
|
384
|
+
|
385
|
+
def close_local_screens
|
386
|
+
Qt.execute_in_main_thread(true) { Screen.close_all_screens(nil) }
|
387
|
+
end
|
388
|
+
end
|
389
|
+
$VERBOSE = old_verbose
|
390
|
+
end
|
@@ -16,6 +16,13 @@ module Cosmos
|
|
16
16
|
class DartMetaFrame < Qt::Widget
|
17
17
|
@@meta_filters = []
|
18
18
|
|
19
|
+
class LabelPopup < Qt::Label
|
20
|
+
attr_accessor :text
|
21
|
+
def mousePressEvent(event)
|
22
|
+
Qt::MessageBox.critical(self.parent, 'Error', @text)
|
23
|
+
end
|
24
|
+
end
|
25
|
+
|
19
26
|
def initialize(parent)
|
20
27
|
super(parent)
|
21
28
|
|
@@ -27,6 +34,7 @@ module Cosmos
|
|
27
34
|
@groupbox = Qt::GroupBox.new("Meta Filter Selection")
|
28
35
|
@vbox = Qt::VBoxLayout.new(@groupbox)
|
29
36
|
@hbox1 = Qt::HBoxLayout.new
|
37
|
+
|
30
38
|
@label = Qt::Label.new("Meta Filters: ")
|
31
39
|
@hbox1.addWidget(@label)
|
32
40
|
@meta_filters_text = Qt::LineEdit.new
|
@@ -43,6 +51,10 @@ module Cosmos
|
|
43
51
|
@vbox.addLayout(@hbox1)
|
44
52
|
|
45
53
|
@hbox2 = Qt::HBoxLayout.new
|
54
|
+
@error = LabelPopup.new
|
55
|
+
@error.setPixmap(Qt::Application.style.standardIcon(Qt::Style::SP_MessageBoxCritical).pixmap(20, 20))
|
56
|
+
@error.hide
|
57
|
+
@hbox2.addWidget(@error)
|
46
58
|
@meta_item_name = Qt::ComboBox.new
|
47
59
|
@meta_item_name.setMinimumWidth(200)
|
48
60
|
@meta_item_name.setMaxVisibleItems(6)
|
@@ -102,7 +114,7 @@ module Cosmos
|
|
102
114
|
if !@got_meta_item_names and !@update_thread
|
103
115
|
@update_thread = Thread.new do
|
104
116
|
begin
|
105
|
-
server = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'])
|
117
|
+
server = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'], 1.0, Cosmos::System.x_csrf_token)
|
106
118
|
item_names = server.item_names("SYSTEM", "META")
|
107
119
|
Qt.execute_in_main_thread do
|
108
120
|
unless self.disposed?
|
@@ -113,8 +125,15 @@ module Cosmos
|
|
113
125
|
end
|
114
126
|
end
|
115
127
|
@got_meta_item_names = true
|
116
|
-
|
117
|
-
|
128
|
+
Qt.execute_in_main_thread { @error.hide }
|
129
|
+
rescue Exception => e
|
130
|
+
case e.message
|
131
|
+
when /execution expired/
|
132
|
+
@error.text = "Could not connect to the DART Decom Server. Is it running?"
|
133
|
+
else
|
134
|
+
@error.text = e.message
|
135
|
+
end
|
136
|
+
Qt.execute_in_main_thread { @error.show }
|
118
137
|
ensure
|
119
138
|
@update_thread = nil
|
120
139
|
server.disconnect if defined? server
|
data/lib/cosmos/interfaces.rb
CHANGED
@@ -20,3 +20,5 @@ require 'cosmos/interfaces/protocols/template_protocol'
|
|
20
20
|
require 'cosmos/interfaces/protocols/terminated_protocol'
|
21
21
|
|
22
22
|
require 'cosmos/interfaces/protocols/override_protocol'
|
23
|
+
require 'cosmos/interfaces/protocols/crc_protocol'
|
24
|
+
require 'cosmos/interfaces/protocols/ignore_packet_protocol'
|
@@ -36,7 +36,7 @@ module Cosmos
|
|
36
36
|
@status_packet.write('PACKET_ID', 1)
|
37
37
|
@clear_errors_command = System.commands.packet('DART', 'CLEAR_ERRORS')
|
38
38
|
@sleeper = Sleeper.new
|
39
|
-
@dart = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'])
|
39
|
+
@dart = JsonDRbObject.new(System.connect_hosts['DART_DECOM'], System.ports['DART_DECOM'], 1.0, Cosmos::System.x_csrf_token)
|
40
40
|
end
|
41
41
|
|
42
42
|
# Indicates if the interface is connected to its target(s) or not. Must be
|
@@ -46,6 +46,9 @@ module Cosmos
|
|
46
46
|
# @return [Array] Array of packet logger classes for this interface
|
47
47
|
attr_accessor :packet_log_writer_pairs
|
48
48
|
|
49
|
+
# @return [Array] Array of stored packet log writers
|
50
|
+
attr_accessor :stored_packet_log_writer_pairs
|
51
|
+
|
49
52
|
# @return [RawLoggerPair] RawLoggerPair instance or nil
|
50
53
|
attr_accessor :raw_logger_pair
|
51
54
|
|
@@ -122,6 +125,7 @@ module Cosmos
|
|
122
125
|
@reconnect_delay = 5.0
|
123
126
|
@disable_disconnect = false
|
124
127
|
@packet_log_writer_pairs = []
|
128
|
+
@stored_packet_log_writer_pairs = []
|
125
129
|
@raw_logger_pair = RawLoggerPair.new(@name)
|
126
130
|
@routers = []
|
127
131
|
@cmd_routers = []
|
@@ -279,7 +283,11 @@ module Cosmos
|
|
279
283
|
|
280
284
|
# Wrap all writes in a mutex and handle errors
|
281
285
|
def _write
|
282
|
-
@write_mutex.
|
286
|
+
if @write_mutex.owned?
|
287
|
+
yield
|
288
|
+
else
|
289
|
+
@write_mutex.synchronize { yield }
|
290
|
+
end
|
283
291
|
rescue Exception => err
|
284
292
|
Logger.instance.error("Error writing to interface : #{@name}")
|
285
293
|
disconnect()
|
@@ -256,7 +256,7 @@ module Cosmos
|
|
256
256
|
# Handle handshake warnings and errors
|
257
257
|
if status == "OK" and code != 0
|
258
258
|
unless @ignored_error_codes[handshake_cmd.handshake.handshake.target_name].include? code
|
259
|
-
Logger.warn "Warning sending command (#{code}): #{source}"
|
259
|
+
Logger.warn "#{@name}: Warning sending command (#{code}): #{source}"
|
260
260
|
end
|
261
261
|
elsif status == "ERROR"
|
262
262
|
unless @ignored_error_codes[handshake_cmd.handshake.handshake.target_name].include? code
|
@@ -295,7 +295,7 @@ module Cosmos
|
|
295
295
|
command.received_count += 1
|
296
296
|
|
297
297
|
# Put a log of the command onto the server for the user to see
|
298
|
-
Logger.info("External Command: " + System.commands.format(linc_handshake.identified_command, System.targets[linc_handshake.identified_command.target_name].ignored_parameters))
|
298
|
+
Logger.info("#{@name}: External Command: " + System.commands.format(linc_handshake.identified_command, System.targets[linc_handshake.identified_command.target_name].ignored_parameters))
|
299
299
|
|
300
300
|
# Log the command to the command log(s)
|
301
301
|
@packet_log_writer_pairs.each do |packet_log_writer_pair|
|
@@ -361,7 +361,7 @@ module Cosmos
|
|
361
361
|
if @handshake
|
362
362
|
timed_out = false
|
363
363
|
else
|
364
|
-
Logger.warn "No handshake - must be timeout."
|
364
|
+
Logger.warn "#{@name}: No handshake - must be timeout."
|
365
365
|
timed_out = true
|
366
366
|
end
|
367
367
|
|