From 881d44f4dd7345f561ddd3b955a3640e4e112939 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Wed, 23 Sep 2026 12:05:37 +0200 Subject: [PATCH] Migrates residual Lts sources to generated rtiddsgen API Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target. --- ci/allowed_signers | 2 +- qt6-after/qt6-migrated-legatus/.envrc | 2 +- qt6-after/qt6-migrated-legatus/CMakeLists.txt | 11 + .../Common/CodeGen/svc_db_structs.h.grantlee | 2 +- .../Common/CodeGen/svc_translation.h.grantlee | 2 +- .../Lts/Common/LtsLogin/lts_login.cpp | 8 +- .../Lts/Common/LtsTimelineClassic/main.cpp | 2 +- .../LtsUtilsCore/qbytearray_byteaccess.h | 2 +- .../Common/LtsUtils/LtsUtilsCore/qpoint3d.cpp | 9 + .../Lts/DDS/FTS/generic_fts_impl.h | 2 +- .../Data/asb_data_plugin.cpp | 14 +- .../Data/asb_foreign_interface_impl.cpp | 40 +- .../Gui/Common/alm_config_alarm_model.cpp | 6 +- .../Gui/Common/alm_history_alarm_model.h | 2 +- .../alm_config_alarm_gui_plugin.cpp | 2 +- .../Gui/ConfigAlarm/alm_dialog.cpp | 36 +- .../Gui/ConfigAlarm/alm_dialog.h | 2 +- .../alm_config_participant_dialog.cpp | 52 +- .../alm_participant_dialog.cpp | 2 +- .../alm_participant_model.cpp | 2 +- .../AesInfo/aes_charge_effect_item_info.cpp | 4 +- .../Gui/AesInfo/aes_info_dialog.cpp | 46 +- .../aes_air_support_impact_list.cpp | 2 +- .../CustomView/aes_bccontamination.cpp | 2 +- .../aes_bccontamination_edit.cpp | 8 +- .../Gui/Base/aes_base_edit.cpp | 26 +- .../Gui/Base/aes_base_model.cpp | 2 +- .../Gui/Base/aes_base_model.h | 10 +- .../Gui/Base/aes_pixmap_label.cpp | 20 +- .../Gui/Borderline/aes_borderline_edit.cpp | 8 +- .../Gui/Borderline/aes_borderlines_model.cpp | 2 +- .../aes_charge_administration_model.cpp | 6 +- .../ChargeEffect/aes_charge_effect_edit.cpp | 2 +- .../Gui/DangerArea/aes_danger_area_edit.cpp | 8 +- .../Explosion/aes_effect_cluster_model.cpp | 6 +- .../Gui/Explosion/aes_explosion_edit.cpp | 22 +- .../Explosion/aes_explosion_gui_plugin.cpp | 6 +- .../Gui/Explosion/aes_explosion_list.cpp | 2 +- .../Gui/Explosion/aes_explosions_edit.cpp | 178 ++-- .../Gui/Explosion/aes_explosions_edit.h | 2 +- .../Explosion/aes_explosions_edit_adler.cpp | 44 +- .../aes_explosions_edit_adler_standalone.cpp | 204 ++--- .../aes_explosions_edit_adler_standalone.h | 20 +- .../Gui/Explosion/aes_rocket_utility.cpp | 26 +- .../Gui/Explosion/aes_rocket_utility.h | 2 +- .../aes_functional_area_edit.cpp | 96 +-- .../Gui/GasPipe/aes_gas_pipe_edit.cpp | 6 +- .../Gui/MineArea/aes_mine_area_edit.cpp | 18 +- .../MineCorridor/aes_mine_corridor_edit.cpp | 6 +- .../MineSingleVirtual/aes_booby_trap_edit.cpp | 6 +- .../aes_off_route_mine_edit.cpp | 6 +- .../aes_ncontamination_edit.cpp | 24 +- .../TechnicalArea/aes_technical_area_edit.cpp | 12 +- .../avm_edit_combat_net_radio_dialog.cpp | 4 +- ...frequency_planning_resource_data_model.cpp | 4 +- ...frequency_planning_set_resource_dialog.cpp | 8 +- .../avm_frequency_planning_dialog.h | 2 +- .../avm_frequency_planning_widget.cpp | 28 +- .../avm_frequency_planning_widget.h | 2 +- .../avm_radio_specifica_hf_widget.cpp | 4 +- .../avm_radio_specifica_uhf_widget.cpp | 10 +- .../avm_radio_specifica_vhf_widget.cpp | 14 +- .../Gui/Eloka/avm_eloka_dialog.cpp | 4 +- .../Gui/Eloka/avm_eloka_edit_dialog.cpp | 6 +- .../Common/bdv_dds_controller.cpp | 12 +- .../BuildingEdit/bdv_building_edit.cpp | 2 +- .../BuildingEdit/bdv_edit_model.cpp | 4 +- .../Gui/BuildingInfo/bld_config_dialog.cpp | 18 +- .../Gui/BuildingInfo/bld_info_dialog.cpp | 2 +- .../Gui/BuildingInfo/bld_info_gui_plugin.cpp | 10 +- .../Gui/BuildingInfo/bridge_info_dialog.cpp | 2 +- .../Gui/BuildingInfo/egcu_info_dialog.cpp | 8 +- .../Gui/BuildingInfo/egcu_operational.cpp | 4 +- .../Buildings/Gui/BuildingInfo/relay_info.cpp | 18 +- .../participants_move_dialog.cpp | 4 +- .../participants_move_model.cpp | 2 +- .../ParticipantUAS/mission_plan_dialog.cpp | 4 +- .../Gui/ParticipantUAS/mission_plan_edit.cpp | 4 +- .../cds_create_simulation_dialog.cpp | 8 +- .../Gui/CreateSimulation/cds_plan_creator.cpp | 14 +- .../SoundArea/efm_sound_area_edit_dialog.cpp | 2 +- .../Gui/SoundArea/efm_sound_area_helper.cpp | 102 +-- .../Gui/esc_effect_show_gui_plugin.cpp | 10 +- .../Gui/esc_firing_explosion.cpp | 6 +- .../EffectShowClient/Gui/esc_firing_smoke.cpp | 34 +- .../Gui/esc_operating_condition.cpp | 54 +- .../EffectShowClient/Gui/esc_order_edit.cpp | 96 +-- .../EffectShowClient/Gui/esc_order_edit.h | 4 +- .../EffectShowClient/Gui/esc_order_list.cpp | 12 +- .../Gui/esc_safety_confirmation_widget.cpp | 6 +- ...sm_combobox_foreign_gui_interface_impl.cpp | 12 +- .../Gui/esm_effect_show_actor_model.cpp | 8 +- .../Gui/esm_effect_show_actor_model.h | 8 +- ...esm_effect_show_actor_relocation_model.cpp | 8 +- .../Gui/esm_effect_show_model.cpp | 8 +- .../Gui/ExerciseEdit/exm_edit_dialog.cpp | 8 +- .../Gui/ExerciseEdit/exm_state_edit.cpp | 6 +- .../Explorer/HQReports/flm_hq_report_edit.cpp | 8 +- .../Gui/Explorer/TopicEditor/topic_editor.cpp | 28 +- .../Gui/Explorer/flm_dialog.cpp | 2 +- .../Gui/Explorer/flm_edit_file_content.cpp | 12 +- .../Gui/Explorer/flm_explorer_gui_plugin.cpp | 2 +- .../Gui/Explorer/flm_preview_playback.cpp | 38 +- .../Aes/Common/aes_display_filter_impl.cpp | 20 +- .../Participant/flt_type_filter_widget.cpp | 28 +- .../flt_building_cmpnt_helper.h | 24 +- .../Gui/InfoDialog/gim_info_dialog.cpp | 16 +- .../PairingEdit/gim_pairing_edit_dialog.cpp | 24 +- .../Data/ism_foreign_data_plugin.cpp | 2 +- .../ism_set_recording_dialog_model.cpp | 6 +- .../AssetList/ism_asset_list_dialog.cpp | 16 +- .../AssetList/ism_asset_list_dialog_model.cpp | 22 +- .../AssetList/ism_edit_asset_dialog.cpp | 4 +- .../ism_exercise_assignment_dialog.cpp | 8 +- .../ism_exercise_assignment_dialog_model.cpp | 6 +- .../ism_mounting_point_list_dialog.cpp | 2 +- ...point_list_dialog_checkbox_proxy_model.cpp | 16 +- .../ism_mounting_point_list_dialog_model.cpp | 6 +- .../Overview/ism_overview_conflicts_model.cpp | 18 +- .../Overview/ism_overview_dialog.cpp | 2 +- .../Overview/ism_overview_dialog_model.cpp | 48 +- ...sm_overview_mounting_point_list_dialog.cpp | 4 +- ...ism_overview_mounting_point_list_model.cpp | 12 +- .../PlanChooser/new_plan_dialog.cpp | 2 +- .../Timeline/ism_plan_tln_dialog.cpp | 2 +- .../ism_building_mount_point_model.cpp | 10 +- .../ResourceManagement/ism_plan_dialog.cpp | 2 +- .../ism_plan_edit_dialog.cpp | 4 +- .../ism_resource_gui_plugin.cpp | 2 +- .../ism_data_plugin_interface.h | 3 +- .../Gui/MarkerEdit/mrk_edit_gui_plugin.cpp | 2 +- .../Gui/Messaging/msg_new_message_dialog.cpp | 12 +- .../Gui/Messaging/msg_show_message_dialog.cpp | 2 +- .../Gui/NotificationEdit/nom_dialog.cpp | 8 +- .../Gui/NotificationEdit/nom_dialog_model.cpp | 20 +- .../NotificationEdit/nom_edit_gui_plugin.cpp | 6 +- .../Gui/BaseDownloader/obd_ex_model.cpp | 2 +- .../osc_demand_situation_filter.cpp | 12 +- .../osc_participant_info.cpp | 98 +-- .../Charts/ore_detailed_chart_model.cpp | 56 +- .../Charts/ore_simple_chart_model.cpp | 6 +- .../Gui/Common/operator_dialog_model.cpp | 2 +- .../Gui/Login/opm_login_dialog_gui_plugin.cpp | 6 +- .../opm_login_remote_shutdown_dialog.cpp | 4 +- .../Gui/OperatorEdit/group_edit_dialog.cpp | 18 +- .../group_edit_member_of_model.cpp | 10 +- .../Gui/OperatorEdit/group_model.cpp | 2 +- .../Gui/OperatorEdit/operator_edit_dialog.cpp | 2 +- .../Gui/OperatorEdit/preset_dialog.cpp | 4 +- .../participant_edit_item_widget_base.cpp | 4 +- .../Gui/Common/participant_edit_model.cpp | 4 +- .../participant_firing_unit_validator.cpp | 10 +- .../participant_firing_unit_validator.h | 4 +- .../Common/participant_tree_edit_handler.cpp | 4 +- .../participant_vulnerability_types.cpp | 46 +- .../Gui/MSDL/msdl/msdl_export.cpp | 6 +- .../participant_pool_model.cpp | 4 +- .../participant_config_dialog.cpp | 36 +- .../participant_config_model.cpp | 4 +- .../participant_history_dialog_model.cpp | 22 +- .../participant_hitline_info_dialog.cpp | 4 +- .../participant_info_dialog.cpp | 140 ++-- .../participant_info_table_model.cpp | 8 +- .../participant_set_injury_dialog.cpp | 20 +- .../participant_set_sanitation_dialog.cpp | 2 +- .../participant_target_config_dialog.cpp | 42 +- .../ParticipantOrgChart/org_chart_main.cpp | 4 +- .../participant_org_chart_helper.cpp | 26 +- .../participant_selection_model.cpp | 2 +- .../participant_template_edit.cpp | 4 +- .../template_unit_namer.cpp | 2 +- .../Gui/PartyEdit/ppm_party_edit.cpp | 18 +- .../Gui/TypeEdit/ppm_type_edit.cpp | 6 +- .../pre_script_dialog.cpp | 2 +- .../Gui/PdmComboBox/pdm_combobox.cpp | 2 +- ...dm_combobox_foreign_gui_interface_impl.cpp | 2 +- .../Gui/pws_control_dialog.cpp | 2 +- .../Models/rep_air_support_model.cpp | 36 +- .../Models/rep_air_support_model.h | 2 +- .../rep_charge_administration_model.cpp | 2 +- .../ReportViewer/Models/rep_firings_model.cpp | 36 +- .../ReportViewer/Models/rep_firings_model.h | 2 +- .../Models/rep_sanitation_material_model.cpp | 2 +- .../Models/rep_treatment_model.cpp | 48 +- .../Models/rep_treatment_timeline_model.cpp | 6 +- .../Models/rep_unit_power_model.cpp | 26 +- .../Gui/ReportViewer/rep_report_edit.cpp | 6 +- .../Gui/ReportViewer/rep_report_preview.cpp | 10 +- .../Lts/Plugins/SAAs/Gui/saa_dialog_model.cpp | 8 +- .../Gui/ServiceEdit/scm_dialog.h | 16 +- .../Gui/ServiceEdit/scm_dialog_service.cpp | 14 +- ...smo_equipment_error_registration_model.cpp | 4 +- .../smo_hgr_and_mine_search_model.cpp | 18 +- .../Gui/Monitors/smo_base_player_model.cpp | 26 +- .../Gui/Monitors/smo_check_button_handler.cpp | 18 +- .../Gui/Monitors/smo_dialog.cpp | 8 +- .../Gui/Monitors/smo_egcu_edit.cpp | 18 +- .../Gui/Monitors/smo_egcu_model.cpp | 78 +- .../smo_party_equipment_check_dialog.cpp | 2 +- .../Monitors/smo_structure_element_edit.cpp | 10 +- .../_explosion_single_central_to_map.cpp | 4 +- .../_explosion_single_central_to_map.h | 2 +- .../SituationMap/AdapterDds/adapter_dds.cpp | 38 +- .../AdapterDds/aes_to_situation_map_tmpl.h | 26 +- .../AdapterDds/air_support_impact_to_map.h | 2 +- .../SituationMap/AdapterDds/alarm_to_map.cpp | 2 +- .../AdapterDds/bccontamination_to_map.h | 2 +- .../AdapterDds/booby_traps_to_map.cpp | 6 +- .../AdapterDds/booby_traps_to_map.h | 2 +- .../AdapterDds/borderline_to_map.h | 2 +- .../AdapterDds/building_contamination.cpp | 2 +- .../AdapterDds/buildings_to_map.cpp | 8 +- .../AdapterDds/charge_effect_to_map.cpp | 50 +- .../AdapterDds/danger_area_to_map.h | 2 +- .../AdapterDds/dus_single_mine_to_map.h | 2 +- .../AdapterDds/effect_cluster_to_map.cpp | 8 +- .../AdapterDds/effect_cluster_to_map.h | 2 +- .../AdapterDds/explosion_area_to_map.h | 2 +- .../AdapterDds/explosion_cluster_to_map.cpp | 30 +- .../AdapterDds/explosion_cluster_to_map.h | 2 +- .../AdapterDds/explosion_single_to_map.h | 2 +- .../AdapterDds/functional_area_to_map.h | 2 +- .../SituationMap/AdapterDds/gas_pipe_to_map.h | 2 +- .../AdapterDds/guez_ied_to_map.cpp | 30 +- .../AdapterDds/mine_area_null_to_map.cpp | 6 +- .../AdapterDds/mine_area_null_to_map.h | 4 +- .../AdapterDds/mine_area_to_map.cpp | 2 +- .../AdapterDds/mine_area_to_map.h | 2 +- .../AdapterDds/mine_corridor_to_map.h | 2 +- .../AdapterDds/mounting_point_to_map.cpp | 66 +- .../AdapterDds/mounting_point_to_map.h | 2 +- .../AdapterDds/ncontamination_to_map.cpp | 2 +- .../AdapterDds/ncontamination_to_map.h | 2 +- .../AdapterDds/off_route_to_map.cpp | 6 +- .../AdapterDds/off_route_to_map.h | 2 +- .../AdapterDds/participant_to_map.cpp | 50 +- .../SituationMap/AdapterDds/pdm_handler.cpp | 2 +- .../AdapterDds/recon_area_to_map.h | 2 +- .../AdapterDds/technical_area_to_map.h | 2 +- .../sitmap_configure_url_model.cpp | 12 +- .../ConfigureUrl/sitmap_configure_urls.cpp | 8 +- .../map_object_selection_widget.cpp | 6 +- .../Gui/SituationMap/situation_map_init.cpp | 12 +- .../ReplayControl/replay_control_widget.cpp | 2 +- .../tgt_assignment_part_model.cpp | 6 +- .../tgt_participant_handler.cpp | 4 +- .../tgt_participant_handler.h | 2 +- .../tgt_target_area_assignment_edit.cpp | 10 +- .../tgt_telegrams.cpp | 10 +- .../tgt_telegrams.h | 4 +- .../Plugins/Timeline/Data/tln_data_plugin.cpp | 2 +- .../CameraVideo/tln_camera_video_filter.cpp | 2 +- .../tln_cross_borderline_filter.cpp | 4 +- .../FireEvent/tln_fire_event_filter.cpp | 4 +- .../EventTypes/Hit/tln_hit_filter.cpp | 28 +- .../EventTypes/Hit/tln_hit_filter.h | 2 +- .../HitBuilding/tln_hit_building_filter.cpp | 12 +- .../HitBuilding/tln_hit_building_filter.h | 4 +- .../tln_hit_effect_simulation_filter.cpp | 4 +- .../tln_hit_effect_simulation_filter.h | 2 +- .../tln_weapon_assignment_filter.cpp | 4 +- .../Gui/EventTimeline/tln_item_list_model.cpp | 4 +- .../Gui/EventTimeline/tln_timeline_dialog.cpp | 6 +- .../Gui/EventTimeline/tln_timeline_model.cpp | 24 +- .../Timeline/Gui/EventTimeline/tln_utils.cpp | 78 +- .../Timeline/Gui/EventTimeline/tln_utils.h | 76 +- .../Gui/equipment_type_edit_dialog.cpp | 184 ++--- .../ControlEffects/xmlreader.cpp | 4 +- .../BuildingControlUnit/VWM/CMakeLists.txt | 1 + .../Buildings/building_control_handler.cpp | 105 +-- .../Proxies/Buildings/building_process.cpp | 375 +++++---- .../Lts/Proxies/Buildings/ism_handler.cpp | 203 ++--- .../Lts/Proxies/Buildings/main_handler.cpp | 2 +- .../Lts/Proxies/Buildings/pdm_handler.cpp | 1 + .../Lts/Proxies/Buildings/ppm_handler.cpp | 11 +- .../Lts/Proxies/Buildings/ppm_handler.h | 1 + .../Proxies/Buildings/relay_info_handler.cpp | 1 + .../Proxies/Buildings/relay_info_handler.h | 1 + .../Helper/cnr_frequency_planning_helper.cpp | 12 +- .../Helper/cnr_frequency_planning_helper.h | 4 +- .../CombatNetRadio/active_exercises.cpp | 10 +- .../Lts/Proxies/CombatNetRadio/config_cnr.cpp | 75 +- .../CombatNetRadio/dds_handler_exercise.cpp | 1 + .../CombatNetRadio/exercise_manager.cpp | 41 +- .../Lts/Proxies/CombatNetRadio/helper.cpp | 4 +- .../Proxies/CombatNetRadio/positions_cnr.cpp | 50 +- .../Proxies/CombatNetRadio/training_area.cpp | 24 +- .../ComponentMonitor/checkmk_handler.cpp | 3 +- .../checkmk_handler_schedule_check.cpp | 6 +- .../component_status_handler.cpp | 61 +- .../handler_nasat_aircraft_participant.cpp | 14 +- .../GuezNasat/handler_nasat_impact.cpp | 4 +- .../Apache/damage_model.cpp | 58 +- .../Apache/damage_model.h | 2 +- .../Apache/ngs_connector.cpp | 50 +- .../Apache/ngs_connector.h | 4 +- .../Apache/ppm_handler.cpp | 126 +-- .../Guez/aes_handler.cpp | 396 ++++----- .../Guez/damage_model.cpp | 28 +- .../Guez/ngs_connector.cpp | 228 +++--- .../Guez/ngs_connector.h | 4 +- .../Guez/ppm_handler.cpp | 106 +-- .../Hla_test_tool/damage_model.cpp | 28 +- .../Hla_test_tool/ngs_connector.cpp | 94 +-- .../Hla_test_tool/ngs_connector.h | 4 +- .../Plugins/AdlerJson/aes_handler.cpp | 18 +- .../Plugins/AdlerJson/flm_handler.cpp | 6 +- .../Plugins/AdlerJson/json_dispatcher.cpp | 24 +- .../TrainingAreaBase/Plugins/UAS/from_tab.cpp | 6 +- .../Plugins/UAS/uav_ia_manager.cpp | 2 +- .../Messages/client_message.cpp | 8 +- .../Messages/reply_message.cpp | 6 +- .../WebSocketInterface/data_manager.cpp | 6 +- .../websocket_interface_handler.cpp | 2 + .../Proxies/TrainingAreaBase/dds_handler.cpp | 2 +- .../Proxies/TrainingAreaBase/exm_handler.cpp | 14 +- .../Proxies/TrainingAreaBase/ism_handler.cpp | 137 ++-- .../Proxies/TrainingAreaBase/main_handler.cpp | 85 +- .../Proxies/TrainingAreaBase/main_handler.h | 2 +- .../Proxies/TrainingAreaBase/pdm_handler.cpp | 47 +- .../TrainingAreaBase/position_handler.cpp | 51 +- .../Proxies/TrainingAreaBase/ppm_handler.cpp | 18 +- .../Proxies/TrainingAreaBase/ppm_handler.h | 3 + .../TrainingAreaBase/recv_from_dds_aes.cpp | 473 +++++------ .../TrainingAreaBase/recv_from_dds_aes.h | 56 +- .../TrainingAreaBase/recv_from_dds_fts.cpp | 430 +++++----- .../Proxies/TrainingAreaBase/send_to_dds.cpp | 769 +++++++++--------- .../TrainingAreaBaseOC/handler_aes_data.cpp | 24 +- .../TrainingAreaBaseOC/send_to_dds.cpp | 2 +- .../WarehouseManagement/data_manager.cpp | 29 +- .../WarehouseManagement/dds_handler.cpp | 2 +- .../exercise_participant_handler.cpp | 88 +- .../WarehouseManagement/exercises_handler.cpp | 25 +- .../interface_wms2ecc_impl.cpp | 211 ++--- .../WarehouseManagement/main_handler.cpp | 2 +- .../AlarmManagement/ModuleTests/alm_tests.cpp | 10 +- .../abstract_firing_strategy.cpp | 2 +- .../effect_cluster_module_test.cpp | 6 +- .../explosion_cluster_module_test.cpp | 42 +- .../ModuleTest_Limits/limits_module_test.cpp | 10 +- .../aes_others_module_test.cpp | 6 +- .../aes_test_explosion_cluster.cpp | 2 +- .../ModuleTests/aes_test_mine_area.cpp | 8 +- .../Trajectory/trajectory_point.h | 8 +- .../Trajectory/trajectory_transform.cpp | 6 +- .../_object_explosion_single_central.cpp | 2 +- .../effector_state_machine.h | 2 +- .../AreaEffectSimulation/handler_base.h | 2 +- .../handler_effect_cluster.cpp | 6 +- .../handler_functional_area.cpp | 2 +- .../AreaEffectSimulation/handler_gas_pipe.cpp | 2 +- .../handler_mine_area.cpp | 6 +- .../handler_recon_area.cpp | 2 +- .../object_air_support_impact.cpp | 2 +- .../AreaEffectSimulation/object_base.h | 4 +- .../object_bccontamination.cpp | 2 +- .../object_booby_trap.cpp | 2 +- .../object_borderline.cpp | 2 +- .../object_charge_effect.h | 2 +- .../object_danger_area.cpp | 2 +- .../object_effect_cluster.cpp | 14 +- .../object_explosion_area.cpp | 2 +- .../object_explosion_cluster.cpp | 18 +- .../object_explosion_single.cpp | 2 +- .../object_functional_area.cpp | 2 +- .../AreaEffectSimulation/object_gas_pipe.cpp | 2 +- .../AreaEffectSimulation/object_mine_area.cpp | 2 +- .../object_mine_area_null.cpp | 4 +- .../object_mine_corridor.cpp | 2 +- .../object_ncontamination.cpp | 2 +- .../object_off_route_mine.cpp | 2 +- .../object_recon_area.cpp | 2 +- .../object_technical_area.cpp | 2 +- .../AreaEffectSimulation/object_trajectory.h | 2 +- .../audio_video_handler.cpp | 4 +- .../AudioVideoManagement/cnr_handler.cpp | 120 +-- .../cnr_tvc_profile_handler.cpp | 100 +-- .../cnr_tvc_profile_handler.h | 4 +- .../AudioVideoManagement/default_av_menus.cpp | 84 +- .../AudioVideoManagement/exercise_handler.cpp | 4 +- .../exercises_handler.cpp | 2 +- .../frequency_planning_handler.cpp | 228 +++--- .../frequency_set_handler.cpp | 46 +- .../handler_frequency_planning_status.cpp | 40 +- .../handler_menu_struct.cpp | 60 +- .../handler_video_receiver.cpp | 120 +-- .../handler_video_team.cpp | 46 +- .../AudioVideoManagement/import_handler.cpp | 10 +- .../object_frequency_planning_status.cpp | 90 +- .../object_frequency_planning_status.h | 4 +- .../object_menu_struct.cpp | 100 +-- .../AudioVideoManagement/object_menu_struct.h | 2 +- .../object_video_receiver.cpp | 74 +- .../object_video_receiver.h | 4 +- .../object_video_team.cpp | 48 +- .../AudioVideoManagement/object_video_team.h | 8 +- .../stream_name_mapping_publisher.cpp | 30 +- .../AudioVideoManagement/tvc_handler.cpp | 96 +-- .../Lts/Services/CMakeLists.txt | 2 +- .../ModuleTests/ces_tests.cpp | 2 +- .../ModuleTests/ces_tests_booby_trap.cpp | 2 +- .../ModuleTests/ces_tests_gas_pipe.cpp | 2 +- .../ModuleTests/ces_tests_mine_areas.cpp | 2 +- .../handler_artillerie_sound.cpp | 12 +- .../Basic/handler_participant_borderline.cpp | 32 +- .../Plugins/Buildings/handler_aes_data.cpp | 48 +- .../Buildings/handler_building_model.cpp | 6 +- .../Buildings/handler_building_ownership.cpp | 4 +- .../Buildings/handler_contamination.cpp | 32 +- .../Plugins/Ces2D/handler_aes_data.cpp | 34 +- .../Ces2D/handler_participant_area.cpp | 298 +++---- .../Plugins/Explosions/handler_explosions.cpp | 134 +-- .../Plugins/Explosions/handler_vulcano.cpp | 6 +- .../handler_functional_area.cpp | 50 +- .../FunctionalAreas/handler_functional_area.h | 2 +- .../Plugins/GasPipes/handler_aes_data.cpp | 32 +- .../GasPipes/handler_participant_gas_pipe.cpp | 18 +- .../Plugins/Jamming/handler_jamming.cpp | 8 +- .../Plugins/Jamming/handler_jamming.h | 2 +- .../Plugins/MineAreas/handler_mine_areas.cpp | 92 +-- .../MissionPlan/ces_mission_plan_handler.cpp | 4 +- .../MissionPlan/ces_mission_plan_handler.h | 2 +- .../Plugins/NBC/handler_nbc.cpp | 186 ++--- .../handler_blocked_areas.cpp | 10 +- .../handler_participant_building.cpp | 4 +- .../TargetAreas/handler_target_areas.cpp | 22 +- .../TargetAreas/handler_target_areas.h | 2 +- .../handler_participant_booby_trap.cpp | 44 +- .../handler_participant_off_route_mine.cpp | 38 +- .../aes_item_view_utm.cpp | 24 +- .../aes_item_view_utm.h | 2 +- .../CentralEffectSimulation/dds_handler.cpp | 42 +- .../handler_building_data.cpp | 70 +- .../handler_participant.cpp | 30 +- .../handler_participant.h | 8 +- .../CentralEffectSimulation/point_helpers.h | 8 +- .../handler_firing_explosion.cpp | 2 +- .../handler_operating_condition.cpp | 20 +- .../EffectShowClient/handler_order.cpp | 38 +- .../EffectShowClient/handler_vehicle.cpp | 4 +- .../EffectShowClient/object_order.cpp | 12 +- .../esm_convert_from_tab.cpp | 2 +- .../handler_effect_show.cpp | 8 +- .../handler_effect_show_actor_relocation.cpp | 2 +- .../EffectShowManagement/object_aes_data.cpp | 8 +- .../object_effect_show.cpp | 8 +- .../object_effect_show_actor_relocation.cpp | 4 +- .../object_effect_show_vehicle_status.cpp | 2 +- .../Evaluations/ModuleTests/evl_tests.cpp | 12 +- .../ModuleTests/eem_tests.cpp | 8 +- .../handler_dynamic_participant_data.cpp | 286 +++---- .../handler_equipment_error_registration.cpp | 34 +- .../handler_participant_event.cpp | 240 +++--- .../web_socket_avs.cpp | 38 +- .../ExerciseEventManagement/web_socket_avs.h | 2 +- .../web_socket_server.cpp | 2 +- .../UnitTests/data_topic_tests.h | 3 + .../WebSocketInterface/data_manager.cpp | 2 +- .../GuezIedManagement/handler_ied.cpp | 22 +- .../Services/GuezIedManagement/object_ied.cpp | 12 +- .../ImportBuildings/ism_import_buildings.cpp | 16 +- .../ModuleTests/mrk_tests.cpp | 6 +- .../Messaging/ModuleTests/msg_tests.cpp | 12 +- .../Messaging/handler_operator_message.cpp | 20 +- .../Services/NmeaManagement/nmea_handler.cpp | 50 +- .../ModuleTests/nom_tests.cpp | 4 +- .../object_notification.cpp | 4 +- .../Messages/client_message.cpp | 4 +- .../OcBaseDownload/handler_base_download.cpp | 86 +- .../OcBaseDownload/handler_pdf_download.cpp | 54 +- .../OcSituationClient/handler_oc_aes_data.cpp | 4 +- .../OcSituationClient/handler_oc_data.cpp | 2 +- .../handler_oc_situation_data.cpp | 6 +- .../handler_locked_topics.cpp | 4 +- .../ParticipantHandling/participant.cpp | 42 +- .../participant_handler.cpp | 8 +- .../participant_handler_for_exercise.cpp | 12 +- .../PartyHandling/party.cpp | 2 +- .../PartyHandling/party_handler.cpp | 2 +- .../object_target_information.cpp | 4 +- .../TypeHandling/type_handler.cpp | 44 +- .../UasHandling/mission_plan_handler.cpp | 2 +- .../ParticipantManagement/UasHandling/uas.cpp | 2 +- .../ParticipantManagement/ppm_common.cpp | 6 +- .../PresentationManagement/initialization.cpp | 3 +- .../ProjectDataManagement/pdm_to_string.h | 6 +- .../static_pvsan_import.cpp | 1 - .../handler_dynamic_participant_data.cpp | 42 +- .../Generator/handler_report_air_support.cpp | 8 +- .../Generator/handler_report_data.cpp | 2 +- .../Generator/handler_report_firings.cpp | 6 +- .../Generator/handler_report_treatment.cpp | 6 +- .../ModuleTests/rep_tests.cpp | 2 +- .../UnitTests/data_topic_tests.h | 3 + .../SituationReplay/static_publisher.cpp | 2 +- .../SoundManagement/handler_sounds.cpp | 6 +- .../handler_target_config.cpp | 4 +- .../WsBaseDataInterface/data_manager.cpp | 5 +- .../handler_equipment_type_wh.cpp | 18 +- .../object_equipment_type_wh.cpp | 18 +- .../Lts/Tools/ConfigX/configurator.cpp | 1 - .../Lts/Tools/EEMFakeServer/Server.cpp | 10 +- .../Tools/VapixConfig/httprequesthandler.cpp | 12 +- .../main_handler.cpp | 24 +- .../proxy_emulator.cpp | 2 +- .../Symbology/symbol_data_to_render_role.h | 14 +- .../qt6-migrated-legatus/docker_build.sh | 1 + .../ism_mounting_point.h | 4 +- .../qt6-migrated-legatus/tests/CMakeLists.txt | 19 +- .../tests/test_nme_dtc.cpp | 231 ++++++ .../tests/test_nme_enums.cpp | 54 ++ .../tests/test_nmea_handler.cpp | 101 +++ 512 files changed, 6887 insertions(+), 6426 deletions(-) create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_nme_dtc.cpp create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_nme_enums.cpp create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_nmea_handler.cpp diff --git a/ci/allowed_signers b/ci/allowed_signers index a85b439aa..8a119cd97 100644 --- a/ci/allowed_signers +++ b/ci/allowed_signers @@ -1 +1 @@ -torsten.wierschin@life-maps.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMV8yH39fMOQE5BeCsxI8RMUXbDBJvRuS5phTTfrXF0H +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6kKREEjPzWMq8zjhIUCeiPI1MtwVHiZHaKxkePmW4t berrux.kana@axilinx.com diff --git a/qt6-after/qt6-migrated-legatus/.envrc b/qt6-after/qt6-migrated-legatus/.envrc index 368a96d91..ea7026e9e 100644 --- a/qt6-after/qt6-migrated-legatus/.envrc +++ b/qt6-after/qt6-migrated-legatus/.envrc @@ -1,4 +1,4 @@ # export MIGRATE_PIPELINE_ROOT="/home/torsten/sandbox/qt6-migration-pipeline" -export MIGRATE_PIPELINE_ROOT="Passe Deinen Pfad an." +export MIGRATE_PIPELINE_ROOT="/home/nkana/repo/qt6-migration-pipeline" export LANG=C.UTF-8 export LC_ALL=C.UTF-8 \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index 332118f96..2a5cdf4b4 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -437,6 +437,17 @@ if(NOT TARGET Qt6::Svg) message(STATUS "Created stub target for Qt6::Svg (library not available)") endif() +# Qt6::SerialPort - create manual target if not found +if(NOT TARGET Qt6::SerialPort AND EXISTS "${QT6_LIB_DIR}/libQt6SerialPort.so.6") + add_library(Qt6::SerialPort SHARED IMPORTED) + set_target_properties(Qt6::SerialPort PROPERTIES + IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6SerialPort.so.6" + INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtSerialPort;${QT6_INC_DIR}" + INTERFACE_LINK_LIBRARIES "Qt6::Core" + ) + message(STATUS "Manually configured Qt6 SerialPort target") +endif() + # Stub Qt6::SerialPort target if not available (needed by TrainingAreaBaseOC) if(NOT TARGET Qt6::SerialPort) add_library(Qt6::SerialPort INTERFACE IMPORTED) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_structs.h.grantlee b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_structs.h.grantlee index 590d6dbf1..1782c0bd8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_structs.h.grantlee +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_db_structs.h.grantlee @@ -26,7 +26,7 @@ {% endif %} #include <{{ include_prefix }}/{{ namespace_abbr }}_export.h> -#include <{{ namespace_abbr }}_enums.hpp> +#include <{{ include_prefix }}/{{ namespace_abbr }}_enums.hpp> {% for ext_service in ext_services.member %} #include <{{ ext_service.baseFilePath }}.hpp> diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_translation.h.grantlee b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_translation.h.grantlee index 4e23ae813..d747fc9e1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_translation.h.grantlee +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_translation.h.grantlee @@ -12,7 +12,7 @@ // filename: {{ namespace_abbr }}_translation.h #include -#include <{{ namespace_abbr }}_enums.hpp> +#include <{{ include_prefix }}/{{ namespace_abbr }}_enums.hpp> #include <{{ include_prefix }}/{{ namespace_abbr }}_export.h> class QString; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp index cc0f7320c..ac5b7b45d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsLogin/lts_login.cpp @@ -252,22 +252,22 @@ void LtsLogin::logoff() QString cmd; switch (m_shutdownAction.underlying()) { - case AssetManagement::ShutdownAction_def::Shutdown: + case AssetManagement::ShutdownAction::Shutdown: #ifdef LTS_DEBUG cmd = QStringLiteral("xeyes"); #else cmd = QStringLiteral("systemctl poweroff"); #endif break; - case AssetManagement::ShutdownAction_def::Reboot: + case AssetManagement::ShutdownAction::Reboot: #ifdef LTS_DEBUG cmd = QStringLiteral("kcalc"); #else cmd = QStringLiteral("systemctl reboot"); #endif break; - case AssetManagement::ShutdownAction_def::Logout: - case AssetManagement::ShutdownAction_def::NoAction: + case AssetManagement::ShutdownAction::Logout: + case AssetManagement::ShutdownAction::NoAction: emit signalLogoffDone(); break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/main.cpp index 4c6cab02d..077211dd0 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/main.cpp @@ -20,7 +20,7 @@ void add(qint64 time_offset) time += time_offset; ttm->addTestEvent(new LtsTimelineClassic::Event( - 0, (int)ProjectDataManagement::PdmEventType_def::Hit, time, 0, 0, 0, 0, QStringList() << QStringLiteral("Test"), + 0, (int)ProjectDataManagement::PdmEventType::EventType_Hit, time, 0, 0, 0, 0, QStringList() << QStringLiteral("Test"), LtsTimelineClassic::Event::drawCustomEventGraphicEllipse, QColor("green"), QString())); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h index 80dddfd4f..41350b14b 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qbytearray_byteaccess.h @@ -211,7 +211,7 @@ template bool inline get2Byte(const QByteArray& data, T& out) template void inline set1Byte(const T in, QByteArray& out) { static_assert(std::is_integral_v || std::is_enum_v, "Only integrals allowed for raw byte accessd"); - unsigned char c = in; + unsigned char c = static_cast(in); out += c; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.cpp index b27ebb0fa..7c55bd66d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/qpoint3d.cpp @@ -30,6 +30,13 @@ double QPoint3D::distanceToPoint(const QPoint3D& point) const return (*this - point).length(); } +// The header declares these operators inside namespace LtsUtils; they must +// be defined there too (a `using` directive does not place definitions +// into a namespace). Qt6's QDataStreamOperatorForType metatype machinery +// references the LtsUtils-scoped symbols explicitly. +namespace LtsUtils +{ + QDataStream& operator<<(QDataStream& s, const QPoint3D& p) { s << p.x() << p.y() << p.z(); @@ -47,3 +54,5 @@ QDataStream& operator>>(QDataStream& s, QPoint3D& p) p.rz() = z; return s; } + +} // namespace LtsUtils diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h index 23f8fb4f0..eed4806d6 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_impl.h @@ -65,7 +65,7 @@ private: // state is assigned directly instead of the old setter call. reply.data().replyState = replyState; - // FtReplyState_def doesn't exist anymore with rtiddsgen 7.7 - the + // FtReplyState doesn't exist anymore with rtiddsgen 7.7 - the // enum values are directly available in Core::FtReplyState. bool bLastTelegram = ((replyState != Core::FtReplyState::InProgress) && (replyState != Core::FtReplyState::NotStarted)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_data_plugin.cpp index 925625bc8..58cb5672d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_data_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_data_plugin.cpp @@ -18,25 +18,25 @@ AdvancedSymbology::SidcDefinitions::Identity roleToIdentity(const ParticipantMan { AdvancedSymbology::SidcDefinitions::Identity identity = AdvancedSymbology::SidcDefinitions::Identity::Unknown; switch (role.underlying()) { - case ParticipantManagement::Role_def::Unknown: + case ParticipantManagement::Role::Unknown: identity = AdvancedSymbology::SidcDefinitions::Identity::Unknown; break; - case ParticipantManagement::Role_def::Friend: + case ParticipantManagement::Role::Friend: identity = AdvancedSymbology::SidcDefinitions::Identity::Friend; break; - case ParticipantManagement::Role_def::Neutral: + case ParticipantManagement::Role::Neutral: identity = AdvancedSymbology::SidcDefinitions::Identity::Neutral; break; - case ParticipantManagement::Role_def::Enemy: + case ParticipantManagement::Role::Enemy: identity = AdvancedSymbology::SidcDefinitions::Identity::HostileFaker; break; - case ParticipantManagement::Role_def::Pending: + case ParticipantManagement::Role::Pending: identity = AdvancedSymbology::SidcDefinitions::Identity::Pending; break; - case ParticipantManagement::Role_def::AssumedFriend: + case ParticipantManagement::Role::AssumedFriend: identity = AdvancedSymbology::SidcDefinitions::Identity::AssumedFriend; break; - case ParticipantManagement::Role_def::Suspect: + case ParticipantManagement::Role::Suspect: identity = AdvancedSymbology::SidcDefinitions::Identity::SuspectJoker; break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp index 44013d343..9d718adbc 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/asb_foreign_interface_impl.cpp @@ -65,7 +65,7 @@ QSharedPointer ForeignInterfaceImpl::findImage(const ParticipantMa symDataToRender.fillColorReplace = true; QColor injuryColor = QColor(100, 100, 0); - ProjectDataManagement::VulnerabilityState currentState = ProjectDataManagement::VulnerabilityState::CombatReady; + ProjectDataManagement::VulnerabilityState currentState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady; const ParticipantManagement::DynamicParticipantData dData = m_ppmDtc->dynamicParticipantData(participant.id()); @@ -161,30 +161,30 @@ AdvancedSymbology::Injury ForeignInterfaceImpl::stateToInjury(const ProjectDataM { switch (state.underlying()) { - case ProjectDataManagement::VulnerabilityState::CombatReady: - case ProjectDataManagement::VulnerabilityState::TemporarySeverance: - case ProjectDataManagement::VulnerabilityState::NearMiss: - case ProjectDataManagement::VulnerabilityState::HitWithNoEffect: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect: return AdvancedSymbology::Injury::NoInjury; - case ProjectDataManagement::VulnerabilityState::LightDamage: - case ProjectDataManagement::VulnerabilityState::MediumDamage: - case ProjectDataManagement::VulnerabilityState::HeavyDamage: - case ProjectDataManagement::VulnerabilityState::NotReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady: return AdvancedSymbology::Injury::Hit; - case ProjectDataManagement::VulnerabilityState::MobilityKill: - case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill: return AdvancedSymbology::Injury::MobilityKill; - case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage: - case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage: return AdvancedSymbology::Injury::WeaponKill; - case ProjectDataManagement::VulnerabilityState::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill: return AdvancedSymbology::Injury::TotalKill; - case ProjectDataManagement::VulnerabilityState::NContamination: - case ProjectDataManagement::VulnerabilityState::BContamination: - case ProjectDataManagement::VulnerabilityState::CContamination: - case ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged: - case ProjectDataManagement::VulnerabilityState::Reserved: - case ProjectDataManagement::VulnerabilityState::NoChange: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NContamination: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_BContamination: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CContamination: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_Reserved: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange: break; } return AdvancedSymbology::Injury::NoInjury; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp index 28b13f7b7..e7dddac76 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.cpp @@ -100,10 +100,10 @@ QVariant ConfigAlarmModel::data(const QModelIndex& index, int role) const const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human - ? ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries - : ProjectDataManagement::VulnerabilityClass_def::VehicleDamages; + ? ProjectDataManagement::VulnerabilityClass::SoldierInjuries + : ProjectDataManagement::VulnerabilityClass::VehicleDamages; ProjectDataManagement::VulnerabilityState vs = - static_cast(alarmConfig.vulnerabilityState()); + static_cast(alarmConfig.vulnerabilityState()); vulnerabilityState = ProjectDataManagement::toString(vs, vc); } return vulnerabilityState; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h index 6d3523b66..9c8f6f72b 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h @@ -21,7 +21,7 @@ struct NotificationEx : public AlarmManagement::Notification int equipmentNumber = 0; int participantId = 0; int aesId = 0; - ProjectDataManagement::PdmEventType eventTypeId = ProjectDataManagement::PdmEventType::Unknown; + ProjectDataManagement::PdmEventType eventTypeId = ProjectDataManagement::PdmEventType::EventType_Unknown; NotificationEx() = default; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp index da6287513..ccbd652b2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_config_alarm_gui_plugin.cpp @@ -57,7 +57,7 @@ void InterfaceImpl::clearInterfaces() void InterfaceImpl::showEmergencyMessage(const AlarmManagement::Notification &data) { - if (data.eventType() != ProjectDataManagement::PdmEventType_def::EmergencyCall) + if (data.eventType() != ProjectDataManagement::PdmEventType::EventType_EmergencyCall) return; const int issi = data.equipmentNumber(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp index 948dfd83a..e4df3c5f9 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.cpp @@ -57,55 +57,55 @@ AlarmDialog::AlarmDialog(QWidget* parent) alarmCheckBox.name = QLatin1String("NuclearAgentEntry"); alarmCheckBox.checkboxMarker = m_ui->cbxNMarker; alarmCheckBox.checkboxWindow = m_ui->cbxNMessage; - alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EnterNuclear; + alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterNuclear; m_checkBoxes.append(alarmCheckBox); alarmCheckBox.name = QLatin1String("DangerAreasEntry"); alarmCheckBox.checkboxMarker = m_ui->cbxDanerAreaMarker; alarmCheckBox.checkboxWindow = m_ui->cbxDangerAreaMessage; - alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EnterDangerArea; + alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterDangerArea; m_checkBoxes.append(alarmCheckBox); alarmCheckBox.name = QLatin1String("MineAreaEntry"); alarmCheckBox.checkboxMarker = m_ui->cbxMineAreaEntryMarker; alarmCheckBox.checkboxWindow = m_ui->cbxMineAreaEntryMessage; - alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EnterMineArea; + alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EventType_EnterMineArea; m_checkBoxes.append(alarmCheckBox); alarmCheckBox.name = QLatin1String("MineAreaHit"); alarmCheckBox.checkboxMarker = m_ui->cbxMineAreaHitMarker; alarmCheckBox.checkboxWindow = m_ui->cbxMineAreaHitMessage; - alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::HitMine; + alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitMine; m_checkBoxes.append(alarmCheckBox); alarmCheckBox.name = QLatin1String("DirectFire"); alarmCheckBox.checkboxMarker = m_ui->cbxDirectFireMarker; alarmCheckBox.checkboxWindow = m_ui->cbxDirectFireMessage; - alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::Hit; + alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Hit; m_checkBoxes.append(alarmCheckBox); alarmCheckBox.name = QLatin1String("IndirectFire"); alarmCheckBox.checkboxMarker = m_ui->cbxIndirectFireMarker; alarmCheckBox.checkboxWindow = m_ui->cbxIndirectFireMessage; - alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::HitEffectSimulation; + alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation; m_checkBoxes.append(alarmCheckBox); alarmCheckBox.name = QLatin1String("CrossLocalBorderlines"); alarmCheckBox.checkboxMarker = m_ui->cbxLocalBorderMarker; alarmCheckBox.checkboxWindow = m_ui->cbxLocalBorderMessage; - alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::CrossLocalBorderline; + alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline; m_checkBoxes.append(alarmCheckBox); alarmCheckBox.name = QLatin1String("CrossGlobalBorderlines"); alarmCheckBox.checkboxMarker = m_ui->cbxGlobalBorderMarker; alarmCheckBox.checkboxWindow = m_ui->cbxGlobalBorderMessage; - alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::CrossGlobalBorderline; + alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline; m_checkBoxes.append(alarmCheckBox); alarmCheckBox.name = QLatin1String("AirSupport"); alarmCheckBox.checkboxMarker = m_ui->cbxAirSupportMarker; alarmCheckBox.checkboxWindow = m_ui->cbxAirSupportMessage; - alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::AirSupport; + alarmCheckBox.eventTypeId = ProjectDataManagement::PdmEventType::EventType_AirSupport; m_checkBoxes.append(alarmCheckBox); setOnlineHelpFilename(QLatin1String("Situation-Configure_Global_Alarms")); @@ -176,57 +176,57 @@ void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, DEBUG_LOG(m_logger) << "************** onAlarmConfig zuweisen "; switch (data.eventTypeId().underlying()) { - case ProjectDataManagement::PdmEventType_def::EnterNuclear: { + case ProjectDataManagement::PdmEventType::EventType_EnterNuclear: { DEBUG_LOG(m_logger) << "EnterNuclear zuweisen "; m_ui->cbxNMarker->setChecked(setMarker); m_ui->cbxNMessage->setChecked(messageWindow); break; } - case ProjectDataManagement::PdmEventType_def::EnterDangerArea: { + case ProjectDataManagement::PdmEventType::EventType_EnterDangerArea: { DEBUG_LOG(m_logger) << "EnterDangerArea zuweisen "; m_ui->cbxDanerAreaMarker->setChecked(setMarker); m_ui->cbxDangerAreaMessage->setChecked(messageWindow); break; } - case ProjectDataManagement::PdmEventType_def::EnterMineArea: { + case ProjectDataManagement::PdmEventType::EventType_EnterMineArea: { DEBUG_LOG(m_logger) << "EnterMineArea zuweisen "; m_ui->cbxMineAreaEntryMarker->setChecked(setMarker); m_ui->cbxMineAreaEntryMessage->setChecked(messageWindow); break; } - case ProjectDataManagement::PdmEventType_def::HitMine: { + case ProjectDataManagement::PdmEventType::EventType_HitMine: { DEBUG_LOG(m_logger) << "HitMine zuweisen "; m_ui->cbxMineAreaHitMarker->setChecked(setMarker); m_ui->cbxMineAreaHitMessage->setChecked(messageWindow); break; } - case ProjectDataManagement::PdmEventType_def::Hit: { + case ProjectDataManagement::PdmEventType::EventType_Hit: { DEBUG_LOG(m_logger) << "Hit zuweisen "; m_ui->cbxDirectFireMarker->setChecked(setMarker); m_ui->cbxDirectFireMessage->setChecked(messageWindow); break; } - case ProjectDataManagement::PdmEventType_def::HitEffectSimulation: { + case ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation: { DEBUG_LOG(m_logger) << "HitEffectSimulation zuweisen "; m_ui->cbxIndirectFireMarker->setChecked(setMarker); m_ui->cbxIndirectFireMessage->setChecked(messageWindow); break; } - case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline: { + case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline: { DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen "; m_ui->cbxLocalBorderMarker->setChecked(setMarker); m_ui->cbxLocalBorderMessage->setChecked(messageWindow); break; } - case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline: { + case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline: { DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen "; m_ui->cbxGlobalBorderMarker->setChecked(setMarker); m_ui->cbxGlobalBorderMessage->setChecked(messageWindow); break; } - case ProjectDataManagement::PdmEventType_def::AirSupport: { + case ProjectDataManagement::PdmEventType::EventType_AirSupport: { DEBUG_LOG(m_logger) << "AirSupport zuweisen "; m_ui->cbxAirSupportMarker->setChecked(setMarker); m_ui->cbxAirSupportMessage->setChecked(messageWindow); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h index 232b8e2fb..124cf1200 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/alm_dialog.h @@ -41,7 +41,7 @@ public: QCheckBox *checkboxMarker = nullptr; QCheckBox *checkboxWindow = nullptr; QString name; - ProjectDataManagement::PdmEventType eventTypeId = ProjectDataManagement::PdmEventType::Unknown; + ProjectDataManagement::PdmEventType eventTypeId = ProjectDataManagement::PdmEventType::EventType_Unknown; }; explicit AlarmDialog(QWidget *parent = nullptr); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp index 8c70fab93..a377723a7 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_config_participant_dialog.cpp @@ -115,7 +115,7 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig& switch (alarm.eventTypeId().underlying()) { - case ProjectDataManagement::PdmEventType_def::Hit: { + case ProjectDataManagement::PdmEventType::EventType_Hit: { DEBUG_LOG(m_logger) << "Hit zuweisen "; m_ui->cbxDirectFire->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); @@ -123,43 +123,43 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig& if (alarm.vulnerabilityState() >= 0) { ProjectDataManagement::VulnerabilityState vulState = - static_cast(alarm.vulnerabilityState()); + static_cast(alarm.vulnerabilityState()); int index = m_ui->cbStatusDirect->findData(QVariant(vulState.underlying())); m_ui->cbStatusDirect->setCurrentIndex(index); } break; } - case ProjectDataManagement::PdmEventType_def::HitEffectSimulation: { + case ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation: { DEBUG_LOG(m_logger) << "HitIndirect zuweisen "; m_ui->cbxIndirectFire->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); break; } - case ProjectDataManagement::PdmEventType_def::AirSupport: { + case ProjectDataManagement::PdmEventType::EventType_AirSupport: { DEBUG_LOG(m_logger) << "AirSupport zuweisen "; m_ui->cbxAirSupport->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); break; } - case ProjectDataManagement::PdmEventType_def::HitMine: { + case ProjectDataManagement::PdmEventType::EventType_HitMine: { DEBUG_LOG(m_logger) << "HitMine zuweisen "; m_ui->cbxMines->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); break; } - case ProjectDataManagement::PdmEventType_def::HitB: - case ProjectDataManagement::PdmEventType_def::HitN: - case ProjectDataManagement::PdmEventType_def::HitC: { + case ProjectDataManagement::PdmEventType::EventType_HitB: + case ProjectDataManagement::PdmEventType::EventType_HitN: + case ProjectDataManagement::PdmEventType::EventType_HitC: { DEBUG_LOG(m_logger) << "Hit N/B/C zuweisen "; m_ui->cbxNbcAgent->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); break; } - case ProjectDataManagement::PdmEventType_def::FriendlyFire: { + case ProjectDataManagement::PdmEventType::EventType_FriendlyFire: { DEBUG_LOG(m_logger) << "FriendlyFire zuweisen "; m_ui->cbxFriendlyFire->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); @@ -167,27 +167,27 @@ void ConfigParticipantsDialog::setAlaramData(const AlarmManagement::AlarmConfig& if (alarm.vulnerabilityState() >= 0) { ProjectDataManagement::VulnerabilityState vulState = - static_cast(alarm.vulnerabilityState()); + static_cast(alarm.vulnerabilityState()); int index = m_ui->cbStatusDirect->findData(QVariant(vulState.underlying())); m_ui->cbStatusFriendly->setCurrentIndex(index); } break; } - case ProjectDataManagement::PdmEventType_def::Manipulation: { + case ProjectDataManagement::PdmEventType::EventType_Manipulation: { DEBUG_LOG(m_logger) << "Manipulation zuweisen "; m_ui->cbxManipulation->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); break; } - case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline: { + case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline: { DEBUG_LOG(m_logger) << "CrossGlobalBorderline zuweisen "; m_ui->cbxGlobalBorderLine->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); m_ui->cbxMessageWindow->setChecked(alarm.messageWindow()); break; } - case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline: { + case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline: { DEBUG_LOG(m_logger) << "CrossLocalBorderline zuweisen "; m_ui->cbxLocalBorderLine->setChecked(true); m_ui->cbxSetMarker->setChecked(alarm.setMarker()); @@ -215,7 +215,7 @@ std::vector ConfigParticipantsDialog::getCheckedVa { if (m_ui->cbxDirectFire->isChecked()) { - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::Hit); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_Hit); int statusDirect = -1; if (m_ui->cbStatusDirect->currentIndex() > 0) statusDirect = m_ui->cbStatusDirect->currentData().toInt(); @@ -224,7 +224,7 @@ std::vector ConfigParticipantsDialog::getCheckedVa } if (m_ui->cbxFriendlyFire->isChecked()) { - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::FriendlyFire); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_FriendlyFire); int statusFriendly = -1; if (m_ui->cbStatusFriendly->currentIndex() > 0) statusFriendly = m_ui->cbStatusFriendly->currentData().toInt(); @@ -234,41 +234,41 @@ std::vector ConfigParticipantsDialog::getCheckedVa alarmActionDds.vulnerabilityState(-1); if (m_ui->cbxIndirectFire->isChecked()) { - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitEffectSimulation); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation); alarmsDds.push_back(alarmActionDds); } if (m_ui->cbxAirSupport->isChecked()) { - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::AirSupport); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_AirSupport); alarmsDds.push_back(alarmActionDds); } if (m_ui->cbxMines->isChecked()) { - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitMine); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitMine); alarmsDds.push_back(alarmActionDds); } if (m_ui->cbxNbcAgent->isChecked()) { - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitN); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitN); alarmsDds.push_back(alarmActionDds); - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitB); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitB); alarmsDds.push_back(alarmActionDds); - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::HitC); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_HitC); alarmsDds.push_back(alarmActionDds); } if (m_ui->cbxManipulation->isChecked()) { - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::Manipulation); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_Manipulation); alarmsDds.push_back(alarmActionDds); } if (m_ui->cbxGlobalBorderLine->isChecked()) { - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline); alarmsDds.push_back(alarmActionDds); } if (m_ui->cbxLocalBorderLine->isChecked()) { - alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType_def::CrossLocalBorderline); + alarmActionDds.eventTypeId(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline); alarmsDds.push_back(alarmActionDds); } } @@ -298,9 +298,9 @@ void ConfigParticipantsDialog::fillCbx() ParticipantManagement::insertVulnerabilityStates(m_ui->cbStatusDirect, m_typeClass); ParticipantManagement::insertVulnerabilityStates(m_ui->cbStatusFriendly, m_typeClass); m_ui->cbStatusDirect->removeItem( - m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::TemporarySeverance)); + m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance)); m_ui->cbStatusFriendly->removeItem( - m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::TemporarySeverance)); + m_ui->cbStatusDirect->findData(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance)); } } // namespace ParticipantAlarms diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp index 20ea1afaa..9f89efa1c 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_dialog.cpp @@ -100,7 +100,7 @@ void ParticipantsDialog::onSelectionChanged() { const ParticipantManagement::ParticipantData data(m_participantModel->getParticipantData(index)); if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) || - m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit) + m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit) configureAlarms = true; DEBUG_LOG(m_logger) << "setChildrenSelected row =" << index.row() << " column=" << index.column(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp index ad3920c4b..a3986188f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/alm_participant_model.cpp @@ -51,7 +51,7 @@ bool ParticipantAlarmModel::isSelectableByAlarm(const QModelIndex& index, bool* const ParticipantManagement::ParticipantData data(getParticipantData(index)); if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) || - m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit) + m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit) isSimulatable = true; DEBUG_LOG(m_logger) << "ParticipantId: " << data.id() << " isSimulated:" << data.isSimulated() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp index 7f78ef272..faa34a56d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_charge_effect_item_info.cpp @@ -180,9 +180,9 @@ void AesChargeEffectItemInfo::onShowDetails() if (m_session->getForeignGuiInterface(ifc)) { const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(aiv.chargeStruct().chargeTypeId()); - if (gearClass == ProjectDataManagement::GearClass_def::Biological) + if (gearClass == ProjectDataManagement::GearClass::Biological) registerDialog(ifc->showEditWindow(aiv.aesItemId(), false, this)); - else if (gearClass == ProjectDataManagement::GearClass_def::Chemical) + else if (gearClass == ProjectDataManagement::GearClass::Chemical) registerDialog(ifc->showEditWindow(aiv.aesItemId(), true, this)); } else diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp index 0eb612bd5..366704d44 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/aes_info_dialog.cpp @@ -107,8 +107,8 @@ bool AesInfoDialog::cbFunc(const AreaEffectSimulation::AesItemView& aesItemView) setOnlineHelpFilename(QStringLiteral("Info_Dialog-BoobyTrap")); break; } - case AreaEffectSimulation::AesType_def::AtOffRouteMine: - case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: { + case AreaEffectSimulation::AesType::AtOffRouteMine: + case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: { handleOffRouteMine(aesItemView); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::offRouteMineChanged, this, &AesInfoDialog::onOffRouteMineChanged); @@ -284,14 +284,14 @@ bool AesInfoDialog::init(LtsSession::LtsSession* session, const std::shared_ptr< m_ui->lbAesId->setText(tr("AES Id:")); - if (m_aesType == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines) + if (m_aesType == AreaEffectSimulation::AesType::AtMineAreaSingleMines) { handleMineAraeSingleMine(); connect(m_dtc.get(), &AreaEffectSimulation::Interface::Dtc::dusMineStateChanged, this, &AesInfoDialog::onDusMineStateChanged); } - else if (m_aesType == AreaEffectSimulation::AesType_def::AtDusSingleMine) + else if (m_aesType == AreaEffectSimulation::AesType::AtDusSingleMine) { handleSingleDusMine(); @@ -363,7 +363,7 @@ void AesInfoDialog::handleBoobyTrap(const AreaEffectSimulation::BoobyTrap& data) DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::BoobyTrap)" << " data.id(): " << data.id(); - handleAesItem(data, AesType_def::AtBoobyTrap); + handleAesItem(data, AesType::AtBoobyTrap); m_bcChargeTypeId = data.chargeStruct().chargeTypeId(); @@ -390,7 +390,7 @@ void AesInfoDialog::handleOffRouteMine(const AreaEffectSimulation::OffRouteMine& DEBUG_LOG(m_logger) << Q_FUNC_INFO << "(AreaEffectSimulation::OffRouteMine)" << " data.id(): " << data.id(); - handleAesItem(data, AesType_def::AtOffRouteMine); + handleAesItem(data, AesType::AtOffRouteMine); m_bcChargeTypeId = data.chargeStruct().chargeTypeId(); @@ -595,17 +595,17 @@ void AesInfoDialog::handleFunctionalArea(const FunctionalArea& data) QStringList chargeTypesNames; QStringList chargeTypesShortNames; - if (data.medicMode() != AesOperatingMode_def::OmNotUsed) + if (data.medicMode() != AesOperatingMode::OmNotUsed) { chargeTypesNames << m_pdmDtc->trChargeTypeName(411, true); chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(411, true); } - if (data.maintMode() != AesOperatingMode_def::OmNotUsed) + if (data.maintMode() != AesOperatingMode::OmNotUsed) { chargeTypesNames << m_pdmDtc->trChargeTypeName(412, true); chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(412, true); } - if (data.deconMode() != AesOperatingMode_def::OmNotUsed) + if (data.deconMode() != AesOperatingMode::OmNotUsed) { chargeTypesNames << m_pdmDtc->trChargeTypeName(413, true); chargeTypesShortNames << m_pdmDtc->trChargeTypeShortName(413, true); @@ -693,7 +693,7 @@ void AesInfoDialog::handleMineAraeSingleMine(const Core::GeoPosition2D& position m_ui->lblChargeTypeId->setText(QString::number(ctId)); } - const bool isDus = static_cast(m_pdmDtc->mineClass(ctId, 0, 0)) == MineClass::DUS; + const bool isDus = static_cast(m_pdmDtc->mineClass(ctId, 0, 0)) == MineClass::DUS; if (isDus) m_ui->lbAesId->setText(tr("DUS Mine Id:")); else @@ -763,28 +763,28 @@ void AesInfoDialog::handleSingleDusMine() switch (dsm.effectStateId().underlying()) { - case AesEffectState_def::EsExpired: + case AesEffectState::EsExpired: m_ui->lblStatus->setText(tr("Inactive")); break; - case AesEffectState_def::EsRemoved: + case AesEffectState::EsRemoved: m_ui->lblStatus->setText(tr("Removed")); break; - case AesEffectState_def::EsCreated: + case AesEffectState::EsCreated: m_ui->lblStatus->setText(tr("Created")); break; - case AesEffectState_def::EsPrepared: + case AesEffectState::EsPrepared: m_ui->lblStatus->setText(tr("Prepared")); break; - case AesEffectState_def::EsActivated: + case AesEffectState::EsActivated: m_ui->lblStatus->setText(tr("Active")); break; - case AesEffectState_def::EsPaused: + case AesEffectState::EsPaused: m_ui->lblStatus->setText(tr("Paused")); break; - case AesEffectState_def::EsError: + case AesEffectState::EsError: m_ui->lblStatus->setText(tr("Error")); break; - case AesEffectState_def::EsReceived: + case AesEffectState::EsReceived: m_ui->lblStatus->setText(tr("Received")); break; default: @@ -847,8 +847,8 @@ void AesInfoDialog::handleAesItem(const AesItem& aesData, AesType aesTypeId) m_pdmDtc->gearClassFromChargeTypeId(aesData.chargeStruct().chargeTypeId()); switch (gearClass.underlying()) { - case ProjectDataManagement::GearClass_def::Biological: - case ProjectDataManagement::GearClass_def::Chemical: + case ProjectDataManagement::GearClass::Biological: + case ProjectDataManagement::GearClass::Chemical: m_ui->lblAesType->setText(ProjectDataManagement::toString(gearClass)); break; default: @@ -916,7 +916,7 @@ void AesInfoDialog::onShowDetails() if (m_session->getForeignGuiInterface(ifc)) { const auto gearClass = m_pdmDtc->gearClassFromChargeTypeId(m_bcChargeTypeId); - if (gearClass == ProjectDataManagement::GearClass_def::Biological) + if (gearClass == ProjectDataManagement::GearClass::Biological) { AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(m_aesEntityId, false, this); if (dialog) @@ -925,7 +925,7 @@ void AesInfoDialog::onShowDetails() break; } - if (gearClass == ProjectDataManagement::GearClass_def::Chemical) + if (gearClass == ProjectDataManagement::GearClass::Chemical) { AreaEffectSimulation::BaseEdit* dialog = ifc->showEditWindow(m_aesEntityId, true, this); if (dialog) @@ -1146,7 +1146,7 @@ void AesInfoDialog::onShowDetails() bool AesInfoDialog::onResetDusMines() { - if (m_aesType == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines) + if (m_aesType == AreaEffectSimulation::AesType::AtMineAreaSingleMines) { DEBUG_LOG(m_logger) << "onResetDusMines() AtMineAreaSingleMines mineId: " << m_aesEntityId; MineResetRequest req(0, {m_aesEntityId}); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.cpp index 490588f77..25622d131 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/aes_air_support_impact_list.cpp @@ -107,7 +107,7 @@ void AirSupportExplosionClusterImpactList::createModel() { m_model = new AesItemSortFilterProxyModelTmpl(m_session, this); - m_effectClusterModel = new EffectClusterModel({ProjectDataManagement::GearClass_def::AirSupport}, this); + m_effectClusterModel = new EffectClusterModel({ProjectDataManagement::GearClass::AirSupport}, this); m_effectClusterModel->initModel(m_session); m_model->setSourceModel(m_effectClusterModel); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/CustomView/aes_bccontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/CustomView/aes_bccontamination.cpp index 7d3c1517a..75eb0f8d0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/CustomView/aes_bccontamination.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/CustomView/aes_bccontamination.cpp @@ -74,7 +74,7 @@ bool CustomViewBCContamination::calculateIcon(const BCContamination &bcContamina bcContaOut.propagationDirection = bcContamination.propagationDirection(); const QPolygonF poly = AreaEffectSimulation::Polygons::bcContamination(bcContaOut, - ProjectDataManagement::VolatilityType_def::get_default(), + ProjectDataManagement::VolatilityType::get_default(), bcContamination.impactRadius(), QDateTime::currentDateTime()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.cpp index 24e1e3094..ec0a25f2d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/aes_bccontamination_edit.cpp @@ -132,12 +132,12 @@ void BCContaminationEdit::enableUiElements(bool enable) m_ui->cbWeather->setEnabled(enable); m_ui->pbClear->setEnabled(enable); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->bCContamination(m_aesItem.id()); @@ -270,7 +270,7 @@ void BCContaminationEdit::setData(const BCContamination &contamination, bool cop if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromStdString(contamination.name())); m_ui->dteEffectStart->setMsecsSinceEpoch(contamination.effectStart().is_set() ? contamination.effectStart().get() : 0); @@ -348,7 +348,7 @@ bool BCContaminationEdit::apply() chargeType, pos, radius, - static_cast(weathersource), + static_cast(weathersource), LtsUtils::toOptional(partyId), LtsUtils::toOptional(participantId), dds::core::optional(), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp index 5f76148c7..c8f900a83 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_edit.cpp @@ -51,20 +51,20 @@ void BaseEdit::onAesItemModifyReply(const Core::FunctionReplyObject& replyObject bool BaseEdit::isModifiable() const { AesEffectState effectState = m_aesItem.effectStateId(); - return (effectState == AreaEffectSimulation::AesEffectState_def::EsPaused || - effectState == AreaEffectSimulation::AesEffectState_def::EsActivated || - effectState == AreaEffectSimulation::AesEffectState_def::EsPrepared || - effectState == AreaEffectSimulation::AesEffectState_def::EsCreated || - effectState == AreaEffectSimulation::AesEffectState_def::EsUnknown || - effectState == AreaEffectSimulation::AesEffectState_def::EsReceived) && + return (effectState == AreaEffectSimulation::AesEffectState::EsPaused || + effectState == AreaEffectSimulation::AesEffectState::EsActivated || + effectState == AreaEffectSimulation::AesEffectState::EsPrepared || + effectState == AreaEffectSimulation::AesEffectState::EsCreated || + effectState == AreaEffectSimulation::AesEffectState::EsUnknown || + effectState == AreaEffectSimulation::AesEffectState::EsReceived) && (!m_session->isReplayPartition()) && (m_session->app() != LtsAppDescriptor::App::OC); } bool BaseEdit::isOnlyNameModifiable() const { AesEffectState effectState = m_aesItem.effectStateId(); - return (effectState == AreaEffectSimulation::AesEffectState_def::EsPaused || - effectState == AreaEffectSimulation::AesEffectState_def::EsActivated) && + return (effectState == AreaEffectSimulation::AesEffectState::EsPaused || + effectState == AreaEffectSimulation::AesEffectState::EsActivated) && (!m_session->isReplayPartition()) && (m_session->app() != LtsAppDescriptor::App::OC); } @@ -166,10 +166,10 @@ void BaseEdit::setEffectStartEnabled(LtsWidgets::LtsDateTimeEdit* dte, bool enab m_session->getDtc(exmDtc); ExerciseManagement::Exercise exercise = exmDtc->exercise(exerciseId); - enable = (exercise.state() == ExerciseManagement::ExerciseState_def::Started || - exercise.state() == ExerciseManagement::ExerciseState_def::Paused); + enable = (exercise.state() == ExerciseManagement::ExerciseState::Started || + exercise.state() == ExerciseManagement::ExerciseState::Paused); - if (exercise.state() == ExerciseManagement::ExerciseState_def::Created) + if (exercise.state() == ExerciseManagement::ExerciseState::Created) dte->setChecked(false); else dte->setChecked(dte->msecsSinceEpoch() > 0); @@ -268,7 +268,7 @@ void BaseEdit::onAreaChanged(const AesItem& data, DataModification modType) if (data.id() != m_aesItem.id()) return; - if (modType == DataModification::eRemoved || data.effectStateId() == AesEffectState_def::EsRemoved) + if (modType == DataModification::eRemoved || data.effectStateId() == AesEffectState::EsRemoved) { __unchange__(); @@ -302,7 +302,7 @@ bool BaseEdit::init(int aesItemId, LtsSession::LtsSession* session) if (aesItemId == 0) { - m_aesItem.effectSourceId(ProjectDataManagement::EffectSource_def::ES_Internal); + m_aesItem.effectSourceId(ProjectDataManagement::EffectSource::ES_Internal); m_buttonBox->setText(LtsWidgets::DialogButton::Ok, tr("Add")); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp index 9716beba6..aaea755b4 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.cpp @@ -285,7 +285,7 @@ bool AesItemSortFilterProxyModel::checkFilter(int source_row) const return false; const auto effectStateId = aesEffectStateId(source_row); - if (effectStateId == AesEffectState_def::EsRemoved) + if (effectStateId == AesEffectState::EsRemoved) return false; if (showExpired()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h index 48eb4f2b1..17b99a755 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h @@ -347,11 +347,11 @@ public: { const auto es = aesItem(row).effectStateId(); - return es != AreaEffectSimulation::AesEffectState_def::EsCreated && - es != AreaEffectSimulation::AesEffectState_def::EsPrepared && - es != AreaEffectSimulation::AesEffectState_def::EsActivated && - es != AreaEffectSimulation::AesEffectState_def::EsPaused && - es != AreaEffectSimulation::AesEffectState_def::EsReceived; + return es != AreaEffectSimulation::AesEffectState::EsCreated && + es != AreaEffectSimulation::AesEffectState::EsPrepared && + es != AreaEffectSimulation::AesEffectState::EsActivated && + es != AreaEffectSimulation::AesEffectState::EsPaused && + es != AreaEffectSimulation::AesEffectState::EsReceived; } bool isExternal(int row) const override { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.cpp index d338d299d..d8446e74b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/aes_pixmap_label.cpp @@ -35,21 +35,21 @@ Qt::BrushStyle PixmapLabel::checkForBrushStyle(const AesEffectState &state) { switch(state.underlying()) { - case AesEffectState_def::EsUnknown: + case AesEffectState::EsUnknown: return Qt::BrushStyle::NoBrush; - case AesEffectState_def::EsPrepared: - case AesEffectState_def::EsFired: + case AesEffectState::EsPrepared: + case AesEffectState::EsFired: return Qt::BrushStyle::BDiagPattern; - case AesEffectState_def::EsCreated: - case AesEffectState_def::EsReceived: + case AesEffectState::EsCreated: + case AesEffectState::EsReceived: return Qt::BrushStyle::VerPattern; - case AesEffectState_def::EsActivated: + case AesEffectState::EsActivated: return Qt::BrushStyle::CrossPattern; - case AesEffectState_def::EsRemoved: + case AesEffectState::EsRemoved: return Qt::BrushStyle::NoBrush; - case AesEffectState_def::EsPaused: - case AesEffectState_def::EsExpired: - case AesEffectState_def::EsError: + case AesEffectState::EsPaused: + case AesEffectState::EsExpired: + case AesEffectState::EsError: return Qt::BrushStyle::SolidPattern; } return Qt::BrushStyle::NoBrush; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp index 7a0a0827c..1c83fd3b5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderline_edit.cpp @@ -83,12 +83,12 @@ void BorderlineEdit::enableUiElements(bool enable) m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable()); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->borderline(m_aesItem.id()); @@ -155,7 +155,7 @@ void BorderlineEdit::setData(const Borderline &borderline, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromStdString(borderline.name())); if ( borderline.partyId().is_set()) @@ -285,7 +285,7 @@ Borderline BorderlineEdit::jsonToBorderline(const QByteArray &content) borderline.effectMarkingInTa(obj[QStringLiteral("effectMarkingInTa")].toInt()); borderline.effectStart(obj[QStringLiteral("effectStart")].toDouble()); int effectStateId = obj[QStringLiteral("effectStateId")].toInt(); - borderline.effectStateId(static_cast(effectStateId)); + borderline.effectStateId(static_cast(effectStateId)); borderline.operatorId(obj[QStringLiteral("operatorId")].toInt()); borderline.id(0); borderline.name(obj[QStringLiteral("leIdentifier")].toString().toStdString()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp index 4d5afe627..0f4fabb38 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/aes_borderlines_model.cpp @@ -144,7 +144,7 @@ QVector BorderlinesModel::jsonToBorderlineVector(const QByteArray &c borderline.effectMarkingInTa(objArr[QStringLiteral("effectMarkingInTa")].toInt()); borderline.effectStart(objArr[QStringLiteral("effectStart")].toDouble()); int effectStateId = objArr[QStringLiteral("effectStateId")].toInt(); - borderline.effectStateId(static_cast(effectStateId)); + borderline.effectStateId(static_cast(effectStateId)); borderline.operatorId(objArr[QStringLiteral("operatorId")].toInt()); borderline.id(0); borderline.name(objArr[QStringLiteral("name")].toString().toStdString()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp index 0838e8eb6..10dfcc8e7 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/aes_charge_administration_model.cpp @@ -98,13 +98,13 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession* session, } QVector chargesForGearClass = - m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass_def::Artillery) + - m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass_def::Mortar); + m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::Artillery) + + m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::Mortar); LtsUtils::ProjectSettings* ps = LtsUtils::ProjectSettings::getInstance(); const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool(); if (enableRocket) - chargesForGearClass += m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass_def::Rocket); + chargesForGearClass += m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass::Rocket); for (const ParticipantManagement::Party& p : std::as_const(parties)) { for (const ProjectDataManagement::ChargeType& ct : std::as_const(chargesForGearClass)) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp index 4fd2483ad..8789cb5b5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/aes_charge_effect_edit.cpp @@ -165,7 +165,7 @@ void ChargeEffectEdit::onSelectionChanged() const ParticipantManagement::ParticipantData data(m_participantModel->getParticipantData(m_ui->dvParticipants->selectedRows().first())); DEBUG_LOG(m_logger) << "ParticipantId: " << data.id(); - if (m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit) + if (m_ppmDtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit) return; DEBUG_LOG(m_logger) << "typeClass: " << m_ppmDtc->type(data.typeId()).typeClass() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.cpp index 11721c945..74bcd12b3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/aes_danger_area_edit.cpp @@ -66,12 +66,12 @@ void DangerAreaEdit::enableUiElements(bool enable) m_ui->pbClear->setEnabled(enable); m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable()); setEffectStartEnabled(m_ui->dteEffectStart, enable); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->dangerArea(m_aesItem.id()); @@ -139,7 +139,7 @@ void DangerAreaEdit::setPbAesItemsText() if (item.id() <= 0) continue; - if (item.effectStateId() != AesEffectState_def::EsActivated) + if (item.effectStateId() != AesEffectState::EsActivated) continue; sl << QString::fromStdString(item.name().c_str()); } @@ -153,7 +153,7 @@ void DangerAreaEdit::setData(const DangerArea &aesItem, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name())); m_ui->dteEffectStart->setMsecsSinceEpoch(aesItem.effectStart().is_set() ? aesItem.effectStart().get() : 0); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.cpp index fdc970178..7b7ef758b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_effect_cluster_model.cpp @@ -176,9 +176,9 @@ QVariant EffectClusterModel::data(const QModelIndex &idx, int role) const const QString &hdr = this->headerData(BcName, Qt::Horizontal, Qt::DisplayRole).toString(); tooltip.append(QStringLiteral("

%1: %2

").arg(hdr, QString::fromStdString(ec.name()))); - bool bIsArtilleryOrMortar = m_gearClasses.contains(ProjectDataManagement::GearClass_def::Artillery) - || m_gearClasses.contains(ProjectDataManagement::GearClass_def::Mortar) - || m_gearClasses.contains(ProjectDataManagement::GearClass_def::Rocket); + bool bIsArtilleryOrMortar = m_gearClasses.contains(ProjectDataManagement::GearClass::Artillery) + || m_gearClasses.contains(ProjectDataManagement::GearClass::Mortar) + || m_gearClasses.contains(ProjectDataManagement::GearClass::Rocket); toolTipHelper(this, idx, ColGearType, tooltip); if (bIsArtilleryOrMortar) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp index 49e14f97e..447431586 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_edit.cpp @@ -280,12 +280,12 @@ void ExplosionEdit::enableUiElements(bool enable) } setFireButton(m_aesItem.effectStateId()); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); AesItem baseData; @@ -307,7 +307,7 @@ void ExplosionEdit::enableUiElements(bool enable) if (name != m_ui->leIdentifier->text()) m_ui->leIdentifier->setText(name); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsPaused) + if (m_aesItem.effectStateId() == AesEffectState::EsPaused) __unchange__(); } @@ -323,7 +323,7 @@ void ExplosionEdit::setBaseData(const AesItem &baseData, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromUtf8(baseData.name().c_str())); int idx = m_ui->cbChargeType->findData(baseData.chargeStruct().chargeTypeId()); @@ -810,16 +810,16 @@ bool ExplosionEdit::apply() void ExplosionEdit::onFireClicked() { m_ui->pbFire->setEnabled(false); - if ((m_aesItem.effectStateId() != AesEffectState_def::EsActivated && - m_aesItem.effectStateId() != AesEffectState_def::EsPaused && - m_aesItem.effectStateId() != AesEffectState_def::EsCreated && - m_aesItem.effectStateId() != AesEffectState_def::EsPrepared) + if ((m_aesItem.effectStateId() != AesEffectState::EsActivated && + m_aesItem.effectStateId() != AesEffectState::EsPaused && + m_aesItem.effectStateId() != AesEffectState::EsCreated && + m_aesItem.effectStateId() != AesEffectState::EsPrepared) || m_aesItem.id() <= 0) return; - if (m_aesItem.effectStateId() == AesEffectState_def::EsCreated || - m_aesItem.effectStateId() == AesEffectState_def::EsPrepared) + if (m_aesItem.effectStateId() == AesEffectState::EsCreated || + m_aesItem.effectStateId() == AesEffectState::EsPrepared) { m_ui->dteEffectStart->setMsecsSinceEpoch(m_session->partitionTime() + 3000); m_ui->dteEffectStart->setChecked(true); @@ -836,7 +836,7 @@ void ExplosionEdit::onFireClicked() m_requestHelper->addRequest([ = ]() { return m_ftc->explosionAreaPauseResumeRequest(ExplosionAreaPauseResumeRequest(m_aesItem.id(), - m_aesItem.effectStateId() != AesEffectState_def::EsActivated, + m_aesItem.effectStateId() != AesEffectState::EsActivated, dds::core::optional(), dds::core::optional(), dds::core::optional()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp index 0afa5e9b2..07edb270f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_gui_plugin.cpp @@ -326,9 +326,9 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowExplosionClusterListDialog(QWidget * ExplosionList *listWidget; listWidget = new ExplosionClusterList(menuGroup(), - {ProjectDataManagement::GearClass_def::Artillery, - ProjectDataManagement::GearClass_def::Mortar, - ProjectDataManagement::GearClass_def::Rocket}, + {ProjectDataManagement::GearClass::Artillery, + ProjectDataManagement::GearClass::Mortar, + ProjectDataManagement::GearClass::Rocket}, parent); if (listWidget->init(m_session)) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp index 027912064..c53d59af2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosion_list.cpp @@ -288,7 +288,7 @@ void ExplosionAreaList::createModel() ExplosionClusterList::ExplosionClusterList(const QString &menuGroup, const QVector &gcs, QWidget *parent) - : ExplosionList(menuGroup, etExplosionCluster, ProjectDataManagement::GearClass_def::Artillery, parent), m_model(nullptr), m_gearClasses(gcs) + : ExplosionList(menuGroup, etExplosionCluster, ProjectDataManagement::GearClass::Artillery, parent), m_model(nullptr), m_gearClasses(gcs) { } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp index 10cc4941e..20b25aec6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.cpp @@ -63,7 +63,7 @@ static int s_timeUntilMinimumSec = 10; static const char *const VALUE_VALID_PROPERTY_NAME = "VALUE_VALID"; static const char *const LAST_VALUE = "LAST_VALUE"; static const int s_laserPrecisionChargeTypeId = 376; -QPair getMinMaxDistance(ProjectDataManagement::GearClass_def::type gearClass, int chargeTypeId) +QPair getMinMaxDistance(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { @@ -81,8 +81,8 @@ QPair getMinMaxDistance(ProjectDataManagement::GearClass_def::type gea static QHash> contraintsDistance; if (contraintsDistance.isEmpty()) { - contraintsDistance.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {3500, 40000}); - contraintsDistance.insert(static_cast(ProjectDataManagement::GearClass_def::Mortar), {800, 7800}); + contraintsDistance.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {3500, 40000}); + contraintsDistance.insert(static_cast(ProjectDataManagement::GearClass::Mortar), {800, 7800}); } @@ -90,8 +90,8 @@ QPair getMinMaxDistance(ProjectDataManagement::GearClass_def::type gea static QHash> contraintsDistanceVulcano; if (contraintsDistanceVulcano.isEmpty()) { - contraintsDistanceVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {10000, 70000}); - contraintsDistanceVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Rocket), {10000, 70000}); + contraintsDistanceVulcano.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {10000, 70000}); + contraintsDistanceVulcano.insert(static_cast(ProjectDataManagement::GearClass::Rocket), {10000, 70000}); } if (chargeTypeIdIsVulcano(chargeTypeId)) { @@ -107,10 +107,10 @@ QPair getMinMaxDistance(ProjectDataManagement::GearClass_def::type gea return {0, 100000}; return *it; } -int getMinDistance(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) { return getMinMaxDistance(gearClass, chargeTypeId).first; } -int getMaxDistance(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) { return getMinMaxDistance(gearClass, chargeTypeId).second; } +int getMinDistance(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxDistance(gearClass, chargeTypeId).first; } +int getMaxDistance(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxDistance(gearClass, chargeTypeId).second; } -QPair getMinMaxFlightDurationSec(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +QPair getMinMaxFlightDurationSec(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { @@ -121,15 +121,15 @@ QPair getMinMaxFlightDurationSec(ProjectDataManagement::GearClass::inn static QHash> contraintsFlightDuration; if (contraintsFlightDuration.isEmpty()) { - contraintsFlightDuration.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {6, 150}); - contraintsFlightDuration.insert(static_cast(ProjectDataManagement::GearClass_def::Mortar), {20, 60}); + contraintsFlightDuration.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {6, 150}); + contraintsFlightDuration.insert(static_cast(ProjectDataManagement::GearClass::Mortar), {20, 60}); } static QHash> contraintsFlightDurationVulcano; if (contraintsFlightDurationVulcano.isEmpty()) { - contraintsFlightDurationVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {0, 999}); - contraintsFlightDurationVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Rocket), {0, 999}); + contraintsFlightDurationVulcano.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {0, 999}); + contraintsFlightDurationVulcano.insert(static_cast(ProjectDataManagement::GearClass::Rocket), {0, 999}); } if (chargeTypeIdIsVulcano(chargeTypeId)) { @@ -145,16 +145,16 @@ QPair getMinMaxFlightDurationSec(ProjectDataManagement::GearClass::inn return {10, 100}; return *it; } -int getMinFlightDurationSec(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +int getMinFlightDurationSec(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxFlightDurationSec(gearClass, chargeTypeId).first; } -int getMaxFlightDurationSec(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +int getMaxFlightDurationSec(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxFlightDurationSec(gearClass, chargeTypeId).second; } -QPair getMinMaxPeakHeight(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +QPair getMinMaxPeakHeight(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { @@ -165,15 +165,15 @@ QPair getMinMaxPeakHeight(ProjectDataManagement::GearClass::inner_enum static QHash> contraintsPeak; if (contraintsPeak.isEmpty()) { - contraintsPeak.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {250, 15000}); - contraintsPeak.insert(static_cast(ProjectDataManagement::GearClass_def::Mortar), {500, 3000}); + contraintsPeak.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {250, 15000}); + contraintsPeak.insert(static_cast(ProjectDataManagement::GearClass::Mortar), {500, 3000}); } static QHash> contraintsPeakVulcano; if (contraintsPeakVulcano.isEmpty()) { - contraintsPeakVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {1000, 37500}); - contraintsPeakVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Rocket), {1000, 37500}); + contraintsPeakVulcano.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {1000, 37500}); + contraintsPeakVulcano.insert(static_cast(ProjectDataManagement::GearClass::Rocket), {1000, 37500}); } if (chargeTypeIdIsVulcano(chargeTypeId)) { @@ -190,8 +190,8 @@ QPair getMinMaxPeakHeight(ProjectDataManagement::GearClass::inner_enum return {100, 10000}; return *it; } -int getMinPeakHeight(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) { return getMinMaxPeakHeight(gearClass, chargeTypeId).first; } -int getMaxPeakHeight(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) { return getMinMaxPeakHeight(gearClass, chargeTypeId).second; } +int getMinPeakHeight(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxPeakHeight(gearClass, chargeTypeId).first; } +int getMaxPeakHeight(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxPeakHeight(gearClass, chargeTypeId).second; } @@ -241,11 +241,11 @@ ExplosionsEdit::ExplosionsEdit(const QString &menuGroup, QWidget *parent) s_dropAngleUp = 70; m_geometrieButtonGroup = new QButtonGroup(this); - m_geometrieButtonGroup->addButton(m_ui->geometrieAimPointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint)); - m_geometrieButtonGroup->addButton(m_ui->geometrieAreaBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgArea)); - m_geometrieButtonGroup->addButton(m_ui->geometrieLineBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgLine)); - m_geometrieButtonGroup->addButton(m_ui->geometriePointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgPoint)); - m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgRadial)); + m_geometrieButtonGroup->addButton(m_ui->geometrieAimPointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgAimPoint)); + m_geometrieButtonGroup->addButton(m_ui->geometrieAreaBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgArea)); + m_geometrieButtonGroup->addButton(m_ui->geometrieLineBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgLine)); + m_geometrieButtonGroup->addButton(m_ui->geometriePointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgPoint)); + m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgRadial)); m_geometrieButtonGroup->setExclusive(true); m_gearClassFilter = {ProjectDataManagement::GearClass::GearClass_Artillery, ProjectDataManagement::GearClass::GearClass_Mortar}; @@ -416,8 +416,8 @@ bool ExplosionsEdit::init(int aesItemId, bool copy, LtsSession::LtsSession *sess } - m_explosionClusterData.explosionGeometry(AreaEffectSimulation::AesExplosionGeometry_def::EgArea); - onGeometrySelected(static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgArea)); + m_explosionClusterData.explosionGeometry(AreaEffectSimulation::AesExplosionGeometry::EgArea); + onGeometrySelected(static_cast(AreaEffectSimulation::AesExplosionGeometry::EgArea)); m_pdmCbx->fillFirePurposeComboBox(m_ui->cbFirePurpose); @@ -469,7 +469,7 @@ bool ExplosionsEdit::init(int aesItemId, bool copy, LtsSession::LtsSession *sess if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); m_explosionClusterData.id(m_aesItem.id()); m_explosionClusterData.effectStateId(m_aesItem.effectStateId()); } @@ -530,22 +530,22 @@ void ExplosionsEdit::setExplosionClusterData(const ExplosionCluster &ecData) m_ui->dteEffectStart->setMsecsSinceEpoch(ecData.effectStart().is_set() ? ecData.effectStart().get() : 0); - const AreaEffectSimulation::AesExplosionGeometry_def::type geometryType = ecData.explosionGeometry().underlying(); + const AreaEffectSimulation::AesExplosionGeometry geometryType = static_cast(ecData.explosionGeometry()); switch (geometryType) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: m_ui->geometrieAimPointBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: m_ui->geometriePointBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: m_ui->geometrieAreaBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgLine: + case AreaEffectSimulation::AesExplosionGeometry::EgLine: m_ui->geometrieLineBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: m_ui->geometrieRadialBtn->setChecked(true); break; default: @@ -614,7 +614,7 @@ void ExplosionsEdit::setExplosionClusterData(const ExplosionCluster &ecData) setCoord(centerpoint); } - if (ecData.explosionGeometry().underlying() == AreaEffectSimulation::AesExplosionGeometry_def::EgRadial) + if (ecData.explosionGeometry().underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial) { m_ui->sbDimensionY_Tiefe->setValue(areaRef.height() / 2); m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width() / 2); @@ -696,11 +696,11 @@ void ExplosionsEdit::onChargeTypeChanged() phfd = FlighDurationOrPeakHeight::FDPH_flightDuration; const qint32 gearClassId = m_ui->cbGearClass->currentData().toInt(); - ProjectDataManagement::GearClass::type gearClassType = static_cast(gearClassId); + ProjectDataManagement::GearClass gearClassType = static_cast(gearClassId); setMinMaxConstraints(phfd, gearClassType, chargeTypeId); - if (m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry_def::EgPoint) + if (m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgPoint) { int igniterTypeId = m_ui->cbIgniterType->currentData().toInt(); const double impactRadius = m_pdmDtc->impactRadius(chargeTypeId, igniterTypeId, 0); @@ -792,7 +792,7 @@ void ExplosionsEdit::getPosition() switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: { const bool isNull = qFuzzyCompare(m_coord.x(), 0) && qFuzzyCompare(m_coord.y(), 0); const QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_coord, @@ -815,17 +815,17 @@ void ExplosionsEdit::getPosition() return; } break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: m_sitMapGuiIfc->getCoordinate(this, SLOT(onCoordinate(QPointF)), nullptr); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgLine: + case AreaEffectSimulation::AesExplosionGeometry::EgLine: { m_sitMapGuiIfc->getPolyline(this, SLOT(onPolylineData(QPolygonF)), nullptr, 2, 2, -1, -1, getCoordinatesQPointF()); return; } break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: m_sitMapGuiIfc->getCircle(this, SLOT(onCircleData(QPointF, double)), nullptr, @@ -1024,7 +1024,7 @@ void ExplosionsEdit::onDropAngleChanged() { doCalculations(true); } void ExplosionsEdit::onWidthChanged(int width) { - if (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgRadial) + if (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgRadial) { m_ui->sbDimensionY_Tiefe->setValue(width); @@ -1123,7 +1123,7 @@ void ExplosionsEdit::onFlightDurationChanged(int data) void ExplosionsEdit::onEffectDurationChanged(int value) { m_ui->sbDurationSec->setToolTip(QDateTime::fromSecsSinceEpoch(value).toString(QStringLiteral("mm:ss"))); } -void ExplosionsEdit::setMinMaxConstraints(ExplosionsEdit::FlighDurationOrPeakHeight phfd, ProjectDataManagement::GearClass_def::type gearClass, int chargeTypeId) +void ExplosionsEdit::setMinMaxConstraints(ExplosionsEdit::FlighDurationOrPeakHeight phfd, ProjectDataManagement::GearClass gearClass, int chargeTypeId) { DEBUG_LOG(m_logger) << " setMinMaxConstraints START"; @@ -1176,7 +1176,7 @@ bool ExplosionsEdit::setValueAccordingContraints(int newValue, ExplosionsEdit::F bool bRet = false; const qint32 gearClassId = m_ui->cbGearClass->currentData().toInt(); - const ProjectDataManagement::GearClass::type gearClass = static_cast(gearClassId); + const ProjectDataManagement::GearClass gearClass = static_cast(gearClassId); const qint32 chargeTypeId = m_ui->cbChargeType->currentData().toInt(); switch (phfd) @@ -1242,7 +1242,7 @@ void ExplosionsEdit::switchTo(FlighDurationOrPeakHeight phfd) } const qint32 gearClassId = m_ui->cbGearClass->currentData().toInt(); - ProjectDataManagement::GearClass::type gearClassType = static_cast(gearClassId); + ProjectDataManagement::GearClass gearClassType = static_cast(gearClassId); const qint32 chargeTypeId = m_ui->cbChargeType->currentData().toInt(); setMinMaxConstraints(phfd, gearClassType, chargeTypeId); } @@ -1273,7 +1273,7 @@ void ExplosionsEdit::doCalculations(bool executeEnableUiElements) return; - if ((m_explosionClusterData.effectStateId() == AesEffectState_def::EsPaused) || (m_explosionClusterData.effectStateId() == AesEffectState_def::EsExpired)) + if ((m_explosionClusterData.effectStateId() == AesEffectState::EsPaused) || (m_explosionClusterData.effectStateId() == AesEffectState::EsExpired)) return; DoCalculationsExitGuard exitGuard(this, executeEnableUiElements); @@ -1519,7 +1519,7 @@ void ExplosionsEdit::doCalculations(bool executeEnableUiElements) const qint32 gearClassId = m_ui->cbGearClass->currentData().toInt(); - ProjectDataManagement::GearClass::type gearClassType = static_cast(gearClassId); + ProjectDataManagement::GearClass gearClassType = static_cast(gearClassId); const qint32 chargeTypeId = m_ui->cbChargeType->currentData().toInt(); @@ -1670,10 +1670,10 @@ void ExplosionsEdit::handleLaserPrecisionChargeType(const int chargeTypeId) const auto geoButtons = m_geometrieButtonGroup->buttons(); if (chargeTypeId == s_laserPrecisionChargeTypeId) { - onGeometrySelected(static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgPoint)); + onGeometrySelected(static_cast(AreaEffectSimulation::AesExplosionGeometry::EgPoint)); for (QAbstractButton *btn : geoButtons) { - if (m_geometrieButtonGroup->id(btn) != static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgPoint)) + if (m_geometrieButtonGroup->id(btn) != static_cast(AreaEffectSimulation::AesExplosionGeometry::EgPoint)) btn->setCheckable(false); } } @@ -1767,15 +1767,15 @@ void ExplosionsEdit::enableUiElements(bool enable) m_ui->pbPosition->setEnabled(m_sitMapGuiIfc && enable); m_ui->positionEdit->setEnabled(enable); m_ui->sbDimensionX_BreiteRadius->setEnabled(enable - && (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgArea - || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgRadial - || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgLine)); - m_ui->sbDimensionY_Tiefe->setEnabled(enable && m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgArea); + && (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgArea + || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgRadial + || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgLine)); + m_ui->sbDimensionY_Tiefe->setEnabled(enable && m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgArea); m_ui->sbHeight1SBox->setEnabled(enable); - m_ui->sbHeight2SBox->setEnabled(enable && m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgLine); + m_ui->sbHeight2SBox->setEnabled(enable && m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgLine); m_ui->sbAimingAxis->setEnabled( enable - && (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgArea || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgLine)); + && (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgArea || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgLine)); m_ui->cbFirePurpose->setEnabled(enable); m_ui->cbGearClass->setEnabled(enable); m_ui->cbActors->setEnabled(enable & m_ui->gbEffectMarkingInTa->isChecked()); @@ -1792,8 +1792,8 @@ void ExplosionsEdit::enableUiElements(bool enable) - m_ui->leZpNumber->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState_def::EsActivated); - m_ui->leElement->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState_def::EsActivated); + m_ui->leZpNumber->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState::EsActivated); + m_ui->leElement->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState::EsActivated); m_ui->pbClear->setEnabled(enable); @@ -1879,7 +1879,7 @@ void ExplosionsEdit::enableUiFireButton() if (!enableBasics) return; - if (m_explosionClusterData.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired) + if (m_explosionClusterData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired) return; int numberTrajectoriesRef = 0; @@ -1927,7 +1927,7 @@ void ExplosionsEdit::enableUiFireButton() else { - if (m_explosionClusterData.effectStateId() == AesEffectState_def::EsPaused) + if (m_explosionClusterData.effectStateId() == AesEffectState::EsPaused) bPause = false; } } @@ -1966,26 +1966,26 @@ void ExplosionsEdit::showPreviewObject() switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: if (m_previewPolygon.isEmpty()) return; m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: if (m_previewCircleCenter.isNull()) return; m_sitMapGuiIfc->displayPreviewObject(this, m_previewCircleCenter, m_previewCircleRadius); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgLine: + case AreaEffectSimulation::AesExplosionGeometry::EgLine: if (m_previewPolygon.isEmpty()) return; m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, false); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: if (m_previewCircleCenter.isNull()) return; @@ -2013,7 +2013,7 @@ bool ExplosionsEdit::isDataSufficiant() bool bHasTargetArea = !m_coord.isNull(); switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: bHasTargetArea &= m_ui->sbDimensionX_BreiteRadius->value() > 0; bHasTargetArea &= m_ui->sbDimensionY_Tiefe->value() > 0; break; @@ -2054,7 +2054,7 @@ bool ExplosionsEdit::apply() switch (m_currentGeometry.underlying()) { - case AesExplosionGeometry_def::EgRadial: + case AesExplosionGeometry::EgRadial: { QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_coord, m_ui->sbDimensionX_BreiteRadius->value() * 2, m_ui->sbDimensionY_Tiefe->value() * 2, 0.0)); bottomLeftGeo = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y()); @@ -2065,7 +2065,7 @@ bool ExplosionsEdit::apply() break; } - case AesExplosionGeometry_def::EgLine: + case AesExplosionGeometry::EgLine: { const QLineF line(m_ui->positionEdit->coordinate(), m_ui->positionEdit_2->coordinate()); @@ -2081,9 +2081,9 @@ bool ExplosionsEdit::apply() break; } - case AesExplosionGeometry_def::EgAimPoint: - case AesExplosionGeometry_def::EgArea: - case AesExplosionGeometry_def::EgPoint: + case AesExplosionGeometry::EgAimPoint: + case AesExplosionGeometry::EgArea: + case AesExplosionGeometry::EgPoint: default: { QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_coord, @@ -2118,7 +2118,7 @@ bool ExplosionsEdit::apply() request.esmParticipantIds().push_back(esmParticipantId2); } - if (bIsPoint || m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry_def::EgRadial) + if (bIsPoint || m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial) request.area().rotation(0); else request.area().rotation((m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400); @@ -2223,7 +2223,7 @@ bool ExplosionsEdit::apply() void ExplosionsEdit::onGeometrySelected(int explosionGeometryInt) { - const AreaEffectSimulation::AesExplosionGeometry::inner_enum newGeometry = static_cast(explosionGeometryInt); + const AreaEffectSimulation::AesExplosionGeometry newGeometry = static_cast(explosionGeometryInt); if (m_currentGeometry == newGeometry) return; @@ -2249,8 +2249,8 @@ void ExplosionsEdit::onGeometrySelected(int explosionGeometryInt) switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: { m_ui->lblRadiusBreite->setText(tr("Breite [m]")); m_ui->sbHeight2SBox->setEnabled(false); @@ -2275,7 +2275,7 @@ void ExplosionsEdit::onGeometrySelected(int explosionGeometryInt) onChargeTypeChanged(); } break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: { m_ui->lblRadiusBreite->setText(tr("Breite [m]")); m_ui->sbHeight2SBox->setEnabled(false); @@ -2296,7 +2296,7 @@ void ExplosionsEdit::onGeometrySelected(int explosionGeometryInt) m_ui->sbDurationSec->setSingleStep(60); } break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgLine: + case AreaEffectSimulation::AesExplosionGeometry::EgLine: { m_ui->lblRadiusBreite->setText(tr("Breite [m]")); m_ui->sbHeight2SBox->setEnabled(true); @@ -2315,7 +2315,7 @@ void ExplosionsEdit::onGeometrySelected(int explosionGeometryInt) m_ui->sbDurationSec->setValue(60); } break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: { m_ui->lblRadiusBreite->setText(tr("Radius [m]")); m_ui->sbHeight2SBox->setEnabled(false); @@ -2351,10 +2351,10 @@ void ExplosionsEdit::onGeometrySelected(int explosionGeometryInt) void ExplosionsEdit::onFireClicked() { TRACE_LOG(m_logger) << LOGFUNCTION << " START"; - if (((m_aesItem.effectStateId() == AesEffectState_def::EsUnknown) || - (m_aesItem.effectStateId() == AesEffectState_def::EsError) || (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) - || (m_aesItem.effectStateId() == AesEffectState_def::EsRemoved) || (m_aesItem.effectStateId() == AesEffectState_def::EsReceived) - || (m_aesItem.effectStateId() == AesEffectState_def::EsFired) + if (((m_aesItem.effectStateId() == AesEffectState::EsUnknown) || + (m_aesItem.effectStateId() == AesEffectState::EsError) || (m_aesItem.effectStateId() == AesEffectState::EsExpired) + || (m_aesItem.effectStateId() == AesEffectState::EsRemoved) || (m_aesItem.effectStateId() == AesEffectState::EsReceived) + || (m_aesItem.effectStateId() == AesEffectState::EsFired) ) || m_aesItem.id() <= 0) @@ -2375,7 +2375,7 @@ void ExplosionsEdit::onFireClicked() const bool bIsObjectModifiable = m_explosionClusterData.isObjectModifiable(); - if ((m_aesItem.effectStateId() == AesEffectState_def::EsCreated || m_aesItem.effectStateId() == AesEffectState_def::EsPrepared) && bIsObjectModifiable) + if ((m_aesItem.effectStateId() == AesEffectState::EsCreated || m_aesItem.effectStateId() == AesEffectState::EsPrepared) && bIsObjectModifiable) { m_ui->dteEffectStart->setMsecsSinceEpoch(m_session->partitionTime() + m_temporaryData.m_estimatedFlightDurationMsec + 5000); m_ui->dteEffectStart->setChecked(true); @@ -2433,7 +2433,7 @@ void ExplosionsEdit::onFireClicked() void ExplosionsEdit::onGearClassChanged() { - const ProjectDataManagement::GearClass_def::type newGearClassType = static_cast(m_ui->cbGearClass->currentData().toInt()); + const ProjectDataManagement::GearClass newGearClassType = static_cast(m_ui->cbGearClass->currentData().toInt()); { QSignalBlocker sb(m_ui->cbChargeType); fillCharges(); @@ -2441,10 +2441,10 @@ void ExplosionsEdit::onGearClassChanged() fillParties(); onPartyChanged(); - ProjectDataManagement::GearClass_def::type lastGearClassType = ProjectDataManagement::GearClass_def::Mortar; + ProjectDataManagement::GearClass lastGearClassType = ProjectDataManagement::GearClass::Mortar; QVariant lastVal = m_ui->cbGearClass->property(LAST_VALUE); if (!lastVal.isNull()) - lastGearClassType = static_cast(lastVal.toInt()); + lastGearClassType = static_cast(lastVal.toInt()); { @@ -2584,7 +2584,7 @@ void ExplosionsEdit::fillCharges() return; } - const ProjectDataManagement::GearClass_def::type curGearClassType = static_cast(m_ui->cbGearClass->currentData().toInt()); + const ProjectDataManagement::GearClass curGearClassType = static_cast(m_ui->cbGearClass->currentData().toInt()); const auto chargesForGearClass = m_pdmDtc->chargesForGearClass(curGearClassType); const int curCtDataToRestore = m_ui->cbChargeType->currentData().toInt(); @@ -2609,7 +2609,7 @@ void ExplosionsEdit::fillCharges() DEBUG_LOG(m_logger) << " fillCharges" << ", id=" << chargeType.id() << ", name= " << chargeType.name() << ", bIsPoint " << bIsPoint << ", bIsVulcano " << bIsVulcano << ", impactRadius4Debug = " << impactRadius4Debug << ", isAdlerChargeType = " << isAdlerChargeType; - if (isAdlerChargeType || (bIsVulcano && !bIsPoint && curGearClassType != ProjectDataManagement::GearClass_def::Artillery)) + if (isAdlerChargeType || (bIsVulcano && !bIsPoint && curGearClassType != ProjectDataManagement::GearClass::Artillery)) continue; m_ui->cbChargeType->addItem(QString::fromStdString(chargeType.name()), chargeType.id()); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.h index 9a1754d1f..f8f7f162b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit.h @@ -111,7 +111,7 @@ private Q_SLOTS: void onEffectDurationChanged(int value); void switchTo(FlighDurationOrPeakHeight phfd); - void setMinMaxConstraints(ExplosionsEdit::FlighDurationOrPeakHeight phfd, ProjectDataManagement::GearClass_def::type gearClass, int chargeTypeId); + void setMinMaxConstraints(ExplosionsEdit::FlighDurationOrPeakHeight phfd, ProjectDataManagement::GearClass gearClass, int chargeTypeId); bool setValueAccordingContraints(int newValue, ExplosionsEdit::FlighDurationOrPeakHeight phfd); bool isGuiVulcano(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp index fd94fca0f..88b4ba587 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler.cpp @@ -88,11 +88,11 @@ ExplosionsEditAdler::ExplosionsEditAdler(const QString &menuGroup, QWidget *pare m_ui->setupUi(this); m_geometrieButtonGroup = new QButtonGroup(this); - m_geometrieButtonGroup->addButton(m_ui->geometrieAimPointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint)); - m_geometrieButtonGroup->addButton(m_ui->geometrieAreaBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgArea)); - m_geometrieButtonGroup->addButton(m_ui->geometrieLineBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgLine)); - m_geometrieButtonGroup->addButton(m_ui->geometriePointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgPoint)); - m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgRadial)); + m_geometrieButtonGroup->addButton(m_ui->geometrieAimPointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgAimPoint)); + m_geometrieButtonGroup->addButton(m_ui->geometrieAreaBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgArea)); + m_geometrieButtonGroup->addButton(m_ui->geometrieLineBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgLine)); + m_geometrieButtonGroup->addButton(m_ui->geometriePointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgPoint)); + m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgRadial)); m_geometrieButtonGroup->setExclusive(true); m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar}; @@ -220,20 +220,20 @@ void ExplosionsEditAdler::showPreviewObject() switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: if (m_previewPolygon.isEmpty()) return; m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: if (m_previewCircleCenter.isNull()) return; m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, false); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: if (m_previewCircleCenter.isNull()) return; @@ -260,7 +260,7 @@ bool ExplosionsEditAdler::isDataSufficiant() bool bHasTargetArea = !m_coord.isNull(); switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: bHasTargetArea &= m_ui->lblDimensionYDepth->text().toInt() > 0; bHasTargetArea &= m_ui->lblWidthRadius->text().toInt() > 0; break; @@ -290,7 +290,7 @@ void ExplosionsEditAdler::setEffectClusterData(const EffectCluster &ecData) if (ecData.effectStart().is_set()) { const QJsonObject propsObj(QJsonDocument::fromJson(QByteArray::fromStdString(ecData.properties())).object()); - const FiringType firingType = static_cast(propsObj[AdlerJson::JsonKeys::ABFEUERUNGSART()].toInt()); + const FiringType firingType = static_cast(propsObj[AdlerJson::JsonKeys::ABFEUERUNGSART()].toInt()); effectStart = ecData.effectStart().get(); @@ -301,22 +301,22 @@ void ExplosionsEditAdler::setEffectClusterData(const EffectCluster &ecData) m_ui->dteEffectStart->setMsecsSinceEpoch(effectStart); // Geometry/Area - const AreaEffectSimulation::AesExplosionGeometry_def::type geometryType = ecData.explosionGeometry().underlying(); + const AreaEffectSimulation::AesExplosionGeometry geometryType = static_cast(ecData.explosionGeometry()); switch (geometryType) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: m_ui->geometrieAimPointBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: m_ui->geometriePointBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: m_ui->geometrieAreaBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgLine: + case AreaEffectSimulation::AesExplosionGeometry::EgLine: m_ui->geometrieLineBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: m_ui->geometrieRadialBtn->setChecked(true); break; default: @@ -380,7 +380,7 @@ void ExplosionsEditAdler::setEffectClusterData(const EffectCluster &ecData) m_esmActorCbx->fillActorComboBox(m_ui->cbActors_2, coordGeo, isSmoke, 0); } - if (ecData.explosionGeometry().underlying() == AreaEffectSimulation::AesExplosionGeometry_def::EgRadial) + if (ecData.explosionGeometry().underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial) { m_ui->lblDimensionYDepth->setText(QString::number(static_cast(std::round(areaRef.height() / 2)))); m_ui->lblWidthRadius->setText(QString::number(static_cast(std::round(areaRef.width() / 2)))); @@ -556,7 +556,7 @@ void ExplosionsEditAdler::enableUiElements(bool enable) m_ui->rbAngleGroupLower->setEnabled(enable); m_ui->rbAngleGroupUpper->setEnabled(enable); - if (m_aesItem.effectStateId() == AesEffectState_def::EsReceived) + if (m_aesItem.effectStateId() == AesEffectState::EsReceived) m_ui->pbStateChange->setEnabled(true); else m_ui->pbStateChange->setEnabled(m_effectClusterData.effectorState() != AreaEffectSimulation::AesEffectorState::EsReadyToFire); @@ -600,7 +600,7 @@ void ExplosionsEditAdler::setPbStateChangeName() m_ui->pbStateChange->show(); - if (m_aesItem.effectStateId() == AesEffectState_def::EsReceived) + if (m_aesItem.effectStateId() == AesEffectState::EsReceived) m_ui->pbStateChange->setText(tr("Acknowledge")); else { @@ -624,7 +624,7 @@ void ExplosionsEditAdler::onPbStateChangeClicked() // Re-Enable PB, so we can call it another time, if it does not react... QTimer::singleShot(2000, [this]() { m_ui->pbStateChange->setEnabled(m_effectClusterData.effectorState() != AreaEffectSimulation::AesEffectorState::EsReadyToFire); }); - if (m_aesItem.effectStateId() == AesEffectState_def::EsReceived) + if (m_aesItem.effectStateId() == AesEffectState::EsReceived) { AreaEffectSimulation::AcknowledgeExternalAesItemRequest request; request.aesId(m_aesItem.id()); @@ -758,7 +758,7 @@ void ExplosionsEditAdler::setEffectClusterDataFromJson(const std::string &proper else m_ui->rbAngleGroupUpper->setChecked(true); - const FiringType &firingType = static_cast(propsObj[AdlerJson::JsonKeys::ABFEUERUNGSART()].toInt()); + const FiringType &firingType = static_cast(propsObj[AdlerJson::JsonKeys::ABFEUERUNGSART()].toInt()); m_ui->lblFiringType->setText(AreaEffectSimulation::toString(firingType)); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp index 6a5e3b0fc..9d27ba455 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.cpp @@ -67,7 +67,7 @@ static const char *const LAST_VALUE = "LAST_VALUE"; static QLatin1String emptyEntryComboBox = QLatin1String("--"); static const int ROLE_GEARTYPE_ID = Qt::UserRole + 1; -QPair ExplosionsEditAdlerStandAlone::getMinMaxDistance(ProjectDataManagement::GearClass_def::type gearClass, int chargeTypeId) +QPair ExplosionsEditAdlerStandAlone::getMinMaxDistance(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { // [GUEZE-2458] Minimaler und maximaler Abstand Feuereinheit Wirkeld Steilfeuer // Es soll zwischen dem Mittelpunkt der Feuereinheit und dem Mittelpunkt des zu bewirkenden Wirkfeldes folgender Abstand als Mindestabstand: @@ -85,17 +85,17 @@ QPair ExplosionsEditAdlerStandAlone::getMinMaxDistance(ProjectDataMana static QHash> contraintsDistance; if (contraintsDistance.isEmpty()) { - contraintsDistance.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {3500, 40000}); // Haubitze - contraintsDistance.insert(static_cast(ProjectDataManagement::GearClass_def::Mortar), {800, 7800}); // Mörser - // contraints.insert(static_cast(ProjectDataManagement::GearClass_def::Mortar), {15000, 90000}); // Rakete - // contraints.insert(static_cast(ProjectDataManagement::GearClass_def::Mortar), {10000, 38400}); // Minenrakete + contraintsDistance.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {3500, 40000}); // Haubitze + contraintsDistance.insert(static_cast(ProjectDataManagement::GearClass::Mortar), {800, 7800}); // Mörser + // contraints.insert(static_cast(ProjectDataManagement::GearClass::Mortar), {15000, 90000}); // Rakete + // contraints.insert(static_cast(ProjectDataManagement::GearClass::Mortar), {10000, 38400}); // Minenrakete } static QHash> contraintsDistanceVulcano; if (contraintsDistanceVulcano.isEmpty()) { - contraintsDistanceVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {10000, 70000}); // Haubitze - contraintsDistanceVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Rocket), {10000, 70000}); // Rakete + contraintsDistanceVulcano.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {10000, 70000}); // Haubitze + contraintsDistanceVulcano.insert(static_cast(ProjectDataManagement::GearClass::Rocket), {10000, 70000}); // Rakete } if (chargeTypeIdIsVulcano(chargeTypeId)) { @@ -111,16 +111,16 @@ QPair ExplosionsEditAdlerStandAlone::getMinMaxDistance(ProjectDataMana return {0, 100000}; return *it; } -int ExplosionsEditAdlerStandAlone::getMinDistance(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +int ExplosionsEditAdlerStandAlone::getMinDistance(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxDistance(gearClass, chargeTypeId).first; } -int ExplosionsEditAdlerStandAlone::getMaxDistance(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +int ExplosionsEditAdlerStandAlone::getMaxDistance(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxDistance(gearClass, chargeTypeId).second; } -QPair ExplosionsEditAdlerStandAlone::getMinMaxFlightDurationSec(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +QPair ExplosionsEditAdlerStandAlone::getMinMaxFlightDurationSec(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { // [GUEZE-2460] Grenzwert Flugdauer Steilfeuer // Haubitze: von 6 bis 150 Sekunden @@ -131,15 +131,15 @@ QPair ExplosionsEditAdlerStandAlone::getMinMaxFlightDurationSec(Projec static QHash> contraintsFlightDuration; if (contraintsFlightDuration.isEmpty()) { - contraintsFlightDuration.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {6, 150}); // Haubitze - contraintsFlightDuration.insert(static_cast(ProjectDataManagement::GearClass_def::Mortar), {20, 60}); // Mörser + contraintsFlightDuration.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {6, 150}); // Haubitze + contraintsFlightDuration.insert(static_cast(ProjectDataManagement::GearClass::Mortar), {20, 60}); // Mörser } static QHash> contraintsFlightDurationVulcano; if (contraintsFlightDurationVulcano.isEmpty()) { - contraintsFlightDurationVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {0, 999}); // Haubitze - contraintsFlightDurationVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Rocket), {0, 999}); // Rakete + contraintsFlightDurationVulcano.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {0, 999}); // Haubitze + contraintsFlightDurationVulcano.insert(static_cast(ProjectDataManagement::GearClass::Rocket), {0, 999}); // Rakete } if (chargeTypeIdIsVulcano(chargeTypeId)) { @@ -155,16 +155,16 @@ QPair ExplosionsEditAdlerStandAlone::getMinMaxFlightDurationSec(Projec return {10, 100}; return *it; } -int ExplosionsEditAdlerStandAlone::getMinFlightDurationSec(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +int ExplosionsEditAdlerStandAlone::getMinFlightDurationSec(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxFlightDurationSec(gearClass, chargeTypeId).first; } -int ExplosionsEditAdlerStandAlone::getMaxFlightDurationSec(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +int ExplosionsEditAdlerStandAlone::getMaxFlightDurationSec(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxFlightDurationSec(gearClass, chargeTypeId).second; } -QPair ExplosionsEditAdlerStandAlone::getMinMaxPeakHeight(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +QPair ExplosionsEditAdlerStandAlone::getMinMaxPeakHeight(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { // [GUEZE-2460] Grenzwert Flugdauer Steilfeuer // Haubitze: von 250 bis 15000m @@ -175,15 +175,15 @@ QPair ExplosionsEditAdlerStandAlone::getMinMaxPeakHeight(ProjectDataMa static QHash> contraintsPeak; if (contraintsPeak.isEmpty()) { - contraintsPeak.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {250, 15000}); // Haubitze - contraintsPeak.insert(static_cast(ProjectDataManagement::GearClass_def::Mortar), {500, 3000}); // Mörser + contraintsPeak.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {250, 15000}); // Haubitze + contraintsPeak.insert(static_cast(ProjectDataManagement::GearClass::Mortar), {500, 3000}); // Mörser } static QHash> contraintsPeakVulcano; if (contraintsPeakVulcano.isEmpty()) { - contraintsPeakVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Artillery), {1000, 37500}); // Haubitze - contraintsPeakVulcano.insert(static_cast(ProjectDataManagement::GearClass_def::Rocket), {1000, 37500}); // Rakete + contraintsPeakVulcano.insert(static_cast(ProjectDataManagement::GearClass::Artillery), {1000, 37500}); // Haubitze + contraintsPeakVulcano.insert(static_cast(ProjectDataManagement::GearClass::Rocket), {1000, 37500}); // Rakete } if (chargeTypeIdIsVulcano(chargeTypeId)) { @@ -200,19 +200,19 @@ QPair ExplosionsEditAdlerStandAlone::getMinMaxPeakHeight(ProjectDataMa return {100, 10000}; return *it; } -int ExplosionsEditAdlerStandAlone::getMinPeakHeight(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +int ExplosionsEditAdlerStandAlone::getMinPeakHeight(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxPeakHeight(gearClass, chargeTypeId).first; } -int ExplosionsEditAdlerStandAlone::getMaxPeakHeight(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId) +int ExplosionsEditAdlerStandAlone::getMaxPeakHeight(ProjectDataManagement::GearClass gearClass, int chargeTypeId) { return getMinMaxPeakHeight(gearClass, chargeTypeId).second; } bool ExplosionsEditAdlerStandAlone::isPointSimilar(AreaEffectSimulation::AesExplosionGeometry geometry) { - return (geometry.underlying() == AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint) - || (geometry.underlying() == AreaEffectSimulation::AesExplosionGeometry_def::EgPoint); + return (geometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgAimPoint) + || (geometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgPoint); } /*! @@ -270,11 +270,11 @@ ExplosionsEditAdlerStandAlone::ExplosionsEditAdlerStandAlone(const QString &menu headline->setAlignment(Qt::AlignCenter); m_geometrieButtonGroup = new QButtonGroup(this); - m_geometrieButtonGroup->addButton(m_ui->geometrieAimPointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint)); - m_geometrieButtonGroup->addButton(m_ui->geometrieAreaBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgArea)); - m_geometrieButtonGroup->addButton(m_ui->geometrieLineBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgLine)); - m_geometrieButtonGroup->addButton(m_ui->geometriePointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgPoint)); - m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgRadial)); + m_geometrieButtonGroup->addButton(m_ui->geometrieAimPointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgAimPoint)); + m_geometrieButtonGroup->addButton(m_ui->geometrieAreaBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgArea)); + m_geometrieButtonGroup->addButton(m_ui->geometrieLineBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgLine)); + m_geometrieButtonGroup->addButton(m_ui->geometriePointBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgPoint)); + m_geometrieButtonGroup->addButton(m_ui->geometrieRadialBtn, static_cast(AreaEffectSimulation::AesExplosionGeometry::EgRadial)); m_geometrieButtonGroup->setExclusive(true); m_gearClassFilter = {ProjectDataManagement::GearClass::Artillery, ProjectDataManagement::GearClass::Mortar}; @@ -506,8 +506,8 @@ bool ExplosionsEditAdlerStandAlone::init(int aesItemId, bool copy, LtsSession::L m_ui->startBtn->setEnabled(false); // initial adjustment: - m_effectClusterData.explosionGeometry(AreaEffectSimulation::AesExplosionGeometry_def::EgArea); - onGeometrySelected(static_cast(AreaEffectSimulation::AesExplosionGeometry_def::EgArea)); + m_effectClusterData.explosionGeometry(AreaEffectSimulation::AesExplosionGeometry::EgArea); + onGeometrySelected(static_cast(AreaEffectSimulation::AesExplosionGeometry::EgArea)); // pay attention!!! firePurposeId vs purpose !!! m_pdmCbx->fillFirePurposeComboBox(m_ui->cbFirePurpose); @@ -569,7 +569,7 @@ bool ExplosionsEditAdlerStandAlone::init(int aesItemId, bool copy, LtsSession::L if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); m_effectClusterData.id(m_aesItem.id()); m_effectClusterData.effectStateId(m_aesItem.effectStateId()); } @@ -624,22 +624,22 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterData(const EffectCluster &ec m_ui->leElement->setText(QString::fromStdString(ecData.element())); // Geometry/Area - const AreaEffectSimulation::AesExplosionGeometry_def::type geometryType = ecData.explosionGeometry().underlying(); + const AreaEffectSimulation::AesExplosionGeometry geometryType = static_cast(ecData.explosionGeometry()); switch (geometryType) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: m_ui->geometrieAimPointBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: m_ui->geometriePointBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: m_ui->geometrieAreaBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgLine: + case AreaEffectSimulation::AesExplosionGeometry::EgLine: m_ui->geometrieLineBtn->setChecked(true); break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: m_ui->geometrieRadialBtn->setChecked(true); break; default: @@ -709,7 +709,7 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterData(const EffectCluster &ec // with firingType setEffectClusterDataFromJson(ecData.properties()); - const FiringType::type firingType = static_cast(m_ui->cbFiringType->currentData().toInt()); + const FiringType firingType = static_cast(m_ui->cbFiringType->currentData().toInt()); if (firingType == FiringType::FireWithIndicationTTF) { // in case of TTF the dte will be set via the setEffectClusterDataFromJson function @@ -732,7 +732,7 @@ void ExplosionsEditAdlerStandAlone::setEffectClusterData(const EffectCluster &ec setCoord(centerpoint); } - if (ecData.explosionGeometry().underlying() == AreaEffectSimulation::AesExplosionGeometry_def::EgRadial) + if (ecData.explosionGeometry().underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial) { m_ui->sbDimensionY_Tiefe->setValue(areaRef.height() / 2); m_ui->sbDimensionX_BreiteRadius->setValue(areaRef.width() / 2); @@ -793,11 +793,11 @@ void ExplosionsEditAdlerStandAlone::onChargeTypeChanged() FlighDurationOrPeakHeight phfd = FlighDurationOrPeakHeight::FDPH_peakHeight; const qint32 gearClassId = m_ui->cbGearClass->currentData().toInt(); - ProjectDataManagement::GearClass::type gearClassType = static_cast(gearClassId); + ProjectDataManagement::GearClass gearClassType = static_cast(gearClassId); setMinMaxConstraints(phfd, gearClassType, chargeTypeId); // only for geometryType::Point: - if (m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry_def::EgPoint) + if (m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgPoint) { int igniterTypeId = m_ui->cbIgniterType->currentData().toInt(); int igniterFunctionId = m_ui->cbIgniterFunction->currentData().toInt(); @@ -915,7 +915,7 @@ void ExplosionsEditAdlerStandAlone::getPosition() switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: { const bool isNull = qFuzzyCompare(m_coord.x(), 0) && qFuzzyCompare(m_coord.y(), 0); const QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_coord, @@ -938,16 +938,16 @@ void ExplosionsEditAdlerStandAlone::getPosition() return; } break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: m_sitMapGuiIfc->getCoordinate(this, SLOT(onCoordinate(QPointF)), nullptr); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgLine: + case AreaEffectSimulation::AesExplosionGeometry::EgLine: { m_sitMapGuiIfc->getPolyline(this, SLOT(onPolylineData(QPolygonF)), nullptr, 2, 2, -1, -1, getCoordinatesQPointF()); return; } - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: m_sitMapGuiIfc->getCircle(this, SLOT(onCircleData(QPointF, double)), nullptr, @@ -1184,7 +1184,7 @@ void ExplosionsEditAdlerStandAlone::onFlightDurationChanged(int data) void ExplosionsEditAdlerStandAlone::onEffectDurationChanged(int value) { m_ui->sbDurationSec->setToolTip(QTime(0, 0).addSecs(value).toString(QStringLiteral("mm:ss"))); } void ExplosionsEditAdlerStandAlone::setMinMaxConstraints(ExplosionsEditAdlerStandAlone::FlighDurationOrPeakHeight phfd, - ProjectDataManagement::GearClass_def::type gearClass, + ProjectDataManagement::GearClass gearClass, int chargeTypeId) { DEBUG_LOG(m_logger) << " setMinMaxConstraints START"; @@ -1218,7 +1218,7 @@ bool ExplosionsEditAdlerStandAlone::setValueAccordingContraints(int newValue, Ex bool bRet = false; const qint32 gearClassId = m_ui->cbGearClass->currentData().toInt(); - const ProjectDataManagement::GearClass::type gearClass = static_cast(gearClassId); + const ProjectDataManagement::GearClass gearClass = static_cast(gearClassId); const qint32 chargeTypeId = m_ui->cbChargeType->currentData().toInt(); switch (phfd) @@ -1269,7 +1269,7 @@ void ExplosionsEditAdlerStandAlone::switchTo(FlighDurationOrPeakHeight phfd) } const qint32 gearClassId = m_ui->cbGearClass->currentData().toInt(); - ProjectDataManagement::GearClass::type gearClassType = static_cast(gearClassId); + ProjectDataManagement::GearClass gearClassType = static_cast(gearClassId); const qint32 chargeTypeId = m_ui->cbChargeType->currentData().toInt(); setMinMaxConstraints(phfd, gearClassType, chargeTypeId); } @@ -1304,7 +1304,7 @@ void ExplosionsEditAdlerStandAlone::doCalculationsAdlerStandAlone(bool executeEn return; // do not update while EsPause or similar: - if ((m_effectClusterData.effectStateId() == AesEffectState_def::EsPaused) || (m_effectClusterData.effectStateId() == AesEffectState_def::EsExpired)) + if ((m_effectClusterData.effectStateId() == AesEffectState::EsPaused) || (m_effectClusterData.effectStateId() == AesEffectState::EsExpired)) return; doCalculationsAdlerStandAloneExitGuard exitGuard(this, executeEnableUiElements); @@ -1506,7 +1506,7 @@ void ExplosionsEditAdlerStandAlone::doCalculationsAdlerStandAlone(bool executeEn // const qint32 gearClassId = m_ui->cbGearClass->currentData().toInt(); - ProjectDataManagement::GearClass::type gearClassType = static_cast(gearClassId); + ProjectDataManagement::GearClass gearClassType = static_cast(gearClassId); const qint32 chargeTypeId = m_ui->cbChargeType->currentData().toInt(); @@ -1784,7 +1784,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable) m_ui->cbParticipantUnits->setEnabled(enable); setEffectStartEnabled(m_ui->dteEffectStart, enable); - const AreaEffectSimulation::FiringType::type firingType = static_cast(m_ui->cbFiringType->currentData().toInt()); + const AreaEffectSimulation::FiringType firingType = static_cast(m_ui->cbFiringType->currentData().toInt()); const bool showEffectStart = (firingType == FiringType::FireWithIndicationTTF || firingType == FiringType::FireWithIndicationTOT); m_ui->dteEffectStart->setChecked(true); m_ui->dteEffectStart->setEnabled(showEffectStart); @@ -1795,15 +1795,15 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable) m_ui->positionEdit->setEnabled(enable); // m_ui->sbAltitude->setEnabled(enable); m_ui->sbDimensionX_BreiteRadius->setEnabled(enable - && (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgArea - || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgRadial - || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgLine)); - m_ui->sbDimensionY_Tiefe->setEnabled(enable && m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgArea); + && (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgArea + || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgRadial + || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgLine)); + m_ui->sbDimensionY_Tiefe->setEnabled(enable && m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgArea); m_ui->sbHeight1SBox->setEnabled(enable); - m_ui->sbHeight2SBox->setEnabled(enable && m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgLine); + m_ui->sbHeight2SBox->setEnabled(enable && m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgLine); m_ui->sbAimingAxis->setEnabled( enable - && (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgArea || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgLine)); + && (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgArea || m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgLine)); m_ui->cbFirePurpose->setEnabled(enable); m_ui->cbGearClass->setEnabled(enable); m_ui->cbActors->setEnabled(enable & m_ui->gbEffectMarkingInTa->isChecked()); @@ -1837,7 +1837,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable) m_ui->cbTargetSubType->setEnabled(enable); m_ui->cbFiringType->setEnabled(enable); - const bool isRocket = (m_ui->cbGearClass->currentData().toInt() == ProjectDataManagement::GearClass_def::Rocket); + const bool isRocket = (m_ui->cbGearClass->currentData().toInt() == ProjectDataManagement::GearClass::Rocket); m_ui->lblLoadType->setEnabled(!isRocket && enable); m_ui->lblLoadNumber->setEnabled(!isRocket && enable); m_ui->cbLoadType->setEnabled(!isRocket && enable); @@ -1856,8 +1856,8 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable) // [GUEZE-2960] Explizite Kunden-Forderung: // ZpNumber nicht_ mehr modifizierbar, wenn Wirkfeld aktiv - m_ui->leZpNumber->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState_def::EsActivated); - m_ui->leElement->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState_def::EsActivated); + m_ui->leZpNumber->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState::EsActivated); + m_ui->leElement->setEnabled((enable || isOnlyNameModifiable()) && m_aesItem.effectStateId() != AesEffectState::EsActivated); m_ui->pbClear->setEnabled(enable); @@ -1901,14 +1901,14 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable) // // Munitionstyp "Mörser" muss die obere Winkelgruppe ausgewählt && die Eingabemaske "Flugkurve" soll ausgrauen. // // Beim Wechsel auf einen anderen Munitionstyp soll wieder als Default die untere Winkelgruppe ausgewählt werden && // // die Eingabemaske muss wieder auswählbar sein. - // const ProjectDataManagement::GearClass_def::type gearClassType = - // static_cast(m_ui->cbGearClass->currentData().toInt()); + // const ProjectDataManagement::GearClass gearClassType = + // static_cast(m_ui->cbGearClass->currentData().toInt()); // // const bool usePeakHeight = m_ui->sBox_peakHeight->styleSheet().isEmpty(); // const bool useFlightDuration = m_ui->sBox_flightDuration->styleSheet().isEmpty(); // m_ui->cbFlightCurve->setEnabled(enable && - // (gearClassType != ProjectDataManagement::GearClass_def::Mortar) && + // (gearClassType != ProjectDataManagement::GearClass::Mortar) && // useFlightDuration // ); // } @@ -1943,7 +1943,7 @@ void ExplosionsEditAdlerStandAlone::enableUiFireButton() if (!enableBasics) return; // stay disabled - if (m_effectClusterData.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired || m_effectClusterData.remainExplosionNumber() == 0) + if (m_effectClusterData.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired || m_effectClusterData.remainExplosionNumber() == 0) return; // stay disabled int numberTrajectoriesRef = 0; @@ -2000,7 +2000,7 @@ void ExplosionsEditAdlerStandAlone::enableUiFireButton() else { // re-openening dialog: - if (m_effectClusterData.effectStateId() == AesEffectState_def::EsPaused) + if (m_effectClusterData.effectStateId() == AesEffectState::EsPaused) bPause = false; } } @@ -2040,24 +2040,24 @@ void ExplosionsEditAdlerStandAlone::showPreviewObject() switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: if (m_previewPolygon.isEmpty()) return; m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, true); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: if (m_previewCircleCenter.isNull()) return; m_sitMapGuiIfc->displayPreviewObject(this, m_previewCircleCenter, m_previewCircleRadius); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgLine: + case AreaEffectSimulation::AesExplosionGeometry::EgLine: m_sitMapGuiIfc->displayPreviewObject(this, m_previewPolygon, false); return; - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: if (m_previewCircleCenter.isNull()) return; @@ -2085,7 +2085,7 @@ bool ExplosionsEditAdlerStandAlone::isDataSufficiant() bool bHasTargetArea = !m_coord.isNull(); switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: bHasTargetArea &= m_ui->sbDimensionX_BreiteRadius->value() > 0; bHasTargetArea &= m_ui->sbDimensionY_Tiefe->value() > 0; break; @@ -2136,7 +2136,7 @@ bool ExplosionsEditAdlerStandAlone::apply() switch (m_currentGeometry.underlying()) { - case AesExplosionGeometry_def::EgRadial: + case AesExplosionGeometry::EgRadial: { QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_coord, m_ui->sbDimensionX_BreiteRadius->value() * 2, m_ui->sbDimensionY_Tiefe->value() * 2, 0.0)); bottomLeftGeo = Core::GeoPosition2D(bottomLeft.x(), bottomLeft.y()); @@ -2147,7 +2147,7 @@ bool ExplosionsEditAdlerStandAlone::apply() break; } - case AesExplosionGeometry_def::EgLine: + case AesExplosionGeometry::EgLine: { const QLineF line(m_ui->positionEdit->coordinate(), m_ui->positionEdit_2->coordinate()); @@ -2163,9 +2163,9 @@ bool ExplosionsEditAdlerStandAlone::apply() break; } - case AesExplosionGeometry_def::EgAimPoint: - case AesExplosionGeometry_def::EgArea: - case AesExplosionGeometry_def::EgPoint: + case AesExplosionGeometry::EgAimPoint: + case AesExplosionGeometry::EgArea: + case AesExplosionGeometry::EgPoint: default: { QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_coord, @@ -2180,7 +2180,7 @@ bool ExplosionsEditAdlerStandAlone::apply() } } - if (bIsPoint || m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry_def::EgRadial) + if (bIsPoint || m_currentGeometry.underlying() == AreaEffectSimulation::AesExplosionGeometry::EgRadial) request.area().rotation(0); else request.area().rotation((m_ui->sbAimingAxis->value() - 1600) * 360.0 / 6400); @@ -2308,7 +2308,7 @@ bool ExplosionsEditAdlerStandAlone::apply() // Rocket-Spezifika: const QVariant currentData = m_ui->cbGearClass->currentData(); - const ProjectDataManagement::GearClass::type currentGearClass = static_cast(currentData.toInt()); + const ProjectDataManagement::GearClass currentGearClass = static_cast(currentData.toInt()); if (currentGearClass == ProjectDataManagement::GearClass::Rocket) { RocketUtility::addRocketPropertiesToRequest(request, m_ppmDtc); @@ -2327,7 +2327,7 @@ bool ExplosionsEditAdlerStandAlone::apply() */ void ExplosionsEditAdlerStandAlone::onGeometrySelected(int explosionGeometryInt) { - const AreaEffectSimulation::AesExplosionGeometry::inner_enum newGeometry = static_cast(explosionGeometryInt); + const AreaEffectSimulation::AesExplosionGeometry newGeometry = static_cast(explosionGeometryInt); if (m_currentGeometry == newGeometry) return; @@ -2353,8 +2353,8 @@ void ExplosionsEditAdlerStandAlone::onGeometrySelected(int explosionGeometryInt) switch (m_currentGeometry.underlying()) { - case AreaEffectSimulation::AesExplosionGeometry_def::EgAimPoint: // What is AimPoint? - case AreaEffectSimulation::AesExplosionGeometry_def::EgPoint: + case AreaEffectSimulation::AesExplosionGeometry::EgAimPoint: // What is AimPoint? + case AreaEffectSimulation::AesExplosionGeometry::EgPoint: { m_ui->lblRadiusBreite->setText(tr("Breite [m]")); m_ui->sbHeight2SBox->setEnabled(false); @@ -2386,7 +2386,7 @@ void ExplosionsEditAdlerStandAlone::onGeometrySelected(int explosionGeometryInt) onChargeTypeChanged(); } break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgArea: + case AreaEffectSimulation::AesExplosionGeometry::EgArea: { m_ui->lblRadiusBreite->setText(tr("Breite [m]")); m_ui->sbHeight2SBox->setEnabled(false); @@ -2412,7 +2412,7 @@ void ExplosionsEditAdlerStandAlone::onGeometrySelected(int explosionGeometryInt) m_ui->sbDurationSec->setSingleStep(60); } break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgLine: + case AreaEffectSimulation::AesExplosionGeometry::EgLine: { m_ui->lblRadiusBreite->setText(tr("Breite [m]")); m_ui->sbHeight2SBox->setEnabled(true); @@ -2437,7 +2437,7 @@ void ExplosionsEditAdlerStandAlone::onGeometrySelected(int explosionGeometryInt) m_ui->sbDurationSec->setValue(60); // 1 min } break; - case AreaEffectSimulation::AesExplosionGeometry_def::EgRadial: + case AreaEffectSimulation::AesExplosionGeometry::EgRadial: { m_ui->lblRadiusBreite->setText(tr("Radius [m]")); m_ui->sbHeight2SBox->setEnabled(false); @@ -2473,10 +2473,10 @@ void ExplosionsEditAdlerStandAlone::onGeometrySelected(int explosionGeometryInt) void ExplosionsEditAdlerStandAlone::onStartBtnClicked() { DEBUG_LOG(m_logger) << " onFireClicked"; - if (((m_aesItem.effectStateId() == AesEffectState_def::EsUnknown) || // initially the effectStateId is Unknown... - (m_aesItem.effectStateId() == AesEffectState_def::EsError) || (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) - || (m_aesItem.effectStateId() == AesEffectState_def::EsRemoved) || (m_aesItem.effectStateId() == AesEffectState_def::EsReceived) - // || (m_aesItem.effectStateId() == AesEffectState_def::EsPaused) // Maybe EsPaused will be supported in future + if (((m_aesItem.effectStateId() == AesEffectState::EsUnknown) || // initially the effectStateId is Unknown... + (m_aesItem.effectStateId() == AesEffectState::EsError) || (m_aesItem.effectStateId() == AesEffectState::EsExpired) + || (m_aesItem.effectStateId() == AesEffectState::EsRemoved) || (m_aesItem.effectStateId() == AesEffectState::EsReceived) + // || (m_aesItem.effectStateId() == AesEffectState::EsPaused) // Maybe EsPaused will be supported in future ) || m_aesItem.id() <= 0) return; @@ -2498,7 +2498,7 @@ void ExplosionsEditAdlerStandAlone::onStartBtnClicked() // - if ((m_aesItem.effectStateId() == AesEffectState_def::EsCreated || m_aesItem.effectStateId() == AesEffectState_def::EsPrepared) && bIsObjectModifiable) + if ((m_aesItem.effectStateId() == AesEffectState::EsCreated || m_aesItem.effectStateId() == AesEffectState::EsPrepared) && bIsObjectModifiable) { ERROR_LOG(m_logger) << LOGFUNCTION << " onFireClicked 2 " << m_data; @@ -2564,7 +2564,7 @@ void ExplosionsEditAdlerStandAlone::onStartBtnClicked() */ void ExplosionsEditAdlerStandAlone::onGearClassChanged() { - const ProjectDataManagement::GearClass_def::type newGearClassType = static_cast(m_ui->cbGearClass->currentData().toInt()); + const ProjectDataManagement::GearClass newGearClassType = static_cast(m_ui->cbGearClass->currentData().toInt()); { QSignalBlocker sb(m_ui->cbChargeType); fillCharges(); @@ -2572,10 +2572,10 @@ void ExplosionsEditAdlerStandAlone::onGearClassChanged() fillParties(); onPartyChanged(); - ProjectDataManagement::GearClass_def::type lastGearClassType = ProjectDataManagement::GearClass_def::Mortar; + ProjectDataManagement::GearClass lastGearClassType = ProjectDataManagement::GearClass::Mortar; QVariant lastVal = m_ui->cbGearClass->property(LAST_VALUE); if (!lastVal.isNull()) - lastGearClassType = static_cast(lastVal.toInt()); + lastGearClassType = static_cast(lastVal.toInt()); { // GUEZE-2459 @@ -2586,7 +2586,7 @@ void ExplosionsEditAdlerStandAlone::onGearClassChanged() // Default is Upper m_ui->rbAngleGroupUpper->setChecked(true); // GUEZE-3520: Aufraeumen -> getm rid of AesFlightCurve - if (newGearClassType == ProjectDataManagement::GearClass_def::Mortar) + if (newGearClassType == ProjectDataManagement::GearClass::Mortar) { DEBUG_LOG(m_logger) << " onGearClassChanged switch to Mortar"; m_ui->rbAngleGroupLower->setCheckable(false); @@ -2711,7 +2711,7 @@ bool ExplosionsEditAdlerStandAlone::isValidParty(qint32 partyId) void ExplosionsEditAdlerStandAlone::setFireBtnState() { - const AreaEffectSimulation::FiringType::type firingType = static_cast(m_ui->cbFiringType->currentData().toInt()); + const AreaEffectSimulation::FiringType firingType = static_cast(m_ui->cbFiringType->currentData().toInt()); const bool showEffectStart = (firingType == FiringType::FireWithIndicationTTF || firingType == FiringType::FireWithIndicationTOT); m_ui->dteEffectStart->setEnabled(showEffectStart); m_ui->dteEffectStart->setVisible(showEffectStart); @@ -2793,7 +2793,7 @@ double ExplosionsEditAdlerStandAlone::getElevation(const double lon, const doubl void ExplosionsEditAdlerStandAlone::onWidthChanged(int width) { - if (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry_def::EgRadial) + if (m_currentGeometry == AreaEffectSimulation::AesExplosionGeometry::EgRadial) { m_ui->sbDimensionY_Tiefe->setValue(width); @@ -2891,7 +2891,7 @@ void ExplosionsEditAdlerStandAlone::fillCharges() return; } - const ProjectDataManagement::GearClass_def::type curGearClassType = static_cast(m_ui->cbGearClass->currentData().toInt()); + const ProjectDataManagement::GearClass curGearClassType = static_cast(m_ui->cbGearClass->currentData().toInt()); const auto chargesForGearClass = m_pdmDtc->chargesForGearClass(curGearClassType); const int curCtDataToRestore = m_ui->cbChargeType->currentData().toInt(); @@ -2916,7 +2916,7 @@ void ExplosionsEditAdlerStandAlone::fillCharges() DEBUG_LOG(m_logger) << " fillCharges" << ", id=" << chargeType.id() << ", name= " << chargeType.name() << ", bIsPoint " << bIsPoint << ", bIsVulcano " << bIsVulcano; - if (adlerChargeTypeName.isEmpty() || (bIsVulcano && !bIsPoint && curGearClassType != ProjectDataManagement::GearClass_def::Artillery)) // [Jira E01562-21] + if (adlerChargeTypeName.isEmpty() || (bIsVulcano && !bIsPoint && curGearClassType != ProjectDataManagement::GearClass::Artillery)) // [Jira E01562-21] continue; m_ui->cbChargeType->addItem(QString::fromStdString(chargeType.name()), chargeType.id()); } @@ -2934,7 +2934,7 @@ void ExplosionsEditAdlerStandAlone::fillCharges() void ExplosionsEditAdlerStandAlone::fillFiringTypCbox() { - QVector firetypes{FiringType::ReportReadyToFire, + QVector firetypes{FiringType::ReportReadyToFire, FiringType::FireWithIndicationTOT, FiringType::FireWithIndicationTTF, FiringType::FireOnCommand, @@ -3047,7 +3047,7 @@ void ExplosionsEditAdlerStandAlone::mmiToJsonproperties(QJsonObject &data) data[AdlerJson::JsonKeys::TYP()] = m_ui->cbTargetType->currentData().toInt(); data[AdlerJson::JsonKeys::SUB_TYP()] = m_ui->cbTargetSubType->currentData().toInt(); data[AdlerJson::JsonKeys::ABFEUERUNGSART()] = m_ui->cbFiringType->currentData().toInt(); - const FiringType::type firingType = static_cast(m_ui->cbFiringType->currentData().toInt()); + const FiringType firingType = static_cast(m_ui->cbFiringType->currentData().toInt()); if (firingType == FiringType::FireWithIndicationTTF && m_ui->dteEffectStart->isChecked()) data[AdlerJson::JsonKeys::ABFEUERUNGSZEIT()] = m_ui->dteEffectStart->msecsSinceEpoch() / 1000.0; else diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.h index 0a15b00bd..022c9907d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_explosions_edit_adler_standalone.h @@ -102,7 +102,7 @@ class ExplosionsEditAdlerStandAlone final void onEffectDurationChanged(int value); void switchTo(FlighDurationOrPeakHeight phfd); - void setMinMaxConstraints(ExplosionsEditAdlerStandAlone::FlighDurationOrPeakHeight phfd, ProjectDataManagement::GearClass_def::type gearClass, int chargeTypeId); + void setMinMaxConstraints(ExplosionsEditAdlerStandAlone::FlighDurationOrPeakHeight phfd, ProjectDataManagement::GearClass gearClass, int chargeTypeId); bool setValueAccordingContraints(int newValue, ExplosionsEditAdlerStandAlone::FlighDurationOrPeakHeight phfd); bool isGuiVulcano(); @@ -148,15 +148,15 @@ class ExplosionsEditAdlerStandAlone final bool isSmoke(); void updateActorComboBox(const Core::GeoPosition &coordGeo); - QPair getMinMaxDistance(ProjectDataManagement::GearClass_def::type gearClass, int chargeTypeId); - int getMinDistance(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId); - int getMaxDistance(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId); - QPair getMinMaxFlightDurationSec(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId); - int getMinFlightDurationSec(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId); - int getMaxFlightDurationSec(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId); - QPair getMinMaxPeakHeight(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId); - int getMinPeakHeight(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId); - int getMaxPeakHeight(ProjectDataManagement::GearClass::inner_enum gearClass, int chargeTypeId); + QPair getMinMaxDistance(ProjectDataManagement::GearClass gearClass, int chargeTypeId); + int getMinDistance(ProjectDataManagement::GearClass gearClass, int chargeTypeId); + int getMaxDistance(ProjectDataManagement::GearClass gearClass, int chargeTypeId); + QPair getMinMaxFlightDurationSec(ProjectDataManagement::GearClass gearClass, int chargeTypeId); + int getMinFlightDurationSec(ProjectDataManagement::GearClass gearClass, int chargeTypeId); + int getMaxFlightDurationSec(ProjectDataManagement::GearClass gearClass, int chargeTypeId); + QPair getMinMaxPeakHeight(ProjectDataManagement::GearClass gearClass, int chargeTypeId); + int getMinPeakHeight(ProjectDataManagement::GearClass gearClass, int chargeTypeId); + int getMaxPeakHeight(ProjectDataManagement::GearClass gearClass, int chargeTypeId); bool isPointSimilar(AreaEffectSimulation::AesExplosionGeometry geometry); struct Charges diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp index dbb8843b3..2f187e3bf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.cpp @@ -27,7 +27,7 @@ namespace AreaEffectSimulation namespace RocketUtility { -void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry::type geometry) +void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry geometry) { if (wirkmittelCombobox == nullptr) return; @@ -39,13 +39,13 @@ void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry::type switch (geometry) { - case AesExplosionGeometry::type::EgAimPoint: - case AesExplosionGeometry::type::EgPoint: - case AesExplosionGeometry::type::EgLine: + case AesExplosionGeometry::EgAimPoint: + case AesExplosionGeometry::EgPoint: + case AesExplosionGeometry::EgLine: for (int indexCounter = 0; indexCounter < wirkmittelCombobox->count(); ++indexCounter) { const QVariant currentData = wirkmittelCombobox->itemData(indexCounter); - const ProjectDataManagement::GearClass::type currentGearClass = static_cast(currentData.toInt()); + const ProjectDataManagement::GearClass currentGearClass = static_cast(currentData.toInt()); if (currentGearClass == ProjectDataManagement::GearClass::Rocket) { @@ -60,15 +60,15 @@ void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry::type } } return; - case AesExplosionGeometry::type::EgRadial: - case AesExplosionGeometry::type::EgArea: + case AesExplosionGeometry::EgRadial: + case AesExplosionGeometry::EgArea: { const int currentIndex = wirkmittelCombobox->currentIndex(); for (int indexCounter = 0; indexCounter < wirkmittelCombobox->count(); ++indexCounter) { const QVariant currentData = wirkmittelCombobox->itemData(indexCounter); - const ProjectDataManagement::GearClass::type currentGearClass = static_cast(currentData.toInt()); + const ProjectDataManagement::GearClass currentGearClass = static_cast(currentData.toInt()); if (currentGearClass == ProjectDataManagement::GearClass::Rocket) { @@ -100,15 +100,15 @@ void addRocketPropertiesToRequest(EffectClusterModifyRequest &request, const std { switch (request.explosionGeometry().underlying()) { - case AesExplosionGeometry::type::EgAimPoint: - case AesExplosionGeometry::type::EgPoint: + case AesExplosionGeometry::EgAimPoint: + case AesExplosionGeometry::EgPoint: addRocketPropertiesForPointGeometry(request, ppmDtc); return; - case AesExplosionGeometry::type::EgLine: + case AesExplosionGeometry::EgLine: addRocketPropertiesForLinearGeometry(request, ppmDtc); return; - case AesExplosionGeometry::type::EgRadial: - case AesExplosionGeometry::type::EgArea: + case AesExplosionGeometry::EgRadial: + case AesExplosionGeometry::EgArea: default: return; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.h index 36ddd895c..93d2d8e96 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/aes_rocket_utility.h @@ -23,7 +23,7 @@ class EffectClusterModifyRequest; namespace RocketUtility { -void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry::type geometry); +void enaDisaWirkmittel(QComboBox *wirkmittelCombobox, AesExplosionGeometry geometry); void addRocketPropertiesToRequest(EffectClusterModifyRequest &request, const std::shared_ptr &ppmDtc); void addRocketPropertiesForPointGeometry(EffectClusterModifyRequest &request, const std::shared_ptr &ppmDtc); void addRocketPropertiesForLinearGeometry(EffectClusterModifyRequest &request, const std::shared_ptr &ppmDtc); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.cpp index ed457eabf..7fa6f4910 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/aes_functional_area_edit.cpp @@ -163,7 +163,7 @@ void FunctionalAreaEdit::enableUiElements(bool enable) const FunctionalAreaType type = m_functionalAreaTypes.value(m_ui->cbFunctionalAreaType->currentData().toInt()); - if (type.supplyMode() == AesOperatingMode_def::OmWaitingTime) + if (type.supplyMode() == AesOperatingMode::OmWaitingTime) { DEBUG_LOG(m_logger) << "SUPPLY-MODE"; m_ui->sbDecontaminationMinutes->setEnabled(false); @@ -209,17 +209,17 @@ void FunctionalAreaEdit::enableUiElements(bool enable) m_ui->sbWidth->setEnabled(enable); - const bool deconAvailable = type.deconMode() != AesOperatingMode_def::OmNotAvailable; - const bool maintAvailable = type.maintMode() != AesOperatingMode_def::OmNotAvailable; - const bool medicAvailable = type.medicMode() != AesOperatingMode_def::OmNotAvailable; + const bool deconAvailable = type.deconMode() != AesOperatingMode::OmNotAvailable; + const bool maintAvailable = type.maintMode() != AesOperatingMode::OmNotAvailable; + const bool medicAvailable = type.medicMode() != AesOperatingMode::OmNotAvailable; m_ui->cbDecontamination->setEnabled(enable && deconAvailable); m_ui->cbMaintenance->setEnabled(enable && maintAvailable); m_ui->cbMedical->setEnabled(enable && medicAvailable); - m_ui->sbDecontaminationMinutes->setEnabled((m_ui->cbDecontamination->currentIndex() == AesOperatingMode_def::OmWaitingTime) && enable && deconAvailable); - m_ui->sbMaintanenceMinutes->setEnabled((m_ui->cbMaintenance->currentIndex() == AesOperatingMode_def::OmWaitingTime) && enable && maintAvailable); - m_ui->sbMedicalMinutes->setEnabled((m_ui->cbMedical->currentIndex() == AesOperatingMode_def::OmWaitingTime) && enable && medicAvailable); + m_ui->sbDecontaminationMinutes->setEnabled((m_ui->cbDecontamination->currentIndex() == AesOperatingMode::OmWaitingTime) && enable && deconAvailable); + m_ui->sbMaintanenceMinutes->setEnabled((m_ui->cbMaintenance->currentIndex() == AesOperatingMode::OmWaitingTime) && enable && maintAvailable); + m_ui->sbMedicalMinutes->setEnabled((m_ui->cbMedical->currentIndex() == AesOperatingMode::OmWaitingTime) && enable && medicAvailable); m_ui->sbSupplyMinutes->setEnabled(false); m_ui->sbSupplyMinutes->setValue(0); m_ui->cbSupply->setCurrentIndex(0); @@ -244,7 +244,7 @@ void FunctionalAreaEdit::enableUiElements(bool enable) m_ui->pbClearPointSymbol->setEnabled(isGenericFunctionalArea); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); @@ -252,7 +252,7 @@ void FunctionalAreaEdit::enableUiElements(bool enable) setUnchangeable(); disableButtons(true); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->functionalArea(m_aesItem.id()); @@ -327,7 +327,7 @@ void FunctionalAreaEdit::setData(const FunctionalArea &area, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromStdString(area.name())); @@ -394,19 +394,19 @@ void FunctionalAreaEdit::fillCbx() QString byOperator = tr("by operator"); QString bytimeout = tr("by wait time"); - m_ui->cbDecontamination->addItem(unused, AesOperatingMode_def::OmNotUsed); - m_ui->cbDecontamination->addItem(byOperator, AesOperatingMode_def::OmObserver); - m_ui->cbDecontamination->addItem(bytimeout, AesOperatingMode_def::OmWaitingTime); + m_ui->cbDecontamination->addItem(unused, AesOperatingMode::OmNotUsed); + m_ui->cbDecontamination->addItem(byOperator, AesOperatingMode::OmObserver); + m_ui->cbDecontamination->addItem(bytimeout, AesOperatingMode::OmWaitingTime); - m_ui->cbMaintenance->addItem(unused, AesOperatingMode_def::OmNotUsed); - m_ui->cbMaintenance->addItem(byOperator, AesOperatingMode_def::OmObserver); - m_ui->cbMaintenance->addItem(bytimeout, AesOperatingMode_def::OmWaitingTime); + m_ui->cbMaintenance->addItem(unused, AesOperatingMode::OmNotUsed); + m_ui->cbMaintenance->addItem(byOperator, AesOperatingMode::OmObserver); + m_ui->cbMaintenance->addItem(bytimeout, AesOperatingMode::OmWaitingTime); - m_ui->cbMedical->addItem(unused, AesOperatingMode_def::OmNotUsed); - m_ui->cbMedical->addItem(byOperator, AesOperatingMode_def::OmObserver); - m_ui->cbMedical->addItem(bytimeout, AesOperatingMode_def::OmWaitingTime); + m_ui->cbMedical->addItem(unused, AesOperatingMode::OmNotUsed); + m_ui->cbMedical->addItem(byOperator, AesOperatingMode::OmObserver); + m_ui->cbMedical->addItem(bytimeout, AesOperatingMode::OmWaitingTime); - m_ui->cbSupply->addItem(bytimeout, AesOperatingMode_def::OmWaitingTime); + m_ui->cbSupply->addItem(bytimeout, AesOperatingMode::OmWaitingTime); if (curIdxDeconCbx >= 0) @@ -450,22 +450,22 @@ void FunctionalAreaEdit::onRectData(const QPointF ¢erPoint, double width, do void FunctionalAreaEdit::onCbxIdxDeconChanged() { - m_ui->sbDecontaminationMinutes->setEnabled(AesOperatingMode_def::OmWaitingTime == m_ui->cbDecontamination->currentData().toInt()); + m_ui->sbDecontaminationMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbDecontamination->currentData().toInt()); } void FunctionalAreaEdit::onCbxIdxMaintChanged() { - m_ui->sbMaintanenceMinutes->setEnabled(AesOperatingMode_def::OmWaitingTime == m_ui->cbMaintenance->currentData().toInt()); + m_ui->sbMaintanenceMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbMaintenance->currentData().toInt()); } void FunctionalAreaEdit::onCbxIdxMedicChanged() { - m_ui->sbMedicalMinutes->setEnabled(AesOperatingMode_def::OmWaitingTime == m_ui->cbMedical->currentData().toInt()); + m_ui->sbMedicalMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbMedical->currentData().toInt()); } void FunctionalAreaEdit::onCbxIdxSupplyChanged() { - m_ui->sbSupplyMinutes->setEnabled(AesOperatingMode_def::OmWaitingTime == m_ui->cbSupply->currentData().toInt()); + m_ui->sbSupplyMinutes->setEnabled(AesOperatingMode::OmWaitingTime == m_ui->cbSupply->currentData().toInt()); } void FunctionalAreaEdit::onCbxIdxFunctionalAreaTypeChanged() @@ -488,9 +488,9 @@ void FunctionalAreaEdit::onCbxIdxFunctionalAreaTypeChanged() m_ui->sbDecontaminationMinutes->setValue(type.deconTime()); m_ui->sbMaintanenceMinutes->setValue(type.maintTime()); m_ui->sbMedicalMinutes->setValue(type.medicTime()); - m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(type.deconMode() == AesOperatingMode_def::OmNotAvailable ? AesOperatingMode_def::OmNotUsed : type.deconMode().underlying())); - m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(type.maintMode() == AesOperatingMode_def::OmNotAvailable ? AesOperatingMode_def::OmNotUsed : type.maintMode().underlying())); - m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(type.medicMode() == AesOperatingMode_def::OmNotAvailable ? AesOperatingMode_def::OmNotUsed : type.medicMode().underlying())); + m_ui->cbDecontamination->setCurrentIndex(m_ui->cbDecontamination->findData(type.deconMode() == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.deconMode().underlying())); + m_ui->cbMaintenance->setCurrentIndex(m_ui->cbMaintenance->findData(type.maintMode() == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.maintMode().underlying())); + m_ui->cbMedical->setCurrentIndex(m_ui->cbMedical->findData(type.medicMode() == AesOperatingMode::OmNotAvailable ? AesOperatingMode::OmNotUsed : type.medicMode().underlying())); } } enableUiElements(true); @@ -613,32 +613,32 @@ bool FunctionalAreaEdit::apply() int functionalAreaType = m_ui->cbFunctionalAreaType->currentData().toInt(); int playerId = 0; const auto pointSymbol = m_sidc.toStdString(); - AesOperatingMode deconMode = static_cast(m_ui->cbDecontamination->currentData().toInt()); - int deconTime = (AesOperatingMode_def::OmWaitingTime == m_ui->cbDecontamination->currentData().toInt()) ? 1000 * 60 * m_ui->sbDecontaminationMinutes->value() : 0; - AesOperatingMode maintMode = static_cast(m_ui->cbMaintenance->currentData().toInt()); - int maintTime = (AesOperatingMode_def::OmWaitingTime == m_ui->cbMaintenance->currentData().toInt()) ? 1000 * 60 * m_ui->sbMaintanenceMinutes->value() : 0; - AesOperatingMode medicMode = static_cast(m_ui->cbMedical->currentData().toInt()); - int medicTime = (AesOperatingMode_def::OmWaitingTime == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0; - AesOperatingMode supplyMode = static_cast(m_ui->cbSupply->currentData().toInt()); + AesOperatingMode deconMode = static_cast(m_ui->cbDecontamination->currentData().toInt()); + int deconTime = (AesOperatingMode::OmWaitingTime == m_ui->cbDecontamination->currentData().toInt()) ? 1000 * 60 * m_ui->sbDecontaminationMinutes->value() : 0; + AesOperatingMode maintMode = static_cast(m_ui->cbMaintenance->currentData().toInt()); + int maintTime = (AesOperatingMode::OmWaitingTime == m_ui->cbMaintenance->currentData().toInt()) ? 1000 * 60 * m_ui->sbMaintanenceMinutes->value() : 0; + AesOperatingMode medicMode = static_cast(m_ui->cbMedical->currentData().toInt()); + int medicTime = (AesOperatingMode::OmWaitingTime == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0; + AesOperatingMode supplyMode = static_cast(m_ui->cbSupply->currentData().toInt()); if ( functionalAreaType != 7 ) - supplyMode = AesOperatingMode_def::OmNotUsed; - int supplyTime = (AesOperatingMode_def::OmWaitingTime == m_ui->cbSupply->currentData().toInt()) ? 1000 * 60 * m_ui->sbSupplyMinutes->value() : 0; - AesOperatingMode notfightMode = static_cast(m_ui->cbMedical->currentData().toInt()); - int notfightTime = (AesOperatingMode_def::OmWaitingTime == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0; + supplyMode = AesOperatingMode::OmNotUsed; + int supplyTime = (AesOperatingMode::OmWaitingTime == m_ui->cbSupply->currentData().toInt()) ? 1000 * 60 * m_ui->sbSupplyMinutes->value() : 0; + AesOperatingMode notfightMode = static_cast(m_ui->cbMedical->currentData().toInt()); + int notfightTime = (AesOperatingMode::OmWaitingTime == m_ui->cbMedical->currentData().toInt()) ? 1000 * 60 * m_ui->sbMedicalMinutes->value() : 0; if ( functionalAreaType == 7 ) { - deconMode = AesOperatingMode_def::OmNotUsed; - maintMode = AesOperatingMode_def::OmNotUsed; - medicMode = AesOperatingMode_def::OmNotUsed; - notfightMode = AesOperatingMode_def::OmNotUsed; + deconMode = AesOperatingMode::OmNotUsed; + maintMode = AesOperatingMode::OmNotUsed; + medicMode = AesOperatingMode::OmNotUsed; + notfightMode = AesOperatingMode::OmNotUsed; } if ( functionalAreaType == 8 ) { - deconMode = AesOperatingMode_def::OmNotUsed; - maintMode = AesOperatingMode_def::OmNotUsed; - medicMode = AesOperatingMode_def::OmNotUsed; - supplyMode = AesOperatingMode_def::OmNotUsed; - notfightMode = AesOperatingMode_def::OmObserver; + deconMode = AesOperatingMode::OmNotUsed; + maintMode = AesOperatingMode::OmNotUsed; + medicMode = AesOperatingMode::OmNotUsed; + supplyMode = AesOperatingMode::OmNotUsed; + notfightMode = AesOperatingMode::OmObserver; } QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_ui->positionEdit->coordinate(), @@ -649,7 +649,7 @@ bool FunctionalAreaEdit::apply() const Area area(bottomLeftGeo, m_ui->sbWidth->value(), m_ui->sbHeight->value(), 0.0); const ::dds::core::optional< int32_t > participantIdOpt = LtsUtils::toOptional(playerId); - if (supplyMode == AesOperatingMode_def::OmWaitingTime) + if (supplyMode == AesOperatingMode::OmWaitingTime) { partyId = 0; playerId = m_participant.id(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.cpp index 261e21207..c885599a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/aes_gas_pipe_edit.cpp @@ -76,12 +76,12 @@ void GasPipeEdit::enableUiElements(bool enable) m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable()); m_ui->cbParty->setEnabled(enable); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->gasPipe(m_aesItem.id()); @@ -136,7 +136,7 @@ void GasPipeEdit::setData(const GasPipe &aesItem, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name())); m_ui->sbWidth->setValue(aesItem.width()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp index d8be35fb7..27ae520fc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/aes_mine_area_edit.cpp @@ -114,12 +114,12 @@ void MineAreaEdit::enableUiElements(bool enable) else m_ui->pbResetDusMines->hide(); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->mineArea(m_aesItem.id()); @@ -193,10 +193,10 @@ bool MineAreaEdit::init(int aesItemId, bool copy, m_ui->cbDurationHours->setCurrentIndex(m_ui->cbDurationHours->findData(96)); if (strcmp(PROJECTBUILD, "guez") == 0) - m_ui->cbLayingProcedure->addItem(tr("Artillery"), AesMaLayingProcedureType_def::LptArtillery); + m_ui->cbLayingProcedure->addItem(tr("Artillery"), AesMaLayingProcedureType::LptArtillery); - m_ui->cbLayingProcedure->addItem(tr("Pioneer"), AesMaLayingProcedureType_def::LptPioneer); - m_ui->cbLayingProcedure->setCurrentIndex(m_ui->cbLayingProcedure->findData(AesMaLayingProcedureType_def::LptPioneer)); + m_ui->cbLayingProcedure->addItem(tr("Pioneer"), AesMaLayingProcedureType::LptPioneer); + m_ui->cbLayingProcedure->setCurrentIndex(m_ui->cbLayingProcedure->findData(AesMaLayingProcedureType::LptPioneer)); m_ui->cbLayingMethod->addItem(tr("Open"), 0); m_ui->cbLayingMethod->addItem(tr("Covered"), 1); @@ -246,7 +246,7 @@ void MineAreaEdit::setData(const MineArea &data, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromUtf8(data.name().c_str())); m_ui->cbChargeType->setCurrentIndex(m_ui->cbChargeType->findData(data.chargeStruct().chargeTypeId())); @@ -323,7 +323,7 @@ void MineAreaEdit::getPosition() double width = m_ui->sbWidth->value(); int maxSegments = m_segments; - if (m_ui->cbLayingProcedure->currentData().toInt() == AesMaLayingProcedureType_def::LptArtillery) + if (m_ui->cbLayingProcedure->currentData().toInt() == AesMaLayingProcedureType::LptArtillery) maxSegments = 1; @@ -380,7 +380,7 @@ bool MineAreaEdit::apply() std::string name = m_ui->leIdentifier->text().toStdString(); int chargeTypeId = m_ui->cbChargeType->currentData().toInt(); s_lastChargeType = chargeTypeId; - AesMaLayingProcedureType layingProcedureType = static_cast(m_ui->cbLayingProcedure->currentData().toInt()); + AesMaLayingProcedureType layingProcedureType = static_cast(m_ui->cbLayingProcedure->currentData().toInt()); bool isLaidHidden = m_ui->cbLayingMethod->currentData().toInt() != 0; int partyId = m_ui->cbParty->currentData().toInt(); int playerId = 0; @@ -429,7 +429,7 @@ bool MineAreaEdit::apply() void MineAreaEdit::onLayingProcedureChanged() { - const bool islptArtillery = m_ui->cbLayingProcedure->currentData().toInt() == AesMaLayingProcedureType_def::LptArtillery; + const bool islptArtillery = m_ui->cbLayingProcedure->currentData().toInt() == AesMaLayingProcedureType::LptArtillery; if (islptArtillery) m_pdmGuiIfc->setChargeTypePropertyFilter(m_ui->cbChargeType, QStringLiteral("canBeThrown"), true); else diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.cpp index 0d8243ccd..bed0d569b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/aes_mine_corridor_edit.cpp @@ -76,12 +76,12 @@ void MineCorridorEdit::enableUiElements(bool enable) m_ui->pbClear->setEnabled(enable); m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable()); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->mineCorridor(m_aesItem.id()); @@ -134,7 +134,7 @@ void MineCorridorEdit::setData(const MineCorridor &aesItem, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromStdString(aesItem.name())); m_ui->sbWidth->setValue(aesItem.width()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.cpp index 9117687d2..ec53e64be 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_booby_trap_edit.cpp @@ -126,12 +126,12 @@ void BoobyTrapEdit::enableUiElements(bool enable) m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable()); m_ui->pbClear->setEnabled(enable); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->boobyTrap(m_aesItem.id()); @@ -225,7 +225,7 @@ void BoobyTrapEdit::setData(const BoobyTrap &bt, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromStdString(bt.name())); m_ui->dteEffectStart->setMsecsSinceEpoch(bt.effectStart().is_set() ? bt.effectStart().get() : 0); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp index 837cecb5b..dc15b6978 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/aes_off_route_mine_edit.cpp @@ -176,12 +176,12 @@ void OffRouteMineEdit::enableUiElements(bool enable) m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable()); m_ui->pbClear->setEnabled(enable); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->offRouteMine(m_aesItem.id()); @@ -249,7 +249,7 @@ void OffRouteMineEdit::setData(const OffRouteMine &orm, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } const Area &area = orm.area(); if (!qFuzzyCompare(area.cornerBottomLeft().lon(), 0) || diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.cpp index 21dcf3189..328748634 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/aes_ncontamination_edit.cpp @@ -157,9 +157,9 @@ void NContaminationEdit::onWeatherChanged(int index ) { Q_UNUSED(index); - AreaEffectSimulation::AesWeatherSource weather = static_cast(m_ui->cbWeather->currentData().toInt()); - if (weather == AreaEffectSimulation::AesWeatherSource_def::AwsDynamic || - weather == AreaEffectSimulation::AesWeatherSource_def::AwsStatic) + AreaEffectSimulation::AesWeatherSource weather = static_cast(m_ui->cbWeather->currentData().toInt()); + if (weather == AreaEffectSimulation::AesWeatherSource::AwsDynamic || + weather == AreaEffectSimulation::AesWeatherSource::AwsStatic) { m_ui->rotationAngleEdit->showSpinbox(1, false); m_ui->stackedWidget->setCurrentWidget(m_ui->lbAngle); @@ -182,9 +182,9 @@ void NContaminationEdit::setRadials(double direction, double spanAngle) double radial1 = direction - (fabs(spanAngle) / 2.0); double radial2 = direction + (fabs(spanAngle) / 2.0); - AreaEffectSimulation::AesWeatherSource weather = static_cast(m_ui->cbWeather->currentData().toInt()); - if (weather == AreaEffectSimulation::AesWeatherSource_def::AwsDynamic || - weather == AreaEffectSimulation::AesWeatherSource_def::AwsStatic) + AreaEffectSimulation::AesWeatherSource weather = static_cast(m_ui->cbWeather->currentData().toInt()); + if (weather == AreaEffectSimulation::AesWeatherSource::AwsDynamic || + weather == AreaEffectSimulation::AesWeatherSource::AwsStatic) { radial1 = spanAngle; } @@ -202,7 +202,7 @@ double NContaminationEdit::spanAngle() const double radial2 = m_ui->rotationAngleEdit->getAngleConverted(m_ui->rotationAngleEdit->getAngle(1), LtsAngleEditBase::AngleUnitType::Deg, m_ui->rotationAngleEdit->getAngleCurrentUnit()); - if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource_def::AwsNone) + if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource::AwsNone) return radial1; double spanAngle = radial2 - radial1; @@ -213,7 +213,7 @@ double NContaminationEdit::spanAngle() const double NContaminationEdit::rotatianAngle() const { - if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource_def::AwsNone) + if (m_ui->cbWeather->currentData().toInt() != AreaEffectSimulation::AesWeatherSource::AwsNone) return 0.0; double radial1 = m_ui->rotationAngleEdit->getAngleConverted(m_ui->rotationAngleEdit->getAngle(0), LtsAngleEditBase::AngleUnitType::Deg, @@ -244,12 +244,12 @@ void NContaminationEdit::enableUiElements(bool enable) m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable()); m_ui->cbWeather->setEnabled(enable); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->nContamination(m_aesItem.id()); @@ -322,7 +322,7 @@ void NContaminationEdit::setData(const NContamination &contamination, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromStdString(contamination.name())); @@ -385,7 +385,7 @@ bool NContaminationEdit::apply() int partyId = 0; int playerId = 0; - AesWeatherSource weatherSourceId = static_cast(m_ui->cbWeather->currentData().toInt()); + AesWeatherSource weatherSourceId = static_cast(m_ui->cbWeather->currentData().toInt()); const QPointF p(m_ui->positionEdit->coordinate()); const Core::GeoPosition2D pos(p.x(), p.y()); const NContaminationModifyRequest req(m_aesItem.id(), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.cpp index 10117a016..6b1e72da6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/aes_technical_area_edit.cpp @@ -81,12 +81,12 @@ void TechnicalAreaEdit::enableUiElements(bool enable) m_ui->sbWidth->setEnabled(enable); m_ui->pbClear->setEnabled(enable); m_ui->leIdentifier->setEnabled(enable || isOnlyNameModifiable()); - if (m_aesItem.effectStateId() == AesEffectState_def::EsExpired) + if (m_aesItem.effectStateId() == AesEffectState::EsExpired) { m_ui->leIdentifier->setText(QString::fromStdString(m_aesItem.name())); __unchange__(); } - if (m_aesItem.effectStateId() == AesEffectState_def::EsActivated) + if (m_aesItem.effectStateId() == AesEffectState::EsActivated) { QString name = m_ui->leIdentifier->text(); auto baseData = m_dtc->technicalArea(m_aesItem.id()); @@ -137,7 +137,7 @@ void TechnicalAreaEdit::setData(const TechnicalArea &area, bool copy) if (copy) { m_aesItem.id(0); - m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState_def::get_default()); + m_aesItem.effectStateId(AreaEffectSimulation::AesEffectState::get_default()); } m_ui->leIdentifier->setText(QString::fromStdString(area.name())); m_ui->sbWidth->setValue(area.area().width()); @@ -161,9 +161,9 @@ inline void TechnicalAreaEdit::fillCbx() m_ui->cbType->clear(); - m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType_def::TatMout), AesTechnicalAreaType_def::TatMout); + m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatMout), AesTechnicalAreaType::TatMout); if ( enableSoundZones ) - m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType_def::TatSoundZone), AesTechnicalAreaType_def::TatSoundZone); + m_ui->cbType->addItem(AreaEffectSimulation::toString(AesTechnicalAreaType::TatSoundZone), AesTechnicalAreaType::TatSoundZone); @@ -204,7 +204,7 @@ void TechnicalAreaEdit::onRectData(const QPointF ¢erPoint, double width, dou bool TechnicalAreaEdit::apply() { std::string name = m_ui->leIdentifier->text().toStdString(); - AesTechnicalAreaType type = static_cast(m_ui->cbType->currentData().toInt()); + AesTechnicalAreaType type = static_cast(m_ui->cbType->currentData().toInt()); QPointF bottomLeft(Polygons::centerPoint2BottomLeft(m_ui->positionEdit->coordinate(), m_ui->sbWidth->value(), m_ui->sbHeight->value(), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp index 35e3f2ae0..2d1614f41 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp @@ -111,7 +111,7 @@ void EditCombatNetRadioDialog::setUiValues(const CnrConfig& cnrConfig) m_ui->chkGlobal->setChecked(m_isGlobal); initCbChannels(cnrConfig.cnrChannelId()); bool disableParty = - (m_avmDtc->cnrChannel(cnrConfig.cnrChannelId()).frequencyBand() == FrequencyBand_def::REL) || m_isGlobal; + (m_avmDtc->cnrChannel(cnrConfig.cnrChannelId()).frequencyBand() == FrequencyBand::REL) || m_isGlobal; if (!disableParty) { m_ui->cbParty->setCurrentIndex(m_ui->cbParty->findData(cnrConfig.partyId())); @@ -492,7 +492,7 @@ void EditCombatNetRadioDialog::onChannelChanged(int index) { int channelId = m_ui->cbChannel->itemData(index).toInt(); - bool disableParty = (m_avmDtc->cnrChannel(channelId).frequencyBand() == FrequencyBand_def::REL) || m_isGlobal; + bool disableParty = (m_avmDtc->cnrChannel(channelId).frequencyBand() == FrequencyBand::REL) || m_isGlobal; m_ui->cbUnit->setDisabled(disableParty); m_ui->lbUnit->setDisabled(disableParty); m_ui->cbParty->setDisabled(disableParty); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp index 91acbf579..eba772a62 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_data_model.cpp @@ -73,10 +73,10 @@ bool EditFrequencyPlanningResourceDataModel::isFiltered(const AudioVideoManageme DataModification modType) const { - if (m_frequencyBand != FrequencyBand_def::REL && data.frequencyBand() != m_frequencyBand) + if (m_frequencyBand != FrequencyBand::REL && data.frequencyBand() != m_frequencyBand) return true; - if (m_frequencyBand == FrequencyBand_def::REL && data.frequencyBand() != FrequencyBand_def::VHF) + if (m_frequencyBand == FrequencyBand::REL && data.frequencyBand() != FrequencyBand::VHF) return true; Q_UNUSED(modType); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp index d9a7eaae5..c7010de3b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_set_resource_dialog.cpp @@ -45,12 +45,12 @@ EditFrequencyPlanningSetResourceDialog::EditFrequencyPlanningSetResourceDialog( for (const auto &it : dataVec) { - if((operatingMode == RcOperatingMode_def::AkwEncEccm || - operatingMode == RcOperatingMode_def::AkwEncNone) + if((operatingMode == RcOperatingMode::AkwEncEccm || + operatingMode == RcOperatingMode::AkwEncNone) && it.akwRadioCircuit() == 0) continue; - if((operatingMode != RcOperatingMode_def::AkwEncEccm && - operatingMode != RcOperatingMode_def::AkwEncNone) + if((operatingMode != RcOperatingMode::AkwEncEccm && + operatingMode != RcOperatingMode::AkwEncNone) && it.akwRadioCircuit() != 0) continue; m_frequencyResourceDataModel->insertRow(it); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h index 850838c15..d67dc423c 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.h @@ -103,7 +103,7 @@ class FrequencyPlanningDialog : public LtsWidgets::LtsDialog, void setButtonSetActivePlanningEnabled(); static void setBackgroundColor(QWidget* w, Qt::GlobalColor color, bool bSetColor); void setStatus(const QString& statusText, const QString& requester, qint64 timeStampMsecs, - TransmissionReason reason = TransmissionReason_def::TR_Unknown, Qt::GlobalColor color = Qt::black); + TransmissionReason reason = TransmissionReason::TR_Unknown, Qt::GlobalColor color = Qt::black); void tableColumnOrganiserSetting() override; private: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp index 367564bdc..e1ef4a067 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp @@ -23,9 +23,9 @@ FrequencyPlanningWidget::FrequencyPlanningWidget(const std::shared_ptrsetupUi(this); - m_ui->cbFrequencyBand->addItem(toString(FrequencyBand_def::VHF), FrequencyBand_def::VHF); - m_ui->cbFrequencyBand->addItem(toString(FrequencyBand_def::HF), FrequencyBand_def::HF); - m_ui->cbFrequencyBand->addItem(toString(FrequencyBand_def::UHF), FrequencyBand_def::UHF); + m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::VHF), FrequencyBand::VHF); + m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::HF), FrequencyBand::HF); + m_ui->cbFrequencyBand->addItem(toString(FrequencyBand::UHF), FrequencyBand::UHF); connect(m_ui->leName, &QLineEdit::textChanged, this, &FrequencyPlanningWidget::onNameChanged); connect(m_ui->cbFrequencyBand, qOverload(&QComboBox::currentIndexChanged), this, @@ -51,15 +51,15 @@ bool FrequencyPlanningWidget::init(LtsSession::LtsSession* session, RadioCircuit switch (ft.underlying()) { - case FrequencyBand_def::HF: { + case FrequencyBand::HF: { createHFWidget(data); break; } - case FrequencyBand_def::UHF: { + case FrequencyBand::UHF: { createUHFWidget(data); break; } - case FrequencyBand_def::VHF: { + case FrequencyBand::VHF: { createVHFWidget(data); break; } @@ -72,13 +72,13 @@ bool FrequencyPlanningWidget::init(LtsSession::LtsSession* session, RadioCircuit m_ui->lbxFrequencyBand->setVisible(true); switch (ft.underlying()) { - case FrequencyBand_def::HF: + case FrequencyBand::HF: createHFWidget(data); break; - case FrequencyBand_def::UHF: + case FrequencyBand::UHF: createUHFWidget(data); break; - case FrequencyBand_def::VHF: + case FrequencyBand::VHF: createVHFWidget(data); break; default: @@ -117,7 +117,7 @@ void FrequencyPlanningWidget::setRelaisRestrictions(bool restrict) { if (restrict) { - m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(FrequencyBand_def::VHF)); + m_ui->cbFrequencyBand->setCurrentIndex(m_ui->cbFrequencyBand->findData(FrequencyBand::VHF)); m_ui->cbFrequencyBand->setEnabled(false); } else @@ -129,7 +129,7 @@ void FrequencyPlanningWidget::setRelaisRestrictions(bool restrict) QJsonObject FrequencyPlanningWidget::toJson() const { return frequencyPlanningJson(m_radioSpecificaWidget->toJson(), m_ui->leName->text(), - static_cast(m_ui->cbFrequencyBand->currentData().toInt()), + static_cast(m_ui->cbFrequencyBand->currentData().toInt()), m_ui->cbRadioStation->currentData().toInt()); } @@ -152,13 +152,13 @@ void FrequencyPlanningWidget::onFrequencyBandChanged() { switch (m_ui->cbFrequencyBand->currentData().toInt()) { - case FrequencyBand_def::HF: + case FrequencyBand::HF: createHFWidget(); break; - case FrequencyBand_def::UHF: + case FrequencyBand::UHF: createUHFWidget(); break; - case FrequencyBand_def::VHF: + case FrequencyBand::VHF: createVHFWidget(); break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h index 2117c848d..5db25fcb9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h @@ -44,7 +44,7 @@ public: FrequencyPlanningWidget(const std::shared_ptr &avmDtc, QSet &allocatedDataSets, QWidget *parent = nullptr); ~FrequencyPlanningWidget(); - bool init(LtsSession::LtsSession *session, RadioCircuit *data, const CnrConfig &cnrConfigId, int frequencySetId = -1, FrequencyBand ft = FrequencyBand_def::VHF); + bool init(LtsSession::LtsSession *session, RadioCircuit *data, const CnrConfig &cnrConfigId, int frequencySetId = -1, FrequencyBand ft = FrequencyBand::VHF); void setNameDisabled(bool disable); void setName(const QString& name); void setRelaisRestrictions(bool restrict); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp index 6ea550354..67050eebc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp @@ -25,7 +25,7 @@ RadioSpecificaHfWidget::RadioSpecificaHfWidget(QWidget *parent) - m_ui->cobChannelSpacing->addItem(toString(ChannelSpacingHF_def::CS_100_Hz), ChannelSpacingHF_def::CS_100_Hz); + m_ui->cobChannelSpacing->addItem(toString(ChannelSpacingHF::CS_100_Hz), ChannelSpacingHF::CS_100_Hz); @@ -94,7 +94,7 @@ RadioCircuitHF RadioSpecificaHfWidget::values() const { RadioCircuitHF spec; spec.modulationType = ModulationType::AM; - spec.channelSpacing = static_cast(m_ui->cobChannelSpacing->currentData().toInt()); + spec.channelSpacing = static_cast(m_ui->cobChannelSpacing->currentData().toInt()); spec.frequency = m_ui->sbFrequency->value(); spec.squelch = m_ui->chbSquelch->isChecked() ? m_ui->sbSquelch->value() : 0; return spec; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp index a196c34d0..33af394c0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp @@ -36,9 +36,9 @@ RadioSpecificaUhfWidget::RadioSpecificaUhfWidget(QWidget *parent) - m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing_def::CS_25_00_kHz), ChannelSpacing_def::CS_25_00_kHz); - m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing_def::CS_12_50_kHz), ChannelSpacing_def::CS_12_50_kHz); - m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing_def::CS_8_33_kHz), ChannelSpacing_def::CS_8_33_kHz); + m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_25_00_kHz), ChannelSpacing::CS_25_00_kHz); + m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_12_50_kHz), ChannelSpacing::CS_12_50_kHz); + m_ui->cobChannelSpacing->addItem(toString(ChannelSpacing::CS_8_33_kHz), ChannelSpacing::CS_8_33_kHz); LtsUtils::ProjectSettings *ps = LtsUtils::ProjectSettings::getInstance(); @@ -149,8 +149,8 @@ RadioCircuitUHF RadioSpecificaUhfWidget::values() const { RadioCircuitUHF spec; - spec.modulationType = static_cast(m_ui->bgModulationType->checkedButton()->property("enum").toInt()); - spec.channelSpacing = static_cast(m_ui->cobChannelSpacing->currentData().toInt()); + spec.modulationType = static_cast(m_ui->bgModulationType->checkedButton()->property("enum").toInt()); + spec.channelSpacing = static_cast(m_ui->cobChannelSpacing->currentData().toInt()); spec.frequency = m_ui->sbFrequency->value() * 1000; spec.squelchDB = m_ui->chbSquelch->isChecked() ? m_ui->sbSquelch->value() : 0; spec.clipper = m_ui->rbClipperOn->isChecked(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp index e41a34cd8..6add26f86 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp @@ -22,11 +22,11 @@ RadioSpecificaVhfWidget::RadioSpecificaVhfWidget(QSet &assignedFrequencySet m_ui->setupUi(this); - m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::FixedFreqEncNone), RcOperatingMode_def::FixedFreqEncNone); - m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::FixedFreqEncHwKr), RcOperatingMode_def::FixedFreqEncHwKr); - m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::FixedFreqEncHwKrKl), RcOperatingMode_def::FixedFreqEncHwKrKl); - m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::AkwEncNone), RcOperatingMode_def::AkwEncNone); - m_ui->cobOperatingMode->addItem(toString(RcOperatingMode_def::AkwEncEccm), RcOperatingMode_def::AkwEncEccm); + m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncNone), RcOperatingMode::FixedFreqEncNone); + m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncHwKr), RcOperatingMode::FixedFreqEncHwKr); + m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::FixedFreqEncHwKrKl), RcOperatingMode::FixedFreqEncHwKrKl); + m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::AkwEncNone), RcOperatingMode::AkwEncNone); + m_ui->cobOperatingMode->addItem(toString(RcOperatingMode::AkwEncEccm), RcOperatingMode::AkwEncEccm); m_ui->leFrequencySet->setEnabled(false); @@ -116,7 +116,7 @@ bool RadioSpecificaVhfWidget::setValues(const QJsonObject &json) RadioCircuitVHF RadioSpecificaVhfWidget::values() const { RadioCircuitVHF spec; - spec.operatingMode = static_cast(m_ui->cobOperatingMode->currentData().toInt()); + spec.operatingMode = static_cast(m_ui->cobOperatingMode->currentData().toInt()); spec.freqSetDataId = m_frequencySetDataId; spec.pilotTone = isAkwMode(spec.operatingMode) ? false : m_ui->rbPilotToneOn->isChecked(); return spec; @@ -163,7 +163,7 @@ void RadioSpecificaVhfWidget::onSelectFrequencySetData() void RadioSpecificaVhfWidget::onOperatingModeChanged() { - RcOperatingMode rcMode = static_cast(m_ui->cobOperatingMode->currentData().toInt()); + RcOperatingMode rcMode = static_cast(m_ui->cobOperatingMode->currentData().toInt()); const bool enablePilotTone = !isAkwMode(rcMode); m_ui->lbxPilotTone->setEnabled(enablePilotTone); m_ui->rbPilotToneOn->setEnabled(enablePilotTone); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp index c8d418932..fa1b8f91d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_dialog.cpp @@ -176,7 +176,7 @@ void ElokaDialog::onQueryElokaResponse(const QVector&& eloka) { for (const auto& cnrTvcProfileData : cnrTvcProfile.data()) { - if (cnrTvcProfileData.radioSystemId() == RadioSystem::inner_enum::Cnr) + if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr) userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Cnr); else userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Tvc); @@ -250,7 +250,7 @@ bool ElokaDialog::isAnnouncement(ElokaData& data) QMap streams = m_avmDtc->streams(); for (const Stream& stream : std::as_const(streams)) { - if ((stream.type() == StreamType_def::AudioOut) || (stream.type() == StreamType_def::AudioInOut)) + if ((stream.type() == StreamType::AudioOut) || (stream.type() == StreamType::AudioInOut)) announcements.insert(stream.id(), stream); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp index a73f2b46a..2a882670a 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/avm_eloka_edit_dialog.cpp @@ -160,7 +160,7 @@ bool ElokaEditDialog::init(const std::vector& usedCnr, const std::vector const QMap streams = m_avmDtc->streams(); for (const Stream& stream : streams) { - if ((stream.type() == StreamType_def::AudioOut) || (stream.type() == StreamType_def::AudioInOut)) + if ((stream.type() == StreamType::AudioOut) || (stream.type() == StreamType::AudioInOut)) m_announcementMap.insert(stream.id(), stream); } @@ -360,7 +360,7 @@ void ElokaEditDialog::onStreamChanged(const Stream& data, DataModification modTy { DEBUG_LOG(m_logger) << "onStreamChanged"; - if ((data.type() != StreamType_def::AudioOut) && (data.type() != StreamType_def::AudioInOut)) + if ((data.type() != StreamType::AudioOut) && (data.type() != StreamType::AudioInOut)) return; switch (modType) @@ -410,7 +410,7 @@ void ElokaEditDialog::getUserProfile() if (cnrTvcProfile.exerciseId() == exerciseId && cnrTvcProfile.operatorId() == operatorId) { for (const auto& cnrTvcProfileData : cnrTvcProfile.data()) - if (cnrTvcProfileData.radioSystemId() == RadioSystem::inner_enum::Cnr) + if (cnrTvcProfileData.radioSystemId() == RadioSystem::Cnr) m_userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Cnr); else m_userProfile.insert(cnrTvcProfileData.radioCircuitId(), ElokaCircuitType::Tvc); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp index f6f5bda35..1ee1e8504 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/bdv_dds_controller.cpp @@ -602,15 +602,15 @@ void BuildingViewerDdsController::handleMountingPoint(const InfrastructureManage QString strAssetType; switch (mp.type().underlying()) { - case InfrastructureManagement::MountingPointType_def::AnnouncementUnit: + case InfrastructureManagement::MountingPointType::AnnouncementUnit: assetType = BuildingViewer::AssetTypes::AnnouncementUnit; strAssetType = QStringLiteral("AnnouncementUnit"); break; - case InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit: + case InfrastructureManagement::MountingPointType::EffectGenerationControlUnit: assetType = BuildingViewer::AssetTypes::EffectGenerationUnit; strAssetType = QStringLiteral("EffectGenerationControlUnit"); break; - case InfrastructureManagement::MountingPointType_def::IndoorCamera: { + case InfrastructureManagement::MountingPointType::IndoorCamera: { bool hasSpeaker = false; QJsonParseError jError; const QJsonDocument doc(QJsonDocument::fromJson(mp.properties(), &jError)); @@ -741,7 +741,7 @@ bool BuildingViewerDdsController::isValidParticipant(const ParticipantManagement return false; ParticipantManagement::TypeClass tc = m_ppmDtc->type(participant.typeId()).typeClass(); - if (tc == ParticipantManagement::TypeClass_def::SupportUnit || tc == ParticipantManagement::TypeClass_def::Unit) + if (tc == ParticipantManagement::TypeClass::SupportUnit || tc == ParticipantManagement::TypeClass::Unit) { DEBUG_LOG(m_logger) << getSessionInfo() << "isValidParticipant: Not handling participant with id " << participant.id() << " since its type is 'SupportUnit', 'Unit' or 'Structure'"; @@ -1337,9 +1337,9 @@ void BuildingViewerDdsController::updateBuildingRoomNames( QString featureID = BuildingViewer::databaseId2FeatureId(buildingDatabaseId); for (const auto& se : vecElements) { - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Building) + if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building) m_connection->excSetBuildingDisplayName(featureID, QString::fromStdString(se.displayName())); - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Room) + if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room) m_connection->excSetRoomDisplayName(featureID, QString::number(se.mountingPointId()), QString::fromStdString(se.displayName())); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp index 3cb00972a..c336c91bd 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_building_edit.cpp @@ -288,7 +288,7 @@ void BuildingEdit::onDestroyElement() std::vector structureElementIds; getStructureElementIds(m_model->privateData(selIndex), structureElementIds); - sendBuildingStateRequest(ProjectDataManagement::VulnerabilityState_def::CatastrophicKill, structureElementIds); + sendBuildingStateRequest(ProjectDataManagement::VulnerabilityState::CatastrophicKill, structureElementIds); } void BuildingEdit::getStructureElementIds(NGLTreeItem* item, std::vector& structureElementIds) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp index b93993f8e..a8be7bf9f 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/BuildingEdit/bdv_edit_model.cpp @@ -141,7 +141,7 @@ bool BuildingEditModel::init(int32_t mseId) for (const auto& se : vecElements) { DEBUG_LOG(m_logger) << "se: =" << se; - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Floor) + if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Floor) { BuildingViewer::TreeItem itemRoom(se); itemRoom.setSuperior(rootId); @@ -162,7 +162,7 @@ bool BuildingEditModel::init(int32_t mseId) for (const auto& se : vecElements) { - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Room) + if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room) { double fortifyFactor = 1.0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp index b1a871509..6a502d5e0 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_config_dialog.cpp @@ -63,12 +63,12 @@ bool BldConfigDialog::init(LtsSession::LtsSession* session) void BldConfigDialog::fillCbx() { m_ui->cmbStatus->clear(); - m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::NoChange), - ProjectDataManagement::VulnerabilityState::NoChange); - m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::CombatReady), - ProjectDataManagement::VulnerabilityState::CombatReady); - m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::CatastrophicKill), - ProjectDataManagement::VulnerabilityState::CatastrophicKill); + m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange), + ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange); + m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady), + ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady); + m_ui->cmbStatus->addItem(toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill), + ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill); m_ui->cmbStatus->setCurrentIndex(m_ui->cmbStatus->findData(m_bldState.vulnerabilityState().underlying())); } @@ -90,7 +90,7 @@ bool BldConfigDialog::apply() requestData.buildings({building}); ProjectDataManagement::VulnerabilityState state = - static_cast(m_ui->cmbStatus->currentData().toInt()); + static_cast(m_ui->cmbStatus->currentData().toInt()); requestData.vulnerabilityState(state); requestData.resetContamination(m_ui->chbResetContamination->isChecked()); @@ -110,8 +110,8 @@ void Buildings::BldConfigDialog::slotCmbStatusCurrentIndexChanged(int index) { Q_UNUSED(index) ProjectDataManagement::VulnerabilityState state = - static_cast(m_ui->cmbStatus->currentData().toInt()); - if (state == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + static_cast(m_ui->cmbStatus->currentData().toInt()); + if (state == ProjectDataManagement::VulnerabilityState::CatastrophicKill) { m_ui->chbResetContamination->setEnabled(true); m_ui->chbResetContamination->setChecked(false); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp index 9efd4ad52..e78c6b7e2 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_dialog.cpp @@ -422,7 +422,7 @@ int BldInfoDialog::findFloorIdByRoomId(int roomId) noexcept(false) if (!getRoom(parentSeId, parentSe)) continue; - if (parentSe.structureElementTypeId().underlying() != StructureElementType_def::Floor) + if (parentSe.structureElementTypeId().underlying() != StructureElementType::Floor) continue; m_floorNames.insert(parentSeId, QString::fromStdString(parentSe.displayName())); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp index 5e61c8e72..f6b8e3466 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bld_info_gui_plugin.cpp @@ -178,13 +178,13 @@ void InterfaceImpl::onBuildinSearchStringEntered(const QString &searchString) const InfrastructureManagement::StructureElement &firstElement = elements.front(); - const InfrastructureManagement::StructureElementType_def::type type = firstElement.structureElementTypeId().underlying(); + const InfrastructureManagement::StructureElementType type = static_cast(firstElement.structureElementTypeId()); - if (type == InfrastructureManagement::StructureElementType_def::Building) + if (type == InfrastructureManagement::StructureElementType::Building) { if (!(m_ismDataIfc && m_ismDataIfc->isBuildingsInCurrentExercise(data.id()))) return; - } else if (type != InfrastructureManagement::StructureElementType_def::Bridge) + } else if (type != InfrastructureManagement::StructureElementType::Bridge) return; @@ -208,10 +208,10 @@ void InterfaceImpl::onBuildinSearchStringEntered(const QString &searchString) if (displayName.contains(searchString, Qt::CaseSensitivity::CaseInsensitive)) { switch (type) { - case InfrastructureManagement::StructureElementType_def::Building: + case InfrastructureManagement::StructureElementType::Building: bldIdCont.append(data.id()); break; - case InfrastructureManagement::StructureElementType_def::Bridge: + case InfrastructureManagement::StructureElementType::Bridge: bridgeIdCont.append(data.id()); break; default: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp index 704ab1508..ea5ca43f0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/bridge_info_dialog.cpp @@ -215,7 +215,7 @@ void BridgeInfoDialog::bridgeStatusChanged() case InfrastructureManagement::BridgeStatus::Intact: data.status(InfrastructureManagement::BridgeStatus::Intact); break; - case InfrastructureManagement::BridgeStatus_def::Broken: + case InfrastructureManagement::BridgeStatus::Broken: data.status(InfrastructureManagement::BridgeStatus::Broken); break; default: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp index a1ab26f4a..e0e2e1d62 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_info_dialog.cpp @@ -244,9 +244,9 @@ bool EgcuInfoDialog::readAllowance(InfrastructureManagement::EffectOverride eo, return true; QJsonObject docObj = QJsonObject(doc.object()); - if (eo == InfrastructureManagement::EffectOverride_def::PermanentOn) + if (eo == InfrastructureManagement::EffectOverride::PermanentOn) return docObj.value(QStringLiteral("allowPermanentOn")).toBool(true); - else if (eo == InfrastructureManagement::EffectOverride_def::PermanentOff) + else if (eo == InfrastructureManagement::EffectOverride::PermanentOff) return docObj.value(QStringLiteral("allowPermanentOff")).toBool(true); else return true; @@ -367,10 +367,10 @@ void EgcuInfoDialog::showEgcuInfos(const InfrastructureManagement::StructureElem allRelayIds.removeOne(relayId); int value = objState.value(relayIdString).toInt(); if (m_relayInfoWidgets.contains(relayId)) - m_relayInfoWidgets[relayId]->setEffectOverride(static_cast(value)); + m_relayInfoWidgets[relayId]->setEffectOverride(static_cast(value)); } for (auto relayId : std::as_const(allRelayIds)) - m_relayInfoWidgets[relayId]->setEffectOverride(InfrastructureManagement::EffectOverride_def::Automatic); + m_relayInfoWidgets[relayId]->setEffectOverride(InfrastructureManagement::EffectOverride::Automatic); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.cpp index 29ca9c244..9c38925bd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/egcu_operational.cpp @@ -255,8 +255,8 @@ void EgcuOperationalDialog::onInstrumentationAssetChanged( return; DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged id:" << data.id(); - if (data.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit - && data.assetStateId() == InfrastructureManagement::InstrumentationAssetState_def::Mounted) + if (data.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit + && data.assetStateId() == InfrastructureManagement::InstrumentationAssetState::Mounted) { DEBUG_LOG(m_logger) << "Insert instrumentation asset id=" << data.id(); m_instrumentationAssets.insert(data.id(), data); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.cpp index 87d71d35b..dc3f724d5 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/relay_info.cpp @@ -74,13 +74,13 @@ void RelayInfoWidget::setEffectOverride(InfrastructureManagement::EffectOverride { switch (override.underlying()) { - case InfrastructureManagement::EffectOverride_def::Automatic: + case InfrastructureManagement::EffectOverride::Automatic: m_ui->tbAuto->setChecked(true); break; - case InfrastructureManagement::EffectOverride_def::PermanentOn: + case InfrastructureManagement::EffectOverride::PermanentOn: m_ui->tbOn->setChecked(true); break; - case InfrastructureManagement::EffectOverride_def::PermanentOff: + case InfrastructureManagement::EffectOverride::PermanentOff: m_ui->tbOff->setChecked(true); break; } @@ -90,13 +90,13 @@ void RelayInfoWidget::setEffectOverrideEnabled(InfrastructureManagement::EffectO { switch (override.underlying()) { - case InfrastructureManagement::EffectOverride_def::Automatic: + case InfrastructureManagement::EffectOverride::Automatic: m_ui->tbAuto->setEnabled(enable); break; - case InfrastructureManagement::EffectOverride_def::PermanentOn: + case InfrastructureManagement::EffectOverride::PermanentOn: m_ui->tbOn->setEnabled(enable); break; - case InfrastructureManagement::EffectOverride_def::PermanentOff: + case InfrastructureManagement::EffectOverride::PermanentOff: m_ui->tbOff->setEnabled(enable); break; } @@ -112,11 +112,11 @@ void RelayInfoWidget::onButtonClicked() QAbstractButton* ab = qobject_cast(sender()); if (!ab) return; - InfrastructureManagement::EffectOverride eo = InfrastructureManagement::EffectOverride_def::Automatic; + InfrastructureManagement::EffectOverride eo = InfrastructureManagement::EffectOverride::Automatic; if (ab == m_ui->tbOff) - eo = InfrastructureManagement::EffectOverride_def::PermanentOff; + eo = InfrastructureManagement::EffectOverride::PermanentOff; else if (ab == m_ui->tbOn) - eo = InfrastructureManagement::EffectOverride_def::PermanentOn; + eo = InfrastructureManagement::EffectOverride::PermanentOn; emit effectOverrideChanged(m_id, eo); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp index a0c0ec527..47e2c0998 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_dialog.cpp @@ -223,7 +223,7 @@ void ParticipantsMoveDialog::onSelectionChanged() m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Save, isOne && !isParticipantInUseOrAdler); } - if (m_ppmDtc->type(data.typeId()).typeClass() != ParticipantManagement::TypeClass_def::Unit) + if (m_ppmDtc->type(data.typeId()).typeClass() != ParticipantManagement::TypeClass::Unit) { if (!data.equipmentNumber().is_set() || data.equipmentNumber().get() <= 0) @@ -734,7 +734,7 @@ void ParticipantsMoveDialog::doSetSimulatedPositionRequest( req.participantId(participantData.id()); bAskOutdated = - m_ppmDtc->type(participantData.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit; + m_ppmDtc->type(participantData.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit; } bool bOnlyOutdated = false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.cpp index e1454c2a7..82af0cb8a 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/participants_move_model.cpp @@ -51,7 +51,7 @@ bool ParticipantMoveModel::isSelectableBySimulation(const QModelIndex& index, bo const ParticipantManagement::ParticipantData data(getParticipantData(index)); if ((data.equipmentNumber().is_set() && data.equipmentNumber().get() > 0) || - m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass_def::Unit) + m_dtc->type(data.typeId()).typeClass() == ParticipantManagement::TypeClass::Unit) isSimulatable = false; DEBUG_LOG(m_logger) << "ParticipantId: " << data.id() << " isSimulated:" << data.isSimulated() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.cpp index bc712d442..f9b69f854 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_dialog.cpp @@ -151,7 +151,7 @@ bool MissionPlanDialog::canBeLocked() const const auto wpStatus = wayPointCurrentStatus(missionPlan); const auto uas = m_ppmDtc->getUasByParticipantId(missionPlan.participantId(), m_session->exerciseId()); - if (uas.uasState() == ProjectDataManagement::UasState_def::Manual || wpStatus == WayPointsStatus::Active) + if (uas.uasState() == ProjectDataManagement::UasState::Manual || wpStatus == WayPointsStatus::Active) return true; return false; @@ -168,7 +168,7 @@ bool MissionPlanDialog::canBeUnlocked() const const auto wpStatus = wayPointCurrentStatus(missionPlan); const auto uas = m_ppmDtc->getUasByParticipantId(missionPlan.participantId(), m_session->exerciseId()); - if (uas.uasState() == ProjectDataManagement::UasState_def::Manual || wpStatus != WayPointsStatus::Active) + if (uas.uasState() == ProjectDataManagement::UasState::Manual || wpStatus != WayPointsStatus::Active) return true; return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp index 1f3aa6f3c..0c9a48722 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/mission_plan_edit.cpp @@ -233,7 +233,7 @@ void MissionPlanEdit::onDynamicParticipantDataChanged(const ParticipantManagemen youngestState = si; } - setReady(youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady); + setReady(youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady); } void MissionPlanEdit::onMissionPlanChanged(const ParticipantManagement::MissionPlan& data, @@ -314,7 +314,7 @@ bool MissionPlanEdit::apply() ParticipantManagement::UAS uasP = m_ppmDtc->getUasByParticipantId(m_ui->participantCBox->currentData().toInt(), m_session->exerciseId()); - if (uasP.uasState() == ProjectDataManagement::UasState_def::Manual && + if (uasP.uasState() == ProjectDataManagement::UasState::Manual && uasP.participantId() != m_missionPlan.participantId()) { LtsWidgets::LtsMessageDialog::showMessage(this, tr("Waypoints can't be saved!: Uas switched to %1-Mode") diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp index d7899c868..b0a05f9d5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_create_simulation_dialog.cpp @@ -327,11 +327,11 @@ void CreateSimulationDialog::fillCharges() using namespace ProjectDataManagement; - const QVector gearClasses = { GearClass_def::AirSupport, - GearClass_def::Artillery, - GearClass_def::Mortar }; + const QVector gearClasses = { GearClass::AirSupport, + GearClass::Artillery, + GearClass::Mortar }; - for (GearClass_def::type currentGearClass : gearClasses) + for (GearClass currentGearClass : gearClasses) { const QVector &chargeTypes = m_pdmDtc->chargesForGearClass(currentGearClass); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp index 4d3acaf17..834c34b1e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/cds_plan_creator.cpp @@ -277,19 +277,19 @@ SymbologyXML::SymbolTypes::t_affil PlanCreator::partyRoleToSymbolAffiliation(con { switch (partyRole.underlying()) { - case ParticipantManagement::Role_def::Unknown: + case ParticipantManagement::Role::Unknown: return SymbologyXML::SymbolTypes::UNKNOWN; - case ParticipantManagement::Role_def::Friend: + case ParticipantManagement::Role::Friend: return SymbologyXML::SymbolTypes::FRIEND; - case ParticipantManagement::Role_def::Neutral: + case ParticipantManagement::Role::Neutral: return SymbologyXML::SymbolTypes::NEUTRAL; - case ParticipantManagement::Role_def::Enemy: + case ParticipantManagement::Role::Enemy: return SymbologyXML::SymbolTypes::ENEMY; - case ParticipantManagement::Role_def::Pending: + case ParticipantManagement::Role::Pending: return SymbologyXML::SymbolTypes::PENDING; - case ParticipantManagement::Role_def::AssumedFriend: + case ParticipantManagement::Role::AssumedFriend: return SymbologyXML::SymbolTypes::ASSUMED_FRIEND; - case ParticipantManagement::Role_def::Suspect: + case ParticipantManagement::Role::Suspect: return SymbologyXML::SymbolTypes::SUSPECT; default: return SymbologyXML::SymbolTypes::AFFIL_UNDEFINED; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.cpp index 4f11201a2..a6361aafa 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_edit_dialog.cpp @@ -50,7 +50,7 @@ void SoundAreaEditDialog::onPlaySound(SoundManagement::SoundCategory category, i qWarning() << "onPlaySound" << volume; SoundManagement::PlayControl control = - inLoop ? SoundManagement::PlayControl_def::PlayLoop : SoundManagement::PlayControl_def::PlaySingle; + inLoop ? SoundManagement::PlayControl::PlayLoop : SoundManagement::PlayControl::PlaySingle; for (const auto& egcuId : std::as_const(m_soundArea->egcuIds)) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp index 2123e4cd8..e07cbb149 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/efm_sound_area_helper.cpp @@ -16,7 +16,7 @@ SoundAreaHelper::SoundAreaHelper(SoundAreaHelper* helper) { QMap assets = m_ismDtc->instrumentationAssets(); for (const auto& asset : std::as_const(assets)) - if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit) + if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) m_egcuNames.insert(asset.id(), QString::fromStdString(asset.name())); SoundManagement::Sounds sounds = m_somDtc->sounds(); @@ -30,7 +30,7 @@ SoundAreaHelper::SoundAreaHelper(std::shared_ptr assets = m_ismDtc->instrumentationAssets(); for (const auto& asset : std::as_const(assets)) - if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit) + if (asset.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) m_egcuNames.insert(asset.id(), QString::fromStdString(asset.name())); SoundManagement::Sounds sounds = m_somDtc->sounds(); @@ -41,10 +41,10 @@ SoundAreaHelper::SoundAreaHelper(std::shared_ptr SoundAreaHelper::soundCategories() { QVector categories = QVector{ - SoundManagement::SoundCategory_def::Aircraft, SoundManagement::SoundCategory_def::Battlefield, - SoundManagement::SoundCategory_def::Boat, SoundManagement::SoundCategory_def::Explosion, - SoundManagement::SoundCategory_def::Helicopter, SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic, - SoundManagement::SoundCategory_def::Vehicle, SoundManagement::SoundCategory_def::InsideBuilding}; + SoundManagement::SoundCategory::Aircraft, SoundManagement::SoundCategory::Battlefield, + SoundManagement::SoundCategory::Boat, SoundManagement::SoundCategory::Explosion, + SoundManagement::SoundCategory::Helicopter, SoundManagement::SoundCategory::MotorsAndUrbanTraffic, + SoundManagement::SoundCategory::Vehicle, SoundManagement::SoundCategory::InsideBuilding}; return categories; } @@ -52,23 +52,23 @@ QString SoundAreaHelper::categoryName(SoundManagement::SoundCategory category) { switch (category.underlying()) { - case SoundManagement::SoundCategory_def::Aircraft: + case SoundManagement::SoundCategory::Aircraft: return QStringLiteral("Aircraft"); - case SoundManagement::SoundCategory_def::Battlefield: + case SoundManagement::SoundCategory::Battlefield: return QStringLiteral("Battlefield"); - case SoundManagement::SoundCategory_def::Boat: + case SoundManagement::SoundCategory::Boat: return QStringLiteral("Boat"); - case SoundManagement::SoundCategory_def::Explosion: + case SoundManagement::SoundCategory::Explosion: return QStringLiteral("Explosion"); - case SoundManagement::SoundCategory_def::Helicopter: + case SoundManagement::SoundCategory::Helicopter: return QStringLiteral("Helicopter"); - case SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic: + case SoundManagement::SoundCategory::MotorsAndUrbanTraffic: return QStringLiteral("MotorsAndUrbanTraffic"); - case SoundManagement::SoundCategory_def::Vehicle: + case SoundManagement::SoundCategory::Vehicle: return QStringLiteral("Vehicle"); - case SoundManagement::SoundCategory_def::InsideBuilding: + case SoundManagement::SoundCategory::InsideBuilding: return QStringLiteral("InsideBuilding"); - case SoundManagement::SoundCategory_def::Unknown: + case SoundManagement::SoundCategory::Unknown: return QStringLiteral("Unknown"); default: return QString(); @@ -84,7 +84,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons { switch (category.underlying()) { - case SoundManagement::SoundCategory_def::Aircraft: + case SoundManagement::SoundCategory::Aircraft: switch (id) { case 1: @@ -99,7 +99,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons return QStringLiteral("Error"); } - case SoundManagement::SoundCategory_def::Battlefield: + case SoundManagement::SoundCategory::Battlefield: switch (id) { case 1: @@ -120,14 +120,14 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons return QStringLiteral("Error"); } - case SoundManagement::SoundCategory_def::Boat: + case SoundManagement::SoundCategory::Boat: switch (id) { default: return QStringLiteral("Error"); } - case SoundManagement::SoundCategory_def::Explosion: + case SoundManagement::SoundCategory::Explosion: switch (id) { case 1: @@ -136,7 +136,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons return QStringLiteral("Error"); } - case SoundManagement::SoundCategory_def::Helicopter: + case SoundManagement::SoundCategory::Helicopter: switch (id) { case 1: @@ -153,7 +153,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons return QStringLiteral("Error"); } - case SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic: + case SoundManagement::SoundCategory::MotorsAndUrbanTraffic: switch (id) { case 1: @@ -182,7 +182,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons return QStringLiteral("Error"); } - case SoundManagement::SoundCategory_def::Vehicle: + case SoundManagement::SoundCategory::Vehicle: switch (id) { case 1: @@ -191,7 +191,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons return QStringLiteral("Error"); } - case SoundManagement::SoundCategory_def::InsideBuilding: + case SoundManagement::SoundCategory::InsideBuilding: switch (id) { case 1: @@ -212,7 +212,7 @@ QString SoundAreaHelper::soundName(SoundManagement::SoundCategory category, cons return QStringLiteral("Error"); } - case SoundManagement::SoundCategory_def::Unknown: + case SoundManagement::SoundCategory::Unknown: switch (id) { default: @@ -249,23 +249,23 @@ QColor SoundAreaHelper::soundCategoryTextColor(const int32_t& category) { switch (category) { - case SoundManagement::SoundCategory_def::Aircraft: + case SoundManagement::SoundCategory::Aircraft: return {Qt::white}; - case SoundManagement::SoundCategory_def::Battlefield: + case SoundManagement::SoundCategory::Battlefield: return {Qt::white}; - case SoundManagement::SoundCategory_def::Boat: + case SoundManagement::SoundCategory::Boat: return {Qt::black}; - case SoundManagement::SoundCategory_def::Explosion: + case SoundManagement::SoundCategory::Explosion: return {Qt::white}; - case SoundManagement::SoundCategory_def::Helicopter: + case SoundManagement::SoundCategory::Helicopter: return {Qt::white}; - case SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic: + case SoundManagement::SoundCategory::MotorsAndUrbanTraffic: return {Qt::white}; - case SoundManagement::SoundCategory_def::Vehicle: + case SoundManagement::SoundCategory::Vehicle: return {Qt::black}; - case SoundManagement::SoundCategory_def::InsideBuilding: + case SoundManagement::SoundCategory::InsideBuilding: return {Qt::black}; - case SoundManagement::SoundCategory_def::Unknown: + case SoundManagement::SoundCategory::Unknown: return {Qt::white}; default: return {Qt::black}; @@ -276,23 +276,23 @@ QColor SoundAreaHelper::soundCategoryBackgroundColor(const int32_t& category) { switch (category) { - case SoundManagement::SoundCategory_def::Aircraft: + case SoundManagement::SoundCategory::Aircraft: return QColor::fromRgb(25, 25, 112); - case SoundManagement::SoundCategory_def::Battlefield: + case SoundManagement::SoundCategory::Battlefield: return QColor::fromRgb(160, 82, 45); - case SoundManagement::SoundCategory_def::Boat: + case SoundManagement::SoundCategory::Boat: return QColor::fromRgb(127, 255, 212); - case SoundManagement::SoundCategory_def::Explosion: + case SoundManagement::SoundCategory::Explosion: return QColor::fromRgb(255, 0, 0); - case SoundManagement::SoundCategory_def::Helicopter: + case SoundManagement::SoundCategory::Helicopter: return QColor::fromRgb(153, 50, 204); - case SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic: + case SoundManagement::SoundCategory::MotorsAndUrbanTraffic: return QColor::fromRgb(85, 107, 47); - case SoundManagement::SoundCategory_def::Vehicle: + case SoundManagement::SoundCategory::Vehicle: return QColor::fromRgb(255, 255, 0); - case SoundManagement::SoundCategory_def::InsideBuilding: + case SoundManagement::SoundCategory::InsideBuilding: return QColor::fromRgb(255, 160, 122); - case SoundManagement::SoundCategory_def::Unknown: + case SoundManagement::SoundCategory::Unknown: return QColor::fromRgb(119, 136, 153); default: return {Qt::white}; @@ -304,24 +304,24 @@ SoundManagement::SoundCategory SoundAreaHelper::soundCategory(const int& i) switch (i) { case 1: - return SoundManagement::SoundCategory_def::Aircraft; + return SoundManagement::SoundCategory::Aircraft; case 2: - return SoundManagement::SoundCategory_def::Battlefield; + return SoundManagement::SoundCategory::Battlefield; case 3: - return SoundManagement::SoundCategory_def::Boat; + return SoundManagement::SoundCategory::Boat; case 4: - return SoundManagement::SoundCategory_def::Explosion; + return SoundManagement::SoundCategory::Explosion; case 5: - return SoundManagement::SoundCategory_def::Helicopter; + return SoundManagement::SoundCategory::Helicopter; case 6: - return SoundManagement::SoundCategory_def::MotorsAndUrbanTraffic; + return SoundManagement::SoundCategory::MotorsAndUrbanTraffic; case 7: - return SoundManagement::SoundCategory_def::Vehicle; + return SoundManagement::SoundCategory::Vehicle; case 8: - return SoundManagement::SoundCategory_def::InsideBuilding; + return SoundManagement::SoundCategory::InsideBuilding; case 9: default: - return SoundManagement::SoundCategory_def::Unknown; + return SoundManagement::SoundCategory::Unknown; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp index ab4289d53..fe867c368 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_effect_show_gui_plugin.cpp @@ -221,15 +221,15 @@ void InterfaceImpl::onOperatingConditionEntityChanged(const OperatingConditionEn if (m_vehicleType == EffectShowManagement::Feature_e::Smoke) { - if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; - if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; - if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; - if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; - if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; if (currentSmokeLoad != m_oldSmokeCount) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp index feeeff41f..9b7ceec78 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_explosion.cpp @@ -313,13 +313,13 @@ bool FiringExplosion::statusChangedForOrderedEffectShow(EffectShowStatus_e statu switch (status) { case EffectShowStatus_e::Fire: - oc = EffectShowManagement::OrderConfirmation_e_def::Execution; + oc = EffectShowManagement::OrderConfirmation_e::Execution; break; case EffectShowStatus_e::CarriedOut: - oc = EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut; + oc = EffectShowManagement::OrderConfirmation_e::OrderCarriedOut; break; case EffectShowStatus_e::Interrupt: - oc = EffectShowManagement::OrderConfirmation_e_def::InterruptExecution; + oc = EffectShowManagement::OrderConfirmation_e::InterruptExecution; break; default: DEBUG_LOG(m_logger) << "FiringExplosion::statusChangedForOrderedEffectShow switch is defaulting, " diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp index 122fe5bdb..046bdca62 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_firing_smoke.cpp @@ -129,32 +129,32 @@ void FiringSmoke::onOperatingConditionEntityChanged(const OperatingConditionEnti Q_UNUSED(modType) QVector onColor = { - data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0), - data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0), - data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0), - data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0), - data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0)}; QVector status = { - ((data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)), - ((data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)), - ((data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)), - ((data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)), - ((data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking))}; + ((data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)), + ((data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)), + ((data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)), + ((data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)), + ((data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking))}; m_smokeState->setSmokeState(status, onColor); m_safetyConfirmationWidget->onOperatingConditionEntityChanged(data); @@ -264,10 +264,10 @@ bool FiringSmoke::statusChangedForOrderedEffectShow(EffectShowStatus_e status) switch (status) { case EffectShowStatus_e::Abort: - oc = EffectShowManagement::OrderConfirmation_e_def::Abort; + oc = EffectShowManagement::OrderConfirmation_e::Abort; break; case EffectShowStatus_e::CarriedOut: - oc = EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut; + oc = EffectShowManagement::OrderConfirmation_e::OrderCarriedOut; break; default: DEBUG_LOG(m_logger) << "FiringSmoke::statusChangedForOrderedEffectShow switch is defaulting, should " diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp index 5a991636b..8f0127824 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_operating_condition.cpp @@ -103,15 +103,15 @@ int OperatingCondition::getSmokeCount() { const OperatingConditionEntity& data = m_dtc->operatingConditionEntity(); int currentSmokeLoad = 0; - if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; - if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; - if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; - if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; - if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) + if (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) currentSmokeLoad++; return currentSmokeLoad; @@ -126,19 +126,19 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien m_lastState = data; if (data.vehicleFeature() == - EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Explosion24)) + EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion24)) { m_ui->ledAftLh->hide(); m_ui->ledAftRh->hide(); } else if (data.vehicleFeature() == - EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Explosion48)) + EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion48)) { m_ui->ledAftLh->show(); m_ui->ledAftRh->show(); } bool isExp = data.vehicleFeature() != - EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Smoke); + EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke); m_ui->frame->setHidden(!isExp); m_ui->lblMagazine->setHidden(!isExp); m_ui->lblMag->setHidden(!isExp); @@ -154,14 +154,14 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien setBatteryVoltage(data.batteryVoltage()); if (data.vehicleFeature() != - EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Smoke)) + EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke)) { if (data.vehicleFeature() == - EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::NotSpecified)) + EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::NotSpecified)) return; int max = data.vehicleFeature() == - EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Explosion24) + EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Explosion24) ? 24 : 48; m_ui->sbMagazine->setMaximum(max); @@ -178,32 +178,32 @@ void OperatingCondition::onOperatingConditionEntityChanged(const EffectShowClien m_ui->sbMagazine->setMaximum(5); m_ui->sbAvailable->setMaximum(12); QVector onColor = { - data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge1().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0), - data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge2().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0), - data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge3().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0), - data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge4().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0), - data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e_def::Ready + data.smokeCartridge5().underlying() <= EffectShowClient::StatusSmokeCartridge_e::Ready ? QColor(0, 255, 0) : QColor(255, 255, 0)}; QVector status = { - ((data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)), - ((data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)), - ((data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)), - ((data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking)), - ((data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Ready) || - (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e_def::Smoking))}; + ((data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge1().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)), + ((data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge2().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)), + ((data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge3().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)), + ((data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge4().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking)), + ((data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Ready) || + (data.smokeCartridge5().underlying() == EffectShowClient::StatusSmokeCartridge_e::Smoking))}; m_smokeState->setSmokeState(status, onColor); } @@ -304,7 +304,7 @@ bool OperatingCondition::onSendAmmunition() EffectShowClient::SendAmmunitionRequest request; const OperatingConditionEntity& condition = m_dtc->operatingConditionEntity(); if (condition.vehicleFeature() == - EffectShowManagement::Feature_e::inner_enum(EffectShowManagement::Feature_e_def::Smoke)) + EffectShowManagement::Feature_e(EffectShowManagement::Feature_e::Smoke)) request.ammunitionMagazine(getSmokeCount()); else request.ammunitionMagazine(m_ui->sbMagazine->value()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp index ec3bbe161..04374e096 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.cpp @@ -82,7 +82,7 @@ bool OrderEdit::apply() OrderModifyRequest orderModifyRequest; int key = m_orderList.key(m_ui->cbOrderConfirmation->currentText()); - EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e::inner_enum(key); + EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e(key); orderModifyRequest.orderConfirmation(oc); orderModifyRequest.answerText(m_ui->cbxAnswer->currentText().toStdString()); @@ -107,8 +107,8 @@ bool OrderEdit::checkForAnswerUiRequirement() const return true; int key = m_orderList.key(m_ui->cbOrderConfirmation->currentText()); - return !(((key == EffectShowManagement::OrderConfirmation_e_def::Nonacceptance) || - (key == EffectShowManagement::OrderConfirmation_e_def::Abort)) && + return !(((key == EffectShowManagement::OrderConfirmation_e::Nonacceptance) || + (key == EffectShowManagement::OrderConfirmation_e::Abort)) && m_ui->cbxAnswer->currentText().isEmpty()); } @@ -118,62 +118,62 @@ void OrderEdit::showOrder() switch (m_order.orderConfirmation().underlying()) { - case EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance: - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::OrderAcceptance] - << m_orderList[EffectShowManagement::OrderConfirmation_e_def::DriveOff] - << m_orderList[EffectShowManagement::OrderConfirmation_e_def::PositionReached]; + case EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance: + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::OrderAcceptance] + << m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff] + << m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached]; if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable) - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::FiringReadiness]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness]; - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Nonacceptance]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Nonacceptance]; break; - case EffectShowManagement::OrderConfirmation_e_def::OrderAcceptance: - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::DriveOff] - << m_orderList[EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation] - << m_orderList[EffectShowManagement::OrderConfirmation_e_def::PositionReached]; + case EffectShowManagement::OrderConfirmation_e::OrderAcceptance: + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff] + << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation] + << m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached]; if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable) - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::FiringReadiness]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness]; - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort]; break; - case EffectShowManagement::OrderConfirmation_e_def::DriveOff: - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation] - << m_orderList[EffectShowManagement::OrderConfirmation_e_def::PositionReached]; + case EffectShowManagement::OrderConfirmation_e::DriveOff: + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation] + << m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached]; if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable) - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::FiringReadiness]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness]; - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort]; break; - case EffectShowManagement::OrderConfirmation_e_def::PositionReached: - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation]; + case EffectShowManagement::OrderConfirmation_e::PositionReached: + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::InterruptRelocation]; if (m_fireReadinessAvailable) - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::FiringReadiness]; - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort]; break; - case EffectShowManagement::OrderConfirmation_e_def::FiringReadiness: + case EffectShowManagement::OrderConfirmation_e::FiringReadiness: - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort]; break; - case EffectShowManagement::OrderConfirmation_e_def::Execution: - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort]; + case EffectShowManagement::OrderConfirmation_e::Execution: + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort]; break; - case EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation: - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::DriveOff] - << m_orderList[EffectShowManagement::OrderConfirmation_e_def::PositionReached]; + case EffectShowManagement::OrderConfirmation_e::InterruptRelocation: + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::DriveOff] + << m_orderList[EffectShowManagement::OrderConfirmation_e::PositionReached]; if (m_order.typeOfOrder() != 0 && m_fireReadinessAvailable) - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::FiringReadiness]; - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::FiringReadiness]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort]; break; - case EffectShowManagement::OrderConfirmation_e_def::InterruptExecution: + case EffectShowManagement::OrderConfirmation_e::InterruptExecution: - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut] - << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::OrderCarriedOut] + << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort]; break; default: - orderList << m_orderList[EffectShowManagement::OrderConfirmation_e_def::Abort]; + orderList << m_orderList[EffectShowManagement::OrderConfirmation_e::Abort]; break; } m_ui->cbOrderConfirmation->addItems(orderList); @@ -182,27 +182,27 @@ void OrderEdit::showOrder() void OrderEdit::createOrderList() { - EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance; + EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::OrderAcceptance; + oc = EffectShowManagement::OrderConfirmation_e::OrderAcceptance; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::DriveOff; + oc = EffectShowManagement::OrderConfirmation_e::DriveOff; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::PositionReached; + oc = EffectShowManagement::OrderConfirmation_e::PositionReached; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::FiringReadiness; + oc = EffectShowManagement::OrderConfirmation_e::FiringReadiness; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::Execution; + oc = EffectShowManagement::OrderConfirmation_e::Execution; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::InterruptExecution; + oc = EffectShowManagement::OrderConfirmation_e::InterruptExecution; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut; + oc = EffectShowManagement::OrderConfirmation_e::OrderCarriedOut; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::Abort; + oc = EffectShowManagement::OrderConfirmation_e::Abort; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::Nonacceptance; + oc = EffectShowManagement::OrderConfirmation_e::Nonacceptance; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); - oc = EffectShowManagement::OrderConfirmation_e_def::InterruptRelocation; + oc = EffectShowManagement::OrderConfirmation_e::InterruptRelocation; m_orderList[oc.underlying()] = EffectShowManagement::toString(oc); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h index 329b9e3d6..ead848486 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_edit.h @@ -27,7 +27,7 @@ class OrderEdit : public LtsWidgets::LtsDialog, protected EffectShowClient::Inte bool init(const std::shared_ptr& ftc, EffectShowManagement::OrderConfirmation_e order = - EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance); + EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance); bool apply() override; private: @@ -48,7 +48,7 @@ class OrderEdit : public LtsWidgets::LtsDialog, protected EffectShowClient::Inte LtsUtils::RequestHelper* m_requestHelper; Order m_order; bool m_fireReadinessAvailable; - EffectShowManagement::OrderConfirmation_e_def m_forcedState; + EffectShowManagement::OrderConfirmation m_forcedState; QHash m_orderList; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp index 296e7d42a..44293a742 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_order_list.cpp @@ -135,8 +135,8 @@ void OrderList::onSelectionChanged() const QModelIndex idx = m_ui->widget->currentIndex(); int row = idx.row(); const EffectShowClient::Order order = m_model->getRowData(row); - bool isReady = order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::FiringReadiness || - order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::Execution; + bool isReady = order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::FiringReadiness || + order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::Execution; m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, isReady); @@ -155,15 +155,15 @@ void OrderList::onEditOrder() const EffectShowClient::Order order = m_model->getRowData(row); DEBUG_LOG(m_logger) << "--- onEditOrder() "; - if (order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut) + if (order.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::OrderCarriedOut) return; bool fireReadinessEnable = true; const auto orders = m_dtc->orders(); for (const auto& ord : orders) { - if (ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::FiringReadiness || - ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::InterruptExecution || - ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e_def::Execution) + if (ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::FiringReadiness || + ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::InterruptExecution || + ord.orderConfirmation() == EffectShowManagement::OrderConfirmation_e::Execution) { fireReadinessEnable = false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp index 97fae7e67..0a30bb238 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/esc_safety_confirmation_widget.cpp @@ -106,16 +106,16 @@ void SafetyConfirmationWidget::onSafetyConfirmationDisplay() { switch (m_currentState.underlying()) { - case EffectShowClient::SafetyConfirmation_e_def::SafetyConfirmed: + case EffectShowClient::SafetyConfirmation_e::SafetyConfirmed: m_ui->ltsLedWidget->setColor(QColor(0, 255, 0)); m_ui->ltsLedWidget->setStatus(true); break; - case EffectShowClient::SafetyConfirmation_e_def::SafetyExpiring: + case EffectShowClient::SafetyConfirmation_e::SafetyExpiring: m_ui->ltsLedWidget->setColor(QColor(0, 255, 0)); m_ui->ltsLedWidget->setStatus(!m_ui->ltsLedWidget->status()); QTimer::singleShot(800, this, &SafetyConfirmationWidget::onSafetyConfirmationDisplay); break; - case EffectShowClient::SafetyConfirmation_e_def::SafetyNotConfirmed: + case EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed: m_ui->ltsLedWidget->setColor(QColor(255, 0, 0)); m_ui->ltsLedWidget->setStatus(true); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp index ee9d663a5..fd78c8576 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/EsmComboBox/esm_combobox_foreign_gui_interface_impl.cpp @@ -76,7 +76,7 @@ QString ForeignGuiComboboxInterfaceImpl::getAssignedAesField (const int particip for (const auto &explosionCluster : m_aesDtc->explosionClusters()) { - if (explosionCluster.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired) + if (explosionCluster.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired) continue; for ( const auto &esmParticipant : explosionCluster.esmParticipantIds()) { @@ -114,7 +114,7 @@ void ForeignGuiComboboxInterfaceImpl::initEffectShowActors() ParticipantManagement::Participant participant = m_ppmDtc->participant(it.value()); EffectShowManagement::EffectShowVehicleStatus effectShowVehicleStatus = effectShowVehicleStatuss.value(it.value()); int equipmentNumber = m_ppmDtc->equipmentNumberByParticipantId(effectShowVehicleStatus.esmParticipantId()); - bool isSmokeVehicle = effectShowVehicleStatus.feature() == Feature_e_def::Smoke; + bool isSmokeVehicle = effectShowVehicleStatus.feature() == Feature_e::Smoke; @@ -157,10 +157,10 @@ bool ForeignGuiComboboxInterfaceImpl::isMatchedByFilter(const EffectShowVehicleS enum eFeature { - NotSpecified = Feature_e_def::NotSpecified, - Smoke = Feature_e_def::Smoke, - Explosion24 = Feature_e_def::Explosion24, - Explosion48 = Feature_e_def::Explosion48, + NotSpecified = Feature_e::NotSpecified, + Smoke = Feature_e::Smoke, + Explosion24 = Feature_e::Explosion24, + Explosion48 = Feature_e::Explosion48, SmokeAndExplosion48 = Explosion48 + 1 }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp index 1091bf9b3..f2af23fdd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.cpp @@ -224,13 +224,13 @@ QVariant EffectShowActorModel::data(const QModelIndex &index, int role) const return QVariant(); switch (vehicleStatus.feature().underlying()) { - case EffectShowManagement::Feature_e_def::Smoke: + case EffectShowManagement::Feature_e::Smoke: return tr("Smoke"); - case EffectShowManagement::Feature_e_def::Explosion24: + case EffectShowManagement::Feature_e::Explosion24: return tr("Explosion (24)"); - case EffectShowManagement::Feature_e_def::Explosion48: + case EffectShowManagement::Feature_e::Explosion48: return tr("Explosion (48)"); - case EffectShowManagement::Feature_e_def::NotSpecified: + case EffectShowManagement::Feature_e::NotSpecified: return tr("Not specified"); } return tr("Unknown (%1)").arg(vehicleStatus.feature().underlying()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.h index 66659efeb..7c404c895 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_actor_model.h @@ -36,10 +36,10 @@ class EffectShowActorModel final : public LtsWidgets::LtsAbstractTableModelgetRowData(source_row); - if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut && - effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::PositionReached && - effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::Abort && - effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::Nonacceptance) + if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::OrderCarriedOut && + effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::PositionReached && + effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::Abort && + effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::Nonacceptance) return true; return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp index 1c0c1072b..b78727f41 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/esm_effect_show_model.cpp @@ -149,9 +149,9 @@ QMap EffectShowModel::getParticipantList(bool is_smoke) const continue; EffectShowManagement::Feature_e feature = m_effectShowActorModel->getFeature(realRow); - if (feature != EffectShowManagement::Feature_e_def::NotSpecified && - ((feature == EffectShowManagement::Feature_e_def::Smoke && is_smoke) || - (feature != EffectShowManagement::Feature_e_def::Smoke && !is_smoke))) + if (feature != EffectShowManagement::Feature_e::NotSpecified && + ((feature == EffectShowManagement::Feature_e::Smoke && is_smoke) || + (feature != EffectShowManagement::Feature_e::Smoke && !is_smoke))) ret.insert(part.id(), getParticipantName(part.id())); } return ret; @@ -479,7 +479,7 @@ bool EffectShowProxyModel::checkFilter(int source_row) const const auto effectShowSource = m_sourceModel->getRowData(source_row); - if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut) + if (effectShowSource.orderConfirmation() != EffectShowManagement::OrderConfirmation_e::OrderCarriedOut) return true; return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp index e9e5f0193..72fa86a5d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_edit_dialog.cpp @@ -727,9 +727,9 @@ bool ExerciseManagementEditDialog::apply() if (m_exerciseId > 0) { - ExerciseState state = static_cast(m_ui->cbState->currentData().toInt()); + ExerciseState state = static_cast(m_ui->cbState->currentData().toInt()); ExerciseManagement::Exercise data = m_dtc->exercise(m_exerciseId); - if (state == ExerciseState_def::Stopped && data.state() != ExerciseState_def::Stopped) + if (state == ExerciseState::Stopped && data.state() != ExerciseState::Stopped) { if (LtsWidgets::LtsMessageDialog::showMessage( this, QString(), tr("Are you sure you want to stop the exercise?"), LtsWidgets::Behaviour::Modal, @@ -737,7 +737,7 @@ bool ExerciseManagementEditDialog::apply() retVal = false; } - else if (state == ExerciseState_def::Terminated && data.state() != ExerciseState_def::Terminated) + else if (state == ExerciseState::Terminated && data.state() != ExerciseState::Terminated) { if (LtsWidgets::LtsMessageDialog::showMessage( this, QString(), tr("Are you sure you want to terminate the exercise?"), @@ -771,7 +771,7 @@ bool ExerciseManagementEditDialog::apply() request.forces(m_ui->pteForces->toPlainText().toStdString()); request.description(m_ui->pteDescription->toPlainText().toStdString()); request.hasHlaInterface(m_ui->cbStartHlaInterface->isChecked()); - request.newState(static_cast(m_ui->cbState->currentData().toInt())); + request.newState(static_cast(m_ui->cbState->currentData().toInt())); request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()); request.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_state_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_state_edit.cpp index 6229b8b11..3df9fc9cb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_state_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/exm_state_edit.cpp @@ -145,8 +145,8 @@ void ExerciseManagementStateEdit::retranslate() bool ExerciseManagementStateEdit::apply() { - ExerciseState exState = static_cast(m_ui->cbState->currentData().toInt()); - if (exState.underlying() == ExerciseState_def::Stopped && + ExerciseState exState = static_cast(m_ui->cbState->currentData().toInt()); + if (exState.underlying() == ExerciseState::Stopped && LtsWidgets::LtsMessageDialog::showMessage(this, tr("Are you sure you want to stop the exercise?"), tr("Stop Exercise"), @@ -177,7 +177,7 @@ bool ExerciseManagementStateEdit::apply() request.defaultTimeZone(m_exercise.defaultTimeZone()); request.forces(m_exercise.forces()); request.description(m_exercise.description()); - request.newState(static_cast(m_ui->cbState->currentData().toInt())); + request.newState(static_cast(m_ui->cbState->currentData().toInt())); if(!m_requestHelper->startSingleRequest( [this, request]() { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp index eed5ceb66..306c1c58c 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/HQReports/flm_hq_report_edit.cpp @@ -99,7 +99,7 @@ bool HQReportEdit::init(LtsSession::LtsSession *session, int partyId) FlmHQReportModel *planModel = new FlmHQReportModel(m_ui->listViewPlan); - if (!planModel->init(m_session, partyFolderId, FileType::inner_enum::TacticalPlan)) + if (!planModel->init(m_session, partyFolderId, FileType::TacticalPlan)) { WARNING_LOG(m_logger) << "Could not init planModel for partyId " << partyId; @@ -113,7 +113,7 @@ bool HQReportEdit::init(LtsSession::LtsSession *session, int partyId) FlmHQReportModel *hqReportModel = new FlmHQReportModel(m_ui->listViewMessage); - if (!hqReportModel->init(m_session, hqReportFolderId, FileType::inner_enum::AdlerJson)) + if (!hqReportModel->init(m_session, hqReportFolderId, FileType::AdlerJson)) { WARNING_LOG(m_logger) << "Could not init hqReportModel for partyId " << partyId; @@ -176,7 +176,7 @@ void HQReportEdit::createModels(const int partyId) delete m_hqModels.take(partyId); auto *planModel = new FlmHQReportModel(m_ui->listViewPlan); - if (!planModel->init(m_session, partyFolderId, FileType::inner_enum::TacticalPlan)) + if (!planModel->init(m_session, partyFolderId, FileType::TacticalPlan)) { WARNING_LOG(m_logger) << "Could not init planModel for partyId " << partyId; delete planModel; @@ -184,7 +184,7 @@ void HQReportEdit::createModels(const int partyId) } auto *hqReportModel = new FlmHQReportModel(m_ui->listViewMessage); - if (!hqReportModel->init(m_session, hqReportFolderId, FileType::inner_enum::AdlerJson)) + if (!hqReportModel->init(m_session, hqReportFolderId, FileType::AdlerJson)) { WARNING_LOG(m_logger) << "Could not init hqReportModel for partyId " << partyId; delete planModel; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp index f7cc2c0da..0cdf65349 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/TopicEditor/topic_editor.cpp @@ -169,38 +169,38 @@ void FileTopicEditor::updateInternalData() switch (m_topicData.topicType) { case TopicEditorBase::TopicType::Image: - m_fileTypes << FileManagement::FileType_def::Jpg << FileManagement::FileType_def::Png; + m_fileTypes << FileManagement::FileType::Jpg << FileManagement::FileType::Png; break; case TopicEditorBase::TopicType::Pdf: - m_fileTypes << FileManagement::FileType_def::Pdf; + m_fileTypes << FileManagement::FileType::Pdf; break; case TopicEditorBase::TopicType::Text: - m_fileTypes << FileManagement::FileType_def::Text << FileManagement::FileType_def::EvaluationSchema; + m_fileTypes << FileManagement::FileType::Text << FileManagement::FileType::EvaluationSchema; break; case TopicEditorBase::TopicType::Xml: - m_fileTypes << FileManagement::FileType_def::Xml; + m_fileTypes << FileManagement::FileType::Xml; break; case TopicEditorBase::TopicType::TacticalPlan: - m_fileTypes << FileManagement::FileType_def::TacticalPlan; + m_fileTypes << FileManagement::FileType::TacticalPlan; break; case TopicEditorBase::TopicType::MSOffice: - m_fileTypes << FileManagement::FileType_def::MSOfficeDocument - << FileManagement::FileType_def::MSOfficeDocument97 - << FileManagement::FileType_def::MSOfficePresentation - << FileManagement::FileType_def::MSOfficePresentation97 - << FileManagement::FileType_def::MSOfficeSpreadsheet - << FileManagement::FileType_def::MSOfficeSpreadsheet97; + m_fileTypes << FileManagement::FileType::MSOfficeDocument + << FileManagement::FileType::MSOfficeDocument97 + << FileManagement::FileType::MSOfficePresentation + << FileManagement::FileType::MSOfficePresentation97 + << FileManagement::FileType::MSOfficeSpreadsheet + << FileManagement::FileType::MSOfficeSpreadsheet97; break; case TopicEditorBase::TopicType::OpenOffice: - m_fileTypes << FileManagement::FileType_def::OpenOfficeDocument - << FileManagement::FileType_def::OpenOfficePresentation - << FileManagement::FileType_def::OpenOfficeSpreadsheet; + m_fileTypes << FileManagement::FileType::OpenOfficeDocument + << FileManagement::FileType::OpenOfficePresentation + << FileManagement::FileType::OpenOfficeSpreadsheet; break; default: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp index 753e5d137..ca81a5eaa 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_dialog.cpp @@ -1290,7 +1290,7 @@ FileManagement::FileType FileManagementDialogWidget::getFileType(const QString& if (fti.extension() == ext) { - type = static_cast(fti.id()); + type = static_cast(fti.id()); return true; } return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp index 3b06b1f21..556dfa9b1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_edit_file_content.cpp @@ -189,9 +189,9 @@ void FileContentEditDialog::setMetaData() DEBUG_LOG(m_logger) << "setMetaData"; m_editData.name(m_ui->leName->text().toStdString()); - m_editData.fileType(static_cast(m_ui->cbFileType->currentData().toInt())); - m_editData.fileCategory(static_cast(m_ui->cbFileCategory->currentData().toInt())); - m_editData.fileStatus(static_cast(m_ui->cbFileStatus->currentData().toInt())); + m_editData.fileType(static_cast(m_ui->cbFileType->currentData().toInt())); + m_editData.fileCategory(static_cast(m_ui->cbFileCategory->currentData().toInt())); + m_editData.fileStatus(static_cast(m_ui->cbFileStatus->currentData().toInt())); m_editData.isTemplate(m_ui->checkTemplate->isChecked()); m_editData.isHidden(m_ui->checkHidden->isChecked()); m_editData.isUsedBy(m_ui->checkUsed->isChecked()); @@ -320,7 +320,7 @@ void FileContentEditDialog::onComboFileTypeChanged(int crt) { DEBUG_LOG(m_logger) << "onComboFileTypeChanged crt = " << crt; m_ui->cbFileType->setCurrentIndex(crt); - m_editData.fileType(static_cast(m_ui->cbFileType->currentData().toInt())); + m_editData.fileType(static_cast(m_ui->cbFileType->currentData().toInt())); } @@ -328,7 +328,7 @@ void FileContentEditDialog::onComboFileStatusChanged(int crt) { DEBUG_LOG(m_logger) << "onComboFileStatusChanged crt = " << crt; m_ui->cbFileStatus->setCurrentIndex(crt); - m_editData.fileStatus(static_cast(m_ui->cbFileStatus->currentData().toInt())); + m_editData.fileStatus(static_cast(m_ui->cbFileStatus->currentData().toInt())); } @@ -336,7 +336,7 @@ void FileContentEditDialog::onComboFileCategoryChanged(int crt) { DEBUG_LOG(m_logger) << "onComboFileCategoryChanged crt = " << crt; m_ui->cbFileCategory->setCurrentIndex(crt); - m_editData.fileCategory(static_cast(m_ui->cbFileCategory->currentData().toInt())); + m_editData.fileCategory(static_cast(m_ui->cbFileCategory->currentData().toInt())); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp index 6bcc0fd72..4a060edc2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_explorer_gui_plugin.cpp @@ -783,7 +783,7 @@ bool InterfaceImpl::TopicReplayInterface::playbackInit(const QJsonObject &attrib if (fileId > 0) fc = m_dtc->fileContent(fileId); else - fc.fileType(FileManagement::FileType_def::Text); + fc.fileType(FileManagement::FileType::Text); if (!m_previewWidget) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp index 34c051d43..88a95625f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/flm_preview_playback.cpp @@ -87,14 +87,14 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo, switch (data.fileType().underlying()) { - case FileManagement::FileType_def::Png: - case FileManagement::FileType_def::Jpg: + case FileManagement::FileType::Png: + case FileManagement::FileType::Jpg: { m_ui->lblPixmap->setPixmap(LtsUtils::getPixmap(m_content)); m_ui->lblPixmap->setVisible(true); break; } - case FileManagement::FileType_def::Text: + case FileManagement::FileType::Text: { if (!m_userText.isEmpty() && m_data.id() == 0) { @@ -105,16 +105,16 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo, } break; } - case FileManagement::FileType_def::Xml: - case FileManagement::FileType_def::TacticalPlan: - case FileManagement::FileType_def::OperatorFavourite: - case FileManagement::FileType_def::EvaluationSchema: + case FileManagement::FileType::Xml: + case FileManagement::FileType::TacticalPlan: + case FileManagement::FileType::OperatorFavourite: + case FileManagement::FileType::EvaluationSchema: { m_ui->teText->setHtml(QString::fromUtf8(LtsUtils::toQByteArray(m_content))); m_ui->teText->setVisible(true); break; } - case FileManagement::FileType_def::Pdf: + case FileManagement::FileType::Pdf: { m_pdfWidget->setVisible(true); m_pdfWidget->setZoomFactor(m_zoomFactor); @@ -123,22 +123,22 @@ bool FileContentPreviewPlaybackWidget::init(const FileContent &data, int pageNo, m_pdfWidget->showPDF(LtsUtils::toQByteArray(m_content)); break; } - case FileManagement::FileType_def::OperatorDefinedSymbol: - case FileManagement::FileType_def::MSOfficeDocument: - case FileManagement::FileType_def::MSOfficeDocument97: - case FileManagement::FileType_def::MSOfficePresentation: - case FileManagement::FileType_def::MSOfficePresentation97: - case FileManagement::FileType_def::MSOfficeSpreadsheet: - case FileManagement::FileType_def::MSOfficeSpreadsheet97: - case FileManagement::FileType_def::OpenOfficeDocument: - case FileManagement::FileType_def::OpenOfficePresentation: - case FileManagement::FileType_def::OpenOfficeSpreadsheet: + case FileManagement::FileType::OperatorDefinedSymbol: + case FileManagement::FileType::MSOfficeDocument: + case FileManagement::FileType::MSOfficeDocument97: + case FileManagement::FileType::MSOfficePresentation: + case FileManagement::FileType::MSOfficePresentation97: + case FileManagement::FileType::MSOfficeSpreadsheet: + case FileManagement::FileType::MSOfficeSpreadsheet97: + case FileManagement::FileType::OpenOfficeDocument: + case FileManagement::FileType::OpenOfficePresentation: + case FileManagement::FileType::OpenOfficeSpreadsheet: { new LtsWidgets::LtsMessageDialogNew(this, tr("Not yet implemented")); close(); break; } - case FileManagement::FileType_def::Unknown: + case FileManagement::FileType::Unknown: default: { if (!m_userText.isEmpty() && m_data.id() == 0) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp index 10a7264f1..0d685fc71 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/aes_display_filter_impl.cpp @@ -220,19 +220,19 @@ bool AesDisplayFilterImpl::isVisible(AreaEffectSimulation::AesType aesType, DEBUG_LOG(m_logger) << "filtering for state ... "; switch (aesState) { - case AreaEffectSimulation::AesEffectState_def::EsCreated: - case AreaEffectSimulation::AesEffectState_def::EsReceived: + case AreaEffectSimulation::AesEffectState::EsCreated: + case AreaEffectSimulation::AesEffectState::EsReceived: DEBUG_LOG(m_logger) << "... created/received visible: " << ess.displayCreated; return ess.displayCreated; - case AreaEffectSimulation::AesEffectState_def::EsPrepared: - case AreaEffectSimulation::AesEffectState_def::EsFired: + case AreaEffectSimulation::AesEffectState::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsFired: DEBUG_LOG(m_logger) << "... prepared/fired visible: " << ess.displayPrepared; return ess.displayPrepared; - case AreaEffectSimulation::AesEffectState_def::EsActivated: - case AreaEffectSimulation::AesEffectState_def::EsPaused: + case AreaEffectSimulation::AesEffectState::EsActivated: + case AreaEffectSimulation::AesEffectState::EsPaused: DEBUG_LOG(m_logger) << "... active/paused visible: " << ess.displayActivated; return ess.displayActivated; - case AreaEffectSimulation::AesEffectState_def::EsExpired: + case AreaEffectSimulation::AesEffectState::EsExpired: { if (aesType != AreaEffectSimulation::AesType::AtAirSupportImpact && @@ -252,11 +252,11 @@ bool AesDisplayFilterImpl::isVisible(AreaEffectSimulation::AesType aesType, << ", return: " << (currentTimeMSec < displayEnd); return (currentTimeMSec < displayEnd); } - case AreaEffectSimulation::AesEffectState_def::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsRemoved: DEBUG_LOG(m_logger) << "... removed - NOT visible"; return false; - case AreaEffectSimulation::AesEffectState_def::EsUnknown: - case AreaEffectSimulation::AesEffectState_def::EsError: + case AreaEffectSimulation::AesEffectState::EsUnknown: + case AreaEffectSimulation::AesEffectState::EsError: break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp index dc913d223..23595f218 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/flt_type_filter_widget.cpp @@ -43,16 +43,16 @@ void TypeFilterWidget::retranslate() void TypeFilterWidget::initTypeClassElements(bool ocMode) { - static const auto typeClassesUnit = {ParticipantManagement::TypeClass_def::Unit, - ParticipantManagement::TypeClass_def::SupportUnit, + static const auto typeClassesUnit = {ParticipantManagement::TypeClass::Unit, + ParticipantManagement::TypeClass::SupportUnit, }; - static const auto typeClasses = {ParticipantManagement::TypeClass_def::SupportEntity, - ParticipantManagement::TypeClass_def::Human, - ParticipantManagement::TypeClass_def::GroundVehicle, - ParticipantManagement::TypeClass_def::VehicleWithGear, - ParticipantManagement::TypeClass_def::WeaponSystem, - ParticipantManagement::TypeClass_def::Aircraft, - ParticipantManagement::TypeClass_def::Vessel, + static const auto typeClasses = {ParticipantManagement::TypeClass::SupportEntity, + ParticipantManagement::TypeClass::Human, + ParticipantManagement::TypeClass::GroundVehicle, + ParticipantManagement::TypeClass::VehicleWithGear, + ParticipantManagement::TypeClass::WeaponSystem, + ParticipantManagement::TypeClass::Aircraft, + ParticipantManagement::TypeClass::Vessel, }; if (!ocMode) { @@ -70,17 +70,17 @@ void TypeFilterWidget::initStateElements() QVBoxLayout *vBox = new QVBoxLayout; - for (int enumIt = 0; enumIt <= ProjectDataManagement::VulnerabilityState_def::TemporarySeverance; ++enumIt) + for (int enumIt = 0; enumIt <= ProjectDataManagement::VulnerabilityState::TemporarySeverance; ++enumIt) { QCheckBox *chb = new QCheckBox(m_ui->gBStates); chb->setText(ProjectDataManagement::toString( - static_cast(enumIt))); + static_cast(enumIt))); chb->setObjectName(QStringLiteral("chb%1").arg(ProjectDataManagement::toString( - static_cast(enumIt)))); + static_cast(enumIt)))); chb->setProperty("stateId", enumIt); connect(chb, &QCheckBox::clicked, this, &TypeFilterWidget::onTypeFilterChanged); @@ -176,8 +176,8 @@ void TypeFilterWidget::setGroupBoxesVisible(const bool bShowOC) { QGroupBox *gb = it.value(); const auto tc = it.key(); - const bool bIsOc = tc == ParticipantManagement::TypeClass_def::SupportEntity || - tc == ParticipantManagement::TypeClass_def::SupportUnit; + const bool bIsOc = tc == ParticipantManagement::TypeClass::SupportEntity || + tc == ParticipantManagement::TypeClass::SupportUnit; bool bShow = bShowOC ? bIsOc : !bIsOc; if (bShow && !gb->findChild()) bShow = false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_helper.h index dbc4d21ea..a1f3eba1a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_helper.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/flt_building_cmpnt_helper.h @@ -20,18 +20,18 @@ namespace FilterManagement const FilterManagement::BuildingComponentSettings::BldCmpSettings::ComponentSettings &compSettings = bldCmpSettings.componentSettings; - if (compSettings.showAnnouncementUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::AnnouncementUnit); - if (compSettings.showBuildingControlUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::BuildingControlUnit); - if (compSettings.showBuildingNetworkSwitch) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::BuildingNetworkSwitch); - if (compSettings.showBuildingSensorModule) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::BuildingSensorModule); - if (compSettings.showEffectGenerationControlUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::EffectGenerationControlUnit); - if (compSettings.showIndoorCamera) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::IndoorCamera); - if (compSettings.showIndoorIPS) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::IndoorIPS); - if (compSettings.showMeteoDataUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::MeteoDataUnit); - if (compSettings.showOutdoorCamera) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::OutdoorCamera); - if (compSettings.showOutdoorControlUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::OutdoorControlUnit); - if (compSettings.showOutdoorIPS) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::OutdoorIPS); - if (compSettings.showVirtualIPS) visibleTypes.insert(InfrastructureManagement::MountingPointType_def::type::VirtualIPS); + if (compSettings.showAnnouncementUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType::AnnouncementUnit); + if (compSettings.showBuildingControlUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType::BuildingControlUnit); + if (compSettings.showBuildingNetworkSwitch) visibleTypes.insert(InfrastructureManagement::MountingPointType::BuildingNetworkSwitch); + if (compSettings.showBuildingSensorModule) visibleTypes.insert(InfrastructureManagement::MountingPointType::BuildingSensorModule); + if (compSettings.showEffectGenerationControlUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType::EffectGenerationControlUnit); + if (compSettings.showIndoorCamera) visibleTypes.insert(InfrastructureManagement::MountingPointType::IndoorCamera); + if (compSettings.showIndoorIPS) visibleTypes.insert(InfrastructureManagement::MountingPointType::IndoorIPS); + if (compSettings.showMeteoDataUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType::MeteoDataUnit); + if (compSettings.showOutdoorCamera) visibleTypes.insert(InfrastructureManagement::MountingPointType::OutdoorCamera); + if (compSettings.showOutdoorControlUnit) visibleTypes.insert(InfrastructureManagement::MountingPointType::OutdoorControlUnit); + if (compSettings.showOutdoorIPS) visibleTypes.insert(InfrastructureManagement::MountingPointType::OutdoorIPS); + if (compSettings.showVirtualIPS) visibleTypes.insert(InfrastructureManagement::MountingPointType::VirtualIPS); return visibleTypes; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.cpp index cfff6eefd..dd3b4f505 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/gim_info_dialog.cpp @@ -95,35 +95,35 @@ void InfoDialog::showIedInfos() m_ui->lblState->setText(GuezIedManagement::toString(ied.tacticalState())); m_ui->tbwBit->setRowCount(0); - if (ied.electronicsError().underlying() != IedError_def::NoError) + if (ied.electronicsError().underlying() != IedError::NoError) { QTableWidgetItem *device = new QTableWidgetItem(tr("Electronics")); QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.electronicsError())); addTbwBitEntry(device, error); } - if (ied.pyrotechnics1Error().underlying() != IedError_def::NoError) + if (ied.pyrotechnics1Error().underlying() != IedError::NoError) { QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 1")); QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics1Error())); addTbwBitEntry(device, error); } - if (ied.pyrotechnics2Error().underlying() != IedError_def::NoError) + if (ied.pyrotechnics2Error().underlying() != IedError::NoError) { QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 2")); QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics2Error())); addTbwBitEntry(device, error); } - if (ied.pyrotechnics3Error().underlying() != IedError_def::NoError) + if (ied.pyrotechnics3Error().underlying() != IedError::NoError) { QTableWidgetItem *device = new QTableWidgetItem(tr("Pyrotechnics 3")); QTableWidgetItem *error = new QTableWidgetItem(GuezIedManagement::toString(ied.pyrotechnics3Error())); addTbwBitEntry(device, error); } - if ((ied.electronicsError().underlying() == IedError_def::NoError) && - (ied.pyrotechnics1Error().underlying() == IedError_def::NoError) && - (ied.pyrotechnics2Error().underlying() == IedError_def::NoError) && - (ied.pyrotechnics3Error().underlying() == IedError_def::NoError)) + if ((ied.electronicsError().underlying() == IedError::NoError) && + (ied.pyrotechnics1Error().underlying() == IedError::NoError) && + (ied.pyrotechnics2Error().underlying() == IedError::NoError) && + (ied.pyrotechnics3Error().underlying() == IedError::NoError)) { QTableWidgetItem *device = new QTableWidgetItem(tr("no Errors")); addTbwBitEntry(device, nullptr); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp index e0aa77dc4..eb2959fe3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/gim_pairing_edit_dialog.cpp @@ -105,7 +105,7 @@ void PairingEditDialog::onIedSelected(int idx) m_ui->cbxPairingState->setCurrentIndex(m_ui->cbxPairingState->findData(QVariant(ied.pairingState().underlying()))); m_ui->treeViewParticipants->clearSelection(); - if (ied.pairingState().underlying() == IedPairingState_def::PairedToParticipant) + if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant) { m_ui->cbxParty->setCurrentIndex(m_ui->cbxParty->findData(m_ppmDtc->participant(ied.pairedParticipantId().get()).partyId())); m_participantModel->selectItemByParticipantId(ied.pairedParticipantId().get(), [this](const QModelIndex &idx){m_ui->treeViewParticipants->setCurrentIndex(idx);}); @@ -135,7 +135,7 @@ void PairingEditDialog::onParticipantSelected(const QModelIndex &idx) if (checkSelectedParticipantType()) { Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt()); - if (ied.pairingState() == IedPairingState_def::PairedToParticipant) + if (ied.pairingState() == IedPairingState::PairedToParticipant) { if (m_participantModel->getParticipantData(idx).id() != ied.pairedParticipantId().get()) @@ -160,8 +160,8 @@ bool PairingEditDialog::apply() PairIedRequest request; request.id(m_ui->cbxIed->currentData().toInt()); - request.pairingState(static_cast(m_ui->cbxPairingState->currentData().toInt())); - if (request.pairingState().underlying() == IedPairingState_def::PairedToParticipant) + request.pairingState(static_cast(m_ui->cbxPairingState->currentData().toInt())); + if (request.pairingState().underlying() == IedPairingState::PairedToParticipant) request.pairedParticipantId(dds::core::optional(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).id())); return m_requestHelper->startSingleRequest([=]() @@ -177,7 +177,7 @@ bool PairingEditDialog::applyPairingStateCheck() Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt()); - if (ied.pairingState() == IedPairingState_def::NotPaired && m_ui->cbxPairingState->currentData().toInt() == ied.pairingState().underlying()) + if (ied.pairingState() == IedPairingState::NotPaired && m_ui->cbxPairingState->currentData().toInt() == ied.pairingState().underlying()) return false; return true; @@ -186,10 +186,10 @@ bool PairingEditDialog::applyPairingStateCheck() bool PairingEditDialog::applyParticipantSelectionCheck() { - if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState_def::PairedToParticipant) + if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::PairedToParticipant) { Ied ied = m_dtc->ied(m_ui->cbxIed->currentData().toInt()); - if (ied.pairingState().underlying() == IedPairingState_def::PairedToParticipant) + if (ied.pairingState().underlying() == IedPairingState::PairedToParticipant) { if (checkSelectedParticipantType()) { @@ -209,8 +209,8 @@ bool PairingEditDialog::applyParticipantSelectionCheck() bool PairingEditDialog::checkSelectedParticipantType() { ParticipantManagement::Type type = m_ppmDtc->type(m_participantModel->getParticipantData(m_ui->treeViewParticipants->currentIndex()).typeId()); - return ((type.typeClass().underlying() != ParticipantManagement::TypeClass_def::SupportUnit) && - (type.typeClass().underlying() != ParticipantManagement::TypeClass_def::Unit)); + return ((type.typeClass().underlying() != ParticipantManagement::TypeClass::SupportUnit) && + (type.typeClass().underlying() != ParticipantManagement::TypeClass::Unit)); } void PairingEditDialog::fillIedCbx() @@ -231,8 +231,8 @@ void PairingEditDialog::fillIedCbx() void PairingEditDialog::fillPairingState() { m_ui->cbxPairingState->clear(); - m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState_def::NotPaired).underlying()), IedPairingState_def::NotPaired); - m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState_def::PairedToParticipant).underlying()), IedPairingState_def::PairedToParticipant); + m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::NotPaired).underlying()), IedPairingState::NotPaired); + m_ui->cbxPairingState->addItem(GuezIedManagement::toString(IedPairingState(IedPairingState::PairedToParticipant).underlying()), IedPairingState::PairedToParticipant); } void PairingEditDialog::fillPartyCbx() @@ -254,7 +254,7 @@ void PairingEditDialog::enDisableUiElements() m_ui->cbxIed->setEnabled(m_ui->cbxIed->count() > 1); m_ui->cbxPairingState->setEnabled(m_ui->cbxIed->count() > 0 && m_participantModel->rowCount() > 0); - if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState_def::NotPaired) + if (m_ui->cbxPairingState->currentData().toInt() == IedPairingState::NotPaired) { m_ui->cbxParty->setEnabled(false); m_ui->treeViewParticipants->setEnabled(false); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp index fc538f53c..ca7bfce1e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Data/ism_foreign_data_plugin.cpp @@ -365,7 +365,7 @@ void ForeignInterfaceImpl::onMainScheduleChanged(const InfrastructureManagement: if(mpp.structureElementId() != mp.data().id()) { - if (mp.aimState() == MountingPointState_def::Idle) + if (mp.aimState() == MountingPointState::Idle) continue; mp.setAimState(MountingPointState::Idle); emit mountingPointChanged(mp, ParticipantManagement::DataModification::eModified); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp index a2dc6c2fc..0553ded11 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/AudioVideoConfig/SetRecording/ism_set_recording_dialog_model.cpp @@ -110,8 +110,8 @@ void SetRecordingDialogModel::initData() const QList sections = m_dtc->getSections(); QMap mapGroup; - const int defaultSectionId = static_cast(InfrastructureManagement::BuildingGroup_def::UnknownGroup); - NGLTreeItem *defaultSectionRoot = new NGLTreeItem(InfrastructureManagement::toString(static_cast(defaultSectionId))); + const int defaultSectionId = static_cast(InfrastructureManagement::BuildingGroup::UnknownGroup); + NGLTreeItem *defaultSectionRoot = new NGLTreeItem(InfrastructureManagement::toString(static_cast(defaultSectionId))); mapGroup.insert(defaultSectionId, defaultSectionRoot); m_rootItem->appendChild(mapGroup.value(defaultSectionId)); @@ -120,7 +120,7 @@ void SetRecordingDialogModel::initData() { if(mapGroup.contains(groupId)) continue; - const QString sectionText = InfrastructureManagement::toString(static_cast(groupId)); + const QString sectionText = InfrastructureManagement::toString(static_cast(groupId)); DEBUG_LOG(m_logger)<<" >> Adding section >> "< &INSTRUMENTATION_ASSET_STATES() { static QHash s_ret { - {InstrumentationAssetState_def::Unmounted, QLatin1String("Unmounted")}, - {InstrumentationAssetState_def::Mounted, QLatin1String("Mounted")}, - {InstrumentationAssetState_def::Defect, QLatin1String("Defect")} + {InstrumentationAssetState::Unmounted, QLatin1String("Unmounted")}, + {InstrumentationAssetState::Mounted, QLatin1String("Mounted")}, + {InstrumentationAssetState::Defect, QLatin1String("Defect")} }; return s_ret; } @@ -248,19 +248,19 @@ InstrumentationAsset AssetListDialog::importData(const QVector &segm InstrumentationAsset asset; asset.barcode() = unquote(dmc); asset.name() = snrStd.empty() ? tkzStd : std::string(tkzStd + '_' + snrStd); - asset.assetStateId(static_cast(INSTRUMENTATION_ASSET_STATES().key(status.toString()))); + asset.assetStateId(static_cast(INSTRUMENTATION_ASSET_STATES().key(status.toString()))); asset.properties() = QJsonDocument(obj).toJson(QJsonDocument::Compact).constData(); if (dmc.startsWith(QLatin1String("GSM"))) asset.mountingPointTypeId(MountingPointType::BuildingSensorModule); else if (dmc.startsWith(QLatin1String("KAA"))) - asset.mountingPointTypeId(MountingPointType_def::OutdoorCamera); + asset.mountingPointTypeId(MountingPointType::OutdoorCamera); else if (dmc.startsWith(QLatin1String("KAI"))) - asset.mountingPointTypeId(MountingPointType_def::IndoorCamera); + asset.mountingPointTypeId(MountingPointType::IndoorCamera); else if (dmc.startsWith(QLatin1String("OPS"))) - asset.mountingPointTypeId(MountingPointType_def::IndoorIPS); + asset.mountingPointTypeId(MountingPointType::IndoorIPS); else if (dmc.startsWith(QLatin1String("WD_"))) - asset.mountingPointTypeId(MountingPointType_def::EffectGenerationControlUnit); + asset.mountingPointTypeId(MountingPointType::EffectGenerationControlUnit); else { if (bOk) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp index fd5e25937..fca72304f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_asset_list_dialog_model.cpp @@ -111,8 +111,8 @@ QVariant AssetListDialogModel::data(const QModelIndex &index, int role) const return QString::fromStdString(currentAsset.properties()); case STATE: { - const InstrumentationAssetState_def::type &currAssetState = currentAsset.assetStateId().underlying(); - if(currAssetState == InstrumentationAssetState_def::Unmounted || currAssetState == InstrumentationAssetState_def::Mounted) + const InstrumentationAssetState &currAssetState = currentAsset.assetStateId().underlying(); + if(currAssetState == InstrumentationAssetState::Unmounted || currAssetState == InstrumentationAssetState::Mounted) { return m_intactStr; } @@ -198,12 +198,12 @@ QVariant AssetListDialogModel::data(const QModelIndex &index, int role) const return QVariant(); } -inline bool isMptRelevant(MountingPointType_def::type type) +inline bool isMptRelevant(MountingPointType type) { - return ((type == MountingPointType_def::IndoorCamera) || - (type == MountingPointType_def::OutdoorCamera) || - (type == MountingPointType_def::EffectGenerationControlUnit) || - (type == MountingPointType_def::BuildingSensorModule) + return ((type == MountingPointType::IndoorCamera) || + (type == MountingPointType::OutdoorCamera) || + (type == MountingPointType::EffectGenerationControlUnit) || + (type == MountingPointType::BuildingSensorModule) ); } @@ -215,7 +215,7 @@ bool AssetListDialogModel::getReachable(const InstrumentationAsset ¤tAsset const bool bIsRelevant = isMptRelevant(currentAsset.mountingPointTypeId().underlying()); if (bIsRelevant) { - const bool bIsMounted = currentAsset.assetStateId().underlying() == InfrastructureManagement::InstrumentationAssetState_def::Mounted; + const bool bIsMounted = currentAsset.assetStateId().underlying() == InfrastructureManagement::InstrumentationAssetState::Mounted; if (bIsMounted) { if (m_cmoDtc) @@ -223,15 +223,15 @@ bool AssetListDialogModel::getReachable(const InstrumentationAsset ¤tAsset const ComponentMonitor::ComponentStatus &cs = m_cmoDtc->componentStatus(currentAsset.id()); const ComponentMonitor::ComponentState state = cs.state(); switch (state.underlying()) { - case ComponentMonitor::ComponentState_def::Undefined: + case ComponentMonitor::ComponentState::Undefined: iconOut = m_reachabilityOrange; stringOut = tr("Undefined"); break; - case ComponentMonitor::ComponentState_def::Reachable: + case ComponentMonitor::ComponentState::Reachable: iconOut = m_reachabilityGreen; stringOut = tr("Reachable"); break; - case ComponentMonitor::ComponentState_def::Unreachable: + case ComponentMonitor::ComponentState::Unreachable: iconOut = m_reachabilityRed; stringOut = tr("Unreachable"); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.cpp index 9b6b2840a..b28dec13c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/AssetList/ism_edit_asset_dialog.cpp @@ -40,7 +40,7 @@ EditAssetDialog::~EditAssetDialog() void EditAssetDialog::slotSetAssetToIntact() { - const InstrumentationAssetState newState = InstrumentationAssetState::type::Unmounted; + const InstrumentationAssetState newState = InstrumentationAssetState::Unmounted; apply(newState); slotClose(); } @@ -48,7 +48,7 @@ void EditAssetDialog::slotSetAssetToIntact() void EditAssetDialog::slotSetAssetToDefect() { - const InstrumentationAssetState newState = InstrumentationAssetState::type::Defect; + const InstrumentationAssetState newState = InstrumentationAssetState::Defect; apply(newState); slotClose(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp index 15e74c083..3238591b5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog.cpp @@ -64,10 +64,10 @@ ExerciseAssignmentDialog::ExerciseAssignmentDialog(LtsSession::LtsSession *sessi switch(data.state().underlying()) { - case ExerciseManagement::ExerciseState_def::Created: - case ExerciseManagement::ExerciseState_def::Started: - case ExerciseManagement::ExerciseState_def::Paused: - case ExerciseManagement::ExerciseState_def::Stopped: + case ExerciseManagement::ExerciseState::Created: + case ExerciseManagement::ExerciseState::Started: + case ExerciseManagement::ExerciseState::Paused: + case ExerciseManagement::ExerciseState::Stopped: { m_exercises.insert(data.id(), data); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp index d856cd47d..62b787fb3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ExerciseAssignment/ism_exercise_assignment_dialog_model.cpp @@ -19,11 +19,11 @@ ExerciseAssignmentDialogModel::ExerciseAssignmentDialogModel(const QMapappendChild(new TreeItem(0, it, toString(static_cast(it)), -1, m_rootItem)); + m_rootItem->appendChild(new TreeItem(0, it, toString(static_cast(it)), -1, m_rootItem)); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp index 5ef90c6ea..bd30875a5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog.cpp @@ -360,7 +360,7 @@ void MountingPointListDialog::getMountingPointPlanData(const QModelIndex &index, if (data.aimState != mppMap[data.id].mountingPointState()) modify.push_back(MountingPointPlan(data.id, data.aimState)); } - else if (data.aimState != MountingPointState_def::Idle) + else if (data.aimState != MountingPointState::Idle) { DEBUG_LOG(m_logger) << "Not available in Map. Desired: " << data.aimState; modify.push_back(MountingPointPlan(data.id, data.aimState)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_proxy_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_proxy_model.cpp index 707ef5f49..95b1387d5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_proxy_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_checkbox_proxy_model.cpp @@ -85,7 +85,7 @@ QString mpsToString(const int mps) } -QString mpsToString(const MountingPointState_def::type mps) +QString mpsToString(const MountingPointState mps) { return mpsToString((int)mps); } @@ -118,16 +118,16 @@ bool CheckboxProxyModel::setData(const QModelIndex &index, const QVariant &value switch (mps) { case -2: - newMps = (int)MountingPointState_def::Idle; + newMps = (int)MountingPointState::Idle; break; - case (int)MountingPointState_def::Idle: - newMps = (int)MountingPointState_def::Equipped; + case (int)MountingPointState::Idle: + newMps = (int)MountingPointState::Equipped; break; - case (int)MountingPointState_def::Equipped: - newMps = (int)MountingPointState_def::Empty; + case (int)MountingPointState::Equipped: + newMps = (int)MountingPointState::Empty; break; - case (int)MountingPointState_def::Empty: - newMps = (int)MountingPointState_def::Idle; + case (int)MountingPointState::Empty: + newMps = (int)MountingPointState::Idle; break; default: return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp index 11ff81934..c376df39e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/MountingPointList/ism_mounting_point_list_dialog_model.cpp @@ -305,10 +305,10 @@ QSet MountingPointListDialogModel::getAvailableFloors() const StructureElement MountingPointListDialogModel::setBuildingGroup(int groupId) { StructureElement se{}; - InfrastructureManagement::BuildingGroup_def::type buildingGroup = static_cast(groupId); + InfrastructureManagement::BuildingGroup buildingGroup = static_cast(groupId); if(buildingGroup == 0) { - buildingGroup = InfrastructureManagement::BuildingGroup_def::UnknownGroup; + buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup; } se.id() = maxIntValue - static_cast(buildingGroup); @@ -353,7 +353,7 @@ bool MountingPointListDialogModel::setData(const QModelIndex &index, const QVari } SimpleMountingPointData smpd = item->data().value(); - smpd.aimState = (MountingPointState::inner_enum)value.toInt(); + smpd.aimState = (MountingPointState)value.toInt(); item->setData(QVariant::fromValue(smpd)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp index 55862f3bd..bbdce0eb5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_conflicts_model.cpp @@ -81,11 +81,11 @@ QVariant ConflictsDialogModel::data(const QModelIndex &index, int role) const { case AIM_STATE: { - return itemData.aimState == MountingPointState_def::Equipped ? green : red; + return itemData.aimState == MountingPointState::Equipped ? green : red; } case CONFLICT_STATE: { - return itemData.conflictState == MountingPointState_def::Equipped ? green : red; + return itemData.conflictState == MountingPointState::Equipped ? green : red; } default: return QVariant(); @@ -135,12 +135,12 @@ bool ConflictsDialogModel::initModel(int scheduleId, - m_visibleTypes = { MountingPointType_def::BuildingSensorModule, + m_visibleTypes = { MountingPointType::BuildingSensorModule, - MountingPointType_def::IndoorCamera, - MountingPointType_def::OutdoorIPS, - MountingPointType_def::IndoorIPS, - MountingPointType_def::EffectGenerationControlUnit + MountingPointType::IndoorCamera, + MountingPointType::OutdoorIPS, + MountingPointType::IndoorIPS, + MountingPointType::EffectGenerationControlUnit }; m_dtc = dtc; @@ -158,12 +158,12 @@ bool ConflictsDialogModel::initModel(int scheduleId, StructureElement ConflictsDialogModel::setBuildingGroup(int groupId) { StructureElement se; - BuildingGroup_def::type buildingGroup = static_cast(groupId); + BuildingGroup buildingGroup = static_cast(groupId); se.id() = maxIntValue - static_cast(buildingGroup); se.name() = InfrastructureManagement::toString(buildingGroup).toStdString(); se.displayName() = InfrastructureManagement::toString(buildingGroup).toStdString(); - se.structureElementTypeId() = StructureElementType_def::Section; + se.structureElementTypeId() = StructureElementType::Section; return se; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp index ce22775c6..2530d718e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog.cpp @@ -116,7 +116,7 @@ void OverviewDialog::setCbComparePlan() m_ui->cbComparePlan->addItem(tr("All active(*) plans"),0); m_ui->cbComparePlan->insertSeparator(1); for (auto ms : m_dtc->mainSchedules()) - m_ui->cbComparePlan->addItem((ms.statusId() == ScheduleStatus_def::Active ? QLatin1Literal("* ") : QLatin1Literal(" ")) + + m_ui->cbComparePlan->addItem((ms.statusId() == ScheduleStatus::Active ? QLatin1Literal("* ") : QLatin1Literal(" ")) + QString::fromStdString(ms.name()), ms.id()); TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.cpp index 1ab1db4dd..50a189198 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Overview/ism_overview_dialog_model.cpp @@ -48,10 +48,10 @@ OverviewDialogModel::OverviewDialogModel(QObject *parent) RowData(MountingPointType::IndoorCamera), RowData(MountingPointType::IndoorIPS)}; - m_refMap[MountingPointType_def::BuildingSensorModule] = 0; - m_refMap[MountingPointType_def::EffectGenerationControlUnit] = 1; - m_refMap[MountingPointType_def::IndoorCamera] = 2; - m_refMap[MountingPointType_def::IndoorIPS] = 3; + m_refMap[MountingPointType::BuildingSensorModule] = 0; + m_refMap[MountingPointType::EffectGenerationControlUnit] = 1; + m_refMap[MountingPointType::IndoorCamera] = 2; + m_refMap[MountingPointType::IndoorIPS] = 3; TRACE_LOG(m_logger) << Q_FUNC_INFO << " END"; } @@ -186,10 +186,10 @@ MountingPointType OverviewDialogModel::getMountingPointTypeId(int structureEleme StructureElement se; if (!m_dtc->getStructureElementById(structureElementId, se)) - return MountingPointType_def::get_default(); + return MountingPointType::get_default(); - const MountingPointType mpType = (se.mountingPointTypeId() == MountingPointType_def::OutdoorIPS) ? MountingPointType_def::IndoorIPS : se.mountingPointTypeId(); + const MountingPointType mpType = (se.mountingPointTypeId() == MountingPointType::OutdoorIPS) ? MountingPointType::IndoorIPS : se.mountingPointTypeId(); m_availableMountingPointTypes.insert(structureElementId, mpType); return mpType; } @@ -219,7 +219,7 @@ QHash OverviewDialogModel::mergePlans(const QHashmainSchedules(); for (const auto &schedule : msConst) { - if (cmpPlanId == 0 && schedule.statusId() != ScheduleStatus_def::Active) + if (cmpPlanId == 0 && schedule.statusId() != ScheduleStatus::Active) continue; if (cmpPlanId != 0 && cmpPlanId != schedule.id()) continue; @@ -251,13 +251,13 @@ QHash OverviewDialogModel::mergePlans(const QHashlwMountingPointType->findItems(QLatin1String(""), Qt::MatchContains)) { - MountingPointType mpt = static_cast(lwi->data(Qt::UserRole).toInt()); + MountingPointType mpt = static_cast(lwi->data(Qt::UserRole).toInt()); if (lwi->isSelected()) types << mpt; m_mountedPointSortProxyModel->addToTypeFilter(mpt, lwi->isSelected()); @@ -351,7 +351,7 @@ QStringList OverviewMountingPointListDialog::getUsedFilterTypes() QStringList filterList; for (const QListWidgetItem *lwi : m_ui->lwMountingPointType->findItems(QLatin1String(""), Qt::MatchContains)) { - MountingPointType mpt = static_cast(lwi->data(Qt::UserRole).toInt()); + MountingPointType mpt = static_cast(lwi->data(Qt::UserRole).toInt()); if (lwi->isSelected()) filterList<(groupId); + InfrastructureManagement::BuildingGroup buildingGroup = static_cast(groupId); if(buildingGroup == 0) { - buildingGroup = InfrastructureManagement::BuildingGroup_def::UnknownGroup; + buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup; } se.id() = maxIntValue - static_cast(buildingGroup); @@ -167,10 +167,10 @@ inline StructureElement setBuildingGroup(int groupId) inline int getFakeBuildingGroupId(int seId) { - InfrastructureManagement::BuildingGroup_def::type buildingGroup = static_cast(seId); + InfrastructureManagement::BuildingGroup buildingGroup = static_cast(seId); if(buildingGroup == 0) { - buildingGroup = InfrastructureManagement::BuildingGroup_def::UnknownGroup; + buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup; } return (maxIntValue - static_cast(buildingGroup)); } @@ -286,7 +286,7 @@ void ViewMountingPointListModel::initData() const MountingPointPlan &mpp = mountingPointPlanCont.value(mpId_StructEleId); mpData.aimState = mpp.mountingPointState(); } else { - mpData.aimState = MountingPointState_def::Idle; + mpData.aimState = MountingPointState::Idle; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp index d26c72f81..033d763e2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/PlanChooser/new_plan_dialog.cpp @@ -52,7 +52,7 @@ bool NewPlanDialog::getData(QString &name, qint64 &begin, qint64 &end, int &stat name = m_ui->lePlanName->text(); begin = m_ui->dteBegin->msecsSinceEpoch(); end = m_ui->dteEnd->msecsSinceEpoch(); - status = static_cast(m_ui->cbStatus->currentData().toInt()); + status = static_cast(m_ui->cbStatus->currentData().toInt()); return true; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp index 1ac6cf48d..bb0179d47 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/Timeline/ism_plan_tln_dialog.cpp @@ -196,7 +196,7 @@ void PlanTimeLineDialog::onRemove() asset.barcode(), asset.hostname(), asset.properties(), - InstrumentationAssetState_def::Unmounted, + InstrumentationAssetState::Unmounted, asset.lastUpdated(), asset.availableInExercise() ); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp index ecbafcd51..6ed16146c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_building_mount_point_model.cpp @@ -200,10 +200,10 @@ StructureElementTreeItem* BuildingMountPointModel::findItemByStructureElementId( StructureElement BuildingMountPointModel::setBuildingGroup(int groupId) { StructureElement se; - InfrastructureManagement::BuildingGroup_def::type buildingGroup = static_cast(groupId); + InfrastructureManagement::BuildingGroup buildingGroup = static_cast(groupId); if(buildingGroup == 0) { - buildingGroup = InfrastructureManagement::BuildingGroup_def::UnknownGroup; + buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup; } se.id() = maxIntValue - static_cast(buildingGroup); @@ -215,10 +215,10 @@ StructureElement BuildingMountPointModel::setBuildingGroup(int groupId) int BuildingMountPointModel::getSectionId(int groupId) { - InfrastructureManagement::BuildingGroup_def::type buildingGroup = static_cast(groupId); + InfrastructureManagement::BuildingGroup buildingGroup = static_cast(groupId); if(buildingGroup == 0) { - buildingGroup = InfrastructureManagement::BuildingGroup_def::UnknownGroup; + buildingGroup = InfrastructureManagement::BuildingGroup::UnknownGroup; } return (maxIntValue - static_cast(buildingGroup)); } @@ -300,7 +300,7 @@ void BuildingMountPointModel::addBuilding(const MainStructureElement &mse) for (const StructureElement &se : mse.elements()) { - if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::BuildingControlUnit) + if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::BuildingControlUnit) continue; int parentId = getParent(se.path()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp index 57fc6e02c..6c11a4e97 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_dialog.cpp @@ -225,7 +225,7 @@ void PlanDialog::onRemove() asset.barcode(), asset.hostname(), asset.properties(), - InstrumentationAssetState_def::Unmounted, + InstrumentationAssetState::Unmounted, asset.lastUpdated(), asset.availableInExercise() ); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.cpp index b3b011156..779aa4b58 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_plan_edit_dialog.cpp @@ -118,7 +118,7 @@ bool PlanEditDialog::apply() MainScheduleModifyRequest data; data.name((m_ui->leName->text().toStdString())); - ScheduleStatus newStatus = static_cast(m_ui->cbStatus->currentData().toInt()); + ScheduleStatus newStatus = static_cast(m_ui->cbStatus->currentData().toInt()); if (newStatus != m_currentState) { @@ -160,7 +160,7 @@ bool PlanEditDialog::apply() else data.timeEnd(); - data.statusId(static_cast(m_ui->cbStatus->currentData().toInt())); + data.statusId(static_cast(m_ui->cbStatus->currentData().toInt())); m_requestHelper->addRequest([data,this](){ return m_ftc->mainScheduleModifyRequest(data, this); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.cpp index 001a328c8..ec9fa13c2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/Gui/ResourceManagement/ism_resource_gui_plugin.cpp @@ -579,7 +579,7 @@ void InterfaceImpl::slotNewPlan() req.id(0); - req.statusId(static_cast(status)); + req.statusId(static_cast(status)); req.timeCreated(QDateTime::currentDateTime().toMSecsSinceEpoch()); if(tbegin > 0) req.timeStart(tbegin); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h index 3c54afc09..41c3203e0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/InfrastructureManagement/ism_data_plugin_interface.h @@ -2,6 +2,7 @@ #pragma once +#include #include #include @@ -81,7 +82,7 @@ public: Q_SIGNALS: - void mountingPointChanged(const InfrastructureManagement::MountingPoint &data, ParticipantManagement::DataModification modType); + void mountingPointChanged(const InfrastructureManagement::MountingPoint &data, DataModification modType); void scheduleIdChanged(int32_t newScheduleId); void buildingsInCurrentExerciseChanged(); }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp index a50f9824e..370e21585 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/MarkerManagement/Gui/MarkerEdit/mrk_edit_gui_plugin.cpp @@ -310,7 +310,7 @@ void InterfaceImpl::startSnapshot() m_replayPartitionId = m_srmForeign->replayPartitionCreateRequest(m_session->exerciseId(), LtsSessionData::LtsSessionData::getInstance()->getWorkstationId(), LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), - Core::ReplayType_def::SnapshotData); + Core::ReplayType::SnapshotData); DEBUG_LOG(m_logger) << "replayPartitionCreateRequest ...DONE"; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.cpp index 4093df327..bdf91a0f6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_new_message_dialog.cpp @@ -175,11 +175,11 @@ bool NewMessageDialog::init(const std::shared_ptr &dt bool NewMessageDialog::initAnswerDialog(const Messaging::OperatorMessage &msg) { m_ui->leSubject->setText(tr("Re: %1").arg(QString::fromStdString(msg.subject()))); - if (msg.senderType() == Messaging::AddressType_def::ObserverController) + if (msg.senderType() == Messaging::AddressType::ObserverController) m_ui->cbxAddrType->setChecked(true); fillAddressBox(); - if (msg.senderType() == Messaging::AddressType_def::ObserverController) + if (msg.senderType() == Messaging::AddressType::ObserverController) { int idx = m_ui->cmbOperators->findData(0-msg.senderId()); INFO_LOG(m_logger) << "senderId=" << 0-msg.senderId() @@ -241,9 +241,9 @@ bool NewMessageDialog::apply() DEBUG_LOG(m_logger) << "request for Operators"; comr.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()); comr.subject(subject.toStdString()); - comr.senderType(Messaging::AddressType_def::type::Operator); + comr.senderType(Messaging::AddressType::Operator); comr.message(message.toStdString()); - comr.recipientType() = Messaging::AddressType_def::type::Operator; + comr.recipientType() = Messaging::AddressType::Operator; comr.recipientIds().reserve(recvOperators.size()); comr.exerciseId(m_session->exerciseId()); @@ -267,9 +267,9 @@ bool NewMessageDialog::apply() DEBUG_LOG(m_logger) << "request for OCs"; comrOC.senderId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId()); comrOC.subject(subject.toStdString()); - comrOC.senderType(Messaging::AddressType_def::type::Operator); + comrOC.senderType(Messaging::AddressType::Operator); comrOC.message(message.toStdString()); - comrOC.recipientType() = Messaging::AddressType_def::type::ObserverController; + comrOC.recipientType() = Messaging::AddressType::ObserverController; comrOC.recipientIds().reserve(recvOperators.size()); comrOC.exerciseId(m_session->exerciseId()); for (const RecipientModel::Recipient &r : recvOCs) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp index c117f1d9a..af8621f78 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Messaging/Gui/Messaging/msg_show_message_dialog.cpp @@ -80,7 +80,7 @@ bool ShowMessageDialog::init(const std::shared_ptr &dtc, m_ui->msgContent->setTextCursor(cursor); m_buttonBox->setButtonVisible(LtsWidgets::DialogButton::Add, ((operatorMessage.recipientId() > 0) && (operatorMessage.correspondingOutboxMessageId() > 0)) - || (operatorMessage.recipientId() == Messaging::AddressType_def::ObserverController)); + || (operatorMessage.recipientId() == Messaging::AddressType::ObserverController)); m_buttonBox->setText(LtsWidgets::DialogButton::Add, tr("Answer")); if (box == MessagingModel::Box::InBox) m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Add, true); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp index bc79a7c2f..b918f8514 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog.cpp @@ -87,8 +87,8 @@ void NotificationManagementDialog::onAcknowledgeNotification() for (const auto &addr : noti.recipientIds()) { - if ((addr.addressType() == AddressType_def::Operator && addr.addressId() == operatorId) - || (addr.addressType() == AddressType_def::Workstation && addr.addressId() == workstationId)) + if ((addr.addressType() == AddressType::Operator && addr.addressId() == operatorId) + || (addr.addressType() == AddressType::Workstation && addr.addressId() == workstationId)) { request.addressId(addr.id()); break; @@ -145,8 +145,8 @@ void NotificationManagementDialog::onRemoveNotification() for (const auto &addr : noti.recipientIds()) { - if ((addr.addressType() == AddressType_def::Operator && addr.addressId() == operatorId) - || (addr.addressType() == AddressType_def::Workstation && addr.addressId() == workstationId)) + if ((addr.addressType() == AddressType::Operator && addr.addressId() == operatorId) + || (addr.addressType() == AddressType::Workstation && addr.addressId() == workstationId)) { request.addressId(addr.id()); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp index 84e5c6ebd..0eb01fcbc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_dialog_model.cpp @@ -70,10 +70,10 @@ QVariant NotificationManagementDialogModel::data(const QModelIndex &index, int r bool setBold = false; for (const auto &addr : noti.recipientIds()) { - if (addr.addressType() == AddressType_def::Operator && addr.addressId() != m_operatorId) + if (addr.addressType() == AddressType::Operator && addr.addressId() != m_operatorId) continue; - if (addr.addressType() == AddressType_def::Workstation && addr.addressId() != m_workstationId) + if (addr.addressType() == AddressType::Workstation && addr.addressId() != m_workstationId) continue; if (!noti.processed()) @@ -126,11 +126,11 @@ QVariant NotificationManagementDialogModel::data(const QModelIndex &index, int r { switch (noti.priority().underlying()) { - case NotificationManagement::Priority_def::Low: + case NotificationManagement::Priority::Low: return QColor(Qt::black); - case NotificationManagement::Priority_def::Normal: + case NotificationManagement::Priority::Normal: return QColor(Qt::cyan); - case NotificationManagement::Priority_def::High: + case NotificationManagement::Priority::High: return QColor(Qt::magenta); case NotificationManagement::Priority::Highest: return QColor(Qt::red); @@ -152,10 +152,10 @@ bool NotificationManagementDialogModel::isFiltered(const NotificationManagement: bool isFiltered = true; for (const auto &addr : data.recipientIds()) { - if (addr.addressType() == AddressType_def::Workstation) + if (addr.addressType() == AddressType::Workstation) if (addr.addressId() != m_workstationId) continue; - if (addr.addressType() == AddressType_def::Operator) + if (addr.addressType() == AddressType::Operator) if (addr.addressId() != m_operatorId) continue; @@ -170,7 +170,7 @@ int NotificationManagementDialogModel::isDeleted(const NomNotification &data) co { for (const auto &addr : data.recipientIds()) { - if (addr.addressType() == AddressType_def::Operator) + if (addr.addressType() == AddressType::Operator) { if (addr.addressId() != m_operatorId) continue; @@ -187,13 +187,13 @@ QString NotificationManagementDialogModel::getNameByAddressId(int addressId, con { if (addr.id() == addressId) { - if (addr.addressType() == AddressType_def::Operator) + if (addr.addressType() == AddressType::Operator) { DEBUG_LOG(m_logger) << "addressId=" << addressId << ", addr.addressId()).name()=" << QString::fromStdString(m_dtcOpm->user(addr.addressId()).name()); return QString::fromStdString(m_dtcOpm->user(addr.addressId()).name()); } - if (addr.addressType() == AddressType_def::Workstation) + if (addr.addressType() == AddressType::Workstation) return QString::fromStdString(m_dtcAsm->asset(addr.addressId()).name()); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp index 9cf1c1454..7f22f4174 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/NotificationManagement/Gui/NotificationEdit/nom_edit_gui_plugin.cpp @@ -39,7 +39,7 @@ int InterfaceImpl::isDeleted(const NomNotification &data) const int operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId(); for (const auto &addr : data.recipientIds()) { - if (addr.addressType() == AddressType_def::Operator) + if (addr.addressType() == AddressType::Operator) { if (addr.addressId() != operatorId) continue; @@ -342,8 +342,8 @@ void InterfaceImpl::ack(const NotificationManagement::NomNotification ¬ificat int workstationId = LtsSessionData::LtsSessionData::getInstance()->getWorkstationId(); for (const auto &addr : notification.recipientIds()) { - if ((addr.addressType() == AddressType_def::Operator && addr.addressId() == operatorId) - || (addr.addressType() == AddressType_def::Workstation && addr.addressId() == workstationId)) + if ((addr.addressType() == AddressType::Operator && addr.addressId() == operatorId) + || (addr.addressType() == AddressType::Workstation && addr.addressId() == workstationId)) { request.addressId(addr.id()); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp index 18dbc4a36..13446cf11 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcBaseDownload/Gui/BaseDownloader/obd_ex_model.cpp @@ -32,7 +32,7 @@ void ExModel::addExercise(const QJsonObject &exercise) ex.defaultTimeZone(exercise.value(QLatin1String("timeZone")).toString().toStdString().c_str()[0]); ex.startTime(exercise.value(QLatin1String("startTime")).toDouble()); ex.stopTime(exercise.value(QLatin1String("stopTime")).toDouble()); - ex.state(static_cast(exercise.value(QLatin1String("status")).toInt())); + ex.state(static_cast(exercise.value(QLatin1String("status")).toInt())); ex.description(exercise.value(QLatin1String("description")).toString().toStdString()); ex.id(exercise.value(QLatin1String("id")).toInt()); ex.trainingAreaId(exercise.value(QLatin1String("trainingAreaId")).toInt()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp index ed0b956b2..9a6f3b018 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/OcTerminal/osc_demand_situation_filter.cpp @@ -68,15 +68,15 @@ bool DemandSituationFilter::init(const std::shared_ptr &ftc) std::set ppmTypeClass; - ppmTypeClass.insert(ParticipantManagement::TypeClass_def::SupportEntity); + ppmTypeClass.insert(ParticipantManagement::TypeClass::SupportEntity); - ppmTypeClass.insert(ParticipantManagement::TypeClass_def::Human); - ppmTypeClass.insert(ParticipantManagement::TypeClass_def::GroundVehicle); + ppmTypeClass.insert(ParticipantManagement::TypeClass::Human); + ppmTypeClass.insert(ParticipantManagement::TypeClass::GroundVehicle); - ppmTypeClass.insert(ParticipantManagement::TypeClass_def::VehicleWithGear); - ppmTypeClass.insert(ParticipantManagement::TypeClass_def::WeaponSystem); + ppmTypeClass.insert(ParticipantManagement::TypeClass::VehicleWithGear); + ppmTypeClass.insert(ParticipantManagement::TypeClass::WeaponSystem); - ppmTypeClass.insert(ParticipantManagement::TypeClass_def::Aircraft); + ppmTypeClass.insert(ParticipantManagement::TypeClass::Aircraft); QStringList typeClassList; typeClassList = m_opSettings->value(m_ocDemandFilterGroupString, QStringLiteral("TypeClass"),-1).toStringList(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp index ea8907f5b..01f005620 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OcSituationClient/Gui/ParticipantInfoOc/osc_participant_info.cpp @@ -226,8 +226,8 @@ void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagem if (data.stateHistory().size() > 0) { const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == ParticipantManagement::TypeClass::Human ? - ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries : - ProjectDataManagement::VulnerabilityClass_def::VehicleDamages; + ProjectDataManagement::VulnerabilityClass::SoldierInjuries : + ProjectDataManagement::VulnerabilityClass::VehicleDamages; const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(data.stateHistory()); m_ui->lblStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc)); @@ -248,7 +248,7 @@ void OcParticipantInfo::onDynamicParticipantDataChanged(const ParticipantManagem - if (!data.specialSensorDataState() || m_typeClass == ParticipantManagement::TypeClass_def::Aircraft) + if (!data.specialSensorDataState() || m_typeClass == ParticipantManagement::TypeClass::Aircraft) { m_ui->lblSpecialSensorState->hide(); m_ui->lbSpecialSensorState->hide(); @@ -353,74 +353,74 @@ void OcParticipantInfo::showSpecialSensorData(int specialSensorData) QString strSpecialSensorData; switch (specialSensorDataState) { - case ParticipantManagement::SpecialSensorStatus_def::ChemicalDetectionFunction_NotOperational: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ChemicalDetectionFunction_NotOperational); + case ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_NotOperational: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_NotOperational); break; - case ParticipantManagement::SpecialSensorStatus_def::ChemicalDetectionFunction_Detecting: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ChemicalDetectionFunction_Detecting); + case ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_Detecting: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ChemicalDetectionFunction_Detecting); break; - case ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_NotOperational: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_NotOperational); + case ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_NotOperational: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_NotOperational); break; - case ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_Test: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_Test); + case ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_Test: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_Test); break; - case ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_DetectingAir: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::NBCDetectionAccessory_DetectingAir); + case ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_DetectingAir: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::NBCDetectionAccessory_DetectingAir); break; - case ParticipantManagement::SpecialSensorStatus_def::AVLB_Mounted: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::AVLB_Mounted); + case ParticipantManagement::SpecialSensorStatus::AVLB_Mounted: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Mounted); break; - case ParticipantManagement::SpecialSensorStatus_def::AVLB_Deployed: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::AVLB_Deployed); + case ParticipantManagement::SpecialSensorStatus::AVLB_Deployed: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Deployed); break; - case ParticipantManagement::SpecialSensorStatus_def::AVLB_Mounting: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::AVLB_Mounting); + case ParticipantManagement::SpecialSensorStatus::AVLB_Mounting: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Mounting); break; - case ParticipantManagement::SpecialSensorStatus_def::AVLB_Deploying: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::AVLB_Deploying); + case ParticipantManagement::SpecialSensorStatus::AVLB_Deploying: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::AVLB_Deploying); break; - case ParticipantManagement::SpecialSensorStatus_def::MineLayer_Operational: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineLayer_Operational); + case ParticipantManagement::SpecialSensorStatus::MineLayer_Operational: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineLayer_Operational); break; - case ParticipantManagement::SpecialSensorStatus_def::MineLayer_Laying: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineLayer_Laying); + case ParticipantManagement::SpecialSensorStatus::MineLayer_Laying: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineLayer_Laying); break; - case ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_March: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_March); + case ParticipantManagement::SpecialSensorStatus::MineClearingFunction_March: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_March); break; - case ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_ReadyToClear: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_ReadyToClear); + case ParticipantManagement::SpecialSensorStatus::MineClearingFunction_ReadyToClear: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_ReadyToClear); break; - case ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_Clearing: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineClearingFunction_Clearing); + case ParticipantManagement::SpecialSensorStatus::MineClearingFunction_Clearing: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineClearingFunction_Clearing); break; - case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_NotOperational: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_NotOperational); + case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_NotOperational: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_NotOperational); break; - case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_ParameterInput: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_ParameterInput); + case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ParameterInput: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ParameterInput); break; - case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_ReadyToDeploy: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_ReadyToDeploy); + case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy); break; - case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_Deploying: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_Deploying); + case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Deploying: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Deploying); break; - case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_Resupply: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_Resupply); + case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Resupply: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_Resupply); break; - case ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_FinishDeploying: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::MineTrowingFunction_FinishDeploying); + case ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_FinishDeploying: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::MineTrowingFunction_FinishDeploying); break; - case ParticipantManagement::SpecialSensorStatus_def::ADLER_Operational: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ADLER_Operational); + case ParticipantManagement::SpecialSensorStatus::ADLER_Operational: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ADLER_Operational); break; - case ParticipantManagement::SpecialSensorStatus_def::ADLER_ConditionallyOperational: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ADLER_ConditionallyOperational); + case ParticipantManagement::SpecialSensorStatus::ADLER_ConditionallyOperational: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ADLER_ConditionallyOperational); break; - case ParticipantManagement::SpecialSensorStatus_def::ADLER_NotOperational: - strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus_def::ADLER_NotOperational); + case ParticipantManagement::SpecialSensorStatus::ADLER_NotOperational: + strSpecialSensorData = toString(ParticipantManagement::SpecialSensorStatus::ADLER_NotOperational); break; default: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp index 69ed8fbcf..9dffdac06 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_detailed_chart_model.cpp @@ -27,23 +27,23 @@ QVariant DetailedChartModel::data(const QModelIndex &index, int role) const switch (index.column()) { case COMBAT_READY: - return m_participantStates.value(ProjectDataManagement::VulnerabilityState::CombatReady).size(); + return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady).size(); case LIGHT_DAMAGE: - return m_participantStates.value(ProjectDataManagement::VulnerabilityState::LightDamage).size(); + return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage).size(); case MEDIUM_DAMAGE: - return m_participantStates.value(ProjectDataManagement::VulnerabilityState::MediumDamage).size(); + return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage).size(); case HEAVY_DAMAGE: - return m_participantStates.value(ProjectDataManagement::VulnerabilityState::HeavyDamage).size(); + return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage).size(); case MOBILITY_KILL: - return m_participantStates.value(ProjectDataManagement::VulnerabilityState::MobilityKill).size(); + return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill).size(); case VISIBLE_MOBILITY_KILL: - return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VisibleMobilityKill).size(); + return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill).size(); case WEAPON_SYSTEM_DAMAGE: - return m_participantStates.value(ProjectDataManagement::VulnerabilityState::WeaponSystemDamage).size(); + return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage).size(); case VISIBLE_WEAPON_SYSTEM_DAMAGE: - return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage).size(); + return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage).size(); case CATASTROPHIC_KILL: - return m_participantStates.value(ProjectDataManagement::VulnerabilityState::CatastrophicKill).size(); + return m_participantStates.value(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill).size(); default: return QVariant(); } @@ -58,23 +58,23 @@ QVariant DetailedChartModel::headerData(int section, Qt::Orientation orientation switch (section) { case COMBAT_READY: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CombatReady); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady); case LIGHT_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::LightDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage); case MEDIUM_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::MediumDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage); case HEAVY_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::HeavyDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage); case MOBILITY_KILL: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::MobilityKill); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill); case VISIBLE_MOBILITY_KILL: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VisibleMobilityKill); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill); case WEAPON_SYSTEM_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::WeaponSystemDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage); case VISIBLE_WEAPON_SYSTEM_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage); case CATASTROPHIC_KILL: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CatastrophicKill); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill); default: return QVariant(); } @@ -87,7 +87,7 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage const ParticipantManagement::StateInformation &stateInfo = m_config.ppmDtc->youngestStateInformation(data.stateHistory()); if (!m_config.participantIds.contains(data.participantId()) || - stateInfo.vulnerabilityState() > ProjectDataManagement::VulnerabilityState::CatastrophicKill) + stateInfo.vulnerabilityState() > ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) return; @@ -102,15 +102,15 @@ void DetailedChartModel::onDynamicParticipantDataChanged(const ParticipantManage DetailedChartModel::DetailedChartModel(const AbstractChartModel::ChartConfig &config, QObject *parent) : AbstractChartModel(config, parent) .getNGLLogger("OnlineReportDetailedChartModel")), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { - m_participantStates.insert(ProjectDataManagement::VulnerabilityState::CombatReady, QSet()); - m_participantStates.insert(ProjectDataManagement::VulnerabilityState::LightDamage, QSet()); - m_participantStates.insert(ProjectDataManagement::VulnerabilityState::MediumDamage, QSet()); - m_participantStates.insert(ProjectDataManagement::VulnerabilityState::HeavyDamage, QSet()); - m_participantStates.insert(ProjectDataManagement::VulnerabilityState::MobilityKill, QSet()); - m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VisibleMobilityKill, QSet()); - m_participantStates.insert(ProjectDataManagement::VulnerabilityState::WeaponSystemDamage, QSet()); - m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage, QSet()); - m_participantStates.insert(ProjectDataManagement::VulnerabilityState::CatastrophicKill, QSet()); + m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady, QSet()); + m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage, QSet()); + m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage, QSet()); + m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage, QSet()); + m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill, QSet()); + m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill, QSet()); + m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage, QSet()); + m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage, QSet()); + m_participantStates.insert(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill, QSet()); auto cb = [this](const ParticipantManagement::DynamicParticipantData & data) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp index 67e02c42a..8c6d4bcac 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OnlineReports/Gui/OnlineReports/Charts/ore_simple_chart_model.cpp @@ -44,9 +44,9 @@ QVariant SimpleChartModel::headerData(int section, Qt::Orientation orientation, switch (section) { case 0: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CombatReady); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady); case 1: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CatastrophicKill); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill); default: return QVariant(); } @@ -64,7 +64,7 @@ void SimpleChartModel::onDynamicParticipantDataChanged(const ParticipantManageme DEBUG_LOG(m_logger) << "Participant id = " << data.participantId(); DEBUG_LOG(m_logger) << "State Info Vulnerability = " << stateInfo.vulnerabilityState(); - if (stateInfo.vulnerabilityState() < ProjectDataManagement::VulnerabilityState::CatastrophicKill) + if (stateInfo.vulnerabilityState() < ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) setCombatReady(data.participantId()); else setKilled(data.participantId()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp index dd06d3264..b301da9a9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Common/operator_dialog_model.cpp @@ -92,7 +92,7 @@ bool OperatorManagementDialogModel::initModel(LtsSession::LtsSession *session, c { auto cb = [this](const Group &group) { - if (group.type() == GroupType_def::PresetGroup) + if (group.type() == GroupType::PresetGroup) m_roles[group.id()] = QString::fromStdString(group.name()); }; dtc->groups(cb); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp index bca161972..17fdbeaa7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_dialog_gui_plugin.cpp @@ -172,9 +172,9 @@ AssetManagement::Asset InterfaceImpl::findWorkstation(const QString &wsName) auto it = std::find_if(assets.constBegin(), assets.constEnd(), [wsName](const AssetManagement::Asset &as) { - return ((as.assetTypeId() == AssetManagement::AssetType_def::Workstation || - as.assetTypeId() == AssetManagement::AssetType_def::ProjectionWorkstation || - as.assetTypeId() == AssetManagement::AssetType_def::MobileAfterActionVehicle) + return ((as.assetTypeId() == AssetManagement::AssetType::Workstation || + as.assetTypeId() == AssetManagement::AssetType::ProjectionWorkstation || + as.assetTypeId() == AssetManagement::AssetType::MobileAfterActionVehicle) #if !defined(QUICK_DEBUG) || !defined(LTS_DEBUG) && QString::fromStdString(as.name()).toUpper() == wsName.toUpper() #endif diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp index 3f17afdc9..76a6e31ee 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/Login/opm_login_remote_shutdown_dialog.cpp @@ -53,7 +53,7 @@ bool RemoteShutdownDialog::init(const std::shared_ptrassets([this, &asmDtc, &wsMap](const AssetManagement::Asset & data) { - if (data.assetTypeId() == AssetManagement::AssetType_def::Workstation && m_thisWsId != data.id()) + if (data.assetTypeId() == AssetManagement::AssetType::Workstation && m_thisWsId != data.id()) { wsMap.insert(QString::fromStdString(asmDtc->location(data.locationId()).description()), WorkstationModel::WorkstationInfo(data.id(), QString::fromStdString(data.name()), data.subLocation())); @@ -167,7 +167,7 @@ std::vector RemoteShutdownDialog::parseCurrentSelection() const void RemoteShutdownDialog::onConfirmActionClicked() { AssetManagement::ShutdownAction shutdownAction = - static_cast(m_ui->cbSelectAction->currentIndex()); + static_cast(m_ui->cbSelectAction->currentIndex()); if (shutdownAction == AssetManagement::ShutdownAction::NoAction) { LtsWidgets::LtsMessageDialog::showMessage(this, tr("An Action has to be selected!"), tr("Error")); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp index 55aa7efe4..ee8968eae 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_dialog.cpp @@ -41,7 +41,7 @@ void GroupEditDialog::init(const Group &group, m_ui->cbRoles->addItem(tr("---"), 0); auto cbGroup = [this](const Group &group) { - if (group.type() == GroupType_def::PresetGroup) + if (group.type() == GroupType::PresetGroup) m_ui->cbRoles->addItem(OperatorManagement::trGroupName(group.name()), group.id()); }; dtc->groups(cbGroup); @@ -50,13 +50,13 @@ void GroupEditDialog::init(const Group &group, int rolePresetId = user.rolePresetId().is_set() ? user.rolePresetId().get() : m_rolePresetId; m_ui->cbRoles->setCurrentIndex(m_ui->cbRoles->findData(rolePresetId)); - if (m_group.type() == GroupType_def::OperatorGroup) + if (m_group.type() == GroupType::OperatorGroup) { m_ui->leName->setEnabled(false); m_ui->leDescription->setEnabled(false); } - if (m_group.type() == GroupType_def::PresetGroup && m_group.id() != 0) + if (m_group.type() == GroupType::PresetGroup && m_group.id() != 0) m_ui->leName->setEnabled(false); connect(m_ui->pbLoadPreset, &QPushButton::clicked, this, &GroupEditDialog::onPbPresetClicked); @@ -73,9 +73,9 @@ void GroupEditDialog::init(const Group &group, connect(m_ui->dvMemberOf, &LtsDataView::LtsDataView::customContextMenuRequested, this, &GroupEditDialog::onContextMenuRequested); #endif - if (m_group.type() == GroupType_def::PresetGroup) + if (m_group.type() == GroupType::PresetGroup) setOnlineHelpFilename(QStringLiteral("Administrator-Presets")); - else if (m_group.type() == GroupType_def::OperatorGroup) + else if (m_group.type() == GroupType::OperatorGroup) setOnlineHelpFilename(QStringLiteral("Administrator-Operators")); } @@ -103,9 +103,9 @@ GroupEditDialog::~GroupEditDialog() { delete m_ui; } void GroupEditDialog::retranslate() { - if (m_group.type() == GroupType_def::PresetGroup) + if (m_group.type() == GroupType::PresetGroup) translate(m_ui, OperatorManagement::trGroupName(m_group.name()), m_group.id() < 1, tr("Preset")); - else if (m_group.type() == GroupType_def::OperatorGroup) + else if (m_group.type() == GroupType::OperatorGroup) translate(m_ui, OperatorManagement::trGroupName(m_group.name()), m_group.id() < 1, tr("Privileges")); } @@ -133,7 +133,7 @@ bool GroupEditDialog::apply() if (m_group.id() == 0) { - if (m_group.type() == GroupType_def::OperatorGroup) + if (m_group.type() == GroupType::OperatorGroup) { emit newGroups(memberOf, m_ui->cbRoles->currentData().toInt()); return true; @@ -142,7 +142,7 @@ bool GroupEditDialog::apply() { const std::string name = m_ui->leName->text().toStdString(); const std::string description = m_ui->leDescription->text().toStdString(); - GroupCreateRequest req(name, description, GroupType_def::PresetGroup, false, memberOf); + GroupCreateRequest req(name, description, GroupType::PresetGroup, false, memberOf); m_requestHelper->addRequest([this, req]() { return m_ftc->groupCreateRequest(req, this); }); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp index 5a0f50aac..705b2eb66 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_edit_member_of_model.cpp @@ -50,7 +50,7 @@ QDataStream &operator>>(QDataStream &ds, Group &gp) gp.description(description.toStdString()); LtsUtils::convert(aclAllow, gp.aclAllow()); LtsUtils::convert(aclDeny, gp.aclDeny()); - gp.type(static_cast(type)); + gp.type(static_cast(type)); gp.isDeleted(isDeleted); gp.isHidden(isHidden); LtsUtils::convert(isMemberOf, gp.isMemberOf()); @@ -215,7 +215,7 @@ MembershipModel::MembershipModel(QObject *parent, auto cbGroup = [this, disabledFunctionality](const Group &group) { - if (group.type() == GroupType_def::StandardGroup) + if (group.type() == GroupType::StandardGroup) { if (disabledFunctionality.contains(group.id()) || group.isHidden()) return; @@ -232,7 +232,7 @@ MembershipModel::MembershipModel(QObject *parent, const std::vector isMemberOf = opGroupItem->data().value().isMemberOf(); auto cbGroup2 = [this, &isMemberOf, opGroupItem] (const Group &group) { - if (group.type() == GroupType_def::AclGroup && contains(isMemberOf, group.id())) + if (group.type() == GroupType::AclGroup && contains(isMemberOf, group.id())) opGroupItem->appendChild(createItem(QVariant::fromValue(group), QIcon())); }; dtc->groups(cbGroup2); @@ -261,7 +261,7 @@ QVariant MembershipModel::data(const QModelIndex &index, int role) const if (role == Qt::CheckStateRole) { Group group = getGroupData(index); - if (!m_bRowsAreCheckable || index.column() != 0 || group.type() != GroupType_def::StandardGroup) + if (!m_bRowsAreCheckable || index.column() != 0 || group.type() != GroupType::StandardGroup) return NGLTreeModel::data(index, role); return item->bIsChecked ? Qt::Checked : Qt::Unchecked; @@ -314,7 +314,7 @@ Qt::ItemFlags MembershipModel::flags(const QModelIndex &index) const { Group group = getGroupData(index); auto ret = NGLTreeModel::flags(index); - if (m_bRowsAreCheckable && index.column() == 0 && group.type() == GroupType_def::StandardGroup) + if (m_bRowsAreCheckable && index.column() == 0 && group.type() == GroupType::StandardGroup) ret |= Qt::ItemIsUserCheckable; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp index 1f1ef154c..870c740e2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/group_model.cpp @@ -34,7 +34,7 @@ bool GroupModel::initModel(const std::shared_ptr &dtc, connect(m_dtc.get(), &OperatorManagement::Interface::Dtc::groupChanged, this, &GroupModel::onDataChanged); m_dtc->groups([this](const OperatorManagement::Group &group) { - if (group.type() == GroupType_def::PresetGroup) + if (group.type() == GroupType::PresetGroup) insertRow(group); }); return true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp index f410bb2ff..68e032a46 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/operator_edit_dialog.cpp @@ -263,7 +263,7 @@ void OperatorEditDialog::showACLs() grp.id(0); grp.name(m_ui->leOperator->text().toStdString()); grp.description(m_ui->leInfo->text().toStdString()); - grp.type(GroupType_def::OperatorGroup); + grp.type(GroupType::OperatorGroup); grp.isMemberOf(m_groups); connect(dlg, &GroupEditDialog::newGroups, this, &OperatorEditDialog::onNewGroups); dlg->init(grp, m_dtc, m_ftc); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.cpp index 559ab75b6..b2974011c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/OperatorManagement/Gui/OperatorEdit/preset_dialog.cpp @@ -76,7 +76,7 @@ void PresetDialog::enaDisa() m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, cntSelectedRows == 1 ); bool deletable = cntSelectedRows > 0 && - (m_model->getRowData(selectedRows.at(0).row()).type() == GroupType_def::PresetGroup); + (m_model->getRowData(selectedRows.at(0).row()).type() == GroupType::PresetGroup); m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Remove, deletable ); } @@ -95,7 +95,7 @@ void PresetDialog::onAddGroup() { GroupEditDialog *dialog = new GroupEditDialog(this); Group grp; - grp.type(GroupType_def::PresetGroup); + grp.type(GroupType::PresetGroup); dialog->init(grp, m_dtc, m_ftc); addDialog(dialog, m_menuGroup, QLatin1String("NewPreset"), LtsWidgets::LayoutArea::eDialogTab); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp index 99379d448..6a4615a37 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_item_widget_base.cpp @@ -18,7 +18,7 @@ namespace ParticipantManagement -static int s_lastTypeClassUsed = ParticipantManagement::TypeClass_def::Human; +static int s_lastTypeClassUsed = ParticipantManagement::TypeClass::Human; static int s_lastTypeUsed = -1; ParticipantEditItemWidgetBase::ParticipantEditItemWidgetBase(bool asSupportService, @@ -140,7 +140,7 @@ void ParticipantEditItemWidgetBase::onFillTypeCb() { QSignalBlocker blocker(m_ui->cbType); - TypeClass currentClass(static_cast(m_ui->cbTypeClass->currentData().toInt())); + TypeClass currentClass(static_cast(m_ui->cbTypeClass->currentData().toInt())); m_ppmGuiCbxIfc->fillTypeComboBox(m_ui->cbType, currentClass); if (!m_disabledTypeIds.isEmpty()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp index 22b455536..6fc343272 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_edit_model.cpp @@ -101,7 +101,7 @@ static ParticipantData qVariantToParticipant(const QVariant &data) pd.designator(designator.toStdString()); pd.tacticalIdentifier(tacticalIdentifier.toStdString()); pd.info(info.toStdString()); - pd.assignState(static_cast(assignState)); + pd.assignState(static_cast(assignState)); pd.isSimulated(isSimulated); pd.isDeleted(isDeleted); pd.modId(modId); @@ -376,7 +376,7 @@ bool ParticipantEditModel::canDropMimeData(const QMimeData *data, qDeleteAll(tiSources); TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId()); - bool isDataTypeClassSupport = dataTypeClass == TypeClass::inner_enum::SupportEntity || dataTypeClass == TypeClass::inner_enum::SupportUnit; + bool isDataTypeClassSupport = dataTypeClass == TypeClass::SupportEntity || dataTypeClass == TypeClass::SupportUnit; bool isOwnTypeClassSupport = m_partyId == 1; if (isOwnTypeClassSupport != isDataTypeClassSupport) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp index e121ffb3f..3a554da01 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.cpp @@ -76,7 +76,7 @@ void FiringUnitValidator::fetchArtilleryTypes() if (!isArtilleryType(type)) return; - if (type.typeClass() == ParticipantManagement::TypeClass::inner_enum::Unit) + if (type.typeClass() == ParticipantManagement::TypeClass::Unit) m_firingUnitTypeIds.insert(type.id()); else m_artilleryParticipantTypeIds.insert(type.id()); @@ -111,24 +111,24 @@ bool FiringUnitValidator::isArtilleryWeaponSystem(int typeId) const bool FiringUnitValidator::isSameGearClassArtillery(int typeIdA, int typeIdB) const { - const ProjectDataManagement::GearClass::type gearClassA = getGearClassType(typeIdA); + const ProjectDataManagement::GearClass gearClassA = getGearClassType(typeIdA); if (gearClassA == ProjectDataManagement::GearClass::GearClass_Unknown) return false; - const ProjectDataManagement::GearClass::type gearClassB = getGearClassType(typeIdB); + const ProjectDataManagement::GearClass gearClassB = getGearClassType(typeIdB); return gearClassA == gearClassB; } -ProjectDataManagement::GearClass::type FiringUnitValidator::getGearClassType(int typeId) const +ProjectDataManagement::GearClass FiringUnitValidator::getGearClassType(int typeId) const { const Type type = m_ppmDtc->type(typeId); const QJsonDocument properties = QJsonDocument::fromJson(QByteArray::fromStdString(type.properties())); const QJsonObject propertiesObject = properties.object(); const int gearClassId = propertiesObject.value(QStringLiteral("gearClassId")).toInt(ProjectDataManagement::GearClass::GearClass_Unknown); - return static_cast(gearClassId); + return static_cast(gearClassId); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h index 05ed3732b..5a6777d13 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_firing_unit_validator.h @@ -43,7 +43,7 @@ public: return !restrictions.testFlag(IS_AT_MAX_CAPACITY); } template - ProjectDataManagement::GearClass::type getGearClassType(const T *model, const QModelIndex &participantIndex) const + ProjectDataManagement::GearClass getGearClassType(const T *model, const QModelIndex &participantIndex) const { if (!model) return {}; @@ -127,7 +127,7 @@ public: bool isArtilleryWeaponSystem(int typeId) const; bool isSameGearClassArtillery(int typeIdA, int typeIdB) const; - ProjectDataManagement::GearClass::type getGearClassType(int typeId) const; + ProjectDataManagement::GearClass getGearClassType(int typeId) const; private: int getTypeId(const ParticipantEditModel *model, const QModelIndex &index) const; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp index 40dc14f18..e418123bb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_tree_edit_handler.cpp @@ -58,9 +58,9 @@ bool ParticipantTreeEditHandler::isContainer() const return false; if (m_asSupportService) - return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::SupportUnit; + return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::SupportUnit; - return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::Unit; + return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::Unit; } QVector ParticipantTreeEditHandler::usedEquipmentNumbers() const diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp index 78a15763c..235bcc1f6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/Common/participant_vulnerability_types.cpp @@ -15,21 +15,21 @@ static ProjectDataManagement::VulnerabilityClass vulnerabilityClassFromTypeClass switch (tc.underlying()) { case TypeClass::Human: - return ProjectDataManagement::VulnerabilityClass::SoldierInjuries; + return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries; case TypeClass::GroundVehicle: case TypeClass::Vessel: case TypeClass::VehicleWithGear: case TypeClass::WeaponSystem: - return ProjectDataManagement::VulnerabilityClass::VehicleDamages; + return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_VehicleDamages; case TypeClass::SupportEntity: case TypeClass::SupportUnit: case TypeClass::Unit: case TypeClass::Unknown: case TypeClass::Aircraft: - return ProjectDataManagement::VulnerabilityClass::Unknown; + return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_Unknown; } Q_ASSERT(false); - return ProjectDataManagement::VulnerabilityClass::Unknown; + return ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_Unknown; } @@ -60,20 +60,20 @@ QVector vulnerabilityStatesForTypeCla { QVector ret; - ret += VulnerabilityState::CombatReady; + ret += VulnerabilityState::VulnerabilityState_CombatReady; if (hasVulnerabilityStateLightDamage) - ret += VulnerabilityState::LightDamage; + ret += VulnerabilityState::VulnerabilityState_LightDamage; if (hasVulnerabilityStateMediumDamage) - ret += VulnerabilityState::MediumDamage; + ret += VulnerabilityState::VulnerabilityState_MediumDamage; if (hasVulnerabilityStateHeavyDamage) - ret += VulnerabilityState::HeavyDamage; + ret += VulnerabilityState::VulnerabilityState_HeavyDamage; if (hasVulnerabilityStateWeaponSystemDamage) - ret += VulnerabilityState::WeaponSystemDamage; + ret += VulnerabilityState::VulnerabilityState_WeaponSystemDamage; if (hasVulnerabilityStateVisibleWeaponSystemDamage) - ret += VulnerabilityState::VisibleWeaponSystemDamage; + ret += VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage; if (hasVulnerabilityStateTemporarySeverance) - ret += VulnerabilityState::TemporarySeverance; - ret += VulnerabilityState::CatastrophicKill; + ret += VulnerabilityState::VulnerabilityState_TemporarySeverance; + ret += VulnerabilityState::VulnerabilityState_CatastrophicKill; return ret; } case TypeClass::GroundVehicle: @@ -84,24 +84,24 @@ QVector vulnerabilityStatesForTypeCla QVector ret; - ret += VulnerabilityState::CombatReady; + ret += VulnerabilityState::VulnerabilityState_CombatReady; if (hasVulnerabilityStateLightDamage) - ret += VulnerabilityState::LightDamage; + ret += VulnerabilityState::VulnerabilityState_LightDamage; if (hasVulnerabilityStateMediumDamage) - ret += VulnerabilityState::MediumDamage; + ret += VulnerabilityState::VulnerabilityState_MediumDamage; if (hasVulnerabilityStateHeavyDamage) - ret += VulnerabilityState::HeavyDamage; + ret += VulnerabilityState::VulnerabilityState_HeavyDamage; if (hasVulnerabilityStateMobilityKill) - ret += VulnerabilityState::MobilityKill; + ret += VulnerabilityState::VulnerabilityState_MobilityKill; if (hasVulnerabilityStateVisibleMobilityKill) - ret += VulnerabilityState::VisibleMobilityKill; + ret += VulnerabilityState::VulnerabilityState_VisibleMobilityKill; if (hasVulnerabilityStateWeaponSystemDamage) - ret += VulnerabilityState::WeaponSystemDamage; + ret += VulnerabilityState::VulnerabilityState_WeaponSystemDamage; if (hasVulnerabilityStateVisibleWeaponSystemDamage) - ret += VulnerabilityState::VisibleWeaponSystemDamage; + ret += VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage; if (hasVulnerabilityStateTemporarySeverance) - ret += VulnerabilityState::TemporarySeverance; - ret += VulnerabilityState::CatastrophicKill; + ret += VulnerabilityState::VulnerabilityState_TemporarySeverance; + ret += VulnerabilityState::VulnerabilityState_CatastrophicKill; return ret; } case TypeClass::SupportEntity: @@ -110,7 +110,7 @@ QVector vulnerabilityStatesForTypeCla return {}; case TypeClass::Unknown: case TypeClass::Aircraft: - return { VulnerabilityState::CombatReady, VulnerabilityState::CatastrophicKill }; + return { VulnerabilityState::VulnerabilityState_CombatReady, VulnerabilityState::VulnerabilityState_CatastrophicKill }; } Q_ASSERT(false); return {}; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp index e6a8a9427..bc45fe3d9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/MSDL/msdl/msdl_export.cpp @@ -221,11 +221,11 @@ msdl_1::MilitaryScenarioType::ForceSides_type Private::createTagForceSides(const ParticipantManagement::Role role = itRelationship.value().role(); msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::UNK; - if (role == ParticipantManagement::Role_def::Enemy) + if (role == ParticipantManagement::Role::Enemy) relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::HO; - else if (role == ParticipantManagement::Role_def::Friend) + else if (role == ParticipantManagement::Role::Friend) relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::FR; - else if (role == ParticipantManagement::Role_def::Neutral) + else if (role == ParticipantManagement::Role::Neutral) relType = msdl_1::ForceSideType::Associations_type::Association_type::Relationship_type::NEUTRL; msdl_1::ForceSideType::Associations_type::Association_type aType(itRelationship.key().toStdString().c_str(), relType); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp index a8ea40468..fee7a6524 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantEdit/participant_pool_model.cpp @@ -375,9 +375,9 @@ bool ParticipantPoolModel::isValidTypeClass(int typeId) const const TypeClass tc = m_dtc->type(typeId).typeClass(); switch (tc.underlying()) { - case TypeClass_def::Unit: + case TypeClass::Unit: return !m_asSupportService; - case TypeClass_def::SupportUnit: + case TypeClass::SupportUnit: return m_asSupportService; default: break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.cpp index 0835509f6..8e0c21908 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_dialog.cpp @@ -381,8 +381,8 @@ void ParticipantConfigDialog::fillCbx() m_ui->cbStatus->addItem(tr("No Change"), -1); if ( m_isTarget) { - m_ui->cbStatus->addItem(tr("CombatReady"), ProjectDataManagement::VulnerabilityState::CombatReady); - m_ui->cbStatus->addItem(tr("Catastrophic Kill / Killed"), ProjectDataManagement::VulnerabilityState::CatastrophicKill); + m_ui->cbStatus->addItem(tr("CombatReady"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady); + m_ui->cbStatus->addItem(tr("Catastrophic Kill / Killed"), ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill); } else insertVulnerabilityStates(m_ui->cbStatus, m_typeClass); @@ -433,25 +433,25 @@ void ParticipantConfigDialog::fillVitalityCbx() m_ui->cbVitality->setEnabled(false); break; } - case ProjectDataManagement::VulnerabilityState::LightDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage: { for (int i = 90 ; i >= 70; i -= 10) m_ui->cbVitality->addItem(QString::number(i), i); break; } - case ProjectDataManagement::VulnerabilityState::MediumDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage: { for (int i = 60 ; i >= 40; i -= 10) m_ui->cbVitality->addItem(QString::number(i), i); break; } - case ProjectDataManagement::VulnerabilityState::HeavyDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage: { for (int i = 30 ; i >= 10; i -= 10) m_ui->cbVitality->addItem(QString::number(i), i); break; } - case ProjectDataManagement::VulnerabilityState::CombatReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady: { m_ui->cbVitality->removeItem(0); m_ui->cbVitality->addItem(QString::number(100), 100); @@ -585,7 +585,7 @@ bool ParticipantConfigDialog::apply() } else { - const ProjectDataManagement::VulnerabilityState state = static_cast(m_ui->cbStatus->currentData().toInt()); + const ProjectDataManagement::VulnerabilityState state = static_cast(m_ui->cbStatus->currentData().toInt()); if (m_ui->cbStatus->currentIndex() == 1 || m_ui->cbResetGearCharge->isChecked() || m_ui->cbResetMedSupplies->isChecked() || @@ -595,7 +595,7 @@ bool ParticipantConfigDialog::apply() req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId()); req.restockCharges(m_ui->cbResetGearCharge->isChecked()); req.resetManipulation(m_ui->cbResetManipulation->isChecked()); - req.resetVulnerabilityState(state == ProjectDataManagement::VulnerabilityState::CombatReady); + req.resetVulnerabilityState(state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady); req.restockSanitationMaterial(m_ui->cbResetMedSupplies->isChecked()); req.participantIds(participantIds); m_requestHelper->addRequest([req, this]() @@ -610,7 +610,7 @@ bool ParticipantConfigDialog::apply() { ModifyStateRequest req; req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId()); - req.vulnerabilityState(state == ProjectDataManagement::VulnerabilityState::NoChange ? ProjectDataManagement::VulnerabilityState::CombatReady : state); + req.vulnerabilityState(state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange ? ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady : state); req.participantIds(participantIds); req.vitality(m_ui->cbVitality->currentData().toInt()); if(req.vitality() > 0) @@ -626,24 +626,24 @@ bool ParticipantConfigDialog::apply() if (m_modeChanged) { - ProjectDataManagement::LanguageConfiguration lang = static_cast(m_ui->cbLanguage->currentData().toInt()); - ProjectDataManagement::OperationMode opMode = static_cast(m_ui->cbCheating->currentData().toInt()); - ProjectDataManagement::WphMode helmet = static_cast(m_ui->cbHelmet->currentData().toInt()); - ProjectDataManagement::WphMode vest = static_cast(m_ui->cbVest->currentData().toInt()); - ProjectDataManagement::PersonalProtection personalProtection = static_cast(m_ui->cbPersonalProtection->currentData().toInt()); - ProjectDataManagement::ProtectionLevel protectionLevel = static_cast(m_ui->cbProtectionLevel->currentData().toInt()); + ProjectDataManagement::LanguageConfiguration lang = static_cast(m_ui->cbLanguage->currentData().toInt()); + ProjectDataManagement::OperationMode opMode = static_cast(m_ui->cbCheating->currentData().toInt()); + ProjectDataManagement::WphMode helmet = static_cast(m_ui->cbHelmet->currentData().toInt()); + ProjectDataManagement::WphMode vest = static_cast(m_ui->cbVest->currentData().toInt()); + ProjectDataManagement::PersonalProtection personalProtection = static_cast(m_ui->cbPersonalProtection->currentData().toInt()); + ProjectDataManagement::ProtectionLevel protectionLevel = static_cast(m_ui->cbProtectionLevel->currentData().toInt()); ProjectDataManagement::HandgrenadeSearchMode grenadeSearch; if(!m_ui->cbGrenadeSearchMode->isHidden()) { - grenadeSearch = static_cast(m_ui->cbGrenadeSearchMode->currentData().toInt()); + grenadeSearch = static_cast(m_ui->cbGrenadeSearchMode->currentData().toInt()); } else { grenadeSearch = ProjectDataManagement::HandgrenadeSearchMode::NoChange; } - ProjectDataManagement::InternationalMode internationalMode = static_cast(m_ui->cbInternationalMode->currentData().toInt()); - ProjectDataManagement::ABCProtectionMode abcProtectionMode = static_cast(m_ui->cbABCProtectionMode->currentData().toInt()); + ProjectDataManagement::InternationalMode internationalMode = static_cast(m_ui->cbInternationalMode->currentData().toInt()); + ProjectDataManagement::ABCProtectionMode abcProtectionMode = static_cast(m_ui->cbABCProtectionMode->currentData().toInt()); int reactDecontMinutes = m_ui->slDecontamination->value() * 10; int reactMaintenanceMinutes = m_ui->slMaintenance->value() * 10; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp index b21ad63f2..ae25ffc9a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_config_model.cpp @@ -100,7 +100,7 @@ static ParticipantData qVariantToParticipant(const QVariant &data) pd.designator(designator.toStdString()); pd.tacticalIdentifier(tacticalIdentifier.toStdString()); pd.info(info.toStdString()); - pd.assignState(static_cast(assignState)); + pd.assignState(static_cast(assignState)); pd.isSimulated(isSimulated); pd.isDeleted(isDeleted); pd.modId(modId); @@ -386,7 +386,7 @@ bool ParticipantConfigModel::canDropMimeData(const QMimeData *data, qDeleteAll(tiSources); TypeClass dataTypeClass = typeClassIdFromTypeId(pdSource.typeId()); - bool isDataTypeClassSupport = dataTypeClass == TypeClass::inner_enum::SupportEntity || dataTypeClass == TypeClass::inner_enum::SupportUnit; + bool isDataTypeClassSupport = dataTypeClass == TypeClass::SupportEntity || dataTypeClass == TypeClass::SupportUnit; bool isOwnTypeClassSupport = m_partyId == 1; if (isOwnTypeClassSupport != isDataTypeClassSupport) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp index e51c0220b..b07d4cf72 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_history_dialog_model.cpp @@ -27,7 +27,7 @@ ParticipantHistoryDialogModel::ParticipantHistoryDialogModel(QObject *parent) }, parent) , m_ddsId(-1) - , m_vulnerabilityClass(ProjectDataManagement::VulnerabilityClass::SoldierInjuries) + , m_vulnerabilityClass(ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries) , m_dtc(nullptr) , m_pdmDtc(nullptr) {} @@ -49,8 +49,8 @@ bool ParticipantHistoryDialogModel::initModel(int dds_id, const auto typeClass = dtc->type(part.typeId()).typeClass(); m_vulnerabilityClass = (typeClass == TypeClass::Human) ? - ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries : - ProjectDataManagement::VulnerabilityClass_def::VehicleDamages; + ProjectDataManagement::VulnerabilityClass::SoldierInjuries : + ProjectDataManagement::VulnerabilityClass::VehicleDamages; reinitModel(m_dtc->dynamicParticipantData(m_ddsId).stateHistory()); return true; @@ -68,13 +68,13 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c if(data.originatorType().underlying() == ProjectDataManagement::StateChangeOriginator::Sanitation) return {}; - if (data.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::NotReady) + if (data.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady) return {}; std::bitset bits(data.vulnerabilityBits()); bits.set(data.vulnerabilityState().underlying()); - for (int i = ProjectDataManagement::VulnerabilityState_def::HeavyDamage; i >= 0; --i) + for (int i = ProjectDataManagement::VulnerabilityState::HeavyDamage; i >= 0; --i) { if (!bits.test(i)) continue; @@ -83,19 +83,19 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c break; } - if (bits.test(ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)) + if (bits.test(ProjectDataManagement::VulnerabilityState::CatastrophicKill)) { - for (int j = 0; j < ProjectDataManagement::VulnerabilityState_def::CatastrophicKill; ++j) + for (int j = 0; j < ProjectDataManagement::VulnerabilityState::CatastrophicKill; ++j) bits.reset(j); - bits.reset(ProjectDataManagement::VulnerabilityState_def::TemporarySeverance); + bits.reset(ProjectDataManagement::VulnerabilityState::TemporarySeverance); } QStringList sl; - for (int i = 0; i <= ProjectDataManagement::VulnerabilityState_def::CContamination; ++i) + for (int i = 0; i <= ProjectDataManagement::VulnerabilityState::CContamination; ++i) { if (!bits.test(i)) continue; - const ProjectDataManagement::VulnerabilityState vs(static_cast(i)); + const ProjectDataManagement::VulnerabilityState vs(static_cast(i)); sl += ProjectDataManagement::toString(vs, m_vulnerabilityClass); } sl.prepend(QLatin1String()); @@ -161,7 +161,7 @@ QVariant ParticipantHistoryDialogModel::dataInternal(const QModelIndex &index) c else if (data.originatorId() == 0) originator = tr("Exercise Control"); QStringList san; - san += QStringLiteral("%1 (%2 - %3) - ").arg(tr("Treatment"), originator, ParticipantManagement::toString(static_cast(data.originatorChargeTypeId()))); + san += QStringLiteral("%1 (%2 - %3) - ").arg(tr("Treatment"), originator, ParticipantManagement::toString(static_cast(data.originatorChargeTypeId()))); san += m_pdmDtc->sanitationProceduresList(data.sanitationProceduresTaken()); return san; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.cpp index 541b96e10..2df9bae52 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_hitline_info_dialog.cpp @@ -139,8 +139,8 @@ void HitLineInfoDialog::showHitLineInfos() ParticipantManagement::DynamicParticipantData data = m_dtc->dynamicParticipantData(m_participantInjury.id()); const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == TypeClass::Human ? - ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries : - ProjectDataManagement::VulnerabilityClass_def::VehicleDamages; + ProjectDataManagement::VulnerabilityClass::SoldierInjuries : + ProjectDataManagement::VulnerabilityClass::VehicleDamages; const StateInformation &lastState = m_dtc->youngestStateInformation(data.stateHistory()); m_ui->lblInjuryStatus->setText(ProjectDataManagement::toString(lastState.vulnerabilityState(), vc)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp index 91d9346dc..9d3068022 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_dialog.cpp @@ -530,8 +530,8 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici if (!data.stateHistory().empty()) { const ProjectDataManagement::VulnerabilityClass vc = m_typeClass == TypeClass::Human ? - ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries : - ProjectDataManagement::VulnerabilityClass_def::VehicleDamages; + ProjectDataManagement::VulnerabilityClass::SoldierInjuries : + ProjectDataManagement::VulnerabilityClass::VehicleDamages; //#define FAKE_HISTORY #ifdef FAKE_HISTORY @@ -591,7 +591,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici { DEBUG_LOG(m_logger) << "append N"; - const ProjectDataManagement::VulnerabilityState vs(static_cast(14)); + const ProjectDataManagement::VulnerabilityState vs(static_cast(14)); QString fullName = ProjectDataManagement::toString(vs); QString shortName; shortName.append(fullName[0]); @@ -602,7 +602,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici { DEBUG_LOG(m_logger) << "append B"; - const ProjectDataManagement::VulnerabilityState vs(static_cast(15)); + const ProjectDataManagement::VulnerabilityState vs(static_cast(15)); QString fullName = ProjectDataManagement::toString(vs); QString shortName; shortName.append(fullName[0]); @@ -613,7 +613,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici { DEBUG_LOG(m_logger) << "append C"; - const ProjectDataManagement::VulnerabilityState vs(static_cast(16)); + const ProjectDataManagement::VulnerabilityState vs(static_cast(16)); QString fullName = ProjectDataManagement::toString(vs); QString shortName; shortName.append(fullName[0]); @@ -628,10 +628,10 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici m_ui->lblKind->setText(QLatin1String("-")); else m_ui->lblKind->setText(m_pdmDtc->trVulnerabilityKindName(lastState.vulnerabilityKindId(), vc)); - if (m_showPvSan && vc == ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries ) + if (m_showPvSan && vc == ProjectDataManagement::VulnerabilityClass::SoldierInjuries ) { - if (lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady ) //Maybe there is some side effect to this like - //if (data.stateHistory().size() == 1 && lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady) + if (lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady ) //Maybe there is some side effect to this like + //if (data.stateHistory().size() == 1 && lastState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady) { QPalette pal = QApplication::palette(m_ui->lbKind); m_ui->lblKind->setPalette(pal); @@ -666,7 +666,7 @@ void ParticipantInfoDialog::onDynamicParticipantDataChanged(const DynamicPartici } else { - if (m_typeClass == TypeClass_def::Aircraft) + if (m_typeClass == TypeClass::Aircraft) { /* CTC_Apache_Sensor_DiffCorrections = 0x01, // Has GPS Differential Corrections @@ -917,74 +917,74 @@ void ParticipantInfoDialog::showSpecialSensorData(int specialSensorData) QString strSpecialSensorData; switch (specialSensorDataState) { - case SpecialSensorStatus_def::ChemicalDetectionFunction_NotOperational: - strSpecialSensorData = toString(SpecialSensorStatus_def::ChemicalDetectionFunction_NotOperational); + case SpecialSensorStatus::ChemicalDetectionFunction_NotOperational: + strSpecialSensorData = toString(SpecialSensorStatus::ChemicalDetectionFunction_NotOperational); break; - case SpecialSensorStatus_def::ChemicalDetectionFunction_Detecting: - strSpecialSensorData = toString(SpecialSensorStatus_def::ChemicalDetectionFunction_Detecting); + case SpecialSensorStatus::ChemicalDetectionFunction_Detecting: + strSpecialSensorData = toString(SpecialSensorStatus::ChemicalDetectionFunction_Detecting); break; - case SpecialSensorStatus_def::NBCDetectionAccessory_NotOperational: - strSpecialSensorData = toString(SpecialSensorStatus_def::NBCDetectionAccessory_NotOperational); + case SpecialSensorStatus::NBCDetectionAccessory_NotOperational: + strSpecialSensorData = toString(SpecialSensorStatus::NBCDetectionAccessory_NotOperational); break; - case SpecialSensorStatus_def::NBCDetectionAccessory_Test: - strSpecialSensorData = toString(SpecialSensorStatus_def::NBCDetectionAccessory_Test); + case SpecialSensorStatus::NBCDetectionAccessory_Test: + strSpecialSensorData = toString(SpecialSensorStatus::NBCDetectionAccessory_Test); break; - case SpecialSensorStatus_def::NBCDetectionAccessory_DetectingAir: - strSpecialSensorData = toString(SpecialSensorStatus_def::NBCDetectionAccessory_DetectingAir); + case SpecialSensorStatus::NBCDetectionAccessory_DetectingAir: + strSpecialSensorData = toString(SpecialSensorStatus::NBCDetectionAccessory_DetectingAir); break; - case SpecialSensorStatus_def::AVLB_Mounted: - strSpecialSensorData = toString(SpecialSensorStatus_def::AVLB_Mounted); + case SpecialSensorStatus::AVLB_Mounted: + strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Mounted); break; - case SpecialSensorStatus_def::AVLB_Deployed: - strSpecialSensorData = toString(SpecialSensorStatus_def::AVLB_Deployed); + case SpecialSensorStatus::AVLB_Deployed: + strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Deployed); break; - case SpecialSensorStatus_def::AVLB_Mounting: - strSpecialSensorData = toString(SpecialSensorStatus_def::AVLB_Mounting); + case SpecialSensorStatus::AVLB_Mounting: + strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Mounting); break; - case SpecialSensorStatus_def::AVLB_Deploying: - strSpecialSensorData = toString(SpecialSensorStatus_def::AVLB_Deploying); + case SpecialSensorStatus::AVLB_Deploying: + strSpecialSensorData = toString(SpecialSensorStatus::AVLB_Deploying); break; - case SpecialSensorStatus_def::MineLayer_Operational: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineLayer_Operational); + case SpecialSensorStatus::MineLayer_Operational: + strSpecialSensorData = toString(SpecialSensorStatus::MineLayer_Operational); break; - case SpecialSensorStatus_def::MineLayer_Laying: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineLayer_Laying); + case SpecialSensorStatus::MineLayer_Laying: + strSpecialSensorData = toString(SpecialSensorStatus::MineLayer_Laying); break; - case SpecialSensorStatus_def::MineClearingFunction_March: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineClearingFunction_March); + case SpecialSensorStatus::MineClearingFunction_March: + strSpecialSensorData = toString(SpecialSensorStatus::MineClearingFunction_March); break; - case SpecialSensorStatus_def::MineClearingFunction_ReadyToClear: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineClearingFunction_ReadyToClear); + case SpecialSensorStatus::MineClearingFunction_ReadyToClear: + strSpecialSensorData = toString(SpecialSensorStatus::MineClearingFunction_ReadyToClear); break; - case SpecialSensorStatus_def::MineClearingFunction_Clearing: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineClearingFunction_Clearing); + case SpecialSensorStatus::MineClearingFunction_Clearing: + strSpecialSensorData = toString(SpecialSensorStatus::MineClearingFunction_Clearing); break; - case SpecialSensorStatus_def::MineTrowingFunction_NotOperational: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_NotOperational); + case SpecialSensorStatus::MineTrowingFunction_NotOperational: + strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_NotOperational); break; - case SpecialSensorStatus_def::MineTrowingFunction_ParameterInput: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_ParameterInput); + case SpecialSensorStatus::MineTrowingFunction_ParameterInput: + strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_ParameterInput); break; - case SpecialSensorStatus_def::MineTrowingFunction_ReadyToDeploy: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_ReadyToDeploy); + case SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy: + strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_ReadyToDeploy); break; - case SpecialSensorStatus_def::MineTrowingFunction_Deploying: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_Deploying); + case SpecialSensorStatus::MineTrowingFunction_Deploying: + strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_Deploying); break; - case SpecialSensorStatus_def::MineTrowingFunction_Resupply: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_Resupply); + case SpecialSensorStatus::MineTrowingFunction_Resupply: + strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_Resupply); break; - case SpecialSensorStatus_def::MineTrowingFunction_FinishDeploying: - strSpecialSensorData = toString(SpecialSensorStatus_def::MineTrowingFunction_FinishDeploying); + case SpecialSensorStatus::MineTrowingFunction_FinishDeploying: + strSpecialSensorData = toString(SpecialSensorStatus::MineTrowingFunction_FinishDeploying); break; - case SpecialSensorStatus_def::ADLER_Operational: - strSpecialSensorData = toString(SpecialSensorStatus_def::ADLER_Operational); + case SpecialSensorStatus::ADLER_Operational: + strSpecialSensorData = toString(SpecialSensorStatus::ADLER_Operational); break; - case SpecialSensorStatus_def::ADLER_ConditionallyOperational: - strSpecialSensorData = toString(SpecialSensorStatus_def::ADLER_ConditionallyOperational); + case SpecialSensorStatus::ADLER_ConditionallyOperational: + strSpecialSensorData = toString(SpecialSensorStatus::ADLER_ConditionallyOperational); break; - case SpecialSensorStatus_def::ADLER_NotOperational: - strSpecialSensorData = toString(SpecialSensorStatus_def::ADLER_NotOperational); + case SpecialSensorStatus::ADLER_NotOperational: + strSpecialSensorData = toString(SpecialSensorStatus::ADLER_NotOperational); break; default: @@ -1083,7 +1083,7 @@ void ParticipantInfoDialog::onPositionChanged(const ParticipantPosition &positio if (room.id() == position.roomId()) { // In the case of external OPS transmitters, the building name was output twice - if ( room.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::Room ) + if ( room.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room ) continue; roomName = QString::fromStdString(room.displayName()); break; @@ -1181,7 +1181,7 @@ void ParticipantInfoDialog::onParticipantChanged(const Participant &participant, m_ui->lblType->setText(ParticipantManagement::trTypeName(m_dtc->type(participant.typeId()).name())); TypeClass typeClass = m_dtc->type(participant.typeId()).typeClass(); // If TypeClass changes, close window. Shouldn't ever happen, but for initialization. - if (m_typeClass != TypeClass_def::Unknown && m_typeClass != typeClass) + if (m_typeClass != TypeClass::Unknown && m_typeClass != typeClass) { m_buttonBox->getButton(LtsWidgets::DialogButton::Close)->click(); } @@ -1513,14 +1513,14 @@ bool ParticipantInfoDialog::initTargetConfig(bool bShow) m_ui->cbTargetWeapon->addItem(QStringLiteral("Shotgun"), 7); // Combobox Mode: - m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode_def::Deactivated), - TargetManagement::Mode_def::Deactivated); - m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode_def::ShootBack), - TargetManagement::Mode_def::ShootBack); - m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode_def::ShootFirst), - TargetManagement::Mode_def::ShootFirst); - m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode_def::NoWeapon), - TargetManagement::Mode_def::NoWeapon); + m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::Deactivated), + TargetManagement::Mode::Deactivated); + m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::ShootBack), + TargetManagement::Mode::ShootBack); + m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::ShootFirst), + TargetManagement::Mode::ShootFirst); + m_ui->cbTargetMode->addItem(TargetManagement::toString(TargetManagement::Mode::NoWeapon), + TargetManagement::Mode::NoWeapon); connect(m_ui->btTarget, &QToolButton::clicked, this, &ParticipantInfoDialog::onTargetConfig); connect(m_ui->cbTargetMode, QOverload::of(&QComboBox::currentIndexChanged), @@ -1571,7 +1571,7 @@ void ParticipantInfoDialog::onTargetConfig() request.id(0); request.participantId(m_participant.id()); - request.tgtCommand(TargetManagement::TgtCommand_def::RequestTechnicalState); + request.tgtCommand(TargetManagement::TgtCommand::RequestTechnicalState); auto cb = [request, this]() { @@ -1606,9 +1606,9 @@ void ParticipantInfoDialog::onTargetModeChangeed() request.id(0); request.participantId(m_participant.id()); - request.tgtCommand(TargetManagement::TgtCommand_def::SetMode); + request.tgtCommand(TargetManagement::TgtCommand::SetMode); int modeInt = m_ui->cbTargetMode->currentData().toInt(); - TargetManagement::Mode mode = static_cast (modeInt); + TargetManagement::Mode mode = static_cast (modeInt); INFO_LOG(m_logger) << "onTargetModeChangeed=" << mode; request.mode(mode); @@ -1627,7 +1627,7 @@ void ParticipantInfoDialog::onTargetWeaponChanged() request.id(0); request.participantId(m_participant.id()); - request.tgtCommand(TargetManagement::TgtCommand_def::SetWeapon); + request.tgtCommand(TargetManagement::TgtCommand::SetWeapon); request.weapon(m_ui->cbTargetWeapon->currentData().toInt()); INFO_LOG(m_logger) << "onTargetWeaponChangeed = " << request.weapon(); @@ -1754,7 +1754,7 @@ void ParticipantInfoDialog::onUnlockUAS() } ModifyUasStateRequest req; req.uasId(uas.id()); - req.uasState(ProjectDataManagement::UasState_def::Auto); + req.uasState(ProjectDataManagement::UasState::Auto); req.equipmentNumber(m_participant.equipmentNumber().get()); auto cb = [req, this]() { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp index c79d00b5e..a5b35e5ed 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_info_table_model.cpp @@ -133,9 +133,9 @@ QVariant ParticipantInfoTableModel::data(const QModelIndex &index, int role) con switch (data.vulnerabilityState.underlying()) { - case ProjectDataManagement::VulnerabilityState::CombatReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady: return green; - case ProjectDataManagement::VulnerabilityState::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill: return red; default: return yellow; @@ -401,8 +401,8 @@ QString ParticipantInfoTableModel::biteStringFromBite(const ParticipantManagemen QString ParticipantInfoTableModel::vulnerabilityStateString(const ParticipantInfo &data) { const ProjectDataManagement::VulnerabilityClass vc = data.typeClass == ParticipantManagement::TypeClass::Human ? - ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries : - ProjectDataManagement::VulnerabilityClass_def::VehicleDamages; + ProjectDataManagement::VulnerabilityClass::SoldierInjuries : + ProjectDataManagement::VulnerabilityClass::VehicleDamages; return ProjectDataManagement::toString(data.vulnerabilityState, vc); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.cpp index 8f1c85424..209bd53ca 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_injury_dialog.cpp @@ -63,9 +63,9 @@ bool ParticipantSetInjuryDialog::init(LtsSession::LtsSession *session, if (m_dtc->type(participant.typeId()).typeClass() != TypeClass::Human) return false; auto vec = vulnerabilityStatesForTypeClass(TypeClass::Human); - if (!vec.contains(ProjectDataManagement::VulnerabilityState::LightDamage) - || !vec.contains(ProjectDataManagement::VulnerabilityState::MediumDamage) - || !vec.contains(ProjectDataManagement::VulnerabilityState::HeavyDamage)) + if (!vec.contains(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage) + || !vec.contains(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage) + || !vec.contains(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage)) return false; m_injuries = m_dtcPdm->sanitationInjurys(); @@ -268,20 +268,20 @@ void ParticipantSetInjuryDialog::checkState() { case 1: { - if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState_def::LightDamage) < 1) - m_ui->cbState->addItem(lightDamage, ProjectDataManagement::VulnerabilityState_def::LightDamage); + if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::LightDamage) < 1) + m_ui->cbState->addItem(lightDamage, ProjectDataManagement::VulnerabilityState::LightDamage); break; } case 2: { - if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState_def::MediumDamage) < 1) - m_ui->cbState->addItem(mediumDamage, ProjectDataManagement::VulnerabilityState_def::MediumDamage); + if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::MediumDamage) < 1) + m_ui->cbState->addItem(mediumDamage, ProjectDataManagement::VulnerabilityState::MediumDamage); break; } case 3: { - if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState_def::HeavyDamage) < 1) - m_ui->cbState->addItem(heavyDamage, ProjectDataManagement::VulnerabilityState_def::HeavyDamage); + if (m_ui->cbState->findData(ProjectDataManagement::VulnerabilityState::HeavyDamage) < 1) + m_ui->cbState->addItem(heavyDamage, ProjectDataManagement::VulnerabilityState::HeavyDamage); break; } } @@ -320,7 +320,7 @@ bool ParticipantSetInjuryDialog::apply() if (m_ui->cbState->currentData().toInt() <= 0) return false; - const ProjectDataManagement::VulnerabilityState state = static_cast(m_ui->cbState->currentData().toInt()); + const ProjectDataManagement::VulnerabilityState state = static_cast(m_ui->cbState->currentData().toInt()); ModifyStateRequest req; req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp index 5da6ffc58..f1bc88f79 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_set_sanitation_dialog.cpp @@ -193,7 +193,7 @@ bool ParticipantSetSanitationDialog::apply() req.id(m_participantId); SanitationData sanDat; sanDat.sanitationProceduresTaken(getProcedures()); - sanDat.qualification(static_cast(m_ui->cbQualification->currentData().toInt())); + sanDat.qualification(static_cast(m_ui->cbQualification->currentData().toInt())); sanDat.originatorEquipmentNumber(0); req.data(sanDat); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp index 39a047863..8c16efebd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantInfo/participant_target_config_dialog.cpp @@ -187,7 +187,7 @@ void ParticipantTargetConfigurationDialog::onDynamicParticipantDataChanged(const { const ParticipantManagement::StateInformation &lastState = m_dtc->youngestStateInformation(dynData.stateHistory()); const ProjectDataManagement::VulnerabilityState &vulState = lastState.vulnerabilityState(); - const ProjectDataManagement::VulnerabilityState_def::type vulStateType = vulState.underlying(); + const ProjectDataManagement::VulnerabilityState vulStateType = static_cast(vulState); int idx = m_ui->cb_status->findData(vulStateType); DEBUG_LOG(m_logger) << Q_FUNC_INFO << " cb_status: vulState=" << vulState; @@ -228,9 +228,9 @@ void ParticipantTargetConfigurationDialog::onStatusChanged() m_ui->cb_status->setEnabled(false); - const ProjectDataManagement::VulnerabilityState newParticipantState = static_cast(m_ui->cb_status->currentData().toInt()); + const ProjectDataManagement::VulnerabilityState newParticipantState = static_cast(m_ui->cb_status->currentData().toInt()); - if (newParticipantState == ProjectDataManagement::VulnerabilityState::CombatReady) + if (newParticipantState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady) { InitParticipantRequest req; req.workstationId(LtsSessionData::LtsSessionData::getInstance()->getWorkstationId()); @@ -299,18 +299,18 @@ void ParticipantTargetConfigurationDialog::onStatusChanged() void ParticipantTargetConfigurationDialog::fillStatusComboBox() { - std::list cont; + std::list cont; cont = { - ProjectDataManagement::VulnerabilityState_def::NoChange, - ProjectDataManagement::VulnerabilityState_def::CombatReady, - ProjectDataManagement::VulnerabilityState_def::CatastrophicKill + ProjectDataManagement::VulnerabilityState::NoChange, + ProjectDataManagement::VulnerabilityState::CombatReady, + ProjectDataManagement::VulnerabilityState::CatastrophicKill }; m_ui->cb_status->clear(); for (auto item : std::as_const(cont)) { ProjectDataManagement::VulnerabilityState st = item; - QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass_def::VehicleDamages); + QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages); m_ui->cb_status->addItem(str, static_cast(item)); } @@ -318,19 +318,19 @@ void ParticipantTargetConfigurationDialog::fillStatusComboBox() void ParticipantTargetConfigurationDialog::fillPrewarningEffectComboBox() { - std::list cont; + std::list cont; cont = { - ProjectDataManagement::VulnerabilityState_def::NoChange, - ProjectDataManagement::VulnerabilityState_def::MobilityKill, - ProjectDataManagement::VulnerabilityState_def::NearMiss, - ProjectDataManagement::VulnerabilityState_def::CatastrophicKill + ProjectDataManagement::VulnerabilityState::NoChange, + ProjectDataManagement::VulnerabilityState::MobilityKill, + ProjectDataManagement::VulnerabilityState::NearMiss, + ProjectDataManagement::VulnerabilityState::CatastrophicKill }; m_ui->cb_prewarningEffect->clear(); for (auto item : std::as_const(cont)) { ProjectDataManagement::VulnerabilityState st = item; - QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass_def::VehicleDamages); + QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages); m_ui->cb_prewarningEffect->addItem(str, static_cast(item)); } m_ui->cb_prewarningEffect->setCurrentIndex(1); @@ -338,17 +338,17 @@ void ParticipantTargetConfigurationDialog::fillPrewarningEffectComboBox() void ParticipantTargetConfigurationDialog::fillTakeDownEffectComboBox() { - std::list cont; + std::list cont; cont = { - ProjectDataManagement::VulnerabilityState_def::MobilityKill, - ProjectDataManagement::VulnerabilityState_def::CatastrophicKill + ProjectDataManagement::VulnerabilityState::MobilityKill, + ProjectDataManagement::VulnerabilityState::CatastrophicKill }; m_ui->cb_takeDownEffect->clear(); for (auto item : std::as_const(cont)) { ProjectDataManagement::VulnerabilityState st = item; - QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass_def::VehicleDamages); + QString str = ProjectDataManagement::toString(st, ProjectDataManagement::VulnerabilityClass::VehicleDamages); m_ui->cb_takeDownEffect->addItem(str, static_cast(item)); } m_ui->cb_takeDownEffect->setCurrentIndex(1); @@ -391,7 +391,7 @@ bool updateValue(int& oldValueRef, int newValue) return hasChanged; } -bool updateValue(ProjectDataManagement::VulnerabilityState& oldValueRef, ProjectDataManagement::VulnerabilityState_def::type newValue) +bool updateValue(ProjectDataManagement::VulnerabilityState& oldValueRef, ProjectDataManagement::VulnerabilityState newValue) { bool hasChanged = oldValueRef != newValue; oldValueRef = newValue; @@ -411,10 +411,10 @@ void ParticipantTargetConfigurationDialog::onGuiChanged() hasChanged |= updateValue(m_targetInformation.silhouette(), m_ui->cb_silhouette->currentData().toInt()); - hasChanged |= updateValue(m_targetInformation.prewarningEffect(), static_cast(m_ui->cb_prewarningEffect->currentData().toInt()) ); + hasChanged |= updateValue(m_targetInformation.prewarningEffect(), static_cast(m_ui->cb_prewarningEffect->currentData().toInt()) ); hasChanged |= updateValue(m_targetInformation.prewarningInterval(), m_ui->sb_prewarningInterval->value()); - hasChanged |= updateValue(m_targetInformation.takedownEffect(), static_cast(m_ui->cb_takeDownEffect->currentData().toInt()) ); + hasChanged |= updateValue(m_targetInformation.takedownEffect(), static_cast(m_ui->cb_takeDownEffect->currentData().toInt()) ); hasChanged |= updateValue(m_targetInformation.takedownInterval(), m_ui->sb_takeDownInterval->value()); DEBUG_LOG(m_logger) << Q_FUNC_INFO << " hasChanged=" << hasChanged; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp index e9decb908..0bea606c2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/org_chart_main.cpp @@ -450,7 +450,7 @@ QVector OrgChartMain::getDataOf(const QJsonObject &obj, int sup pData.tacticalIdentifier() = obj.value(QStringLiteral("tactIdentifier")).toString().toStdString(); pData.typeId(obj.value(QStringLiteral("typeId")).toInt()); if (obj.value(QStringLiteral("assignState")).toInt() >= 0) - pData.assignState(static_cast(obj.value(QStringLiteral("assignState")).toInt())); + pData.assignState(static_cast(obj.value(QStringLiteral("assignState")).toInt())); QJsonArray arr = obj.value(QStringLiteral("children")).toArray(); int hierarNr = 1; for (auto arrItem = arr.constBegin(); arrItem != arr.constEnd(); ++arrItem) @@ -510,7 +510,7 @@ ParticipantData OrgChartMain::convertFromJson(const QJsonObject &obj) pData.partyId(m_party); pData.id(obj.value(QStringLiteral("ddsId")).toInt()); if (obj.value(QStringLiteral("assignState")).toInt() >= 0) - pData.assignState(static_cast(obj.value(QStringLiteral("assignState")).toInt())); + pData.assignState(static_cast(obj.value(QStringLiteral("assignState")).toInt())); pData.symbol(obj.value(QStringLiteral("symbol")).toString().toStdString()); return pData; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp index b3b8ec67a..51b72c3aa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantOrgChart/participant_org_chart_helper.cpp @@ -301,26 +301,26 @@ AdvancedSymbology::Injury ParticipantOrgChart_MimeDataHelper::stateToInjury(cons { switch (state.underlying()) { - case ProjectDataManagement::VulnerabilityState::CombatReady: - case ProjectDataManagement::VulnerabilityState::TemporarySeverance: - case ProjectDataManagement::VulnerabilityState::NearMiss: - case ProjectDataManagement::VulnerabilityState::HitWithNoEffect: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect: return AdvancedSymbology::Injury::NoInjury; break; - case ProjectDataManagement::VulnerabilityState::LightDamage: - case ProjectDataManagement::VulnerabilityState::MediumDamage: - case ProjectDataManagement::VulnerabilityState::HeavyDamage: - case ProjectDataManagement::VulnerabilityState::NotReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady: return AdvancedSymbology::Injury::Hit; break; - case ProjectDataManagement::VulnerabilityState::MobilityKill: - case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill: return AdvancedSymbology::Injury::MobilityKill; break; - case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage: - case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage: return AdvancedSymbology::Injury::WeaponKill; - case ProjectDataManagement::VulnerabilityState::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill: return AdvancedSymbology::Injury::TotalKill; default: return AdvancedSymbology::Injury::NoInjury; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp index 215638ace..9ba7d4760 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantSelection/participant_selection_model.cpp @@ -100,7 +100,7 @@ static ParticipantData qVariantToParticipant(const QVariant &data) pd.designator(designator.toStdString()); pd.tacticalIdentifier(tacticalIdentifier.toStdString()); pd.info(info.toStdString()); - pd.assignState(static_cast(assignState)); + pd.assignState(static_cast(assignState)); pd.isSimulated(isSimulated); pd.isDeleted(isDeleted); pd.modId(modId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp index c0b04491d..62ab46043 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/participant_template_edit.cpp @@ -169,9 +169,9 @@ bool ParticipantTemplateEdit::isContainer(const QModelIndex &index) return false; if (m_asSupportService) - return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::SupportUnit; + return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::SupportUnit; else - return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass_def::Unit; + return m_dtc->type(typeId).typeClass() == ParticipantManagement::TypeClass::Unit; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.cpp index 289af0b0c..eeaeb86ca 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/ParticipantTemplates/template_unit_namer.cpp @@ -75,7 +75,7 @@ void ParticipantManagement::TemplateUnitNamer::onSetUnitName() void TemplateUnitNamer::onTypeClassChanged() { - TypeClass currentClass(static_cast(m_ui->cbxTypeClass->currentData().toInt())); + TypeClass currentClass(static_cast(m_ui->cbxTypeClass->currentData().toInt())); m_ppmGuiCbxIfc->fillTypeComboBox(m_ui->cbxType, currentClass); enaDisa(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp index 7957f2dc8..d86ff3df2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/PartyEdit/ppm_party_edit.cpp @@ -152,8 +152,8 @@ bool PartyEdit::apply() { if (!m_partiallyUnchangeable) { - ParticipantManagement::Role role = static_cast(m_ui->cbRole->currentData().toInt()); - ParticipantManagement::HlaForceIdentifierEnum hlaIdentfier = static_cast(m_ui->cbHlaForceIdentifier->currentData().toInt()); + ParticipantManagement::Role role = static_cast(m_ui->cbRole->currentData().toInt()); + ParticipantManagement::HlaForceIdentifierEnum hlaIdentfier = static_cast(m_ui->cbHlaForceIdentifier->currentData().toInt()); Party req; req.id(m_partyId); @@ -283,7 +283,7 @@ void PartyEdit::fillJsonSuppressNotifications( QJsonArray ¬if, NotificationMa { QJsonObject suppNotif; suppNotif[QStringLiteral("partyId")] = m_partyId; - suppNotif[QStringLiteral("AddressType")] = NotificationManagement::AddressType_def::Service; + suppNotif[QStringLiteral("AddressType")] = NotificationManagement::AddressType::Service; suppNotif[QStringLiteral("Address")] = AreaEffectSimulation::Offset; QCheckBox *cbNotif = findCheckBoxByNotificationType(notifType); @@ -339,8 +339,8 @@ void PartyEdit::fillOpmProperties( QJsonObject &opmProperties) int indexToReplace = -1; if (arrExercises.isEmpty()) { - fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::AdlerNotification); - fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::CombatOrder); + fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::AdlerNotification); + fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::CombatOrder); } else { @@ -350,8 +350,8 @@ void PartyEdit::fillOpmProperties( QJsonObject &opmProperties) if (objExe[QStringLiteral("exerciseId")] == m_session->exerciseId()) { notif = objExe[QStringLiteral("suppressNotifications")].toArray(); - fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::AdlerNotification); - fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType_def::CombatOrder); + fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::AdlerNotification); + fillJsonSuppressNotifications(notif, NotificationManagement::NotificationType::CombatOrder); indexToReplace = i; break; } @@ -390,8 +390,8 @@ void PartyEdit::notificationCheck() // Here add another NotificationType, everything else will happen automatically // CheckBox insert in Ui - const QList notifTypes { NotificationManagement::NotificationType_def::AdlerNotification, - NotificationManagement::NotificationType_def::CombatOrder}; + const QList notifTypes { NotificationManagement::NotificationType::AdlerNotification, + NotificationManagement::NotificationType::CombatOrder}; for (int i=0; i < arrExercises.size(); ++i) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.cpp index 43fd6b3e0..323f708e2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ParticipantManagement/Gui/TypeEdit/ppm_type_edit.cpp @@ -138,7 +138,7 @@ bool TypeEdit::apply() } const Type req(m_type.id(), - static_cast(m_ui->cbTypeClass->currentData().toInt()), + static_cast(m_ui->cbTypeClass->currentData().toInt()), equipType, m_symbolSidc.toStdString(), m_ui->leName->text().toStdString(), @@ -346,8 +346,8 @@ void TypeEdit::updateEquipMinMaxLabel(const EquipmentType &eqType) bool TypeEdit::isUnitTypeClass() const { - auto tc = static_cast(m_ui->cbTypeClass->currentData().toInt()); - return tc == TypeClass_def::Unit || tc == TypeClass_def::SupportUnit; + auto tc = static_cast(m_ui->cbTypeClass->currentData().toInt()); + return tc == TypeClass::Unit || tc == TypeClass::SupportUnit; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp index ab79fc04a..52d85b214 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/PresentationManagement/Gui/Script/ScriptTimelineEditor/pre_script_dialog.cpp @@ -3986,7 +3986,7 @@ void ScriptTimelineDialog::startEssentialsView(int topicItemId, int topicType, b replayId = m_srmForeignDataIfc->replayPartitionCreateRequest( exerciseId, LtsSessionData::LtsSessionData::getInstance()->getWorkstationId(), LtsSessionData::LtsSessionData::getInstance()->getOperatorId(), - Core::ReplayType_def::SituationData); + Core::ReplayType::SituationData); } catch(...) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp index 77768e13a..f8d219e11 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox.cpp @@ -240,7 +240,7 @@ bool fill(QComboBox *cbx, PdmComboBoxType type) if (alreadySeen.contains(langId)) continue; alreadySeen += langId; - cbx->addItem(toString(static_cast(langId)), static_cast(langId)); + cbx->addItem(toString(static_cast(langId)), static_cast(langId)); } break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp index 267cc3c2b..cb1383870 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectDataManagement/Gui/PdmComboBox/pdm_combobox_foreign_gui_interface_impl.cpp @@ -68,7 +68,7 @@ bool ForeignGuiInterfaceImpl::fillBoobyTrapComboBox(QComboBox *cbx) bool ForeignGuiInterfaceImpl::fillOffRouteMineComboBox(QComboBox *cbx) { - return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass_def::OffRouteMine, m_dtc); + return PdmComboBox::fill(cbx, ProjectDataManagement::GearClass::OffRouteMine, m_dtc); } bool ForeignGuiInterfaceImpl::fillFunctionalAreaComboBox(QComboBox *cbx) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp index 509d21bc2..a383962d2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ProjectionWorkstation/Gui/pws_control_dialog.cpp @@ -310,7 +310,7 @@ void ControlDialog::fillCombobox() m_asmDtc->assets([this](const AssetManagement::Asset & data) { if (m_ui->chbProjectionWSOnly->isChecked() && - data.assetTypeId() != AssetManagement::AssetType_def::ProjectionWorkstation) + data.assetTypeId() != AssetManagement::AssetType::ProjectionWorkstation) return; if (m_ui->chbInThisLocationOnly->isChecked() && data.locationId() != m_locationId) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp index 77bff2e29..63d08d1ff 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.cpp @@ -32,25 +32,25 @@ AirSupportModel::AirSupportModel(const ReportInfo &report, LtsSession::LtsSessio resData.chargeTypeId = 371; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::CatastrophicKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill; resData.hits = {9, 4, 4, 0}; m_dataTable.append(resData); resData.chargeTypeId = 371; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::MobilityKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill; resData.hits = {9, 4, 3, 1}; m_dataTable.append(resData); resData.chargeTypeId = 371; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VisibleMobilityKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill; resData.hits = {2, 2, 2, 0}; m_dataTable.append(resData); resData.chargeTypeId = 371; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; resData.hits = {20, 10, 9, 1}; m_dataTable.append(resData); @@ -63,25 +63,25 @@ AirSupportModel::AirSupportModel(const ReportInfo &report, LtsSession::LtsSessio resData.chargeTypeId = 372; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::CatastrophicKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill; resData.hits = {14, 4, 4, 0}; m_dataTable.append(resData); resData.chargeTypeId = 372; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::MobilityKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill; resData.hits = {4, 4, 3, 1}; m_dataTable.append(resData); resData.chargeTypeId = 372; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VisibleMobilityKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill; resData.hits = {2, 2, 2, 0}; m_dataTable.append(resData); resData.chargeTypeId = 372; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; resData.hits = {20, 10, 9, 1}; m_dataTable.append(resData); @@ -92,7 +92,7 @@ AirSupportModel::AirSupportModel(const ReportInfo &report, LtsSession::LtsSessio resData.chargeTypeId = 0; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; resData.hits = {40, 20, 18, 2}; m_dataTable.append(resData); #else @@ -174,7 +174,7 @@ QVariant AirSupportModel::data(const QModelIndex &index, int role) const boldFont.setBold(true); - if (displayInfo.chargeTypeId == 0 || displayInfo.vulnerabilityState == ProjectDataManagement::VulnerabilityState::NotReady) + if (displayInfo.chargeTypeId == 0 || displayInfo.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady) return boldFont; return QFont(); @@ -192,7 +192,7 @@ QVariant AirSupportModel::data(const QModelIndex &index, int role) const if (displayInfo.chargeTypeId > 0) { QString chargeTypeName = m_pdmDtc->trChargeTypeShortName(displayInfo.chargeTypeId); - if (displayInfo.vulnerabilityState == ProjectDataManagement::VulnerabilityState::NotReady) + if (displayInfo.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady) displayTypeName = tr("Total [%1]").arg(chargeTypeName); else displayTypeName = chargeTypeName; @@ -202,7 +202,7 @@ QVariant AirSupportModel::data(const QModelIndex &index, int role) const case START_TIME: { QString timeInterval = DTG::toStringMSec(displayInfo.startTime) + QStringLiteral(" - " ) + DTG::toStringMSec(displayInfo.endTime); - return (displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::NotReady ? timeInterval : QVariant()); + return (displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady ? timeInterval : QVariant()); } case IMPACTS: return (displayInfo.hits[4] > 0 ? displayInfo.hits[4] : QVariant()); @@ -215,8 +215,8 @@ QVariant AirSupportModel::data(const QModelIndex &index, int role) const case HITS_FRIENDLY: return displayInfo.hits[3]; case VULNERABILITY_STATE: - return ((displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::NotReady && - displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::CombatReady) ? + return ((displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady && + displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady) ? ProjectDataManagement::toString(displayInfo.vulnerabilityState): QVariant()); default: return QVariant(); @@ -344,7 +344,7 @@ void AirSupportModel::fillReportData() resData.startTime = obj[QStringLiteral("start_time")].toDouble(); resData.endTime = obj[QStringLiteral("end_time")].toDouble(); resData.hits[4] = obj[QStringLiteral("impacts")].toInt(); - resData.vulnerabilityState = static_cast(obj[QStringLiteral("vulnerability_state")].toInt()); + resData.vulnerabilityState = static_cast(obj[QStringLiteral("vulnerability_state")].toInt()); resData.hits[0] = obj[QStringLiteral("hits_buildings")].toInt(); resData.hits[3] = obj[QStringLiteral("hits_friendly_fire")].toInt(); resData.hits[2] = obj[QStringLiteral("hits")].toInt(); @@ -369,7 +369,7 @@ void AirSupportModel::fillReportData() totalChargeTypeId.chargeTypeId = chargeTypeId; totalChargeTypeId.startTime = 0; - totalChargeTypeId.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + totalChargeTypeId.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; totalChargeTypeId.hits = sums[chargeTypeId]; m_dataTable.append(std::move(totalChargeTypeId)); @@ -394,7 +394,7 @@ void AirSupportModel::fillReportData() resultDataTable totalChargeTypeId; totalChargeTypeId.chargeTypeId = chargeTypeId; totalChargeTypeId.startTime = 0; - totalChargeTypeId.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + totalChargeTypeId.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; totalChargeTypeId.hits = sums[chargeTypeId]; m_dataTable.append(std::move(totalChargeTypeId)); @@ -404,7 +404,7 @@ void AirSupportModel::fillReportData() resultDataTable total; total.chargeTypeId = 0; total.startTime = 0; - total.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + total.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; total.hits = bigTotal; m_dataTable.append(std::move(total)); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.h index 197bb5adc..698dc546f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_air_support_model.h @@ -66,7 +66,7 @@ private: struct resultDataTable : public resultDataPie { - ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; }; QVector m_dataTable; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp index 44eded417..192df09bd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_charge_administration_model.cpp @@ -196,7 +196,7 @@ void ChargeAdministrationModel::fillReportData() resultData resData; resData.chargeTypeId = obj[QStringLiteral("charge_type_id")].toInt(); - resData.effectSourceId = static_cast(obj[QStringLiteral("effect_source_id")].toInt()); + resData.effectSourceId = static_cast(obj[QStringLiteral("effect_source_id")].toInt()); resData.charges[0] = obj[QStringLiteral("charge_start")].toInt(); resData.charges[1] = obj[QStringLiteral("charge_resupplied")].toInt(); resData.charges[2] = obj[QStringLiteral("charge_end")].toInt(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp index a208ebb65..7d6d5bbc2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.cpp @@ -31,25 +31,25 @@ FiringsModel::FiringsModel(const ReportInfo &report, LtsSession::LtsSession *ses resData.chargeTypeId = 371; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::CatastrophicKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill; resData.hits = {9, 4, 4, 0}; m_dataTable.append(resData); resData.chargeTypeId = 371; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::MobilityKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill; resData.hits = {9, 4, 3, 1}; m_dataTable.append(resData); resData.chargeTypeId = 371; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VisibleMobilityKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill; resData.hits = {2, 2, 2, 0}; m_dataTable.append(resData); resData.chargeTypeId = 371; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; resData.hits = {20, 10, 9, 1}; m_dataTable.append(resData); @@ -62,25 +62,25 @@ FiringsModel::FiringsModel(const ReportInfo &report, LtsSession::LtsSession *ses resData.chargeTypeId = 372; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::CatastrophicKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill; resData.hits = {14, 4, 4, 0}; m_dataTable.append(resData); resData.chargeTypeId = 372; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::MobilityKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill; resData.hits = {4, 4, 3, 1}; m_dataTable.append(resData); resData.chargeTypeId = 372; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VisibleMobilityKill; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill; resData.hits = {2, 2, 2, 0}; m_dataTable.append(resData); resData.chargeTypeId = 372; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; resData.hits = {20, 10, 9, 1}; m_dataTable.append(resData); @@ -91,7 +91,7 @@ FiringsModel::FiringsModel(const ReportInfo &report, LtsSession::LtsSession *ses resData.chargeTypeId = 0; resData.startTime = 1513758640000; - resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + resData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; resData.hits = {40, 20, 18, 2}; m_dataTable.append(resData); #else @@ -167,7 +167,7 @@ QVariant FiringsModel::data(const QModelIndex &index, int role) const boldFont.setBold(true); - if (displayInfo.chargeTypeId == 0 || displayInfo.vulnerabilityState == ProjectDataManagement::VulnerabilityState::NotReady) + if (displayInfo.chargeTypeId == 0 || displayInfo.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady) return boldFont; return QFont(); @@ -185,7 +185,7 @@ QVariant FiringsModel::data(const QModelIndex &index, int role) const if (displayInfo.chargeTypeId > 0) { QString chargeTypeName = m_pdmDtc->trChargeTypeShortName(displayInfo.chargeTypeId); - if (displayInfo.vulnerabilityState == ProjectDataManagement::VulnerabilityState::NotReady) + if (displayInfo.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady) displayTypeName = tr("Total [%1]").arg(chargeTypeName); else displayTypeName = chargeTypeName; @@ -193,7 +193,7 @@ QVariant FiringsModel::data(const QModelIndex &index, int role) const return (displayInfo.chargeTypeId > 0 ? displayTypeName : tr("TOTAL:")); } case START_TIME: - return (displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::NotReady ? DTG::toStringMSec(displayInfo.startTime) : QVariant()); + return (displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady ? DTG::toStringMSec(displayInfo.startTime) : QVariant()); case FIRINGS: return (displayInfo.hits[0] > 0 ? displayInfo.hits[0] : QVariant()); case HITS_TOTAL: @@ -203,8 +203,8 @@ QVariant FiringsModel::data(const QModelIndex &index, int role) const case HITS_FRIENDLY: return displayInfo.hits[3]; case VULNERABILITY_STATE: - return ((displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::NotReady && - displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::CombatReady) ? + return ((displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady && + displayInfo.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady) ? ProjectDataManagement::toString(displayInfo.vulnerabilityState): QVariant()); default: return QVariant(); @@ -329,7 +329,7 @@ void FiringsModel::fillReportData() resData.chargeTypeId = obj[QStringLiteral("charge_type_id")].toInt(); resData.startTime = obj[QStringLiteral("start_time")].toDouble(); - resData.vulnerabilityState = static_cast(obj[QStringLiteral("vulnerability_state")].toInt()); + resData.vulnerabilityState = static_cast(obj[QStringLiteral("vulnerability_state")].toInt()); resData.hits[0] = obj[QStringLiteral("firings")].toInt(); resData.hits[3] = obj[QStringLiteral("hits_friendly_fire")].toInt(); resData.hits[2] = obj[QStringLiteral("hits")].toInt(); @@ -353,7 +353,7 @@ void FiringsModel::fillReportData() totalChargeType.chargeTypeId = chargeTypeId; totalChargeType.startTime = 0; - totalChargeType.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + totalChargeType.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; totalChargeType.hits = sums[chargeTypeId]; m_dataTable.append(std::move(totalChargeType)); @@ -377,7 +377,7 @@ void FiringsModel::fillReportData() resultDataTable totalChargeType; totalChargeType.chargeTypeId = chargeTypeId; totalChargeType.startTime = 0; - totalChargeType.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + totalChargeType.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; totalChargeType.hits = sums[chargeTypeId]; m_dataTable.append(std::move(totalChargeType)); @@ -387,7 +387,7 @@ void FiringsModel::fillReportData() resultDataTable total; total.chargeTypeId = 0; total.startTime = 0; - total.vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + total.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; total.hits = bigTotal; m_dataTable.append(std::move(total)); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.h index 164efcd6e..216e5e7ed 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_firings_model.h @@ -61,7 +61,7 @@ private: struct resultDataTable : public resultDataPie { - ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::NotReady; + ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady; }; QVector m_dataTable; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp index d424e332c..cb00cf380 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_sanitation_material_model.cpp @@ -169,7 +169,7 @@ QVariant SanitationMaterialModel::data(const QModelIndex &index, int role) const return tot; } case QUALIFICATION: - return (displayInfo.qualification > 0 ? ParticipantManagement::toString(static_cast(displayInfo.qualification)) : QVariant()); + return (displayInfo.qualification > 0 ? ParticipantManagement::toString(static_cast(displayInfo.qualification)) : QVariant()); case MATERIAL_ID: return (displayInfo.materialId > 0 ? displayInfo.materialId : QVariant()); case MATERIAL_NAME: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.cpp index e51ff05eb..02c1bd1b3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_model.cpp @@ -485,18 +485,18 @@ void TreatmentModel::fillReportData() resData.timeTreatmentVulnerability = resData.timeTreatment - resData.timeVulnerability; resData.inbetween10Minutes = false; resData.goldenHour = false; - if (resData.sanitationResult >= ParticipantManagement::SanitationResult_def::Insufficient) + if (resData.sanitationResult >= ParticipantManagement::SanitationResult::Insufficient) { if (resData.timeTreatmentVulnerability < (10 * 60 * 1000)) resData.inbetween10Minutes = true; DEBUG_LOG(m_logger) << "qualification: " << resData.qualification; - if (resData.timeTreatmentVulnerability < (60 * 60 * 1000) && resData.qualification == ParticipantManagement::Qualification_def::SANPers) + if (resData.timeTreatmentVulnerability < (60 * 60 * 1000) && resData.qualification == ParticipantManagement::Qualification::SANPers) { resData.goldenHour = true; DEBUG_LOG(m_logger) << "golden hour particpantId: " << resData.participantId; } } - if (resData.sanitationResult == ParticipantManagement::SanitationResult_def::Optimal) + if (resData.sanitationResult == ParticipantManagement::SanitationResult::Optimal) resData.optimalTreated = true; if (resData.sanitationResult >= 0) @@ -577,21 +577,21 @@ void TreatmentModel::fillReportData() QMap> tmpVulMap = it.value(); - resDataTable.amountLightlyWounded = tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::LightDamage).size(); + resDataTable.amountLightlyWounded = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::LightDamage).size(); resDataTotal.amountLightlyWounded += resDataTable.amountLightlyWounded; - for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::LightDamage)) + for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::LightDamage)) INFO_LOG(m_logger) << "participantId: lightlyWouned: " << id; - resDataTable.amountMediumWounded = tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::MediumDamage).size(); + resDataTable.amountMediumWounded = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::MediumDamage).size(); resDataTotal.amountMediumWounded += resDataTable.amountMediumWounded; - for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::MediumDamage)) + for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::MediumDamage)) INFO_LOG(m_logger) << "participantId: mediumWouned: " << id; - resDataTable.amountHeavyWounded = tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::HeavyDamage).size(); + resDataTable.amountHeavyWounded = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::HeavyDamage).size(); resDataTotal.amountHeavyWounded += resDataTable.amountHeavyWounded; - for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::HeavyDamage)) + for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::HeavyDamage)) INFO_LOG(m_logger) << "participantId: heavyWouned: " << id; @@ -600,11 +600,11 @@ void TreatmentModel::fillReportData() resDataTotal.amountInjuryTotal += resDataTable.amountInjuryTotal; - resDataTable.amountKIA = tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::CatastrophicKill).size(); + resDataTable.amountKIA = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::CatastrophicKill).size(); resDataTotal.amountKIA += resDataTable.amountKIA; - for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::CatastrophicKill)) + for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::CatastrophicKill)) { INFO_LOG(m_logger) << "participantId: KIA: " << id; m_rescueStationTreated[resDataTable.participantId].remove(id); @@ -612,10 +612,10 @@ void TreatmentModel::fillReportData() } - resDataTable.amountKIAAfterWIA = tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::TemporarySeverance).size(); + resDataTable.amountKIAAfterWIA = tmpVulMap.value(ProjectDataManagement::VulnerabilityState::TemporarySeverance).size(); resDataTotal.amountKIAAfterWIA += resDataTable.amountKIAAfterWIA; - for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState_def::TemporarySeverance)) + for ( int id : tmpVulMap.value(ProjectDataManagement::VulnerabilityState::TemporarySeverance)) { INFO_LOG(m_logger) << "participantId: kiaAfterWia: " << id; m_rescueStationTreated[resDataTable.participantId].remove(id); @@ -762,12 +762,12 @@ void TreatmentModel::fillParticipantMap() QMap> vulnMap; QSet partIds; - vulnMap.insert(ProjectDataManagement::VulnerabilityState_def::LightDamage, partIds); - vulnMap.insert(ProjectDataManagement::VulnerabilityState_def::MediumDamage, partIds); - vulnMap.insert(ProjectDataManagement::VulnerabilityState_def::HeavyDamage, partIds); - vulnMap.insert(ProjectDataManagement::VulnerabilityState_def::CatastrophicKill, partIds); + vulnMap.insert(ProjectDataManagement::VulnerabilityState::LightDamage, partIds); + vulnMap.insert(ProjectDataManagement::VulnerabilityState::MediumDamage, partIds); + vulnMap.insert(ProjectDataManagement::VulnerabilityState::HeavyDamage, partIds); + vulnMap.insert(ProjectDataManagement::VulnerabilityState::CatastrophicKill, partIds); - vulnMap.insert(ProjectDataManagement::VulnerabilityState_def::TemporarySeverance, partIds); + vulnMap.insert(ProjectDataManagement::VulnerabilityState::TemporarySeverance, partIds); m_vulnerabilityMap.insert(it2.key(), vulnMap); m_rescueStationTreated.insert(it2.key(), partIds); @@ -820,9 +820,9 @@ int TreatmentModel::getParticipantKey(int participantId) void TreatmentModel::countVulnerabilityState( int key, const resultData &data) { - if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady || - data.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage || - data.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged) + if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady || + data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage || + data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged) return; if ( key <= 0) @@ -859,11 +859,11 @@ void TreatmentModel::countVulnerabilityState( int key, const resultData &data) } } - if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill && data.kiaAfterWia) + if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill && data.kiaAfterWia) { - vulMapTemp[ProjectDataManagement::VulnerabilityState_def::CatastrophicKill].remove(data.participantId); + vulMapTemp[ProjectDataManagement::VulnerabilityState::CatastrophicKill].remove(data.participantId); - vulMapTemp[ProjectDataManagement::VulnerabilityState_def::TemporarySeverance].insert(data.participantId); + vulMapTemp[ProjectDataManagement::VulnerabilityState::TemporarySeverance].insert(data.participantId); } m_vulnerabilityMap[key] = vulMapTemp; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.cpp index dc4f33c9a..4985ffc64 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_treatment_timeline_model.cpp @@ -214,9 +214,9 @@ QVariant TreatmentTimelineModel::data(const QModelIndex &index, int role) const } case VULNERABILITY: { - QString vbg = ProjectDataManagement::toString(static_cast(displayInfo.vulnerabilityState)); + QString vbg = ProjectDataManagement::toString(static_cast(displayInfo.vulnerabilityState)); if (displayInfo.vulnerability > 0) - vbg += QStringLiteral("\n") + m_pdmDtc->trVulnerabilityKindName(displayInfo.vulnerability, ProjectDataManagement::VulnerabilityClass::SoldierInjuries); + vbg += QStringLiteral("\n") + m_pdmDtc->trVulnerabilityKindName(displayInfo.vulnerability, ProjectDataManagement::VulnerabilityClass::VulnerabilityClass_SoldierInjuries); return vbg; } case AREA_NAME: @@ -325,7 +325,7 @@ void TreatmentTimelineModel::fillReportData() resData.vulnerability = obj[QStringLiteral("vulnerability")].toInt(); resData.vulnerabilityState = obj[QStringLiteral("vulnerability_state")].toInt(); resData.eventTime = obj[QStringLiteral("event_time")].toDouble(); - resData.eventTypeId = static_cast(obj[QStringLiteral("event_type_id")].toInt()); + resData.eventTypeId = static_cast(obj[QStringLiteral("event_type_id")].toInt()); resData.properties = obj[QStringLiteral("properties")].toString(); DEBUG_LOG(m_logger) << "Participant type id = " << resData.participantTypeId; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp index 18d6cefe0..9deedc3b0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/Models/rep_unit_power_model.cpp @@ -134,31 +134,31 @@ QVariant UnitPowerModel::headerData(int section, Qt::Orientation orientation, in switch (section) { case COMBAT_READY: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CombatReady); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady); case NOT_READY: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::NotReady); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady); case LIGHT_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::LightDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage); case MEDIUM_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::MediumDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage); case HEAVY_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::HeavyDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HeavyDamage); case MOBILITY_KILL: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::MobilityKill); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill); case VISIBLE_MOBILITY_KILL: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VisibleMobilityKill); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill); case WEAPON_SYSTEM_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::WeaponSystemDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_WeaponSystemDamage); case VISIBLE_WEAPON_SYSTEM_DAMAGE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage); case CATASTROPHIC_KILL: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CatastrophicKill); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill); case TEMPORARY_SEVERANCE: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::TemporarySeverance); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance); case NEAR_MISS: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::NearMiss); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss); case HIT_WITH_NO_EFFECT: - return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::HitWithNoEffect); + return ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect); case START_TIME: return tr("Time"); default: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp index 2a8518e7d..043ec4636 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_edit.cpp @@ -125,7 +125,7 @@ ReportEdit::ReportEdit(LtsSession::LtsSession *session, QWidget *parent) { for (QAction *action : m_ui->pbEffectSource->menu()->actions()) { - const ProjectDataManagement::EffectSource effectSourceId = static_cast(action->data().toInt()); + const ProjectDataManagement::EffectSource effectSourceId = static_cast(action->data().toInt()); auto it = std::find(m_activeEffectSources.begin(), m_activeEffectSources.end(), effectSourceId); if (it != m_activeEffectSources.end()) return true; @@ -274,7 +274,7 @@ bool ReportEdit::init(const ReportInfo &currReport, LtsSession::LtsSession *sess connect(action, &QAction::toggled, this, - [=](bool checked) { onEffectSourceToggled(static_cast(action->data().toInt()), checked); }); + [=](bool checked) { onEffectSourceToggled(static_cast(action->data().toInt()), checked); }); } m_ui->pbEffectSource->setMenu(effectSourceMenu); } @@ -1084,7 +1084,7 @@ bool ReportEdit::initInputs() QStringList toolTip; for (QAction *action : m_ui->pbEffectSource->menu()->actions()) { - const ProjectDataManagement::EffectSource effectSourceId = static_cast(action->data().toInt()); + const ProjectDataManagement::EffectSource effectSourceId = static_cast(action->data().toInt()); auto it = std::find(m_report.effectSources().begin(), m_report.effectSources().end(), effectSourceId.underlying()); if (it != m_report.effectSources().end()) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp index cfc12a6f7..07dae4c81 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ReportManagement/Gui/ReportViewer/rep_report_preview.cpp @@ -489,7 +489,7 @@ void ReportPreview::collectHeaderData() addToHeaderData(tr("Area: "), tr("not specified")); } - if ( m_report.reportType() == ReportType_def::Treatment && m_report.visualisationType() == VisualisationType_def::Pie) + if ( m_report.reportType() == ReportType::Treatment && m_report.visualisationType() == VisualisationType::Pie) { TreatmentModel *tm = dynamic_cast(m_dataModel); addToHeaderData(tr("Injury Total: "), QString::number(tm->getAmountInjuryTotal())); @@ -544,7 +544,7 @@ bool ReportPreview::displayReportAsTable() KDReports::AutoTableElement autoTable(proxyModel); autoTable.setVerticalHeaderVisible(false); - if (m_report.reportType() == ReportType_def::Treatment || m_report.reportType() == ReportType_def::AirSupport) + if (m_report.reportType() == ReportType::Treatment || m_report.reportType() == ReportType::AirSupport) m_reportDisplay->setOrientation(QPrinter::Landscape); m_reportDisplay->setReportMode(KDReports::Report::WordProcessing); @@ -1054,7 +1054,7 @@ KDChart::Chart *ReportPreview::createNewChart(const ChartType &chartType, bool h - eventsLegend->setBrush(index, m_eventsModel->eventColor(static_cast(index+1))); + eventsLegend->setBrush(index, m_eventsModel->eventColor(static_cast(index+1))); } } @@ -1122,7 +1122,7 @@ KDChart::Chart *ReportPreview::createNewChart(const ChartType &chartType, bool h for ( int iRow = 0; iRow < rowCount; ++iRow ) { int eventTypeId = diagram->model()->data(diagram->model()->index(iRow, 0), Qt::UserRole + 1).toInt(); - QColor eventColor = m_eventsModel->eventColor(static_cast(eventTypeId)); + QColor eventColor = m_eventsModel->eventColor(static_cast(eventTypeId)); DEBUG_LOG(m_logger) << "Row " << iRow << ", eventTypeId " << eventTypeId; DEBUG_LOG(m_logger) << "Event color " << eventColor.name(); @@ -1322,7 +1322,7 @@ QVariant EventTypeModel::headerData(int section, Qt::Orientation orientation, in { if (orientation == Qt::Horizontal) { - const ReportManagement::EventType &et = static_cast(section+1); + const ReportManagement::EventType &et = static_cast(section+1); if (role == Qt::DisplayRole) return ReportManagement::toString(et); if (role == Qt::BackgroundRole) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.cpp index 85a5892aa..5361a19fb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SAAs/Gui/saa_dialog_model.cpp @@ -49,7 +49,7 @@ bool SaaDialogModel::initModel(LtsSession::LtsSession *session) m_asmDtc->assets( [this](const AssetManagement::Asset &asset) { - if (asset.id() <= 1 || asset.assetTypeId() != AssetManagement::AssetType_def::AdlerSAA) + if (asset.id() <= 1 || asset.assetTypeId() != AssetManagement::AssetType::AdlerSAA) return; AsmAssetProps asmProps(QString::fromStdString(asset.properties())); if (asmProps.hasExerciseId() && asmProps.exId != m_session->exerciseId()) @@ -153,7 +153,7 @@ void SaaDialogModel::onPartyDataChanged(const ParticipantManagement::Party &data bool SaaDialogModel::isFiltered(const AssetManagement::Asset &data, DataModification modType) const { - if (data.id() <= 1 || data.assetTypeId() != AssetManagement::AssetType_def::AdlerSAA) + if (data.id() <= 1 || data.assetTypeId() != AssetManagement::AssetType::AdlerSAA) return true; @@ -166,7 +166,7 @@ bool SaaDialogModel::isFiltered(const AssetManagement::Asset &data, DataModifica void SaaDialogModel::slotAssetChanged(const AssetManagement::Asset &data, DataModification modType) { - if (data.id() <= 1 || data.assetTypeId() != AssetManagement::AssetType_def::AdlerSAA) + if (data.id() <= 1 || data.assetTypeId() != AssetManagement::AssetType::AdlerSAA) return; AsmAssetProps asmProps(QString::fromStdString(data.properties())); if (asmProps.hasExerciseId() && asmProps.exId != m_session->exerciseId()) @@ -245,7 +245,7 @@ QVariant SaaDialogModel::data(const QModelIndex &index, int role) const ParticipantManagement::Party party; - if (asset.assetTypeId() == AssetManagement::AssetType_def::AdlerSAA && assetProps.hasExerciseId()) + if (asset.assetTypeId() == AssetManagement::AssetType::AdlerSAA && assetProps.hasExerciseId()) getPartyWithAssetId(asset.id(), party); if (role == Qt::DisplayRole) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.h index 821b14de9..19518f6e8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog.h @@ -54,14 +54,14 @@ public: // TODO: raus, String soll gepublished werden static QString groupEnumToGroupName(const Core::ServiceGroupType &type) { - QMap groupNameMapping; - groupNameMapping.insert(QLatin1String("Master"), Core::ServiceGroupType_def::Master); - groupNameMapping.insert(QLatin1String("Core"), Core::ServiceGroupType_def::Core); - groupNameMapping.insert(QLatin1String("ExercisePreparation"), Core::ServiceGroupType_def::ExercisePreparation); - groupNameMapping.insert(QLatin1String("ExerciseExecution"), Core::ServiceGroupType_def::ExerciseExecution); - groupNameMapping.insert(QLatin1String("ExercisePaused"), Core::ServiceGroupType_def::ExercisePaused); - groupNameMapping.insert(QLatin1String("ExerciseAfterActionReview"), Core::ServiceGroupType_def::ExerciseAfterActionReview); - groupNameMapping.insert(QLatin1String("Playback"), Core::ServiceGroupType_def::Playback); + QMap groupNameMapping; + groupNameMapping.insert(QLatin1String("Master"), Core::ServiceGroupType::Master); + groupNameMapping.insert(QLatin1String("Core"), Core::ServiceGroupType::Core); + groupNameMapping.insert(QLatin1String("ExercisePreparation"), Core::ServiceGroupType::ExercisePreparation); + groupNameMapping.insert(QLatin1String("ExerciseExecution"), Core::ServiceGroupType::ExerciseExecution); + groupNameMapping.insert(QLatin1String("ExercisePaused"), Core::ServiceGroupType::ExercisePaused); + groupNameMapping.insert(QLatin1String("ExerciseAfterActionReview"), Core::ServiceGroupType::ExerciseAfterActionReview); + groupNameMapping.insert(QLatin1String("Playback"), Core::ServiceGroupType::Playback); return groupNameMapping.key(type.underlying()); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp index 100533a88..58ac65bd6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceManagement/Gui/ServiceEdit/scm_dialog_service.cpp @@ -74,25 +74,25 @@ void ServiceWidget::setState(Core::RunningState state) switch (state.underlying()) { // STARTING - case Core::RunningState::inner_enum::Starting: + case Core::RunningState::Starting: status = ServiceWidget::STARTING; break; // STARTED - case Core::RunningState::inner_enum::Running: + case Core::RunningState::Running: status = ServiceWidget::STARTED; break; // STOPPING - case Core::RunningState::inner_enum::Stopping: + case Core::RunningState::Stopping: status = ServiceWidget::STOPPING; break; // STOPPED - case Core::RunningState::inner_enum::StartingError: - case Core::RunningState::inner_enum::NotYetStarted: - case Core::RunningState::inner_enum::StoppedNormally: - case Core::RunningState::inner_enum::StoppedError: // FIXME: how does that look like? was STARTED but is not stoppable and still STARTED? + case Core::RunningState::StartingError: + case Core::RunningState::NotYetStarted: + case Core::RunningState::StoppedNormally: + case Core::RunningState::StoppedError: // FIXME: how does that look like? was STARTED but is not stoppable and still STARTED? status = ServiceWidget::STOPPED; break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp index 9a7b87e3d..fdaf618a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.cpp @@ -93,7 +93,7 @@ void EquipmentErrorRegistrationModel::doEventRequests() { int64_t reqEnd = ((startTime + 24 * 60 * 60 * 1000) > endTime ? endTime : startTime + 24 * 60 * 60 * 1000); - m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType_def::EquipmentErrorReport}); + m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport}); startTime += (24 * 60 * 60 * 1000) + 1; @@ -133,7 +133,7 @@ void EquipmentErrorRegistrationModel::onRequestedDataAvailable(TimeLineManagemen void EquipmentErrorRegistrationModel::onLiveEvent(const ExerciseEventManagement::Event &ev) { - if (ev.eventTypeId() != ProjectDataManagement::PdmEventType_def::EquipmentErrorReport) + if (ev.eventTypeId() != ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport) return; INFO_LOG(m_logger) << "Event EquipmentNumber=" << ev.equipmentNumber(); insertRow(event2Entry(ev)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp index efbb5e384..a2eff7db8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.cpp @@ -201,9 +201,9 @@ QVariant HgrAndMineSearchModel::data(const QModelIndex &index, int role) const { ParticipantManagement::TypeClass typeClass = m_ppmDtc->type(m_ppmDtc->participant(entry.participantId).typeId()).typeClass(); const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human ? - ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries : - ProjectDataManagement::VulnerabilityClass_def::VehicleDamages; - ProjectDataManagement::VulnerabilityState vs = static_cast(entry.vbg); + ProjectDataManagement::VulnerabilityClass::SoldierInjuries : + ProjectDataManagement::VulnerabilityClass::VehicleDamages; + ProjectDataManagement::VulnerabilityState vs = static_cast(entry.vbg); vulnerabilityState = ProjectDataManagement::toString(vs, vc); } return vulnerabilityState; @@ -253,7 +253,7 @@ void HgrAndMineSearchModel::onEquipmentSystemEventDataReply(const Core::Function return; HgrAndMineSearchEntry entry; - entry.type = ProjectDataManagement::HgrMineSearchFilterType(ProjectDataManagement::HgrMineSearchFilterType_def::Handgrenade); + entry.type = ProjectDataManagement::HgrMineSearchFilterType(ProjectDataManagement::HgrMineSearchFilterType::Handgrenade); entry.pos = event.position(); entry.timeStamp = event.timeStamp(); entry.source = event.equipmentNumber(); @@ -287,7 +287,7 @@ void HgrAndMineSearchModel::onRequestedDataAvailable(TimeLineManagement::Timelin event.properties().size())).object(); entry.type = m_evtFlt.value(obj.value(QStringLiteral("OriginatorChargeTypeId")).toInt()); - if (entry.type == ProjectDataManagement::HgrMineSearchFilterType::inner_enum::Mine) + if (entry.type == ProjectDataManagement::HgrMineSearchFilterType::Mine) continue; entry.pos = event.position(); @@ -347,9 +347,9 @@ void HgrAndMineSearchModel::doEventRequests() arr += QJsonValue(it.key()); const QJsonObject filter({{QStringLiteral("OriginatorChargeTypeId"), arr}}); - m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType_def::Hit, - ProjectDataManagement::PdmEventType_def::HitEffectSimulation, - ProjectDataManagement::PdmEventType_def::HitMine}, filter); + m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType::EventType_Hit, + ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation, + ProjectDataManagement::PdmEventType::EventType_HitMine}, filter); startTime += (24 * 60 * 60 * 1000) + 1; @@ -364,7 +364,7 @@ void HgrAndMineSearchModel::doInsertMines() HgrAndMineSearchEntry entry; QJsonObject properties; - entry.type = ProjectDataManagement::HgrMineSearchFilterType::inner_enum::Mine; + entry.type = ProjectDataManagement::HgrMineSearchFilterType::Mine; entry.timeStamp = QDateTime::currentMSecsSinceEpoch(); for (auto it = dusMineStates.constBegin(); it != dusMineStates.constEnd(); ++it) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp index 21cf9289b..2f256d23b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.cpp @@ -173,16 +173,16 @@ QVariant BasePlayerModel::headerData(int section, Qt::Orientation orientation, i cfc.data.push_back(std::move(cfd)); }; - fill(ProjectDataManagement::VulnerabilityState_def::CombatReady, m_tactStatusGreen); + fill(ProjectDataManagement::VulnerabilityState::CombatReady, m_tactStatusGreen); { LtsWidgets::ComboboxFilterData cfd; - cfd.data = ProjectDataManagement::VulnerabilityState_def::LightDamage; + cfd.data = ProjectDataManagement::VulnerabilityState::LightDamage; cfd.text = tr("Wounded / Damaged"); cfd.icon = m_tactStatusYellow; cfc.data.push_back(std::move(cfd)); } - fill(ProjectDataManagement::VulnerabilityState_def::CatastrophicKill, m_tactStatusRed); - fill(ProjectDataManagement::VulnerabilityState_def::NotReady, m_tactStatusOrange); + fill(ProjectDataManagement::VulnerabilityState::CatastrophicKill, m_tactStatusRed); + fill(ProjectDataManagement::VulnerabilityState::NotReady, m_tactStatusOrange); return cfc.toVariant(); } @@ -245,11 +245,11 @@ QVariant BasePlayerModel::data(const QModelIndex &index, int role) const { switch (data.vulnerabilityState.underlying()) { - case ProjectDataManagement::VulnerabilityState::NotReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady: return m_tactStatusOrange; - case ProjectDataManagement::VulnerabilityState::CombatReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady: return m_tactStatusGreen; - case ProjectDataManagement::VulnerabilityState::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill: return m_tactStatusRed; default: return m_tactStatusYellow; @@ -343,14 +343,14 @@ QVariant BasePlayerModel::data(const QModelIndex &index, int role) const { switch (data.vulnerabilityState.underlying()) { - case ProjectDataManagement::VulnerabilityState::NotReady: - case ProjectDataManagement::VulnerabilityState::CombatReady: - case ProjectDataManagement::VulnerabilityState::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_NotReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady: + case ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill: return data.vulnerabilityState.underlying(); default: break; } - return ProjectDataManagement::VulnerabilityState_def::LightDamage; + return ProjectDataManagement::VulnerabilityState::LightDamage; } case ColPosition: return data.isOutdated; @@ -786,8 +786,8 @@ QString BasePlayerModel::vulnerabilityStateString(ParticipantManagement::TypeCla ProjectDataManagement::VulnerabilityState vulState) const { const ProjectDataManagement::VulnerabilityClass vc = typeClass == ParticipantManagement::TypeClass::Human ? - ProjectDataManagement::VulnerabilityClass_def::SoldierInjuries : - ProjectDataManagement::VulnerabilityClass_def::VehicleDamages; + ProjectDataManagement::VulnerabilityClass::SoldierInjuries : + ProjectDataManagement::VulnerabilityClass::VehicleDamages; return ProjectDataManagement::toString(vulState, vc); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp index 001d082b1..b0c263b4e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_check_button_handler.cpp @@ -87,7 +87,7 @@ void CheckButtonHandler::addTacticalState() m_vbgs.reserve(13); - ProjectDataManagement::VulnerabilityState vs = ProjectDataManagement::VulnerabilityState_def::CombatReady; + ProjectDataManagement::VulnerabilityState vs = ProjectDataManagement::VulnerabilityState::CombatReady; QAction *a1 = new QAction(ProjectDataManagement::toString(vs) + tr(" (Bldg: without cont. reset)"), m_menuTacticalState); m_vbgs += a1; m_menuTacticalState->addAction(a1); @@ -97,7 +97,7 @@ void CheckButtonHandler::addTacticalState() connect(m_vbgs.last(), &QAction::triggered, this, &CheckButtonHandler::combatReadyRequested); - vs = ProjectDataManagement::VulnerabilityState_def::CombatReady; + vs = ProjectDataManagement::VulnerabilityState::CombatReady; QAction *a2 = new QAction(ProjectDataManagement::toString(vs) + tr(" (Bldg: with cont. reset)"), m_menuTacticalState); m_vbgs += a2; m_menuTacticalState->addAction(a2); @@ -107,7 +107,7 @@ void CheckButtonHandler::addTacticalState() connect(m_vbgs.last(), &QAction::triggered, this, &CheckButtonHandler::combatReadyResetContamintationRequested); - vs = ProjectDataManagement::VulnerabilityState_def::NoChange; + vs = ProjectDataManagement::VulnerabilityState::NoChange; QAction *a3 = new QAction( tr("Contamination reset only"), m_menuTacticalState); m_vbgs += a3; m_menuTacticalState->addAction(a3); @@ -116,11 +116,11 @@ void CheckButtonHandler::addTacticalState() for (int i = 1; i <= 9; ++i) { - ProjectDataManagement::VulnerabilityState vs(static_cast(i)); + ProjectDataManagement::VulnerabilityState vs(static_cast(i)); QAction *ac = new QAction(ProjectDataManagement::toString(vs), m_menuTacticalState); m_vbgs += ac; m_menuTacticalState->addAction(ac); - if (i == static_cast(ProjectDataManagement::VulnerabilityState_def::CombatReady)) + if (i == static_cast(ProjectDataManagement::VulnerabilityState::CombatReady)) { connect(m_vbgs.last(), &QAction::triggered, this, [this]() { sendInitRequest(m_selectedParticipants, false, false, true, false);}); @@ -246,12 +246,12 @@ std::vector CheckButtonHandler::setSelectedParticipantIds(const std::vector m_selectedParticipants.push_back(partIter.key()); if (!hasSoldier) - hasSoldier = (tc == ParticipantManagement::TypeClass_def::Human); + hasSoldier = (tc == ParticipantManagement::TypeClass::Human); if (!hasVehicles) - hasVehicles = (tc != ParticipantManagement::TypeClass_def::Human && - tc != ParticipantManagement::TypeClass_def::SupportEntity); + hasVehicles = (tc != ParticipantManagement::TypeClass::Human && + tc != ParticipantManagement::TypeClass::SupportEntity); if (!hasOC) - hasOC = (tc == ParticipantManagement::TypeClass_def::SupportEntity); + hasOC = (tc == ParticipantManagement::TypeClass::SupportEntity); } const bool enable = m_selectedParticipants.size() != 0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp index 0694b42e5..6084639dd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp @@ -290,12 +290,12 @@ void ServiceMonitorDialog::setAllOverrides(InfrastructureManagement::EffectOverr void ServiceMonitorDialog::onAllOff() { - setAllOverrides(InfrastructureManagement::EffectOverride_def::PermanentOff); + setAllOverrides(InfrastructureManagement::EffectOverride::PermanentOff); } void ServiceMonitorDialog::onAllAuto() { - setAllOverrides(InfrastructureManagement::EffectOverride_def::Automatic); + setAllOverrides(InfrastructureManagement::EffectOverride::Automatic); } void ServiceMonitorDialog::onTableViewSelectionChanged(const QItemSelection &selected) @@ -310,8 +310,8 @@ void ServiceMonitorDialog::onTableViewSelectionChanged(const QItemSelection &sel EgcuModel *em = qobject_cast(m_ui->ltsDataView->sourceModel()); auto type = em->getStructureElementType(m_ui->ltsDataView->selectedRows().first()); - if (type != InfrastructureManagement::StructureElementType_def::Building && - type != InfrastructureManagement::StructureElementType_def::MountingPoint) + if (type != InfrastructureManagement::StructureElementType::Building && + type != InfrastructureManagement::StructureElementType::MountingPoint) ena = false; } m_buttonBox->getButton(LtsWidgets::DialogButton::Edit)->setEnabled(ena); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp index f7d88554d..065b0cf43 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_edit.cpp @@ -61,16 +61,16 @@ bool EgcuEdit::init(const EgcuData &data, LtsSession::LtsSession *session) QLabel *name = new QLabel(QString::fromStdString(relayInfo.name()), this); QComboBox *cb = new QComboBox(this); - if (EgcuModel::readAllowance(InfrastructureManagement::EffectOverride_def::PermanentOn, relayInfo.property())) - cb->addItem(tr("On"), InfrastructureManagement::EffectOverride_def::PermanentOn); - if (EgcuModel::readAllowance(InfrastructureManagement::EffectOverride_def::PermanentOff, relayInfo.property())) - cb->addItem(tr("Off"), InfrastructureManagement::EffectOverride_def::PermanentOff); - cb->addItem(tr("Auto"), InfrastructureManagement::EffectOverride_def::Automatic); + if (EgcuModel::readAllowance(InfrastructureManagement::EffectOverride::PermanentOn, relayInfo.property())) + cb->addItem(tr("On"), InfrastructureManagement::EffectOverride::PermanentOn); + if (EgcuModel::readAllowance(InfrastructureManagement::EffectOverride::PermanentOff, relayInfo.property())) + cb->addItem(tr("Off"), InfrastructureManagement::EffectOverride::PermanentOff); + cb->addItem(tr("Auto"), InfrastructureManagement::EffectOverride::Automatic); l->addWidget(name, l->rowCount(), 0); l->addWidget(cb, l->rowCount()-1, 1); - cb->setCurrentIndex(cb->findData(InfrastructureManagement::EffectOverride_def::Automatic)); + cb->setCurrentIndex(cb->findData(InfrastructureManagement::EffectOverride::Automatic)); m_relayCbs.insert(relayInfo.id(), cb); }; @@ -90,7 +90,7 @@ bool EgcuEdit::init(const EgcuData &data, LtsSession::LtsSession *session) const std::vector &vecElements = data.mainStructureElement.elements(); for (const auto &se : vecElements) { - if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::Floor) + if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::Floor) continue; QTreeWidgetItem *twi = new QTreeWidgetItem(m_ui->twRooms, {QString::fromStdString(se.displayName())}); twi->setFlags(twi->flags() | Qt::ItemIsAutoTristate | Qt::ItemIsUserCheckable); @@ -101,7 +101,7 @@ bool EgcuEdit::init(const EgcuData &data, LtsSession::LtsSession *session) for (const auto &se : vecElements) { - if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::Room) + if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::Room) continue; if (se.path().size() < 2) @@ -260,7 +260,7 @@ bool EgcuEdit::apply() for (auto it = m_relayCbs.cbegin(); it != m_relayCbs.cend(); ++it) { QJsonObject objRelay; - if (it.value()->currentData().toInt() == InfrastructureManagement::EffectOverride_def::Automatic) + if (it.value()->currentData().toInt() == InfrastructureManagement::EffectOverride::Automatic) continue; objRelay[QString::number(it.key())] = it.value()->currentData().toInt(); arrRelays.append(objRelay); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp index 506348d46..4f3213898 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp @@ -189,17 +189,17 @@ QString EgcuModel::getOverridesFlash(const QByteArray &properties) if ( !overridesObj.contains(QStringLiteral("flash"))) return {}; - InfrastructureManagement::EffectOverride flash = static_cast(overridesObj.value(QStringLiteral("flash")).toInt()); + InfrastructureManagement::EffectOverride flash = static_cast(overridesObj.value(QStringLiteral("flash")).toInt()); QString res; switch(flash.underlying()) { - case InfrastructureManagement::EffectOverride_def::PermanentOff: + case InfrastructureManagement::EffectOverride::PermanentOff: res = tr("Off"); break; - case InfrastructureManagement::EffectOverride_def::PermanentOn: + case InfrastructureManagement::EffectOverride::PermanentOn: res = tr("On"); break; - case InfrastructureManagement::EffectOverride_def::Automatic: + case InfrastructureManagement::EffectOverride::Automatic: default: return {}; } @@ -216,13 +216,13 @@ QString EgcuModel::getOverridesString(const EgcuData &data) const QString res; switch(override.underlying()) { - case InfrastructureManagement::EffectOverride_def::PermanentOff: + case InfrastructureManagement::EffectOverride::PermanentOff: res = tr("Off"); break; - case InfrastructureManagement::EffectOverride_def::PermanentOn: + case InfrastructureManagement::EffectOverride::PermanentOn: res = tr("On"); break; - case InfrastructureManagement::EffectOverride_def::Automatic: + case InfrastructureManagement::EffectOverride::Automatic: default: continue; } @@ -464,11 +464,11 @@ void EgcuModel::initData() else parentIndex = indexFromItem(m_rootItem); - if (currentElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::BuildingSensorModule) + if (currentElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::BuildingSensorModule) continue; - bool bMseHasMountedBsm = mseHasMountedAsset(mse, InfrastructureManagement::MountingPointType_def::BuildingSensorModule); - bool bMseHasMountedEgcu = mseHasMountedAsset(mse, InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit); + bool bMseHasMountedBsm = mseHasMountedAsset(mse, InfrastructureManagement::MountingPointType::BuildingSensorModule); + bool bMseHasMountedEgcu = mseHasMountedAsset(mse, InfrastructureManagement::MountingPointType::EffectGenerationControlUnit); @@ -492,7 +492,7 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme switch (mountingPoint.type().underlying()) { - case InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit: + case InfrastructureManagement::MountingPointType::EffectGenerationControlUnit: { @@ -521,16 +521,16 @@ NGLTreeItem* EgcuModel::createItemFromMountingPoint(const InfrastructureManageme return new NGLTreeItem(QVariant::fromValue(mpData)); break; } - case InfrastructureManagement::MountingPointType_def::Unknown: - case InfrastructureManagement::MountingPointType_def::AnnouncementUnit: - case InfrastructureManagement::MountingPointType_def::BuildingSensorModule: - case InfrastructureManagement::MountingPointType_def::BuildingControlUnit: - case InfrastructureManagement::MountingPointType_def::OutdoorCamera: - case InfrastructureManagement::MountingPointType_def::IndoorCamera: - case InfrastructureManagement::MountingPointType_def::OutdoorIPS: - case InfrastructureManagement::MountingPointType_def::IndoorIPS: - case InfrastructureManagement::MountingPointType_def::MeteoDataUnit: - case InfrastructureManagement::MountingPointType_def::VirtualIPS: + case InfrastructureManagement::MountingPointType::Unknown: + case InfrastructureManagement::MountingPointType::AnnouncementUnit: + case InfrastructureManagement::MountingPointType::BuildingSensorModule: + case InfrastructureManagement::MountingPointType::BuildingControlUnit: + case InfrastructureManagement::MountingPointType::OutdoorCamera: + case InfrastructureManagement::MountingPointType::IndoorCamera: + case InfrastructureManagement::MountingPointType::OutdoorIPS: + case InfrastructureManagement::MountingPointType::IndoorIPS: + case InfrastructureManagement::MountingPointType::MeteoDataUnit: + case InfrastructureManagement::MountingPointType::VirtualIPS: default: return {}; break; @@ -572,14 +572,14 @@ InfrastructureManagement::StructureElementType EgcuModel::getStructureElementTyp { NGLTreeItem *item = privateData(index); if (!item) - return InfrastructureManagement::StructureElementType_def::get_default(); + return InfrastructureManagement::StructureElementType::get_default(); if (item->data().canConvert()) - return InfrastructureManagement::StructureElementType_def::MountingPoint; + return InfrastructureManagement::StructureElementType::MountingPoint; else if (item->data().canConvert()) return item->data().value().structureElementTypeId(); else - return InfrastructureManagement::StructureElementType_def::get_default(); + return InfrastructureManagement::StructureElementType::get_default(); } void EgcuModel::udpatePropertiesForRelayOverride(const int relay, @@ -604,14 +604,14 @@ void EgcuModel::udpatePropertiesForRelayOverride(const int relay, if (key != relay) continue; - if (state.underlying() != InfrastructureManagement::EffectOverride_def::Automatic) + if (state.underlying() != InfrastructureManagement::EffectOverride::Automatic) arrRelays[i] = QJsonObject({qMakePair(keyStr, state.underlying())}); else arrRelays.removeAt(i); containsRelay = true; break; } - if (!containsRelay && state.underlying() != InfrastructureManagement::EffectOverride_def::Automatic) + if (!containsRelay && state.underlying() != InfrastructureManagement::EffectOverride::Automatic) arrRelays.append(QJsonObject({qMakePair(QString::number(relay), state.underlying())})); if (arrRelays.isEmpty()) @@ -639,7 +639,7 @@ void EgcuModel::udpatePropertiesForOverride(const QString &tagName, QJsonObject docObj = QJsonObject(doc.object()); QJsonObject overridesObj = docObj.value(QStringLiteral("Overrides")).toObject(); - if (state.underlying() != InfrastructureManagement::EffectOverride_def::Automatic) + if (state.underlying() != InfrastructureManagement::EffectOverride::Automatic) overridesObj.insert(tagName, state.underlying()); else overridesObj.remove(tagName); @@ -681,7 +681,7 @@ void EgcuModel::findBuildings(NGLTreeItem *item, QMapdata().value(); - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Building) + if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building) buildings[se.mainStructureElementId()] = se; } @@ -712,7 +712,7 @@ void EgcuModel::getContextMenu(const QModelIndexList &indexes, QMenu &menu) menu.addAction(addContextMenuHeaderItem(tr("On"))); for (const AssetManagement::RelayInfo &relayInfo : std::as_const(m_relayInfos)) { - QAction *a = getRelayAction(InfrastructureManagement::EffectOverride_def::PermanentOn, egcus, relayInfo); + QAction *a = getRelayAction(InfrastructureManagement::EffectOverride::PermanentOn, egcus, relayInfo); if (a) menu.addAction(a); } @@ -720,25 +720,25 @@ void EgcuModel::getContextMenu(const QModelIndexList &indexes, QMenu &menu) menu.addAction(addContextMenuHeaderItem(tr("Off"))); for (const AssetManagement::RelayInfo &relayInfo : std::as_const(m_relayInfos)) { - QAction *a = getRelayAction(InfrastructureManagement::EffectOverride_def::PermanentOff, egcus, relayInfo); + QAction *a = getRelayAction(InfrastructureManagement::EffectOverride::PermanentOff, egcus, relayInfo); if (a) menu.addAction(a); } if (!buildings.isEmpty()) - menu.addAction(getGenericAction(InfrastructureManagement::EffectOverride_def::PermanentOff, tr("Flash"), QLatin1String("flash"), buildings)); + menu.addAction(getGenericAction(InfrastructureManagement::EffectOverride::PermanentOff, tr("Flash"), QLatin1String("flash"), buildings)); menu.addSeparator(); menu.addAction(addContextMenuHeaderItem(tr("Auto"))); for (const AssetManagement::RelayInfo &relayInfo : std::as_const(m_relayInfos)) { - QAction *a = getRelayAction(InfrastructureManagement::EffectOverride_def::Automatic, egcus, relayInfo); + QAction *a = getRelayAction(InfrastructureManagement::EffectOverride::Automatic, egcus, relayInfo); if (a) menu.addAction(a); } if (!buildings.isEmpty()) - menu.addAction(getGenericAction(InfrastructureManagement::EffectOverride_def::Automatic, tr("Flash"), QLatin1String("flash"), buildings)); + menu.addAction(getGenericAction(InfrastructureManagement::EffectOverride::Automatic, tr("Flash"), QLatin1String("flash"), buildings)); if (m_sitMapGuiIfc && buildings.size() == 1) { @@ -809,7 +809,7 @@ void EgcuModel::setAllOverrides(InfrastructureManagement::EffectOverride eo, con for (const InfrastructureManagement::StructureElement &building : std::as_const(buildings)) { auto copy = building; - udpatePropertiesForOverride(QLatin1String("flash"), eo == InfrastructureManagement::EffectOverride_def::PermanentOn ? InfrastructureManagement::EffectOverride_def::Automatic : eo, copy); + udpatePropertiesForOverride(QLatin1String("flash"), eo == InfrastructureManagement::EffectOverride::PermanentOn ? InfrastructureManagement::EffectOverride::Automatic : eo, copy); if (!requests.contains(building.mainStructureElementId())) { @@ -1181,9 +1181,9 @@ bool EgcuModel::readAllowance(InfrastructureManagement::EffectOverride eo, const return true; QJsonObject docObj = QJsonObject(doc.object()); - if (eo == InfrastructureManagement::EffectOverride_def::PermanentOn) + if (eo == InfrastructureManagement::EffectOverride::PermanentOn) return docObj.value(QStringLiteral("allowPermanentOn")).toBool(true); - else if (eo == InfrastructureManagement::EffectOverride_def::PermanentOff) + else if (eo == InfrastructureManagement::EffectOverride::PermanentOff) return docObj.value(QStringLiteral("allowPermanentOff")).toBool(true); else return true; @@ -1310,7 +1310,7 @@ EgcuData::EgcuData(const InfrastructureManagement::InstrumentationAsset &ia, con , mountingPointAsset(mpa), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { for (int relayId : relayIds) - effectOverrides.insert(relayId, InfrastructureManagement::EffectOverride_def::Automatic); + effectOverrides.insert(relayId, InfrastructureManagement::EffectOverride::Automatic); update(mse); @@ -1366,10 +1366,10 @@ void EgcuData::update(const InfrastructureManagement::StructureElement &se, cons allRelayIds.remove(relayId); int value = objState.value(relayIdString).toInt(); if (effectOverrides.contains(relayId)) - effectOverrides[relayId] = static_cast(value); + effectOverrides[relayId] = static_cast(value); } for (auto relayId : std::as_const(allRelayIds)) - effectOverrides[relayId] = InfrastructureManagement::EffectOverride_def::Automatic; + effectOverrides[relayId] = InfrastructureManagement::EffectOverride::Automatic; } void EgcuData::update(const Buildings::RelayState &data) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_party_equipment_check_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_party_equipment_check_dialog.cpp index 3a7640a9b..28c696a22 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_party_equipment_check_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_party_equipment_check_dialog.cpp @@ -98,7 +98,7 @@ void PartyEquipmentCheckDialog::onPartyCbChanged() void PartyEquipmentCheckDialog::onTypeClassCbChanged() { - const auto tc = ParticipantManagement::TypeClass_def::type(m_ui->cbTypeClass->currentData().toInt()); + const auto tc = ParticipantManagement::TypeClass(m_ui->cbTypeClass->currentData().toInt()); m_partyPlayerProxyModel->setTypeClass(tc); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp index 4c20a8cbe..f5bad832a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_structure_element_edit.cpp @@ -41,15 +41,15 @@ bool StructureElementEdit::init(const InfrastructureManagement::StructureElement if (!session->getFtc(m_ismFtc)) return false; - if (m_structureElement.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::Building) + if (m_structureElement.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building) { m_ui->groupBox->hide(); } - m_ui->cbFlashing->addItem(tr("Off"), InfrastructureManagement::EffectOverride_def::PermanentOff); - m_ui->cbFlashing->addItem(tr("Auto"), InfrastructureManagement::EffectOverride_def::Automatic); - m_ui->cbFlashing->setCurrentIndex(m_ui->cbFlashing->findData(InfrastructureManagement::EffectOverride_def::Automatic)); + m_ui->cbFlashing->addItem(tr("Off"), InfrastructureManagement::EffectOverride::PermanentOff); + m_ui->cbFlashing->addItem(tr("Auto"), InfrastructureManagement::EffectOverride::Automatic); + m_ui->cbFlashing->setCurrentIndex(m_ui->cbFlashing->findData(InfrastructureManagement::EffectOverride::Automatic)); updateComboBoxes(); @@ -139,7 +139,7 @@ bool StructureElementEdit::apply() QJsonObject resultObj; QJsonObject overrideObj; - if (m_ui->cbFlashing->currentData().toInt() != InfrastructureManagement::EffectOverride_def::Automatic) + if (m_ui->cbFlashing->currentData().toInt() != InfrastructureManagement::EffectOverride::Automatic) overrideObj.insert(QStringLiteral("flash"), m_ui->cbFlashing->currentData().toInt()); if (overrideObj.size()) resultObj.insert (QStringLiteral("Overrides"), overrideObj); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.cpp index c05cced06..176cae89b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.cpp @@ -123,8 +123,8 @@ bool ExplosionSingleCentral2SituationMap::updateElementImpl(const Sim2SituationM partyId = 0; mapObj->setPartyId(partyId); - const bool changeToActive = (ddsData.effectStateId().underlying()==AreaEffectSimulation::AesEffectState_def::EsActivated) && - (static_cast(mapObj->aesState()) < static_cast(AreaEffectSimulation::AesEffectState_def::EsActivated)); + const bool changeToActive = (ddsData.effectStateId().underlying()==AreaEffectSimulation::AesEffectState::EsActivated) && + (static_cast(mapObj->aesState()) < static_cast(AreaEffectSimulation::AesEffectState::EsActivated)); mapObj->setAesState(effectState2aesState(ddsData.effectStateId().underlying())); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.h index 6d451a1ab..2db15928d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/_explosion_single_central_to_map.h @@ -18,7 +18,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::ExplosionSingleCentral; using MAP_TYPE = SituationMap::SingleFireCentral; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory; }; class ExplosionSingleCentral2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp index 92c4cf9f6..a54c622b2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/adapter_dds.cpp @@ -231,7 +231,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -262,7 +262,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -277,7 +277,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -305,7 +305,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -319,7 +319,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -344,7 +344,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -360,7 +360,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -377,7 +377,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -412,11 +412,11 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointermode() == Mode::Mode_3D) { INFO_LOG(m_logger) << Q_FUNC_INFO << " assignUniqueValueRendererAesCentral"; - initRenderer3D_AesCentral_Booby(layernameAesCentral, {AreaEffectSimulation::AesType_def::AtBoobyTrap, AreaEffectSimulation::AesType_def::AtOffRouteMine}); + initRenderer3D_AesCentral_Booby(layernameAesCentral, {AreaEffectSimulation::AesType::AtBoobyTrap, AreaEffectSimulation::AesType::AtOffRouteMine}); } { - AreaEffectSimulation::AesType::inner_enum aesType = AreaEffectSimulation::AesType_def::AtBoobyTrap; + AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBoobyTrap; BoobyTrap2SituationMap *sim2Map = static_cast(m_aes2MapCont.value(aesType)); if (!sim2Map) { @@ -430,7 +430,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (!sim2Map) { @@ -449,7 +449,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -463,7 +463,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -477,7 +477,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -491,7 +491,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -508,7 +508,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -525,7 +525,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -542,7 +542,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { @@ -558,7 +558,7 @@ bool AdapterDds::init(Map *map, PluginProvider *pluginProvider, QPointer(m_aes2MapCont.value(aesType)); if (! sim2Map) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/aes_to_situation_map_tmpl.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/aes_to_situation_map_tmpl.h index 303db462d..4e836b8f1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/aes_to_situation_map_tmpl.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/aes_to_situation_map_tmpl.h @@ -59,20 +59,20 @@ inline SituationMap::AesEffectState effectState2aesState(AreaEffectSimulation::A switch (effectState.underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsUnknown: - case AreaEffectSimulation::AesEffectState_def::EsError: - case AreaEffectSimulation::AesEffectState_def::EsExpired: - case AreaEffectSimulation::AesEffectState_def::EsRemoved: - case AreaEffectSimulation::AesEffectState_def::EsPaused: - case AreaEffectSimulation::AesEffectState_def::EsReceived: - case AreaEffectSimulation::AesEffectState_def::EsCreated: + case AreaEffectSimulation::AesEffectState::EsUnknown: + case AreaEffectSimulation::AesEffectState::EsError: + case AreaEffectSimulation::AesEffectState::EsExpired: + case AreaEffectSimulation::AesEffectState::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsPaused: + case AreaEffectSimulation::AesEffectState::EsReceived: + case AreaEffectSimulation::AesEffectState::EsCreated: aesState = AesEffectState::Created; break; - case AreaEffectSimulation::AesEffectState_def::EsFired: - case AreaEffectSimulation::AesEffectState_def::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsFired: + case AreaEffectSimulation::AesEffectState::EsPrepared: aesState = AesEffectState::Prepared; break; - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: aesState = AesEffectState::Activated; break; } @@ -292,9 +292,9 @@ protected: const AreaEffectSimulation::AesEffectState &aesEffectState = ddsData.effectStateId(); if (ddsData.isDeleted()) return true; - if (aesEffectState == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (aesEffectState == AreaEffectSimulation::AesEffectState::EsRemoved) return true; - if (aesEffectState == AreaEffectSimulation::AesEffectState_def::EsExpired) + if (aesEffectState == AreaEffectSimulation::AesEffectState::EsExpired) { if (!ddsData.effectStart().is_set()) return true; @@ -317,7 +317,7 @@ protected: if (data.isDeleted()) return false; - if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsExpired) + if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsExpired) return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.h index c0a11c8aa..61586ea9a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/air_support_impact_to_map.h @@ -18,7 +18,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::AirSupportImpact; using MAP_TYPE = SituationMap::SingleFire; - static const AreaEffectSimulation::AesType::type aesType = AreaEffectSimulation::AesType::AtAirSupportImpact; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtAirSupportImpact; }; class AirSupportImpact2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp index e0e796aea..b06005eb8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/alarm_to_map.cpp @@ -108,7 +108,7 @@ bool AlarmToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const - if (data.eventType().underlying() != ProjectDataManagement::PdmEventType_def::EmergencyCall) + if (data.eventType().underlying() != ProjectDataManagement::PdmEventType::EventType_EmergencyCall) return true; return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.h index 2020dd040..e07cd4687 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/bccontamination_to_map.h @@ -20,7 +20,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::BCContamination; using MAP_TYPE = SituationMap::SingleFire; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtBCContamination; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBCContamination; }; class BCContamination2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp index 8fd88d668..f0fdec918 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.cpp @@ -330,7 +330,7 @@ bool BoobyTrap2SituationMap::isVisibleByFilter(const DDS_TYPE &data) const const auto partyId = data.partyId().is_set() ? data.partyId().get() : -1; bool isVisibleByFilter = partyId > 0 ? FilterClass::m_currentSymbolSettings.symbolSettings.symbolPartyAppearance.value(partyId).isVisible : true; if (isVisibleByFilter) - isVisibleByFilter = m_displayFilter->isVisible(AreaEffectSimulation::AesType_def::AtMineArea, + isVisibleByFilter = m_displayFilter->isVisible(AreaEffectSimulation::AesType::AtMineArea, data.effectStateId(), data.chargeStruct().chargeTypeId(), partyId, @@ -344,8 +344,8 @@ bool BoobyTrap2SituationMap::isVisibleByFilter(const DDS_TYPE &data) const void BoobyTrap2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType aesType) { - if ((AreaEffectSimulation::AesType_def::AtBoobyTrap != aesType.underlying()) && - (AreaEffectSimulation::AesType_def::AtMineArea != aesType.underlying())) + if ((AreaEffectSimulation::AesType::AtBoobyTrap != aesType.underlying()) && + (AreaEffectSimulation::AesType::AtMineArea != aesType.underlying())) return; const auto cb = [this](const DDS_TYPE &data) -> bool diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.h index 392403d6c..54ef55027 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/booby_traps_to_map.h @@ -22,7 +22,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::BoobyTrap; using MAP_TYPE = SituationMap::VirtualMine; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtBoobyTrap; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBoobyTrap; }; class BoobyTrap2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h index 3c3c9d517..7cc7cb06b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/borderline_to_map.h @@ -21,7 +21,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::Borderline; using MAP_TYPE = SituationMap::Polyline; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtBorderline; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBorderline; }; class Borderline2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp index dfbb9bc7a..157bf98bd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/building_contamination.cpp @@ -421,7 +421,7 @@ int BuildingContamination::findFloorIdByRoomId(int roomId) noexcept(false) continue; - if (parentSe.structureElementTypeId().underlying() != InfrastructureManagement::StructureElementType_def::Floor) + if (parentSe.structureElementTypeId().underlying() != InfrastructureManagement::StructureElementType::Floor) continue; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp index 2b3f1d896..504d3abd8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/buildings_to_map.cpp @@ -95,10 +95,10 @@ bool Building2SituationMap::isElapsed(const InfrastructureManagement::MainStruct - const InfrastructureManagement::StructureElementType::inner_enum set = ddsData.structureElementTypeId().underlying(); - if ((set == InfrastructureManagement::StructureElementType_def::MeteoDataUnit) || - (set == InfrastructureManagement::StructureElementType_def::RadioStation) || - (set == InfrastructureManagement::StructureElementType_def::ApproachingPoint) + const InfrastructureManagement::StructureElementType set = ddsData.structureElementTypeId().underlying(); + if ((set == InfrastructureManagement::StructureElementType::MeteoDataUnit) || + (set == InfrastructureManagement::StructureElementType::RadioStation) || + (set == InfrastructureManagement::StructureElementType::ApproachingPoint) ) return true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp index 1a435e82a..840d80f0e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/charge_effect_to_map.cpp @@ -73,7 +73,7 @@ bool ChargeEffectToMap::init(PluginProvider *pluginProvider) m_displayFilter->addChangedCallback(this); } - onAesDisplayFilterChanged(AreaEffectSimulation::AesType_def::AtExplosionArea); + onAesDisplayFilterChanged(AreaEffectSimulation::AesType::AtExplosionArea); connect(m_pluginProvider, &PluginProvider::partitionTimeChanged, this, &ChargeEffectToMap::onPartitionTimeChanged, Qt::UniqueConnection); TRACE_LOG(m_logger) << LOGFUNCTION << " END"; @@ -108,7 +108,7 @@ bool ChargeEffectToMap::run() m_pluginProvider->aesDtc()->trajectoryTimeAwares([this](const AreaEffectSimulation::TrajectoryTimeAware &data) { onTracjectoryChanged(data, DataModification::eAdded); }); - onAesDisplayFilterChanged(AreaEffectSimulation::AesType_def::AtExplosionArea); + onAesDisplayFilterChanged(AreaEffectSimulation::AesType::AtExplosionArea); return true; } @@ -549,8 +549,8 @@ void ChargeEffectToMap::updateImpacts2D3D(RefPointer &mapObj, const DDS_T { TRACE_LOG(m_logger) << LOGFUNCTION << " START"; - static QVector relevantEffectStates - = {AreaEffectSimulation::AesEffectState_def::EsActivated, AreaEffectSimulation::AesEffectState_def::EsFired}; + static QVector relevantEffectStates + = {AreaEffectSimulation::AesEffectState::EsActivated, AreaEffectSimulation::AesEffectState::EsFired}; const bool bDisplayDueToEffectState = relevantEffectStates.contains(data.state().underlying()); @@ -564,11 +564,11 @@ void ChargeEffectToMap::updateImpacts2D3D(RefPointer &mapObj, const DDS_T const Core::ZReference zReference = data.zReference(); switch (zReference.underlying()) { - case Core::ZReference_def::ZrDrapedOnGround: + case Core::ZReference::ZrDrapedOnGround: mapObj->setImpacts({origin}); break; - case Core::ZReference_def::ZrUndefined: - case Core::ZReference_def::ZrAbsolute: + case Core::ZReference::ZrUndefined: + case Core::ZReference::ZrAbsolute: mapObj->setImpactsAbsoluteHeight({origin}); break; default: @@ -601,8 +601,8 @@ void ChargeEffectToMap::updateDetonation3D(RefPointer &mapObj, const DDS_ - static QVector relevantEffectStates - = {AreaEffectSimulation::AesEffectState_def::EsActivated, AreaEffectSimulation::AesEffectState_def::EsFired, AreaEffectSimulation::AesEffectState_def::EsExpired}; + static QVector relevantEffectStates + = {AreaEffectSimulation::AesEffectState::EsActivated, AreaEffectSimulation::AesEffectState::EsFired, AreaEffectSimulation::AesEffectState::EsExpired}; bDisplay = bDisplay && relevantEffectStates.contains(effectState.underlying()); @@ -621,12 +621,12 @@ void ChargeEffectToMap::updateDetonation3D(RefPointer &mapObj, const DDS_ switch (zRef.underlying()) { - case Core::ZReference_def::ZrDrapedOnGround: + case Core::ZReference::ZrDrapedOnGround: if (mapObj->setDetonationsDraped({origin}, std::round(impactRadius))) bHasChanged = true; break; - case Core::ZReference_def::ZrUndefined: - case Core::ZReference_def::ZrAbsolute: + case Core::ZReference::ZrUndefined: + case Core::ZReference::ZrAbsolute: if (mapObj->setDetonationsAbsolute({origin}, std::round(impactRadius))) bHasChanged = true; break; @@ -670,24 +670,24 @@ bool ChargeEffectToMap::visibleByAesFilter(const DDS_T &data) const switch (data.state().underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsError: - case AreaEffectSimulation::AesEffectState_def::EsUnknown: - case AreaEffectSimulation::AesEffectState_def::EsRemoved: - case AreaEffectSimulation::AesEffectState_def::EsReceived: - case AreaEffectSimulation::AesEffectState_def::EsFired: + case AreaEffectSimulation::AesEffectState::EsError: + case AreaEffectSimulation::AesEffectState::EsUnknown: + case AreaEffectSimulation::AesEffectState::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsReceived: + case AreaEffectSimulation::AesEffectState::EsFired: DEBUG_LOG(m_logger) << "[visibleByAesFilter] set unvisible id: " << data.id() << ", state:" << data.state(); return false; - case AreaEffectSimulation::AesEffectState_def::EsCreated: + case AreaEffectSimulation::AesEffectState::EsCreated: DEBUG_LOG(m_logger) << "[visibleByAesFilter][EsCreated] created visible: " << m_effectStateStruct.displayCreated; return m_effectStateStruct.displayCreated; - case AreaEffectSimulation::AesEffectState_def::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsPrepared: DEBUG_LOG(m_logger) << "[visibleByAesFilter][EsPrepared] prepared visible? " << m_effectStateStruct.displayPrepared; return m_effectStateStruct.displayPrepared; - case AreaEffectSimulation::AesEffectState_def::EsActivated: - case AreaEffectSimulation::AesEffectState_def::EsPaused: + case AreaEffectSimulation::AesEffectState::EsActivated: + case AreaEffectSimulation::AesEffectState::EsPaused: DEBUG_LOG(m_logger) << "[visibleByAesFilter] [active/paused] visible? " << m_effectStateStruct.displayActivated; return m_effectStateStruct.displayActivated; - case AreaEffectSimulation::AesEffectState_def::EsExpired: + case AreaEffectSimulation::AesEffectState::EsExpired: { auto timeTriggered = data.sampleTime(); const AreaEffectSimulation::AesType t(AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions); @@ -705,11 +705,11 @@ void ChargeEffectToMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesType { DEBUG_LOG(m_logger) << "[ChargeEffectToMap] onAesDisplayFilterChanged aes Type: " << aesType; if (!m_displayFilter - || ((AreaEffectSimulation::AesType_def::AtExplosionCluster != aesType.underlying()) - && (AreaEffectSimulation::AesType_def::AtExplosionArea != aesType.underlying()))) + || ((AreaEffectSimulation::AesType::AtExplosionCluster != aesType.underlying()) + && (AreaEffectSimulation::AesType::AtExplosionArea != aesType.underlying()))) return; - m_effectStateStruct = m_displayFilter->effectStateFilter(AreaEffectSimulation::AesType_def::AtExplosionArea); + m_effectStateStruct = m_displayFilter->effectStateFilter(AreaEffectSimulation::AesType::AtExplosionArea); updateAllChargeEffects(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.h index 0fca43838..1cc31896b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/danger_area_to_map.h @@ -17,7 +17,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::DangerArea; using MAP_TYPE = SituationMap::DangerArea; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtDangerArea; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtDangerArea; }; class DangerArea2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.h index 35ffe208d..3228bec7f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/dus_single_mine_to_map.h @@ -22,7 +22,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::DusSingleMine; using MAP_TYPE = SituationMap::Participant; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtDusSingleMine; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtDusSingleMine; }; class DusSingleMine2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp index 91e254fb5..3548cca91 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.cpp @@ -412,7 +412,7 @@ bool EffectCluster2SituationMap::updateNonLethalArea(RefPointergearClassFromChargeTypeId(chargeTypeId); - if (gc.underlying() == ProjectDataManagement::GearClass_def::AirSupport) + if (gc.underlying() == ProjectDataManagement::GearClass::AirSupport) { const QVector &casEffectsVec = m_pdmHandler->casEffects(EffectCluster.chargeStruct()); @@ -537,9 +537,9 @@ void EffectCluster2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation: TRACE_LOG(m_logger) << " onAesDisplayFilterChanged, aesType =" << aesType << ", this " << this; - if ((AreaEffectSimulation::AesType_def::AtEffectCluster != aesType.underlying()) && - (AreaEffectSimulation::AesType_def::AtExplosionArea != aesType.underlying()) && - (AreaEffectSimulation::AesType_def::AtAirSupportImpact != aesType.underlying())) + if ((AreaEffectSimulation::AesType::AtEffectCluster != aesType.underlying()) && + (AreaEffectSimulation::AesType::AtExplosionArea != aesType.underlying()) && + (AreaEffectSimulation::AesType::AtAirSupportImpact != aesType.underlying())) return; const auto cb = [this](const DDS_TYPE &data) -> bool diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.h index 7dd7cda65..c83f84853 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/effect_cluster_to_map.h @@ -19,7 +19,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::EffectCluster; using MAP_TYPE = SituationMap::AreaFire; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtEffectCluster; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtEffectCluster; }; class EffectCluster2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.h index e0fc1c11e..de42a1294 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_area_to_map.h @@ -17,7 +17,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::ExplosionArea; using MAP_TYPE = SituationMap::AreaFire; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtExplosionArea; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionArea; }; class ExplosionArea2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp index e259646c5..607693975 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.cpp @@ -177,8 +177,8 @@ bool ExplosionCluster2SituationMap::updateVisibility(const Aes2SituationMap::DDS if (m_displayFilter) bDisplayFilterShowGTL = m_displayFilter->showExplosionClusterGunToTargetLine(); const bool bDisplayFilterShowGFK = bDisplayFilterShowGTL && bIsMode3D && - ((effectState.underlying() != AreaEffectSimulation::AesEffectState_def::EsActivated) && - (effectState.underlying() != AreaEffectSimulation::AesEffectState_def::EsExpired)); + ((effectState.underlying() != AreaEffectSimulation::AesEffectState::EsActivated) && + (effectState.underlying() != AreaEffectSimulation::AesEffectState::EsExpired)); @@ -420,18 +420,18 @@ bool ExplosionCluster2SituationMap::onEffectssChanged(const AreaEffectSimulation for (const AreaEffectSimulation::SingleEffect &se : std::as_const(singleEffectsRef)) { - if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered) + if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState::SesTriggered) continue; switch (se.zPlacement().underlying()) { - case AreaEffectSimulation::AesZPlacement_def::ZpDraped: + case AreaEffectSimulation::AesZPlacement::ZpDraped: posContImpactsDraped.append({se.position().lon(), se.position().lat(), se.position().z()}); break; - case AreaEffectSimulation::AesZPlacement_def::ZpAbsolute: + case AreaEffectSimulation::AesZPlacement::ZpAbsolute: posContImpactsAbsolute.append({se.position().lon(), se.position().lat(), se.position().z()}); break; - case AreaEffectSimulation::AesZPlacement_def::ZpRelative: + case AreaEffectSimulation::AesZPlacement::ZpRelative: break; } @@ -544,7 +544,7 @@ bool ExplosionCluster2SituationMap::updateNonLethalArea(RefPointergearClassFromChargeTypeId(chargeTypeId); - if (gc.underlying() == ProjectDataManagement::GearClass_def::AirSupport) + if (gc.underlying() == ProjectDataManagement::GearClass::AirSupport) { const QVector &casEffectsVec = m_pdmHandler->casEffects(explosionCluster.chargeStruct()); @@ -721,7 +721,7 @@ bool ExplosionCluster2SituationMap::updateAllTracjectories(int simToRestrict) bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSimulation::Effects &effects) { - if (effects.aesTypeId() != AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions) + if (effects.aesTypeId() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions) return false; const int32_t simId = effects.aesItemId(); @@ -767,7 +767,7 @@ bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSi { ++i; - if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered) + if (se.singleEffectState().underlying() != AreaEffectSimulation::AesSingleEffectState::SesTriggered) continue; const qint64 age = partitionTimeMsec - se.singleEffectTime(); @@ -782,13 +782,13 @@ bool ExplosionCluster2SituationMap::updateEffects3DSingleItem(const AreaEffectSi switch (se.zPlacement().underlying()) { - case AreaEffectSimulation::AesZPlacement_def::ZpDraped: + case AreaEffectSimulation::AesZPlacement::ZpDraped: posContImpactsDraped.append({singleEffectPosGeo.lon(), singleEffectPosGeo.lat(), singleEffectPosGeo.z()}); break; - case AreaEffectSimulation::AesZPlacement_def::ZpAbsolute: + case AreaEffectSimulation::AesZPlacement::ZpAbsolute: posContImpactsAbsolute.append({singleEffectPosGeo.lon(), singleEffectPosGeo.lat(), singleEffectPosGeo.z()}); break; - case AreaEffectSimulation::AesZPlacement_def::ZpRelative: + case AreaEffectSimulation::AesZPlacement::ZpRelative: break; } @@ -939,9 +939,9 @@ void ExplosionCluster2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulati TRACE_LOG(m_logger) << "START onAesDisplayFilterChanged, aesType =" << aesType << ", this " << this; - if ((AreaEffectSimulation::AesType_def::AtExplosionCluster != aesType.underlying()) && - (AreaEffectSimulation::AesType_def::AtExplosionArea != aesType.underlying()) && - (AreaEffectSimulation::AesType_def::AtAirSupportImpact != aesType.underlying())) + if ((AreaEffectSimulation::AesType::AtExplosionCluster != aesType.underlying()) && + (AreaEffectSimulation::AesType::AtExplosionArea != aesType.underlying()) && + (AreaEffectSimulation::AesType::AtAirSupportImpact != aesType.underlying())) return; const auto cb = [this](const DDS_TYPE &data) -> bool diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.h index 4b106342b..4c872d4d2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_cluster_to_map.h @@ -19,7 +19,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::ExplosionCluster; using MAP_TYPE = SituationMap::AreaFire; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtExplosionCluster; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionCluster; }; class ExplosionCluster2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.h index 5a1011a17..94a896fd2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/explosion_single_to_map.h @@ -18,7 +18,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::ExplosionSingle; using MAP_TYPE = SituationMap::SingleFire; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtExplosionSingle; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtExplosionSingle; }; class ExplosionSingle2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.h index 3ba4b4740..68f83307f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/functional_area_to_map.h @@ -20,7 +20,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::FunctionalArea; using MAP_TYPE = SituationMap::FunctionalArea; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtFunctionalArea; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtFunctionalArea; }; class FunctionalArea2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.h index bb13dd725..f223ffe0a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/gas_pipe_to_map.h @@ -17,7 +17,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::GasPipe; using MAP_TYPE = SituationMap::Polygon; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtGasPipe; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtGasPipe; }; class GasPipe2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp index 880544059..28e011ba3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/guez_ied_to_map.cpp @@ -67,7 +67,7 @@ bool GuezIed2SituationMap::init(PluginProvider *pluginProvider) m_displayFilter->addChangedCallback(this); } - onAesDisplayFilterChanged(AreaEffectSimulation::AesType_def::AtMineAreaSingleMines); + onAesDisplayFilterChanged(AreaEffectSimulation::AesType::AtMineAreaSingleMines); connect(m_pluginProvider, &PluginProvider::partitionTimeChanged, this, &GuezIed2SituationMap::partitionTimeChanged); @@ -100,7 +100,7 @@ bool GuezIed2SituationMap::run() onIedPositionChanged(data, DataModification::eAdded); }); - onAesDisplayFilterChanged(AreaEffectSimulation::AesType_def::AtMineAreaSingleMines); + onAesDisplayFilterChanged(AreaEffectSimulation::AesType::AtMineAreaSingleMines); TRACE_LOG(m_logger) << LOGFUNCTION << " END"; return true; @@ -300,8 +300,8 @@ bool GuezIed2SituationMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsD AdvancedSymbology::Injury injury = guezIedStateToInjury(ddsData.tacticalState()); - if ((ddsData.type() == GuezIedManagement::IedType_def::IedSmallPyro) || - (ddsData.type() == GuezIedManagement::IedType_def::IedBigPyro)) + if ((ddsData.type() == GuezIedManagement::IedType::IedSmallPyro) || + (ddsData.type() == GuezIedManagement::IedType::IedBigPyro)) { updateIedPyro(ddsData.tacticalState(), injury, symData.sidc); } @@ -336,10 +336,10 @@ void GuezIed2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation::AesTy { DEBUG_LOG(m_logger) << "GuezIed2SituationMap"; - if (!m_displayFilter || aesType != AreaEffectSimulation::AesType_def::AtMineAreaSingleMines) + if (!m_displayFilter || aesType != AreaEffectSimulation::AesType::AtMineAreaSingleMines) return; - m_effectStateStruct = m_displayFilter->effectStateFilter(AreaEffectSimulation::AesType_def::AtMineAreaSingleMines); + m_effectStateStruct = m_displayFilter->effectStateFilter(AreaEffectSimulation::AesType::AtMineAreaSingleMines); handleSymbolAppearanceSettings(); @@ -438,19 +438,19 @@ bool GuezIed2SituationMap::visibleByAesFilter(const Sim2SituationMap::DDS_T &dds - case GuezIedManagement::IedTacticalState_def::NotActive: + case GuezIedManagement::IedTacticalState::NotActive: return m_effectStateStruct.displayPrepared; - case GuezIedManagement::IedTacticalState_def::Active: + case GuezIedManagement::IedTacticalState::Active: return m_effectStateStruct.displayActivated; - case GuezIedManagement::IedTacticalState_def::Unknown: + case GuezIedManagement::IedTacticalState::Unknown: return false; - case GuezIedManagement::IedTacticalState_def::Defused: - case GuezIedManagement::IedTacticalState_def::TriggeredByControlDevice: - case GuezIedManagement::IedTacticalState_def::TriggeredByLightBarrier: - case GuezIedManagement::IedTacticalState_def::TriggeredByRemote: - case GuezIedManagement::IedTacticalState_def::TriggeredBySwitch: - case GuezIedManagement::IedTacticalState_def::TriggeredByTautWire: + case GuezIedManagement::IedTacticalState::Defused: + case GuezIedManagement::IedTacticalState::TriggeredByControlDevice: + case GuezIedManagement::IedTacticalState::TriggeredByLightBarrier: + case GuezIedManagement::IedTacticalState::TriggeredByRemote: + case GuezIedManagement::IedTacticalState::TriggeredBySwitch: + case GuezIedManagement::IedTacticalState::TriggeredByTautWire: auto timeTriggered = ddsData.sampleTime(); const AreaEffectSimulation::AesType t(AreaEffectSimulation::AesType::AtMineAreaSingleMines); const auto afterGlow = m_effectStateStruct.expiredAfterglowDurationMSec; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp index 8232fbdbf..52b2e3675 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.cpp @@ -223,7 +223,7 @@ const QMap DusMineStateProxy::getFromDds() bool DusMineStateProxy::getItemView(AreaEffectSimulation::AesItemView &itemView) { - int aesType = static_cast(AreaEffectSimulation::AesType::inner_enum::AtMineAreaSingleMines); + int aesType = static_cast(AreaEffectSimulation::AesType::AtMineAreaSingleMines); const AreaEffectSimulation::AesItemView &localItemView = m_aesDtc->aesItemView(aesType); @@ -295,7 +295,7 @@ bool MineAreaNull2SituationMap::mapObjectsClicked(const QVector &un if (simIds.isEmpty()) return true; - sp->showInfoWindow(simIds, AreaEffectSimulation::AesType_def::AtMineAreaSingleMines); + sp->showInfoWindow(simIds, AreaEffectSimulation::AesType::AtMineAreaSingleMines); return true; } @@ -360,7 +360,7 @@ void MineAreaNull2SituationMap::onAesDisplayFilterChanged(AreaEffectSimulation:: { - if (AreaEffectSimulation::AesType_def::AtMineArea != aesType.underlying()) + if (AreaEffectSimulation::AesType::AtMineArea != aesType.underlying()) return; const auto cb = [this](const DDS_TYPE &data) -> bool diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h index c8458cc91..8c6146d75 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_null_to_map.h @@ -60,7 +60,7 @@ public: static PartyId partyId() { return {}; } static bool isCentral() { return false;} - static AreaEffectSimulation::AesEffectState effectStateId() { return AreaEffectSimulation::AesEffectState_def::EsCreated;} + static AreaEffectSimulation::AesEffectState effectStateId() { return AreaEffectSimulation::AesEffectState::EsCreated;} AreaEffectSimulation::ChargeStruct chargeStruct() const { return m_chargeStruct; } int chargeTypeId() const { return m_chargeStruct.chargeTypeId(); } @@ -168,7 +168,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = DusMineStateAndPositionData; using MAP_TYPE = SituationMap::Participant; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtMineArea; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineArea; }; class MineAreaNull2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp index 974cf69d0..0ed7a85f2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.cpp @@ -72,7 +72,7 @@ bool MineArea2SituationMap::updateVisibility(const DDS_TYPE &data, RefPointershowDetails(AreaEffectSimulation::AesType_def::AtMineArea); + bDisplayFilterShowDetails = m_displayFilter->showDetails(AreaEffectSimulation::AesType::AtMineArea); const bool bShowDetails = mapObj->visibility() && bDisplayFilterShowDetails; bool bUpdateView = false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.h index 01b3dbcb4..d14fc5c09 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_area_to_map.h @@ -17,7 +17,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::MineArea; using MAP_TYPE = SituationMap::MineField; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtMineArea; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineArea; }; class MineArea2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.h index ffc1722ac..c0cb36380 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mine_corridor_to_map.h @@ -17,7 +17,7 @@ struct Aes2SituationMapTraits { using DDS_TYPE = AreaEffectSimulation::MineCorridor; using MAP_TYPE = SituationMap::Polygon; - static const AreaEffectSimulation::AesType_def::type aesType = AreaEffectSimulation::AesType_def::AtMineCorridor; + static const AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtMineCorridor; }; class MineCorridor2SituationMap final : public Aes2SituationMap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp index d5b9cfafc..cecf1ea58 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/mounting_point_to_map.cpp @@ -170,7 +170,7 @@ bool MountingPointToMap::initRendererInternal() SituationMap::LayerFactory::UniqueValueData uvd; - QMap &imageCont = + QMap &imageCont = InfrastructureManagement::MountingPoint::getImageTable(); @@ -507,26 +507,26 @@ bool MountingPointToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const switch (m_resourceManagerMode) { case ResourceManagerMode::RMM_PlanActivityView: - return ( (mpType.underlying() == InfrastructureManagement::MountingPointType_def::BuildingControlUnit) || - (data.aimState().underlying() == InfrastructureManagement::MountingPointState_def::Idle) + return ( (mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingControlUnit) || + (data.aimState().underlying() == InfrastructureManagement::MountingPointState::Idle) ); break; case ResourceManagerMode::RMM_PlanDefinitionView: - return (mpType.underlying() == InfrastructureManagement::MountingPointType_def::BuildingControlUnit); + return (mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingControlUnit); break; case ResourceManagerMode::RMM_ComponentMonitor: return ! (data.hasAssociatedAsset() && ( - (mpType.underlying() == InfrastructureManagement::MountingPointType_def::OutdoorIPS) || - (mpType.underlying() == InfrastructureManagement::MountingPointType_def::IndoorIPS) || - (mpType.underlying() == InfrastructureManagement::MountingPointType_def::OutdoorCamera) || - (mpType.underlying() == InfrastructureManagement::MountingPointType_def::IndoorCamera) || - (mpType.underlying() == InfrastructureManagement::MountingPointType_def::OutdoorCamera) || - (mpType.underlying() == InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit) || - (mpType.underlying() == InfrastructureManagement::MountingPointType_def::BuildingSensorModule) + (mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorIPS) || + (mpType.underlying() == InfrastructureManagement::MountingPointType::IndoorIPS) || + (mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorCamera) || + (mpType.underlying() == InfrastructureManagement::MountingPointType::IndoorCamera) || + (mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorCamera) || + (mpType.underlying() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) || + (mpType.underlying() == InfrastructureManagement::MountingPointType::BuildingSensorModule) ) ); break; @@ -608,8 +608,8 @@ bool MountingPointToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsDat InfrastructureManagement::MountingPoint::MpColor col = InfrastructureManagement::MountingPoint::MpColor::GRAY; const InfrastructureManagement::MountingPointType mpType = ddsData.type(); - if ( (mpType.underlying() == InfrastructureManagement::MountingPointType_def::OutdoorIPS) || - (mpType.underlying() == InfrastructureManagement::MountingPointType_def::IndoorIPS) ) + if ( (mpType.underlying() == InfrastructureManagement::MountingPointType::OutdoorIPS) || + (mpType.underlying() == InfrastructureManagement::MountingPointType::IndoorIPS) ) { col = InfrastructureManagement::MountingPoint::MpColor::GRAY; } else { @@ -622,16 +622,16 @@ bool MountingPointToMap::updateElementImpl(const Sim2SituationMap::DDS_T &ddsDat DEBUG_LOG(m_logger) << LOGFUNCTION << " componentStateOfHostname: '" << hostname << "' -> " << stateOut; switch (stateOut.underlying()) { - case ComponentMonitor::ComponentState_def::Undefined: + case ComponentMonitor::ComponentState::Undefined: if (QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier)) col = InfrastructureManagement::MountingPoint::MpColor::ORANGE; else col = InfrastructureManagement::MountingPoint::MpColor::RED; break; - case ComponentMonitor::ComponentState_def::Reachable: + case ComponentMonitor::ComponentState::Reachable: col = InfrastructureManagement::MountingPoint::MpColor::GREEN; break; - case ComponentMonitor::ComponentState_def::Unreachable: + case ComponentMonitor::ComponentState::Unreachable: col = InfrastructureManagement::MountingPoint::MpColor::RED; break; default: @@ -703,7 +703,7 @@ void MountingPointToMap::handleBuildingComponentSettingsMP(RefPointer(mountingPoint.type()); bool newVisi = showMountingPointType(type); if (newVisi) { @@ -724,62 +724,62 @@ void MountingPointToMap::handleBuildingComponentSettingsMP(RefPointer &mapObj) override; void handleBuildingComponentSettingsMP(RefPointer &mapObj, const InfrastructureManagement::MountingPoint &mountingPoint); - bool showMountingPointType(InfrastructureManagement::MountingPointType_def::type mpType) const; + bool showMountingPointType(InfrastructureManagement::MountingPointType mpType) const; #endif private: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp index 84ee29fec..eb08d70f3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/AdapterDds/ncontamination_to_map.cpp @@ -87,7 +87,7 @@ bool NContamination2SituationMap::updateSphere3D(RefPointer convertMapDecription2BaseUrlVec(const std::vectorsetCenterPoint(QPointF(marker.position().lon(), marker.position().lat())); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp index 95ee83920..89ad78749 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_assignment_part_model.cpp @@ -600,11 +600,11 @@ QString AssignmentParticipantModel::effectToString(const Effect &effect) const { switch (effect.underlying()) { - case TargetManagement::Effect_def::NearMiss: + case TargetManagement::Effect::NearMiss: return tr("NearMiss"); - case TargetManagement::Effect_def::MobilityKill: + case TargetManagement::Effect::MobilityKill: return tr("MobilityKill"); - case TargetManagement::Effect_def::WeaponKill: + case TargetManagement::Effect::WeaponKill: return tr("WeaponKill"); default: { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp index c5b8c6896..dd96b70be 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.cpp @@ -72,9 +72,9 @@ QString ParticipantHandler::target_wmsTypeClassToString(const ParticipantManagem { switch (wmsTypeClass.underlying()) { - case ParticipantManagement::WmsTypeClass_def::TargetHuman: + case ParticipantManagement::WmsTypeClass::TargetHuman: return QStringLiteral("Human"); - case ParticipantManagement::WmsTypeClass_def::TargetVehicle: + case ParticipantManagement::WmsTypeClass::TargetVehicle: return QStringLiteral("Vehicle"); break; default: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.h index bfef3b820..3204fce5c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_participant_handler.h @@ -47,7 +47,7 @@ public: int getParticipantIdToEquipmentNumber(int participantId) const { return m_participantIdToEq.value(participantId, -1); } ParticipantManagement::WmsTypeClass getParticipantIdToWmsTypeClass(int participantId) const - { return m_participantIdToWmsTypeClass.value(participantId, ParticipantManagement::WmsTypeClass_def::None); } + { return m_participantIdToWmsTypeClass.value(participantId, ParticipantManagement::WmsTypeClass::None); } static QString target_wmsTypeClassToString(const ParticipantManagement::WmsTypeClass &wmsTypeClass); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp index 3c2b79611..98479f890 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_target_area_assignment_edit.cpp @@ -142,9 +142,9 @@ void AssignmentEditDialog::fillCmbEffect(QComboBox *cmb) { if (!cmb) return; - cmb->addItem(tr("Near Miss"), TargetManagement::Effect_def::NearMiss); - cmb->addItem(tr("Mobility Kill"), TargetManagement::Effect_def::MobilityKill); - cmb->addItem(tr("WeaponK ill"), TargetManagement::Effect_def::WeaponKill); + cmb->addItem(tr("Near Miss"), TargetManagement::Effect::NearMiss); + cmb->addItem(tr("Mobility Kill"), TargetManagement::Effect::MobilityKill); + cmb->addItem(tr("WeaponK ill"), TargetManagement::Effect::WeaponKill); cmb->setCurrentIndex(0); } @@ -227,11 +227,11 @@ bool AssignmentEditDialog::apply() { ShootbackConfiguration &configRef = m_assignment.configuration(); configRef.interval1(m_ui->sb_preWarningInterval->value()); - configRef.effect1( static_cast(m_ui->cmb_preWarningEffect->currentData().toInt()) ); + configRef.effect1( static_cast(m_ui->cmb_preWarningEffect->currentData().toInt()) ); configRef.flash1(m_ui->cb_flashAfterExpiration_1->isChecked()); configRef.interval2(m_ui->sb_timeToEffectInterval->value()); - configRef.effect2( static_cast(m_ui->cmb_timeToEffectEffect->currentData().toInt()) ); + configRef.effect2( static_cast(m_ui->cmb_timeToEffectEffect->currentData().toInt()) ); configRef.flash2(m_ui->cb_flashAfterExpiration_2->isChecked()); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp index 600d53d5c..347f514ab 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.cpp @@ -111,12 +111,12 @@ bool get(const QJsonObject &obj, const QString &key, Effect &val, bool bOptional { int iVal; get(obj, key, iVal, bOptional); - switch (static_cast(iVal)) + switch (static_cast(iVal)) { - case Effect_def::NearMiss: - case Effect_def::MobilityKill: - case Effect_def::WeaponKill: - val = Effect( static_cast(iVal) ); + case Effect::NearMiss: + case Effect::MobilityKill: + case Effect::WeaponKill: + val = Effect( static_cast(iVal) ); return true; } throw JsonException(obj, key); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h index a5068dc2b..1a0b89289 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/TargetManagement/Gui/ShootbackTargetConfiguration/tgt_telegrams.h @@ -124,11 +124,11 @@ struct ShootbackConfigurationData final : public TargetBaseTmplgetBuildingDisplayName(data.id()) + m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id()) : QString::fromStdString(data.description()); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp index 4c1e31637..d123fbeed 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/CrossBorderline/tln_cross_borderline_filter.cpp @@ -72,8 +72,8 @@ void CrossBorderlineFilter::updateFilterString() } m_filterString = QStringLiteral(" WHEN event_type_id = %1 OR event_type_id = %2") - .arg(int(ProjectDataManagement::PdmEventType_def::CrossLocalBorderline)) - .arg(int(ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline)); + .arg(int(ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline)) + .arg(int(ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline)); if (m_attributes[CrossBorderlineEventFactory::s_global].isEmpty() && m_attributes[CrossBorderlineEventFactory::s_sampleTime].isEmpty()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp index 869c41a5b..99721a8a4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/FireEvent/tln_fire_event_filter.cpp @@ -144,7 +144,7 @@ void FireEventFilter::updateFilterString() void FireEventFilter::onGearTypeChanged(const ProjectDataManagement::GearType &data, DataModification modType) { - if (data.gearClassId() != ProjectDataManagement::GearClass_def::DuelSim || data.name() == "N/A") + if (data.gearClassId() != ProjectDataManagement::GearClass::DuelSim || data.name() == "N/A") return; switch (modType) @@ -165,7 +165,7 @@ void FireEventFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeTyp if (data.id() < 1) return; - if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass_def::DuelSim) + if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim) return; const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp index cccc246f6..2473df204 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.cpp @@ -74,19 +74,19 @@ bool HitFilter::init( if (m_vulnerabilityStates.isEmpty()) { - using VulnerabilityState = ProjectDataManagement::VulnerabilityState_def; - m_vulnerabilityStates.insert(VulnerabilityState::CombatReady, ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState_def::CombatReady)); - m_vulnerabilityStates.insert(VulnerabilityState::LightDamage, ProjectDataManagement::toString(VulnerabilityState::LightDamage)); - m_vulnerabilityStates.insert(VulnerabilityState::MediumDamage, ProjectDataManagement::toString(VulnerabilityState::MediumDamage)); - m_vulnerabilityStates.insert(VulnerabilityState::HeavyDamage, ProjectDataManagement::toString(VulnerabilityState::HeavyDamage)); - m_vulnerabilityStates.insert(VulnerabilityState::MobilityKill, ProjectDataManagement::toString(VulnerabilityState::MobilityKill)); - m_vulnerabilityStates.insert(VulnerabilityState::VisibleMobilityKill, ProjectDataManagement::toString(VulnerabilityState::VisibleMobilityKill)); - m_vulnerabilityStates.insert(VulnerabilityState::WeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::WeaponSystemDamage)); - m_vulnerabilityStates.insert(VulnerabilityState::VisibleWeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VisibleWeaponSystemDamage)); - m_vulnerabilityStates.insert(VulnerabilityState::CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::CatastrophicKill)); - m_vulnerabilityStates.insert(VulnerabilityState::TemporarySeverance, ProjectDataManagement::toString(VulnerabilityState::TemporarySeverance)); - m_vulnerabilityStates.insert(VulnerabilityState::NearMiss, ProjectDataManagement::toString(VulnerabilityState::NearMiss)); - m_vulnerabilityStates.insert(VulnerabilityState::HitWithNoEffect, ProjectDataManagement::toString(VulnerabilityState::HitWithNoEffect)); + using VulnerabilityState = ProjectDataManagement::VulnerabilityState; + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CombatReady, ProjectDataManagement::toString(ProjectDataManagement::VulnerabilityState::CombatReady)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_LightDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_LightDamage)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_MediumDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MediumDamage)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_HeavyDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HeavyDamage)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_MobilityKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_MobilityKill)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_VisibleMobilityKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleMobilityKill)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_WeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_WeaponSystemDamage)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_TemporarySeverance, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_TemporarySeverance)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_NearMiss, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_NearMiss)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_HitWithNoEffect, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_HitWithNoEffect)); } if (m_partys.isEmpty()) @@ -272,7 +272,7 @@ void HitFilter::onChargeTypeChanged(const ProjectDataManagement::ChargeType &dat if (data.id() < 1) return; - if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass_def::DuelSim) + if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim) return; const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h index eb4c7b267..a8f99beb8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/Hit/tln_hit_filter.h @@ -40,7 +40,7 @@ public: bool check(const AbstractEventItem &item) const override; int originatorEquipmentNumber(int id) const { return m_originatorEquipmentNumbers.value(id, 0); } - QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast(id)); } + QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast(id)); } QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); } QString party(int id) const { return ParticipantManagement::trPartyName(m_ppmDtc->party(id).name()); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp index bd37e4cee..f382d7fff 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.cpp @@ -102,7 +102,7 @@ bool HitBuildingFilter::init( if (m_aesTypes.isEmpty()) { - using AesType = AreaEffectSimulation::AesType_def::type; + using AesType = AreaEffectSimulation::AesType; m_aesTypes.insert(static_cast(AesType::AtExplosionArea), AreaEffectSimulation::toString(AesType::AtExplosionArea)); @@ -123,8 +123,8 @@ bool HitBuildingFilter::init( if (m_vulnerabilityStates.isEmpty()) { - using VulnerabilityState = ProjectDataManagement::VulnerabilityState_def; - m_vulnerabilityStates.insert(VulnerabilityState::CombatReady, ProjectDataManagement::toString(VulnerabilityState::CombatReady)); + using VulnerabilityState = ProjectDataManagement::VulnerabilityState; + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CombatReady, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CombatReady)); @@ -132,7 +132,7 @@ bool HitBuildingFilter::init( - m_vulnerabilityStates.insert(VulnerabilityState::CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::CatastrophicKill)); + m_vulnerabilityStates.insert(VulnerabilityState::VulnerabilityState_CatastrophicKill, ProjectDataManagement::toString(VulnerabilityState::VulnerabilityState_CatastrophicKill)); @@ -410,7 +410,7 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage bool isOutdoor = true; for (const InfrastructureManagement::StructureElement &structureElement : std::as_const(data.elements())) { - if (structureElement.mountingPointTypeId() != InfrastructureManagement::MountingPointType_def::OutdoorCamera) + if (structureElement.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorCamera) { isOutdoor = false; break; @@ -423,7 +423,7 @@ void HitBuildingFilter::onMainStructureElementChanged(const InfrastructureManage { case DataModification::eAdded: case DataModification::eModified: - m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Building ? m_ismDtc->getBuildingDisplayName(data.id()) + m_mainStructureElements[data.id()] = data.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building ? m_ismDtc->getBuildingDisplayName(data.id()) : QString::fromStdString(data.description()); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.h index 8ebc29467..c0c350fcc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitBuilding/tln_hit_building_filter.h @@ -41,10 +41,10 @@ public: void addWidgetsToLayout(QGridLayout *layout, LtsWidgets::LtsDialog *dialog) const override; bool check(const AbstractEventItem &item) const override; - QString aesType(int id) const { return AreaEffectSimulation::toString(static_cast(id)); } + QString aesType(int id) const { return AreaEffectSimulation::toString(static_cast(id)); } QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); } QString mainStructureElement(int id) const { return m_ismDtc->getBuildingDisplayName(id); } - QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast(id)); } + QString vulnerabilityState(int id) const { return ProjectDataManagement::toString(static_cast(id)); } QString getChargeTypeShortName(int id); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp index 0a59403cf..60a0fa377 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.cpp @@ -64,7 +64,7 @@ bool HitEffectSimulationFilter::init(std::shared_ptr(AesType::AtNContamination), AreaEffectSimulation::toString(AesType::AtNContamination)); m_aesTypes.insert(static_cast(AesType::AtBCContamination), AreaEffectSimulation::toString(AesType::AtBCContamination)); m_aesTypes.insert(static_cast(AesType::AtExplosionArea), AreaEffectSimulation::toString(AesType::AtExplosionArea)); @@ -190,7 +190,7 @@ void HitEffectSimulationFilter::onChargeTypeChanged(const ProjectDataManagement: if (data.id() < 1) return; - if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) == ProjectDataManagement::GearClass_def::DuelSim) + if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) == ProjectDataManagement::GearClass::DuelSim) return; const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.h index 58a3a90a5..6c2092e92 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/HitEffectSimulation/tln_hit_effect_simulation_filter.h @@ -34,7 +34,7 @@ public: void addWidgetsToLayout(QGridLayout *layout, LtsWidgets::LtsDialog *dialog) const override; bool check(const AbstractEventItem &item) const override; - QString aesType(int id) const { return AreaEffectSimulation::toString(static_cast(id)); } + QString aesType(int id) const { return AreaEffectSimulation::toString(static_cast(id)); } QString chargeType(int id) const { return m_pdmDtc->trChargeTypeShortName(id); } static const std::vector s_originatorChargeTypesIds; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp index 4e169150d..e5650e406 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/EventTypes/WeaponAssignment/tln_weapon_assignment_filter.cpp @@ -162,7 +162,7 @@ void WeaponAssignmentFilter::updateFilterString() void WeaponAssignmentFilter::onGearTypeChanged(const ProjectDataManagement::GearType &data, DataModification modType) { - if (data.gearClassId() != ProjectDataManagement::GearClass_def::DuelSim || data.name() == "N/A") + if (data.gearClassId() != ProjectDataManagement::GearClass::DuelSim || data.name() == "N/A") return; switch (modType) @@ -183,7 +183,7 @@ void WeaponAssignmentFilter::onChargeTypeChanged(const ProjectDataManagement::Ch if (data.id() < 1) return; - if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass_def::DuelSim) + if (m_pdmDtc->gearClassFromChargeTypeId(data.id()) != ProjectDataManagement::GearClass::DuelSim) return; const QJsonObject properties = QJsonDocument::fromJson(QString::fromStdString(data.properties()).toUtf8()).object(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp index ee1bb2484..38cea5c5f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_item_list_model.cpp @@ -232,7 +232,7 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const if (!ele.isDouble()) return QVariant(); const int aesTypeId = ele.toInt(); - return AreaEffectSimulation::toString(static_cast(aesTypeId)); + return AreaEffectSimulation::toString(static_cast(aesTypeId)); } case Columns::AesId: { @@ -320,7 +320,7 @@ QVariant ItemListModel::data(const QModelIndex &index, int role) const if (!ele.isDouble()) return QVariant(); const int vId = ele.toInt(); - return ProjectDataManagement::toString(static_cast(vId)); + return ProjectDataManagement::toString(static_cast(vId)); } case Columns::MarkerNote: { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp index 734e5f719..50f68704a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_dialog.cpp @@ -126,8 +126,8 @@ TimelineDialog::TimelineDialog( if (m_exerciseEnd == 0) throw QStringLiteral("both end time and stop time of exercise %1 are unknown").arg(exc.id()); if (m_session->app() == LtsAppDescriptor::App::ThpSituationReplay || - exc.state() == ExerciseManagement::ExerciseState_def::Paused || - exc.state() == ExerciseManagement::ExerciseState_def::Stopped) + exc.state() == ExerciseManagement::ExerciseState::Paused || + exc.state() == ExerciseManagement::ExerciseState::Stopped) { m_range.maxEndSecs = m_exerciseEnd / 1000LL; m_range.maxEndMSecs = static_cast(m_range.maxEndSecs) * 1000LL; @@ -477,7 +477,7 @@ void TimelineDialog::onDebugCreateFakeEvent() } m_model->onLiveEvent(ExerciseEventManagement::Event(uniqueId, start, - ProjectDataManagement::PdmEventType(static_cast(typeId)), + ProjectDataManagement::PdmEventType(static_cast(typeId)), participantId, partyId, eqId, te->toPlainText().toStdString(), {})); }); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp index e39972471..2257ea51c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_timeline_model.cpp @@ -608,9 +608,9 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent) auto updateItem = [this, &properties, &eemEvent](Item &i, Track &t) { int type = (int)eemEvent.eventTypeId().underlying(); - if (type == ProjectDataManagement::PdmEventType_def::CameraVideo - || type == ProjectDataManagement::PdmEventType_def::RadioTvc - || type == ProjectDataManagement::PdmEventType_def::RadioCnr) + if (type == ProjectDataManagement::PdmEventType::EventType_CameraVideo + || type == ProjectDataManagement::PdmEventType::EventType_RadioTvc + || type == ProjectDataManagement::PdmEventType::EventType_RadioCnr) { int duration = properties[QStringLiteral("duration")].toInt(0); @@ -722,8 +722,8 @@ void TimelineModel::onLiveEvent(const ExerciseEventManagement::Event &eemEvent) EventType eventType = static_cast(static_cast(eemEvent.eventTypeId().underlying())); - if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline || - eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType_def::CrossLocalBorderline) + if (eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline || + eemEvent.eventTypeId().underlying() == ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline) eventType = EventType::CrossBorderline; EventItemPtr eventItem; @@ -1473,7 +1473,7 @@ int TimelineModel::findTrack(const AbstractEventItem &_eventItem) const QString &streamName = cameraVideoItem.internalStreamName(); InfrastructureManagement::StructureElement structureElement; m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId(), structureElement); - bool isOutdoorCameraEvent = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::OutdoorCamera; + bool isOutdoorCameraEvent = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera; if (!m_mainStructureElements.contains(msei) && msei != 0 ) throw QStringLiteral("camera video event with msei %1 is not inside msei list (maybe building not mapped into current exercise)").arg(msei); @@ -2053,7 +2053,7 @@ void TimelineModel::getBuildings() - if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::Building + if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building || !m_ismDtc->isElementAssignedToExercise(mse, m_session->exerciseId())) continue; @@ -2094,9 +2094,9 @@ void TimelineModel::getBuildings() int mappingCounter = 0; for (const InfrastructureManagement::StructureElement &se : std::as_const(mse.elements())) { - if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::MountingPoint - && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType_def::OutdoorCamera - && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType_def::IndoorCamera) + if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::MountingPoint + && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorCamera + && se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorCamera) continue; m_mountingPointsToMainStructureElementMapping.insert(se.id(), msei); @@ -2230,7 +2230,7 @@ void TimelineModel::getBuildingVideoStreams() for (auto it1 = streams.constBegin(); it1 != streams.constEnd(); ++it1) { - if (it1->type() != AudioVideoManagement::StreamType_def::Video) + if (it1->type() != AudioVideoManagement::StreamType::Video) continue; int32_t mountingPointId = it1->mountingPointId(); @@ -2273,7 +2273,7 @@ void TimelineModel::getBuildingVideoStreams() int msei = it2.value(); InfrastructureManagement::StructureElement structureElement; m_ismDtc->getStructureElementById(m_ismDtc->mainStructureElement(msei).structureElementId(), structureElement); - bool isOutdoorCameraStream = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType_def::OutdoorCamera; + bool isOutdoorCameraStream = structureElement.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera; if (isOutdoorCameraStream) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp index 45a9182a4..3edbe04ba 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.cpp @@ -13,115 +13,115 @@ QString eventTypeString(EventType eventType) switch (eventType) { case EventType::Hit: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Hit); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Hit); case EventType::WeaponAssignment: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::WeaponAssignment); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_WeaponAssignment); case EventType::BiteMessage: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::BiteMessage); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_BiteMessage); case EventType::FireEvent: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FireEvent); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_FireEvent); case EventType::HitBuilding: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitBuilding); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitBuilding); case EventType::Manipulation: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Manipulation); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Manipulation); case EventType::CameraVideo: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::CameraVideo); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_CameraVideo); case EventType::RadioCnr: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::RadioCnr); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_RadioCnr); case EventType::RadioTvc: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::RadioTvc); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_RadioTvc); case EventType::HitEffectSimulation: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitEffectSimulation); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation); case EventType::HitMine: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitMine); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitMine); case EventType::HitN: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitN); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitN); case EventType::HitC: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitC); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitC); case EventType::EnterDangerArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterDangerArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EnterDangerArea); case EventType::LeaveDangerArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveDangerArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea); case EventType::EnterMineArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterMineArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EnterMineArea); case EventType::LeaveMineArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveMineArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_LeaveMineArea); case EventType::CrossBorderline: return QCoreApplication::translate("EventType", "CrossBorderline"); case EventType::EnterFunctionalArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterFunctionalArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea); case EventType::LeaveFunctionalArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea); case EventType::EnterNuclear: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EnterNuclear); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EnterNuclear); case EventType::LeaveNuclear: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::LeaveNuclear); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_LeaveNuclear); case EventType::HitB: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitB); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitB); case EventType::FriendlyFire: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FriendlyFire); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_FriendlyFire); case EventType::HitGasPipe: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::HitGasPipe); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_HitGasPipe); case EventType::MineArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::MineArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_MineArea); case EventType::NContamination: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::NContamination); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_NContamination); case EventType::BCContamination: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::BCContamination); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_BCContamination); case EventType::DangerArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::DangerArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_DangerArea); case EventType::FunctionalArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::FunctionalArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_FunctionalArea); case EventType::MineCorridor: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::MineCorridor); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_MineCorridor); case EventType::Borderline: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Borderline); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Borderline); case EventType::TechnicalArea: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::TechnicalArea); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_TechnicalArea); case EventType::GasPipe: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::GasPipe); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_GasPipe); case EventType::Sanitation: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Sanitation); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Sanitation); case EventType::EquipmentErrorReport: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EquipmentErrorReport); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport); case EventType::EmergencyCall: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::EmergencyCall); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_EmergencyCall); case EventType::Marker: return QCoreApplication::translate("EventType", "Marker"); @@ -131,7 +131,7 @@ QString eventTypeString(EventType eventType) case EventType::Unknown: default: - return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType_def::Unknown); + return ProjectDataManagement::toString(ProjectDataManagement::PdmEventType::EventType_Unknown); } Q_UNREACHABLE(); } @@ -191,8 +191,8 @@ EventType toEventType(int eventType) case EventType::LeaveMineArea: return EventType::LeaveMineArea; - case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline: - case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline: + case ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline: + case ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline: return EventType::CrossBorderline; case EventType::EnterFunctionalArea: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h index c01744d7e..e7440512a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/Timeline/Gui/EventTimeline/tln_utils.h @@ -10,46 +10,46 @@ namespace Timeline enum EventType { - Unknown = ProjectDataManagement::PdmEventType_def::Unknown, - Hit = ProjectDataManagement::PdmEventType_def::Hit, - WeaponAssignment = ProjectDataManagement::PdmEventType_def::WeaponAssignment, - BiteMessage = ProjectDataManagement::PdmEventType_def::BiteMessage, - FireEvent = ProjectDataManagement::PdmEventType_def::FireEvent, - HitBuilding = ProjectDataManagement::PdmEventType_def::HitBuilding, - Manipulation = ProjectDataManagement::PdmEventType_def::Manipulation, - CameraVideo = ProjectDataManagement::PdmEventType_def::CameraVideo, - RadioCnr = ProjectDataManagement::PdmEventType_def::RadioCnr, - RadioTvc = ProjectDataManagement::PdmEventType_def::RadioTvc, - HitEffectSimulation = ProjectDataManagement::PdmEventType_def::HitEffectSimulation, - HitMine = ProjectDataManagement::PdmEventType_def::HitMine, - HitN = ProjectDataManagement::PdmEventType_def::HitN, - HitC = ProjectDataManagement::PdmEventType_def::HitC, - EnterDangerArea = ProjectDataManagement::PdmEventType_def::EnterDangerArea, - LeaveDangerArea = ProjectDataManagement::PdmEventType_def::LeaveDangerArea, - EnterMineArea = ProjectDataManagement::PdmEventType_def::EnterMineArea, - LeaveMineArea = ProjectDataManagement::PdmEventType_def::LeaveMineArea, - CrossBorderline = ProjectDataManagement::PdmEventType_def::CrossLocalBorderline, + Unknown = ProjectDataManagement::PdmEventType::EventType_Unknown, + Hit = ProjectDataManagement::PdmEventType::EventType_Hit, + WeaponAssignment = ProjectDataManagement::PdmEventType::EventType_WeaponAssignment, + BiteMessage = ProjectDataManagement::PdmEventType::EventType_BiteMessage, + FireEvent = ProjectDataManagement::PdmEventType::EventType_FireEvent, + HitBuilding = ProjectDataManagement::PdmEventType::EventType_HitBuilding, + Manipulation = ProjectDataManagement::PdmEventType::EventType_Manipulation, + CameraVideo = ProjectDataManagement::PdmEventType::EventType_CameraVideo, + RadioCnr = ProjectDataManagement::PdmEventType::EventType_RadioCnr, + RadioTvc = ProjectDataManagement::PdmEventType::EventType_RadioTvc, + HitEffectSimulation = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation, + HitMine = ProjectDataManagement::PdmEventType::EventType_HitMine, + HitN = ProjectDataManagement::PdmEventType::EventType_HitN, + HitC = ProjectDataManagement::PdmEventType::EventType_HitC, + EnterDangerArea = ProjectDataManagement::PdmEventType::EventType_EnterDangerArea, + LeaveDangerArea = ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea, + EnterMineArea = ProjectDataManagement::PdmEventType::EventType_EnterMineArea, + LeaveMineArea = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea, + CrossBorderline = ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline, - EnterFunctionalArea = ProjectDataManagement::PdmEventType_def::EnterFunctionalArea, - LeaveFunctionalArea = ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea, - EnterNuclear = ProjectDataManagement::PdmEventType_def::EnterNuclear, - LeaveNuclear = ProjectDataManagement::PdmEventType_def::LeaveNuclear, + EnterFunctionalArea = ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea, + LeaveFunctionalArea = ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea, + EnterNuclear = ProjectDataManagement::PdmEventType::EventType_EnterNuclear, + LeaveNuclear = ProjectDataManagement::PdmEventType::EventType_LeaveNuclear, - HitB = ProjectDataManagement::PdmEventType_def::HitB, - FriendlyFire = ProjectDataManagement::PdmEventType_def::FriendlyFire, - HitGasPipe = ProjectDataManagement::PdmEventType_def::HitGasPipe, - MineArea = ProjectDataManagement::PdmEventType_def::MineArea, - NContamination = ProjectDataManagement::PdmEventType_def::NContamination, - BCContamination = ProjectDataManagement::PdmEventType_def::BCContamination, - DangerArea = ProjectDataManagement::PdmEventType_def::DangerArea, - FunctionalArea = ProjectDataManagement::PdmEventType_def::FunctionalArea, - MineCorridor = ProjectDataManagement::PdmEventType_def::MineCorridor, - Borderline = ProjectDataManagement::PdmEventType_def::Borderline, - TechnicalArea = ProjectDataManagement::PdmEventType_def::TechnicalArea, - GasPipe = ProjectDataManagement::PdmEventType_def::GasPipe, - Sanitation = ProjectDataManagement::PdmEventType_def::Sanitation, - EquipmentErrorReport = ProjectDataManagement::PdmEventType_def::EquipmentErrorReport, - EmergencyCall = ProjectDataManagement::PdmEventType_def::EmergencyCall, + HitB = ProjectDataManagement::PdmEventType::EventType_HitB, + FriendlyFire = ProjectDataManagement::PdmEventType::EventType_FriendlyFire, + HitGasPipe = ProjectDataManagement::PdmEventType::EventType_HitGasPipe, + MineArea = ProjectDataManagement::PdmEventType::EventType_MineArea, + NContamination = ProjectDataManagement::PdmEventType::EventType_NContamination, + BCContamination = ProjectDataManagement::PdmEventType::EventType_BCContamination, + DangerArea = ProjectDataManagement::PdmEventType::EventType_DangerArea, + FunctionalArea = ProjectDataManagement::PdmEventType::EventType_FunctionalArea, + MineCorridor = ProjectDataManagement::PdmEventType::EventType_MineCorridor, + Borderline = ProjectDataManagement::PdmEventType::EventType_Borderline, + TechnicalArea = ProjectDataManagement::PdmEventType::EventType_TechnicalArea, + GasPipe = ProjectDataManagement::PdmEventType::EventType_GasPipe, + Sanitation = ProjectDataManagement::PdmEventType::EventType_Sanitation, + EquipmentErrorReport = ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport, + EmergencyCall = ProjectDataManagement::PdmEventType::EventType_EmergencyCall, Marker = 666, Block = 999, }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.cpp b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.cpp index 5e89fc59b..0ae96b5a2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/WarehouseManagement/Gui/equipment_type_edit_dialog.cpp @@ -64,59 +64,59 @@ bool EquipmentEditDialog::init() void EquipmentEditDialog::loadUiStandards() { - m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage_def::AbeLanguageGerman), WarehouseGuez::ConfigurationAbeLanguage_def::AbeLanguageGerman); - m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage_def::AbeLanguageEnglish), WarehouseGuez::ConfigurationAbeLanguage_def::AbeLanguageEnglish); - m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage_def::AbeLanguageFrench), WarehouseGuez::ConfigurationAbeLanguage_def::AbeLanguageFrench); + m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman), WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageGerman); + m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish), WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageEnglish); + m_ui->cmbDisplayLanguage->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench), WarehouseGuez::ConfigurationAbeLanguage::AbeLanguageFrench); - m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor_def::MhgrSensorOperatingOnTrainingEquipment), WarehouseGuez::ConfigurationMhgrSensor_def::MhgrSensorOperatingOnTrainingEquipment); - m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor_def::MhgrSensorOperatingOnOtherVehicle), WarehouseGuez::ConfigurationMhgrSensor_def::MhgrSensorOperatingOnOtherVehicle); - m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor_def::MhgrSensorOperatingOnSrVehicle), WarehouseGuez::ConfigurationMhgrSensor_def::MhgrSensorOperatingOnSrVehicle); + m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment), WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnTrainingEquipment); + m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle), WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnOtherVehicle); + m_ui->cmbMhgrOperatingMode->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle), WarehouseGuez::ConfigurationMhgrSensor::MhgrSensorOperatingOnSrVehicle); - m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV_def::AgdusHWNoHelmetNoWest), WarehouseGuez::ConfigurationAgdusHV_def::AgdusHWNoHelmetNoWest); - m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV_def::AgdusHWWithHelmetNoVest), WarehouseGuez::ConfigurationAgdusHV_def::AgdusHWWithHelmetNoVest); - m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV_def::AgdusHWWithHelmetWithVest), WarehouseGuez::ConfigurationAgdusHV_def::AgdusHWWithHelmetWithVest); + m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest), WarehouseGuez::ConfigurationAgdusHV::AgdusHWNoHelmetNoWest); + m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest), WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetNoVest); + m_ui->cmbConfAgdusHv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest), WarehouseGuez::ConfigurationAgdusHV::AgdusHWWithHelmetWithVest); - m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate_def::PositionUpdateVehicle), WarehouseGuez::ConfigurationPositionUpdate_def::PositionUpdateVehicle); - m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate_def::PositionUpdatePerson), WarehouseGuez::ConfigurationPositionUpdate_def::PositionUpdatePerson); - m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate_def::PositionUpdateAirUnit), WarehouseGuez::ConfigurationPositionUpdate_def::PositionUpdateAirUnit); + m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle), WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateVehicle); + m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson), WarehouseGuez::ConfigurationPositionUpdate::PositionUpdatePerson); + m_ui->cmbConfPositionUpdate->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit), WarehouseGuez::ConfigurationPositionUpdate::PositionUpdateAirUnit); - m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagNoDisplay), WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagNoDisplay); - m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagAbe), WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagAbe); - m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagAgdusPassiveAbe), WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagAgdusPassiveAbe); - m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagAgdusHW), WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagAgdusHW); - m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagAgdusBt46), WarehouseGuez::ConfigurationDisplayAdag_def::DisplayAdagAgdusBt46); + m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagNoDisplay); + m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAbe); + m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusPassiveAbe); + m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusHW); + m_ui->cmbConfDisplayAdag->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46), WarehouseGuez::ConfigurationDisplayAdag::DisplayAdagAgdusBt46); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASNoDisplayAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASNoDisplayAll); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAbeAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAbeAll); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeDefault), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeDefault); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeUnarmouredWheeledVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeUnarmouredWheeledVehicle); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeCraneVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeCraneVehicle); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeExcavatorVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeExcavatorVehicle); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeNbcDetectionFuchs), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeNbcDetectionFuchs); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeArmouredWheeledVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeArmouredWheeledVehicle); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeM113BasedVehicles), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeM113BasedVehicles); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPAssiveAbeMiwSkorpion), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPAssiveAbeMiwSkorpion); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbePiPzDachs), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbePiPzDachs); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeMiRPzKeiler), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeMiRPzKeiler); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeBPzBueffel), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeBPzBueffel); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbePrLPzBiber), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbePrLPzBiber); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbePZh2000), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbePZh2000); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeMinethrowerMiv), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeMinethrowerMiv); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeWieselAff), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeWieselAff); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeFlarakwatrgozelot), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusPassiveAbeFlarakwatrgozelot); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusHWAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusHWAll); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46Default), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46Default); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46KPzLeopard), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46KPzLeopard); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46SPzMarder), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46SPzMarder); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46LLPzWieselMk), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46LLPzWieselMk); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46LLPzWieselTow), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46LLPzWieselTow); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46SpehwgFennek), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46SpehwgFennek); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46GtkBoxer), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46GtkBoxer); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46GefKl_1_4), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46GefKl_1_4); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46GTFKl_1_4), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46GTFKl_1_4); - m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46TPzFuchs), WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::DASAgdusBt46TPzFuchs); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASNoDisplayAll); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAbeAll); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeDefault); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeUnarmouredWheeledVehicle); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeCraneVehicle); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeExcavatorVehicle); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeNbcDetectionFuchs); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeArmouredWheeledVehicle); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeM113BasedVehicles); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPAssiveAbeMiwSkorpion); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePiPzDachs); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMiRPzKeiler); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeBPzBueffel); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePrLPzBiber); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbePZh2000); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeMinethrowerMiv); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeWieselAff); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusPassiveAbeFlarakwatrgozelot); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusHWAll); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46Default); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46KPzLeopard); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SPzMarder); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselMk); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46LLPzWieselTow); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46SpehwgFennek); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GtkBoxer); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GefKl_1_4); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46GTFKl_1_4); + m_ui->cmbConfDisplayAdagSubunit->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs), WarehouseGuez::ConfigurationDisplayAdagSubUnit::DASAgdusBt46TPzFuchs); m_ui->cmbConfEffectModelAgdus->addItem(QObject::tr("NONE"), 0); auto cb = [this](const WarehouseGuez::InjuryModelAgdusWh &injModel) @@ -126,19 +126,19 @@ void EquipmentEditDialog::loadUiStandards() m_dtc->injuryModelAgdusWhs(cb); - m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir_def::SpecialSensorFirNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorFir_def::SpecialSensorFirNoConfiguration); - m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir_def::SpecialSensorFirFir), WarehouseGuez::ConfigurationSpecialSensorFir_def::SpecialSensorFirFir); - m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir_def::SpecialSensorFirFirSpzMarder), WarehouseGuez::ConfigurationSpecialSensorFir_def::SpecialSensorFirFirSpzMarder); + m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirNoConfiguration); + m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir), WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFir); + m_ui->cmbSpecialSensorFir->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder), WarehouseGuez::ConfigurationSpecialSensorFir::SpecialSensorFirFirSpzMarder); - m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit_def::SpecialSensorMineFitNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorMineFit_def::SpecialSensorMineFitNoConfiguration); - m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit_def::SpecialSensorMineMv), WarehouseGuez::ConfigurationSpecialSensorMineFit_def::SpecialSensorMineMv); - m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit_def::SpecialSensorMineWmv), WarehouseGuez::ConfigurationSpecialSensorMineFit_def::SpecialSensorMineWmv); + m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineFitNoConfiguration); + m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv), WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineMv); + m_ui->cmbSpecialSensorMv->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv), WarehouseGuez::ConfigurationSpecialSensorMineFit::SpecialSensorMineWmv); - m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdNoConfiguration); - m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdZabc), WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdZabc); - m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdCsf), WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdCsf); - m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdPzBr), WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdPzBr); - m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdMrf), WarehouseGuez::ConfigurationSpecialSensorStd_def::SpecialSensorStdMrf); + m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdNoConfiguration); + m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdZabc); + m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdCsf); + m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdPzBr); + m_ui->cmbSpecialSensorStd->addItem(WarehouseGuez::toString(WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf), WarehouseGuez::ConfigurationSpecialSensorStd::SpecialSensorStdMrf); } @@ -208,24 +208,24 @@ bool EquipmentEditDialog::apply() m_ui->sbGroup->value(), m_ui->sbMinEquipNo->value(), m_ui->sbMaxEquipNo->value(), - static_cast(m_ui->cmbConfPositionUpdate->currentData().toInt()), - static_cast(m_ui->cmbConfDisplayAdag->currentData().toInt()), - static_cast(m_ui->cmbConfDisplayAdagSubunit->currentData().toInt()), - static_cast(m_ui->cmbConfAgdusHv->currentData().toInt()), + static_cast(m_ui->cmbConfPositionUpdate->currentData().toInt()), + static_cast(m_ui->cmbConfDisplayAdag->currentData().toInt()), + static_cast(m_ui->cmbConfDisplayAdagSubunit->currentData().toInt()), + static_cast(m_ui->cmbConfAgdusHv->currentData().toInt()), m_ui->cmbConfEffectModelAgdus->currentData().toInt(), m_ui->sbConfEffectModelMineIed->value(), m_ui->sbConfEffectModelHighAngleFire->value(), m_ui->sbConfEffectModelResources->value(), m_ui->sbConfEffectModelAcWeapon->value(), - static_cast(m_ui->cmbDisplayLanguage->currentData().toInt()), + static_cast(m_ui->cmbDisplayLanguage->currentData().toInt()), m_ui->chbDisplayAudioFeedback->isChecked(), - static_cast(m_ui->cmbMhgrOperatingMode->currentData().toInt()), + static_cast(m_ui->cmbMhgrOperatingMode->currentData().toInt()), m_ui->chbMhgrEnergySaveMode->isChecked(), m_ui->chbEffSimPyrotechnic->isChecked(), m_ui->chbSpecialSensorFirSan->isChecked(), - static_cast(m_ui->cmbSpecialSensorFir->currentData().toInt()), - static_cast(m_ui->cmbSpecialSensorMv->currentData().toInt()), - static_cast(m_ui->cmbSpecialSensorStd->currentData().toInt()), + static_cast(m_ui->cmbSpecialSensorFir->currentData().toInt()), + static_cast(m_ui->cmbSpecialSensorMv->currentData().toInt()), + static_cast(m_ui->cmbSpecialSensorStd->currentData().toInt()), m_ui->sbCanStartUpTime->value(), canDevicesFromUi()); @@ -239,38 +239,38 @@ quint32 EquipmentEditDialog::canDevicesFromUi() { quint32 ret = 0; - if (m_ui->chbCanAgdus->isChecked()) { ret |= WarehouseGuez::CanDevices_def::AGDUS; } - if (m_ui->chbCanDisplayUnit->isChecked()) { ret |= WarehouseGuez::CanDevices_def::ABE; } - if (m_ui->chbCanSpecialSensorFir->isChecked()) { ret |= WarehouseGuez::CanDevices_def::SS_FIR; } - if (m_ui->chbCanSpecialSensorMv->isChecked()) { ret |= WarehouseGuez::CanDevices_def::SS_MV; } - if (m_ui->chbCanSpecialSensorStd->isChecked()) { ret |= WarehouseGuez::CanDevices_def::SS_STD; } - if (m_ui->chbCanMhgrSensor->isChecked()) { ret |= WarehouseGuez::CanDevices_def::MHGR; } - if (m_ui->chbCanOverpressureSensor->isChecked()) { ret |= WarehouseGuez::CanDevices_def::ABC_UEBERDR; } - if (m_ui->chbCanNbcFlowSensor->isChecked()) { ret |= WarehouseGuez::CanDevices_def::ABC_STROEM; } - if (m_ui->chbCanEffectSimulator->isChecked()) { ret |= WarehouseGuez::CanDevices_def::WIRKDARST; } - if (m_ui->chbCanOcLaptop->isChecked()) { ret |= WarehouseGuez::CanDevices_def::SRT; } - if (m_ui->chbCanFireMarker->isChecked()) { ret |= WarehouseGuez::CanDevices_def::DMF; } - if (m_ui->chbCanIedSensor->isChecked()) { ret |= WarehouseGuez::CanDevices_def::IED_SENSOR; } - if (m_ui->chbCanIedControlUnit->isChecked()) { ret |= WarehouseGuez::CanDevices_def::IED_KONT_EINH; } + if (m_ui->chbCanAgdus->isChecked()) { ret |= WarehouseGuez::CanDevices::AGDUS; } + if (m_ui->chbCanDisplayUnit->isChecked()) { ret |= WarehouseGuez::CanDevices::ABE; } + if (m_ui->chbCanSpecialSensorFir->isChecked()) { ret |= WarehouseGuez::CanDevices::SS_FIR; } + if (m_ui->chbCanSpecialSensorMv->isChecked()) { ret |= WarehouseGuez::CanDevices::SS_MV; } + if (m_ui->chbCanSpecialSensorStd->isChecked()) { ret |= WarehouseGuez::CanDevices::SS_STD; } + if (m_ui->chbCanMhgrSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::MHGR; } + if (m_ui->chbCanOverpressureSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::ABC_UEBERDR; } + if (m_ui->chbCanNbcFlowSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::ABC_STROEM; } + if (m_ui->chbCanEffectSimulator->isChecked()) { ret |= WarehouseGuez::CanDevices::WIRKDARST; } + if (m_ui->chbCanOcLaptop->isChecked()) { ret |= WarehouseGuez::CanDevices::SRT; } + if (m_ui->chbCanFireMarker->isChecked()) { ret |= WarehouseGuez::CanDevices::DMF; } + if (m_ui->chbCanIedSensor->isChecked()) { ret |= WarehouseGuez::CanDevices::IED_SENSOR; } + if (m_ui->chbCanIedControlUnit->isChecked()) { ret |= WarehouseGuez::CanDevices::IED_KONT_EINH; } return ret; } void EquipmentEditDialog::setCanDevicesInUi(quint32 devices) { - m_ui->chbCanAgdus->setChecked(devices & WarehouseGuez::CanDevices_def::AGDUS); - m_ui->chbCanDisplayUnit->setChecked(devices & WarehouseGuez::CanDevices_def::ABE); - m_ui->chbCanSpecialSensorFir->setChecked(devices & WarehouseGuez::CanDevices_def::SS_FIR); - m_ui->chbCanSpecialSensorMv->setChecked(devices & WarehouseGuez::CanDevices_def::SS_MV); - m_ui->chbCanSpecialSensorStd->setChecked(devices & WarehouseGuez::CanDevices_def::SS_STD); - m_ui->chbCanMhgrSensor->setChecked(devices & WarehouseGuez::CanDevices_def::MHGR); - m_ui->chbCanOverpressureSensor->setChecked(devices & WarehouseGuez::CanDevices_def::ABC_UEBERDR); - m_ui->chbCanNbcFlowSensor->setChecked(devices & WarehouseGuez::CanDevices_def::ABC_STROEM); - m_ui->chbCanEffectSimulator->setChecked(devices & WarehouseGuez::CanDevices_def::WIRKDARST); - m_ui->chbCanOcLaptop->setChecked(devices & WarehouseGuez::CanDevices_def::SRT); - m_ui->chbCanFireMarker->setChecked(devices & WarehouseGuez::CanDevices_def::DMF); - m_ui->chbCanIedSensor->setChecked(devices & WarehouseGuez::CanDevices_def::IED_SENSOR); - m_ui->chbCanIedControlUnit->setChecked(devices & WarehouseGuez::CanDevices_def::IED_KONT_EINH); + m_ui->chbCanAgdus->setChecked(devices & WarehouseGuez::CanDevices::AGDUS); + m_ui->chbCanDisplayUnit->setChecked(devices & WarehouseGuez::CanDevices::ABE); + m_ui->chbCanSpecialSensorFir->setChecked(devices & WarehouseGuez::CanDevices::SS_FIR); + m_ui->chbCanSpecialSensorMv->setChecked(devices & WarehouseGuez::CanDevices::SS_MV); + m_ui->chbCanSpecialSensorStd->setChecked(devices & WarehouseGuez::CanDevices::SS_STD); + m_ui->chbCanMhgrSensor->setChecked(devices & WarehouseGuez::CanDevices::MHGR); + m_ui->chbCanOverpressureSensor->setChecked(devices & WarehouseGuez::CanDevices::ABC_UEBERDR); + m_ui->chbCanNbcFlowSensor->setChecked(devices & WarehouseGuez::CanDevices::ABC_STROEM); + m_ui->chbCanEffectSimulator->setChecked(devices & WarehouseGuez::CanDevices::WIRKDARST); + m_ui->chbCanOcLaptop->setChecked(devices & WarehouseGuez::CanDevices::SRT); + m_ui->chbCanFireMarker->setChecked(devices & WarehouseGuez::CanDevices::DMF); + m_ui->chbCanIedSensor->setChecked(devices & WarehouseGuez::CanDevices::IED_SENSOR); + m_ui->chbCanIedControlUnit->setChecked(devices & WarehouseGuez::CanDevices::IED_KONT_EINH); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp index e26bae598..d78012cb5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/ControlEffects/xmlreader.cpp @@ -12,7 +12,7 @@ namespace BuildingControlUnit XmlReader::XmlReader(QObject *parent) : QObject(parent) - .getNGLLogger("XmlReader")) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("XmlReader")) { } @@ -188,7 +188,7 @@ Action *XmlReader::parseAction(QXmlStreamReader &xml) if (xml.name() == QStringLiteral("bsm")) return parseBsmAction(xml); - WARNING_LOG(m_logger) << "--- parseUnknownAction with name '" << xml.name().string() << "'cannot be handled."; + WARNING_LOG(m_logger) << "--- parseUnknownAction with name '" << xml.name().toString() << "'cannot be handled."; return {}; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/CMakeLists.txt index 29e263089..d242ca2de 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/BuildingControlUnit/VWM/CMakeLists.txt @@ -40,6 +40,7 @@ if(QT6_GUI_AVAILABLE) Qt6::Core ${Qt6_Gui} LtsUtilsCoreHeaderOnly + LtsUtilsCore BuildingControlCommon ) endif() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp index 74831a43f..0227f5ca3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_control_handler.cpp @@ -26,6 +26,7 @@ BuildingControlHandler::BuildingControlHandler(MainHandler *mainHandler) , Interface::Fts::TriggerBsmFlashRequestHandler(mainHandler->ddsHandler()->fts()) , Interface::Fts::SwitchRelayRequestHandler(mainHandler->ddsHandler()->fts()) , m_mainHandler(mainHandler) + , m_logger(getLogger("BuildingControlHandler")) {} BuildingControlHandler::~BuildingControlHandler() @@ -66,12 +67,12 @@ bool BuildingControlHandler::init() for (auto it = latestStates.begin(); it != latestStates.end(); ++it) { const Buildings::HistoryState &historyState = it.value(); - if (!m_mainHandler->ismHandler()->isElementAssignedToExercise(historyState.mseId(),m_mainHandler->exerciseId() )) + if (!m_mainHandler->ismHandler()->isElementAssignedToExercise(historyState.mseId,m_mainHandler->exerciseId() )) { - DEBUG_LOG(m_logger)<<"[INIT] [recordReplay]>>>>>>> mseId=" << historyState.mseId() << " not in execise"; + DEBUG_LOG(m_logger)<<"[INIT] [recordReplay]>>>>>>> mseId=" << historyState.mseId << " not in execise"; continue; } - m_historyStates.insert(historyState.mseId(), historyState); + m_historyStates.insert(historyState.mseId, historyState); DEBUG_LOG(m_logger)<<"[INIT] [recordReplay]>>>>>>> "<setContaminationState(data.buildingId(), data.contaminationState())) - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Can not send contamination state to building control process.")); + if (!bldg->setContaminationState(data.buildingId, data.contaminationState)) + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Can not send contamination state to building control process.")); return Core::FunctionReplyObject(); } @@ -210,45 +211,45 @@ Core::FunctionReplyObject BuildingControlHandler::onSetBuildingContaminationStat Core::FunctionReplyObject BuildingControlHandler::onSetBuildingStatesRequestInternal(const SetBuildingStatesRequest &data) { std::vector roomIds; - for (const auto &building : data.buildings()) + for (const auto &building : data.buildings) { - const auto it = m_buildings.find(building.buildingId()); + const auto it = m_buildings.find(building.buildingId); if (it == m_buildings.end()) - return Core::FunctionReplyObject(building.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(building.buildingId()); + return Core::FunctionReplyObject(building.buildingId, tr_lts("dds", "Building with id %1 not found.")).arg(building.buildingId); BuildingProcess *bldg = it.value(); - if (data.resetContamination().is_set()) + if (data.resetContamination.is_set()) { - if (data.resetContamination().get() && !bldg->resetContaminationState()) - return Core::FunctionReplyObject(building.buildingId(), tr_lts("dds", "reset contamination of building with id %1 failed.")).arg(building.buildingId()); + if (data.resetContamination.get() && !bldg->resetContaminationState()) + return Core::FunctionReplyObject(building.buildingId, tr_lts("dds", "reset contamination of building with id %1 failed.")).arg(building.buildingId); } - if (data.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::NoChange) + if (data.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NoChange) continue; - if (data.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::CatastrophicKill && - data.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::CombatReady ) - return Core::FunctionReplyObject(building.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(building.buildingId()); + if (data.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill && + data.vulnerabilityState != ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady ) + return Core::FunctionReplyObject(building.buildingId, tr_lts("dds", "Building with id %1 not found.")).arg(building.buildingId); - if (building.roomIds().is_set()) - roomIds = building.roomIds().get(); + if (building.roomIds.is_set()) + roomIds = building.roomIds.get(); - if (!bldg->setVulnerabilityState(data.vulnerabilityState(), roomIds)) - return Core::FunctionReplyObject(building.buildingId(), tr_lts("dds", "Can not send vulnerability state to building control process.")); + if (!bldg->setVulnerabilityState(data.vulnerabilityState, roomIds)) + return Core::FunctionReplyObject(building.buildingId, tr_lts("dds", "Can not send vulnerability state to building control process.")); } return Core::FunctionReplyObject(); } Core::FunctionReplyObject BuildingControlHandler::onSetFortifyFactorRequestInternal(const SetFortifyFactorRequest &data) { - auto it = m_buildings.find(data.buildingId()); + auto it = m_buildings.find(data.buildingId); if (it == m_buildings.end()) - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId()); + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId); BuildingProcess *bldg = it.value(); - if (!bldg->setFortifyFactors(data.fortifyFactors())) - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Can not send fortify factors to building control process.")); + if (!bldg->setFortifyFactors(data.fortifyFactors)) + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Can not send fortify factors to building control process.")); return Core::FunctionReplyObject(); } @@ -271,9 +272,9 @@ void BuildingControlHandler::setEffectStates(const int buildingId, const int ass void BuildingControlHandler::onRelayInfoChanged(const AssetManagement::RelayInfo &info, const DataModification mod) { if (mod != DataModification::eRemoved) - m_relayInfos.insert(info.id(), info); + m_relayInfos.insert(info.id, info); else - m_relayInfos.remove(info.id()); + m_relayInfos.remove(info.id); for(auto *bldg : std::as_const(m_buildings)) bldg->newRelayInfos(m_relayInfos); @@ -283,20 +284,20 @@ void BuildingControlHandler::onRelayInfoChanged(const AssetManagement::RelayInfo Core::FunctionReplyObject BuildingControlHandler::onSendCesHitOnBuildingRequestInternal(const SendCesHitOnBuildingRequest &data) { DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingRequestInternal"; - auto it = m_buildings.find(data.buildingId()); + auto it = m_buildings.find(data.buildingId); if (it == m_buildings.end()) { DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingRequestInternal return"; - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId()); + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId); } BuildingProcess *bldg = it.value(); - if (!bldg->sendCesHitOnBuilding(data.effectTime(), data.chargeTypeId(), data.destructiveFactor(), data.penetrationFactor(), - data.aesId(), data.impactPosition(), - QString::fromStdString(data.properties()))) + if (!bldg->sendCesHitOnBuilding(data.effectTime, data.chargeTypeId, data.destructiveFactor, data.penetrationFactor, + data.aesId, data.impactPosition, + QString::fromStdString(data.properties))) { DEBUG_LOG(m_logger) << "onSendCesHitOnBuildingRequestInternal return Can not send ces hit to building control process"; - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Can not send ces hit to building control process.")); + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Can not send ces hit to building control process.")); } DEBUG_LOG(m_logger) << "FunctionReplyObject"; return Core::FunctionReplyObject(); @@ -306,20 +307,20 @@ Core::FunctionReplyObject BuildingControlHandler::onSendCesHit3DonBuildingReques { DEBUG_LOG(m_logger) << "onSendCesHit3DonBuildingRequestInternal"; - auto it = m_buildings.find(data.buildingId()); + auto it = m_buildings.find(data.buildingId); if (it == m_buildings.end()) { DEBUG_LOG(m_logger) << "onSendCesHit3DonBuildingRequestInternal return"; - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId()); + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId); } BuildingProcess *bldg = it.value(); - if (!bldg->sendCesHit3DonBuilding(data.effectTime(), data.chargeTypeId(), data.destructiveFactor(), data.penetrationFactor(), - data.aesId(), data.impactPosition(), data.detonationLocation(), data.detonationDistance(), - QString::fromStdString(data.properties()))) + if (!bldg->sendCesHit3DonBuilding(data.effectTime, data.chargeTypeId, data.destructiveFactor, data.penetrationFactor, + data.aesId, data.impactPosition, data.detonationLocation, data.detonationDistance, + QString::fromStdString(data.properties))) { DEBUG_LOG(m_logger) << "onSendCesHit3DonBuildingRequestInternal return Can not send ces hit to building control process"; - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Can not send ces hit to building control process.")); + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Can not send ces hit to building control process.")); } DEBUG_LOG(m_logger) << "FunctionReplyObject"; return Core::FunctionReplyObject(); @@ -332,22 +333,22 @@ Core::FunctionReplyObject BuildingControlHandler::onTriggerBsmFlashInternal(cons { - auto it = m_buildings.find(data.buildingId()); + auto it = m_buildings.find(data.buildingId); if (it == m_buildings.end()) - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId()); + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId); BuildingProcess *bldg = it.value(); BuildingInfo buildingInfo= bldg->buildingInfo(); - BsmInfo bsmInfo = buildingInfo.bsms.value(data.assetId()); + BsmInfo bsmInfo = buildingInfo.bsms.value(data.assetId); - DEBUG_LOG(m_logger) << " BuildingId=" << data.buildingId() + DEBUG_LOG(m_logger) << " BuildingId=" << data.buildingId << " assetId=" << bsmInfo.assetId << " hostname=" << bsmInfo.hostname; if (!bldg->triggerFlashlight(data)) { DEBUG_LOG(m_logger) << "onTriggerBsmFlashInternal return Can not send trigger flashlight to building control process"; - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Can not send trigger flashlight to building control process")); + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Can not send trigger flashlight to building control process")); } } DEBUG_LOG(m_logger) << "FunctionReplyObject"; @@ -368,12 +369,12 @@ void BuildingControlHandler::onSwitchRelayRequest(const rti::core::SampleIdentit Core::FunctionReplyObject BuildingControlHandler::onSwitchRelayInternal(const SwitchRelayRequest &data) { DEBUG_LOG(m_logger) << "onSwitchRelayInternal " << data; - auto it = m_buildings.find(data.buildingId()); + auto it = m_buildings.find(data.buildingId); if (it == m_buildings.end()) - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId()); + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Building with id %1 not found.")).arg(data.buildingId); BuildingProcess *bldg = it.value(); if (!bldg->switchRelay(data)) - return Core::FunctionReplyObject(data.buildingId(), tr_lts("dds", "Can not set relay to building control process.")); + return Core::FunctionReplyObject(data.buildingId, tr_lts("dds", "Can not set relay to building control process.")); return Core::FunctionReplyObject(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp index bafa94641..e707e4547 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/building_process.cpp @@ -53,6 +53,7 @@ BuildingProcess::BuildingProcess(MainHandler *mainHandler, , m_hitLineInfoTimer(new QTimer(this)) , m_hitLineId(info.mseId << 16) , m_initBuilding(initBuilding) + , m_logger(getLogger("BuildingProcess")) { m_proc.setProgram(procName); m_proc.setReadChannel(QProcess::StandardOutput); @@ -86,7 +87,7 @@ void BuildingProcess::onStructureElementUpdateEffectOverrideReply(const Core::Fu bool BuildingProcess::start() { DEBUG_LOG(m_logger) << "BuildingProcess::start mseId = " << m_buildingInfo.mseId - << " m_historyState.size() = " << m_historyState.stateHistory().size() + << " m_historyState.size() = " << m_historyState.stateHistory.size() << " m_initBuilding=" << m_initBuilding; if (m_buildingInfo.mseId <= 0) { @@ -201,11 +202,11 @@ void BuildingProcess::shutdown() void BuildingProcess::setHistoryState(const Buildings::HistoryState &historyState) { - DEBUG_LOG(m_logger) << "BuildingProcess::setHistoryState size =" << historyState.stateHistory().size(); + DEBUG_LOG(m_logger) << "BuildingProcess::setHistoryState size =" << historyState.stateHistory.size(); ERROR_LOG(m_logger) << "[BuildingProcess::setHistoryState]>>> history =" << historyState; m_historyState = historyState; - m_historyState.sampleTime(QDateTime::currentMSecsSinceEpoch()); + m_historyState.sampleTime = QDateTime::currentMSecsSinceEpoch(); m_mainHandler->ddsHandler()->dts()->publish(m_historyState); } @@ -215,7 +216,7 @@ bool BuildingProcess::setVulnerabilityState(ProjectDataManagement::Vulnerability if (!m_wsSocket || !m_wsSocket->isValid()) return false; BuildingControlUnit::Json::Telegrams::SetDamageState tele; - tele.damageState = (state == ProjectDataManagement::VulnerabilityState::CatastrophicKill ? + tele.damageState = (state == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill ? BuildingControlUnit::DamageState::Destroyed : BuildingControlUnit::DamageState::NoDamage); tele.roomIds.reserve(roomIds.size()); @@ -236,12 +237,12 @@ bool BuildingProcess::setContaminationState(const int &bldId, const Contaminatio return false; BuildingControlUnit::Json::Telegrams::SetContaminationState tele; BuildingControlUnit::ContaminationState contState; - contState.aesId = contaminationState.aesId(); - if ( contaminationState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CatastrophicKill ) + contState.aesId = contaminationState.aesId; + if ( contaminationState.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill ) contState.damagePercentNew = 100; else contState.damagePercentNew = 0; - contState.rooms = contaminationState.rooms(); + contState.rooms = contaminationState.rooms; tele.contaminationStates.push_back(contState); DEBUG_LOG(m_logger) << "SetContaminationState websocket send: " << QString::fromUtf8(tele.toJson()); @@ -271,8 +272,8 @@ bool BuildingProcess::setFortifyFactors(const std::vector &r for (const auto &ff : relayStates) { BuildingControlUnit::Json::Telegrams::RelayState::RelayStateInfo info; - info.id = ff.id(); - info.state = ff.state(); + info.id = ff.id; + info.state = ff.state; tele.relayStates.push_back(info); } @@ -427,21 +428,21 @@ bool BuildingProcess::sendCesHitOnBuilding(const qint64 effectTimeMSec, return false; - const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(m_buildingInfo.absPosition.lon(), - m_buildingInfo.absPosition.lat())); - const LtsCoordTrans::UtmCoordinate impact(LtsCoordTrans::UtmCoordinate::fromGeographic(impactPosition.lon(), - impactPosition.lat(), + const LtsCoordTrans::UtmCoordinate coord(LtsCoordTrans::UtmCoordinate::fromGeographic(m_buildingInfo.absPosition.lon, + m_buildingInfo.absPosition.lat)); + const LtsCoordTrans::UtmCoordinate impact(LtsCoordTrans::UtmCoordinate::fromGeographic(impactPosition.lon, + impactPosition.lat, coord.zone)); Core::RelativePosition relPos(impact.x - coord.x, impact.y - coord.y, - impactPosition.z() - m_buildingInfo.absPosition.z()); + impactPosition.z - m_buildingInfo.absPosition.z); double xRot, yRot; QTransform m; m.rotate(-m_buildingInfo.angle); - m.map(relPos.offsetX(), relPos.offsetY(), &xRot, &yRot); - relPos.offsetX(xRot); - relPos.offsetY(yRot); + m.map(relPos.offsetX, relPos.offsetY, &xRot, &yRot); + relPos.offsetX = xRot; + relPos.offsetY = yRot; BuildingControlUnit::Json::Telegrams::CentralEffectSimulationHit tele; @@ -450,9 +451,9 @@ bool BuildingProcess::sendCesHitOnBuilding(const qint64 effectTimeMSec, tele.destructiveFactor = destructiveFactor; tele.penetrationFactor = penetrationFactor; tele.aesId = aesId; - tele.relPosition.x = relPos.offsetX(); - tele.relPosition.y = relPos.offsetY(); - tele.relPosition.z = relPos.offsetZ(); + tele.relPosition.x = relPos.offsetX; + tele.relPosition.y = relPos.offsetY; + tele.relPosition.z = relPos.offsetZ; tele.properties = properties; DEBUG_LOG(m_logger) << "sendCesHitOnBuilding websocket send: " << QString::fromUtf8(tele.toJson()); @@ -469,27 +470,27 @@ bool BuildingProcess::sendCesHit3DonBuilding(const qint64 effectTimeMSec, const return false; - const LtsCoordTrans::UtmCoordinate &coord(LtsCoordTrans::UtmCoordinate::fromGeographic(m_buildingInfo.absPosition.lon(), - m_buildingInfo.absPosition.lat())); + const LtsCoordTrans::UtmCoordinate &coord(LtsCoordTrans::UtmCoordinate::fromGeographic(m_buildingInfo.absPosition.lon, + m_buildingInfo.absPosition.lat)); Core::RelativePosition relImpactPos; { - const LtsCoordTrans::UtmCoordinate &impactUtm(LtsCoordTrans::UtmCoordinate::fromGeographic(impactPosition.lon(), - impactPosition.lat(), + const LtsCoordTrans::UtmCoordinate &impactUtm(LtsCoordTrans::UtmCoordinate::fromGeographic(impactPosition.lon, + impactPosition.lat, coord.zone)); relImpactPos = Core::RelativePosition(impactUtm.x - coord.x, impactUtm.y - coord.y, - impactPosition.z() - m_buildingInfo.absPosition.z()); + impactPosition.z - m_buildingInfo.absPosition.z); } Core::RelativePosition relDetoLoc; { - const LtsCoordTrans::UtmCoordinate &detonationLocationUtm(LtsCoordTrans::UtmCoordinate::fromGeographic(detonationLocation.lon(), - detonationLocation.lat(), + const LtsCoordTrans::UtmCoordinate &detonationLocationUtm(LtsCoordTrans::UtmCoordinate::fromGeographic(detonationLocation.lon, + detonationLocation.lat, coord.zone)); relDetoLoc = Core::RelativePosition(detonationLocationUtm.x - coord.x, detonationLocationUtm.y - coord.y, - detonationLocation.z() - m_buildingInfo.absPosition.z()); + detonationLocation.z - m_buildingInfo.absPosition.z); } @@ -498,13 +499,13 @@ bool BuildingProcess::sendCesHit3DonBuilding(const qint64 effectTimeMSec, const m.rotate(-m_buildingInfo.angle); - m.map(relImpactPos.offsetX(), relImpactPos.offsetY(), &xRot, &yRot); - relImpactPos.offsetX(xRot); - relImpactPos.offsetY(yRot); + m.map(relImpactPos.offsetX, relImpactPos.offsetY, &xRot, &yRot); + relImpactPos.offsetX = xRot; + relImpactPos.offsetY = yRot; - m.map(relDetoLoc.offsetX(), relDetoLoc.offsetY(), &xRot, &yRot); - relDetoLoc.offsetX(xRot); - relDetoLoc.offsetY(yRot); + m.map(relDetoLoc.offsetX, relDetoLoc.offsetY, &xRot, &yRot); + relDetoLoc.offsetX = xRot; + relDetoLoc.offsetY = yRot; BuildingControlUnit::Json::Telegrams::CentralEffectSimulationHit3D tele; @@ -514,13 +515,13 @@ bool BuildingProcess::sendCesHit3DonBuilding(const qint64 effectTimeMSec, const tele.penetrationFactor = penetrationFactor; tele.aesId = aesId; - tele.impactPosition.x = relImpactPos.offsetX(); - tele.impactPosition.y = relImpactPos.offsetY(); - tele.impactPosition.z = relImpactPos.offsetZ(); + tele.impactPosition.x = relImpactPos.offsetX; + tele.impactPosition.y = relImpactPos.offsetY; + tele.impactPosition.z = relImpactPos.offsetZ; - tele.detonationLocation.x = relDetoLoc.offsetX(); - tele.detonationLocation.y = relDetoLoc.offsetY(); - tele.detonationLocation.z = relDetoLoc.offsetZ(); + tele.detonationLocation.x = relDetoLoc.offsetX; + tele.detonationLocation.y = relDetoLoc.offsetY; + tele.detonationLocation.z = relDetoLoc.offsetZ; tele.detonationDistance = detonationDistance; tele.properties = properties; @@ -537,9 +538,9 @@ bool BuildingProcess::switchRelay(const SwitchRelayRequest &data) if (!m_wsSocket || !m_wsSocket->isValid()) return false; DEBUG_LOG(m_logger) << "switchRelay" - << " buildingId=" << data.buildingId() - << " assetId=" << data.assetId() - << data.state(); + << " buildingId=" << data.buildingId + << " assetId=" << data.assetId + << data.state; for (const EgcuInfo &egcu : std::as_const(m_buildingInfo.egcus)) @@ -547,19 +548,19 @@ bool BuildingProcess::switchRelay(const SwitchRelayRequest &data) DEBUG_LOG(m_logger) << "EGCU: " << egcu.assetName << " assetId=" << egcu.assetId << " hostname=" << egcu.hostname; - DEBUG_LOG(m_logger) << "data.assetId()=" << data.assetId() + DEBUG_LOG(m_logger) << "data.assetId()=" << data.assetId << "egcu.assetId=" << egcu.assetId; - if ( data.assetId() != egcu.assetId) + if ( data.assetId != egcu.assetId) continue; tele.segment = egcu.hostname; - tele.switchRelayValues.id = data.number(); - tele.switchRelayValues.bcuRelayState = static_cast (data.state().underlying()); - if ( data.state() == StateSetRelay_def::Pulse) + tele.switchRelayValues.id = data.number; + tele.switchRelayValues.bcuRelayState = static_cast (static_cast(data.state)); + if ( data.state == StateSetRelay::Pulse) { - tele.switchRelayValues.count = data.pulseAttributes().get().count(); - tele.switchRelayValues.delay = data.pulseAttributes().get().delay(); - tele.switchRelayValues.pulse = data.pulseAttributes().get().pulse(); + tele.switchRelayValues.count = data.pulseAttributes.get().count; + tele.switchRelayValues.delay = data.pulseAttributes.get().delay; + tele.switchRelayValues.pulse = data.pulseAttributes.get().pulse; } DEBUG_LOG(m_logger) << "switchRelay websocket send: " << QString::fromUtf8(tele.toJson()); m_wsSocket->sendTextMessage(QString::fromUtf8(tele.toJson())); @@ -575,8 +576,8 @@ bool BuildingProcess::triggerFlashlight(const TriggerBsmFlashRequest data) if (!m_wsSocket || !m_wsSocket->isValid()) return false; DEBUG_LOG(m_logger) << "triggerFlashlight" - << " BuildingId=" << data.buildingId() - << " assetId=" << data.assetId() + << " BuildingId=" << data.buildingId + << " assetId=" << data.assetId << " m_buildingInfo.bsms.size()" << m_buildingInfo.bsms.size(); QMapIterator i(m_buildingInfo.bsms); @@ -589,10 +590,10 @@ bool BuildingProcess::triggerFlashlight(const TriggerBsmFlashRequest data) << " port=" << i.value().port; } - if ( m_buildingInfo.bsms.contains(data.assetId())) + if ( m_buildingInfo.bsms.contains(data.assetId)) { - BsmInfo bsmInfo = m_buildingInfo.bsms.value(data.assetId()); - DEBUG_LOG(m_logger) << " BuildingId=" << data.buildingId() + BsmInfo bsmInfo = m_buildingInfo.bsms.value(data.assetId); + DEBUG_LOG(m_logger) << " BuildingId=" << data.buildingId << " assetId=" << bsmInfo.assetId << " hostname=" << bsmInfo.hostname; @@ -664,21 +665,21 @@ void BuildingProcess::onTextMessageReceived(const QString &message) void BuildingProcess::handleBsmState(BuildingControlUnit::Json::Telegrams::BsmState *tel) { BuildingStateTechnical state; - state.id(m_buildingInfo.mseId); - state.assetId(m_buildingInfo.assetId); - state.structureElementId(m_buildingInfo.structureElementId); - state.sampleTime(QDateTime::currentMSecsSinceEpoch()); - state.bsmStates().resize(tel->bsmStates.size()); + state.id = m_buildingInfo.mseId; + state.assetId = m_buildingInfo.assetId; + state.structureElementId = m_buildingInfo.structureElementId; + state.sampleTime = QDateTime::currentMSecsSinceEpoch(); + state.bsmStates.resize(tel->bsmStates.size()); BsmState s; for (int i = 0; i < tel->bsmStates.size(); ++i) { const BuildingControlUnit::Json::Telegrams::BsmState::BsmStateInfo &info = tel->bsmStates.at(i); - s.id(info.id); - s.connected(info.connected); - s.hostport(info.port); - s.hostname(info.hostname.toStdString()); - s.versionInfo(info.versionInfo.toStdString()); - state.bsmStates()[i] = s; + s.id = info.id; + s.connected = info.connected; + s.hostport = info.port; + s.hostname = info.hostname.toStdString(); + s.versionInfo = info.versionInfo.toStdString(); + state.bsmStates[i] = s; m_bsmStates.insert(info.id, s); } @@ -687,32 +688,32 @@ void BuildingProcess::handleBsmState(BuildingControlUnit::Json::Telegrams::BsmSt void BuildingProcess::historyState(const BuildingState &state) { - if (state.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady - && state.damagePercent() == 0 - && state.originatorParticipantId() == 0 - && state.contaminationStates().size() == 0) + if (state.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady + && state.damagePercent == 0 + && state.originatorParticipantId == 0 + && state.contaminationStates.size() == 0) { - DEBUG_LOG(m_logger) << "setVulnerabilityState->removeHistoryStateByKey:" << state.id(); - m_historyState.stateHistory().resize(0); + DEBUG_LOG(m_logger) << "setVulnerabilityState->removeHistoryStateByKey:" << state.id; + m_historyState.stateHistory.resize(0); } HistoryStateItem historyStateItem; - historyStateItem.aesId(state.aesId()); - historyStateItem.chargeTypeId(state.chargeTypeId()); - historyStateItem.damagePercent(state.damagePercent()); - historyStateItem.damagePercentOld(state.damagePercentOld()); - historyStateItem.originatorParticipantId(state.originatorParticipantId()); - historyStateItem.originatorType() = state.originatorType(); - historyStateItem.time(state.sampleTime()); - historyStateItem.vulnerabilityState() = state.vulnerabilityState(); - historyStateItem.contaminationStates() = state.contaminationStates(); + historyStateItem.aesId = state.aesId; + historyStateItem.chargeTypeId = state.chargeTypeId; + historyStateItem.damagePercent = state.damagePercent; + historyStateItem.damagePercentOld = state.damagePercentOld; + historyStateItem.originatorParticipantId = state.originatorParticipantId; + historyStateItem.originatorType = state.originatorType; + historyStateItem.time = state.sampleTime; + historyStateItem.vulnerabilityState = state.vulnerabilityState; + historyStateItem.contaminationStates = state.contaminationStates; - m_historyState.stateHistory().push_back(std::move(historyStateItem)); + m_historyState.stateHistory.push_back(std::move(historyStateItem)); DEBUG_LOG(m_logger) << "BuildingProcess::historyState contaminationStates:" << state; - m_historyState.mseId(state.id()); - DEBUG_LOG(m_logger) << "setVulnerabilityState->removeHistoryStateByKey:" << m_historyState.mseId(); - m_historyState.sampleTime(QDateTime::currentMSecsSinceEpoch()); + m_historyState.mseId = state.id; + DEBUG_LOG(m_logger) << "setVulnerabilityState->removeHistoryStateByKey:" << m_historyState.mseId; + m_historyState.sampleTime = QDateTime::currentMSecsSinceEpoch(); m_mainHandler->ddsHandler()->dts()->publish(m_historyState); } @@ -722,78 +723,78 @@ void BuildingProcess::handleHitResult(BuildingControlUnit::Json::Telegrams::HitR BuildingState state; DEBUG_LOG(m_logger) << Q_FUNC_INFO << " data.hitOnRoomId=" << data.hitOnRoomId; - state.id(m_buildingInfo.mseId); + state.id = m_buildingInfo.mseId; int assetId = m_mainHandler->ddsHandler()->dtcIsm()->getAssetIdFromMountingPointId(m_buildingInfo.mseId, data.sensorId); DEBUG_LOG(m_logger) << "handleHitResult assetId=" << assetId; - state.assetId(assetId); + state.assetId = assetId; InfrastructureManagement::StructureElement se; m_mainHandler->ddsHandler()->dtcIsm()->getStructureElementInMntPointAssetByAssetId(assetId, se); - DEBUG_LOG(m_logger) << "handleHitResult structureElementId=" << se.id(); - state.structureElementId(se.id()); - state.sampleTime(QDateTime::currentMSecsSinceEpoch()); + DEBUG_LOG(m_logger) << "handleHitResult structureElementId=" << se.id; + state.structureElementId = se.id; + state.sampleTime = QDateTime::currentMSecsSinceEpoch(); if (data.originatorType == BuildingControlUnit::OriginatorType::DirectHit) { - state.originatorParticipantId(m_mainHandler->ppmHandler()->equipmentNumberToParticipantId(data.originatorId)); - state.chargeTypeId(data.chargeTypeId); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::Participant); + state.originatorParticipantId = m_mainHandler->ppmHandler()->equipmentNumberToParticipantId(data.originatorId); + state.chargeTypeId = data.chargeTypeId; + state.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant; } else if (data.originatorType == BuildingControlUnit::OriginatorType::CesHit) { - state.aesId(data.originatorId); + state.aesId = data.originatorId; - state.chargeTypeId(data.chargeTypeId); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation); + state.chargeTypeId = data.chargeTypeId; + state.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation; } else if (data.originatorType == BuildingControlUnit::OriginatorType::OC) { - state.originatorParticipantId(0); - state.chargeTypeId(data.chargeTypeId); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ObserverController); + state.originatorParticipantId = 0; + state.chargeTypeId = data.chargeTypeId; + state.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController; } else { - state.originatorParticipantId(0); - state.chargeTypeId(data.chargeTypeId); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ExerciseControl); + state.originatorParticipantId = 0; + state.chargeTypeId = data.chargeTypeId; + state.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl; } - state.damagePercent(data.damagePercentNew); - state.damagePercentOld(data.damagePercentOld); - state.vulnerabilityState(data.damageState == BuildingControlUnit::DamageState::Destroyed ? - ProjectDataManagement::VulnerabilityState::CatastrophicKill : - ProjectDataManagement::VulnerabilityState::CombatReady); - state.hitOnRoomId(data.hitOnRoomId); - state.roomStates().reserve(data.rooms.size()); + state.damagePercent = data.damagePercentNew; + state.damagePercentOld = data.damagePercentOld; + state.vulnerabilityState = data.damageState == BuildingControlUnit::DamageState::Destroyed ? + ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill : + ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady; + state.hitOnRoomId = data.hitOnRoomId; + state.roomStates.reserve(data.rooms.size()); RoomState s; for (const auto &info : data.rooms) { - s.id(m_buildingInfo.subId2RoomId.value(info.roomId)); - s.mountingPointId(info.roomId); - s.damagePercent(info.damagePercent); - s.remainingEffectPercent(info.remainingEffectPercent); - s.fortifyFactor(info.fortifyFactor); - state.roomStates().push_back(s); + s.id = m_buildingInfo.subId2RoomId.value(info.roomId); + s.mountingPointId = info.roomId; + s.damagePercent = info.damagePercent; + s.remainingEffectPercent = info.remainingEffectPercent; + s.fortifyFactor = info.fortifyFactor; + state.roomStates.push_back(s); } ContaminationState cs; - state.contaminationStates().reserve(data.contaminations.count()); + state.contaminationStates.reserve(data.contaminations.count()); for (const auto &csi : data.contaminations) { - cs.aesId(csi.aesId); - cs.rooms().assign(csi.rooms.begin(), csi.rooms.end()); - state.contaminationStates().push_back(cs); + cs.aesId = csi.aesId; + cs.rooms.assign(csi.rooms.begin(), csi.rooms.end()); + state.contaminationStates.push_back(cs); } - if (m_historyState.mseId() != 0) + if (m_historyState.mseId != 0) historyState(state); else { - m_historyState.mseId(m_buildingInfo.mseId); + m_historyState.mseId = m_buildingInfo.mseId; } m_mainHandler->ddsHandler()->dts()->publish(state); @@ -823,7 +824,7 @@ void BuildingProcess::handleReconnectEgcu(const QString &segment) if (m_effectOverridesReconnect.value(relayId) >= 0) { - InfrastructureManagement::EffectOverride override = InfrastructureManagement::EffectOverride_def::PermanentOff; + InfrastructureManagement::EffectOverride override = InfrastructureManagement::EffectOverride::PermanentOff; int structureElementIdMp = m_mainHandler->ddsHandler()->dtcIsm()->getStructueElementIdFromAssetId(egcu.assetId); @@ -837,9 +838,9 @@ void BuildingProcess::handleReconnectEgcu(const QString &segment) InfrastructureManagement::StructureElementUpdateEffectOverrideRequest request; - request.structureElementId(structureElementIdMp); - request.effectId(relayId); - request.effectOverride(override); + request.structureElementId = structureElementIdMp; + request.effectId = relayId; + request.effectOverride = override; DEBUG_LOG(m_logger) << "Vor structureElementUpdateEffectOverrideRequest"; int result = m_mainHandler->ismHandler()->ftcIsm()->structureElementUpdateEffectOverrideRequest(request, this); DEBUG_LOG(m_logger) << "Nach structureElementUpdateEffectOverrideRequest result=" << result; @@ -875,9 +876,9 @@ void BuildingProcess::handleRelayState(BuildingControlUnit::Json::Telegrams::Rel << " assetId=" << egcu.assetId << " hostname='" << egcu.hostname << "' buildingName=" << egcu.buildingName; - state.id(egcu.assetId); - state.stateTime(tel->stateTime); - state.offlineTime(tel->offlineTime); + state.id = egcu.assetId; + state.stateTime = tel->stateTime; + state.offlineTime = tel->offlineTime; break; } } @@ -885,10 +886,10 @@ void BuildingProcess::handleRelayState(BuildingControlUnit::Json::Telegrams::Rel RelayStateItem item; for (const auto &info : std::as_const(tel->relayStates)) { - item.id(info.id); - item.state(info.state); + item.id = info.id; + item.state = info.state; - state.relayStates().push_back(item); + state.relayStates.push_back(item); } @@ -914,85 +915,85 @@ void BuildingProcess::handleEffectOverride(BuildingControlUnit::Json::Telegrams: << " structureElementId=" << m_buildingInfo.structureElementId << " structureElementIdMp=" << structureElementIdMp; - request.structureElementId(structureElementIdMp); + request.structureElementId = structureElementIdMp; } for ( int j = 0; j < tel->overrides.size(); j++ ) { - request.effectId(tel->overrides.at(j).id); + request.effectId = tel->overrides.at(j).id; switch (tel->overrides.at(j).effectOverride) { case -1: { - request.effectOverride(InfrastructureManagement::EffectOverride_def::Automatic); + request.effectOverride = InfrastructureManagement::EffectOverride::Automatic; break; } case 0: { - request.effectOverride(InfrastructureManagement::EffectOverride_def::PermanentOff); + request.effectOverride = InfrastructureManagement::EffectOverride::PermanentOff; break; } case 1: { - request.effectOverride(InfrastructureManagement::EffectOverride_def::PermanentOn); + request.effectOverride = InfrastructureManagement::EffectOverride::PermanentOn; break; } } DEBUG_LOG(m_logger) << "Send Override Request" - << " structureElementId=" << request.structureElementId() - << " effectId=" << request.effectId() - << " effectOverride=" << request.effectOverride(); - if ( request.structureElementId() > 0) + << " structureElementId=" << request.structureElementId + << " effectId=" << request.effectId + << " effectOverride=" << request.effectOverride; + if ( request.structureElementId > 0) m_mainHandler->ddsHandler()->ftcIsm()->structureElementUpdateEffectOverrideRequest(request, this); else - ERROR_LOG(m_logger) << "request.structureElementId() =" << request.structureElementId() << " NOT VALID!!!"; + ERROR_LOG(m_logger) << "request.structureElementId() =" << request.structureElementId << " NOT VALID!!!"; } } } bool BuildingProcess::isValidPos(const Core::GeoPosition &pos) { - if (qFuzzyIsNull(pos.lat()) && qFuzzyIsNull(pos.lon())) + if (qFuzzyIsNull(pos.lat) && qFuzzyIsNull(pos.lon)) return false; - return !std::isnan(pos.lat()) && !std::isnan(pos.lon()); + return !std::isnan(pos.lat) && !std::isnan(pos.lon); } void BuildingProcess::sendHitLine(const BuildingState &state) { - if (state.originatorParticipantId() <= 0) + if (state.originatorParticipantId <= 0) return; - const ParticipantManagement::ParticipantPosition participantPosition = m_mainHandler->ppmHandler()->participantPosition(state.originatorParticipantId()); - if (!isValidPos(participantPosition.pos())) + const ParticipantManagement::ParticipantPosition participantPosition = m_mainHandler->ppmHandler()->participantPosition(state.originatorParticipantId); + if (!isValidPos(participantPosition.pos)) return; BuildingHitLineInfo buildingHitLineInfo; - InfrastructureManagement::MainStructureElement mainStructureElement = m_mainHandler->ismHandler()->mainStructureElement(state.id()); + InfrastructureManagement::MainStructureElement mainStructureElement = m_mainHandler->ismHandler()->mainStructureElement(state.id); - buildingHitLineInfo.id(m_hitLineId); - buildingHitLineInfo.buildingId(m_buildingInfo.mseId); - buildingHitLineInfo.buildingPos(mainStructureElement.geoPosition()); - if (state.hitOnRoomId() > 0) + buildingHitLineInfo.id = m_hitLineId; + buildingHitLineInfo.buildingId = m_buildingInfo.mseId; + buildingHitLineInfo.buildingPos = mainStructureElement.geoPosition; + if (state.hitOnRoomId > 0) { - for (const auto &se : mainStructureElement.elements()) + for (const auto &se : mainStructureElement.elements) { - if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room && - se.mountingPointId() == state.hitOnRoomId()) + if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Room && + se.mountingPointId == state.hitOnRoomId) { - buildingHitLineInfo.buildingPos(se.geoPosition()); + buildingHitLineInfo.buildingPos = se.geoPosition; break; } } } - buildingHitLineInfo.chargeTypeId(state.chargeTypeId()); - buildingHitLineInfo.originatorParticipantId(state.originatorParticipantId()); - buildingHitLineInfo.originatorPos(participantPosition.pos()); - buildingHitLineInfo.originatorPartyId(participantPosition.partyId()); - buildingHitLineInfo.sampleTime(state.sampleTime()); - buildingHitLineInfo.hitOnRoomId(state.hitOnRoomId()); - buildingHitLineInfo.contaminationStates(state.contaminationStates()); + buildingHitLineInfo.chargeTypeId = state.chargeTypeId; + buildingHitLineInfo.originatorParticipantId = state.originatorParticipantId; + buildingHitLineInfo.originatorPos = participantPosition.pos; + buildingHitLineInfo.originatorPartyId = participantPosition.partyId; + buildingHitLineInfo.sampleTime = state.sampleTime; + buildingHitLineInfo.hitOnRoomId = state.hitOnRoomId; + buildingHitLineInfo.contaminationStates = state.contaminationStates; m_mainHandler->ddsHandler()->dts()->publish(buildingHitLineInfo); - m_hitLineInfoMap.insert(buildingHitLineInfo.id(), buildingHitLineInfo); + m_hitLineInfoMap.insert(buildingHitLineInfo.id, buildingHitLineInfo); ++m_hitLineId; } @@ -1003,9 +1004,9 @@ void BuildingProcess::onHitLineInfoTimeout() auto it = m_hitLineInfoMap.begin(); while (it != m_hitLineInfoMap.end()) { - if (!LtsUtils::isPositionTimeOutdated(tNow, it.value().sampleTime())) + if (!LtsUtils::isPositionTimeOutdated(tNow, it.value().sampleTime)) break; - m_mainHandler->ddsHandler()->dts()->removeBuildingHitLineInfoByKey(it.value().id()); + m_mainHandler->ddsHandler()->dts()->removeBuildingHitLineInfoByKey(it.value().id); it = m_hitLineInfoMap.erase(it); } @@ -1037,16 +1038,16 @@ static void outputBsmData(QXmlStreamWriter &sw, const BsmInfo &bsm) sw.writeStartElement(QStringLiteral("Position")); { - sw.writeAttribute(QStringLiteral("x"), QString::number(bsm.relPosition.offsetX(), 'f', 10)); - sw.writeAttribute(QStringLiteral("y"), QString::number(bsm.relPosition.offsetY(), 'f', 10)); - sw.writeAttribute(QStringLiteral("z"), QString::number(bsm.relPosition.offsetZ(), 'f', 10)); + sw.writeAttribute(QStringLiteral("x"), QString::number(bsm.relPosition.offsetX, 'f', 10)); + sw.writeAttribute(QStringLiteral("y"), QString::number(bsm.relPosition.offsetY, 'f', 10)); + sw.writeAttribute(QStringLiteral("z"), QString::number(bsm.relPosition.offsetZ, 'f', 10)); } sw.writeEndElement(); sw.writeStartElement(QStringLiteral("Direction")); { - sw.writeAttribute(QStringLiteral("x"), QString::number(bsm.orientation.heave(), 'f', 10)); - sw.writeAttribute(QStringLiteral("y"), QString::number(bsm.orientation.pitch(), 'f', 10)); - sw.writeAttribute(QStringLiteral("z"), QString::number(bsm.orientation.roll(), 'f', 10)); + sw.writeAttribute(QStringLiteral("x"), QString::number(bsm.orientation.heave, 'f', 10)); + sw.writeAttribute(QStringLiteral("y"), QString::number(bsm.orientation.pitch, 'f', 10)); + sw.writeAttribute(QStringLiteral("z"), QString::number(bsm.orientation.roll, 'f', 10)); } sw.writeEndElement(); } @@ -1077,7 +1078,6 @@ QByteArray BuildingProcess::generateBuildingConfigData() const QXmlStreamWriter sw(&ret); sw.setAutoFormatting(true); sw.setAutoFormattingIndent(2); - sw.setCodec("UTF-8"); sw.writeStartDocument(QStringLiteral("1.0"), true); sw.writeStartElement(QStringLiteral("BuildingConfiguration")); { @@ -1103,31 +1103,30 @@ QByteArray BuildingProcess::generateChargesData() const QXmlStreamWriter sw(&ret); sw.setAutoFormatting(true); sw.setAutoFormattingIndent(2); - sw.setCodec("UTF-8"); sw.writeStartDocument(QStringLiteral("1.0"), true); sw.writeStartElement(QStringLiteral("Charges")); { for (const ProjectDataManagement::BuildingChargeEffect &charge : buildingCharges) { - auto it = chargeTypes.find(charge.chargeTypeId()); + auto it = chargeTypes.find(charge.chargeTypeId); if (it == chargeTypes.end()) { - WARNING_LOG(m_logger) << "Could not find charge type with id " << charge.chargeTypeId() << " - skipping"; + WARNING_LOG(m_logger) << "Could not find charge type with id " << charge.chargeTypeId << " - skipping"; continue; } - ProjectDataManagement::ChargeTypeProperty chargeTypeProperty = m_mainHandler->ddsHandler()->dtcPdm()->getChargeTypeSpecialProperty(charge.chargeTypeId(),0,0); + ProjectDataManagement::ChargeTypeProperty chargeTypeProperty = m_mainHandler->ddsHandler()->dtcPdm()->getChargeTypeSpecialProperty(charge.chargeTypeId,0,0); sw.writeStartElement(QStringLiteral("Charge")); - sw.writeTextElement(QStringLiteral("Id"), QString::number(charge.id())); - sw.writeTextElement(QStringLiteral("ChargeTypeId"), QString::number(charge.chargeTypeId())); - sw.writeTextElement(QStringLiteral("DestructiveFactor"), QString::number(charge.destructiveFactor())); - sw.writeTextElement(QStringLiteral("PenetrationEffect"), QString::number(charge.penetrationFactor())); + sw.writeTextElement(QStringLiteral("Id"), QString::number(charge.id)); + sw.writeTextElement(QStringLiteral("ChargeTypeId"), QString::number(charge.chargeTypeId)); + sw.writeTextElement(QStringLiteral("DestructiveFactor"), QString::number(charge.destructiveFactor)); + sw.writeTextElement(QStringLiteral("PenetrationEffect"), QString::number(charge.penetrationFactor)); sw.writeTextElement(QStringLiteral("properties"), properties); - sw.writeTextElement(QStringLiteral("EffectSound"), QString::number(charge.hitSound())); - sw.writeTextElement(QStringLiteral("DifcueLight"), QString::number(charge.difcueLight())); - sw.writeTextElement(QStringLiteral("DifcuePyro"), QString::number(charge.difcuePyro())); - if (chargeTypeProperty == ProjectDataManagement::ChargeTypeProperty_def::None) - if (charge.destructiveFactor() > 0) + sw.writeTextElement(QStringLiteral("EffectSound"), QString::number(charge.hitSound)); + sw.writeTextElement(QStringLiteral("DifcueLight"), QString::number(charge.difcueLight)); + sw.writeTextElement(QStringLiteral("DifcuePyro"), QString::number(charge.difcuePyro)); + if (chargeTypeProperty == ProjectDataManagement::ChargeTypeProperty::None) + if (charge.destructiveFactor > 0) sw.writeTextElement(QStringLiteral("showHitLine"), QString::number(1)); else sw.writeTextElement(QStringLiteral("showHitLine"), QString::number(0)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp index d45c0d630..3a654d039 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ism_handler.cpp @@ -4,6 +4,7 @@ #include "ism_handler.h" #include #include "main_handler.h" +#include #include #include #include @@ -79,40 +80,40 @@ bool IsmHandler::isElementAssignedToExercise(const int mseId, int exerciseId) void IsmHandler::onInstrumentationAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType) { - if (data.mountingPointTypeId() == InfrastructureManagement::MountingPointType::BuildingSensorModule || - data.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) + if (data.mountingPointTypeId == InfrastructureManagement::MountingPointType::BuildingSensorModule || + data.mountingPointTypeId == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) { switch (modType) { case DataModification::eAdded: case DataModification::eModified: - m_instAssets.insert(data.id(), data); + m_instAssets.insert(data.id, data); break; case DataModification::eRemoved: - m_instAssets.remove(data.id()); + m_instAssets.remove(data.id); break; } m_changeTimeoutTimer->start(); return; } - if (data.mountingPointTypeId() == InfrastructureManagement::MountingPointType::BuildingControlUnit) + if (data.mountingPointTypeId == InfrastructureManagement::MountingPointType::BuildingControlUnit) { switch (modType) { case DataModification::eAdded: case DataModification::eModified: { - const int exerciseId = data.availableInExercise().size() == 0 ? 0 : data.availableInExercise().at(0); - DEBUG_LOG(m_logger) << "setting asset " << data.id() << " available in exercise " << exerciseId; - m_assetMainStructureElementInExercise.insert(data.id(), exerciseId); + const int exerciseId = data.availableInExercise.size() == 0 ? 0 : data.availableInExercise.at(0); + DEBUG_LOG(m_logger) << "setting asset " << data.id << " available in exercise " << exerciseId; + m_assetMainStructureElementInExercise.insert(data.id, exerciseId); break; } case DataModification::eRemoved: { - const int exerciseId = data.availableInExercise().size() == 0 ? 0 : data.availableInExercise().at(0); - DEBUG_LOG(m_logger) << "removing asset " << data.id() << " from exercise " << exerciseId; - m_assetMainStructureElementInExercise.remove(data.id()); + const int exerciseId = data.availableInExercise.size() == 0 ? 0 : data.availableInExercise.at(0); + DEBUG_LOG(m_logger) << "removing asset " << data.id << " from exercise " << exerciseId; + m_assetMainStructureElementInExercise.remove(data.id); break; } } @@ -126,12 +127,12 @@ void IsmHandler::onMountingPointAssetChanged(const InfrastructureManagement::Mou { case DataModification::eAdded: case DataModification::eModified: - DEBUG_LOG(m_logger) << "mounting asset " << data.assetId() << " on structure element id " << data.structureElementId(); - m_structureElementId2AssetId.insert(data.structureElementId(), data.assetId()); + DEBUG_LOG(m_logger) << "mounting asset " << data.assetId << " on structure element id " << data.structureElementId; + m_structureElementId2AssetId.insert(data.structureElementId, data.assetId); break; case DataModification::eRemoved: - DEBUG_LOG(m_logger) << "unmounting asset " << m_structureElementId2AssetId.value(data.structureElementId()) << " from structure element " << data.structureElementId(); - m_structureElementId2AssetId.remove(data.structureElementId()); + DEBUG_LOG(m_logger) << "unmounting asset " << m_structureElementId2AssetId.value(data.structureElementId) << " from structure element " << data.structureElementId; + m_structureElementId2AssetId.remove(data.structureElementId); break; } m_changeTimeoutTimer->start(); @@ -145,16 +146,16 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M case DataModification::eAdded: case DataModification::eModified: { - if (!isElementAssignedToExercise (data.id(),m_mainHandler->exerciseId() ) ) + if (!isElementAssignedToExercise (data.id,m_mainHandler->exerciseId() ) ) { - m_mainStructureElements.remove(data.id()); - DEBUG_LOG(m_logger) << "Building not in exercise id=" << data.id(); + m_mainStructureElements.remove(data.id); + DEBUG_LOG(m_logger) << "Building not in exercise id=" << data.id; return; } - DEBUG_LOG(m_logger) << "Building=" << data.name() - << " properties=" << data.properties(); + DEBUG_LOG(m_logger) << "Building=" << data.name + << " properties=" << data.properties; QJsonParseError parserError; - QByteArray content = QByteArray::fromStdString(data.properties()); + QByteArray content = QByteArray::fromStdString(data.properties); const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError)); if (parserError.error != QJsonParseError::NoError) @@ -170,19 +171,19 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M bool startBuildingProcess = objProperties.value(QStringLiteral("start_building_process")).toBool(); if (!startBuildingProcess) { - DEBUG_LOG(m_logger) << "Building=" << data.name() + DEBUG_LOG(m_logger) << "Building=" << data.name << " start_building_process = false "; return; } } - DEBUG_LOG(m_logger) << "##### onMainStructureElementChanged - ID = " << data.id(); - checkOverride( m_mainStructureElements[data.id()], data); - m_mainStructureElements[data.id()] = data; + DEBUG_LOG(m_logger) << "##### onMainStructureElementChanged - ID = " << data.id; + checkOverride( m_mainStructureElements[data.id], data); + m_mainStructureElements[data.id] = data; break; } case DataModification::eRemoved: - m_mainStructureElements.remove(data.id()); + m_mainStructureElements.remove(data.id); break; } m_changeTimeoutTimer->start(); @@ -197,12 +198,12 @@ void IsmHandler::onBridgeStatusChanged(const InfrastructureManagement::BridgeCha case DataModification::eAdded: case DataModification::eModified: { - DEBUG_LOG(m_logger) << "##### onBridgeStatusChanged - buildingId = " << data.buildingId(); + DEBUG_LOG(m_logger) << "##### onBridgeStatusChanged - buildingId = " << data.buildingId; BridgeStatus bs; - bs.id(s_id++); - bs.buildingId(data.buildingId()); - bs.sampleTime(data.sampleTime()); - bs.status(m_dtcIsm->getBridgeStatus(data.buildingId()).underlying()); + bs.id = s_id++; + bs.buildingId = data.buildingId; + bs.sampleTime = data.sampleTime; + bs.status = static_cast(m_dtcIsm->getBridgeStatus(data.buildingId)); m_mainHandler->ddsHandler()->dts()->publish(bs); break; } @@ -214,9 +215,9 @@ void IsmHandler::onBridgeStatusChanged(const InfrastructureManagement::BridgeCha void IsmHandler::getEgcuToRoom(const InfrastructureManagement::MainStructureElement &mse, QVector &eis) { - INFO_LOG(m_logger) << "properties=" << mse.properties(); + INFO_LOG(m_logger) << "properties=" << mse.properties; QJsonParseError parserError; - QByteArray content = QByteArray::fromStdString(mse.properties()); + QByteArray content = QByteArray::fromStdString(mse.properties); const QJsonDocument doc(QJsonDocument::fromJson(content, &parserError)); if (parserError.error != QJsonParseError::NoError) @@ -275,34 +276,34 @@ void IsmHandler::buildingsChanged(bool init) INFO_LOG(m_logger) << "Updating building config m_mainStructureElements.size=" << m_mainStructureElements.size(); for (const InfrastructureManagement::MainStructureElement &mse : std::as_const(m_mainStructureElements)) { - DEBUG_LOG(m_logger) << "Checking building " << mse.id() << " - " << mse.name(); + DEBUG_LOG(m_logger) << "Checking building " << mse.id << " - " << mse.name; BuildingInfo bi; - bi.mseId = mse.id(); - bi.modelId = mse.modelId(); - bi.externalWlsId = mse.externalWlsId(); - bi.name = QString::fromStdString(mse.name()); - bi.absPosition = mse.geoPosition(); - bi.angle = mse.angle(); - bi.structureElementId = mse.structureElementId(); + bi.mseId = mse.id; + bi.modelId = mse.modelId; + bi.externalWlsId = mse.externalWlsId; + bi.name = QString::fromStdString(mse.name); + bi.absPosition = mse.geoPosition; + bi.angle = mse.angle; + bi.structureElementId = mse.structureElementId; - for (const InfrastructureManagement::StructureElement &se : mse.elements()) + for (const InfrastructureManagement::StructureElement &se : mse.elements) { - if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::BuildingSensorModule) + if (se.mountingPointTypeId == InfrastructureManagement::MountingPointType::BuildingSensorModule) handleBuildingSensorModule(se, bi); - else if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::BuildingControlUnit) + else if (se.mountingPointTypeId == InfrastructureManagement::MountingPointType::BuildingControlUnit) handleBuildingControlUnit(se, bi); - else if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) + else if (se.mountingPointTypeId == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) handleEffectGenerationControlUnit(se, bi); - else if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Room) + else if (se.structureElementTypeId == InfrastructureManagement::StructureElementType::Room) { - bi.subId2RoomId.insert(se.mountingPointId(), se.id()); - bi.roomId2SubId.insert(se.id(), se.mountingPointId()); - bi.roomName2RoomId.insert(QString::fromStdString(se.name()), se.mountingPointId()); - INFO_LOG(m_logger) << " Room: mountingPointId: " << se.mountingPointId() - << ", roomId: " << se.id() - << ", Name: " << se.name(); - m_roomId2RoomName.insert(se.id(), QString::fromStdString(se.name())); + bi.subId2RoomId.insert(se.mountingPointId, se.id); + bi.roomId2SubId.insert(se.id, se.mountingPointId); + bi.roomName2RoomId.insert(QString::fromStdString(se.name), se.mountingPointId); + INFO_LOG(m_logger) << " Room: mountingPointId: " << se.mountingPointId + << ", roomId: " << se.id + << ", Name: " << se.name; + m_roomId2RoomName.insert(se.id, QString::fromStdString(se.name)); } } if (m_mainHandler->exerciseId() != bi.currentExerciseId) @@ -313,8 +314,8 @@ void IsmHandler::buildingsChanged(bool init) << " buildingName" << bi.name; continue; } - INFO_LOG(m_logger) << "Adding building configuration for " << mse.id() << " - " << mse.name(); - availableBuildingIds += mse.id(); + INFO_LOG(m_logger) << "Adding building configuration for " << mse.id << " - " << mse.name; + availableBuildingIds += mse.id; getEgcuToRoom(mse, bi.egcus); newBuildingConfiguration.insert(bi.mseId, bi); } @@ -356,7 +357,7 @@ void IsmHandler::buildingsChanged(bool init) void IsmHandler::handleBuildingSensorModule(const InfrastructureManagement::StructureElement &se, BuildingInfo &bi) const { - auto itMpa = m_structureElementId2AssetId.find(se.id()); + auto itMpa = m_structureElementId2AssetId.find(se.id); if (itMpa == m_structureElementId2AssetId.end()) return; const int assetId = itMpa.value(); @@ -366,11 +367,11 @@ void IsmHandler::handleBuildingSensorModule(const InfrastructureManagement::Stru const InfrastructureManagement::InstrumentationAsset &ia = itAsset.value(); BsmInfo bsi; bsi.assetId = assetId; - bsi.bsmId = se.mountingPointId(); - bsi.hostname = QString::fromStdString(ia.hostname()); - bsi.port = getBsmPortFromJSon(ia.properties()); - bsi.relPosition = se.relPosition(); - bsi.orientation = se.orientation(); + bsi.bsmId = se.mountingPointId; + bsi.hostname = QString::fromStdString(ia.hostname); + bsi.port = getBsmPortFromJSon(ia.properties); + bsi.relPosition = se.relPosition; + bsi.orientation = se.orientation; DEBUG_LOG(m_logger) << "adding bsm sensor module to building " << bi.mseId << ": " << bsi.assetId << ", " << bsi.bsmId << ", " << bsi.hostname; bi.bsms.insert(bsi.assetId, bsi); } @@ -383,10 +384,10 @@ void IsmHandler::handleBuildingControlUnit(const InfrastructureManagement::Struc - auto itMpa = m_structureElementId2AssetId.find(se.id()); + auto itMpa = m_structureElementId2AssetId.find(se.id); if (itMpa == m_structureElementId2AssetId.end()) { - INFO_LOG(m_logger) << "structure element id " << se.id() << " not (yet)found" + INFO_LOG(m_logger) << "structure element id " << se.id << " not (yet)found" << " bi.mseId=" << bi.mseId << " bi.assetId=" << bi.assetId << " bi.egcus.size=" << bi.egcus.size() @@ -410,8 +411,8 @@ void IsmHandler::handleBuildingControlUnit(const InfrastructureManagement::Struc void IsmHandler::handleEffectGenerationControlUnit(const InfrastructureManagement::StructureElement &se, BuildingInfo &bi) const { DEBUG_LOG(m_logger) << "BuildingId=" << bi.mseId - << " se.id=" << se.id(); - auto itMpa = m_structureElementId2AssetId.find(se.id()); + << " se.id=" << se.id; + auto itMpa = m_structureElementId2AssetId.find(se.id); if (itMpa == m_structureElementId2AssetId.end()) { INFO_LOG(m_logger) << "Return m_structureElementId2AssetId.size()=" << m_structureElementId2AssetId.size(); @@ -428,12 +429,12 @@ void IsmHandler::handleEffectGenerationControlUnit(const InfrastructureManagemen EgcuInfo egcu; egcu.buildingName = bi.name; - egcu.mountPointName = QString::fromStdString(se.name()); - egcu.mountPointId = se.mountingPointId(); - egcu.hostname = QString::fromStdString(ia.hostname()); + egcu.mountPointName = QString::fromStdString(se.name); + egcu.mountPointId = se.mountingPointId; + egcu.hostname = QString::fromStdString(ia.hostname); egcu.assetId = assetId; DEBUG_LOG(m_logger) << "Egcu.hostname=" << egcu.hostname; - INFO_LOG(m_logger) << "properties=" << ia.properties(); + INFO_LOG(m_logger) << "properties=" << ia.properties; bi.egcus.push_back(egcu); @@ -470,38 +471,38 @@ void IsmHandler::checkOverride(const InfrastructureManagement::MainStructureElem { DEBUG_LOG(m_logger) << Q_FUNC_INFO; - DEBUG_LOG(m_logger) << "mseOld.elements().size()=" << mseOld.elements().size() - << " mseNew.elements().size()=" << mseNew.elements().size(); + DEBUG_LOG(m_logger) << "mseOld.elements.size()=" << mseOld.elements.size() + << " mseNew.elements.size()=" << mseNew.elements.size(); - for (const InfrastructureManagement::StructureElement &se : mseNew.elements()) + for (const InfrastructureManagement::StructureElement &se : mseNew.elements) { - DEBUG_LOG(m_logger) << "se=" << se.id() - << " name=" << se.name() - << " displayName=" << se.displayName() - << " properties=" << se.properties(); + DEBUG_LOG(m_logger) << "se=" << se.id + << " name=" << se.name + << " displayName=" << se.displayName + << " properties=" << se.properties; - for (const InfrastructureManagement::StructureElement &seOld : mseOld.elements()) + for (const InfrastructureManagement::StructureElement &seOld : mseOld.elements) { - DEBUG_LOG(m_logger) << "seOld.id=" << seOld.id() - << " se.id=" << se.id(); - if ( seOld.id() == se.id()) + DEBUG_LOG(m_logger) << "seOld.id=" << seOld.id + << " se.id=" << se.id; + if ( seOld.id == se.id) { - DEBUG_LOG(m_logger) << "Properties =" << se.properties() - << " se.id=" << se.id() - << " se.name=" << se.name() - << " mountingPointId=" << se.mountingPointId(); - DEBUG_LOG(m_logger) << "se.properties()=" << se.properties() - << " seOld.properties()=" << seOld.properties(); - if (se.properties() != seOld.properties() ) + DEBUG_LOG(m_logger) << "Properties =" << se.properties + << " se.id=" << se.id + << " se.name=" << se.name + << " mountingPointId=" << se.mountingPointId; + DEBUG_LOG(m_logger) << "se.properties=" << se.properties + << " seOld.properties=" << seOld.properties; + if (se.properties != seOld.properties ) { DEBUG_LOG(m_logger) << "HandleOverrides" "<< m_currentBuildingConfiguration.size=" << m_currentBuildingConfiguration.size(); - if ( se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building) + if ( se.structureElementTypeId == InfrastructureManagement::StructureElementType::Building) { DEBUG_LOG(m_logger) << "BSM-Flash, no EGCU"; - QByteArray properties = QByteArray::fromStdString(se.properties()); - emit setEffectStates(mseNew.id(), 0, properties ); + QByteArray properties = QByteArray::fromStdString(se.properties); + emit setEffectStates(mseNew.id, 0, properties ); continue; } for (auto it = m_currentBuildingConfiguration.begin(); it != m_currentBuildingConfiguration.end(); ++it) @@ -517,15 +518,15 @@ void IsmHandler::checkOverride(const InfrastructureManagement::MainStructureElem << " assetName=" << egcu.assetName << " hostname=" << egcu.hostname << " egcu.mountPointId=" << egcu.mountPointId - << " se.mountingPointId()=" << se.mountingPointId(); - if (egcu.mountPointId == se.mountingPointId()) + << " se.mountingPointId=" << se.mountingPointId; + if (egcu.mountPointId == se.mountingPointId) { - QByteArray properties = QByteArray::fromStdString(se.properties()); + QByteArray properties = QByteArray::fromStdString(se.properties); DEBUG_LOG(m_logger) << "Send Json SetEffectStates to BuildingProcess" << " buildingId=" << " assetId="<< egcu.assetId << " properties =" << properties; - emit setEffectStates(mseNew.id(), egcu.assetId, properties ); + emit setEffectStates(mseNew.id, egcu.assetId, properties ); } } } @@ -539,22 +540,22 @@ void IsmHandler::checkOverride(const InfrastructureManagement::MainStructureElem } - if (mseOld.elements().size() == 0) + if (mseOld.elements.size() == 0) { - QByteArray properties = QByteArray::fromStdString(se.properties()); + QByteArray properties = QByteArray::fromStdString(se.properties); QByteArray overrides("Overrides"); if (properties.contains(overrides)) { int assetId; - bool foundAssetId = m_dtcIsm->getAssetIdFromMountingPoint(se.id(), se.mountingPointId(), assetId); + bool foundAssetId = m_dtcIsm->getAssetIdFromMountingPoint(se.id, se.mountingPointId, assetId); DEBUG_LOG(m_logger) << "Send Overrides to BuildingProcess (EGCU)" << " foundAssetId=" << foundAssetId - << " structureElementId=" << mseNew.id() - << " se.id=" << se.id() - << " mountingPointId=" << se.mountingPointId() + << " structureElementId=" << mseNew.id + << " se.id=" << se.id + << " mountingPointId=" << se.mountingPointId << " assetId=" << assetId; - emit setEffectStates(mseNew.id(), assetId, properties ); + emit setEffectStates(mseNew.id, assetId, properties ); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp index 4919fcf3f..dc193a164 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/main_handler.cpp @@ -37,7 +37,7 @@ bool MainHandler::init(int domainId, int exerciseId) DEBUG_LOG(m_logger) << "WebSocketInterfaceHandler initialized Port=" << m_webSocketHandler->listenPort(); - m_ddsHandler->pacemaker()->addPort(m_webSocketHandler->listenPort(), Core::PortType::WebSocketServer); + m_ddsHandler->pacemaker()->addPort(m_webSocketHandler->listenPort(), Core::CorePortType::WebSocketServer); if (bRet) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp index 48277fcb3..314159f03 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/pdm_handler.cpp @@ -4,6 +4,7 @@ #include "pdm_handler.h" #include "main_handler.h" #include +#include namespace Buildings { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp index 3424af757..95b4d91fc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.cpp @@ -3,6 +3,7 @@ #include "ppm_handler.h" #include "main_handler.h" +#include namespace Buildings { @@ -47,7 +48,7 @@ ParticipantManagement::ParticipantPosition PpmHandler::participantPosition(int p void PpmHandler::onEquipmentExerciseMappingChanged(const ParticipantManagement::EquipmentExerciseMapping &data, DataModification modType) { - if (data.exerciseId() != m_mainHandler->exerciseId()) + if (data.exerciseId != m_mainHandler->exerciseId()) return; m_equipmentNumber2ParticipantId.clear(); @@ -55,8 +56,8 @@ void PpmHandler::onEquipmentExerciseMappingChanged(const ParticipantManagement:: { case DataModification::eAdded: case DataModification::eModified: - for (const ParticipantManagement::Equipment2ParticipantId &e2p : data.mapping()) - m_equipmentNumber2ParticipantId[e2p.equipmentNumber()] = e2p.participantId(); + for (const ParticipantManagement::Equipment2ParticipantId &e2p : data.mapping) + m_equipmentNumber2ParticipantId[e2p.equipmentNumber] = e2p.participantId; break; case DataModification::eRemoved: break; @@ -69,10 +70,10 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti { case DataModification::eAdded: case DataModification::eModified: - m_participantPositions[data.participantId()] = data; + m_participantPositions[data.participantId] = data; break; case DataModification::eRemoved: - m_participantPositions.remove(data.participantId()); + m_participantPositions.remove(data.participantId); break; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h index 1801bab35..2c556afd3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/ppm_handler.h @@ -3,6 +3,7 @@ #pragma once #include +#include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp index 283fc2280..211946b7f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.cpp @@ -10,6 +10,7 @@ RelayInfoHandler::RelayInfoHandler(MainHandler *mainHandler) : QObject() , Interface::Fts::SetRelayInfoRequestHandler(mainHandler->ddsHandler()->fts()) , m_mainHandler(mainHandler) + , m_logger(getLogger("RelayInfoHandler")) {} RelayInfoHandler::~RelayInfoHandler() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h index 696605277..58573549b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/Buildings/relay_info_handler.h @@ -3,6 +3,7 @@ #pragma once #include +#include #include #include "logger.h" #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.cpp index 5c4580f5e..501be1133 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.cpp @@ -40,7 +40,7 @@ T fromJson(const QByteArray &json) QJsonObject frequencyPlanningJson(QJsonObject obj, const QString &name, FrequencyBand freqBand, int radioStationId) { obj.insert(QStringLiteral("Name"), name); - obj.insert(QStringLiteral("FrequencyBand"), freqBand); + obj.insert(QStringLiteral("FrequencyBand"), static_cast(freqBand)); obj.insert(QStringLiteral("RadioStationId"), radioStationId); return obj; } @@ -59,8 +59,8 @@ bool RadioCircuitHF::isValid() const QJsonObject RadioCircuitHF::toJson() const { QJsonObject obj; - obj.insert(QStringLiteral("ModulationType"), modulationType); - obj.insert(QStringLiteral("ChannelSpacing"), channelSpacing); + obj.insert(QStringLiteral("ModulationType"), static_cast(modulationType)); + obj.insert(QStringLiteral("ChannelSpacing"), static_cast(channelSpacing)); obj.insert(QStringLiteral("Frequency"), frequency); obj.insert(QStringLiteral("Squelch"), squelch); @@ -94,8 +94,8 @@ bool RadioCircuitUHF::isValid() const QJsonObject RadioCircuitUHF::toJson() const { QJsonObject obj; - obj.insert(QStringLiteral("ModulationType"), modulationType); - obj.insert(QStringLiteral("ChannelSpacing"), channelSpacing); + obj.insert(QStringLiteral("ModulationType"), static_cast(modulationType)); + obj.insert(QStringLiteral("ChannelSpacing"), static_cast(channelSpacing)); obj.insert(QStringLiteral("Frequency"), frequency); obj.insert(QStringLiteral("Squelch"), squelchDB); obj.insert(QStringLiteral("Clipper"), clipper); @@ -128,7 +128,7 @@ RadioCircuitUHF* RadioCircuitUHF::fromJson(const QJsonObject &obj) QJsonObject RadioCircuitVHF::toJson() const { QJsonObject obj; - obj.insert(QStringLiteral("OperatingMode"), operatingMode); + obj.insert(QStringLiteral("OperatingMode"), static_cast(operatingMode)); obj.insert(QStringLiteral("FrequencySetDataId"), freqSetDataId); obj.insert(QStringLiteral("PilotTone"), pilotTone); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h index 51aa70e6a..8d0beb345 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h @@ -33,7 +33,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuit virtual ~RadioCircuit() = default; QString name; - FrequencyBand freqBand {FrequencyBand::VHF_v}; + FrequencyBand freqBand {FrequencyBand::VHF}; int radioStationId {0}; @@ -92,7 +92,7 @@ struct SVCCNRHELPER_EXPORT RadioCircuitUHF: public RadioCircuit struct SVCCNRHELPER_EXPORT RadioCircuitVHF: public RadioCircuit { - RcOperatingMode operatingMode {RcOperatingMode::FixedFreqEncNone_v}; + RcOperatingMode operatingMode {RcOperatingMode::FixedFreqEncNone}; int freqSetDataId {0}; bool pilotTone {false}; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.cpp index 9f784df42..9c313c321 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/active_exercises.cpp @@ -44,19 +44,19 @@ void ActiveExercises::onExerciseChanged(const ExerciseManagement::Exercise &exer break; case DataModification::eRemoved: - tryDeactivate(exercise.id()); + tryDeactivate(exercise.id); break; } } void ActiveExercises::check(const ExerciseManagement::Exercise &exercise) { - Q_ASSERT(exercise.id() > 0); + Q_ASSERT(exercise.id > 0); - if (isActive(exercise.state())) - tryActivate(exercise.id()); + if (isActive(exercise.state)) + tryActivate(exercise.id); else - tryDeactivate(exercise.id()); + tryDeactivate(exercise.id); } void ActiveExercises::tryActivate(int exerciseId) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp index b5b5b8a9e..196fd3095 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/config_cnr.cpp @@ -3,6 +3,7 @@ #include "config_cnr.h" #include +#include #include "helper.h" #include #include @@ -53,22 +54,22 @@ void ConfigCnr::buildConfigCnrData() return; } - AudioVideoManagement::FrequencySet frequencySet = m_avmDtc->frequencySet(plan->frequencySetId()); + AudioVideoManagement::FrequencySet frequencySet = m_avmDtc->frequencySet(plan->frequencySetId); QMap fsdMap; - for (const auto &fsd : std::as_const(frequencySet.data())) - fsdMap.insert(fsd.id(), fsd); + for (const auto &fsd : std::as_const(frequencySet.data)) + fsdMap.insert(fsd.id, fsd); - configCnr.setId = plan->frequencySetId(); - configCnr.time = QDateTime::fromMSecsSinceEpoch(plan->date()).toString(Qt::ISODate); - configCnr.radioCircuit.reserve(plan->data().size()); + configCnr.setId = plan->frequencySetId; + configCnr.time = QDateTime::fromMSecsSinceEpoch(plan->date).toString(Qt::ISODate); + configCnr.radioCircuit.reserve(plan->data.size()); - for (const auto ¤tData : plan->data()) + for (const auto ¤tData : plan->data) { WebSocketInterface::Messages::ConfigCnrMessage::RadioCircuit radioCircuit; - AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(currentData.cnrConfigId()); - AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId()); - QVector circuits = AudioVideoManagement::fromJson(currentData.properties()); + AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(currentData.cnrConfigId); + AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId); + QVector circuits = AudioVideoManagement::fromJson(currentData.properties); int subCircuitCount = 0; for (AudioVideoManagement::RadioCircuit* circuit : std::as_const(circuits)) @@ -78,9 +79,9 @@ void ConfigCnr::buildConfigCnrData() WebSocketInterface::Messages::ConfigCnrMessage::SubRadioCircuit subCircuit; - switch (circuit->freqBand.underlying()) + switch (circuit->freqBand) { - case AudioVideoManagement::FrequencyBand_def::VHF: + case AudioVideoManagement::FrequencyBand::VHF: { AudioVideoManagement::RadioCircuitVHF *rcVhf = dynamic_cast(circuit); if (!rcVhf) @@ -88,19 +89,19 @@ void ConfigCnr::buildConfigCnrData() AudioVideoManagement::FrequencySetDataWithId &fsd = fsdMap[rcVhf->freqSetDataId]; subCircuit.agc = false; - subCircuit.akw = fsd.akwBundle().is_set() ? fsd.akwBundle().get() : 0; + subCircuit.akw = fsd.akwBundle.is_set() ? fsd.akwBundle.get() : 0; subCircuit.channelSpacing = 0; subCircuit.clipper = false; - subCircuit.comsec = fsd.comsec().is_set() ? fsd.comsec().get() : 0; + subCircuit.comsec = fsd.comsec.is_set() ? fsd.comsec.get() : 0; subCircuit.crossbeam = 0; - subCircuit.frequency = fsd.frequency() * 1000; - subCircuit.frequencyBand = fsd.frequencyBand().underlying(); - subCircuit.fsb = fsd.fsbBundle().is_set() ? fsd.fsbBundle().get() : 0; + subCircuit.frequency = fsd.frequency * 1000; + subCircuit.frequencyBand = static_cast(fsd.frequencyBand); + subCircuit.fsb = fsd.fsbBundle.is_set() ? fsd.fsbBundle.get() : 0; subCircuit.modulationType = 0; subCircuit.orientation = 0; subCircuit.ptSig = rcVhf->pilotTone; - subCircuit.rcAkw = fsd.akwRadioCircuit().is_set() ? fsd.akwRadioCircuit().get() : 0; - subCircuit.rcMode = rcVhf->operatingMode.underlying(); + subCircuit.rcAkw = fsd.akwRadioCircuit.is_set() ? fsd.akwRadioCircuit.get() : 0; + subCircuit.rcMode = static_cast(rcVhf->operatingMode); subCircuit.rcSubId = toRcIdString(cnrChannel); subCircuit.rcSubName = rcVhf->name; subCircuit.rcType = 2; @@ -109,7 +110,7 @@ void ConfigCnr::buildConfigCnrData() break; } - case AudioVideoManagement::FrequencyBand_def::UHF: + case AudioVideoManagement::FrequencyBand::UHF: { AudioVideoManagement::RadioCircuitUHF *rcUhf = dynamic_cast(circuit); if (!rcUhf) @@ -117,14 +118,14 @@ void ConfigCnr::buildConfigCnrData() subCircuit.agc = rcUhf->agc; subCircuit.akw = 0; - subCircuit.channelSpacing = rcUhf->channelSpacing.underlying(); + subCircuit.channelSpacing = static_cast(rcUhf->channelSpacing); subCircuit.clipper = rcUhf->clipper; subCircuit.comsec = 0; subCircuit.crossbeam = 0; subCircuit.frequency = rcUhf->frequency; subCircuit.frequencyBand = 0; subCircuit.fsb = 0; - subCircuit.modulationType = rcUhf->modulationType.underlying(); + subCircuit.modulationType = static_cast(rcUhf->modulationType); subCircuit.orientation = 0; subCircuit.ptSig = 0; subCircuit.rcAkw = 0; @@ -136,7 +137,7 @@ void ConfigCnr::buildConfigCnrData() subCircuit.station = stationId(radioStation); break; } - case AudioVideoManagement::FrequencyBand_def::HF: + case AudioVideoManagement::FrequencyBand::HF: { AudioVideoManagement::RadioCircuitHF *rcHf = dynamic_cast(circuit); if (!rcHf) @@ -144,14 +145,14 @@ void ConfigCnr::buildConfigCnrData() subCircuit.agc = 0; subCircuit.akw = 0; - subCircuit.channelSpacing = rcHf->channelSpacing.underlying(); + subCircuit.channelSpacing = static_cast(rcHf->channelSpacing); subCircuit.clipper = 0; subCircuit.comsec = 0; subCircuit.crossbeam = 0; subCircuit.frequency = rcHf->frequency; subCircuit.frequencyBand = 0; subCircuit.fsb = 0; - subCircuit.modulationType = rcHf->modulationType.underlying(); + subCircuit.modulationType = static_cast(rcHf->modulationType); subCircuit.orientation = 0; subCircuit.ptSig = 0; subCircuit.rcAkw = 0; @@ -173,8 +174,8 @@ void ConfigCnr::buildConfigCnrData() qDeleteAll(circuits); radioCircuit.rcId = toRcIdString(cnrChannel); - radioCircuit.rcName = QString::fromStdString(cnrConfig.radioCircuit()); - radioCircuit.ssrc = cnrChannel.ssrc(); + radioCircuit.rcName = QString::fromStdString(cnrConfig.radioCircuit); + radioCircuit.ssrc = cnrChannel.ssrc; configCnr.radioCircuit.append(radioCircuit); } @@ -188,10 +189,10 @@ boost::optional ConfigCnr::activePlan() { AudioVideoManagement::ActiveFrequencyPlanning activePlanning = m_avmDtc->activeFrequencyPlanning(m_exerciseId); - if (activePlanning.exerciseId() != m_exerciseId) + if (activePlanning.exerciseId != m_exerciseId) return boost::none; - AudioVideoManagement::FrequencyPlanning frequencyPlanning = m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId()); + AudioVideoManagement::FrequencyPlanning frequencyPlanning = m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId); return frequencyPlanning; } @@ -201,7 +202,7 @@ void ConfigCnr::onActiveFrequencyPlanningChanged(const AudioVideoManagement::Act DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data; Q_UNUSED(modType); - if (data.exerciseId() == m_exerciseId) + if (data.exerciseId == m_exerciseId) m_timer.start(); } @@ -215,7 +216,7 @@ void ConfigCnr::onFrequencyPlanningChanged(const AudioVideoManagement::Frequency if (!plan) return; - if (data.id() == plan->id() || !data.exerciseId().is_set()) + if (data.id == plan->id || !data.exerciseId.is_set()) m_timer.start(); } @@ -225,8 +226,8 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data, DEBUG_LOG(m_logger) << Q_FUNC_INFO << ": " << data; Q_UNUSED(modType); - bool isGlobal = !data.exerciseId().is_set(); - if ((isGlobal || data.exerciseId().get() == m_exerciseId) && modType != DataModification::eAdded && isInActiveFrequencyPlanning(data)) + bool isGlobal = !data.exerciseId.is_set(); + if ((isGlobal || data.exerciseId.get() == m_exerciseId) && modType != DataModification::eAdded && isInActiveFrequencyPlanning(data)) m_timer.start(); } @@ -234,17 +235,17 @@ void ConfigCnr::onCnrConfigChanged(const AudioVideoManagement::CnrConfig &data, bool ConfigCnr::isInActiveFrequencyPlanning(const AudioVideoManagement::CnrConfig &data) { - if(!data.exerciseId().is_set()) + if(!data.exerciseId.is_set()) return true; const auto activePlans = m_avmDtc->activeFrequencyPlannings(); for (const AudioVideoManagement::ActiveFrequencyPlanning &activePlan : activePlans) { - const auto frequencyPlannings = m_avmDtc->frequencyPlanning(activePlan.frequencyPlanningId()); - for(const auto &frequencyPlanningData : frequencyPlannings.data()) + const auto frequencyPlannings = m_avmDtc->frequencyPlanning(activePlan.frequencyPlanningId); + for(const auto &frequencyPlanningData : frequencyPlannings.data) { - if(frequencyPlanningData.cnrConfigId() == data.id()) + if(frequencyPlanningData.cnrConfigId == data.id) return true; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler_exercise.cpp index dfdb8eba7..2ab6004b1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/dds_handler_exercise.cpp @@ -3,6 +3,7 @@ #include "dds_handler_exercise.h" #include +#include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp index 2921502e3..bffc22bcf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/exercise_manager.cpp @@ -65,7 +65,8 @@ public: ExerciseManager::ExerciseManager(ActiveExercises *activeExercises, DdsHandler *ddsHandler) - : m_activeExercises(activeExercises) + : m_logger(getLogger("ExerciseManager")) + , m_activeExercises(activeExercises) , m_ddsHandler(ddsHandler) { Q_ASSERT(activeExercises); @@ -216,15 +217,15 @@ void ExerciseManager::stopPositionsUpdate() void ExerciseManager::onNewClientConnection(qint64 id) { AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request; - request.client(id); - request.isActive(true); + request.client = id; + request.isActive = true; m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this); } void ExerciseManager::onClientConnectionClosed(qint64 id) { AudioVideoManagement::RemoveFrequencyPlanningStatusByClientRequest request; - request.client(id); + request.client = id; m_ddsHandler->avmFtc()->removeFrequencyPlanningStatusByClientRequest(request, this); } @@ -237,33 +238,33 @@ void ExerciseManager::onClearFrequencyPlanningStatus() void ExerciseManager::onConfigCnrSent(qint64 id, const QString &uuid, const QString &requester, bool isActiveClient) { AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request; - request.client(id); - request.uuid(uuid.toStdString()); - request.sent(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch()); - request.requester(requester.toStdString()); - request.isActive(isActiveClient); + request.client = id; + request.uuid = uuid.toStdString(); + request.sent = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); + request.requester = requester.toStdString(); + request.isActive = isActiveClient; m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this); } void ExerciseManager::onConfigCnrReceived(qint64 id, const QString &uuid) { AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request; - request.client(id); - request.uuid(uuid.toStdString()); - request.received(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch()); + request.client = id; + request.uuid = uuid.toStdString(); + request.received = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this); } void ExerciseManager::onConfigCnrProcessed(qint64 id, const QString &uuid, const QJsonObject &configCnrData) { AudioVideoManagement::ModifyFrequencyPlanningStatusRequest request; - request.client(id); - request.uuid(uuid.toStdString()); - request.activated(QDateTime::currentDateTimeUtc().toMSecsSinceEpoch()); - request.content(QJsonDocument(configCnrData).toJson().toStdString()); - request.requester(QJsonDocument(configCnrData).object()[QStringLiteral("requester")].toString().toStdString()); - request.reason(static_cast(QJsonDocument(configCnrData).object()[QStringLiteral("reason")].toInt(0))); - request.isActive(true); + request.client = id; + request.uuid = uuid.toStdString(); + request.activated = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); + request.content = QJsonDocument(configCnrData).toJson().toStdString(); + request.requester = QJsonDocument(configCnrData).object()[QStringLiteral("requester")].toString().toStdString(); + request.reason = static_cast(QJsonDocument(configCnrData).object()[QStringLiteral("reason")].toInt(0)); + request.isActive = true; m_ddsHandler->avmFtc()->modifyFrequencyPlanningStatusRequest(request, this); } @@ -291,7 +292,7 @@ void ExerciseManager::onExerciseActivated(int exerciseId) if (isFirstActiveExercise) { ExerciseManagement::Exercise exercise = m_ddsHandler->exmDtc()->exercise(exerciseId); - m_trainingArea.reset(new TrainingArea(exercise.trainingAreaId(), m_ddsHandler->asmDtc(), m_ddsHandler->ismDtc())); + m_trainingArea.reset(new TrainingArea(exercise.trainingAreaId, m_ddsHandler->asmDtc(), m_ddsHandler->ismDtc())); } emit essentialsUpdate(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/helper.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/helper.cpp index 2d331f362..4eb9203f4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/helper.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/helper.cpp @@ -13,12 +13,12 @@ namespace CombatNetRadio int stationId(const InfrastructureManagement::MainStructureElement &radioStation) { - return LtsUtils::JsonObject::fromJson(radioStation.properties()).valueOr("stationId", 0); + return LtsUtils::JsonObject::fromJson(radioStation.properties).valueOr("stationId", 0); } QString toRcIdString(const AudioVideoManagement::CnrChannel &cnrChannel) { - QString result = QString::fromStdString(cnrChannel.name()); + QString result = QString::fromStdString(cnrChannel.name); result.remove(1, 2); return result; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp index 0b4087e6c..8a113470c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/positions_cnr.cpp @@ -7,6 +7,7 @@ #include "helper.h" #include #include +#include #include #include #include @@ -22,13 +23,13 @@ QSet participantIdsFromParty(const QMapdata()) + for (const auto &entry : plan->data) { - AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(entry.cnrConfigId()); - AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId()); + AudioVideoManagement::CnrConfig cnrConfig = m_avmDtc->cnrConfig(entry.cnrConfigId); + AudioVideoManagement::CnrChannel cnrChannel = m_avmDtc->cnrChannel(cnrConfig.cnrChannelId); positionsData.radioCircuit.push_back({toRcIdString(cnrChannel), positionsFor(cnrConfig)}); } @@ -74,14 +75,14 @@ WebSocketInterface::Messages::PositionsCnrMessage::PositionsCnrMessageData Posit QVector PositionsCnr::positionsForGlobal(const AudioVideoManagement::CnrConfig &config) const { - bool isGlobal = !config.exerciseId().is_set(); + bool isGlobal = !config.exerciseId.is_set(); Q_ASSERT(isGlobal); return positionsForLocal(config); } QVector PositionsCnr::positionsFor(const AudioVideoManagement::CnrConfig &config) const { - bool isLocal = config.exerciseId().is_set(); + bool isLocal = config.exerciseId.is_set(); if (isLocal) return positionsForLocal(config); else @@ -95,12 +96,12 @@ QVector PositionsCnr::p auto allParticipants = m_ppmDtc->participants(); QSet participantIdsInUnit; - if (config.unitId().is_set()) - m_ppmDtc->participantIdsByUnit(config.unitId().get(), allParticipants, participantIdsInUnit); + if (config.unitId.is_set()) + m_ppmDtc->participantIdsByUnit(config.unitId.get(), allParticipants, participantIdsInUnit); else { - bool isGlobal = !config.exerciseId().is_set(); - participantIdsInUnit = participantIdsFromParty(allParticipants, config.partyId(), isGlobal); + bool isGlobal = !config.exerciseId.is_set(); + participantIdsInUnit = participantIdsFromParty(allParticipants, config.partyId, isGlobal); } const qint64 now = QDateTime::currentMSecsSinceEpoch(); @@ -109,21 +110,24 @@ QVector PositionsCnr::p for (int participantId : std::as_const(participantIdsInUnit)) { const ParticipantManagement::Participant &participant = allParticipants.value(participantId); - if (!participant.equipmentNumber().is_set()) + if (!participant.equipmentNumber.is_set()) continue; - const ParticipantManagement::Type &type = m_ppmDtc->type(participant.typeId()); - if (type.radioCount() < 1) - continue; + const ParticipantManagement::Type &type = m_ppmDtc->type(participant.typeId); + if (type.radioCount < 1) + continue; const auto &pos = m_ppmDtc->participantPosition(participantId); - if (pos.participantId() != participantId) - continue; + if (pos.participantId != participantId) + continue; - if (LtsUtils::isPositionTimeOutdated(now, pos.sampleTime())) - continue; + if (LtsUtils::isPositionTimeOutdated(now, pos.sampleTime)) + continue; - positions.push_back({toDeg(pos.pos().lon()), toDeg(pos.pos().lat())}); + WebSocketInterface::Messages::ReplyMessage::LonLatPoint point; + point.lon = toDeg(pos.pos.lon); + point.lat = toDeg(pos.pos.lat); + positions.push_back(point); } return positions; @@ -132,9 +136,9 @@ QVector PositionsCnr::p boost::optional PositionsCnr::activePlan() const { AudioVideoManagement::ActiveFrequencyPlanning activePlanning = m_avmDtc->activeFrequencyPlanning(m_exerciseId); - if (activePlanning.exerciseId() != m_exerciseId) + if (activePlanning.exerciseId != m_exerciseId) return boost::none; - return m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId()); + return m_avmDtc->frequencyPlanning(activePlanning.frequencyPlanningId); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp index 431a657b7..ee1a3d514 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/CombatNetRadio/training_area.cpp @@ -29,7 +29,7 @@ void TrainingArea::getTrainingArea(int trainingAreaId, AssetManagement::Interfac { AssetManagement::TrainingArea ddsTrainingArea = asmDtc->trainingArea(trainingAreaId); - m_trainingAreaData.designation = QString::fromStdString(ddsTrainingArea.name()); + m_trainingAreaData.designation = QString::fromStdString(ddsTrainingArea.name); m_trainingAreaData.id = trainingAreaId; m_trainingAreaData.refPoint.lat = -1.; m_trainingAreaData.refPoint.lon = -1.; @@ -37,25 +37,25 @@ void TrainingArea::getTrainingArea(int trainingAreaId, AssetManagement::Interfac WebSocketInterface::Messages::ReplyMessage::LonLatPoint point; - LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(ddsTrainingArea.bottomLeft().lon(), ddsTrainingArea.bottomLeft().lat()); - point.lat = toDeg(ddsTrainingArea.bottomLeft().lat()); - point.lon = toDeg(ddsTrainingArea.bottomLeft().lon()); + LtsCoordTrans::UtmCoordinate utmCoordinate = LtsCoordTrans::UtmCoordinate::fromGeographic(ddsTrainingArea.bottomLeft.lon, ddsTrainingArea.bottomLeft.lat); + point.lat = toDeg(ddsTrainingArea.bottomLeft.lat); + point.lon = toDeg(ddsTrainingArea.bottomLeft.lon); m_trainingAreaData.path << point; - QPointF coord = utmCoordinate.geographic(ddsTrainingArea.width()); + QPointF coord = utmCoordinate.geographic(ddsTrainingArea.width); point.lon = toDeg(coord.x()); point.lat = toDeg(coord.y()); m_trainingAreaData.path << point; - coord = utmCoordinate.geographic(ddsTrainingArea.width(), ddsTrainingArea.height()); + coord = utmCoordinate.geographic(ddsTrainingArea.width, ddsTrainingArea.height); point.lon = toDeg(coord.x()); point.lat = toDeg(coord.y()); m_trainingAreaData.path << point; - coord = utmCoordinate.geographic(0, ddsTrainingArea.height()); + coord = utmCoordinate.geographic(0, ddsTrainingArea.height); point.lon = toDeg(coord.x()); point.lat = toDeg(coord.y()); m_trainingAreaData.path << point; @@ -65,7 +65,7 @@ void TrainingArea::getRadioStations(InfrastructureManagement::Interface::Dtc *is { auto cb = [this](const InfrastructureManagement::MainStructureElement &mse) { - if (mse.structureElementTypeId() != InfrastructureManagement::StructureElementType::RadioStation || mse.isDeleted()) + if (mse.structureElementTypeId != InfrastructureManagement::StructureElementType::RadioStation || mse.isDeleted) return; WebSocketInterface::Messages::RadioStationMessage::RadioStationData data; @@ -73,13 +73,13 @@ void TrainingArea::getRadioStations(InfrastructureManagement::Interface::Dtc *is if (data.id == 0) { WARNING_LOG(m_logger) << "Got MainStructureElement of type 'RadioStation' but property 'stationId' was not set" - << " - database id: " << mse.id() << " - ignoring!"; + << " - database id: " << mse.id << " - ignoring!"; return; } - data.geoPoint.lon = toDeg(mse.geoPosition().lon()); - data.geoPoint.lat = toDeg(mse.geoPosition().lat()); + data.geoPoint.lon = toDeg(mse.geoPosition.lon); + data.geoPoint.lat = toDeg(mse.geoPosition.lat); data.trainingAreaId = m_trainingAreaData.id; - data.designation = QString::fromStdString(mse.name()); + data.designation = QString::fromStdString(mse.name); m_radioStations.push_back(data); }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp index 2fcfa5bcd..5942813e0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler.cpp @@ -6,6 +6,7 @@ #include #include #include +#include @@ -50,7 +51,7 @@ bool CheckmkHandler::initialize(const QString &checkMkServerHostname, int checkM } connect(m_socket, &QTcpSocket::stateChanged, this, &CheckmkHandler::onStateChanged); - connect(m_socket, QOverload::of(&QAbstractSocket::error), + connect(m_socket, qOverload(&QAbstractSocket::error), this, &CheckmkHandler::onSocketError); connect(m_socket, &QTcpSocket::connected, diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp index 7acaf34a6..32219a555 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/checkmk_handler_schedule_check.cpp @@ -7,6 +7,7 @@ #include #include #include +#include namespace ComponentMonitor { @@ -14,6 +15,7 @@ namespace ComponentMonitor CheckmkHandlerScheduleCheck::CheckmkHandlerScheduleCheck(const std::shared_ptr &ddsHandler) : QObject() , TriggerUpdateRequestHandler(ddsHandler->fts()) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) , m_socket(new QTcpSocket(this)) , m_ddsHandler(ddsHandler) { @@ -49,7 +51,7 @@ bool CheckmkHandlerScheduleCheck::initialize(const QString &checkMkServerHostnam } connect(m_socket, &QTcpSocket::stateChanged, this, &CheckmkHandlerScheduleCheck::onStateChanged); - connect(m_socket, QOverload::of(&QAbstractSocket::error), + connect(m_socket, qOverload(&QAbstractSocket::error), this, &CheckmkHandlerScheduleCheck::onSocketError); connect(m_socket, &QTcpSocket::connected, @@ -192,7 +194,7 @@ void CheckmkHandlerScheduleCheck::onTriggerUpdateRequest(const rti::core::Sample - const std::vector< std::string >& hostnames = request.hostnames(); + const std::vector< std::string >& hostnames = request.hostnames; QStringList sl; sl.reserve(hostnames.size()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp index 04d56bce4..fb541e01e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/ComponentMonitor/component_status_handler.cpp @@ -6,6 +6,7 @@ #include "dds_handler.h" #include #include +#include #include @@ -75,7 +76,7 @@ std::vector ComponentStatusHandler::getHostnames() const ret.reserve(m_statusMap.size()); for (CONST_ITERATOR_T it = m_statusMap.cbegin(); it != m_statusMap.cend(); ++it) - ret.push_back(it->hostname()); + ret.push_back(it->hostname); return ret; } @@ -83,28 +84,28 @@ std::vector ComponentStatusHandler::getHostnames() const void ComponentStatusHandler::onInstrumentationAssetChanged(const InfrastructureManagement::InstrumentationAsset &iAsset, DataModification dataMod) { - const InfrastructureManagement::MountingPointType_def::type mpType = iAsset.mountingPointTypeId().underlying(); - if ((mpType != InfrastructureManagement::MountingPointType_def::IndoorCamera) && - (mpType != InfrastructureManagement::MountingPointType_def::OutdoorCamera) && - (mpType != InfrastructureManagement::MountingPointType_def::EffectGenerationControlUnit) && - (mpType != InfrastructureManagement::MountingPointType_def::BuildingSensorModule) + const InfrastructureManagement::MountingPointType mpType = static_cast(iAsset.mountingPointTypeId); + if ((mpType != InfrastructureManagement::MountingPointType::IndoorCamera) && + (mpType != InfrastructureManagement::MountingPointType::OutdoorCamera) && + (mpType != InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) && + (mpType != InfrastructureManagement::MountingPointType::BuildingSensorModule) ) return; static int assetChangedCounter = 0; - const int iAssetId = iAsset.id(); + const int iAssetId = iAsset.id; DEBUG_LOG(m_logger) << Q_FUNC_INFO << ", iAssetId=" << iAssetId << " (assetChangedCounter=" << ++assetChangedCounter << ")"; - const bool bIsMounted = iAsset.assetStateId() == InfrastructureManagement::InstrumentationAssetState_def::Mounted; + const bool bIsMounted = iAsset.assetStateId == InfrastructureManagement::InstrumentationAssetState::Mounted; if (!bIsMounted) dataMod = DataModification::eRemoved; - const bool bNoHostname = iAsset.hostname().empty(); + const bool bNoHostname = iAsset.hostname.empty(); if (bNoHostname) dataMod = DataModification::eRemoved; @@ -116,9 +117,9 @@ void ComponentStatusHandler::onInstrumentationAssetChanged(const InfrastructureM case DataModification::eModified: { ComponentStatus cs; - cs.id(iAssetId); - cs.hostname(iAsset.hostname()); - cs.state(ComponentMonitor::ComponentState::Undefined); + cs.id = iAssetId; + cs.hostname = iAsset.hostname; + cs.state = ComponentMonitor::ComponentState::Undefined; addUpdateInstrumentationAsset(it, cs); } @@ -150,9 +151,9 @@ void ComponentStatusHandler::dump() DEBUG_LOG(m_logger) << " REACHABLE:"; for (const ComponentStatus &status : std::as_const(m_statusMap)) { - if (status.state().underlying() == ComponentState_def::Reachable) + if (status.state == ComponentState::Reachable) { - DEBUG_LOG(m_logger) << " id=" << status.id() << ", host '" << status.hostname().c_str() << " -> Reachable"; + DEBUG_LOG(m_logger) << " id=" << status.id << ", host '" << status.hostname.c_str() << " -> Reachable"; ++counter; } } @@ -164,9 +165,9 @@ void ComponentStatusHandler::dump() DEBUG_LOG(m_logger) << " UNREACHABLE:"; for (const ComponentStatus &status : std::as_const(m_statusMap)) { - if (status.state().underlying() == ComponentState_def::Unreachable) + if (status.state == ComponentState::Unreachable) { - DEBUG_LOG(m_logger) << " id=" << status.id() << ", host '" << status.hostname().c_str() << " -> Unreachable"; + DEBUG_LOG(m_logger) << " id=" << status.id << ", host '" << status.hostname.c_str() << " -> Unreachable"; ++counter; } } @@ -178,9 +179,9 @@ void ComponentStatusHandler::dump() DEBUG_LOG(m_logger) << " UNDEFINED:"; for (const ComponentStatus &status : std::as_const(m_statusMap)) { - if (status.state().underlying() == ComponentState_def::Undefined) + if (status.state == ComponentState::Undefined) { - DEBUG_LOG(m_logger) << " id=" << status.id() << ", host '" << status.hostname().c_str() << " -> Undefined"; + DEBUG_LOG(m_logger) << " id=" << status.id << ", host '" << status.hostname.c_str() << " -> Undefined"; ++counter; } } @@ -202,14 +203,14 @@ void ComponentStatusHandler::onNewState(const QString &hostname, bool reachable, for (ITERATOR_T it = m_statusMap.begin(); it != m_statusMap.end(); ++it) { - const QString hname = QString::fromStdString(it->hostname()); + const QString hname = QString::fromStdString(it->hostname); if (hname.compare(hostname, Qt::CaseInsensitive) == 0) { - ComponentState_def::type newStateInner = reachable ? ComponentState_def::Reachable : ComponentState_def::Unreachable; + ComponentState newStateInner = reachable ? ComponentState::Reachable : ComponentState::Unreachable; ComponentStatus newCs = (*it); - newCs.state(newStateInner); - newCs.last_check(lastCheckSec); + newCs.state = newStateInner; + newCs.last_check = lastCheckSec; addUpdateInstrumentationAsset(it, newCs); } @@ -223,23 +224,23 @@ void ComponentStatusHandler::onUpdateLastCheckTimeDirect(const QStringList &host for (ITERATOR_T it = m_statusMap.begin(); it != m_statusMap.end(); ++it) { ComponentStatus &cs = *it; - const QString &curHostname = QString::fromStdString(cs.hostname()); + const QString &curHostname = QString::fromStdString(cs.hostname); if (!hostnamesForUpdateLastCheckTime.contains(curHostname, Qt::CaseInsensitive)) continue; - if (lastCheckSec <= cs.last_check()) + if (lastCheckSec <= cs.last_check) continue; - const ComponentState_def::type curState = cs.state().underlying(); - if ((curState == ComponentState_def::Reachable) || - (curState == ComponentState_def::Unreachable)) + const ComponentState curState = cs.state; + if ((curState == ComponentState::Reachable) || + (curState == ComponentState::Unreachable)) { DEBUG_LOG(m_logger) << Q_FUNC_INFO << " updateLastCheckTimeDirect" << " host: '" << curHostname << "'" << " newLastCheck= " << lastCheckSec; INFO_LOG(m_logger) << Q_FUNC_INFO << " DIFF_2a (*it) " << (*it); - cs.last_check(lastCheckSec); + cs.last_check = lastCheckSec; INFO_LOG(m_logger) << Q_FUNC_INFO << " DIFF_2b (*it) " << (*it); m_ddsHandler->dts()->publish(cs); } @@ -251,7 +252,7 @@ bool ComponentStatusHandler::addUpdateInstrumentationAsset(ComponentStatusHandle { DEBUG_LOG(m_logger) << Q_FUNC_INFO << " START add/Update: cs=" << cs << ", curSize=" << m_statusMap.size() << ")"; - const int id = cs.id(); + const int id = cs.id; if (it != m_statusMap.end()) { @@ -280,7 +281,7 @@ bool ComponentStatusHandler::addUpdateInstrumentationAsset(ComponentStatusHandle bool ComponentStatusHandler::removeInstrumentationAsset(ComponentStatusHandler::ITERATOR_T it) { - const int id = it.value().id(); + const int id = it.value().id; DEBUG_LOG(m_logger) << Q_FUNC_INFO << " remove: id=" << id; m_statusMap.remove(id); m_ddsHandler->dts()->removeComponentStatusByKey(id); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp index dc39b6a45..c10353a8e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_aircraft_participant.cpp @@ -161,17 +161,17 @@ void HandlerNasatAircraftParticipant::participantRemoved(int exerciseId, int par } } -bool isExerciseStateValid(ExerciseManagement::ExerciseState::type state) +bool isExerciseStateValid(ExerciseManagement::ExerciseState state) { switch (state) { - case ExerciseManagement::ExerciseState_def::Created: - case ExerciseManagement::ExerciseState_def::Paused: - case ExerciseManagement::ExerciseState_def::Started: - case ExerciseManagement::ExerciseState_def::Stopped: + case ExerciseManagement::ExerciseState::Created: + case ExerciseManagement::ExerciseState::Paused: + case ExerciseManagement::ExerciseState::Started: + case ExerciseManagement::ExerciseState::Stopped: return true; - case ExerciseManagement::ExerciseState_def::Unknown: - case ExerciseManagement::ExerciseState_def::Terminated: + case ExerciseManagement::ExerciseState::Unknown: + case ExerciseManagement::ExerciseState::Terminated: return false; } return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp index a7d1e4eac..03f782362 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/GuezNasat/handler_nasat_impact.cpp @@ -137,7 +137,7 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos, ecReq.effectStart = impactTimeMsec > tNow ? impactTimeMsec : tNow; ecReq.name = QStringLiteral("NASAT_%1_%2_%3").arg(nasatId).arg(munitionCode).arg(dtNow.toString(QStringLiteral("dd hh:mm:ss"))).toStdString(); ecReq.element = ecReq.name; - ecReq.impactPosition(Core::GeoPosition2D(pos.lon, pos.lat)); + ecReq.impactPosition = Core::GeoPosition2D(pos.lon, pos.lat); ecReq.chargeTypeId = chargeTypeIdVal; @@ -166,7 +166,7 @@ void HandlerNasatImpact::nasatImpact(int nasatId, const Core::GeoPosition &pos, ecCommonModifyRequest.chargeStruct.chargeTypeId = chargeTypeIdVal; ecCommonModifyRequest.chargeStruct.igniterTypeId = fuseTypeToPdmIgniterType(fuseType); - ecCommonModifyRequest.area.cornerBottomLeft(Core::GeoPosition2D(pos.lon, pos.lat)); + ecCommonModifyRequest.area.cornerBottomLeft = Core::GeoPosition2D(pos.lon, pos.lat); ecCommonModifyRequest.name = QStringLiteral("NASAT_%1_%2_%3").arg(nasatId).arg(munitionCode).arg(dtNow.toString(QStringLiteral("dd hh:mm:ss"))).toStdString(); ecCommonModifyRequest.element = ecReq.name; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp index 3e7b61850..0e9e1914b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.cpp @@ -30,16 +30,16 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityStateFromDam switch(status) { case rpr2::DamageStatusEnum32::NoDamage: - vs = ProjectDataManagement::VulnerabilityState_def::CombatReady; + vs = ProjectDataManagement::VulnerabilityState::CombatReady; break; case rpr2::DamageStatusEnum32::SlightDamage: - vs = ProjectDataManagement::VulnerabilityState_def::LightDamage; + vs = ProjectDataManagement::VulnerabilityState::LightDamage; break; case rpr2::DamageStatusEnum32::ModerateDamage: - vs = ProjectDataManagement::VulnerabilityState_def::HeavyDamage; + vs = ProjectDataManagement::VulnerabilityState::HeavyDamage; break; case rpr2::DamageStatusEnum32::Destroyed: - vs = ProjectDataManagement::VulnerabilityState_def::CatastrophicKill; + vs = ProjectDataManagement::VulnerabilityState::CatastrophicKill; break; } @@ -63,31 +63,31 @@ rpr2::DamageStatusEnum32::ET DamageModel::damageState(qint64 simTimeMSec) const switch (m_vulnerabilityStates.at(idx).vulnerabilityState.underlying()) { - case ProjectDataManagement::VulnerabilityState_def::CombatReady: + case ProjectDataManagement::VulnerabilityState::CombatReady: return rpr2::DamageStatusEnum32::NoDamage; - case ProjectDataManagement::VulnerabilityState_def::LightDamage: + case ProjectDataManagement::VulnerabilityState::LightDamage: return rpr2::DamageStatusEnum32::SlightDamage; - case ProjectDataManagement::VulnerabilityState_def::MediumDamage: - case ProjectDataManagement::VulnerabilityState_def::HeavyDamage: - case ProjectDataManagement::VulnerabilityState_def::MobilityKill: - case ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill: - case ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage: - case ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::MediumDamage: + case ProjectDataManagement::VulnerabilityState::HeavyDamage: + case ProjectDataManagement::VulnerabilityState::MobilityKill: + case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill: + case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage: return rpr2::DamageStatusEnum32::ModerateDamage; - case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::CatastrophicKill: return rpr2::DamageStatusEnum32::Destroyed; - case ProjectDataManagement::VulnerabilityState_def::TemporarySeverance: - case ProjectDataManagement::VulnerabilityState_def::NearMiss: - case ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect: + case ProjectDataManagement::VulnerabilityState::TemporarySeverance: + case ProjectDataManagement::VulnerabilityState::NearMiss: + case ProjectDataManagement::VulnerabilityState::HitWithNoEffect: return rpr2::DamageStatusEnum32::NoDamage; - case ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged: - case ProjectDataManagement::VulnerabilityState_def::Reserved: + case ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged: + case ProjectDataManagement::VulnerabilityState::Reserved: return rpr2::DamageStatusEnum32::NoDamage; - case ProjectDataManagement::VulnerabilityState_def::NContamination: - case ProjectDataManagement::VulnerabilityState_def::BContamination: - case ProjectDataManagement::VulnerabilityState_def::CContamination: + case ProjectDataManagement::VulnerabilityState::NContamination: + case ProjectDataManagement::VulnerabilityState::BContamination: + case ProjectDataManagement::VulnerabilityState::CContamination: return rpr2::DamageStatusEnum32::SlightDamage; - case ProjectDataManagement::VulnerabilityState_def::NotReady: + case ProjectDataManagement::VulnerabilityState::NotReady: return rpr2::DamageStatusEnum32::NoDamage; } return rpr2::DamageStatusEnum32::NoDamage; @@ -98,9 +98,9 @@ bool DamageModel::immobilized(qint64 simTimeMSec) const int idx = indexForTime(simTimeMSec); if (idx < 0) return false; - if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::MobilityKill || - m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill || - m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::MobilityKill || + m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleMobilityKill || + m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) return true; return false; } @@ -110,9 +110,9 @@ bool DamageModel::firePowerDisabled(qint64 simTimeMSec) const int idx = indexForTime(simTimeMSec); if (idx < 0) return false; - if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage || - m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage || - m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::WeaponSystemDamage || + m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage || + m_vulnerabilityStates.at(idx).vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) return true; return false; } @@ -149,7 +149,7 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64 { int idx = indexForTime(simTimeMSec); if (idx < 0) - return ProjectDataManagement::VulnerabilityState_def::CombatReady; + return ProjectDataManagement::VulnerabilityState::CombatReady; return m_vulnerabilityStates.at(idx).vulnerabilityState; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h index 4f47c8c58..8d1e57169 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/damage_model.h @@ -26,7 +26,7 @@ public: explicit DamageModel(const ProjectDataManagement::VulnerabilityState &state); explicit DamageModel(const IdentifierStruct &is, const rpr2::DamageStatusEnum32::ET &status); explicit DamageModel(const IdentifierStruct &is) - : DamageModel(is, ProjectDataManagement::VulnerabilityState_def::CombatReady) + : DamageModel(is, ProjectDataManagement::VulnerabilityState::CombatReady) {} const IdentifierStruct &identifierStruct() const { return m_is; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp index 266ab4f37..5293902b5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.cpp @@ -986,10 +986,10 @@ void NgsConnector::onBaseEntityEntityIdentifierChanged(const rpr2::EntityIdentif GuezHitStruct hs; - hs.originatorType = ProjectDataManagement::StateChangeOriginator_def::Initialization; + hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization; hs.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); hs.targetId = is.entityNumber(); - hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged; + hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj, simTimeMSecs]() mutable { @@ -1048,10 +1048,10 @@ void NgsConnector::onEmbeddedSystemEntityIdentifierChanged(const rpr2::EntityIde GuezHitStruct hs; - hs.originatorType = ProjectDataManagement::StateChangeOriginator_def::Initialization; + hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization; hs.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); hs.targetId = is.entityNumber(); - hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged; + hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj, simTimeMSecs]() mutable { @@ -1149,11 +1149,11 @@ bool NgsConnector::onDamageStateChanged(const rpr2::EntityIdentifierStruct &eis, GuezHitStruct hitStruct; hitStruct.originatorChargeTypeEtsString = TypeStruct::fromDisInt(0).toString(); hitStruct.originatorId = 0; - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown; hitStruct.position = m_observerPositions[is.entityNumber()].toGeoPosition(); hitStruct.sampleTime = simTimeMSecs; hitStruct.targetId = is.entityNumber(); - hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged; + hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; hitStruct.vulnerabilityKind = 0; @@ -1303,7 +1303,7 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI ParticipantPosition pPos = interaction.isValidDetonationLocation() ? ParticipantPosition(interaction.getDetonationLocation()) : m_observerPositions.value(receiver); TrainingAreaBase::TabPosition tPos; tPos.position(pPos.toGeoPosition()); - tPos.reportingSource(Core::PositionReportingSource_def::External); + tPos.reportingSource(Core::PositionReportingSource::External); TrainingAreaBase::EquipmentState state; @@ -1317,7 +1317,7 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI if (sender > 0) { state.originatorId(sender); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::Participant); + state.originatorType(ProjectDataManagement::StateChangeOriginator::Participant); } else { @@ -1326,28 +1326,28 @@ void NgsConnector::onNewEngagementReply(const rpr2::IObserverEngagementReplyIntI if (source == QLatin1String("excon")) { state.originatorId(0); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ExerciseControl); + state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl); } else if (source == QLatin1String("cis")) { state.originatorId(1); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ExerciseControl); + state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl); } else if (source == QLatin1String("greenkey")) { state.originatorId(0); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ObserverController); + state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController); } else if (source == QLatin1String("optical")) { state.originatorId(0); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ObserverController); + state.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController); } else { state.originatorId(2); - state.originatorType(ProjectDataManagement::StateChangeOriginator_def::ExerciseControl); + state.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl); } } state.sampleTime(simTimeToMSec(interaction.getReceiveTimeStamp())); @@ -1708,16 +1708,16 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat switch (originatorType.underlying()) { - case ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation: + case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation: { break; } - case ProjectDataManagement::StateChangeOriginator_def::ExerciseControl: + case ProjectDataManagement::StateChangeOriginator::ExerciseControl: break; - case ProjectDataManagement::StateChangeOriginator_def::ObserverController: + case ProjectDataManagement::StateChangeOriginator::ObserverController: break; - case ProjectDataManagement::StateChangeOriginator_def::Participant: - if (originatorType == ProjectDataManagement::StateChangeOriginator_def::Participant) + case ProjectDataManagement::StateChangeOriginator::Participant: + if (originatorType == ProjectDataManagement::StateChangeOriginator::Participant) { if (m_playerMap.contains(originatorEqNo)) is = IdentifierStruct(originatorEqNo); @@ -1731,14 +1731,14 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat break; } Q_FALLTHROUGH(); - case ProjectDataManagement::StateChangeOriginator_def::Initialization: - case ProjectDataManagement::StateChangeOriginator_def::FunctionalArea: - case ProjectDataManagement::StateChangeOriginator_def::MaintainanceDevice: - case ProjectDataManagement::StateChangeOriginator_def::Unknown: - case ProjectDataManagement::StateChangeOriginator_def::WoundTreatmentDevice: + case ProjectDataManagement::StateChangeOriginator::Initialization: + case ProjectDataManagement::StateChangeOriginator::FunctionalArea: + case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice: + case ProjectDataManagement::StateChangeOriginator::Unknown: + case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice: - case ProjectDataManagement::StateChangeOriginator_def::ImprovisedExplosiveDevice: - case ProjectDataManagement::StateChangeOriginator_def::DusMine: + case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice: + case ProjectDataManagement::StateChangeOriginator::DusMine: break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h index e06c415ed..5b9e3d96e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ngs_connector.h @@ -113,12 +113,12 @@ struct GuezHitStruct { qint32 targetId = 0; qint64 sampleTime = 0; - ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::get_default(); + ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::get_default(); qint32 vulnerabilityKind = 0; qint32 vulnerabilityBits = 0; Core::GeoPosition position = Core::GeoPosition(0, 0, 0); qint32 originatorId = 0; - ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator_def::get_default(); + ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator::get_default(); QString originatorChargeTypeEtsString; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp index b318d7303..a6103aa8f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Apache/ppm_handler.cpp @@ -116,7 +116,7 @@ bool PpmHandler::init() ParticipantManagement::Role PpmHandler::roleForPartyId(int partyId) { if (partyId <= 0) - return ParticipantManagement::Role_def::Unknown; + return ParticipantManagement::Role::Unknown; auto it = m_partyData.constFind(partyId); if (it == m_partyData.constEnd()) { @@ -124,7 +124,7 @@ ParticipantManagement::Role PpmHandler::roleForPartyId(int partyId) m_partyData = m_dtcPpm->partys(); it = m_partyData.constFind(partyId); if (it == m_partyData.constEnd()) - return ParticipantManagement::Role_def::Unknown; + return ParticipantManagement::Role::Unknown; } return it.value().role(); } @@ -430,31 +430,31 @@ rpr2::DetonationResultCodeEnum8::ET PpmHandler::rpr2DetonationResultFromVulnerab rpr2::DetonationResultCodeEnum8::ET status = rpr2::DetonationResultCodeEnum8::None; switch(vulnerabilityState) { - case TrainingAreaBase::TetraIcd::VulnerabilityState::CombatReady: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CombatReady: status = rpr2::DetonationResultCodeEnum8::None; break; - case TrainingAreaBase::TetraIcd::VulnerabilityState::LightDamage: - case TrainingAreaBase::TetraIcd::VulnerabilityState::MediumDamage: - case TrainingAreaBase::TetraIcd::VulnerabilityState::HeavyDamage: - case TrainingAreaBase::TetraIcd::VulnerabilityState::MobilityKill: - case TrainingAreaBase::TetraIcd::VulnerabilityState::VisibleMobilityKill: - case TrainingAreaBase::TetraIcd::VulnerabilityState::WeaponSystemDamage: - case TrainingAreaBase::TetraIcd::VulnerabilityState::VisibleWeaponSystemDamage: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_LightDamage: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_MediumDamage: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_HeavyDamage: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_MobilityKill: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_VisibleMobilityKill: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_WeaponSystemDamage: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage: status = rpr2::DetonationResultCodeEnum8::AirHit; break; - case TrainingAreaBase::TetraIcd::VulnerabilityState::CatastrophicKill: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CatastrophicKill: status = rpr2::DetonationResultCodeEnum8::EntityImpact; break; - case TrainingAreaBase::TetraIcd::VulnerabilityState::TemporarySeverance: - case TrainingAreaBase::TetraIcd::VulnerabilityState::NearMiss: - case TrainingAreaBase::TetraIcd::VulnerabilityState::HitWithNoEffect: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_TemporarySeverance: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_NearMiss: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_HitWithNoEffect: status = rpr2::DetonationResultCodeEnum8::EntityProximateDetonation; break; - case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityBitsChanged: - case TrainingAreaBase::TetraIcd::VulnerabilityState::Reserved: - case TrainingAreaBase::TetraIcd::VulnerabilityState::NContamination: - case TrainingAreaBase::TetraIcd::VulnerabilityState::BContamination: - case TrainingAreaBase::TetraIcd::VulnerabilityState::CContamination: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_Reserved: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_NContamination: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_BContamination: + case TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CContamination: status = rpr2::DetonationResultCodeEnum8::Other; break; } @@ -514,22 +514,22 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par bool bCreated; switch (partType.typeClass().underlying()) { - case ParticipantManagement::TypeClass_def::Human: + case ParticipantManagement::TypeClass::Human: bCreated = createHuman(participant); break; - case ParticipantManagement::TypeClass_def::GroundVehicle: - case ParticipantManagement::TypeClass_def::VehicleWithGear: - case ParticipantManagement::TypeClass_def::WeaponSystem: + case ParticipantManagement::TypeClass::GroundVehicle: + case ParticipantManagement::TypeClass::VehicleWithGear: + case ParticipantManagement::TypeClass::WeaponSystem: bCreated = createGroundVehicle(participant); break; - case ParticipantManagement::TypeClass_def::Aircraft: + case ParticipantManagement::TypeClass::Aircraft: bCreated = createAircraft(participant); break; - case ParticipantManagement::TypeClass_def::SupportEntity: - case ParticipantManagement::TypeClass_def::Unit: + case ParticipantManagement::TypeClass::SupportEntity: + case ParticipantManagement::TypeClass::Unit: - case ParticipantManagement::TypeClass_def::Vessel: + case ParticipantManagement::TypeClass::Vessel: default: @@ -617,7 +617,7 @@ ProjectDataManagement::VulnerabilityState PpmHandler::currentVulnerabilityState( return ts; } } - ts = ProjectDataManagement::VulnerabilityState_def::TemporarySeverance; + ts = ProjectDataManagement::VulnerabilityState::TemporarySeverance; return ts; } @@ -729,97 +729,97 @@ rpr2::ForceIdentifierEnum8::ET PpmHandler::getRprForceIdentifierFromPpmForceIden { rpr2::ForceIdentifierEnum8::ET eqfi = rpr2::ForceIdentifierEnum8::Other; switch (ppmForceIdentifier.underlying()) { - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_1: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_1: eqfi = rpr2::ForceIdentifierEnum8::Friendly; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_2: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_2: eqfi = rpr2::ForceIdentifierEnum8::Friendly_2; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_3: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_3: eqfi = rpr2::ForceIdentifierEnum8::Friendly_3; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_4: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_4: eqfi = rpr2::ForceIdentifierEnum8::Friendly_4; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_5: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_5: eqfi = rpr2::ForceIdentifierEnum8::Friendly_5; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_6: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_6: eqfi = rpr2::ForceIdentifierEnum8::Friendly_6; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_7: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_7: eqfi = rpr2::ForceIdentifierEnum8::Friendly_7; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_8: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_8: eqfi = rpr2::ForceIdentifierEnum8::Friendly_8; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_9: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_9: eqfi = rpr2::ForceIdentifierEnum8::Friendly_9; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_10: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_10: eqfi = rpr2::ForceIdentifierEnum8::Friendly_10; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_1: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_1: eqfi = rpr2::ForceIdentifierEnum8::Opposing; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_2: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_2: eqfi = rpr2::ForceIdentifierEnum8::Opposing_2; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_3: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_3: eqfi = rpr2::ForceIdentifierEnum8::Opposing_3; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_4: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_4: eqfi = rpr2::ForceIdentifierEnum8::Opposing_4; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_5: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_5: eqfi = rpr2::ForceIdentifierEnum8::Opposing_5; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_6: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_6: eqfi = rpr2::ForceIdentifierEnum8::Opposing_6; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_7: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_7: eqfi = rpr2::ForceIdentifierEnum8::Opposing_7; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_8: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_8: eqfi = rpr2::ForceIdentifierEnum8::Opposing_8; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_9: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_9: eqfi = rpr2::ForceIdentifierEnum8::Opposing_9; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_10: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_10: eqfi = rpr2::ForceIdentifierEnum8::Opposing_10; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_1: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_1: eqfi = rpr2::ForceIdentifierEnum8::Neutral; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_2: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_2: eqfi = rpr2::ForceIdentifierEnum8::Neutral_2; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_3: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_3: eqfi = rpr2::ForceIdentifierEnum8::Neutral_3; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_4: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_4: eqfi = rpr2::ForceIdentifierEnum8::Neutral_4; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_5: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_5: eqfi = rpr2::ForceIdentifierEnum8::Neutral_5; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_6: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_6: eqfi = rpr2::ForceIdentifierEnum8::Neutral_6; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_7: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_7: eqfi = rpr2::ForceIdentifierEnum8::Neutral_7; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_8: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_8: eqfi = rpr2::ForceIdentifierEnum8::Neutral_8; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_9: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_9: eqfi = rpr2::ForceIdentifierEnum8::Neutral_9; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_10: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_10: eqfi = rpr2::ForceIdentifierEnum8::Neutral_10; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Other: + case ParticipantManagement::HlaForceIdentifierEnum::Other: eqfi = rpr2::ForceIdentifierEnum8::Other; break; } @@ -894,15 +894,15 @@ void PpmHandler::onParticipantHit(const GuezHitStruct &hitStruct) TrainingAreaBase::TabPosition pos; pos.position(hitStruct.position); - pos.reportingSource(Core::PositionReportingSource_def::External); + pos.reportingSource(Core::PositionReportingSource::External); TrainingAreaBase::EquipmentState es; es.equipmentNumber(hitStruct.targetId); es.originatorChargeTypeId(ct.id()); - if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation) + if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation) { int aesItemId = 0; - if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType_def::AtUnknown) + if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType::AtUnknown) es.originatorId(hitStruct.originatorId % 10); else es.originatorId(aesItemId); @@ -971,7 +971,7 @@ void PpmHandler::onEquipmentState(const TrainingAreaBase::EquipmentState &event) bool PpmHandler::onExconEngagement(int eqNo, const ProjectDataManagement::VulnerabilityState &state) { - if (state != ProjectDataManagement::VulnerabilityState_def::CombatReady) + if (state != ProjectDataManagement::VulnerabilityState::CombatReady) { TrainingAreaBase::DemandVulnerabilityStateChangeRequest req; req.equipmentNumbers().push_back(eqNo); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp index fb7dac0af..b74778ff5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/aes_handler.cpp @@ -203,14 +203,14 @@ void AesHandler::onAesItemViewChanged(const AesItemView &data, DataModification } else if (data.effectStateId() == AesEffectState::EsPrepared && - data.aesTypeId() == AesType_def::AtExplosionAreaSingleExplosions) + data.aesTypeId() == AesType::AtExplosionAreaSingleExplosions) { DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " added"; m_aesItemViews.insert(data.aesItemId(), data); m_takenIndicesForAesItem.insert(data.aesItemId(), QVector()); } - else if (data.aesTypeId() == AesType_def::AtBCContamination) + else if (data.aesTypeId() == AesType::AtBCContamination) { m_ngsHandler->ngsConnector()->setItemForm(data.aesItemId(), data.aesTypeId().underlying(), data.form()); DEBUG_LOG(m_logger) << "Item view with id " << data.aesItemId() << " directly updated in ngsConnector"; @@ -247,7 +247,7 @@ void AesHandler::onTriggeredImpactsChanged(const TriggeredImpacts &data, DataMod m_takenIndicesForAesItem.remove(data.aesItemId()); return; } - if (data.aesTypeId() != AesType_def::AtExplosionAreaSingleExplosions) + if (data.aesTypeId() != AesType::AtExplosionAreaSingleExplosions) return; if (!m_aesItemViews.contains(data.aesItemId())) @@ -289,7 +289,7 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType) m_handledImpactsStorage.removeAesItem(aesItemId); return; } - if (data.aesTypeId() != AesType_def::AtExplosionClusterSingleExplosions) + if (data.aesTypeId() != AesType::AtExplosionClusterSingleExplosions) return; const std::vector &singleEffectsRef = data.singleEffects(); @@ -324,7 +324,7 @@ void AesHandler::onEffectsChanged(const Effects &data, DataModification modType) { ++curSeIndex; - if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered) + if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState::SesTriggered) continue; @@ -478,10 +478,10 @@ void AesHandler::onAesBCContaminationChanged(const BCContamination &data, DataMo bool AesHandler::isModifiable(const AreaEffectSimulation::AesItem &item) { - return (item.effectStateId() == AesEffectState_def::EsCreated || - item.effectStateId() == AesEffectState_def::EsPrepared || - item.effectStateId() == AesEffectState_def::EsUnknown || - item.effectStateId() == AesEffectState_def::EsReceived); + return (item.effectStateId() == AesEffectState::EsCreated || + item.effectStateId() == AesEffectState::EsPrepared || + item.effectStateId() == AesEffectState::EsUnknown || + item.effectStateId() == AesEffectState::EsReceived); } @@ -493,9 +493,9 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa switch (type.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: break; - case AreaEffectSimulation::AesType_def::AtMineCorridor: + case AreaEffectSimulation::AesType::AtMineCorridor: { MineCorridorModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); if (!req) @@ -509,7 +509,7 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa req->name(newName); break; } - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineArea: { MineAreaModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); if (!req) @@ -523,34 +523,34 @@ void AesHandler::onAesNameChanged(qint64 identifierInt, const std::string &newNa req->name(newName); break; } - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtNContamination: break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionArea: break; - case AreaEffectSimulation::AesType_def::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionSingle: break; - case AreaEffectSimulation::AesType_def::AtAirSupportImpact: + case AreaEffectSimulation::AesType::AtAirSupportImpact: break; - case AreaEffectSimulation::AesType_def::AtUnknown: - case AreaEffectSimulation::AesType_def::AtDangerArea: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtBorderline: - case AreaEffectSimulation::AesType_def::AtTechnicalArea: - case AreaEffectSimulation::AesType_def::AtReconArea: - case AreaEffectSimulation::AesType_def::AtDusSingleMine: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtGasPipe: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory: - case AreaEffectSimulation::AesType_def::AtBoobyTrap: - case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary: - case AreaEffectSimulation::AesType_def::AtOffRouteMine: - case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: - case AreaEffectSimulation::AesType_def::AtExplosionCluster: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory: - case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine: + case AreaEffectSimulation::AesType::AtUnknown: + case AreaEffectSimulation::AesType::AtDangerArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtBorderline: + case AreaEffectSimulation::AesType::AtTechnicalArea: + case AreaEffectSimulation::AesType::AtReconArea: + case AreaEffectSimulation::AesType::AtDusSingleMine: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtGasPipe: + case AreaEffectSimulation::AesType::AtExplosionSingleCentral: + case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory: + case AreaEffectSimulation::AesType::AtBoobyTrap: + case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: + case AreaEffectSimulation::AesType::AtOffRouteMine: + case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: + case AreaEffectSimulation::AesType::AtExplosionCluster: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory: + case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine: break; } @@ -567,9 +567,9 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt) switch (type.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: break; - case AreaEffectSimulation::AesType_def::AtMineCorridor: + case AreaEffectSimulation::AesType::AtMineCorridor: { m_requestHelper->startSingleRequest([req, this]() { @@ -577,7 +577,7 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt) }); break; } - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineArea: { m_requestHelper->startSingleRequest([req, this]() { @@ -585,34 +585,34 @@ void AesHandler::onAesRemoveItem(qint64 identifierInt) }); break; } - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtNContamination: return; - case AreaEffectSimulation::AesType_def::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionArea: return; - case AreaEffectSimulation::AesType_def::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionSingle: return; - case AreaEffectSimulation::AesType_def::AtAirSupportImpact: + case AreaEffectSimulation::AesType::AtAirSupportImpact: break; - case AreaEffectSimulation::AesType_def::AtUnknown: - case AreaEffectSimulation::AesType_def::AtDangerArea: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtBorderline: - case AreaEffectSimulation::AesType_def::AtTechnicalArea: - case AreaEffectSimulation::AesType_def::AtReconArea: - case AreaEffectSimulation::AesType_def::AtDusSingleMine: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtGasPipe: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory: - case AreaEffectSimulation::AesType_def::AtBoobyTrap: - case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary: - case AreaEffectSimulation::AesType_def::AtOffRouteMine: - case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: - case AreaEffectSimulation::AesType_def::AtExplosionCluster: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory: - case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine: + case AreaEffectSimulation::AesType::AtUnknown: + case AreaEffectSimulation::AesType::AtDangerArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtBorderline: + case AreaEffectSimulation::AesType::AtTechnicalArea: + case AreaEffectSimulation::AesType::AtReconArea: + case AreaEffectSimulation::AesType::AtDusSingleMine: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtGasPipe: + case AreaEffectSimulation::AesType::AtExplosionSingleCentral: + case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory: + case AreaEffectSimulation::AesType::AtBoobyTrap: + case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: + case AreaEffectSimulation::AesType::AtOffRouteMine: + case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: + case AreaEffectSimulation::AesType::AtExplosionCluster: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory: + case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine: return; } @@ -629,9 +629,9 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi switch (type.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: break; - case AreaEffectSimulation::AesType_def::AtMineCorridor: + case AreaEffectSimulation::AesType::AtMineCorridor: { MineCorridorModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); if (!req) @@ -645,7 +645,7 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi req->effectStart(msecsSinceEpoch); break; } - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineArea: { DEBUG_LOG(m_logger) << "onAesActivationTimeChanged / MineArea"; MineAreaModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); @@ -661,34 +661,34 @@ void AesHandler::onAesActivationTimeChanged(qint64 identifierInt, qint64 msecsSi req->effectStart(msecsSinceEpoch); break; } - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtNContamination: break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionArea: break; - case AreaEffectSimulation::AesType_def::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionSingle: break; - case AreaEffectSimulation::AesType_def::AtAirSupportImpact: + case AreaEffectSimulation::AesType::AtAirSupportImpact: break; - case AreaEffectSimulation::AesType_def::AtUnknown: - case AreaEffectSimulation::AesType_def::AtDangerArea: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtBorderline: - case AreaEffectSimulation::AesType_def::AtTechnicalArea: - case AreaEffectSimulation::AesType_def::AtReconArea: - case AreaEffectSimulation::AesType_def::AtDusSingleMine: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtGasPipe: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory: - case AreaEffectSimulation::AesType_def::AtBoobyTrap: - case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary: - case AreaEffectSimulation::AesType_def::AtOffRouteMine: - case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: - case AreaEffectSimulation::AesType_def::AtExplosionCluster: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory: - case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine: + case AreaEffectSimulation::AesType::AtUnknown: + case AreaEffectSimulation::AesType::AtDangerArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtBorderline: + case AreaEffectSimulation::AesType::AtTechnicalArea: + case AreaEffectSimulation::AesType::AtReconArea: + case AreaEffectSimulation::AesType::AtDusSingleMine: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtGasPipe: + case AreaEffectSimulation::AesType::AtExplosionSingleCentral: + case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory: + case AreaEffectSimulation::AesType::AtBoobyTrap: + case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: + case AreaEffectSimulation::AesType::AtOffRouteMine: + case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: + case AreaEffectSimulation::AesType::AtExplosionCluster: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory: + case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine: break; } } @@ -701,9 +701,9 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId) switch (type.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: break; - case AreaEffectSimulation::AesType_def::AtMineCorridor: + case AreaEffectSimulation::AesType::AtMineCorridor: { MineCorridorModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); if (!req) @@ -717,7 +717,7 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId) req->partyId(partyId); break; } - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineArea: { MineAreaModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); if (!req) @@ -731,34 +731,34 @@ void AesHandler::onAesForceIdentifierChanged(qint64 identifierInt, int partyId) req->partyId(partyId); break; } - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtNContamination: break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionArea: break; - case AreaEffectSimulation::AesType_def::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionSingle: break; - case AreaEffectSimulation::AesType_def::AtAirSupportImpact: + case AreaEffectSimulation::AesType::AtAirSupportImpact: break; - case AreaEffectSimulation::AesType_def::AtUnknown: - case AreaEffectSimulation::AesType_def::AtDangerArea: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtBorderline: - case AreaEffectSimulation::AesType_def::AtTechnicalArea: - case AreaEffectSimulation::AesType_def::AtReconArea: - case AreaEffectSimulation::AesType_def::AtDusSingleMine: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtGasPipe: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory: - case AreaEffectSimulation::AesType_def::AtBoobyTrap: - case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary: - case AreaEffectSimulation::AesType_def::AtOffRouteMine: - case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: - case AreaEffectSimulation::AesType_def::AtExplosionCluster: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory: - case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine: + case AreaEffectSimulation::AesType::AtUnknown: + case AreaEffectSimulation::AesType::AtDangerArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtBorderline: + case AreaEffectSimulation::AesType::AtTechnicalArea: + case AreaEffectSimulation::AesType::AtReconArea: + case AreaEffectSimulation::AesType::AtDusSingleMine: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtGasPipe: + case AreaEffectSimulation::AesType::AtExplosionSingleCentral: + case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory: + case AreaEffectSimulation::AesType::AtBoobyTrap: + case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: + case AreaEffectSimulation::AesType::AtOffRouteMine: + case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: + case AreaEffectSimulation::AesType::AtExplosionCluster: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory: + case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine: break; } } @@ -784,9 +784,9 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time) switch (type.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: break; - case AreaEffectSimulation::AesType_def::AtMineCorridor: + case AreaEffectSimulation::AesType::AtMineCorridor: { MineCorridorModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); const int timeMSec = checkDuration(u_time, 60 * 60 * 1000, m_logger); @@ -801,7 +801,7 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time) req->effectDuration(timeMSec); break; } - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineArea: { MineAreaModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); const int timeMSec = checkDuration(u_time, 60 * 60 * 1000, m_logger); @@ -816,34 +816,34 @@ void AesHandler::onAesDurationChanged(qint64 identifierInt, quint32 u_time) req->effectDuration(timeMSec); break; } - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtNContamination: break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionArea: break; - case AreaEffectSimulation::AesType_def::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionSingle: break; - case AreaEffectSimulation::AesType_def::AtAirSupportImpact: + case AreaEffectSimulation::AesType::AtAirSupportImpact: break; - case AreaEffectSimulation::AesType_def::AtUnknown: - case AreaEffectSimulation::AesType_def::AtDangerArea: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtBorderline: - case AreaEffectSimulation::AesType_def::AtTechnicalArea: - case AreaEffectSimulation::AesType_def::AtReconArea: - case AreaEffectSimulation::AesType_def::AtDusSingleMine: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtGasPipe: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory: - case AreaEffectSimulation::AesType_def::AtBoobyTrap: - case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary: - case AreaEffectSimulation::AesType_def::AtOffRouteMine: - case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: - case AreaEffectSimulation::AesType_def::AtExplosionCluster: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory: - case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine: + case AreaEffectSimulation::AesType::AtUnknown: + case AreaEffectSimulation::AesType::AtDangerArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtBorderline: + case AreaEffectSimulation::AesType::AtTechnicalArea: + case AreaEffectSimulation::AesType::AtReconArea: + case AreaEffectSimulation::AesType::AtDusSingleMine: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtGasPipe: + case AreaEffectSimulation::AesType::AtExplosionSingleCentral: + case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory: + case AreaEffectSimulation::AesType::AtBoobyTrap: + case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: + case AreaEffectSimulation::AesType::AtOffRouteMine: + case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: + case AreaEffectSimulation::AesType::AtExplosionCluster: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory: + case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine: break; } @@ -856,11 +856,11 @@ void AesHandler::onAesChargeChanged(qint64 identifierInt, int chargeTypeId) switch (type.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: break; - case AreaEffectSimulation::AesType_def::AtMineCorridor: + case AreaEffectSimulation::AesType::AtMineCorridor: break; - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineArea: { MineAreaModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); if (!req) @@ -874,34 +874,34 @@ void AesHandler::onAesChargeChanged(qint64 identifierInt, int chargeTypeId) req->chargeStruct().chargeTypeId(chargeTypeId); break; } - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtNContamination: break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionArea: break; - case AreaEffectSimulation::AesType_def::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionSingle: break; - case AreaEffectSimulation::AesType_def::AtAirSupportImpact: + case AreaEffectSimulation::AesType::AtAirSupportImpact: break; - case AreaEffectSimulation::AesType_def::AtUnknown: - case AreaEffectSimulation::AesType_def::AtDangerArea: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtBorderline: - case AreaEffectSimulation::AesType_def::AtTechnicalArea: - case AreaEffectSimulation::AesType_def::AtReconArea: - case AreaEffectSimulation::AesType_def::AtDusSingleMine: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtGasPipe: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory: - case AreaEffectSimulation::AesType_def::AtBoobyTrap: - case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary: - case AreaEffectSimulation::AesType_def::AtOffRouteMine: - case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: - case AreaEffectSimulation::AesType_def::AtExplosionCluster: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory: - case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine: + case AreaEffectSimulation::AesType::AtUnknown: + case AreaEffectSimulation::AesType::AtDangerArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtBorderline: + case AreaEffectSimulation::AesType::AtTechnicalArea: + case AreaEffectSimulation::AesType::AtReconArea: + case AreaEffectSimulation::AesType::AtDusSingleMine: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtGasPipe: + case AreaEffectSimulation::AesType::AtExplosionSingleCentral: + case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory: + case AreaEffectSimulation::AesType::AtBoobyTrap: + case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: + case AreaEffectSimulation::AesType::AtOffRouteMine: + case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: + case AreaEffectSimulation::AesType::AtExplosionCluster: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory: + case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine: break; } } @@ -962,9 +962,9 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector< switch (type.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: break; - case AreaEffectSimulation::AesType_def::AtMineCorridor: + case AreaEffectSimulation::AesType::AtMineCorridor: { MineCorridorModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); if (!req) @@ -987,7 +987,7 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector< req->width(width); break; } - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineArea: { MineAreaModifyRequest *req = static_cast(m_pendingRequests.value(aesItemId)); if (!req) @@ -1011,34 +1011,34 @@ void AesHandler::onAesPointsDataChanged(qint64 identifierInt, const std::vector< req->width(width); break; } - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtNContamination: break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionArea: break; - case AreaEffectSimulation::AesType_def::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionSingle: break; - case AreaEffectSimulation::AesType_def::AtAirSupportImpact: + case AreaEffectSimulation::AesType::AtAirSupportImpact: break; - case AreaEffectSimulation::AesType_def::AtUnknown: - case AreaEffectSimulation::AesType_def::AtDangerArea: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtBorderline: - case AreaEffectSimulation::AesType_def::AtTechnicalArea: - case AreaEffectSimulation::AesType_def::AtReconArea: - case AreaEffectSimulation::AesType_def::AtDusSingleMine: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtGasPipe: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory: - case AreaEffectSimulation::AesType_def::AtBoobyTrap: - case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary: - case AreaEffectSimulation::AesType_def::AtOffRouteMine: - case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: - case AreaEffectSimulation::AesType_def::AtExplosionCluster: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleTrajectory: - case AreaEffectSimulation::AesType_def::AtExplosionClusterGunToTargetLine: + case AreaEffectSimulation::AesType::AtUnknown: + case AreaEffectSimulation::AesType::AtDangerArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtBorderline: + case AreaEffectSimulation::AesType::AtTechnicalArea: + case AreaEffectSimulation::AesType::AtReconArea: + case AreaEffectSimulation::AesType::AtDusSingleMine: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtGasPipe: + case AreaEffectSimulation::AesType::AtExplosionSingleCentral: + case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory: + case AreaEffectSimulation::AesType::AtBoobyTrap: + case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: + case AreaEffectSimulation::AesType::AtOffRouteMine: + case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: + case AreaEffectSimulation::AesType::AtExplosionCluster: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleTrajectory: + case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine: break; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp index a25f05ac1..1cb5584e8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/damage_model.cpp @@ -215,35 +215,35 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64 { int idx = indexForTime(simTimeMSec); if (idx < 0) - return ProjectDataManagement::VulnerabilityState_def::CombatReady; + return ProjectDataManagement::VulnerabilityState::CombatReady; switch (m_tacticalStates.at(idx).tss.TacticalStatus) { case rpr2::TacticalStatusEnum8::CombatReady: - return ProjectDataManagement::VulnerabilityState_def::CombatReady; + return ProjectDataManagement::VulnerabilityState::CombatReady; case rpr2::TacticalStatusEnum8::LightHit: - return ProjectDataManagement::VulnerabilityState_def::LightDamage; + return ProjectDataManagement::VulnerabilityState::LightDamage; case rpr2::TacticalStatusEnum8::MediumHit: - return ProjectDataManagement::VulnerabilityState_def::MediumDamage; + return ProjectDataManagement::VulnerabilityState::MediumDamage; case rpr2::TacticalStatusEnum8::HeavyHit: - return ProjectDataManagement::VulnerabilityState_def::HeavyDamage; + return ProjectDataManagement::VulnerabilityState::HeavyDamage; case rpr2::TacticalStatusEnum8::Immobilized: - return ProjectDataManagement::VulnerabilityState_def::MobilityKill; + return ProjectDataManagement::VulnerabilityState::MobilityKill; case rpr2::TacticalStatusEnum8::ImmobilizedVisible: - return ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill; + return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill; case rpr2::TacticalStatusEnum8::WeaponKill: - return ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage; + return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage; case rpr2::TacticalStatusEnum8::WeaponKillVisible: - return ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage; + return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage; case rpr2::TacticalStatusEnum8::TotalKill: - return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill; + return ProjectDataManagement::VulnerabilityState::CatastrophicKill; case rpr2::TacticalStatusEnum8::TemporaryFailure: - return ProjectDataManagement::VulnerabilityState_def::TemporarySeverance; + return ProjectDataManagement::VulnerabilityState::TemporarySeverance; case rpr2::TacticalStatusEnum8::NearMiss: - return ProjectDataManagement::VulnerabilityState_def::NearMiss; + return ProjectDataManagement::VulnerabilityState::NearMiss; case rpr2::TacticalStatusEnum8::HitWithoutEffect: - return ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect; + return ProjectDataManagement::VulnerabilityState::HitWithNoEffect; } - return ProjectDataManagement::VulnerabilityState_def::CombatReady; + return ProjectDataManagement::VulnerabilityState::CombatReady; } int DamageModel::indexForTime(qint64 simTimeMSec) const diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp index bd0403d4c..cad4dbf7d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.cpp @@ -647,8 +647,8 @@ bool NgsConnector::guezMineField(const AreaEffectSimulation::MineArea &data) const QList icbs = m_environmentObjects.values(data.id()); - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired || - data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired || + data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved) { for (rpr2::IPlayerEnvironmentObjectObjInstance *item : icbs) item->deleteObjectInstance(ngs::SimTime(true)); @@ -657,11 +657,11 @@ bool NgsConnector::guezMineField(const AreaEffectSimulation::MineArea &data) return true; } - if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPrepared && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived) + if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived) return false; QVector minefields; @@ -705,9 +705,9 @@ bool NgsConnector::guezMineField(const AreaEffectSimulation::MineArea &data) const AreaEffectSimulation::MineSegment &segment = data.segments()[i]; icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0)); - icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState_def::EsActivated); - if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsExpired || - data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState::EsActivated); + if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsExpired || + data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsRemoved) icb->setPercentComplete(100); else icb->setPercentComplete(0); @@ -739,8 +739,8 @@ bool NgsConnector::guezMineFieldBreach(const AreaEffectSimulation::MineCorridor const QList icbs = m_environmentObjects.values(data.id()); - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired || - data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired || + data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved) { for (rpr2::IPlayerEnvironmentObjectObjInstance *item : icbs) item->deleteObjectInstance(ngs::SimTime(true)); @@ -749,11 +749,11 @@ bool NgsConnector::guezMineFieldBreach(const AreaEffectSimulation::MineCorridor return true; } - if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPrepared && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused) + if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused) return false; QMap map; @@ -799,9 +799,9 @@ bool NgsConnector::guezMineFieldBreach(const AreaEffectSimulation::MineCorridor icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0)); icb->setAreaEffectSimulationName(rpr2::OMT13string(data.name())); icb->setPointsData(positionArray(mineCorridorSegment(data.segments().at(i), data.segments().at(i + 1), data.width()))); - icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState_def::EsActivated); - if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsExpired || - data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState::EsActivated); + if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsExpired || + data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsRemoved) icb->setPercentComplete(100); else icb->setPercentComplete(0); @@ -827,8 +827,8 @@ bool NgsConnector::guezNuclearAgent(const AreaEffectSimulation::NContamination & if (icb && - (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired || - data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)) + (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired || + data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)) { icb->deleteObjectInstance(ngs::SimTime(true)); m_environmentObjects.remove(data.id()); @@ -836,11 +836,11 @@ bool NgsConnector::guezNuclearAgent(const AreaEffectSimulation::NContamination & return true; } - if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPrepared && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused) + if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused) return false; if (!icb) @@ -881,8 +881,8 @@ bool NgsConnector::guezChemicalAgent(const AreaEffectSimulation::BCContamination if (icb && - (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired || - data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved)) + (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired || + data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved)) { icb->deleteObjectInstance(ngs::SimTime(true)); m_environmentObjects.remove(data.id()); @@ -890,11 +890,11 @@ bool NgsConnector::guezChemicalAgent(const AreaEffectSimulation::BCContamination return true; } - if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPrepared && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated && - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused) + if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPrepared && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated && + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused) return false; if (!icb) @@ -922,13 +922,13 @@ bool NgsConnector::guezChemicalAgent(const AreaEffectSimulation::BCContamination } is.setEntityNumber(10 * data.id()); icb->setObjectIdentifier(is.toEIS()); - icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState_def::EsActivated); + icb->setDeactivated(data.effectStateId().underlying() != AreaEffectSimulation::AesEffectState::EsActivated); icb->setActivationTime(getClockTimeStruct(data.effectStart().is_set() ? data.effectStart().get() : 0)); icb->setAreaEffectSimulationName(rpr2::OMT13string(data.name())); icb->setDuration(data.effectDuration() / 1000 / 60); icb->setDetonationLocation(pos.toWorldLocation()); - if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsExpired || - data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsExpired || + data.effectStateId().underlying() == AreaEffectSimulation::AesEffectState::EsRemoved) icb->setPercentComplete(100); else icb->setPercentComplete(0); @@ -961,26 +961,26 @@ bool NgsConnector::setItemForm(int aesItemId, int aesTypeId, const std::vector reducedForm; switch (aesTypeId) { - case AesType_def::AtBCContamination: + case AesType::AtBCContamination: reducedForm = bcReduction(form); break; - case AesType_def::AtMineCorridor: - case AesType_def::AtExplosionArea: - case AesType_def::AtExplosionSingle: - case AesType_def::AtMineArea: - case AesType_def::AtNContamination: + case AesType::AtMineCorridor: + case AesType::AtExplosionArea: + case AesType::AtExplosionSingle: + case AesType::AtMineArea: + case AesType::AtNContamination: return true; - case AesType_def::AtUnknown: - case AesType_def::AtDangerArea: - case AesType_def::AtFunctionalArea: - case AesType_def::AtBorderline: - case AesType_def::AtTechnicalArea: - case AesType_def::AtReconArea: - case AesType_def::AtDusSingleMine: - case AesType_def::AtExplosionAreaSingleExplosions: - case AesType_def::AtMineAreaSingleMines: - case AesType_def::AtGasPipe: + case AesType::AtUnknown: + case AesType::AtDangerArea: + case AesType::AtFunctionalArea: + case AesType::AtBorderline: + case AesType::AtTechnicalArea: + case AesType::AtReconArea: + case AesType::AtDusSingleMine: + case AesType::AtExplosionAreaSingleExplosions: + case AesType::AtMineAreaSingleMines: + case AesType::AtGasPipe: return true; } @@ -1577,33 +1577,33 @@ rpr2::HitResultEnum16::ET NgsConnector::getHitResultEnum(const ProjectDataManage { switch (ts.underlying()) { - case ProjectDataManagement::VulnerabilityState_def::CombatReady: + case ProjectDataManagement::VulnerabilityState::CombatReady: return rpr2::HitResultEnum16::Reset; - case ProjectDataManagement::VulnerabilityState_def::LightDamage: + case ProjectDataManagement::VulnerabilityState::LightDamage: return rpr2::HitResultEnum16::LightDamage; - case ProjectDataManagement::VulnerabilityState_def::MediumDamage: + case ProjectDataManagement::VulnerabilityState::MediumDamage: return rpr2::HitResultEnum16::MediumDamage; - case ProjectDataManagement::VulnerabilityState_def::HeavyDamage: + case ProjectDataManagement::VulnerabilityState::HeavyDamage: return rpr2::HitResultEnum16::HeavyDamage; - case ProjectDataManagement::VulnerabilityState_def::MobilityKill: + case ProjectDataManagement::VulnerabilityState::MobilityKill: return rpr2::HitResultEnum16::MobilityKill; - case ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill: + case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill: return rpr2::HitResultEnum16::MobilityKillVisible; - case ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage: return rpr2::HitResultEnum16::WeaponDamage; - case ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage: return rpr2::HitResultEnum16::WeaponDamageVisible; - case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::CatastrophicKill: return rpr2::HitResultEnum16::TotalKill; - case ProjectDataManagement::VulnerabilityState_def::TemporarySeverance: + case ProjectDataManagement::VulnerabilityState::TemporarySeverance: return rpr2::HitResultEnum16::TemporaryFailure; - case ProjectDataManagement::VulnerabilityState_def::NearMiss: + case ProjectDataManagement::VulnerabilityState::NearMiss: return rpr2::HitResultEnum16::NearMiss; - case ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect: + case ProjectDataManagement::VulnerabilityState::HitWithNoEffect: return rpr2::HitResultEnum16::HitWithNoEffect; - case ProjectDataManagement::VulnerabilityState_def::NContamination: - case ProjectDataManagement::VulnerabilityState_def::BContamination: - case ProjectDataManagement::VulnerabilityState_def::CContamination: + case ProjectDataManagement::VulnerabilityState::NContamination: + case ProjectDataManagement::VulnerabilityState::BContamination: + case ProjectDataManagement::VulnerabilityState::CContamination: return rpr2::HitResultEnum16::Contaminated; default: return rpr2::HitResultEnum16::Reset; @@ -1616,37 +1616,37 @@ ProjectDataManagement::VulnerabilityState NgsConnector::getTacticalStatusEnum(co switch (hr) { case rpr2::HitResultEnum16::Reset: - return ProjectDataManagement::VulnerabilityState_def::CombatReady; + return ProjectDataManagement::VulnerabilityState::CombatReady; case rpr2::HitResultEnum16::LightDamage: - return ProjectDataManagement::VulnerabilityState_def::LightDamage; + return ProjectDataManagement::VulnerabilityState::LightDamage; case rpr2::HitResultEnum16::MediumDamage: - return ProjectDataManagement::VulnerabilityState_def::MediumDamage; + return ProjectDataManagement::VulnerabilityState::MediumDamage; case rpr2::HitResultEnum16::HeavyDamage: - return ProjectDataManagement::VulnerabilityState_def::HeavyDamage; + return ProjectDataManagement::VulnerabilityState::HeavyDamage; case rpr2::HitResultEnum16::MobilityKill: - return ProjectDataManagement::VulnerabilityState_def::MobilityKill; + return ProjectDataManagement::VulnerabilityState::MobilityKill; case rpr2::HitResultEnum16::MobilityKillVisible: - return ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill; + return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill; case rpr2::HitResultEnum16::WeaponDamage: - return ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage; + return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage; case rpr2::HitResultEnum16::WeaponDamageVisible: - return ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage; + return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage; case rpr2::HitResultEnum16::TotalKill: - return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill; + return ProjectDataManagement::VulnerabilityState::CatastrophicKill; case rpr2::HitResultEnum16::CheatingKill: - return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill; + return ProjectDataManagement::VulnerabilityState::CatastrophicKill; case rpr2::HitResultEnum16::NearMiss: - return ProjectDataManagement::VulnerabilityState_def::NearMiss; + return ProjectDataManagement::VulnerabilityState::NearMiss; case rpr2::HitResultEnum16::HitWithNoEffect: - return ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect; + return ProjectDataManagement::VulnerabilityState::HitWithNoEffect; case rpr2::HitResultEnum16::Contaminated: - return ProjectDataManagement::VulnerabilityState_def::CContamination; + return ProjectDataManagement::VulnerabilityState::CContamination; case rpr2::HitResultEnum16::TemporaryFailure: - return ProjectDataManagement::VulnerabilityState_def::TemporarySeverance; + return ProjectDataManagement::VulnerabilityState::TemporarySeverance; default: - return ProjectDataManagement::VulnerabilityState_def::NoChange; + return ProjectDataManagement::VulnerabilityState::NoChange; } - return ProjectDataManagement::VulnerabilityState_def::NoChange; + return ProjectDataManagement::VulnerabilityState::NoChange; } QPolygonF NgsConnector::utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordTrans::UtmCoordinate &base) @@ -1681,10 +1681,10 @@ void NgsConnector::onEntityIdentifierChanged(const rpr2::EntityIdentifierStruct GuezHitStruct hs; - hs.originatorType = ProjectDataManagement::StateChangeOriginator_def::Initialization; + hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization; hs.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); hs.targetId = is.entityNumber(); - hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged; + hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj]() mutable { @@ -2083,11 +2083,11 @@ bool NgsConnector::onTacticalStatusChanged(const rpr2::EntityIdentifierStruct &e GuezHitStruct hitStruct; hitStruct.originatorChargeTypeEtsString = TypeStruct::fromDisInt(0).toString(); hitStruct.originatorId = 0; - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown; hitStruct.position = m_observerPositions[is.entityNumber()].toGeoPosition(); hitStruct.sampleTime = simTimeMSecs; hitStruct.targetId = is.entityNumber(); - hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged; + hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; hitStruct.vulnerabilityKind = 0; const auto vulnerabilityBits = m_damageModelMap[is.entityNumber()]->totalState(hitStruct.sampleTime); @@ -2423,31 +2423,31 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac GuezHitStruct hitStruct; hitStruct.originatorChargeTypeEtsString = TypeStruct(interaction.getMunition()).toString(); hitStruct.originatorId = interaction.getOriginatorIdentifier().EntityNumber; - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown; switch (interaction.getOriginatorType()) { case rpr2::OriginatorTypeEnum16::Unknown: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown; break; case rpr2::OriginatorTypeEnum16::NoMedicalTreatment: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Participant; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant; if (hitStruct.originatorId == 0) hitStruct.originatorId = hitStruct.targetId; break; case rpr2::OriginatorTypeEnum16::Participant: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Participant; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant; if (hitStruct.originatorId == 0) - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::ExerciseControl; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl; break; case rpr2::OriginatorTypeEnum16::AreaEffectSimulation: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation; hitStruct.originatorId = IdentifierStruct(interaction.getOriginatorIdentifier()).toInt64(); break; case rpr2::OriginatorTypeEnum16::ObserverController: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::ObserverController; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ObserverController; break; case rpr2::OriginatorTypeEnum16::ExerciseControl: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::ExerciseControl; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl; break; } hitStruct.position = ParticipantPosition(interaction.getTargetLocation()).toGeoPosition(); @@ -2458,16 +2458,16 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac hitStruct.vulnerabilityState = getTacticalStatusEnum(interaction.getHitResult()); - if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator_def::ExerciseControl || - hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator_def::ObserverController + if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ExerciseControl || + hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ObserverController ) - && hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect) + && hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::HitWithNoEffect) { auto ptr = m_damageModelMap.value(eqNo); if (ptr) { hitStruct.vulnerabilityState = ptr->vulnerabilityState(hitStruct.sampleTime); - if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady) + if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady) ptr->setTacticalStatus(rpr2::HitResultEnum16::Reset, simTimeToMSec(interaction.getReceiveTimeStamp())); } } @@ -2714,7 +2714,7 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat switch (originatorType.underlying()) { - case ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation: + case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation: { if (m_environmentObjects.contains(originatorEqNo)) is = IdentifierStruct(10 * originatorEqNo); @@ -2734,14 +2734,14 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat originatorTypeRpr = rpr2::OriginatorTypeEnum16::AreaEffectSimulation; break; } - case ProjectDataManagement::StateChangeOriginator_def::ExerciseControl: + case ProjectDataManagement::StateChangeOriginator::ExerciseControl: originatorTypeRpr = rpr2::OriginatorTypeEnum16::ExerciseControl; break; - case ProjectDataManagement::StateChangeOriginator_def::ObserverController: + case ProjectDataManagement::StateChangeOriginator::ObserverController: originatorTypeRpr = rpr2::OriginatorTypeEnum16::ObserverController; break; - case ProjectDataManagement::StateChangeOriginator_def::Participant: - if (originatorType == ProjectDataManagement::StateChangeOriginator_def::Participant) + case ProjectDataManagement::StateChangeOriginator::Participant: + if (originatorType == ProjectDataManagement::StateChangeOriginator::Participant) { if (m_playerMap.contains(originatorEqNo)) is = IdentifierStruct(originatorEqNo); @@ -2756,16 +2756,16 @@ bool NgsConnector::setParticipantHit(int eqNo, const ParticipantManagement::Stat break; } Q_FALLTHROUGH(); - case ProjectDataManagement::StateChangeOriginator_def::Initialization: - case ProjectDataManagement::StateChangeOriginator_def::FunctionalArea: - case ProjectDataManagement::StateChangeOriginator_def::MaintainanceDevice: - case ProjectDataManagement::StateChangeOriginator_def::Unknown: - case ProjectDataManagement::StateChangeOriginator_def::WoundTreatmentDevice: - case ProjectDataManagement::StateChangeOriginator_def::MedicalTimeout: - case ProjectDataManagement::StateChangeOriginator_def::Sanitation: + case ProjectDataManagement::StateChangeOriginator::Initialization: + case ProjectDataManagement::StateChangeOriginator::FunctionalArea: + case ProjectDataManagement::StateChangeOriginator::MaintainanceDevice: + case ProjectDataManagement::StateChangeOriginator::Unknown: + case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice: + case ProjectDataManagement::StateChangeOriginator::MedicalTimeout: + case ProjectDataManagement::StateChangeOriginator::Sanitation: - case ProjectDataManagement::StateChangeOriginator_def::ImprovisedExplosiveDevice: - case ProjectDataManagement::StateChangeOriginator_def::DusMine: + case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice: + case ProjectDataManagement::StateChangeOriginator::DusMine: originatorTypeRpr = rpr2::OriginatorTypeEnum16::Unknown; break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h index c8a4e9167..2c4fa5030 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ngs_connector.h @@ -130,12 +130,12 @@ struct GuezHitStruct { qint32 targetId = 0; qint64 sampleTime = 0; - ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::get_default(); + ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::get_default(); qint32 vulnerabilityKind = 0; qint32 vulnerabilityBits = 0; Core::GeoPosition position = Core::GeoPosition(0, 0, 0); qint64 originatorId = 0; - ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator_def::get_default(); + ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator::get_default(); QString originatorChargeTypeEtsString; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.cpp index 61bc54536..4c4b271f2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Guez/ppm_handler.cpp @@ -120,7 +120,7 @@ bool PpmHandler::init() ParticipantManagement::Role PpmHandler::roleForPartyId(int partyId) { if (partyId <= 0) - return ParticipantManagement::Role_def::Unknown; + return ParticipantManagement::Role::Unknown; auto it = m_partyData.constFind(partyId); if (it == m_partyData.constEnd()) { @@ -128,7 +128,7 @@ ParticipantManagement::Role PpmHandler::roleForPartyId(int partyId) m_partyData = m_dtcPpm->partys(); it = m_partyData.constFind(partyId); if (it == m_partyData.constEnd()) - return ParticipantManagement::Role_def::Unknown; + return ParticipantManagement::Role::Unknown; } return it.value().role(); } @@ -381,8 +381,8 @@ void PpmHandler::onParticipantReceivedInit(int eqId, qint64 simTimeMSecs) init.equipmentNumber(eqId); init.sampleTime(simTimeMSecs); init.vulnerabilityBits(1); - init.vulnerabilityState(ProjectDataManagement::VulnerabilityState_def::CombatReady); - init.originatorType(ProjectDataManagement::StateChangeOriginator_def::ExerciseControl); + init.vulnerabilityState(ProjectDataManagement::VulnerabilityState::CombatReady); + init.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl); m_dtsTab->publish(init); } @@ -490,15 +490,15 @@ void PpmHandler::createParticipant(const ParticipantManagement::Participant &par bool bCreated; switch (partType.typeClass().underlying()) { - case ParticipantManagement::TypeClass_def::Human: + case ParticipantManagement::TypeClass::Human: bCreated = createHuman(participant); break; - case ParticipantManagement::TypeClass_def::GroundVehicle: - case ParticipantManagement::TypeClass_def::VehicleWithGear: - case ParticipantManagement::TypeClass_def::WeaponSystem: + case ParticipantManagement::TypeClass::GroundVehicle: + case ParticipantManagement::TypeClass::VehicleWithGear: + case ParticipantManagement::TypeClass::WeaponSystem: bCreated = createGroundVehicle(participant); break; - case ParticipantManagement::TypeClass_def::SupportEntity: + case ParticipantManagement::TypeClass::SupportEntity: bCreated = createObserverController(participant); break; default: @@ -661,97 +661,97 @@ rpr2::ForceIdentifierEnum8::ET PpmHandler::getRprForceIdentifierFromPpmForceIden { rpr2::ForceIdentifierEnum8::ET eqfi = rpr2::ForceIdentifierEnum8::Other; switch (ppmForceIdentifier.underlying()) { - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_1: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_1: eqfi = rpr2::ForceIdentifierEnum8::Friendly; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_2: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_2: eqfi = rpr2::ForceIdentifierEnum8::Friendly_2; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_3: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_3: eqfi = rpr2::ForceIdentifierEnum8::Friendly_3; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_4: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_4: eqfi = rpr2::ForceIdentifierEnum8::Friendly_4; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_5: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_5: eqfi = rpr2::ForceIdentifierEnum8::Friendly_5; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_6: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_6: eqfi = rpr2::ForceIdentifierEnum8::Friendly_6; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_7: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_7: eqfi = rpr2::ForceIdentifierEnum8::Friendly_7; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_8: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_8: eqfi = rpr2::ForceIdentifierEnum8::Friendly_8; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_9: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_9: eqfi = rpr2::ForceIdentifierEnum8::Friendly_9; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Friendly_10: + case ParticipantManagement::HlaForceIdentifierEnum::Friendly_10: eqfi = rpr2::ForceIdentifierEnum8::Friendly_10; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_1: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_1: eqfi = rpr2::ForceIdentifierEnum8::Opposing; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_2: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_2: eqfi = rpr2::ForceIdentifierEnum8::Opposing_2; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_3: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_3: eqfi = rpr2::ForceIdentifierEnum8::Opposing_3; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_4: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_4: eqfi = rpr2::ForceIdentifierEnum8::Opposing_4; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_5: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_5: eqfi = rpr2::ForceIdentifierEnum8::Opposing_5; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_6: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_6: eqfi = rpr2::ForceIdentifierEnum8::Opposing_6; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_7: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_7: eqfi = rpr2::ForceIdentifierEnum8::Opposing_7; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_8: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_8: eqfi = rpr2::ForceIdentifierEnum8::Opposing_8; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_9: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_9: eqfi = rpr2::ForceIdentifierEnum8::Opposing_9; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Opposing_10: + case ParticipantManagement::HlaForceIdentifierEnum::Opposing_10: eqfi = rpr2::ForceIdentifierEnum8::Opposing_10; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_1: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_1: eqfi = rpr2::ForceIdentifierEnum8::Neutral; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_2: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_2: eqfi = rpr2::ForceIdentifierEnum8::Neutral_2; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_3: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_3: eqfi = rpr2::ForceIdentifierEnum8::Neutral_3; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_4: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_4: eqfi = rpr2::ForceIdentifierEnum8::Neutral_4; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_5: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_5: eqfi = rpr2::ForceIdentifierEnum8::Neutral_5; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_6: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_6: eqfi = rpr2::ForceIdentifierEnum8::Neutral_6; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_7: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_7: eqfi = rpr2::ForceIdentifierEnum8::Neutral_7; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_8: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_8: eqfi = rpr2::ForceIdentifierEnum8::Neutral_8; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_9: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_9: eqfi = rpr2::ForceIdentifierEnum8::Neutral_9; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Neutral_10: + case ParticipantManagement::HlaForceIdentifierEnum::Neutral_10: eqfi = rpr2::ForceIdentifierEnum8::Neutral_10; break; - case ParticipantManagement::HlaForceIdentifierEnum_def::Other: + case ParticipantManagement::HlaForceIdentifierEnum::Other: eqfi = rpr2::ForceIdentifierEnum8::Other; break; } @@ -826,15 +826,15 @@ void PpmHandler::onParticipantHit(const GuezHitStruct &hitStruct) TrainingAreaBase::TabPosition pos; pos.position(hitStruct.position); - pos.reportingSource(Core::PositionReportingSource_def::External); + pos.reportingSource(Core::PositionReportingSource::External); TrainingAreaBase::EquipmentState es; es.equipmentNumber(hitStruct.targetId); es.originatorChargeTypeId(ct.id()); - if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation) + if (hitStruct.originatorType.underlying() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation) { int aesItemId = 0; - if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType_def::AtUnknown) + if (m_dtcAes->aesItemIdFromExternalId(hitStruct.originatorId, aesItemId) == AreaEffectSimulation::AesType::AtUnknown) es.originatorId((hitStruct.originatorId & 0xffff) / 10); else es.originatorId(aesItemId); @@ -963,25 +963,25 @@ bool PpmHandler::onExconInit(int eqNo, rpr2::ResetPlayerEnum8::ET rp, rpr2::Acti }); } - ProjectDataManagement::WphMode helmet = ProjectDataManagement::WphMode_def::NoChange;; - ProjectDataManagement::WphMode vest = ProjectDataManagement::WphMode_def::NoChange; + ProjectDataManagement::WphMode helmet = ProjectDataManagement::WphMode::NoChange;; + ProjectDataManagement::WphMode vest = ProjectDataManagement::WphMode::NoChange; bool bNoChange = false; switch (aho) { case rpr2::ActivateHelmetObservationEnum8::WithoutHelmetWithoutVest: - helmet = ProjectDataManagement::WphMode_def::Without; - vest = ProjectDataManagement::WphMode_def::Without; + helmet = ProjectDataManagement::WphMode::Without; + vest = ProjectDataManagement::WphMode::Without; break; case rpr2::ActivateHelmetObservationEnum8::HelmetWithoutVest: - helmet = ProjectDataManagement::WphMode_def::With; - vest = ProjectDataManagement::WphMode_def::Without; + helmet = ProjectDataManagement::WphMode::With; + vest = ProjectDataManagement::WphMode::Without; break; case rpr2::ActivateHelmetObservationEnum8::HelmetAndVest: - helmet = ProjectDataManagement::WphMode_def::With; - vest = ProjectDataManagement::WphMode_def::With; + helmet = ProjectDataManagement::WphMode::With; + vest = ProjectDataManagement::WphMode::With; break; case rpr2::ActivateHelmetObservationEnum8::NoChange: - helmet = ProjectDataManagement::WphMode_def::NoChange; - vest = ProjectDataManagement::WphMode_def::NoChange; + helmet = ProjectDataManagement::WphMode::NoChange; + vest = ProjectDataManagement::WphMode::NoChange; bNoChange = true; break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp index a25f05ac1..1cb5584e8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/damage_model.cpp @@ -215,35 +215,35 @@ ProjectDataManagement::VulnerabilityState DamageModel::vulnerabilityState(qint64 { int idx = indexForTime(simTimeMSec); if (idx < 0) - return ProjectDataManagement::VulnerabilityState_def::CombatReady; + return ProjectDataManagement::VulnerabilityState::CombatReady; switch (m_tacticalStates.at(idx).tss.TacticalStatus) { case rpr2::TacticalStatusEnum8::CombatReady: - return ProjectDataManagement::VulnerabilityState_def::CombatReady; + return ProjectDataManagement::VulnerabilityState::CombatReady; case rpr2::TacticalStatusEnum8::LightHit: - return ProjectDataManagement::VulnerabilityState_def::LightDamage; + return ProjectDataManagement::VulnerabilityState::LightDamage; case rpr2::TacticalStatusEnum8::MediumHit: - return ProjectDataManagement::VulnerabilityState_def::MediumDamage; + return ProjectDataManagement::VulnerabilityState::MediumDamage; case rpr2::TacticalStatusEnum8::HeavyHit: - return ProjectDataManagement::VulnerabilityState_def::HeavyDamage; + return ProjectDataManagement::VulnerabilityState::HeavyDamage; case rpr2::TacticalStatusEnum8::Immobilized: - return ProjectDataManagement::VulnerabilityState_def::MobilityKill; + return ProjectDataManagement::VulnerabilityState::MobilityKill; case rpr2::TacticalStatusEnum8::ImmobilizedVisible: - return ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill; + return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill; case rpr2::TacticalStatusEnum8::WeaponKill: - return ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage; + return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage; case rpr2::TacticalStatusEnum8::WeaponKillVisible: - return ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage; + return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage; case rpr2::TacticalStatusEnum8::TotalKill: - return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill; + return ProjectDataManagement::VulnerabilityState::CatastrophicKill; case rpr2::TacticalStatusEnum8::TemporaryFailure: - return ProjectDataManagement::VulnerabilityState_def::TemporarySeverance; + return ProjectDataManagement::VulnerabilityState::TemporarySeverance; case rpr2::TacticalStatusEnum8::NearMiss: - return ProjectDataManagement::VulnerabilityState_def::NearMiss; + return ProjectDataManagement::VulnerabilityState::NearMiss; case rpr2::TacticalStatusEnum8::HitWithoutEffect: - return ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect; + return ProjectDataManagement::VulnerabilityState::HitWithNoEffect; } - return ProjectDataManagement::VulnerabilityState_def::CombatReady; + return ProjectDataManagement::VulnerabilityState::CombatReady; } int DamageModel::indexForTime(qint64 simTimeMSec) const diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp index b15bd575f..c13cdbade 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.cpp @@ -1231,33 +1231,33 @@ rpr2::HitResultEnum16::ET NgsConnector::getHitResultEnum(const ProjectDataManage { switch (ts.underlying()) { - case ProjectDataManagement::VulnerabilityState_def::CombatReady: + case ProjectDataManagement::VulnerabilityState::CombatReady: return rpr2::HitResultEnum16::Reset; - case ProjectDataManagement::VulnerabilityState_def::LightDamage: + case ProjectDataManagement::VulnerabilityState::LightDamage: return rpr2::HitResultEnum16::LightDamage; - case ProjectDataManagement::VulnerabilityState_def::MediumDamage: + case ProjectDataManagement::VulnerabilityState::MediumDamage: return rpr2::HitResultEnum16::MediumDamage; - case ProjectDataManagement::VulnerabilityState_def::HeavyDamage: + case ProjectDataManagement::VulnerabilityState::HeavyDamage: return rpr2::HitResultEnum16::HeavyDamage; - case ProjectDataManagement::VulnerabilityState_def::MobilityKill: + case ProjectDataManagement::VulnerabilityState::MobilityKill: return rpr2::HitResultEnum16::MobilityKill; - case ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill: + case ProjectDataManagement::VulnerabilityState::VisibleMobilityKill: return rpr2::HitResultEnum16::MobilityKillVisible; - case ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::WeaponSystemDamage: return rpr2::HitResultEnum16::WeaponDamage; - case ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage: + case ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage: return rpr2::HitResultEnum16::WeaponDamageVisible; - case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::CatastrophicKill: return rpr2::HitResultEnum16::TotalKill; - case ProjectDataManagement::VulnerabilityState_def::TemporarySeverance: + case ProjectDataManagement::VulnerabilityState::TemporarySeverance: return rpr2::HitResultEnum16::TemporaryFailure; - case ProjectDataManagement::VulnerabilityState_def::NearMiss: + case ProjectDataManagement::VulnerabilityState::NearMiss: return rpr2::HitResultEnum16::NearMiss; - case ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect: + case ProjectDataManagement::VulnerabilityState::HitWithNoEffect: return rpr2::HitResultEnum16::HitWithNoEffect; - case ProjectDataManagement::VulnerabilityState_def::NContamination: - case ProjectDataManagement::VulnerabilityState_def::BContamination: - case ProjectDataManagement::VulnerabilityState_def::CContamination: + case ProjectDataManagement::VulnerabilityState::NContamination: + case ProjectDataManagement::VulnerabilityState::BContamination: + case ProjectDataManagement::VulnerabilityState::CContamination: return rpr2::HitResultEnum16::Contaminated; default: return rpr2::HitResultEnum16::Reset; @@ -1270,37 +1270,37 @@ ProjectDataManagement::VulnerabilityState NgsConnector::getTacticalStatusEnum(co switch (hr) { case rpr2::HitResultEnum16::Reset: - return ProjectDataManagement::VulnerabilityState_def::CombatReady; + return ProjectDataManagement::VulnerabilityState::CombatReady; case rpr2::HitResultEnum16::LightDamage: - return ProjectDataManagement::VulnerabilityState_def::LightDamage; + return ProjectDataManagement::VulnerabilityState::LightDamage; case rpr2::HitResultEnum16::MediumDamage: - return ProjectDataManagement::VulnerabilityState_def::MediumDamage; + return ProjectDataManagement::VulnerabilityState::MediumDamage; case rpr2::HitResultEnum16::HeavyDamage: - return ProjectDataManagement::VulnerabilityState_def::HeavyDamage; + return ProjectDataManagement::VulnerabilityState::HeavyDamage; case rpr2::HitResultEnum16::MobilityKill: - return ProjectDataManagement::VulnerabilityState_def::MobilityKill; + return ProjectDataManagement::VulnerabilityState::MobilityKill; case rpr2::HitResultEnum16::MobilityKillVisible: - return ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill; + return ProjectDataManagement::VulnerabilityState::VisibleMobilityKill; case rpr2::HitResultEnum16::WeaponDamage: - return ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage; + return ProjectDataManagement::VulnerabilityState::WeaponSystemDamage; case rpr2::HitResultEnum16::WeaponDamageVisible: - return ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage; + return ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage; case rpr2::HitResultEnum16::TotalKill: - return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill; + return ProjectDataManagement::VulnerabilityState::CatastrophicKill; case rpr2::HitResultEnum16::CheatingKill: - return ProjectDataManagement::VulnerabilityState_def::CatastrophicKill; + return ProjectDataManagement::VulnerabilityState::CatastrophicKill; case rpr2::HitResultEnum16::NearMiss: - return ProjectDataManagement::VulnerabilityState_def::NearMiss; + return ProjectDataManagement::VulnerabilityState::NearMiss; case rpr2::HitResultEnum16::HitWithNoEffect: - return ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect; + return ProjectDataManagement::VulnerabilityState::HitWithNoEffect; case rpr2::HitResultEnum16::Contaminated: - return ProjectDataManagement::VulnerabilityState_def::CContamination; + return ProjectDataManagement::VulnerabilityState::CContamination; case rpr2::HitResultEnum16::TemporaryFailure: - return ProjectDataManagement::VulnerabilityState_def::TemporarySeverance; + return ProjectDataManagement::VulnerabilityState::TemporarySeverance; default: - return ProjectDataManagement::VulnerabilityState_def::NoChange; + return ProjectDataManagement::VulnerabilityState::NoChange; } - return ProjectDataManagement::VulnerabilityState_def::NoChange; + return ProjectDataManagement::VulnerabilityState::NoChange; } QPolygonF NgsConnector::utmToGeogrphic(const QPolygonF &polyUtm, const LtsCoordTrans::UtmCoordinate &base) @@ -1335,10 +1335,10 @@ void NgsConnector::onEntityIdentifierChanged(const rpr2::EntityIdentifierStruct GuezHitStruct hs; - hs.originatorType = ProjectDataManagement::StateChangeOriginator_def::Initialization; + hs.originatorType = ProjectDataManagement::StateChangeOriginator::Initialization; hs.sampleTime = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); hs.targetId = is.entityNumber(); - hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged; + hs.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; QTimer::singleShot(STATUS_WAIT_INTERVAL, this, [this, hs, obj]() mutable { @@ -1619,11 +1619,11 @@ bool NgsConnector::onTacticalStatusChanged(const rpr2::EntityIdentifierStruct &e GuezHitStruct hitStruct; hitStruct.originatorChargeTypeEtsString = TypeStruct::fromDisInt(0).toString(); hitStruct.originatorId = 0; - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown; hitStruct.position = m_observerPositions[is.entityNumber()].toGeoPosition(); hitStruct.sampleTime = simTimeMSecs; hitStruct.targetId = is.entityNumber(); - hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged; + hitStruct.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged; hitStruct.vulnerabilityKind = 0; const auto vulnerabilityBits = m_damageModelMap[is.entityNumber()]->totalState(hitStruct.sampleTime); @@ -1910,31 +1910,31 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac GuezHitStruct hitStruct; hitStruct.originatorChargeTypeEtsString = TypeStruct(interaction.getMunition()).toString(); hitStruct.originatorId = interaction.getOriginatorIdentifier().EntityNumber; - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown; switch (interaction.getOriginatorType()) { case rpr2::OriginatorTypeEnum16::Unknown: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Unknown; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Unknown; break; case rpr2::OriginatorTypeEnum16::NoMedicalTreatment: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Participant; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant; if (hitStruct.originatorId == 0) hitStruct.originatorId = hitStruct.targetId; break; case rpr2::OriginatorTypeEnum16::Participant: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::Participant; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::Participant; if (hitStruct.originatorId == 0) - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::ExerciseControl; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl; break; case rpr2::OriginatorTypeEnum16::AreaEffectSimulation: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::AreaEffectSimulation; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation; hitStruct.originatorId = IdentifierStruct(interaction.getOriginatorIdentifier()).toInt64(); break; case rpr2::OriginatorTypeEnum16::ObserverController: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::ObserverController; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ObserverController; break; case rpr2::OriginatorTypeEnum16::ExerciseControl: - hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator_def::ExerciseControl; + hitStruct.originatorType = ProjectDataManagement::StateChangeOriginator::ExerciseControl; break; } hitStruct.position = ParticipantPosition(interaction.getTargetLocation()).toGeoPosition(); @@ -1945,16 +1945,16 @@ void NgsConnector::onNewGuezHit(const rpr2::IObserverGuezHitIntInstance &interac hitStruct.vulnerabilityState = getTacticalStatusEnum(interaction.getHitResult()); - if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator_def::ExerciseControl || - hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator_def::ObserverController + if ((hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ExerciseControl || + hitStruct.originatorType == ProjectDataManagement::StateChangeOriginator::ObserverController ) - && hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect) + && hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::HitWithNoEffect) { auto ptr = m_damageModelMap.value(eqNo); if (ptr) { hitStruct.vulnerabilityState = ptr->vulnerabilityState(hitStruct.sampleTime); - if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady) + if (hitStruct.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady) ptr->setTacticalStatus(rpr2::HitResultEnum16::Reset, simTimeToMSec(interaction.getReceiveTimeStamp())); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h index ff0b9f6a2..11f771ca2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/HighLevelArchitecture/Hla_test_tool/ngs_connector.h @@ -130,12 +130,12 @@ struct GuezHitStruct { qint32 targetId = 0; qint64 sampleTime = 0; - ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::get_default(); + ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::get_default(); qint32 vulnerabilityKind = 0; qint32 vulnerabilityBits = 0; Core::GeoPosition position = Core::GeoPosition(0, 0, 0); qint64 originatorId = 0; - ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator_def::get_default(); + ProjectDataManagement::StateChangeOriginator originatorType = ProjectDataManagement::StateChangeOriginator::get_default(); QString originatorChargeTypeEtsString; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp index 89d1cab7c..423dcddbf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/aes_handler.cpp @@ -109,7 +109,7 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep ERROR_LOG(m_logger) << "Try send notification0"; m_aesId = replyObject.id(); ProjectDataManagement::EffectSource effectSource - = static_cast(propertiesObject.value(QStringLiteral("effectSource")).toInt()); + = static_cast(propertiesObject.value(QStringLiteral("effectSource")).toInt()); ERROR_LOG(m_logger) << "Try send notification1 " << effectSource; if (effectSource != ProjectDataManagement::EffectSource::ES_ADLER) @@ -178,7 +178,7 @@ void AesHandler::onEffectClusterModifyReply(const Core::FunctionReplyObject &rep addr.isRead(false); const OperatorManagement::User user = m_mainDispatcher->ddsHandler()->dtcOpm()->user(recipientId); addr.name(user.name()); - addr.addressType(NotificationManagement::AddressType_def::Operator); + addr.addressType(NotificationManagement::AddressType::Operator); recipentVec.emplace_back(addr); } req.notification().recipientIds(recipentVec); @@ -252,7 +252,7 @@ void AesHandler::onAirSupportImpactModifyReply(const Core::FunctionReplyObject & void AesHandler::handleCreateSingleExplosion(const TrainingAreaBase::TetraIcd::CreateSingleExplosion &data) { auto strFromObj = QJsonDocument(data.toJson()).toJson(QJsonDocument::Compact); - m_singleExplosions.insert(data.aesDdsId, AreaEffectSimulation::AesEffectState_def::EsCreated); + m_singleExplosions.insert(data.aesDdsId, AreaEffectSimulation::AesEffectState::EsCreated); DEBUG_LOG(m_logger) << "TEST SINGLE EXPLOSION CREATED " << strFromObj; } @@ -958,11 +958,11 @@ QList AesHandler::findAllPendingEffectCluster(int partyId) { if (effectCluster.partyId() != partyId) continue; - if (effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsReceived - && effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsCreated) + if (effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState::EsReceived + && effectCluster.effectStateId() != AreaEffectSimulation::AesEffectState::EsCreated) continue; - if (effectCluster.effectSourceId() != ProjectDataManagement::EffectSource_def::ES_ADLER /*&& - effectCluster.effectSourceId() != ProjectDataManagement::EffectSource_def::ES_ADLER_STANDALONE*/) + if (effectCluster.effectSourceId() != ProjectDataManagement::EffectSource::ES_ADLER /*&& + effectCluster.effectSourceId() != ProjectDataManagement::EffectSource::ES_ADLER_STANDALONE*/) continue; ret.append(effectCluster.id()); @@ -1096,8 +1096,8 @@ void AesHandler::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionS m_singleExplosions.insert(data.id(), data.effectStateId()); return; } - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated - && m_singleExplosions.value(data.id(), AreaEffectSimulation::AesEffectState::EsActivated) != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated + && m_singleExplosions.value(data.id(), AreaEffectSimulation::AesEffectState::EsActivated) != AreaEffectSimulation::AesEffectState::EsActivated) { const auto state = data.effectStateId(); DEBUG_LOG(m_logger) << "----------------- switch state ------------- " << state; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp index a6064c47c..83234e866 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/flm_handler.cpp @@ -173,8 +173,8 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con int prio = s->getInteger(QStringLiteral("NOM/notificationPriority"), 3); DEBUG_LOG(m_logger) << " Setting: NotificationPriority: " << prio; - notif.priority(static_cast(prio)); - notif.processedPriority(NotificationManagement::Priority_def::Low); + notif.priority(static_cast(prio)); + notif.processedPriority(NotificationManagement::Priority::Low); notif.exerciseId(m_exerciseId); for (const auto &userId : m_opmDtc->getOperatorsByOperatorRight(OperatorRights::FileManagementFilesEdit)) @@ -183,7 +183,7 @@ void FlmHandler::createHQNotification(const int partyId, const int folderId, con addr.addressId(userId); addr.isRead(false); addr.name(m_opmDtc->user(userId).name()); - addr.addressType(NotificationManagement::AddressType_def::Operator); + addr.addressType(NotificationManagement::AddressType::Operator); notif.recipientIds().push_back(addr); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp index 56fcf8298..8a59d38a6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/AdlerJson/json_dispatcher.cpp @@ -120,7 +120,7 @@ int JsonDispatcher::getAssetId(const QString &saaName) const for (const auto &currAsset : m_mainDispatcher->asmHandler()->getDtc()->assets()) { - if (currAsset.assetTypeId() != AssetManagement::AssetType_def::AdlerSAA) + if (currAsset.assetTypeId() != AssetManagement::AssetType::AdlerSAA) continue; const auto &dbSaa = saaNameFromProps(currAsset.properties()); @@ -335,7 +335,7 @@ void JsonDispatcher::onSAARegistration(const int wsId, const int partyId, const DEBUG_LOG(m_logger) << "onSAARegistration modifyParty" << " ==> SAA name " << saaName; createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification", "Reconnect to SAA")), - NotificationManagement::MessageType_def::Success, + NotificationManagement::MessageType::Success, NotificationManagement::NotificationType::AdlerNotification, saaName, {}); @@ -357,7 +357,7 @@ void JsonDispatcher::onSAADeregistration(const int wsId, const int partyId) const int assetId = getAssetId(saa->getSAAName()); DEBUG_LOG(m_logger) << "Deregistation from " << saa->getSAAName(); createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification", "SAADeregistration")), - NotificationManagement::MessageType_def::Info, + NotificationManagement::MessageType::Info, NotificationManagement::NotificationType::AdlerNotification, saa->getSAAName(), {}); @@ -424,7 +424,7 @@ void JsonDispatcher::onSAAStatus(const int wsId, const EXStatus &status) } createNotificationRequest(wsId, title, - NotificationManagement::MessageType_def::Success, + NotificationManagement::MessageType::Success, NotificationManagement::NotificationType::AdlerNotification, saa->getSAAName(), {}); @@ -465,7 +465,7 @@ void JsonDispatcher::onSAAExceptionStatus(const int wsId, const TechnischeDaten args << exceptionStatus.beschreibung; createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification","Error Message from SAA")), - NotificationManagement::MessageType_def::Error, + NotificationManagement::MessageType::Error, NotificationManagement::NotificationType::AdlerNotification, content, args); @@ -547,7 +547,7 @@ void JsonDispatcher::sendParticipantInfoNotification(const int wsId, const int p createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification","Loading Point Position Report")), - NotificationManagement::MessageType_def::Info, + NotificationManagement::MessageType::Info, NotificationManagement::NotificationType::AdlerNotification, content, args); @@ -664,7 +664,7 @@ void JsonDispatcher::onSSAEXFIREHALT(const int wsId, const FeuerHaltDaten &feuer } createNotificationRequest(wsId, QString::fromUtf8(tr_lts("Notification","Hold your fire")), - NotificationManagement::MessageType_def::Info, + NotificationManagement::MessageType::Info, NotificationManagement::NotificationType::CombatOrder, saa->getSAAName(), {}); @@ -811,7 +811,7 @@ void JsonDispatcher::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.koordinate.longitude = request.positionTarget().lon() * 180.0 / M_PI; exFlugbahnberechnung.flugbahnberechnungDaten.zielkoordinate.hoehe = request.positionTarget().z(); - exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem = ProjectDataManagement::L26_EffectingSystemType::inner_enum(request.weaponSystemType().underlying() + 1); + exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem = ProjectDataManagement::L26_EffectingSystemType(request.weaponSystemType().underlying() + 1); DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77 weaponSystemType " << request.weaponSystemType().underlying(); DEBUG_LOG(m_logger) << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!77 L26_EffectingSystemType " << exFlugbahnberechnung.flugbahnberechnungDaten.waffensystem; @@ -917,8 +917,8 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId, notif.contentArgs(args); notif.timeStamp(currentTime); notif.expiryTime(expiryTime); - notif.priority(NotificationManagement::Priority_def::High); - notif.processedPriority(NotificationManagement::Priority_def::High); + notif.priority(NotificationManagement::Priority::High); + notif.processedPriority(NotificationManagement::Priority::High); notif.exerciseId(m_mainDispatcher->exerciseId()); const QVector recipientIds = m_mainDispatcher->ddsHandler()->dtcOpm()->getNotificationRecipents(m_mainDispatcher->exerciseId(), @@ -937,7 +937,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId, addr.isRead(false); const OperatorManagement::User user = m_mainDispatcher->ddsHandler()->dtcOpm()->user(recipientId); addr.name(user.name()); - addr.addressType(NotificationManagement::AddressType_def::Operator); + addr.addressType(NotificationManagement::AddressType::Operator); notif.recipientIds().push_back(addr); DEBUG_LOG(m_logger) << "recipientId=" << addr.name() << ", addr.addressId=" << addr.addressId(); @@ -945,7 +945,7 @@ void JsonDispatcher::getCreateNotificationRequestData(const int wsId, NotificationManagement::Address addrSender; addrSender.name(saa->getSAAName().toStdString()); - addrSender.addressType(NotificationManagement::AddressType_def::Service); + addrSender.addressType(NotificationManagement::AddressType::Service); notif.sender(addrSender); data.notification(notif); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp index 5ea0ad2e8..ac1ae2e2c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/from_tab.cpp @@ -105,7 +105,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::Init &data) msg.originatorType = TrainingAreaBase::TetraIcd::OriginatorType::ExerciseControl; msg.tasVitality = 100; msg.vulnerabilityBits = 0; - msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CombatReady; + msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CombatReady; m_sendToDds->rxData(msg); return true; @@ -193,7 +193,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::CesHitRequest &data) msg.chargeTypeId = data.chargeTasCodeDirect; msg.header.equipmentNumber = eqId; msg.header.timeStamp = data.header.timeStamp; - msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CatastrophicKill; + msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CatastrophicKill; msg.originatorId = data.originatorEquipmentNumber; DEBUG_LOG(m_logger) << "sending state change direct (kill) with jamming for eqId " << msg.header.equipmentNumber; @@ -213,7 +213,7 @@ bool FromTab::txData(const TrainingAreaBase::TetraIcd::DemandVulnerabilityStateC const auto &pData = m_dtcPpm->dynamicParticipantData(p); for (const auto &dyn : pData.stateHistory()) { - if (dyn.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CatastrophicKill) + if (dyn.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) { return false; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp index 9aadcec44..ddd74b036 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/UAS/uav_ia_manager.cpp @@ -235,7 +235,7 @@ void UAVInterfaceAdapterManager::start(const ParticipantManagement::UAS &uas, UA msg.originatorType = TrainingAreaBase::TetraIcd::OriginatorType::Initialisation; msg.tasVitality = 100; msg.vulnerabilityBits = 0; - msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::CombatReady; + msg.vulnerabilityState = TrainingAreaBase::TetraIcd::VulnerabilityState::VulnerabilityState_CombatReady; m_sendToDds->rxData(msg); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp index fa440dbc8..ab2904f4b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp @@ -6,6 +6,8 @@ #include "WebSocketInterface/json_keys.h" #include "WebSocketInterface/data_manager.h" +#include + #include #include @@ -42,12 +44,14 @@ LtsWebSocket::AbstractClientMessage *ClientMessageFactory::createMessage(LtsWebS ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : LtsWebSocket::AbstractClientMessage(client, type, typeId, uuid, data) , m_dataManager(dataManager) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} -SendBiteRequest::SendBiteRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} +SendBiteRequest::SendBiteRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) + : ClientMessage(dataManager, client, type, typeId, uuid, data) +{} void SendBiteRequest::process() { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.cpp index 3a8a283f5..3d5423152 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.cpp @@ -108,9 +108,9 @@ PositionMessage::PositionMessage(const PositionMessage::PositionData &data, cons { m_jsonRepresentation.insert(DATA(), QJsonObject({{EQUIP_NO(), data.equipNo}, - {POS_LAT(), data.pos.lat()}, - {POS_LON(), data.pos.lon()}, - {POS_Z(), data.pos.z()}, + {POS_LAT(), data.pos.lat}, + {POS_LON(), data.pos.lon}, + {POS_Z(), data.pos.z}, {LAST_POSITION_UPDATE(), data.gpsTime} })); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/data_manager.cpp index 7c4e49752..fef8b3fca 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/data_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/data_manager.cpp @@ -23,9 +23,9 @@ DataManager::DataManager(MainHandler *mainHandler) LtsWebSocket::ReplyMessage* DataManager::sendBiteRequest(const QString &uuid, int equipNo) { DemandBiteRequest request; - request.equipmentNumbers().push_back(equipNo); - request.withSelfTest(true); - request.requestId(s_requestId++); + request.equipmentNumbers.push_back(equipNo); + request.withSelfTest = true; + request.requestId = s_requestId++; rti::core::SampleIdentity sampleIdentity; m_mainHandler->ftsHandler()->onDemandBiteRequest(sampleIdentity, request); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/websocket_interface_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/websocket_interface_handler.cpp index 82343a9fb..4e15f6992 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/websocket_interface_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/websocket_interface_handler.cpp @@ -7,6 +7,7 @@ #include "WebSocketInterface/Messages/client_message.h" #include "WebSocketInterface/Messages/reply_message.h" #include "settings.h" +#include namespace TrainingAreaBase { @@ -19,6 +20,7 @@ WebSocketInterfaceHandler::WebSocketInterfaceHandler(MainHandler *mainHandler, Q , m_messageFactory(nullptr) , m_dataManager(nullptr) , m_mainHandler(mainHandler) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) { } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp index d64e3d569..e825012f6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp @@ -60,7 +60,7 @@ bool DdsHandler::init(const QStringList &qosFileList) assert(m_dtcPartitionTime.get()); m_dtcPartitionTime->setSubscriberCallback([this](const Core::PartitionTime & data, DataModification) { - m_curMSecSinceEpoch = data.timeStamp(); + m_curMSecSinceEpoch = data.timeStamp; }); // default dts:... diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp index 2f19c2cce..1a9fd61fa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp @@ -3,12 +3,14 @@ #include "exm_handler.h" #include "main_handler.h" +#include namespace TrainingAreaBase { ExmHandler::ExmHandler(MainHandler *mainHandler) - : m_mainHandler(mainHandler) + : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_mainHandler(mainHandler) {} bool ExmHandler::init() @@ -35,7 +37,7 @@ ExerciseManagement::Exercise ExmHandler::exercise(int exerciseId) void ExmHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType) { - if (!data.radioGroupId().is_set() || data.radioGroupId().get() == 0) + if (!data.radioGroupId.is_set() || data.radioGroupId.get() == 0) modType = DataModification::eRemoved; bool bExercise2RadioGroupChanged = false; @@ -44,17 +46,17 @@ void ExmHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Dat case DataModification::eAdded: case DataModification::eModified: { - auto &val = m_exercise2RadioGroup[data.id()]; - if (val != data.radioGroupId().get()) + auto &val = m_exercise2RadioGroup[data.id]; + if (val != data.radioGroupId.get()) { bExercise2RadioGroupChanged = true; - val = data.radioGroupId().get(); + val = data.radioGroupId.get(); } break; } case DataModification::eRemoved: { - auto it = m_exercise2RadioGroup.find(data.id()); + auto it = m_exercise2RadioGroup.find(data.id); if (it != m_exercise2RadioGroup.end()) { bExercise2RadioGroupChanged = true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp index 68b037c95..3ac8b9960 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp @@ -5,6 +5,7 @@ #include #include "main_handler.h" #include "settings.h" +#include #include #include #include @@ -114,8 +115,8 @@ IsmHandler::OpsData IsmHandler::dataFromOpsCode(int ipsCode) void IsmHandler::onInstrumentationAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType) { - if (data.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorIPS && - data.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorIPS) + if (data.mountingPointTypeId != InfrastructureManagement::MountingPointType::IndoorIPS && + data.mountingPointTypeId != InfrastructureManagement::MountingPointType::OutdoorIPS) return; switch (modType) { @@ -127,19 +128,19 @@ void IsmHandler::onInstrumentationAssetChanged(const InfrastructureManagement::I QHashIterator i(m_opsData); while (i.hasNext()) { i.next(); - if ( i.value().assetId == data.id()) + if ( i.value().assetId == data.id) { opsCode = i.value().opsCode; - DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged assetId=" << data.id(); + DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged assetId=" << data.id; break; } } OpsData &d = m_opsData[opsCode]; - d.assetId = data.id(); - d.opsCode = getOpsCodeFromJSon(data.properties()); - d.opsTunnel = getIsOpsTunnel(data.properties()); - d.mountingPointTypeId = data.mountingPointTypeId().underlying(); + d.assetId = data.id; + d.opsCode = getOpsCodeFromJSon(data.properties); + d.opsTunnel = getIsOpsTunnel(data.properties); + d.mountingPointTypeId = static_cast(data.mountingPointTypeId); updateOpsData(d); break; } @@ -149,10 +150,10 @@ void IsmHandler::onInstrumentationAssetChanged(const InfrastructureManagement::I QHashIterator i(m_opsData); while (i.hasNext()) { i.next(); - if ( i.value().assetId == data.id()) + if ( i.value().assetId == data.id) { opsCode = i.value().opsCode; - DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged assetId=" << data.id(); + DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged assetId=" << data.id; break; } } @@ -171,17 +172,17 @@ void IsmHandler::onMountingPointAssetChanged(const InfrastructureManagement::Mou { OpsData opsData; - opsData.opsCode = m_dtcIsm->getOpticalCodeFromAssetId(data.assetId()); - opsData.assetId = data.assetId(); + opsData.opsCode = m_dtcIsm->getOpticalCodeFromAssetId(data.assetId); + opsData.assetId = data.assetId; updateOpsData(opsData, true); break; } case DataModification::eRemoved: - DEBUG_LOG(m_logger) << "onMountingPointAssetChanged Unmount id=" << data.id() - << " assetId=" << data.assetId(); + DEBUG_LOG(m_logger) << "onMountingPointAssetChanged Unmount id=" << data.id + << " assetId=" << data.assetId; - removeOpsAsset(data.assetId()); + removeOpsAsset(data.assetId); break; } } @@ -196,12 +197,12 @@ void IsmHandler::rotateBuildingFootprint(int mseId) return; } InfrastructureManagement::MainStructureElement mse = m_dtcIsm->mainStructureElement(mseId); - TetraIcd::RelativePosition relBldgPosition = m_mainHandler->posHandler()->geographicToRelative(mse.geoPosition()); + TetraIcd::RelativePosition relBldgPosition = m_mainHandler->posHandler()->geographicToRelative(mse.geoPosition); DEBUG_LOG(m_logger) << " mainStructureElements.Rotate id=" << mseId; QTransform matrix; QPolygonF relBuildingFootprintMgrs; - qreal angle = mse.angle(); + qreal angle = mse.angle; matrix.rotate(angle); const QPolygonF relBuildingFootprint = m_relBuildingFootprints.value(mseId); const QPolygonF relBuildingFootprintRotated = matrix.map(relBuildingFootprint); @@ -233,21 +234,21 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M int exerciseId = m_mainHandler->ddsHandler()->getExerciseId(); if ( !m_dtcIsm->isElementAssignedToExercise(data, exerciseId)) { - INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id() << " remove"; + INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id << " remove"; - m_buildingBoundingBoxes.remove(data.id()); - m_relBuildingFootprints.remove(data.id()); - m_relBuildingFootprintsRotated.remove((data.id())); - m_buildingBoundingBoxesMgrs.remove(data.id()); - m_relBuildingFootprintsRotatedMgrs.remove(data.id()); + m_buildingBoundingBoxes.remove(data.id); + m_relBuildingFootprints.remove(data.id); + m_relBuildingFootprintsRotated.remove((data.id)); + m_buildingBoundingBoxesMgrs.remove(data.id); + m_relBuildingFootprintsRotatedMgrs.remove(data.id); - for (const auto &se : data.elements()) + for (const auto &se : data.elements) { - if (se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorIPS && - se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorIPS) + if (se.mountingPointTypeId != InfrastructureManagement::MountingPointType::IndoorIPS && + se.mountingPointTypeId != InfrastructureManagement::MountingPointType::OutdoorIPS) continue; - removeOpsDataByStructureElementId(se.id()); + removeOpsDataByStructureElementId(se.id); } @@ -255,7 +256,7 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M while (iter.hasNext()) { iter.next(); - if (iter.value().mainStructureElementId == data.id()) + if (iter.value().mainStructureElementId == data.id) { DEBUG_LOG(m_logger) << "remove from m_opsData, key=" << iter.key(); iter.remove(); @@ -270,36 +271,36 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M - for (const InfrastructureManagement::StructureElement &se : data.elements()) + for (const InfrastructureManagement::StructureElement &se : data.elements) { - if (se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorIPS && - se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorIPS) + if (se.mountingPointTypeId != InfrastructureManagement::MountingPointType::IndoorIPS && + se.mountingPointTypeId != InfrastructureManagement::MountingPointType::OutdoorIPS) continue; auto it = std::find_if(m_opsData.begin(), m_opsData.end(), [se](const OpsData & d) { - return d.structureElementId == se.id(); + return d.structureElementId == se.id; }); if (it != m_opsData.end()) updateOpsData(it.value()); } - DEBUG_LOG(m_logger) << " mainStructureElements Vor Rotate id=" << data.id(); + DEBUG_LOG(m_logger) << " mainStructureElements Vor Rotate id=" << data.id; QMap mainFootprints = m_dtcIsm->getFootprintsByExerciseId(exerciseId); - if (mainFootprints.contains(data.id())) + if (mainFootprints.contains(data.id)) { - rotateBuildingFootprint(data.id()); + rotateBuildingFootprint(data.id); } break; } case DataModification::eRemoved: - for (const auto &se : data.elements()) + for (const auto &se : data.elements) { - if (se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::IndoorIPS && - se.mountingPointTypeId() != InfrastructureManagement::MountingPointType::OutdoorIPS) + if (se.mountingPointTypeId != InfrastructureManagement::MountingPointType::IndoorIPS && + se.mountingPointTypeId != InfrastructureManagement::MountingPointType::OutdoorIPS) continue; - removeOpsDataByStructureElementId(se.id()); + removeOpsDataByStructureElementId(se.id); } break; } @@ -307,8 +308,8 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M void IsmHandler::onMainFootprintChanged(const InfrastructureManagement::MainFootprint &data, DataModification modType) { - DEBUG_LOG(m_logger) << "onMainFootprintChanged id=" << data.id() - << " size=" << data.elements().size(); + DEBUG_LOG(m_logger) << "onMainFootprintChanged id=" << data.id + << " size=" << data.elements.size(); switch (modType) { @@ -317,22 +318,22 @@ void IsmHandler::onMainFootprintChanged(const InfrastructureManagement::MainFoot { - DEBUG_LOG(m_logger) << "mainStructureElements onMainFootprintChanged id=" << data.id(); + DEBUG_LOG(m_logger) << "mainStructureElements onMainFootprintChanged id=" << data.id; double minX = 0; double maxX = 0; double minY = 0; double maxY = 0; QPolygonF relBuildingFootprint; - relBuildingFootprint.reserve(data.elements().size()); - for (const InfrastructureManagement::FootprintElement &fpElem : data.elements()) + relBuildingFootprint.reserve(data.elements.size()); + for (const InfrastructureManagement::FootprintElement &fpElem : data.elements) { - const Core::RelativePosition &relPos = fpElem.relPosition(); - minX = std::min(minX, relPos.offsetX()); - maxX = std::max(maxX, relPos.offsetX()); - minY = std::min(minY, relPos.offsetY()); - maxY = std::min(maxY, relPos.offsetY()); + const Core::RelativePosition &relPos = fpElem.relPosition; + minX = std::min(minX, relPos.offsetX); + maxX = std::max(maxX, relPos.offsetX); + minY = std::min(minY, relPos.offsetY); + maxY = std::min(maxY, relPos.offsetY); - QPointF point(relPos.offsetX(), relPos.offsetY()); + QPointF point(relPos.offsetX, relPos.offsetY); relBuildingFootprint.append(point); DEBUG_LOG(m_logger) << "relBuildingFootprint.append() " << point.x() << "/" << point.y() << ")"; @@ -349,12 +350,12 @@ void IsmHandler::onMainFootprintChanged(const InfrastructureManagement::MainFoot QPointF boundingBoxBottomRight(maxX + m_distanceIpsToGps, minY - m_distanceIpsToGps); QRectF BoundingBox(boundingBoxTopLeft, boundingBoxBottomRight); - m_buildingBoundingBoxes.insert(data.id(), BoundingBox); + m_buildingBoundingBoxes.insert(data.id, BoundingBox); - m_relBuildingFootprints.insert(data.id(), relBuildingFootprint); + m_relBuildingFootprints.insert(data.id, relBuildingFootprint); for (const QPointF &p : std::as_const(relBuildingFootprint)) DEBUG_LOG(m_logger) << "relBuildingFootprint = " << p.x() << "/" << p.y(); - rotateBuildingFootprint(data.id()); + rotateBuildingFootprint(data.id); break; } case DataModification::eRemoved: @@ -451,24 +452,24 @@ void IsmHandler::updateOpsData(OpsData &data, bool force) if (!force && !m_dtcIsm->isElementAssignedToExercise(mse, exerciseId)) continue; - for (const InfrastructureManagement::StructureElement &se : mse.elements()) + for (const InfrastructureManagement::StructureElement &se : mse.elements) { - if (se.id() == seId) + if (se.id == seId) { data.structureElementId = seId; - data.mainStructureElementId = mse.id(); + data.mainStructureElementId = mse.id; - if (se.path().size() > 1) - data.roomId = se.path().at(se.path().size() - 2); - data.position = se.geoPosition(); - data.position.z(data.position.z() - mse.geoPosition().z()); - m_structure_ElementId2AssetTypeId[seId] = se.mountingPointTypeId().underlying(); + if (se.path.size() > 1) + data.roomId = se.path.at(se.path.size() - 2); + data.position = se.geoPosition; + data.position.z = data.position.z - mse.geoPosition.z; + m_structure_ElementId2AssetTypeId[seId] = static_cast(se.mountingPointTypeId); DEBUG_LOG(m_logger) << "found position for asset " << data.assetId << " with se id " << seId - << " " << data.position.lon() << "/" << data.position.lat() << "/" << data.position.z() - << " name=" << se.name() - << " type=" << se.mountingPointTypeId() + << " " << data.position.lon << "/" << data.position.lat << "/" << data.position.z + << " name=" << se.name + << " type=" << se.mountingPointTypeId << " m_structure_ElementId2AssetTypeId.size()=" << m_structure_ElementId2AssetTypeId.size(); - data.mountingPointTypeId = se.mountingPointTypeId().underlying(); + data.mountingPointTypeId = static_cast(se.mountingPointTypeId); m_opsData[data.opsCode] = data; return; @@ -487,11 +488,11 @@ bool IsmHandler::posInExtendedBuildingFootprint(int mainStructureElementId, cons return false; switch (mountPointTypeId) { - case InfrastructureManagement::MountingPointType_def::OutdoorIPS: + case static_cast(InfrastructureManagement::MountingPointType::OutdoorIPS): DEBUG_LOG(m_logger) << "posInExtendedBuildingFootprint Distance = m_distanceOpsToGps"; distance = m_distanceOpsToGps; break; - case InfrastructureManagement::MountingPointType_def::IndoorIPS: + case static_cast(InfrastructureManagement::MountingPointType::IndoorIPS): DEBUG_LOG(m_logger) << "posInExtendedBuildingFootprint Distance = m_distanceIpsToGps"; distance = m_distanceIpsToGps; break; @@ -516,7 +517,7 @@ bool IsmHandler::posInExtendedBuildingFootprint(int mainStructureElementId, cons return false; - TetraIcd::RelativePosition relBldgPosition = m_mainHandler->posHandler()->geographicToRelative(mse.geoPosition()); + TetraIcd::RelativePosition relBldgPosition = m_mainHandler->posHandler()->geographicToRelative(mse.geoPosition); TetraIcd::RelativePosition relPosition = m_mainHandler->posHandler()->geographicToRelative(position); DEBUG_LOG(m_logger) << "relBldgPosition=" << relBldgPosition.offsetX << "/" << relBldgPosition.offsetY << ", relPosition=" << relPosition.offsetX << "/" << relPosition.offsetY; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp index 363d7292c..85aa58950 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp @@ -178,7 +178,7 @@ bool MainHandler::init(int domainId, int exerciseId) ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed."; return false; } - m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}")); + m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::CorePortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}")); DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler successful."; @@ -199,15 +199,15 @@ ProjectDataManagement::RadioGroup MainHandler::exerciseRadioGroup() const const QMap radioGrps = m_pdmHandler->radioGroups(); for (auto it = radioGrps.begin(); it != radioGrps.end(); ++it) - if (it.value().base_group()) + if (it.value().base_group) return it.value(); return ProjectDataManagement::RadioGroup(); } const auto ex = m_exmHandler->exercise(exerciseId()); - if (ex.radioGroupId().is_set()) - return m_pdmHandler->radioGroup(ex.radioGroupId().get()); + if (ex.radioGroupId.is_set()) + return m_pdmHandler->radioGroup(ex.radioGroupId.get()); return ProjectDataManagement::RadioGroup(); } @@ -252,7 +252,7 @@ TetraIcd::ExerciseEnvironmentData MainHandler::exerciseEnvironmentData() const exData.utmZone = baseCoord.zone; exData.grid = zone.mid(3, 2).toStdString(); exData.utmBand = zone.mid(2, 1).at(0).toLatin1(); - exData.timeZone = m_exerciseData.defaultTimeZone(); + exData.timeZone = m_exerciseData.defaultTimeZone; return exData; } @@ -261,11 +261,11 @@ TetraIcd::ExerciseStateData MainHandler::exerciseStateData() const { TetraIcd::ExerciseStateData exData; - if (m_exerciseData.id() != exerciseId()) + if (m_exerciseData.id != exerciseId()) return exData; - exData.exerciseId = m_exerciseData.id(); - exData.exerciseState = static_cast(m_exerciseData.state().underlying()); + exData.exerciseId = m_exerciseData.id; + exData.exerciseState = static_cast(m_exerciseData.state); return exData; } @@ -279,7 +279,7 @@ TetraIcd::ExerciseEquipmentAssignmentComplete MainHandler::exerciseEquipmentAssi for (const auto &it : exercises) { const ProjectDataManagement::RadioGroup rg = radioGroups.value(it.second); - if (rg.id() == 0) + if (rg.id == 0) { WARNING_LOG(m_logger) << "Got a radio group id " << it.second << " for exercise " << it.first << " but could not find valid data for it - ignoring!"; @@ -287,9 +287,9 @@ TetraIcd::ExerciseEquipmentAssignmentComplete MainHandler::exerciseEquipmentAssi } TrainingAreaBase::TetraIcd::GroupIssiInformation gissi; gissi.exerciseId = it.first; - gissi.serverIssi = rg.issi(); - gissi.broadcastIssi1 = rg.group_issi1(); - gissi.broadcastIssi2 = rg.group_issi2(); + gissi.serverIssi = rg.issi; + gissi.broadcastIssi1 = rg.group_issi1; + gissi.broadcastIssi2 = rg.group_issi2; eeac.groupIssiInformation.push_back(std::move(gissi)); } return eeac; @@ -325,7 +325,7 @@ int MainHandler::domainId() const void MainHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType) { - if (data.id() != exerciseId()) + if (data.id != exerciseId()) return; m_exerciseData = data; @@ -359,9 +359,8 @@ void MainHandler::onConnectionState(const QString &name, bool connectionState) DEBUG_LOG(m_logger) << "Publishing connection states: " << m_ifcConnectionState.size(); TrainingAreaBase::Connections connections; - connections.id(1); - for (auto it = m_ifcConnectionState.cbegin(); it != m_ifcConnectionState.cend(); ++it) - connections.connections().push_back( + connections.id = 1; for (auto it = m_ifcConnectionState.cbegin(); it != m_ifcConnectionState.cend(); ++it) + connections.connections.push_back( TrainingAreaBase::ConnectionState(it.key().toStdString(), it.value())); m_ddsHandler->dtsTab()->publish(connections); @@ -395,9 +394,9 @@ void MainHandler::onDirectMessage(const QByteArray &jsonMessage) QString isOk; for (const ProjectDataManagement::CanComponentString &ccs : qAsConst(m_ccsMap)) { - if (ccs.bitMask() == bitValue) + if (ccs.pdm_bitMask == bitValue) { - name = m_pdmHandler->dtc()->trCanComponentStringName(ccs.id()); + name = m_pdmHandler->dtc()->trCanComponentStringName(ccs.id); break; } } @@ -442,28 +441,24 @@ void MainHandler::onDirectMessage(const QByteArray &jsonMessage) QString text; QJsonObject error = ele.toObject(); ParticipantManagement::BiteError bitError; - bitError.canDeviceNumber(error.value(QStringLiteral("canDeviceNumber")).toInt()); - bitError.errorNumber(error.value(QStringLiteral("errorNumber")).toInt()); - bitError.subdeviceNumber(error.value(QStringLiteral("subdeviceNumber")).toInt()); - bitError.uniqueId(error.value(QStringLiteral("uniqueId")).toInt()); - - if (bitError.subdeviceNumber() != 0) + bitError.canDeviceNumber = error.value(QStringLiteral("canDeviceNumber")).toInt(); bitError.errorNumber = error.value(QStringLiteral("errorNumber")).toInt(); bitError.subdeviceNumber = error.value(QStringLiteral("subdeviceNumber")).toInt(); bitError.uniqueId = error.value(QStringLiteral("uniqueId")).toInt(); + if (bitError.subdeviceNumber != 0) text = (tr("Error: %1 \nComponent: %2 \nSubdev: %3 \nUId: %4 ") .arg(getErrorString(bitError), - getCanDeviceName(bitError.canDeviceNumber()), - getSubDeviceName(bitError.subdeviceNumber())) - .arg(QString::number( bitError.uniqueId(), 16 ).toUpper())); + getCanDeviceName(bitError.canDeviceNumber), + getSubDeviceName(bitError.subdeviceNumber)) + .arg(QString::number( bitError.uniqueId, 16 ).toUpper())); - else if (bitError.canDeviceNumber() != 0) + else if (bitError.canDeviceNumber != 0) text = (tr("Error: %1 \nComponent: %2") .arg(getErrorString(bitError), - getCanDeviceName(bitError.canDeviceNumber()))); + getCanDeviceName(bitError.canDeviceNumber))); WebSocketInterface::Messages::BiteDataMessage::BiteError biteErrorLocal; - biteErrorLocal.deviceId = bitError.canDeviceNumber(); - biteErrorLocal.subDevice = bitError.subdeviceNumber(); - biteErrorLocal.errorNo = bitError.errorNumber(); - biteErrorLocal.uniqueId = bitError.uniqueId(); + biteErrorLocal.deviceId = bitError.canDeviceNumber; + biteErrorLocal.subDevice = bitError.subdeviceNumber; + biteErrorLocal.errorNo = bitError.errorNumber; + biteErrorLocal.uniqueId = bitError.uniqueId; WebSocketInterface::Messages::BiteDataMessage::ErrorText errorT; errorT.lang = QStringLiteral("de_DE"); @@ -483,22 +478,22 @@ void MainHandler::onDirectMessage(const QByteArray &jsonMessage) QString MainHandler::getErrorString(const ParticipantManagement::BiteError &error) const { - const bool subDevice = (error.subdeviceNumber() != 0); + const bool subDevice = (error.subdeviceNumber != 0); for (const ProjectDataManagement::BiteComponentText &bct : m_bctMap) { - if (((subDevice && bct.subDeviceId() == error.subdeviceNumber()) || - (bct.canDeviceId() == error.canDeviceNumber())) && - (bct.errorNumber() == error.errorNumber())) - return m_pdmHandler->dtc()->trBiteComponentTextName(bct.id()); + if (((subDevice && bct.subDeviceId == error.subdeviceNumber) || + (bct.canDeviceId == error.canDeviceNumber)) && + (bct.errorNumber == error.errorNumber)) + return m_pdmHandler->dtc()->trBiteComponentTextName(bct.id); } - return tr("Unknown (%1)").arg(error.errorNumber()); + return tr("Unknown (%1)").arg(error.errorNumber); } QString MainHandler::getCanDeviceName(int id) const { for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap) { - if (ccs.canDeviceId() == id) - return m_pdmHandler->dtc()->trCanComponentStringName(ccs.id()); + if (ccs.canDeviceId == id) + return m_pdmHandler->dtc()->trCanComponentStringName(ccs.id); } return tr("Unknown (%1)").arg(id); } @@ -507,8 +502,8 @@ QString MainHandler::getSubDeviceName(int id) const { for (const ProjectDataManagement::CanComponentString &ccs : m_ccsMap) { - if (ccs.subDeviceId() == id) - return m_pdmHandler->dtc()->trCanComponentStringName(ccs.id()); + if (ccs.subDeviceId == id) + return m_pdmHandler->dtc()->trCanComponentStringName(ccs.id); } return tr("Unknown (%1)").arg(id); } @@ -517,8 +512,8 @@ void MainHandler::onPositionChanged(int equipNo, const ParticipantManagement::Pa { WebSocketInterface::Messages::PositionMessage::PositionData positionData; positionData.equipNo = equipNo; - positionData.pos = pos.pos(); - positionData.gpsTime = pos.sampleTime(); + positionData.pos = pos.pos; + positionData.gpsTime = pos.sampleTime; WebSocketInterface::Messages::PositionMessage *msg = new WebSocketInterface::Messages::PositionMessage(positionData, QUuid::createUuid().toString()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h index 46250a4e8..17d9f9472 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h @@ -98,7 +98,7 @@ private: std::shared_ptr m_dbHandler; std::shared_ptr m_rxHandler; std::shared_ptr m_ftsHandler; - std::shared_ptr m_txHandler; + std::shared_ptr m_txHandler; std::shared_ptr m_aesHandler; std::shared_ptr m_ismHandler; std::shared_ptr m_exmHandler; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp index de7f056e7..9b2a4b0a2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp @@ -6,6 +6,7 @@ #include "main_handler.h" #include +#include namespace TrainingAreaBase { @@ -66,9 +67,9 @@ bool PdmHandler::initializePdm() auto cbTasVulKind = [this](const ProjectDataManagement::VulnerabilityKind &k) { - const int realTasKindId = k.taVulnerabilityKind() & 0x00FFFFFF; - const int realTypeId = (k.taVulnerabilityKind() & 0x00FF0000) >> 16; - const int fallbackTypeId = (k.taVulnerabilityKind() & 0xFF000000) >> 24; + const int realTasKindId = k.taVulnerabilityKind & 0x00FFFFFF; + const int realTypeId = (k.taVulnerabilityKind & 0x00FF0000) >> 16; + const int fallbackTypeId = (k.taVulnerabilityKind & 0xFF000000) >> 24; m_vulnerabilityKinds[realTasKindId] = k; TRACE_LOG(m_logger) << "realTasKindId: " << realTasKindId << ", realTypeId: " << realTypeId << ", fallbackTypeId: " << fallbackTypeId; if (fallbackTypeId) @@ -107,10 +108,10 @@ ProjectDataManagement::GearClass PdmHandler::gearClassFromChargeTypeId(int charg for (const auto &gearType2ChargeType : std::as_const(m_gearTypeChargeTypes)) { - if (gearType2ChargeType.chargeTypeId() == chargeTypeId) + if (gearType2ChargeType.chargeTypeId == chargeTypeId) { - const auto gearType = m_gearTypes.value(gearType2ChargeType.gearTypeId()); - return gearType.gearClassId(); + const auto gearType = m_gearTypes.value(gearType2ChargeType.gearTypeId); + return gearType.gearClassId; } } return ProjectDataManagement::GearClass::GearClass_Unknown; @@ -134,7 +135,7 @@ ProjectDataManagement::BuildingChargeEffect PdmHandler::buildingChargeEffect(int for (const auto &bce : std::as_const(m_buildingChargeEffects)) { - if (bce.chargeTypeId() == chargeTypeId) + if (bce.chargeTypeId == chargeTypeId) return bce; } return {}; @@ -172,7 +173,7 @@ int PdmHandler::vulnerabilityKindId(int tasVulnerabilityKindId, int equipmentNum DEBUG_LOG(m_logger) << "vulnerability type with id " << typeId << " and index " << index << " is using fallback typeId " << fallBackTypeId; } - return it.value().taVulnerabilityKind(); + return it.value().taVulnerabilityKind; } @@ -216,11 +217,11 @@ int PdmHandler::chargeTypeIdFromGearAndChargeTasCode(int gearTasCode, int charge { for (const auto &gearType2ChargeType : std::as_const(m_gearTypeChargeTypes)) { - if (gearType2ChargeType.gearTypeId() == gearTasCode) + if (gearType2ChargeType.gearTypeId == gearTasCode) { - const auto chargeType = m_chargeTypes.value(gearType2ChargeType.chargeTypeId()); - if (chargeType.id() == chargeTasCode) - return chargeType.id(); + const auto chargeType = m_chargeTypes.value(gearType2ChargeType.chargeTypeId); + if (chargeType.id == chargeTasCode) + return chargeType.id; } } } @@ -246,8 +247,8 @@ int PdmHandler::gearTypeIdFromTasGearTasCode(int gearTasCode) for (const auto &gearType : std::as_const(m_gearTypes)) { - if (gearType.tasCode() == gearTasCode) - return gearType.id(); + if (gearType.tasCode == gearTasCode) + return gearType.id; } WARNING_LOG(m_logger) << "Got unmapped training area gear type id " @@ -257,32 +258,32 @@ int PdmHandler::gearTypeIdFromTasGearTasCode(int gearTasCode) int PdmHandler::legacyChargeTypeIgniterType(int chargeTypeId, int igniterTypeId, int igniterFunctionId) { - return m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeTypeId, igniterTypeId, igniterFunctionId).chargeLegacyId(); + return m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeTypeId, igniterTypeId, igniterFunctionId).chargeLegacyId; } double PdmHandler::impactRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->impactRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->impactRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } double PdmHandler::impactEdgeLength(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->impactEdgeLength(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->impactEdgeLength(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } bool PdmHandler::isSmartChargeType(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->isSmart(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->isSmart(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } bool PdmHandler::isIedChargeType(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->isIed(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->isIed(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } bool PdmHandler::isReactivatableChargeType(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->isReactivatable(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->isReactivatable(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } bool PdmHandler::isIndirect(int chargeTypeId) const @@ -291,16 +292,16 @@ bool PdmHandler::isIndirect(int chargeTypeId) const } int PdmHandler::hazardDistance(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->hazardDistance(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->hazardDistance(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } bool PdmHandler::isLaserGuidable(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->isLaserGuidable(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->isLaserGuidable(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } bool PdmHandler::isUasDroppable(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->isUasDroppable(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->isUasDroppable(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp index 526a7fd76..e249efd0c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp @@ -4,6 +4,7 @@ #include "position_handler.h" #include "exm_handler.h" #include "logger.h" +#include #include using namespace TrainingAreaBase; @@ -28,7 +29,7 @@ bool PositionHandler::initCoordinateConversion() const constexpr int ddsTimeout = 10 * 1000; const auto ex = m_mainHandler->exmHandler()->exercise(m_mainHandler->exerciseId()); - if (ex.id() <= 0) + if (ex.id <= 0) { ERROR_LOG(m_logger) << "Can not retrieve exercise information for id " << m_mainHandler->exerciseId(); return false; @@ -38,18 +39,18 @@ bool PositionHandler::initCoordinateConversion() const ERROR_LOG(m_logger) << "Error initializing AssetManagement DTC"; return false; } - const auto ta = m_dtcAsm->trainingArea(ex.trainingAreaId()); - if (ta.id() <= 0) + const auto ta = m_dtcAsm->trainingArea(ex.trainingAreaId); + if (ta.id <= 0) { - ERROR_LOG(m_logger) << "Can not retrieve training are information for id " << ex.trainingAreaId(); + ERROR_LOG(m_logger) << "Can not retrieve training are information for id " << ex.trainingAreaId; return false; } m_dtcAsm.reset(); - const LtsCoordTrans::UtmCoordinate bottomLeft(LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft().lon(), ta.bottomLeft().lat())); - const QPointF mid(bottomLeft.geographic(ta.width() / 2, ta.height() / 2)); + const LtsCoordTrans::UtmCoordinate bottomLeft(LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft.lon, ta.bottomLeft.lat)); + const QPointF mid(bottomLeft.geographic(ta.width / 2, ta.height / 2)); @@ -60,8 +61,8 @@ bool PositionHandler::initCoordinateConversion() const m_utm2Geographic = LtsCoordTrans::UtmCoordinate::fromMgrs(mgrs); LtsCoordTrans::UtmCoordinate topRight(bottomLeft); - topRight.x += ta.width(); - topRight.y += ta.height(); + topRight.x += ta.width; + topRight.y += ta.height; m_relPosBottomLeft = bottomLeft.relativeTo(m_utm2Geographic); m_relPosTopRight = topRight.relativeTo(m_utm2Geographic); @@ -69,8 +70,8 @@ bool PositionHandler::initCoordinateConversion() const NOTICE_LOG(m_logger) << "Training area bottomLeft: " << m_relPosBottomLeft.x() << "," << m_relPosBottomLeft.y() << ", topRight: " << m_relPosTopRight.x() << "," << m_relPosTopRight.y() << ", base point: " << mgrs - << ", width:" << ta.width() - << ", height: " << ta.height(); + << ", width:" << ta.width + << ", height: " << ta.height; return true; } @@ -84,13 +85,13 @@ Core::GeoPosition2D PositionHandler::relativeToGeographic2D(const TetraIcd::Rela { const QPointF point(m_utm2Geographic.geographic(p.offsetX, p.offsetY)); - ret.lon(point.x()); - ret.lat(point.y()); + ret.lon = point.x(); + ret.lat = point.y(); } else { - ret.lon(nan("")); - ret.lat(nan("")); + ret.lon = nan(""); + ret.lat = nan(""); } return ret; } @@ -99,17 +100,17 @@ Core::GeoPosition PositionHandler::relativeToGeographic(const TetraIcd::Relative { const Core::GeoPosition2D pos2d(relativeToGeographic2D(p)); Core::GeoPosition ret; - ret.lon(pos2d.lon()); - ret.lat(pos2d.lat()); - ret.z(p.offsetZ); + ret.lon = pos2d.lon; + ret.lat = pos2d.lat; + ret.z = p.offsetZ; DEBUG_LOG(m_logger) << "x/y -> lon/lat: " << p.offsetX << "," << p.offsetY - << " -> " << ret.lon() * LtsCoordTrans::rad2deg() << "," << ret.lat() * LtsCoordTrans::rad2deg(); + << " -> " << ret.lon * LtsCoordTrans::rad2deg() << "," << ret.lat * LtsCoordTrans::rad2deg(); return ret; } QPointF PositionHandler::geographicToRelativePointF(const Core::GeoPosition2D &p) const { - return geographicToRelativePointF(Core::GeoPosition(p.lon(), p.lat(), 0)); + return geographicToRelativePointF(Core::GeoPosition(p.lon, p.lat, 0)); } QPointF PositionHandler::geographicToRelativePointF(const Core::GeoPosition &p) const @@ -117,21 +118,21 @@ QPointF PositionHandler::geographicToRelativePointF(const Core::GeoPosition &p) initCoordinateConversion(); - const LtsCoordTrans::UtmCoordinate point(LtsCoordTrans::UtmCoordinate::fromGeographic(p.lon(), p.lat(), m_utm2Geographic.zone)); + const LtsCoordTrans::UtmCoordinate point(LtsCoordTrans::UtmCoordinate::fromGeographic(p.lon, p.lat, m_utm2Geographic.zone)); return QPointF(point.x - m_utm2Geographic.x, point.y - m_utm2Geographic.y); } TetraIcd::RelativePosition PositionHandler::geographicToRelative(const Core::GeoPosition2D &p, double z) const { - return geographicToRelative(Core::GeoPosition(p.lon(), p.lat(), z)); + return geographicToRelative(Core::GeoPosition(p.lon, p.lat, z)); } TetraIcd::RelativePosition PositionHandler::geographicToRelative(const Core::GeoPosition &p) const { const QPointF rel(geographicToRelativePointF(p)); - const TetraIcd::RelativePosition ret(qRound(rel.x()), qRound(rel.y()), p.z()); - DEBUG_LOG(m_logger) << "lon/lat -> x/y: " << p.lon() * LtsCoordTrans::rad2deg() << "," << p.lat() * LtsCoordTrans::rad2deg() + const TetraIcd::RelativePosition ret(qRound(rel.x()), qRound(rel.y()), p.z); + DEBUG_LOG(m_logger) << "lon/lat -> x/y: " << p.lon * LtsCoordTrans::rad2deg() << "," << p.lat * LtsCoordTrans::rad2deg() << " -> " << ret.offsetX << "," << ret.offsetY; return ret; } @@ -153,7 +154,7 @@ double PositionHandler::speed (const TetraIcd::RelativePosition &relPos, const i if (deltaTime == 0) return 0.0; - TetraIcd::RelativePosition lastRelPosition = geographicToRelative(lastParticipantPosition.pos.position()); + TetraIcd::RelativePosition lastRelPosition = geographicToRelative(lastParticipantPosition.pos.position); QLineF line(QPointF(lastRelPosition.offsetX, lastRelPosition.offsetY), QPointF(relPos.offsetX, relPos.offsetY)); @@ -191,7 +192,7 @@ TrainingAreaBase::TabPosition PositionHandler::lastPosition(int equipNo) const lastPos = m_lastPosition.value(equipNo); return lastPos.pos; } - ret.position(Core::GeoPosition(nan(""), nan(""), nan(""))); + ret.position = Core::GeoPosition(nan(""), nan(""), nan("")); return ret; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp index ac64d34bf..90be21836 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp @@ -4,12 +4,14 @@ #include "ppm_handler.h" #include "main_handler.h" #include "send_to_tab.h" +#include #include namespace TrainingAreaBase { PpmHandler::PpmHandler(MainHandler *mainHandler) - : m_mainHandler(mainHandler) + : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_mainHandler(mainHandler) , m_equipExerciseMappingTimer(new QTimer(this)) { m_equipExerciseMappingTimer->setSingleShot(true); @@ -46,10 +48,10 @@ void PpmHandler::onParticipantPositionChanged(const ParticipantManagement::Parti if (modType == DataModification::eRemoved) return; - ParticipantManagement::Participant participant = m_ppmDtc->participant(data.participantId()); + ParticipantManagement::Participant participant = m_ppmDtc->participant(data.participantId); int equipNo = 0; - if (participant.equipmentNumber().is_set()) - equipNo = participant.equipmentNumber().get(); + if (participant.equipmentNumber.is_set()) + equipNo = participant.equipmentNumber.get(); if (equipNo > 0) emit position(equipNo, data); @@ -64,15 +66,15 @@ void PpmHandler::onEquipmentExerciseMappingChanged(const ParticipantManagement:: case DataModification::eAdded: case DataModification::eModified: { - std::unordered_set &equipmentNumbers = m_exerciseEquipmentAssignments[data.exerciseId()]; + std::unordered_set &equipmentNumbers = m_exerciseEquipmentAssignments[data.exerciseId]; equipmentNumbers.clear(); - for (const ParticipantManagement::Equipment2ParticipantId &e2p : data.mapping()) - equipmentNumbers.insert(e2p.equipmentNumber()); + for (const ParticipantManagement::Equipment2ParticipantId &e2p : data.mapping) + equipmentNumbers.insert(e2p.equipmentNumber); break; } case DataModification::eRemoved: { - auto it = m_exerciseEquipmentAssignments.find(data.exerciseId()); + auto it = m_exerciseEquipmentAssignments.find(data.exerciseId); if (it != m_exerciseEquipmentAssignments.end()) m_exerciseEquipmentAssignments.erase(it); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h index 9818f70e4..663a33e64 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h @@ -2,7 +2,10 @@ #pragma once +#include #include +#include +#include #include #include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp index 30b6ca2aa..3daedffda 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -17,9 +18,10 @@ namespace TrainingAreaBase -AesStateHandler::AesStateHandler(MainHandler *mainHandler) : m_dbInterface(mainHandler->dbHandler()->db()) - , m_exerciseId(mainHandler->exerciseId()), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} +AesStateHandler::AesStateHandler(MainHandler *mainHandler) + : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_dbInterface(mainHandler->dbHandler()->db()) + , m_exerciseId(mainHandler->exerciseId()) {} template<> @@ -112,6 +114,7 @@ RecvFromDdsAes::RecvFromDdsAes(MainHandler *mainHandler, const std::shared_ptr &txCallback, QObject *parent) : QObject(parent) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) , m_ddsConnector(mainHandler->ddsHandler()->ddsConnector()) , m_txCallback(txCallback) , m_aesStateHandler(new AesStateHandler(mainHandler)) @@ -211,67 +214,67 @@ int RecvFromDdsAes::aesChargeId(int aesId) const { auto it = m_currentBCContaminations.find(aesId); if (it != m_currentBCContaminations.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentExplosionArea.find(aesId); if (it != m_currentExplosionArea.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentExplosionCluster.find(aesId); if (it != m_currentExplosionCluster.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentExplosionSingle.find(aesId); if (it != m_currentExplosionSingle.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentMineArea.find(aesId); if (it != m_currentMineArea.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentNContamination.find(aesId); if (it != m_currentNContamination.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentDusSingleMine.find(aesId); if (it != m_currentDusSingleMine.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentGasPipes.find(aesId); if (it != m_currentGasPipes.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentFunctionalArea.find(aesId); if (it != m_currentFunctionalArea.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentBoobyTraps.find(aesId); if (it != m_currentBoobyTraps.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentOffRouteMines.find(aesId); if (it != m_currentOffRouteMines.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentTechnicalArea.find(aesId); if (it != m_currentTechnicalArea.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } { auto it = m_currentAirSupportImpacts.find(aesId); if (it != m_currentAirSupportImpacts.end()) - return it->second.chargeStruct().chargeTypeId(); + return it->second.chargeStruct.chargeTypeId; } return -1; } @@ -344,18 +347,18 @@ TetraIcd::AreaEffectSimulationType RecvFromDdsAes::aesTypeFromId(int aesId) cons bool RecvFromDdsAes::sendSingleFireSMArt(const SendCesHitRequest &request) { AreaEffectSimulation::ExplosionSingle data; - data.chargeStruct().chargeTypeId(request.chargeTypeId()); - data.effectDuration(1); - data.effectStart(request.effectTime()); - data.id(request.aesId()); - data.impactPosition(request.position().position()); - data.isDeleted(false); - data.participantId(request.participantId()); - data.partyId(request.partyId()); + data.chargeStruct.chargeTypeId = request.chargeTypeId; + data.effectDuration = 1; + data.effectStart = request.effectTime; + data.id = request.aesId; + data.impactPosition = request.position.position; + data.isDeleted = false; + data.participantId = request.participantId; + data.partyId = request.partyId; bool bAlreadyExists = false; - const int aesTetraId = m_aesStateHandler->createAesTetraId(request.aesId(), bAlreadyExists); + const int aesTetraId = m_aesStateHandler->createAesTetraId(request.aesId, bAlreadyExists); if (!bAlreadyExists) { @@ -364,8 +367,8 @@ bool RecvFromDdsAes::sendSingleFireSMArt(const SendCesHitRequest &request) dataChanged(data, bOnlyNameChanged); } - sendCreateEffectSimulation(data, aesTetraId, request.equipmentNumber()); - m_aesStateHandler->update(request.aesId(), aesTetraId, true); + sendCreateEffectSimulation(data, aesTetraId, request.equipmentNumber); + m_aesStateHandler->update(request.aesId, aesTetraId, true); return true; } @@ -375,19 +378,19 @@ bool RecvFromDdsAes::sendSingleFireSMArt(const SendCesHitRequest &request) template void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modType, TetraIcd::AreaEffectSimulationType aesType) { - DEBUG_LOG(m_logger) << "RecvFromDdsAes::handleEffectSimulation(id=" << data.id() + DEBUG_LOG(m_logger) << "RecvFromDdsAes::handleEffectSimulation(id=" << data.id << ", modType: " << static_cast(modType) << ", type=" << static_cast(aesType) - << ", name: " << data.name() - << ", state: " << data.effectStateId() - << ", old state: " << m_currentEffectState.value(data.id()) << ")"; + << ", name: " << data.name + << ", state: " << data.effectStateId + << ", old state: " << m_currentEffectState.value(data.id) << ")"; if (std::is_same::value || std::is_same::value || std::is_same::value ) { - if (m_mainHandler->pdmHandler()->isSmartChargeType(data.chargeStruct())) + if (m_mainHandler->pdmHandler()->isSmartChargeType(data.chargeStruct)) { DEBUG_LOG(m_logger) << "Do not send SMART Single/AreaFire to Tetra as broadcast, hits are send directly."; return; @@ -401,28 +404,28 @@ void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modT case DataModification::eRemoved: { - if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsPaused && - m_currentEffectState.value(data.id()) != AreaEffectSimulation::AesEffectState::EsPaused) + if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsPaused && + m_currentEffectState.value(data.id) != AreaEffectSimulation::AesEffectState::EsPaused) { - const int aesTetraId = m_aesStateHandler->getAesTetraId(data.id()); + const int aesTetraId = m_aesStateHandler->getAesTetraId(data.id); if (aesTetraId <= 0) { handleSendToTetra(data, aesType); } - sendPauseEffectSimulation(data.id()); + sendPauseEffectSimulation(data.id); } - else if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated && - m_currentEffectState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsPaused) + else if (data.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated && + m_currentEffectState.value(data.id) == AreaEffectSimulation::AesEffectState::EsPaused) { sendResumeEffectSimulation(data); } - else if (!data.effectStart().is_set() || - data.effectStart().get() == 0 || - data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved || - data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired) + else if (!data.effectStart.is_set() || + data.effectStart.get() == 0 || + data.effectStateId == AreaEffectSimulation::AesEffectState::EsRemoved || + data.effectStateId == AreaEffectSimulation::AesEffectState::EsExpired) { if (modType == DataModification::eAdded) @@ -434,7 +437,7 @@ void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modT - sendRemoveEffectSimulation(aesType, data.id()); + sendRemoveEffectSimulation(aesType, data.id); resetStartTime(data); } else @@ -442,10 +445,10 @@ void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modT if (!(std::is_same::value) || - (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)) + (data.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)) handleSendToTetra(data, aesType); } - m_currentEffectState[data.id()] = data.effectStateId(); + m_currentEffectState[data.id] = data.effectStateId; break; } } @@ -456,7 +459,7 @@ void RecvFromDdsAes::handleSendToTetra(const T &data, TetraIcd::AreaEffectSimul { bool bAlreadyExists = false; - const int aesTetraId = m_aesStateHandler->createAesTetraId(data.id(), bAlreadyExists); + const int aesTetraId = m_aesStateHandler->createAesTetraId(data.id, bAlreadyExists); bool bOnlyNameChanged = false; @@ -475,15 +478,15 @@ void RecvFromDdsAes::handleSendToTetra(const T &data, TetraIcd::AreaEffectSimul !std::is_same::value) { sendModifyEffectSimulationName(aesType, - m_aesStateHandler->getAesTetraId(data.id()), - data.name(), - data.id()); - m_aesStateHandler->update(data.id(), aesTetraId, true); + m_aesStateHandler->getAesTetraId(data.id), + data.name, + data.id); + m_aesStateHandler->update(data.id, aesTetraId, true); } else if (bSomethingChanged) { sendCreateEffectSimulation(data, aesTetraId); - m_aesStateHandler->update(data.id(), aesTetraId, true); + m_aesStateHandler->update(data.id, aesTetraId, true); } } @@ -513,11 +516,11 @@ void RecvFromDdsAes::onMineAreaChanged(const AreaEffectSimulation::MineArea &dat handleEffectSimulation(data, modType, TetraIcd::AreaEffectSimulationType::MineArea); - auto it = m_temporarySingleMineState.find(data.id()); + auto it = m_temporarySingleMineState.find(data.id); if (it != m_temporarySingleMineState.end()) { onTriggeredImpactsChanged(it->second, DataModification::eModified); - m_temporarySingleMineState.erase(data.id()); + m_temporarySingleMineState.erase(data.id); } } @@ -540,29 +543,29 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg { if (modType == DataModification::eRemoved) return; - if (data.aesTypeId() != AreaEffectSimulation::AesType::AtMineAreaSingleMines) + if (data.aesTypeId != AreaEffectSimulation::AesType::AtMineAreaSingleMines) return; - if (data.aesItemId() == 0) + if (data.aesItemId == 0) return; bool completeUntriggered = true; - for (size_t i = 0; i < data.bitfield().size() && completeUntriggered; ++i) + for (size_t i = 0; i < data.bitfield.size() && completeUntriggered; ++i) { - if ((i + 1) * 8 <= static_cast(data.impactCount())) + if ((i + 1) * 8 <= static_cast(data.impactCount)) { - if (data.bitfield().at(i) != 0xFF) + if (data.bitfield.at(i) != 0xFF) completeUntriggered = false; } else { uint8_t endMask = 0; - for (uint32_t j = 0; j < (static_cast(data.impactCount()) - i * 8); ++j) + for (uint32_t j = 0; j < (static_cast(data.impactCount) - i * 8); ++j) endMask |= 0x80 >> j; - if (data.bitfield().at(i) != endMask) + if (data.bitfield.at(i) != endMask) completeUntriggered = false; } } @@ -570,24 +573,24 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg return; - auto it = m_currentMineArea.find(data.aesItemId()); + auto it = m_currentMineArea.find(data.aesItemId); if (it != m_currentMineArea.end()) { const auto &mineArea = it->second; - if (mineArea.isDus() || mineArea.isConcrete()) + if (mineArea.isDus || mineArea.isConcrete) { - INFO_LOG(m_logger) << "Not publishing mineArea single state for " << data.aesItemId() << " - is a DUS mineArea"; + INFO_LOG(m_logger) << "Not publishing mineArea single state for " << data.aesItemId << " - is a DUS mineArea"; return; } - switch (mineArea.effectStateId().underlying()) + switch (mineArea.effectStateId) { case AreaEffectSimulation::AesEffectState::EsError: case AreaEffectSimulation::AesEffectState::EsExpired: case AreaEffectSimulation::AesEffectState::EsRemoved: case AreaEffectSimulation::AesEffectState::EsUnknown: { - INFO_LOG(m_logger) << "Not publishing mineArea single state for " << data.aesItemId() << " - with state " << AreaEffectSimulation::toString(mineArea.effectStateId()); + INFO_LOG(m_logger) << "Not publishing mineArea single state for " << data.aesItemId << " - with state " << AreaEffectSimulation::toString(mineArea.effectStateId); return; } default: @@ -596,18 +599,18 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg } else { - INFO_LOG(m_logger) << "Storing mineArea single state, as we dont have the corresponding mineArea yet aesId" << data.aesItemId(); - m_temporarySingleMineState[data.aesItemId()] = data; + INFO_LOG(m_logger) << "Storing mineArea single state, as we dont have the corresponding mineArea yet aesId" << data.aesItemId; + m_temporarySingleMineState[data.aesItemId] = data; return; } TetraIcd::MineAreaSingleMineState out; - out.aesDdsId = data.aesItemId(); + out.aesDdsId = data.aesItemId; - out.mineCount = data.impactCount(); - out.mineState.reserve(data.bitfield().size()); - for (const auto &c : data.bitfield()) + out.mineCount = data.impactCount; + out.mineState.reserve(data.bitfield.size()); + for (const auto &c : data.bitfield) out.mineState.push_back(c); txData(out); @@ -618,7 +621,7 @@ void RecvFromDdsAes::onDusMineStateChanged(const AreaEffectSimulation::DusMineSt if (modType == DataModification::eRemoved) return; - const auto &vec = data.mines(); + const auto &vec = data.mines; if (vec.size() == 0) return; @@ -627,26 +630,26 @@ void RecvFromDdsAes::onDusMineStateChanged(const AreaEffectSimulation::DusMineSt { - if (!m_mainHandler->pdmHandler()->isReactivatableChargeType({mine.chargeTypeId(), 0,0})) + if (!m_mainHandler->pdmHandler()->isReactivatableChargeType({mine.chargeTypeId, 0,0})) continue; - if (mine != m_allReactivatableDusMines.value(mine.eqId())) + if (mine != m_allReactivatableDusMines.value(mine.eqId)) { - if (!mine.triggered() && - m_allReactivatableDusMines.contains(mine.eqId()) && m_allReactivatableDusMines.value(mine.eqId()).triggered() + if (!mine.triggered && + m_allReactivatableDusMines.contains(mine.eqId) && m_allReactivatableDusMines.value(mine.eqId).triggered ) - m_minesToSend << mine.eqId(); + m_minesToSend << mine.eqId; - m_allReactivatableDusMines.insert(mine.eqId(), mine); + m_allReactivatableDusMines.insert(mine.eqId, mine); } } if (!m_minesToSend.isEmpty()) m_sendDusMineReactivtionTimer->start(); else - INFO_LOG(m_logger) << "Nothing changed in DusMineState of MineArea: " << data.id(); + INFO_LOG(m_logger) << "Nothing changed in DusMineState of MineArea: " << data.id; } void RecvFromDdsAes::onSendDusMineReactivationTimeout() @@ -655,7 +658,7 @@ void RecvFromDdsAes::onSendDusMineReactivationTimeout() out.dusSerialNumbers.reserve(m_minesToSend.size()); for (const auto &mineId : std::as_const(m_minesToSend)) { - m_allReactivatableDusMines[mineId].triggered(false); + m_allReactivatableDusMines[mineId].triggered = false; out.dusSerialNumbers.push_back(mineId); } m_minesToSend.clear(); @@ -693,19 +696,19 @@ void RecvFromDdsAes::onExplosionClusterChanged(const AreaEffectSimulation::Explo template void setCommonParams(T &out, const S &in, const int aesTetraId) { - out.aesDdsId = in.id(); + out.aesDdsId = in.id; Q_UNUSED(aesTetraId); - out.name = in.name(); - out.partyId = in.partyId().is_set() ? in.partyId().get() : 0; + out.name = in.name; + out.partyId = in.partyId.is_set() ? in.partyId.get() : 0; } template void setCommonCombatParams(T &out, const S &in, const int aesTetraId) { setCommonParams(out, in, aesTetraId); - out.effectStart = in.effectStart().is_set() ? in.effectStart().get() : 0; - out.effectDuration = in.effectDuration(); + out.effectStart = in.effectStart.is_set() ? in.effectStart.get() : 0; + out.effectDuration = in.effectDuration; } @@ -718,27 +721,27 @@ void RecvFromDdsAes::onEffectsChanged(const AreaEffectSimulation::Effects &data, - if (data.aesTypeId().underlying() != AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions) + if (data.aesTypeId != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions) return; - const int aesItemId = data.aesItemId(); + const int aesItemId = data.aesItemId; if (aesItemId <= 0) return; const AreaEffectSimulation::ExplosionCluster &aes = m_dtcAes->explosionCluster(aesItemId); - if (aes.id() != aesItemId) + if (aes.id != aesItemId) return; - const bool bIsLaserGuidable = m_mainHandler->pdmHandler()->isLaserGuidable(aes.chargeStruct()); + const bool bIsLaserGuidable = m_mainHandler->pdmHandler()->isLaserGuidable(aes.chargeStruct); if (!bIsLaserGuidable) return; - const std::vector &singleEffectsRef = data.singleEffects(); + const std::vector &singleEffectsRef = data.singleEffects; if (!singleEffectsRef.empty()) { @@ -762,23 +765,23 @@ void RecvFromDdsAes::onEffectsChanged(const AreaEffectSimulation::Effects &data, const AreaEffectSimulation::SingleEffect &firstSingleEffect = singleEffectsRef.front(); - const Core::GeoPosition &fsePosition = firstSingleEffect.position(); + const Core::GeoPosition &fsePosition = firstSingleEffect.position; cAes.relCorner = m_posHandler->geographicToRelative(fsePosition); - cAes.width = qRound(aes.area().width()); - cAes.height = qRound(aes.area().height()); - cAes.rotationAngle = aes.area().rotation(); - cAes.mhpRotation = aes.mhpRotation(); - cAes.mhpWidth = aes.mhpWidth(); - cAes.mhpLength = aes.mhpLength(); - cAes.impactCount = aes.impactCount(); - cAes.impactEdgeLength = qRound(pdm()->impactEdgeLength(aes.chargeStruct())); - cAes.hazardDistance = m_mainHandler->pdmHandler()->hazardDistance(aes.chargeStruct()); + cAes.width = qRound(aes.area.width); + cAes.height = qRound(aes.area.height); + cAes.rotationAngle = aes.area.rotation; + cAes.mhpRotation = aes.mhpRotation; + cAes.mhpWidth = aes.mhpWidth; + cAes.mhpLength = aes.mhpLength; + cAes.impactCount = aes.impactCount; + cAes.impactEdgeLength = qRound(pdm()->impactEdgeLength(aes.chargeStruct)); + cAes.hazardDistance = m_mainHandler->pdmHandler()->hazardDistance(aes.chargeStruct); std::vector &mhPointsRef = cAes.mhPoints; mhPointsRef.clear(); - mhPointsRef.reserve(aes.mhPoints().size()); - for (const Core::GeoPosition2D &pos : std::as_const(aes.mhPoints())) + mhPointsRef.reserve(aes.mhPoints.size()); + for (const Core::GeoPosition2D &pos : std::as_const(aes.mhPoints)) mhPointsRef.emplace_back(m_posHandler->geographicToRelative(pos, 0)); @@ -795,9 +798,9 @@ void RecvFromDdsAes::onEffectsChanged(const AreaEffectSimulation::Effects &data, void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::AirSupportImpact &aes, int aesTetraId) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionSingle, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionSingle, aes.id); return; } DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(AirSupportImpact, " @@ -807,13 +810,13 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::AirS setCommonCombatParams(cAes, aes, aesTetraId); cAes.header.equipmentNumber = 0; - cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition(), 0); + cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition, 0); - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct().chargeTypeId())); - cAes.chargeTypeId = chargeType.legacyId() > 0 ? chargeType.legacyId() : chargeType.id(); + const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); + cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; - cAes.effectDiameter = qRound(2 * pdm()->impactRadius(aes.chargeStruct())); + cAes.effectDiameter = qRound(2 * pdm()->impactRadius(aes.chargeStruct)); if (cAes.chargeTypeId <= 0) return; @@ -823,33 +826,33 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::AirS void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::BCContamination &aes, int aesTetraId) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::CContamination, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::CContamination, aes.id); return; } DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(BCContamination, " << aesTetraId << ")"; TetraIcd::CreateCContamination cAes; - cAes.expansionFactor = pdm()->dtc()->expansionFactor(aes.chargeStruct().chargeTypeId(), - aes.chargeStruct().igniterTypeId(), - aes.chargeStruct().igniterFunctionId()); + cAes.expansionFactor = pdm()->dtc()->expansionFactor(aes.chargeStruct.chargeTypeId, + aes.chargeStruct.igniterTypeId, + aes.chargeStruct.igniterFunctionId); setCommonCombatParams(cAes, aes, aesTetraId); - cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition(), 0); - cAes.effectRadius = qRound(aes.impactRadius()); - cAes.propagationDirection = aes.propagationDirection(); - cAes.windSpeed = qRound(aes.windSpeed()); - cAes.validityTimeWind = aes.weatherTimestamp(); - cAes.relPositionValidityTimeWind = m_posHandler->geographicToRelative(aes.weatherPosition(), 0); + cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition, 0); + cAes.effectRadius = qRound(aes.impactRadius); + cAes.propagationDirection = aes.propagationDirection; + cAes.windSpeed = qRound(aes.windSpeed); + cAes.validityTimeWind = aes.weatherTimestamp; + cAes.relPositionValidityTimeWind = m_posHandler->geographicToRelative(aes.weatherPosition, 0); - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct().chargeTypeId())); - cAes.chargeTypeId = chargeType.legacyId() > 0 ? chargeType.legacyId() : chargeType.id(); + const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); + cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; - switch (pdm()->dtc()->volatilityTypeId(aes.chargeStruct().chargeTypeId(), - aes.chargeStruct().igniterTypeId(), - aes.chargeStruct().igniterFunctionId()).underlying()) + switch (pdm()->dtc()->volatilityTypeId(aes.chargeStruct.chargeTypeId, + aes.chargeStruct.igniterTypeId, + aes.chargeStruct.igniterFunctionId)) { case ProjectDataManagement::VolatilityType::Floating: cAes.volatility = TetraIcd::CreateCContamination::Volatiliy::Floating; @@ -870,9 +873,9 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::BCCo void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::ExplosionArea &aes, int aesTetraId) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id); return; } DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, " @@ -880,17 +883,17 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl TetraIcd::CreateAreaExplosion cAes; setCommonCombatParams(cAes, aes, aesTetraId); - cAes.relCorner = m_posHandler->geographicToRelative(aes.area().cornerBottomLeft(), 0); - cAes.width = qRound(aes.area().width()); - cAes.height = qRound(aes.area().height()); - cAes.rotationAngle = aes.area().rotation(); - cAes.impactCount = aes.cannonCount() * aes.cannonRounds(); - cAes.impactEdgeLength = qRound(pdm()->impactEdgeLength(aes.chargeStruct())); - cAes.hazardDistance = m_mainHandler->pdmHandler()->hazardDistance(aes.chargeStruct()); + cAes.relCorner = m_posHandler->geographicToRelative(aes.area.cornerBottomLeft, 0); + cAes.width = qRound(aes.area.width); + cAes.height = qRound(aes.area.height); + cAes.rotationAngle = aes.area.rotation; + cAes.impactCount = aes.cannonCount * aes.cannonRounds; + cAes.impactEdgeLength = qRound(pdm()->impactEdgeLength(aes.chargeStruct)); + cAes.hazardDistance = m_mainHandler->pdmHandler()->hazardDistance(aes.chargeStruct); - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct().chargeTypeId())); - cAes.chargeTypeId = chargeType.legacyId() > 0 ? chargeType.legacyId() : chargeType.id(); + const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); + cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; if (cAes.chargeTypeId <= 0) return; @@ -901,7 +904,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::ExplosionCluster &aes, int aesTetraId) { - const bool bIsLaserGuidable = m_mainHandler->pdmHandler()->isLaserGuidable(aes.chargeStruct()); + const bool bIsLaserGuidable = m_mainHandler->pdmHandler()->isLaserGuidable(aes.chargeStruct); DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation " << ", aes " << aes @@ -914,9 +917,9 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl return; } - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id); return; } DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, " @@ -926,25 +929,25 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl setCommonCombatParams(cAes, aes, aesTetraId); - cAes.relCorner = m_posHandler->geographicToRelative(aes.area().cornerBottomLeft(), 0); - cAes.width = qRound(aes.area().width()); - cAes.height = qRound(aes.area().height()); - cAes.rotationAngle = aes.area().rotation(); - cAes.mhpRotation = aes.mhpRotation(); - cAes.mhpWidth = aes.mhpWidth(); - cAes.mhpLength = aes.mhpLength(); - cAes.impactCount = aes.impactCount(); - cAes.impactEdgeLength = qRound(pdm()->impactEdgeLength(aes.chargeStruct())); - cAes.impactRadius = m_mainHandler->pdmHandler()->impactRadius(aes.chargeStruct()); + cAes.relCorner = m_posHandler->geographicToRelative(aes.area.cornerBottomLeft, 0); + cAes.width = qRound(aes.area.width); + cAes.height = qRound(aes.area.height); + cAes.rotationAngle = aes.area.rotation; + cAes.mhpRotation = aes.mhpRotation; + cAes.mhpWidth = aes.mhpWidth; + cAes.mhpLength = aes.mhpLength; + cAes.impactCount = aes.impactCount; + cAes.impactEdgeLength = qRound(pdm()->impactEdgeLength(aes.chargeStruct)); + cAes.impactRadius = m_mainHandler->pdmHandler()->impactRadius(aes.chargeStruct); std::vector &mhPointsRef = cAes.mhPoints; mhPointsRef.clear(); - mhPointsRef.reserve(aes.mhPoints().size()); - for (const Core::GeoPosition2D &pos : std::as_const(aes.mhPoints())) + mhPointsRef.reserve(aes.mhPoints.size()); + for (const Core::GeoPosition2D &pos : std::as_const(aes.mhPoints)) mhPointsRef.emplace_back(m_posHandler->geographicToRelative(pos, 0)); int chargeTypeId = 0; - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct().chargeTypeId())); - chargeTypeId = pdm()->legacyChargeTypeIgniterType(aes.chargeStruct().chargeTypeId(), aes.chargeStruct().igniterTypeId(), aes.chargeStruct().igniterFunctionId()); + const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); + chargeTypeId = pdm()->legacyChargeTypeIgniterType(aes.chargeStruct.chargeTypeId, aes.chargeStruct.igniterTypeId, aes.chargeStruct.igniterFunctionId); @@ -952,7 +955,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl cAes.chargeTypeId = chargeTypeId; else { - cAes.chargeTypeId = chargeType.legacyId() > 0 ? chargeType.legacyId() : chargeType.id(); + cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; } if (cAes.chargeTypeId <= 0) @@ -963,9 +966,9 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::ExplosionSingle &aes, int aesTetraId, int equipmentNumber) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionSingle, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionSingle, aes.id); return; } DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionSingle, " @@ -974,12 +977,12 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl setCommonCombatParams(cAes, aes, aesTetraId); cAes.header.equipmentNumber = equipmentNumber; - cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition(), 0); - cAes.effectDiameter = qRound(2 * pdm()->impactRadius(aes.chargeStruct())); + cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition, 0); + cAes.effectDiameter = qRound(2 * pdm()->impactRadius(aes.chargeStruct)); - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct().chargeTypeId())); - cAes.chargeTypeId = chargeType.legacyId() > 0 ? chargeType.legacyId() : chargeType.id(); + const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); + cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; if (cAes.chargeTypeId <= 0) return; @@ -989,9 +992,9 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::MineArea &aes, int aesTetraId) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::MineArea, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::MineArea, aes.id); return; } DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(MineArea, " @@ -1002,33 +1005,33 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Mine - cAes.layingDepth = aes.width(); - cAes.layingDensity = aes.density(); + cAes.layingDepth = aes.width; + cAes.layingDensity = aes.density; - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct().chargeTypeId())); - cAes.chargeTypeId = chargeType.legacyId() > 0 ? chargeType.legacyId() : chargeType.id(); + const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); + cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; TetraIcd::MineAreaSegment segment; - cAes.segments.reserve(aes.segments().size()); - for (size_t i = 0; i < aes.segments().size(); ++i) + cAes.segments.reserve(aes.segments.size()); + for (size_t i = 0; i < aes.segments.size(); ++i) { - const AreaEffectSimulation::MineSegment &s = aes.segments().at(i); - if (aes.isCenterLine()) + const AreaEffectSimulation::MineSegment &s = aes.segments.at(i); + if (aes.isCenterLine) { - segment.relStart = m_posHandler->geographicToRelative(s.positionStart(), 0); - segment.relEnd = m_posHandler->geographicToRelative(s.positionEnd(), 0); + segment.relStart = m_posHandler->geographicToRelative(s.positionStart, 0); + segment.relEnd = m_posHandler->geographicToRelative(s.positionEnd, 0); } else { - const QPointF relStart = m_posHandler->geographicToRelativePointF(s.positionStart()); - const QPointF relEnd = m_posHandler->geographicToRelativePointF(s.positionEnd()); + const QPointF relStart = m_posHandler->geographicToRelativePointF(s.positionStart); + const QPointF relEnd = m_posHandler->geographicToRelativePointF(s.positionEnd); const QLineF line({relStart.x(), relStart.y()}, {relEnd.x(), relEnd.y()}); DEBUG_LOG(m_logger) << "relStart: x: " << relStart.x() << ", y: " << relStart.y(); DEBUG_LOG(m_logger) << "relEnd: x: " << relEnd.x() << ", y: " << relEnd.y(); QTransform trans; trans.rotate(0-line.angle()); - const QPointF ofs = trans.map(QPointF(aes.width() / 2, 0)); + const QPointF ofs = trans.map(QPointF(aes.width / 2, 0)); DEBUG_LOG(m_logger) << "ofs: x: " << ofs.x() << ", y: " << ofs.y(); segment.relStart.offsetX = qRound(relStart.x() + ofs.y()); @@ -1050,9 +1053,9 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Mine void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::NContamination &aes, int aesTetraId) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::NContamination, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::NContamination, aes.id); return; } DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(NContamination, " @@ -1060,23 +1063,23 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::NCon TetraIcd::CreateNContamination cAes; setCommonCombatParams(cAes, aes, aesTetraId); - cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition(), 0); - cAes.innerRadius = qRound(aes.impactRadius()); - cAes.borderLengthInner = qRound(aes.borderLengthInner()); - cAes.borderLengthOuter = qRound(aes.borderLengthOuter()); - cAes.spanAngle = aes.spanAngle(); - cAes.rotationAngle = aes.rotationAngle(); + cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition, 0); + cAes.innerRadius = qRound(aes.impactRadius); + cAes.borderLengthInner = qRound(aes.borderLengthInner); + cAes.borderLengthOuter = qRound(aes.borderLengthOuter); + cAes.spanAngle = aes.spanAngle; + cAes.rotationAngle = aes.rotationAngle; - cAes.chargeTypeId = aes.chargeStruct().chargeTypeId(); + cAes.chargeTypeId = aes.chargeStruct.chargeTypeId; txData(cAes); } void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::FunctionalArea &aes, int aesTetraId) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::FunctionalArea, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::FunctionalArea, aes.id); return; } DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(FunctionalArea, " @@ -1084,24 +1087,24 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Func TetraIcd::CreateFunctionalArea fAes; setCommonParams(fAes, aes, aesTetraId); - fAes.relEffectPosition = m_posHandler->geographicToRelative(aes.area().cornerBottomLeft(), 0); - fAes.width = qRound(aes.area().width()); - fAes.height = qRound(aes.area().height()); - fAes.deconMode = static_cast(aes.deconMode().underlying()); - fAes.deconTimeout = aes.deconTime(); - fAes.maintenanceMode = static_cast(aes.maintMode().underlying()); - fAes.maintenanceTimeout = aes.maintTime(); - fAes.medicalMode = static_cast(aes.medicMode().underlying()); - fAes.medicalTimeout = aes.medicTime(); + fAes.relEffectPosition = m_posHandler->geographicToRelative(aes.area.cornerBottomLeft, 0); + fAes.width = qRound(aes.area.width); + fAes.height = qRound(aes.area.height); + fAes.deconMode = static_cast(aes.deconMode); + fAes.deconTimeout = aes.deconTime; + fAes.maintenanceMode = static_cast(aes.maintMode); + fAes.maintenanceTimeout = aes.maintTime; + fAes.medicalMode = static_cast(aes.medicMode); + fAes.medicalTimeout = aes.medicTime; txData(fAes); } void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::TechnicalArea &aes, int aesTetraId) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::TechnicalArea, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::TechnicalArea, aes.id); return; } @@ -1109,22 +1112,22 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Tech << aesTetraId << ")"; TetraIcd::TechnicalArea fAes; - fAes.aesDdsId = aes.id(); + fAes.aesDdsId = aes.id; - fAes.name = aes.name(); - fAes.taType = static_cast(aes.type().underlying()); - fAes.relCorner = m_posHandler->geographicToRelative(aes.area().cornerBottomLeft(), 0); - fAes.width = qRound(aes.area().width()); - fAes.height = qRound(aes.area().height()); + fAes.name = aes.name; + fAes.taType = static_cast(aes.type); + fAes.relCorner = m_posHandler->geographicToRelative(aes.area.cornerBottomLeft, 0); + fAes.width = qRound(aes.area.width); + fAes.height = qRound(aes.area.height); txData(fAes); } void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::DusSingleMine &aes, int aesTetraId) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::DusSingleMineSimulator, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::DusSingleMineSimulator, aes.id); return; } DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(DusSingleMine, " @@ -1132,13 +1135,13 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::DusS TetraIcd::CreateDusSingleMine dAes; setCommonParams(dAes, aes, aesTetraId); - dAes.relEffectPosition = m_posHandler->geographicToRelative(aes.position(), 0); - dAes.effectStart = aes.effectStart().get(); - dAes.effectDuration = aes.effectDuration(); - dAes.mineId = aes.mineId(); + dAes.relEffectPosition = m_posHandler->geographicToRelative(aes.position, 0); + dAes.effectStart = aes.effectStart.get(); + dAes.effectDuration = aes.effectDuration; + dAes.mineId = aes.mineId; - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct().chargeTypeId())); - dAes.chargeTypeId = chargeType.legacyId() > 0 ? chargeType.legacyId() : chargeType.id(); + const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); + dAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; txData(dAes); } @@ -1242,15 +1245,15 @@ void RecvFromDdsAes::sendPauseEffectSimulation(int aesDdsId) template<> void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::ExplosionArea &aes) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id); return; } - const int aesDdsId = aes.id(); + const int aesDdsId = aes.id; if (aesDdsId == 0) return; - const int aesTetraId = m_aesStateHandler->getAesTetraId(aes.id()); + const int aesTetraId = m_aesStateHandler->getAesTetraId(aes.id); if (aesTetraId == 0) { DEBUG_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId ; @@ -1265,15 +1268,15 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl << ", tetraId=" << aesTetraId << ")"; TetraIcd::ResumeEffectSimulation dAes; - dAes.aesDdsId = aes.id(); + dAes.aesDdsId = aes.id; - dAes.sequelNumber = AreaEffectSimulation::Polygons::getSequelNumber(aes.id(), - aes.cannonCount() * aes.cannonRounds(), - aes.originalEffectDuration(), - aes.effectDuration()); - dAes.nextImpact = aes.remainExplosionNumber(); - dAes.resumeTime = aes.effectStart().is_set() ? aes.effectStart().get() : 0; - dAes.remainDuration = aes.effectDuration(); + dAes.sequelNumber = AreaEffectSimulation::Polygons::getSequelNumber(aes.id, + aes.cannonCount * aes.cannonRounds, + aes.originalEffectDuration, + aes.effectDuration); + dAes.nextImpact = aes.remainExplosionNumber; + dAes.resumeTime = aes.effectStart.is_set() ? aes.effectStart.get() : 0; + dAes.remainDuration = aes.effectDuration; txData(dAes); } @@ -1282,15 +1285,15 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl template<> void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::ExplosionCluster &aes) { - if (aes.isCentral()) + if (aes.isCentral) { - sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id()); + sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationType::ExplosionArea, aes.id); return; } - const int aesDdsId = aes.id(); + const int aesDdsId = aes.id; if (aesDdsId == 0) return; - const int aesTetraId = m_aesStateHandler->getAesTetraId(aes.id()); + const int aesTetraId = m_aesStateHandler->getAesTetraId(aes.id); if (aesTetraId == 0) { WARNING_LOG(m_logger) << "Could not find a valid tetra id for aes dds id " << aesDdsId ; @@ -1305,15 +1308,15 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl << ", tetraId=" << aesTetraId << ")"; TetraIcd::ResumeEffectSimulation dAes; - dAes.aesDdsId = aes.id(); + dAes.aesDdsId = aes.id; - dAes.sequelNumber = AreaEffectSimulation::Polygons::getSequelNumber(aes.id(), - aes.impactCount(), - aes.originalEffectDuration(), - aes.effectDuration()); - dAes.nextImpact = aes.remainExplosionNumber(); - dAes.resumeTime = aes.effectStart().is_set() ? aes.effectStart().get() : 0; - dAes.remainDuration = aes.effectDuration(); + dAes.sequelNumber = AreaEffectSimulation::Polygons::getSequelNumber(aes.id, + aes.impactCount, + aes.originalEffectDuration, + aes.effectDuration); + dAes.nextImpact = aes.remainExplosionNumber; + dAes.resumeTime = aes.effectStart.is_set() ? aes.effectStart.get() : 0; + dAes.remainDuration = aes.effectDuration; txData(dAes); } @@ -1355,7 +1358,7 @@ void RecvFromDdsAes::resetAllDusMines() QTimer::singleShot(300, this, [this]() { for (AreaEffectSimulation::DusMine &mine : m_allReactivatableDusMines) - mine.triggered(false); + mine.triggered = false; m_minesToSend.clear(); connect(m_sendDusMineReactivtionTimer, &QTimer::timeout, this, &RecvFromDdsAes::onSendDusMineReactivationTimeout); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h index 17fd4f49a..6e32ec2f3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h @@ -51,7 +51,8 @@ public: } private: - + + NGL::INGLLogger &m_logger; QMap m_tetraId2ddsId; QMap m_ddsId2TetraId; QSet m_aesInTetraAvailable; @@ -149,8 +150,7 @@ private: void doSpecialization(const AreaEffectSimulation::ExplosionArea &data, std::unordered_map &cont) { - cont[data.id()].remainExplosionNumber(data.remainExplosionNumber()); - } + cont[data.id].remainExplosionNumber = data.remainExplosionNumber; } template void doSpecialization(const T &data, std::unordered_map &cont) { @@ -161,20 +161,18 @@ private: bool dataChanged(const T &data, std::unordered_map &cont, bool &onlyNameChanged) { onlyNameChanged = false; - auto it = cont.find(data.id()); + auto it = cont.find(data.id); T dataTmp(data); - dataTmp.sampleTime(0); - + dataTmp.sampleTime = 0; if (it == cont.end()) { - cont.emplace(std::make_pair(data.id(), std::move(dataTmp))); + cont.emplace(std::make_pair(data.id, std::move(dataTmp))); DEBUG_LOG(m_logger) << "new AES Item: " << data; return true; } - it->second.effectStateId(data.effectStateId()); - + it->second.effectStateId = data.effectStateId; doSpecialization(data, cont); @@ -186,9 +184,7 @@ private: T tmp(it->second); - tmp.name(data.name()); - tmp.sampleTime(data.sampleTime()); - onlyNameChanged = (tmp == data); + tmp.name = data.name; tmp.sampleTime = data.sampleTime; onlyNameChanged = (tmp == data); std::swap(it->second, dataTmp); @@ -207,15 +203,13 @@ private: { AreaEffectSimulation::ExplosionArea copy(current); - copy.remainExplosionNumber(0); - return dataChanged(copy, m_currentExplosionArea, onlyNameChanged); + copy.remainExplosionNumber = 0; return dataChanged(copy, m_currentExplosionArea, onlyNameChanged); } bool dataChanged(const AreaEffectSimulation::ExplosionCluster ¤t, bool &onlyNameChanged) { AreaEffectSimulation::ExplosionCluster copy(current); - copy.remainExplosionNumber(0); - return dataChanged(copy, m_currentExplosionCluster, onlyNameChanged); + copy.remainExplosionNumber = 0; return dataChanged(copy, m_currentExplosionCluster, onlyNameChanged); } bool dataChanged(const AreaEffectSimulation::ExplosionSingle ¤t, bool &onlyNameChanged) @@ -270,60 +264,59 @@ private: auto it = cont.find(aesDdsId); if (it == cont.end()) return; - it->second.effectStart(0); - } + it->second.effectStart = 0; } void resetStartTime(const AreaEffectSimulation::AirSupportImpact ¤t) { - resetStartTime(current.id(), m_currentBCContaminations); + resetStartTime(current.id, m_currentBCContaminations); } void resetStartTime(const AreaEffectSimulation::BCContamination ¤t) { - resetStartTime(current.id(), m_currentBCContaminations); + resetStartTime(current.id, m_currentBCContaminations); } void resetStartTime(const AreaEffectSimulation::ExplosionArea ¤t) { - resetStartTime(current.id(), m_currentExplosionArea); + resetStartTime(current.id, m_currentExplosionArea); } void resetStartTime(const AreaEffectSimulation::ExplosionCluster ¤t) { - resetStartTime(current.id(), m_currentExplosionCluster); + resetStartTime(current.id, m_currentExplosionCluster); } void resetStartTime(const AreaEffectSimulation::ExplosionSingle ¤t) { - resetStartTime(current.id(), m_currentExplosionSingle); + resetStartTime(current.id, m_currentExplosionSingle); } void resetStartTime(const AreaEffectSimulation::MineArea ¤t) { - resetStartTime(current.id(), m_currentMineArea); + resetStartTime(current.id, m_currentMineArea); } void resetStartTime(const AreaEffectSimulation::NContamination ¤t) { - resetStartTime(current.id(), m_currentNContamination); + resetStartTime(current.id, m_currentNContamination); } void resetStartTime(const AreaEffectSimulation::FunctionalArea ¤t) { - resetStartTime(current.id(), m_currentFunctionalArea); + resetStartTime(current.id, m_currentFunctionalArea); } void resetStartTime(const AreaEffectSimulation::TechnicalArea ¤t) { - resetStartTime(current.id(), m_currentTechnicalArea); + resetStartTime(current.id, m_currentTechnicalArea); } void resetStartTime(const AreaEffectSimulation::DusSingleMine ¤t) { - resetStartTime(current.id(), m_currentDusSingleMine); + resetStartTime(current.id, m_currentDusSingleMine); } void resetStartTime(const AreaEffectSimulation::GasPipe ¤t) { - resetStartTime(current.id(), m_currentGasPipes); + resetStartTime(current.id, m_currentGasPipes); } void resetStartTime(const AreaEffectSimulation::BoobyTrap ¤t) { - resetStartTime(current.id(), m_currentBoobyTraps); + resetStartTime(current.id, m_currentBoobyTraps); } void resetStartTime(const AreaEffectSimulation::OffRouteMine ¤t) { - resetStartTime(current.id(), m_currentOffRouteMines); + resetStartTime(current.id, m_currentOffRouteMines); } std::shared_ptr pdm(); @@ -342,6 +335,7 @@ private: void onSendDusMineReactivationTimeout(); private: + NGL::INGLLogger &m_logger; std::unordered_map m_currentAirSupportImpacts; std::unordered_map m_currentBCContaminations; std::unordered_map m_currentExplosionArea; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp index 50433ccdd..e98789f50 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp @@ -62,104 +62,104 @@ RecvFromDdsFts::RecvFromDdsFts(MainHandler *mainHandler, const std::shared_ptrtxData(data)) bRet = false; } - m_ftsTab->demandBiteReply(cookie, fillFro(request.requestId(), bRet)); + m_ftsTab->demandBiteReply(cookie, fillFro(request.requestId, bRet)); } void RecvFromDdsFts::onDemandInitRequest(const rti::core::SampleIdentity &cookie, const DemandInitRequest &request) { TetraIcd::Init data; - data.workstationId = request.workstationId(); - data.resetManipulation = request.resetManipulation(); - data.resetVulnerabilityState = request.resetVulnerabilityState(); - data.restockCharges = request.restockCharges(); - data.restockSanitationMaterial = request.restockSanitationMaterial(); + data.workstationId = request.workstationId; + data.resetManipulation = request.resetManipulation; + data.resetVulnerabilityState = request.resetVulnerabilityState; + data.restockCharges = request.restockCharges; + data.restockSanitationMaterial = request.restockSanitationMaterial; bool bRet = true; // TODO: fixme - for (const int equipNo : request.equipmentNumbers()) + for (const int equipNo : request.equipmentNumbers) { data.header.equipmentNumber = equipNo; if (!m_txCallback->txData(data)) bRet = false; } - m_ftsTab->demandInitReply(cookie, fillFro(request.requestId(), bRet)); + m_ftsTab->demandInitReply(cookie, fillFro(request.requestId, bRet)); } void RecvFromDdsFts::onSendSetVulnerabilityModelRequest(const rti::core::SampleIdentity &cookie, const SendSetVulnerabilityModelRequest &request) { TetraIcd::SetVulnerabilityModel data; - data.header.equipmentNumber = request.equipmentNumber(); - data.vulnerabilityModelMineIed = request.vulnerabilityModelMineIed(); - data.vulnerabilityModelAreaFire = request.vulnerabilityModelAreaFire(); - data.vulnerabilityModelOperatingResource = request.vulnerabilityModelOperationalResource(); - data.vulnerabilityModelAcWeaponry = request.vulnerabilityModelACWeaponry(); + data.header.equipmentNumber = request.equipmentNumber; + data.vulnerabilityModelMineIed = request.vulnerabilityModelMineIed; + data.vulnerabilityModelAreaFire = request.vulnerabilityModelAreaFire; + data.vulnerabilityModelOperatingResource = request.vulnerabilityModelOperationalResource; + data.vulnerabilityModelAcWeaponry = request.vulnerabilityModelACWeaponry; - m_ftsTab->sendSetVulnerabilityModelReply(cookie, fillFro(request.participantId(), m_txCallback->txData(data))); + m_ftsTab->sendSetVulnerabilityModelReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } void RecvFromDdsFts::onDemandConfigurationReportRequest(const rti::core::SampleIdentity &cookie, const DemandConfigurationReportRequest &request) { TetraIcd::DemandEquipmentConfigurationReport data; - data.header.equipmentNumber = request.equipmentNumber(); + data.header.equipmentNumber = request.equipmentNumber; - m_ftsTab->demandConfigurationReportReply(cookie, fillFro(request.participantId(), m_txCallback->txData(data))); + m_ftsTab->demandConfigurationReportReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } void RecvFromDdsFts::onDemandVulnerabilityStateChangeRequest(const rti::core::SampleIdentity &cookie, const DemandVulnerabilityStateChangeRequest &request) { TetraIcd::DemandVulnerabilityStateChange data; - data.reqestedState = static_cast(request.vulnerabilityState().underlying()); - data.workstationId = request.workstationId(); - data.vulnerabilityVitalityIndex = getVulnerabilityVitalityIndexFromVitalityAndVba(request.vulnerabilityKind(), request.vitality()); + data.reqestedState = static_cast(request.vulnerabilityState); + data.workstationId = request.workstationId; + data.vulnerabilityVitalityIndex = getVulnerabilityVitalityIndexFromVitalityAndVba(request.vulnerabilityKind, request.vitality); bool bRet = true; // TODO: fixme - for (const int equipNo : request.equipmentNumbers()) + for (const int equipNo : request.equipmentNumbers) { data.header.equipmentNumber = equipNo; if (!m_txCallback->txData(data)) bRet = false; } - m_ftsTab->demandVulnerabilityStateChangeReply(cookie, fillFro(request.requestId(), bRet)); + m_ftsTab->demandVulnerabilityStateChangeReply(cookie, fillFro(request.requestId, bRet)); } void RecvFromDdsFts::onSendLanguageSelectionRequest(const rti::core::SampleIdentity &cookie, const SendLanguageSelectionRequest &request) { TetraIcd::LanguageSelection data; - data.header.equipmentNumber = request.equipmentNumber(); - data.languageSelection = static_cast(request.language().underlying()); + data.header.equipmentNumber = request.equipmentNumber; + data.languageSelection = static_cast(request.language); - m_ftsTab->sendLanguageSelectionReply(cookie, fillFro(request.participantId(), m_txCallback->txData(data))); + m_ftsTab->sendLanguageSelectionReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdentity &cookie, const SendEquipmentMessageRequest &request) { - if (request.sender().is_set() && - request.subject().is_set() && - request.message().is_set()) + if (request.sender.is_set() && + request.subject.is_set() && + request.message.is_set()) { // Message to O/C TetraIcd::EquipmentMessageOC data; - data.senderId = request.sender().get(); - data.subject = request.subject().get(); - data.message = request.message().get(); + data.senderId = request.sender.get(); + data.subject = request.subject.get(); + data.message = request.message.get(); data.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); bool bRet = true; // TODO: fixme - for (const int equipNo : request.equipmentNumbers()) + for (const int equipNo : request.equipmentNumbers) { data.header.equipmentNumber = equipNo; data.receiverId = equipNo; @@ -172,10 +172,10 @@ void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdenti else { TetraIcd::EquipmentMessage data; - if (request.messageId().is_set()) - data.msgId = request.messageId().get(); - else if (request.message().is_set()) - data.message = request.message().get(); + if (request.messageId.is_set()) + data.msgId = request.messageId.get(); + else if (request.message.is_set()) + data.message = request.message.get(); else { m_ftsTab->sendEquipmentMessageReply(cookie, fillFro(0, false)); @@ -184,14 +184,14 @@ void RecvFromDdsFts::onSendEquipmentMessageRequest(const rti::core::SampleIdenti } bool bRet = true; // TODO: fixme - for (const int equipNo : request.equipmentNumbers()) + for (const int equipNo : request.equipmentNumbers) { data.header.equipmentNumber = equipNo; if (!m_txCallback->txData(data)) bRet = false; } - m_ftsTab->sendEquipmentMessageReply(cookie, fillFro(request.requestId(), bRet)); + m_ftsTab->sendEquipmentMessageReply(cookie, fillFro(request.requestId, bRet)); } } @@ -199,82 +199,82 @@ void RecvFromDdsFts::onSendOcDataRequest(const rti::core::SampleIdentity &cookie { TetraIcd::OpaquePayloadDataOut data; data.payloadType = TetraIcd::OpaquePayloadDataBase::Type::OC; - data.header.equipmentNumber = request.equipmentNumber(); - data.payload = request.payload(); + data.header.equipmentNumber = request.equipmentNumber; + data.payload = request.payload; - m_ftsTab->sendOcDataReply(cookie, fillFro(request.participantId(), m_txCallback->txData(data))); + m_ftsTab->sendOcDataReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendFireSmokeMarkerDataRequest(const rti::core::SampleIdentity &cookie, const SendFireSmokeMarkerDataRequest &request) { TetraIcd::OpaquePayloadDataOut data; data.payloadType = TetraIcd::OpaquePayloadDataBase::Type::FireSmokeMarker; - data.header.equipmentNumber = request.equipmentNumber(); - data.payload = request.payload(); + data.header.equipmentNumber = request.equipmentNumber; + data.payload = request.payload; - m_ftsTab->sendFireSmokeMarkerDataReply(cookie, fillFro(request.participantId(), m_txCallback->txData(data))); + m_ftsTab->sendFireSmokeMarkerDataReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendGeopairingDataRequest(const rti::core::SampleIdentity &cookie, const SendGeopairingDataRequest &request) { TetraIcd::OpaquePayloadDataOut data; data.payloadType = TetraIcd::OpaquePayloadDataBase::Type::Geopairing; - data.header.equipmentNumber = request.equipmentNumber(); - data.payload = request.payload(); + data.header.equipmentNumber = request.equipmentNumber; + data.payload = request.payload; - m_ftsTab->sendGeopairingDataReply(cookie, fillFro(request.participantId(), m_txCallback->txData(data))); + m_ftsTab->sendGeopairingDataReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendTargetDataRequest(const rti::core::SampleIdentity &cookie, const SendTargetDataRequest &request) { TetraIcd::OpaquePayloadDataOut data; data.payloadType = TetraIcd::OpaquePayloadDataBase::Type::Target; - data.header.equipmentNumber = request.equipmentNumber(); - data.payload = request.payload(); + data.header.equipmentNumber = request.equipmentNumber; + data.payload = request.payload; - m_ftsTab->sendTargetDataReply(cookie, fillFro(request.participantId(), m_txCallback->txData(data))); + m_ftsTab->sendTargetDataReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendCesHitInformationRequest(const rti::core::SampleIdentity &cookie, const SendCesHitInformation &request) { TetraIcd::CesHitInformation data; - data.header.equipmentNumber = request.equipmentNumber(); - data.header.timeStamp = request.effectTime(); - data.originatorEquipmentNumber = request.originatorEquipmentNumber(); - const auto &ct = m_mainHandler->pdmHandler()->chargeTypeFromId(request.chargeTypeId()); - data.chargeTasCodeDirect = ct.id(); - data.chargeTasCodeIndirect = ct.id(); - data.directionDegree = request.directionDegree(); - data.distance = request.distanceToOrignator(); - data.effectPercent = request.effectPercent(); + data.header.equipmentNumber = request.equipmentNumber; + data.header.timeStamp = request.effectTime; + data.originatorEquipmentNumber = request.originatorEquipmentNumber; + const auto &ct = m_mainHandler->pdmHandler()->chargeTypeFromId(request.chargeTypeId); + data.chargeTasCodeDirect = ct.id; + data.chargeTasCodeIndirect = ct.id; + data.directionDegree = request.directionDegree; + data.distance = request.distanceToOrignator; + data.effectPercent = request.effectPercent; - m_ftsTab->sendCesHitInformationReply(cookie, fillFro(request.participantId(), m_txCallback->txData(data))); + m_ftsTab->sendCesHitInformationReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie, const SendCesHitRequest &request) { - DEBUG_LOG(m_logger) << "onSendCesHitRequest: " << request.equipmentNumber() << " - " << request.effectTime() - << " request.chargeTypeId=" << request.chargeTypeId() - << " request.eventType()=" << request.eventType() - << " request.aesId()=" << request.aesId() - << " aesTypeFromId=" << m_mainHandler->aesHandler()->aesTypeFromId(request.aesId()); + DEBUG_LOG(m_logger) << "onSendCesHitRequest: " << request.equipmentNumber << " - " << request.effectTime + << " request.chargeTypeId=" << request.chargeTypeId + << " request.pdmEventType=" << request.pdmEventType + << " request.aesId()=" << request.aesId + << " aesTypeFromId=" << m_mainHandler->aesHandler()->aesTypeFromId(request.aesId); // NOTE: igniterType/IgniterFunciton = 0 as long as SendCesHitRequest does not contain values - if (m_mainHandler->pdmHandler()->isSmartChargeType({request.chargeTypeId(), 0,0})) + if (m_mainHandler->pdmHandler()->isSmartChargeType({request.chargeTypeId, 0,0})) { // special handling for smart - must be send as singleFire m_ftsTab->sendCesHitReply(cookie, - fillFro(request.participantId(), + fillFro(request.participantId, m_mainHandler->aesHandler()->sendSingleFireSMArt(request))); return; } TetraIcd::CesHitRequest data; //test - data.reserve2 = request.originatorEquipmentNumber(); - data.reserve1 = request.chargeTypeId(); - data.header.equipmentNumber = request.equipmentNumber(); - data.header.timeStamp = request.effectTime(); - const auto &ct = m_mainHandler->pdmHandler()->chargeTypeFromId(request.chargeTypeId()); + data.reserve2 = request.originatorEquipmentNumber; + data.reserve1 = request.chargeTypeId; + data.header.equipmentNumber = request.equipmentNumber; + data.header.timeStamp = request.effectTime; + const auto &ct = m_mainHandler->pdmHandler()->chargeTypeFromId(request.chargeTypeId); // GUEZE-359 Steilfeuer mit Sekundaerwirkung wird als Mun 371, ... gesendet. Fuehrt zu Treffer DUS statt WirkSim //#ifdef GUEZ_MODE // if ( request.chargeTypeId() > 370 && request.chargeTypeId() < 390 ) @@ -288,78 +288,78 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie // data.chargeTasCodeIndirect = ct.id(); // } //#else - if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) && (ct.legacyId() > 0)) + if ((request.pdmEventType == ProjectDataManagement::PdmEventType::EventType_HitBuilding) && (ct.legacyId > 0)) { data.chargeTasCodeDirect = 201; // immer den direkten code (fuer wirkfelder: pseudo-osag code >= 201) data.chargeTasCodeIndirect = 201; } - else if (ct.legacyId() > 0) + else if (ct.legacyId > 0) { - data.chargeTasCodeDirect = ct.legacyId(); - data.chargeTasCodeIndirect = ct.legacyId(); + data.chargeTasCodeDirect = ct.legacyId; + data.chargeTasCodeIndirect = ct.legacyId; } else { - data.chargeTasCodeDirect = ct.id(); - data.chargeTasCodeIndirect = ct.id(); + data.chargeTasCodeDirect = ct.id; + data.chargeTasCodeIndirect = ct.id; } //#endif - data.mineId = request.mineId(); - if (request.aesId() != 0) + data.mineId = request.mineId; + if (request.aesId != 0) { //data.aesTetraIdUnused = m_mainHandler->aesHandler()->tetraIdFromDdsId(request.aesId()); - data.aesDdsId = request.aesId(); + data.aesDdsId = request.aesId; //TODO: !!!!!! Use new EventType to check which AreaEffectSimulationType will be chosen. - if (request.eventType() == ProjectDataManagement::EventType::ExplosionCluster) + if (request.pdmEventType == ProjectDataManagement::PdmEventType::EventType_ExplosionCluster) data.aesType = TetraIcd::AreaEffectSimulationType::ExplosionArea; else - data.aesType = m_mainHandler->aesHandler()->aesTypeFromId(request.aesId()); + data.aesType = m_mainHandler->aesHandler()->aesTypeFromId(request.aesId); /*! \brief Take the new event type attribute to check if its is a HazardArea(DangerZone/Gefahrenbereich) * * */ - if ((request.eventType() == ProjectDataManagement::EventType::LeaveHazardDistance) || - (request.eventType() == ProjectDataManagement::EventType::EnterHazardDistance)) + if ((request.pdmEventType == ProjectDataManagement::PdmEventType::EventType_LeaveHazardDistance) || + (request.pdmEventType == ProjectDataManagement::PdmEventType::EventType_EnterHazardDistance)) { - INFO_LOG(m_logger) << "HarzardArea: " << request.effectTime(); - data.reserve1 = request.mineId(); + INFO_LOG(m_logger) << "HarzardArea: " << request.effectTime; + data.reserve1 = request.mineId; data.aesType = TetraIcd::AreaEffectSimulationType::DangerZoneExplosion; } - else if (request.eventType() == ProjectDataManagement::EventType::AirSupport) + else if (request.pdmEventType == ProjectDataManagement::PdmEventType::EventType_AirSupport) { data.aesType = TetraIcd::AreaEffectSimulationType::AirSupport; } } else - data.originatorEquipmentNumber = request.originatorEquipmentNumber(); - const auto &tabPos = request.position(); - data.buildingId = tabPos.moutObjectId().is_set() ? tabPos.moutObjectId().get() : 0; - data.roomId = tabPos.moutRoomId().is_set() ? tabPos.moutRoomId().get() : 0; - data.remainEffectPercent = request.remainEffectPercent(); - data.relPosition = m_mainHandler->posHandler()->geographicToRelative(tabPos.position()); + data.originatorEquipmentNumber = request.originatorEquipmentNumber; + const auto &tabPos = request.position; + data.buildingId = tabPos.moutObjectId.is_set() ? tabPos.moutObjectId.get() : 0; + data.roomId = tabPos.moutRoomId.is_set() ? tabPos.moutRoomId.get() : 0; + data.remainEffectPercent = request.remainEffectPercent; + data.relPosition = m_mainHandler->posHandler()->geographicToRelative(tabPos.position); // NOTE: igniterType/IgniterFunciton = 0 as long as SendCesHitRequest does not contain values - if (m_mainHandler->pdmHandler()->isSmartChargeType({request.chargeTypeId(),0,0})) - data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent()); - else if ((request.eventType() == ProjectDataManagement::EventType::HitBuilding) || - (request.eventType() == ProjectDataManagement::EventType::HitEffectSimulation) // GUEZE-2873 / GUEZE-2888 + if (m_mainHandler->pdmHandler()->isSmartChargeType({request.chargeTypeId,0,0})) + data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id, request.remainEffectPercent); + else if ((request.pdmEventType == ProjectDataManagement::PdmEventType::EventType_HitBuilding) || + (request.pdmEventType == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation) // GUEZE-2873 / GUEZE-2888 ) //Gebäude Sekudärwirkung { - data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent()); - DEBUG_LOG(m_logger) << "PDM::EventType = " << request.eventType() - << " equipmentNumber=" << request.equipmentNumber() + data.remainEffectTasCodeDirect = calculateRemainEffectTasCode(ct.id, request.remainEffectPercent); + DEBUG_LOG(m_logger) << "PDM::EventType = " << request.pdmEventType + << " equipmentNumber=" << request.equipmentNumber << " originatorEquipmentNumber=" << data.originatorEquipmentNumber - << " chargeType=" << ct.id() - << " remainEffectPercent()=" << request.remainEffectPercent() + << " chargeType=" << ct.id + << " remainEffectPercent()=" << request.remainEffectPercent << " -> remainEffectTasCodeDirect=" << data.remainEffectTasCodeDirect ; } else - data.remainEffectTasCodeDirect = request.remainEffectPercent();//calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent()); + data.remainEffectTasCodeDirect = request.remainEffectPercent;//calculateRemainEffectTasCode(ct.id(), request.remainEffectPercent()); // [GUEZE-3469] Funktionsraum dekontaminiert faelschlicherweise - if (m_mainHandler->aesHandler()->aesTypeFromId(request.aesId()) == TetraIcd::AreaEffectSimulationType::FunctionalArea) + if (m_mainHandler->aesHandler()->aesTypeFromId(request.aesId) == TetraIcd::AreaEffectSimulationType::FunctionalArea) { // GUEZSB60_ICD_52_Zentrale-TNE // 3.3.2.5.9.6 Trefferereignis Sekundärwirkung @@ -370,39 +370,39 @@ void RecvFromDdsFts::onSendCesHitRequest(const rti::core::SampleIdentity &cookie // Feld Reserve1: Betriebsmodus (MS-Byte) / Wartezeit (LS-Byte) für Instandsetzungsmaßnahmen // Feld Reserve2: Betriebsmodus (MS-Byte) / Wartezeit (LS-Byte) für San.-dienstliche Versorgung - AreaEffectSimulation::FunctionalArea fa = m_mainHandler->aesHandler()->dtcAes()->functionalArea(request.aesId()); - DEBUG_LOG(m_logger) << "fa maintMode=" << fa.maintMode() - << " maintTime=" <sendParticipantSwVerionsReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data))); + m_ftsTab->sendParticipantSwVerionsReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendParticipantModeRequest(const rti::core::SampleIdentity &cookie, const SendParticipantModeRequest &request) { TetraIcd::ParticipantMode data; - data.header.equipmentNumber = request.equipmentNumber(); - data.language = static_cast(request.language().underlying()); - data.operationMode = static_cast(request.operationMode().underlying()); - data.reactivationDetoxication = request.reactivationDetoxication(); - data.reactivationMaintenance = request.reactivationMaintenance(); - data.reactivationMedic = request.reactivationMedic(); - data.modeVest = static_cast(request.protectionModeVest().underlying()); - data.modeHelmet = static_cast(request.protectionModeHelmet().underlying()); - data.personellProtectionMode = static_cast(request.personellProtection().underlying()); - data.protectionLevel = static_cast(request.protectionLevel().underlying()); - data.handgrenadeSearchMode = static_cast(request.handgrenadeSearchMode().underlying()); - data.internationalMode = static_cast(request.internationalMode().underlying()); - data.abcProtectionMode = static_cast(request.abcProtectionMode().underlying()); + data.header.equipmentNumber = request.equipmentNumber; + data.language = static_cast(request.language); + data.operationMode = static_cast(request.operationMode); + data.reactivationDetoxication = request.reactivationDetoxication; + data.reactivationMaintenance = request.reactivationMaintenance; + data.reactivationMedic = request.reactivationMedic; + data.modeVest = static_cast(request.protectionModeVest); + data.modeHelmet = static_cast(request.protectionModeHelmet); + data.personellProtectionMode = static_cast(request.personellProtection); + data.protectionLevel = static_cast(request.protectionLevel); + data.handgrenadeSearchMode = static_cast(request.handgrenadeSearchMode); + data.internationalMode = static_cast(request.internationalMode); + data.abcProtectionMode = static_cast(request.abcProtectionMode); - m_ftsTab->sendParticipantModeReply(cookie, fillFro(request.requestId(), m_txCallback->txData(data))); + m_ftsTab->sendParticipantModeReply(cookie, fillFro(request.requestId, m_txCallback->txData(data))); } void RecvFromDdsFts::onDemandParticipantModeRequest(const rti::core::SampleIdentity &cookie, const DemandParticipantModeRequest &request) { TetraIcd::DemandParticipantMode data; - data.header.equipmentNumber = request.equipmentNumber(); + data.header.equipmentNumber = request.equipmentNumber; - m_ftsTab->demandParticipantModeReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data))); + m_ftsTab->demandParticipantModeReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendParticipantConfigurationRequest(const rti::core::SampleIdentity &cookie, const SendParticipantConfigurationRequest &request) { TetraIcd::ParticipantConfiguration data; - data.header.equipmentNumber = request.equipmentNumber(); + data.header.equipmentNumber = request.equipmentNumber; // positioning - data.positionIntervallVehicle = request.positionIntervallVehicle(); - data.positionIntervallPersonell = request.positionIntervallPersonell(); - data.positionIntervallAircraft = request.positionIntervallAircraft(); - data.positionTransmissionIntervall = request.positionTransmissionIntervall(); - data.heightbarrier = request.heightbarrier(); - data.faultPositionHandling = static_cast(request.faultPositionHandling().underlying()); - data.switchingPositionIntervall = static_cast(request.switchingPositionIntervall().underlying()); + data.positionIntervallVehicle = request.positionIntervallVehicle; + data.positionIntervallPersonell = request.positionIntervallPersonell; + data.positionIntervallAircraft = request.positionIntervallAircraft; + data.positionTransmissionIntervall = request.positionTransmissionIntervall; + data.heightbarrier = request.heightbarrier; + data.faultPositionHandling = static_cast(request.faultPositionHandling); + data.switchingPositionIntervall = static_cast(request.switchingPositionIntervall); // radio protocoll parameter - data.waittimeAdditionalBroadcastDemand = request.waittimeAdditionalBroadcastDemand(); - data.factorWaittimeIncreaseAtHighload = request.factorWaittimeIncreaseHighload(); + data.waittimeAdditionalBroadcastDemand = request.waittimeAdditionalBroadcastDemand; + data.factorWaittimeIncreaseAtHighload = request.factorWaittimeIncreaseHighload; // automatic vulnerability increase - data.waittimeAutomaticVulnerabilityIncreaseLevel1 = request.waittimeAutomaticVulnerabilityIncreaseLevel1(); - data.waittimeAutomaticVulnerabilityIncreaseLevel2 = request.waittimeAutomaticVulnerabilityIncreaseLevel2(); - data.waittimeAutomaticVulnerabilityIncreaseLevel3 = request.waittimeAutomaticVulnerabilityIncreaseLevel3(); + data.waittimeAutomaticVulnerabilityIncreaseLevel1 = request.waittimeAutomaticVulnerabilityIncreaseLevel1; + data.waittimeAutomaticVulnerabilityIncreaseLevel2 = request.waittimeAutomaticVulnerabilityIncreaseLevel2; + data.waittimeAutomaticVulnerabilityIncreaseLevel3 = request.waittimeAutomaticVulnerabilityIncreaseLevel3; // optical code - data.opticalCode = static_cast(request.opticalCode().underlying()); + data.opticalCode = static_cast(request.opticalCode); // vulnerability model - data.vulnerabilityModel = request.vulnerabilityModel(); - data.validTimeOps = request.validTimeOps(); + data.vulnerabilityModel = request.vulnerabilityModel; + data.validTimeOps = request.validTimeOps; - m_ftsTab->sendParticipantConfigurationReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data))); + m_ftsTab->sendParticipantConfigurationReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendParticipantBlockedAreaRequest(const rti::core::SampleIdentity &cookie, const SendParticipantBlockedAreaRequest &request) { TetraIcd::CesHitRequest data; - data.header.equipmentNumber = request.equipmentNumber(); + data.header.equipmentNumber = request.equipmentNumber; data.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); // TODO data.aesType = TetraIcd::AreaEffectSimulationType::SpecialArea; - data.remainEffectPercent = request.blockedAreaMode() == BlockedAreaMode::Enter ? 1 : 0; + data.remainEffectPercent = request.blockedAreaMode == BlockedAreaMode::Enter ? 1 : 0; - m_ftsTab->sendParticipantBlockedAreaReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data))); + m_ftsTab->sendParticipantBlockedAreaReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendParticipantBeStillWarningRequest(const rti::core::SampleIdentity &cookie, const SendParticipantBeStillWarningRequest &request) { TetraIcd::CesHitRequest data; - data.header.equipmentNumber = request.equipmentNumber(); + data.header.equipmentNumber = request.equipmentNumber; data.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); // TODO data.aesType = TetraIcd::AreaEffectSimulationType::BeStillWarning; data.remainEffectPercent = 0; - WARNING_LOG(m_logger) << "sendParticipantBeStillWarningReply equipmentNumber=" << request.equipmentNumber(); - m_ftsTab->sendParticipantBeStillWarningReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data))); + WARNING_LOG(m_logger) << "sendParticipantBeStillWarningReply equipmentNumber=" << request.equipmentNumber; + m_ftsTab->sendParticipantBeStillWarningReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendSetSanitationRequest(const rti::core::SampleIdentity &cookie, const SendSetSanitationRequest &request) { TetraIcd::Sanitation data; - data.header.equipmentNumber = request.equipmentNumber(); + data.header.equipmentNumber = request.equipmentNumber; data.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); - data.proceduresTaken = request.sanitationProceduresTaken(); + data.proceduresTaken = request.sanitationProceduresTaken; data.sanitationResult = TetraIcd::SanitationResult::NoEffect; data.sanitationEvaluation = TetraIcd::SanitationEvaluation::Okay; // To have a 0 for TETRA data.uniqeId = 0; - data.originatorEquipmentNumber = request.originatorEquipmentNumber(); - data.qualification = static_cast(request.qualification().underlying()); - m_ftsTab->sendSetSanitationReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data))); + data.originatorEquipmentNumber = request.originatorEquipmentNumber; + data.qualification = static_cast(request.qualification); + m_ftsTab->sendSetSanitationReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendSelectiveReammunitionRequest(const rti::core::SampleIdentity &cookie, const SendSelectiveReammunitionRequest &request) { - DEBUG_LOG(m_logger) << "onSendSelectiveReammunitionRequest for equipment number: " << request.equipmentNumber(); + DEBUG_LOG(m_logger) << "onSendSelectiveReammunitionRequest for equipment number: " << request.equipmentNumber; TetraIcd::SelectiveReammunition data; - data.header.equipmentNumber = request.equipmentNumber(); + data.header.equipmentNumber = request.equipmentNumber; data.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); - data.gearId = request.gearId(); - for(auto ra : request.reammunition()) + data.gearId = request.gearId; + for(auto ra : request.reammunition) { TetraIcd::Reammunition tra; - tra.chargeTypeId = ra.chargeTypeId(); - tra.newDefaultStock = ra.newDefaultStock(); - tra.newStock = ra.newStock(); - tra.tracerRatio = ra.tracerRatio(); + tra.chargeTypeId = ra.chargeTypeId; + tra.newDefaultStock = ra.newDefaultStock; + tra.newStock = ra.newStock; + tra.tracerRatio = ra.tracerRatio; data.reammunitions.push_back(tra); } - m_ftsTab->sendSelectiveReammunitionReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data))); + m_ftsTab->sendSelectiveReammunitionReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(data))); } void RecvFromDdsFts::onSendResetAllDusMinesRequest(const rti::core::SampleIdentity &cookie, const SendResetAllDusMinesRequest &request) @@ -549,20 +549,20 @@ void RecvFromDdsFts::onSendResetAllDusMinesRequest(const rti::core::SampleIdenti void RecvFromDdsFts::onDemandParticipantConfigurationRequest(const rti::core::SampleIdentity &cookie, const DemandParticipantConfigurationRequest &request) { TetraIcd::DemandParticipantConfiguration data; - data.header.equipmentNumber = request.equipmentNumber(); + data.header.equipmentNumber = request.equipmentNumber; - m_ftsTab->demandParticipantConfigurationReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data))); + m_ftsTab->demandParticipantConfigurationReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(data))); } void RecvFromDdsFts::onSetDevicePowerRequest(const rti::core::SampleIdentity &cookie, const SetDevicePowerRequest &request) { TetraIcd::SetDevicePowerRequest data; - data.header.equipmentNumber = request.equipmentNumber(); + data.header.equipmentNumber = request.equipmentNumber; data.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); - data.powerType = static_cast(request.powerType().underlying()); - data.subdeviceId = request.subdeviceId(); + data.powerType = static_cast(request.powerType); + data.subdeviceId = request.subdeviceId; - m_ftsTab->setDevicePowerReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(data))); + m_ftsTab->setDevicePowerReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(data))); } void RecvFromDdsFts::onAdlerCalculateTrajectoryRequest(const rti::core::SampleIdentity &cookie, const AdlerCalculateTrajectoryRequest &request) @@ -574,30 +574,30 @@ void RecvFromDdsFts::onAdlerCalculateTrajectoryRequest(const rti::core::SampleId void RecvFromDdsFts::onSendOcCommandRequest(const rti::core::SampleIdentity &cookie, const SendOcCommandRequest &request) { TetraIcd::OcCommand data; - data.action = request.action(); + data.action = request.action; bool bRet = true; - for (const int equipNo : request.equipmentNumbers()) + for (const int equipNo : request.equipmentNumbers) { data.header.equipmentNumber = equipNo; if (!m_txCallback->txData(data)) bRet = false; } - m_ftsTab->sendOcCommandReply(cookie, fillFro(request.requestId(), bRet)); + m_ftsTab->sendOcCommandReply(cookie, fillFro(request.requestId, bRet)); } void RecvFromDdsFts::onSendUasWaypointRequest(const rti::core::SampleIdentity &cookie, const SendUasWaypointRequest &request) { TetraIcd::UAVPerformMission mission; - mission.header.equipmentNumber = request.equipmentNumber(); + mission.header.equipmentNumber = request.equipmentNumber; mission.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); - mission.missionName = QString::fromStdString(request.name()); - mission.missionId = request.planId(); + mission.missionName = QString::fromStdString(request.name); + mission.missionId = request.planId; - ERROR_LOG(m_logger) << "####################### request.equipmentNumber(): " << request.equipmentNumber() << ", request.name(): " << request.name() << ", mission.header.equipmentNumber: " << mission.header.equipmentNumber << ", properties: " << request.properties(); + ERROR_LOG(m_logger) << "####################### request.equipmentNumber(): " << request.equipmentNumber << ", request.name(): " << request.name << ", mission.header.equipmentNumber: " << mission.header.equipmentNumber << ", properties: " << request.properties; TetraIcd::UAVAction action; action.task = TetraIcd::UAVActionTask::Loiter; @@ -610,7 +610,7 @@ void RecvFromDdsFts::onSendUasWaypointRequest(const rti::core::SampleIdentity &c try { - const auto props = LtsUtils::JsonObject::fromJsonSafe(request.properties()); + const auto props = LtsUtils::JsonObject::fromJsonSafe(request.properties); lat = props.value("location_y"); lon = props.value("location_x"); @@ -619,7 +619,7 @@ void RecvFromDdsFts::onSendUasWaypointRequest(const rti::core::SampleIdentity &c catch (const std::exception &ex) { ERROR_LOG(m_logger) << "props is missing critical values: " << ex.what(); - m_ftsTab->sendUasWaypointReply(cookie, fillFro(request.equipmentNumber(), false)); + m_ftsTab->sendUasWaypointReply(cookie, fillFro(request.equipmentNumber, false)); return; } @@ -630,16 +630,16 @@ void RecvFromDdsFts::onSendUasWaypointRequest(const rti::core::SampleIdentity &c mission.actions.push_back(action); bool ret = m_txCallback->txData(mission); // send waypoint to uav via uas tab plugin - m_ftsTab->sendUasWaypointReply(cookie, fillFro(request.equipmentNumber(), ret)); + m_ftsTab->sendUasWaypointReply(cookie, fillFro(request.equipmentNumber, ret)); } void RecvFromDdsFts::onSendModifyUasStateRequest(const rti::core::SampleIdentity &cookie, const SendModifyUasStateRequest &request) { TetraIcd::UAVChangeState changeState; - changeState.header.equipmentNumber = request.equipmentNumber(); + changeState.header.equipmentNumber = request.equipmentNumber; changeState.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); - changeState.requestedState = static_cast(request.uasState().underlying()); - m_ftsTab->sendModifyUasStateReply(cookie, fillFro(request.equipmentNumber(), m_txCallback->txData(changeState))); + changeState.requestedState = static_cast(request.uasState); + m_ftsTab->sendModifyUasStateReply(cookie, fillFro(request.equipmentNumber, m_txCallback->txData(changeState))); } void RecvFromDdsFts::onSendExFireReadinessRequest(const rti::core::SampleIdentity &cookie, const SendExFireReadinessRequest &request) @@ -647,37 +647,37 @@ void RecvFromDdsFts::onSendExFireReadinessRequest(const rti::core::SampleIdentit TetraIcd::ExFireReadiness fireReadiness; fireReadiness.header.equipmentNumber = 100; fireReadiness.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); - fireReadiness.partyId = request.partyId(); - fireReadiness.reference = QString::fromStdString(request.reference()); + fireReadiness.partyId = request.partyId; + fireReadiness.reference = QString::fromStdString(request.reference); - m_ftsTab->sendExFireReadinessReply(cookie, fillFro(request.participantId(), m_txCallback->txData(fireReadiness))); + m_ftsTab->sendExFireReadinessReply(cookie, fillFro(request.participantId, m_txCallback->txData(fireReadiness))); } void RecvFromDdsFts::onSendExFiredReportRequest(const rti::core::SampleIdentity &cookie, const SendExFiredReportRequest &request) { TetraIcd::ExFiredReport firedReport; - firedReport.header.equipmentNumber = request.participantId(); + firedReport.header.equipmentNumber = request.participantId; firedReport.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); - firedReport.partyId = request.partyId(); - firedReport.reference = QString::fromStdString(request.reference()); - firedReport.unitIdentifier = QString::fromStdString(request.unitIdentifier()); - firedReport.identifier = QString::fromStdString(request.identifier()); + firedReport.partyId = request.partyId; + firedReport.reference = QString::fromStdString(request.reference); + firedReport.unitIdentifier = QString::fromStdString(request.unitIdentifier); + firedReport.identifier = QString::fromStdString(request.identifier); - m_ftsTab->sendExFiredReportReply(cookie, fillFro(request.participantId(), m_txCallback->txData(firedReport))); + m_ftsTab->sendExFiredReportReply(cookie, fillFro(request.participantId, m_txCallback->txData(firedReport))); } void RecvFromDdsFts::onSendExConfirmationReportRequest(const rti::core::SampleIdentity &cookie, const SendExConfirmationReportRequest &request) { TetraIcd::ExConfirmationReport confirmationReport; - confirmationReport.header.equipmentNumber = request.participantId(); + confirmationReport.header.equipmentNumber = request.participantId; confirmationReport.header.timeStamp = QDateTime::currentMSecsSinceEpoch(); - confirmationReport.partyId = request.partyId(); - confirmationReport.reference = QString::fromStdString(request.reference()); - confirmationReport.unitIdentifier = QString::fromStdString(request.unitIdentifier()); - confirmationReport.identifier = QString::fromStdString(request.identifier()); + confirmationReport.partyId = request.partyId; + confirmationReport.reference = QString::fromStdString(request.reference); + confirmationReport.unitIdentifier = QString::fromStdString(request.unitIdentifier); + confirmationReport.identifier = QString::fromStdString(request.identifier); - m_ftsTab->sendExConfirmationReportReply(cookie, fillFro(request.participantId(), m_txCallback->txData(confirmationReport))); + m_ftsTab->sendExConfirmationReportReply(cookie, fillFro(request.participantId, m_txCallback->txData(confirmationReport))); } @@ -757,7 +757,7 @@ int RecvFromDdsFts::calculateRemainEffectTasCode(int chargeTypeIdBase, int remai if (remainEffectPercent > 100) remainEffectPercent = 100; - const int destructiveFactor = m_mainHandler->pdmHandler()->buildingChargeEffect(chargeTypeIdBase).destructiveFactor(); + const int destructiveFactor = m_mainHandler->pdmHandler()->buildingChargeEffect(chargeTypeIdBase).destructiveFactor; const int categorie = getDestructiveCategorie(destructiveFactor); const auto &value = m_categorieData.value(categorie); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp index 2bd315fe3..d87f909e3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/send_to_dds.cpp @@ -6,6 +6,8 @@ #include "main_handler.h" #include "settings.h" #include +#include + #include namespace TrainingAreaBase @@ -13,7 +15,8 @@ namespace TrainingAreaBase static constexpr const int s_PartyIdOffset = 1; SendToDds::SendToDds(MainHandler *mainHandler) - : m_mainHandler(mainHandler) + : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) + , m_mainHandler(mainHandler) , m_dtsTab(mainHandler->ddsHandler()->dtsTab()) , m_aesStateHandler(m_mainHandler->aesHandler() ? mainHandler->aesHandler()->aesStateHandler() : nullptr) , m_aesHandler(m_mainHandler->aesHandler()) @@ -23,8 +26,8 @@ SendToDds::SendToDds(MainHandler *mainHandler) template static inline void assignBase(const S &src, T &dest) { - dest.equipmentNumber(src.header.equipmentNumber); - dest.sampleTime(src.header.timeStamp); + dest.equipmentNumber = src.header.equipmentNumber; + dest.sampleTime = src.header.timeStamp; } void SendToDds::rxData(const TetraIcd::ManipulationReport &inData) @@ -32,8 +35,8 @@ void SendToDds::rxData(const TetraIcd::ManipulationReport &inData) TrainingAreaBase::EquipmentOperationalState outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.isManipulation(inData.isManipulation); - outData.equipmentFunctionId(inData.equipmentFunctionId); + outData.isManipulation = inData.isManipulation; + outData.equipmentFunctionId = inData.equipmentFunctionId; publish(outData); } @@ -43,7 +46,7 @@ void SendToDds::rxData(const TetraIcd::EquipmentOperationalState &inData) TrainingAreaBase::EquipmentOperationalState outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.nbcProtectionActive(inData.nbcProtectionActive); + outData.nbcProtectionActive = inData.nbcProtectionActive; publish(outData); } @@ -53,40 +56,40 @@ void SendToDds::rxData(const TetraIcd::EquipmentConfigurationReport &inData) TrainingAreaBase::EquipmentConfigurationReport outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.equipmentNumber(inData.equipmentNumber); - outData.canStartupTime(inData.canStartUpTime); - outData.equipmentType(inData.equipmentType); + outData.equipmentNumber = inData.equipmentNumber; + outData.canStartupTime = inData.canStartUpTime; + outData.equipmentType = inData.equipmentType; - outData.loginWaittimeBitweenTrys(inData.loginWaittimeBitweenTrys); - outData.loginMaxRetryCount(inData.loginMaxRetryCnt); - outData.loginMasteringFlag(inData.loginMasteringFlag); + outData.loginWaittimeBitweenTrys = inData.loginWaittimeBitweenTrys; + outData.loginMaxRetryCount = inData.loginMaxRetryCnt; + outData.loginMasteringFlag = inData.loginMasteringFlag; - outData.canDeviceConfiguration(inData.canDeviceConfiguration); + outData.canDeviceConfiguration = inData.canDeviceConfiguration; - outData.displayDeviceVoiceOutput(inData.displayDeviceVoiceOutput); - outData.displayDeviceLanguage(static_cast(inData.displayDeviceLanguage)); + outData.displayDeviceVoiceOutput = inData.displayDeviceVoiceOutput; + outData.displayDeviceLanguage = static_cast(inData.displayDeviceLanguage); - outData.pyrotechnics(inData.pyrotechnics); + outData.pyrotechnics = inData.pyrotechnics; - outData.mineHandgrenadeSensorMode(static_cast(inData.mhgrsMode)); - outData.mineHandgrenadeSensorEnergySaving(inData.mhgrsEnergySaving); + outData.mineHandgrenadeSensorMode = static_cast(inData.mhgrsMode); + outData.mineHandgrenadeSensorEnergySaving = inData.mhgrsEnergySaving; - outData.firMode(static_cast(inData.specialSensorFir)); - outData.minelayerMode(static_cast(inData.specialSensorMinelayer)); - outData.specialSensorStandard(static_cast(inData.specialSensorStandard)); + outData.firMode = static_cast(inData.specialSensorFir); + outData.minelayerMode = static_cast(inData.specialSensorMinelayer); + outData.specialSensorStandard = static_cast(inData.specialSensorStandard); - outData.agdusHwMode(static_cast(inData.agdusHwMode)); + outData.agdusHwMode = static_cast(inData.agdusHwMode); - outData.positionUpdateIntervall(static_cast(inData.positionUpdateInterval)); + outData.positionUpdateIntervall = static_cast(inData.positionUpdateInterval); - outData.displayTextMainGroup(inData.displayTextMainGroup); - outData.displayTextSubGroup(inData.displayTextSubGroup); + outData.displayTextMainGroup = inData.displayTextMainGroup; + outData.displayTextSubGroup = inData.displayTextSubGroup; - outData.vulnerabilityModelAgdus(inData.vulnerabilityModelAgdus); - outData.vulnerabilityModelMineIed(inData.vulnerabilityModelMineIed); - outData.vulnerabilityModelAreaFire(inData.vulnerabilityModelAreaFire); - outData.vulnerabilityModelOperatingResource(inData.vulnerabilityModelOperatingResource); - outData.vulnerabilityModelACWeaponry(inData.vulnerabilityModelAcWeaponry); + outData.vulnerabilityModelAgdus = inData.vulnerabilityModelAgdus; + outData.vulnerabilityModelMineIed = inData.vulnerabilityModelMineIed; + outData.vulnerabilityModelAreaFire = inData.vulnerabilityModelAreaFire; + outData.vulnerabilityModelOperatingResource = inData.vulnerabilityModelOperatingResource; + outData.vulnerabilityModelACWeaponry = inData.vulnerabilityModelAcWeaponry; publish(outData); } @@ -97,8 +100,8 @@ void SendToDds::rxData(const TetraIcd::CtaDataError &inData) TrainingAreaBase::CtaDataError outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.reason(static_cast(inData.reason)); - outData.originTelegramId(inData.originTelegramId); + outData.reason = static_cast(inData.reason); + outData.originTelegramId = inData.originTelegramId; publish(outData); } @@ -135,7 +138,7 @@ void SendToDds::rxData(const TetraIcd::PositionReportWithMountedEquipments &inDa } - outData.mountedParticipants() = inData.mountedEquipments; + outData.mountedParticipants = inData.mountedEquipments; publish(outData); } @@ -145,11 +148,11 @@ void SendToDds::rxData(const TetraIcd::MineTriggered &inData) TrainingAreaBase::MineTriggered outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.mineAreaId(inData.mineAreaId); - outData.mineIndex(inData.mineIndex); + outData.mineAreaId = inData.mineAreaId; + outData.mineIndex = inData.mineIndex; if (inData.chargeTypeId != 0) - outData.chargeTypeId(inData.chargeTypeId); + outData.chargeTypeId = inData.chargeTypeId; if (inData.relPositionValid) { if (!setPosition2d(outData, inData.relPosition)) @@ -166,9 +169,9 @@ template static inline void assignIedBaseData(const S &inData, T &outData) { assignBase(inData, outData); - outData.iedId(inData.iedId); - outData.tacticalState(static_cast(inData.tacticalState)); - outData.statePyrotechnics(inData.statePyrotechnics); + outData.iedId = inData.iedId; + outData.tacticalState = static_cast(inData.tacticalState); + outData.statePyrotechnics = inData.statePyrotechnics; } void SendToDds::rxData(const TetraIcd::DefinitionIed &inData) @@ -181,17 +184,17 @@ void SendToDds::rxData(const TetraIcd::DefinitionIed &inData) ctasErrorPosition(inData); return; } - outData.type(static_cast(inData.iedType)); - outData.remoteTrigger((inData.trigger & static_cast(TetraIcd::DefinitionIed::TriggerTypes::Remote)) ? true : false); - outData.switchTrigger((inData.trigger & static_cast(TetraIcd::DefinitionIed::TriggerTypes::Switch)) ? true : false); - outData.lightBarrierTrigger((inData.trigger & static_cast(TetraIcd::DefinitionIed::TriggerTypes::LightBarrier)) ? true : false); - outData.tautWireTrigger((inData.trigger & static_cast(TetraIcd::DefinitionIed::TriggerTypes::TautWire)) ? true : false); - outData.explosiveForce(inData.explosiveForce); - outData.pairingState(static_cast(inData.pairingState)); + outData.type = static_cast(inData.iedType); + outData.remoteTrigger = (inData.trigger & static_cast(TetraIcd::DefinitionIed::TriggerTypes::Remote)) ? true : false; + outData.switchTrigger = (inData.trigger & static_cast(TetraIcd::DefinitionIed::TriggerTypes::Switch)) ? true : false; + outData.lightBarrierTrigger = (inData.trigger & static_cast(TetraIcd::DefinitionIed::TriggerTypes::LightBarrier)) ? true : false; + outData.tautWireTrigger = (inData.trigger & static_cast(TetraIcd::DefinitionIed::TriggerTypes::TautWire)) ? true : false; + outData.explosiveForce = inData.explosiveForce; + outData.pairingState = static_cast(inData.pairingState); if (inData.pairingState != TrainingAreaBase::TetraIcd::IedPairingState::NotPaired) - outData.pairedId(inData.pairedId); + outData.pairedId = inData.pairedId; if (inData.partyId != 0) - outData.partyId(inData.partyId + s_PartyIdOffset); + outData.partyId = inData.partyId + s_PartyIdOffset; publish(outData); } @@ -201,11 +204,11 @@ void SendToDds::rxData(const TetraIcd::StateIed &inData) TrainingAreaBase::StateIed outData; checkTimeStamp(inData); assignIedBaseData(inData, outData); - outData.batteryWarnings(inData.batteryWarnings); - outData.errorStateElectronics(static_cast(inData.errorStateElectronics)); - outData.errorStatePyrotechnics1(static_cast(inData.errorStatePyrotechnics1)); - outData.errorStatePyrotechnics2(static_cast(inData.errorStatePyrotechnics2)); - outData.errorStatePyrotechnics3(static_cast(inData.errorStatePyrotechnics3)); + outData.batteryWarnings = inData.batteryWarnings; + outData.errorStateElectronics = static_cast(inData.errorStateElectronics); + outData.errorStatePyrotechnics1 = static_cast(inData.errorStatePyrotechnics1); + outData.errorStatePyrotechnics2 = static_cast(inData.errorStatePyrotechnics2); + outData.errorStatePyrotechnics3 = static_cast(inData.errorStatePyrotechnics3); publish(outData); } @@ -215,11 +218,11 @@ void SendToDds::rxData(const TetraIcd::DusSingleMineState &inData) TrainingAreaBase::DusSingleMineState outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.mineId(inData.mineId); - outData.effectStart(inData.effectStart); + outData.mineId = inData.mineId; + outData.effectStart = inData.effectStart; setPosition2d(outData, inData.relPosition); - outData.chargeTypeId(inData.chargeTypeId); - outData.state(inData.state); + outData.chargeTypeId = inData.chargeTypeId; + outData.state = inData.state; publish(outData); } @@ -259,43 +262,43 @@ void SendToDds::rxData(const TetraIcd::StateChangeDirect &inData) { TetraIcd::MineTriggered mt; mt.header.timeStamp = inData.header.timeStamp; - if (outData.position().is_set()) + if (outData.position.is_set()) { - const TrainingAreaBase::TabPosition pos = outData.position().get(); - mt.relPosition = m_posHandler->geographicToRelative(pos.position()); + const TrainingAreaBase::TabPosition pos = outData.position.get(); + mt.relPosition = m_posHandler->geographicToRelative(pos.position); mt.relPositionValid = true; - mt.chargeTypeId = ct.id(); + mt.chargeTypeId = ct.id; mt.mineIndex = inData.originatorId; rxData(mt); } - outData.originatorType(ProjectDataManagement::StateChangeOriginator::DusMine); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine; } else { - if (pdm()->isIedChargeType({ct.id(),0,0,})) - outData.originatorType(ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice); + if (pdm()->isIedChargeType({ct.id,0,0,})) + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ImprovisedExplosiveDevice; else { if (m_mainHandler->ppmHandler()->getDtc()->participantIdByEquipmentNumber(inData.originatorId) <= 0) { - if (m_mainHandler->ppmHandler()->getDtc()->party(inData.originatorId).id()) - outData.originatorType(ProjectDataManagement::StateChangeOriginator::Party); + if (m_mainHandler->ppmHandler()->getDtc()->party(inData.originatorId).id) + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Party; else - outData.originatorType(ProjectDataManagement::StateChangeOriginator::Participant); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant; } else - outData.originatorType(ProjectDataManagement::StateChangeOriginator::Participant); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Participant; } } - outData.originatorId(inData.originatorId); + outData.originatorId = inData.originatorId; - outData.originatorChargeTypeId(inData.chargeTypeId); + outData.originatorChargeTypeId = inData.chargeTypeId; - if (outData.originatorType() == ProjectDataManagement::StateChangeOriginator::DusMine) + if (outData.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_DusMine) @@ -320,16 +323,16 @@ void SendToDds::rxData(const TetraIcd::StateChangeIndirect &inData) if (!setPosition(outData, inData.geoPosition, inData.relPosition, inData.opsPosition, inData.header.timeStamp)) ctasErrorPosition(inData); - outData.originatorType(ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation; - outData.originatorId(inData.originatorId); + outData.originatorId = inData.originatorId; if (m_aesHandler) { int offsetIndirectHit = inData.isSecondaryEffect ? 500 : 0; - outData.originatorChargeTypeId(offsetIndirectHit + m_aesHandler->aesChargeId(outData.originatorId())); + outData.originatorChargeTypeId = offsetIndirectHit + m_aesHandler->aesChargeId(outData.originatorId); } @@ -341,8 +344,8 @@ void SendToDds::rxData(const TetraIcd::OperatorAction &inData) TrainingAreaBase::OperatorAction outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.operatorId(inData.operatorId); - outData.action(inData.action); + outData.operatorId = inData.operatorId; + outData.action = inData.action; publish(outData); } @@ -358,32 +361,32 @@ void SendToDds::rxData(const TetraIcd::StateChange &inData) switch (inData.originatorType) { case TrainingAreaBase::TetraIcd::OriginatorType::ObserverController: - outData.originatorType(ProjectDataManagement::StateChangeOriginator::ObserverController); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController; break; case TrainingAreaBase::TetraIcd::OriginatorType::ExerciseControl: - outData.originatorType(ProjectDataManagement::StateChangeOriginator::ExerciseControl); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl; break; case TrainingAreaBase::TetraIcd::OriginatorType::MedicTimeout: - outData.originatorType(ProjectDataManagement::StateChangeOriginator::MedicalTimeout); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout; break; case TrainingAreaBase::TetraIcd::OriginatorType::Sanitation: - outData.originatorType(ProjectDataManagement::StateChangeOriginator::Sanitation); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation; break; case TrainingAreaBase::TetraIcd::OriginatorType::MedicDecontamination: - outData.originatorType(ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_WoundTreatmentDevice; break; case TrainingAreaBase::TetraIcd::OriginatorType::MaintainanceRepair: case TrainingAreaBase::TetraIcd::OriginatorType::MaintainanceDecontamination: - outData.originatorType(ProjectDataManagement::StateChangeOriginator::MaintainanceDevice); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MaintainanceDevice; break; case TrainingAreaBase::TetraIcd::OriginatorType::FunctionalArea: - outData.originatorType(ProjectDataManagement::StateChangeOriginator::FunctionalArea); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_FunctionalArea; break; case TrainingAreaBase::TetraIcd::OriginatorType::Initialisation: - outData.originatorType(ProjectDataManagement::StateChangeOriginator::Initialization); + outData.originatorType = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization; break; } - outData.originatorId(inData.originatorId); + outData.originatorId = inData.originatorId; publish(outData); } @@ -396,7 +399,7 @@ void SendToDds::rxData(const TetraIcd::FunctionalAreaEntry &inData) if (!setPosition2d(outData, inData.relPosition)) ctasErrorPosition(inData); - outData.aesItemId(inData.aesDdsId); + outData.aesItemId = inData.aesDdsId; publish(outData); } @@ -425,7 +428,7 @@ void SendToDds::rxData(const TetraIcd::SpecialSensorData &inData) operationalState |= (inData.type & 0x0F) << 12; operationalState |= (inData.nbcType & 0x03) << 16; - outData.operationalState(operationalState); + outData.operationalState = operationalState; publish(outData); } @@ -434,11 +437,11 @@ template static inline void assignMinelayerData(T &inData, TrainingAreaBase::MinelayerTrailerData &outData) { assignBase(inData, outData); - outData.barrierId(inData.barrierId); - outData.layingDensity(inData.layingDensity); - outData.effectStart(inData.effectStart); - outData.effectDuration(inData.effectDuration); - outData.mineCount(inData.mineCount); + outData.barrierId = inData.barrierId; + outData.layingDensity = inData.layingDensity; + outData.effectStart = inData.effectStart; + outData.effectDuration = inData.effectDuration; + outData.mineCount = inData.mineCount; } void SendToDds::rxData(const TetraIcd::MinelayerTrailerData &inData) @@ -446,7 +449,7 @@ void SendToDds::rxData(const TetraIcd::MinelayerTrailerData &inData) TrainingAreaBase::MinelayerTrailerData outData; checkTimeStamp(inData); assignMinelayerData(inData, outData); - outData.chargeTypeId(m_mainHandler->pdmHandler()->chargeTypeFromId(inData.indirectChargeTasCode).id()); + outData.chargeTypeId = m_mainHandler->pdmHandler()->chargeTypeFromId(inData.indirectChargeTasCode).id; if (!setPosition2d(outData, inData.relPosition)) { ctasErrorPosition(inData); @@ -461,13 +464,13 @@ void SendToDds::rxData(const TetraIcd::MinelayerThrowerData &inData) TrainingAreaBase::MinelayerThrowerData outData; checkTimeStamp(inData); assignMinelayerData(inData, outData); - outData.chargeTypeId(m_mainHandler->pdmHandler()->chargeTypeFromId(inData.indirectChargeTasCode).id()); + outData.chargeTypeId = m_mainHandler->pdmHandler()->chargeTypeFromId(inData.indirectChargeTasCode).id; if (!setPosition2d(outData, inData.relPosition)) { ctasErrorPosition(inData); return; } - outData.throwingType(static_cast(inData.throwingType)); + outData.throwingType = static_cast(inData.throwingType); publish(outData); } @@ -477,8 +480,8 @@ void SendToDds::rxData(const TetraIcd::MinelayerTrailerPosition &inData) TrainingAreaBase::MinelayerTrailerPosition outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.dusSerialNo(inData.dusSerialNo); - outData.chargeTypeId(m_mainHandler->pdmHandler()->chargeTypeFromId(inData.indirectChargeTasCode).id()); + outData.dusSerialNo = inData.dusSerialNo; + outData.chargeTypeId = m_mainHandler->pdmHandler()->chargeTypeFromId(inData.indirectChargeTasCode).id; if (!setPosition2d(outData, inData.relPosition)) { ctasErrorPosition(inData); @@ -493,21 +496,21 @@ void SendToDds::rxData(const TetraIcd::BiteReport &inData) TrainingAreaBase::EquipmentBite outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.registerType(static_cast(inData.loginType)); - outData.biteState(inData.biteState); - outData.configState(inData.configState); - outData.batteryState(inData.batteryState); - outData.configError(inData.configError); - outData.biteErrors().resize(inData.biteErrors.size()); + outData.registerType = static_cast(inData.loginType); + outData.biteState = inData.biteState; + outData.configState = inData.configState; + outData.batteryState = inData.batteryState; + outData.configError = inData.configError; + outData.biteErrors.resize(inData.biteErrors.size()); TrainingAreaBase::EquipmentBiteError ebe; for (size_t i = 0; i < inData.biteErrors.size(); ++i) { const TetraIcd::BiteError &be = inData.biteErrors.at(i); - ebe.canDeviceNumber(be.canDeviceNumber); - ebe.errorNumber(be.errorNumber); - ebe.uniqueId(be.uniqueId); - ebe.subdeviceNumber(be.subdeviceNumber); - outData.biteErrors()[i] = ebe; + ebe.canDeviceNumber = be.canDeviceNumber; + ebe.errorNumber = be.errorNumber; + ebe.uniqueId = be.uniqueId; + ebe.subdeviceNumber = be.subdeviceNumber; + outData.biteErrors[i] = ebe; } publish(outData); @@ -522,13 +525,13 @@ void SendToDds::rxData(const TetraIcd::EquipmentEvent &inData) ctasErrorPosition(inData); TrainingAreaBase::Equipment src; - src.equipmentFunctionId(inData.equipmentFunctionId); - src.subDeviceId(inData.subDeviceId); - src.unqiueId(inData.uniqueId); - outData.source(src); + src.equipmentFunctionId = inData.equipmentFunctionId; + src.subDeviceId = inData.subDeviceId; + src.unqiueId = inData.uniqueId; + outData.source = src; - outData.code(inData.code); - outData.data() = inData.payload; + outData.code = inData.code; + outData.data = inData.payload; publish(outData); } @@ -539,15 +542,15 @@ void SendToDds::rxData(const TetraIcd::EquipmentGearAssignment &inData) TrainingAreaBase::EquipmentGearAssignment outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.gears().resize(inData.gears.size()); + outData.gears.resize(inData.gears.size()); TrainingAreaBase::Gear tabGear; for (size_t i = 0; i < inData.gears.size(); ++i) { const TetraIcd::Gear &gear = inData.gears.at(i); - tabGear.gearId(gear.gearSerialNumber); - tabGear.gearTypeId(pdm()->gearTypeIdFromTasGearTasCode(gear.gearTasCode)); - tabGear.chargeCounting(gear.chargeCounting); - outData.gears()[i] = tabGear; + tabGear.gearId = gear.gearSerialNumber; + tabGear.gearTypeId = pdm()->gearTypeIdFromTasGearTasCode(gear.gearTasCode); + tabGear.chargeCounting = gear.chargeCounting; + outData.gears[i] = tabGear; } publish(outData); @@ -558,20 +561,20 @@ void SendToDds::rxData(const TetraIcd::EquipmentGearChargeState &inData) TrainingAreaBase::EquipmentGearChargeState outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.charge().resize(inData.charges.size()); + outData.charge.resize(inData.charges.size()); TrainingAreaBase::GearCharge tabGr; for (size_t i = 0; i < inData.charges.size(); ++i) { const TetraIcd::GearCharge &gr = inData.charges.at(i); - tabGr.gearId(gr.gearSerialNumber); - tabGr.gearTypeId(pdm()->gearTypeIdFromTasGearTasCode(gr.gearTasCode)); - tabGr.remain(gr.remain); - tabGr.chargeTypeId(pdm()->chargeTypeIdFromGearAndChargeTasCode(tabGr.gearTypeId(), gr.chargeTypeId)); + tabGr.gearId = gr.gearSerialNumber; + tabGr.gearTypeId = pdm()->gearTypeIdFromTasGearTasCode(gr.gearTasCode); + tabGr.remain = gr.remain; + tabGr.chargeTypeId = pdm()->chargeTypeIdFromGearAndChargeTasCode(tabGr.gearTypeId, gr.chargeTypeId); if (gr.gearSerialNumber == 0 && gr.gearTasCode == 0) - tabGr.gearId(gr.location); - outData.charge()[i] = tabGr; + tabGr.gearId = gr.location; + outData.charge[i] = tabGr; } publish(outData); @@ -582,13 +585,13 @@ void SendToDds::rxData(const TetraIcd::EquipmentGearEvent &inData) TrainingAreaBase::EquipmentGearEvent outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.chargeAmount(inData.chargeAmount); + outData.chargeAmount = inData.chargeAmount; TrainingAreaBase::GearCharge tabGr; - tabGr.gearId(inData.charge.gearSerialNumber); - tabGr.gearTypeId(pdm()->gearTypeIdFromTasGearTasCode(inData.charge.gearTasCode)); - tabGr.remain(inData.charge.remain); - tabGr.chargeTypeId(pdm()->chargeTypeIdFromGearAndChargeTasCode(tabGr.gearTypeId(), inData.charge.chargeTypeId)); - outData.charge(tabGr); + tabGr.gearId = inData.charge.gearSerialNumber; + tabGr.gearTypeId = pdm()->gearTypeIdFromTasGearTasCode(inData.charge.gearTasCode); + tabGr.remain = inData.charge.remain; + tabGr.chargeTypeId = pdm()->chargeTypeIdFromGearAndChargeTasCode(tabGr.gearTypeId, inData.charge.chargeTypeId); + outData.charge = tabGr; publish(outData); } @@ -599,16 +602,16 @@ void SendToDds::rxData(const TetraIcd::ParticipantSwVersions &inData) checkTimeStamp(inData); assignBase(inData, outData); - outData.equipments().resize(inData.equipments.size()); + outData.equipments.resize(inData.equipments.size()); TrainingAreaBase::EquipmentSwVersion eqpmt; for (size_t i = 0; i < inData.equipments.size(); ++i) { const TetraIcd::EquipmentSwVersion data = inData.equipments.at(i); - eqpmt.equipmentFunctionId(data.equipmentFunctionId); - eqpmt.subDeviceId(data.subDeviceId); - eqpmt.unqiueId(data.uniqueId); - eqpmt.swVersion(data.swVersion); - outData.equipments()[i] = eqpmt; + eqpmt.equipmentFunctionId = data.equipmentFunctionId; + eqpmt.subDeviceId = data.subDeviceId; + eqpmt.unqiueId = data.uniqueId; + eqpmt.swVersion = data.swVersion; + outData.equipments[i] = eqpmt; } publish(outData); @@ -619,10 +622,10 @@ void SendToDds::rxData(const TetraIcd::EquipmentMessageOC &inData) TrainingAreaBase::EquipmentMessage outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.subject(inData.subject); - outData.text(inData.message); - outData.sender(inData.senderId); - outData.receiver(inData.receiverId); + outData.subject = inData.subject; + outData.text = inData.message; + outData.sender = inData.senderId; + outData.receiver = inData.receiverId; publish(outData); } @@ -635,7 +638,7 @@ void SendToDds::rxData(const TetraIcd::OpaquePayloadDataIn &inData) { TrainingAreaBase::FireSmokeMarkerData outData; assignBase(inData, outData); - outData.payload() = inData.payload; + outData.payload = inData.payload; publish(outData); break; } @@ -649,7 +652,7 @@ void SendToDds::rxData(const TetraIcd::OpaquePayloadDataIn &inData) ctasErrorPosition(inData); return; } - outData.payload() = inData.payload; + outData.payload = inData.payload; publish(outData); break; } @@ -657,7 +660,7 @@ void SendToDds::rxData(const TetraIcd::OpaquePayloadDataIn &inData) { TrainingAreaBase::TargetData outData; assignBase(inData, outData); - outData.payload() = inData.payload; + outData.payload = inData.payload; publish(outData); break; } @@ -665,7 +668,7 @@ void SendToDds::rxData(const TetraIcd::OpaquePayloadDataIn &inData) { TrainingAreaBase::OcData outData; assignBase(inData, outData); - outData.payload() = inData.payload; + outData.payload = inData.payload; publish(outData); } } @@ -676,18 +679,18 @@ void SendToDds::rxData(const TetraIcd::ParticipantModeReport &inData) TrainingAreaBase::ParticipantModeReport outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.language(static_cast(inData.language)); - outData.operationMode(static_cast(inData.operationMode)); - outData.reactivationDetoxication(inData.reactivationDetoxication); - outData.reactivationMaintenance(inData.reactivationMaintenance); - outData.reactivationMedic(inData.reactivationMedic); - outData.protectionModeVest(static_cast(inData.modeVest)); - outData.protectionModeHelmet(static_cast(inData.modeHelmet)); - outData.personellProtectionMode(static_cast(inData.personellProtectionMode)); - outData.protectionLevel(static_cast(inData.protectionLevel)); - outData.handgrenadeSearchMode(static_cast(inData.handgrenadeSearchMode)); - outData.internationalMode(static_cast(inData.internationalMode)); - outData.abcProtectionMode(static_cast(inData.abcProtectionMode)); + outData.language = static_cast(inData.language); + outData.operationMode = static_cast(inData.operationMode); + outData.reactivationDetoxication = inData.reactivationDetoxication; + outData.reactivationMaintenance = inData.reactivationMaintenance; + outData.reactivationMedic = inData.reactivationMedic; + outData.protectionModeVest = static_cast(inData.modeVest); + outData.protectionModeHelmet = static_cast(inData.modeHelmet); + outData.personellProtectionMode = static_cast(inData.personellProtectionMode); + outData.protectionLevel = static_cast(inData.protectionLevel); + outData.handgrenadeSearchMode = static_cast(inData.handgrenadeSearchMode); + outData.internationalMode = static_cast(inData.internationalMode); + outData.abcProtectionMode = static_cast(inData.abcProtectionMode); publish(outData); @@ -698,21 +701,21 @@ void SendToDds::rxData(const TetraIcd::ParticipantConfigurationReport &inData) TrainingAreaBase::ParticipantConfigurationReport outData; checkTimeStamp(inData); assignBase(inData, outData); - outData.positionIntervallVehicle(inData.positionIntervallVehicle); - outData.positionIntervallPersonell(inData.positionIntervallPersonell); - outData.positionIntervallAircraft(inData.positionIntervallAircraft); - outData.positionTransmissionIntervall(inData.positionTransmissionIntervall); - outData.heightbarrier(inData.heightbarrier); - outData.faultPositionHandling(static_cast(inData.faultPositionHandling)); - outData.switchingPositionIntervall(static_cast(inData.switchingPositionIntervall)); - outData.waittimeAdditionalBroadcastRequest(inData.waittimeAdditionalBroadcastDemand); - outData.factorWaittimeIncreaseHighload(inData.factorWaittimeIncreaseAtHighload); - outData.waittimeAutomaticVulnerbilityIncreaseLevel1(inData.waittimeAutomaticVulnerabilityIncreaseLevel1); - outData.waittimeAutomaticVulnerbilityIncreaseLevel2(inData.waittimeAutomaticVulnerabilityIncreaseLevel2); - outData.waittimeAutomaticVulnerbilityIncreaseLevel3(inData.waittimeAutomaticVulnerabilityIncreaseLevel3); - outData.opticalCode(static_cast(inData.opticalCode)); - outData.vulnerabilityModel(inData.vulnerabilityModel); - outData.validTimeOps(inData.validTimeOps); + outData.positionIntervallVehicle = inData.positionIntervallVehicle; + outData.positionIntervallPersonell = inData.positionIntervallPersonell; + outData.positionIntervallAircraft = inData.positionIntervallAircraft; + outData.positionTransmissionIntervall = inData.positionTransmissionIntervall; + outData.heightbarrier = inData.heightbarrier; + outData.faultPositionHandling = static_cast(inData.faultPositionHandling); + outData.switchingPositionIntervall = static_cast(inData.switchingPositionIntervall); + outData.waittimeAdditionalBroadcastRequest = inData.waittimeAdditionalBroadcastDemand; + outData.factorWaittimeIncreaseHighload = inData.factorWaittimeIncreaseAtHighload; + outData.waittimeAutomaticVulnerbilityIncreaseLevel1 = inData.waittimeAutomaticVulnerabilityIncreaseLevel1; + outData.waittimeAutomaticVulnerbilityIncreaseLevel2 = inData.waittimeAutomaticVulnerabilityIncreaseLevel2; + outData.waittimeAutomaticVulnerbilityIncreaseLevel3 = inData.waittimeAutomaticVulnerabilityIncreaseLevel3; + outData.opticalCode = static_cast(inData.opticalCode); + outData.vulnerabilityModel = inData.vulnerabilityModel; + outData.validTimeOps = inData.validTimeOps; publish(outData); } @@ -721,10 +724,10 @@ void SendToDds::rxData(const TetraIcd::EmergencyCall &inData) { TrainingAreaBase::EmergencyCall outData; - outData.equipmentNumber(inData.issi); - outData.sampleTime(inData.timeStamp); + outData.equipmentNumber = inData.issi; + outData.sampleTime = inData.timeStamp; const Core::GeoPosition2D pos(inData.absPosition.lon, inData.absPosition.lat); - outData.position(pos); + outData.position = pos; m_mainHandler->ddsHandler()->emergencyCall()->write(outData); @@ -743,20 +746,20 @@ void SendToDds::rxData(const TetraIcd::EmergencyCall &inData) void SendToDds::rxData(const TetraIcd::SanitationRepair &inData) { TrainingAreaBase::ParticipantSanitationRepair sanRepair; - sanRepair.equipmentNumber(inData.header.equipmentNumber); - sanRepair.sampleTime(inData.header.timeStamp); - sanRepair.originatorType(static_cast(inData.originatorType)); - sanRepair.equipmentNumberOrigin(inData.equipmentNumberOrigin); - sanRepair.stateStart(static_cast(inData.stateStart)); - sanRepair.typeOfTreatment(inData.typeOfTreatment); - sanRepair.triage(inData.triage); - sanRepair.tyeOfDamage(inData.tyeOfDamage); - sanRepair.stateResult(static_cast(inData.stateResult)); - sanRepair.treatmentResult(static_cast(inData.treatmentResult)); - sanRepair.triagePriority(inData.triagePriority); - sanRepair.fullState(inData.fullState); - sanRepair.timeOfTreatment(inData.timeOfTreatment); - sanRepair.timeOfRecovery(inData.timeOfRecovery); + sanRepair.equipmentNumber = inData.header.equipmentNumber; + sanRepair.sampleTime = inData.header.timeStamp; + sanRepair.originatorType = static_cast(inData.originatorType); + sanRepair.equipmentNumberOrigin = inData.equipmentNumberOrigin; + sanRepair.stateStart = static_cast(inData.stateStart); + sanRepair.typeOfTreatment = inData.typeOfTreatment; + sanRepair.triage = inData.triage; + sanRepair.tyeOfDamage = inData.tyeOfDamage; + sanRepair.stateResult = static_cast(inData.stateResult); + sanRepair.treatmentResult = static_cast(inData.treatmentResult); + sanRepair.triagePriority = inData.triagePriority; + sanRepair.fullState = inData.fullState; + sanRepair.timeOfTreatment = inData.timeOfTreatment; + sanRepair.timeOfRecovery = inData.timeOfRecovery; publish(sanRepair); } @@ -764,85 +767,85 @@ void SendToDds::rxData(const TetraIcd::SanitationRepair &inData) void SendToDds::rxData(const TetraIcd::SanitaryMaterialStockReport &inData) { TrainingAreaBase::ParticipantSanitaryMaterialStockReport sanReport; - sanReport.equipmentNumber(inData.header.equipmentNumber); - sanReport.sampleTime(inData.header.timeStamp); - sanReport.sanitaryMaterialCount(inData.sanitaryMaterialCount); - sanReport.sanitaryMaterialStock(inData.sanitaryMaterialStock); - sanReport.uniqueId(inData.uniqueId); - sanReport.originatorEquipmentNumber(inData.originatorEquipmentNumber); - sanReport.qualification(static_cast(inData.qualification)); + sanReport.equipmentNumber = inData.header.equipmentNumber; + sanReport.sampleTime = inData.header.timeStamp; + sanReport.sanitaryMaterialCount = inData.sanitaryMaterialCount; + sanReport.sanitaryMaterialStock = inData.sanitaryMaterialStock; + sanReport.uniqueId = inData.uniqueId; + sanReport.originatorEquipmentNumber = inData.originatorEquipmentNumber; + sanReport.qualification = static_cast(inData.qualification); publish(sanReport); - DEBUG_LOG(m_logger) << "SendToDds::rxData(const TetraIcd::SanitaryMaterialStockReport for " << sanReport.equipmentNumber(); + DEBUG_LOG(m_logger) << "SendToDds::rxData(const TetraIcd::SanitaryMaterialStockReport for " << sanReport.equipmentNumber; - if (sanReport.qualification() == TrainingAreaBase::Qualification::NotDefined) + if (sanReport.qualification == TrainingAreaBase::Qualification::NotDefined) { - int oldEquipNo = m_uniqueId2EquipmentNumber.value(sanReport.uniqueId()); + int oldEquipNo = m_uniqueId2EquipmentNumber.value(sanReport.uniqueId); if (oldEquipNo > 0) { TrainingAreaBase::ParticipantSanitation sanitation; - sanitation.equipmentNumber(oldEquipNo); - sanitation.sampleTime(sanReport.sampleTime()); - sanitation.proceduresTaken(0); - sanitation.uniqueId(sanReport.uniqueId()); - sanitation.originatorEquipmentNumber(0); - sanitation.qualification(TrainingAreaBase::Qualification::NotDefined); - sanitation.sanitationResult(TrainingAreaBase::SanitationResult::NoEffect); - sanitation.sanitationEvaluation(TrainingAreaBase::SanitationEvaluation::NotApplicable); + sanitation.equipmentNumber = oldEquipNo; + sanitation.sampleTime = sanReport.sampleTime; + sanitation.proceduresTaken = 0; + sanitation.uniqueId = sanReport.uniqueId; + sanitation.originatorEquipmentNumber = 0; + sanitation.qualification = TrainingAreaBase::Qualification::NotDefined; + sanitation.sanitationResult = TrainingAreaBase::SanitationResult::NoEffect; + sanitation.sanitationEvaluation = TrainingAreaBase::SanitationEvaluation::NotApplicable; publish(sanitation); } - m_uniqueId2EquipmentNumber.remove(sanReport.uniqueId()); + m_uniqueId2EquipmentNumber.remove(sanReport.uniqueId); } - onPvSanUniqueIdMapping(sanReport.uniqueId(), sanReport.equipmentNumber(), sanReport.sampleTime()); + onPvSanUniqueIdMapping(sanReport.uniqueId, sanReport.equipmentNumber, sanReport.sampleTime); } void SendToDds::rxData(const TetraIcd::Sanitation &inData) { TrainingAreaBase::ParticipantSanitation sanitation; - sanitation.equipmentNumber(inData.header.equipmentNumber); - sanitation.sampleTime(inData.header.timeStamp); - sanitation.proceduresTaken(inData.proceduresTaken); - sanitation.uniqueId(inData.uniqeId); - sanitation.originatorEquipmentNumber(inData.originatorEquipmentNumber); - sanitation.qualification(static_cast(inData.qualification)); - sanitation.sanitationResult(static_cast(inData.sanitationResult)); - sanitation.sanitationEvaluation(static_cast(inData.sanitationEvaluation)); + sanitation.equipmentNumber = inData.header.equipmentNumber; + sanitation.sampleTime = inData.header.timeStamp; + sanitation.proceduresTaken = inData.proceduresTaken; + sanitation.uniqueId = inData.uniqeId; + sanitation.originatorEquipmentNumber = inData.originatorEquipmentNumber; + sanitation.qualification = static_cast(inData.qualification); + sanitation.sanitationResult = static_cast(inData.sanitationResult); + sanitation.sanitationEvaluation = static_cast(inData.sanitationEvaluation); publish(sanitation); - DEBUG_LOG(m_logger) << "SendToDds::rxData(const TetraIcd::Sanitation for " << sanitation.equipmentNumber(); + DEBUG_LOG(m_logger) << "SendToDds::rxData(const TetraIcd::Sanitation for " << sanitation.equipmentNumber; - if (sanitation.qualification() == TrainingAreaBase::Qualification::NotDefined) + if (sanitation.qualification == TrainingAreaBase::Qualification::NotDefined) { TrainingAreaBase::ParticipantSanitaryMaterialStockReport sanReport; - sanReport.equipmentNumber(sanitation.equipmentNumber()); - sanReport.sampleTime(sanitation.sampleTime()); - sanReport.sanitaryMaterialCount(0); - sanReport.sanitaryMaterialStock(std::vector()); - sanReport.uniqueId(sanitation.uniqueId()); - sanReport.originatorEquipmentNumber(0); - sanReport.qualification(TrainingAreaBase::Qualification::NotDefined); + sanReport.equipmentNumber = sanitation.equipmentNumber; + sanReport.sampleTime = sanitation.sampleTime; + sanReport.sanitaryMaterialCount = 0; + sanReport.sanitaryMaterialStock = std::vector(); + sanReport.uniqueId = sanitation.uniqueId; + sanReport.originatorEquipmentNumber = 0; + sanReport.qualification = TrainingAreaBase::Qualification::NotDefined; publish(sanReport); - m_uniqueId2EquipmentNumber.remove(sanitation.uniqueId()); + m_uniqueId2EquipmentNumber.remove(sanitation.uniqueId); } else - onPvSanUniqueIdMapping(sanitation.uniqueId(), sanitation.equipmentNumber(), sanitation.sampleTime()); + onPvSanUniqueIdMapping(sanitation.uniqueId, sanitation.equipmentNumber, sanitation.sampleTime); } void SendToDds::rxData(const TetraIcd::ApacheLaserDesignation &inData) { TrainingAreaBase::LaserDesignation laserDesignation; - laserDesignation.equipmentNumber(inData.header.equipmentNumber); - laserDesignation.sampleTime(inData.header.timeStamp); - laserDesignation.spotLocation(Core::GeoPosition2D(inData.spotLocation.lon, inData.spotLocation.lat)); - laserDesignation.outputPower(inData.outputPower); - laserDesignation.code(inData.code); - laserDesignation.gearId(inData.gearId); + laserDesignation.equipmentNumber = inData.header.equipmentNumber; + laserDesignation.sampleTime = inData.header.timeStamp; + laserDesignation.spotLocation = Core::GeoPosition2D(inData.spotLocation.lon, inData.spotLocation.lat); + laserDesignation.outputPower = inData.outputPower; + laserDesignation.code = inData.code; + laserDesignation.gearId = inData.gearId; publish(laserDesignation); } @@ -851,35 +854,35 @@ void SendToDds::ctasErrorPosition(const S &data) { TrainingAreaBase::CtaDataError error; - error.equipmentNumber(data.header.equipmentNumber); - error.sampleTime(data.header.timeStamp); - error.reason(ProjectDataManagement::DataErrorReason_def::InvalidPosition); - error.originTelegramId(data.id()); + error.equipmentNumber = data.header.equipmentNumber; + error.sampleTime = data.header.timeStamp; + error.reason = ProjectDataManagement::DataErrorReason::DataErrorReason_InvalidPosition; + error.originTelegramId = data.id(); publish(error); } void SendToDds::rxData(const TetraIcd::BatteryInfo &inData) { TrainingAreaBase::BatteryInfo batteryInfo; - batteryInfo.equipmentNumber(inData.header.equipmentNumber); - batteryInfo.sampleTime(inData.header.timeStamp); + batteryInfo.equipmentNumber = inData.header.equipmentNumber; + batteryInfo.sampleTime = inData.header.timeStamp; std::vector batteryStates; batteryStates.reserve(inData.batteryStates.size()); for(const TetraIcd::BatteryState &batState : std::as_const(inData.batteryStates)) { TrainingAreaBase::BatteryState batStateOut; - batStateOut.batteryPort(batState.batteryPort); - batStateOut.batteryPercent(batState.batteryPercent); - batStateOut.current(batState.current); - batStateOut.frequency(batState.frequency); - batStateOut.generic(batState.generic); - batStateOut.serialNumber(batState.serialNumber.toStdString()); - batStateOut.switchOrValue(batState.switchOrValue); - batStateOut.temperature(batState.temperature); - batStateOut.voltage(batState.voltage); + batStateOut.batteryPort = batState.batteryPort(); + batStateOut.batteryPercent = batState.batteryPercent(); + batStateOut.current = batState.current(); + batStateOut.frequency = batState.frequency(); + batStateOut.generic = batState.generic(); + batStateOut.serialNumber = batState.serialNumber().toStdString(); + batStateOut.switchOrValue = batState.switchOrValue(); + batStateOut.temperature = batState.temperature(); + batStateOut.voltage = batState.voltage(); batteryStates.push_back(batStateOut); } - batteryInfo.batteryStates(batteryStates); + batteryInfo.batteryStates = batteryStates; publish(batteryInfo); } @@ -887,23 +890,23 @@ void SendToDds::rxData(const TetraIcd::BatteryInfo &inData) void SendToDds::rxData(const TetraIcd::BatteryAlarm &inData) { TrainingAreaBase::BatteryAlarm batAlarm; - batAlarm.acknowledge(inData.acknowledge); - batAlarm.alarmTime(inData.alarmTime); - batAlarm.condition(inData.condition); - batAlarm.description(inData.description.toStdString()); - batAlarm.batteryPort(inData.id); - batAlarm.uniqueAlarmNumber(inData.uniqueAlarmNumber); - batAlarm.equipmentNumber(inData.header.equipmentNumber); - batAlarm.sampleTime(inData.header.timeStamp); + batAlarm.acknowledge = inData.acknowledge(); + batAlarm.alarmTime = inData.alarmTime(); + batAlarm.condition = inData.condition(); + batAlarm.description = inData.description().toStdString(); + batAlarm.batteryPort = inData.id(); + batAlarm.uniqueAlarmNumber = inData.uniqueAlarmNumber(); + batAlarm.equipmentNumber = inData.header().equipmentNumber; + batAlarm.sampleTime = inData.header().timeStamp; publish(batAlarm); } void SendToDds::rxData(const TetraIcd::ServiceControl &inData) { TrainingAreaBase::ServiceControl serviceControl; - serviceControl.equipmentNumber(inData.header.equipmentNumber); - serviceControl.sampleTime(inData.header.timeStamp); - serviceControl.serviceControlState(static_cast(inData.serviceControlState)); + serviceControl.equipmentNumber = inData.header.equipmentNumber; + serviceControl.sampleTime = inData.header.timeStamp; + serviceControl.serviceControlState = static_cast(inData.serviceControlState); publish(serviceControl); } @@ -917,12 +920,12 @@ void SendToDds::rxData(const TetraIcd::RestoreRadioReadiness &inData) RestoreRadioReadiness restoreRadioReadiness; - restoreRadioReadiness.equipmentNumber(inData.header.equipmentNumber); - restoreRadioReadiness.sampleTime(inData.header.timeStamp); - restoreRadioReadiness.readinessLossPosition(m_posHandler->relativeToGeographic(inData.readinessLossPosition)); - restoreRadioReadiness.readinessLossTime(inData.readinessLossTime); - restoreRadioReadiness.readinessRestorePosition(m_posHandler->relativeToGeographic(inData.readinessRestorePosition)); - restoreRadioReadiness.readinessRestoreTime(inData.readinessRestoreTime); + restoreRadioReadiness.equipmentNumber = inData.header.equipmentNumber; + restoreRadioReadiness.sampleTime = inData.header.timeStamp; + restoreRadioReadiness.readinessLossPosition = m_posHandler->relativeToGeographic(inData.readinessLossPosition); + restoreRadioReadiness.readinessLossTime = inData.readinessLossTime; + restoreRadioReadiness.readinessRestorePosition = m_posHandler->relativeToGeographic(inData.readinessRestorePosition); + restoreRadioReadiness.readinessRestoreTime = inData.readinessRestoreTime; publish(restoreRadioReadiness); } @@ -935,22 +938,22 @@ void SendToDds::rxData(const TetraIcd::UAVRadioLinkConnectionStatus &inData) switch (inData.uavConnectionState) { case TetraIcd::UAVRadioLinkConnectionStatusType::Connected: - outData.connectionStatus(ProjectDataManagement::UasState::UasState_On); + outData.connectionStatus = ProjectDataManagement::UasState::UasState_On; break; case TetraIcd::UAVRadioLinkConnectionStatusType::Disconnected: - outData.connectionStatus(ProjectDataManagement::UasState::UasState_Off); + outData.connectionStatus = ProjectDataManagement::UasState::UasState_Off; break; case TetraIcd::UAVRadioLinkConnectionStatusType::Connecting: - outData.connectionStatus(ProjectDataManagement::UasState::UasState_Init); + outData.connectionStatus = ProjectDataManagement::UasState::UasState_Init; break; case TetraIcd::UAVRadioLinkConnectionStatusType::Diconnecting: - outData.connectionStatus(ProjectDataManagement::UasState::UasState_Shutdown); + outData.connectionStatus = ProjectDataManagement::UasState::UasState_Shutdown; break; case TetraIcd::UAVRadioLinkConnectionStatusType::Error: - outData.connectionStatus(ProjectDataManagement::UasState::UasState_Undefined); + outData.connectionStatus = ProjectDataManagement::UasState::UasState_Undefined; break; case TetraIcd::UAVRadioLinkConnectionStatusType::Undefined: - outData.connectionStatus(ProjectDataManagement::UasState::UasState_Undefined); + outData.connectionStatus = ProjectDataManagement::UasState::UasState_Undefined; break; } @@ -964,18 +967,18 @@ void SendToDds::rxData(const TetraIcd::UAVMissionStatus &inData) switch (inData.currentAction) { - case TetraIcd::UAVActionTask::Undefined: outData.currentTask(ProjectDataManagement::UasActionTask::Undefined); break; - case TetraIcd::UAVActionTask::Disarm: outData.currentTask(ProjectDataManagement::UasActionTask::Disarm); break; - case TetraIcd::UAVActionTask::Arm: outData.currentTask(ProjectDataManagement::UasActionTask::Arm); break; - case TetraIcd::UAVActionTask::Takeoff: outData.currentTask(ProjectDataManagement::UasActionTask::Takeoff); break; - case TetraIcd::UAVActionTask::Connect: outData.currentTask(ProjectDataManagement::UasActionTask::Connect); break; - case TetraIcd::UAVActionTask::Loiter: outData.currentTask(ProjectDataManagement::UasActionTask::Loiter); break; - case TetraIcd::UAVActionTask::Return: outData.currentTask(ProjectDataManagement::UasActionTask::Return); break; - case TetraIcd::UAVActionTask::Observe: outData.currentTask(ProjectDataManagement::UasActionTask::Observe); break; + case TetraIcd::UAVActionTask::Undefined: outData.currentTask = ProjectDataManagement::UasActionTask::Undefined; break; + case TetraIcd::UAVActionTask::Disarm: outData.currentTask = ProjectDataManagement::UasActionTask::Disarm; break; + case TetraIcd::UAVActionTask::Arm: outData.currentTask = ProjectDataManagement::UasActionTask::Arm; break; + case TetraIcd::UAVActionTask::Takeoff: outData.currentTask = ProjectDataManagement::UasActionTask::Takeoff; break; + case TetraIcd::UAVActionTask::Connect: outData.currentTask = ProjectDataManagement::UasActionTask::Connect; break; + case TetraIcd::UAVActionTask::Loiter: outData.currentTask = ProjectDataManagement::UasActionTask::Loiter; break; + case TetraIcd::UAVActionTask::Return: outData.currentTask = ProjectDataManagement::UasActionTask::Return; break; + case TetraIcd::UAVActionTask::Observe: outData.currentTask = ProjectDataManagement::UasActionTask::Observe; break; } - outData.currentMissionName(inData.currentMissionName.toStdString()); - outData.missionEnded(inData.missionEnded.toStdString()); + outData.currentMissionName = inData.currentMissionName.toStdString(); + outData.missionEnded = inData.missionEnded.toStdString(); publish(outData); } @@ -988,37 +991,37 @@ void SendToDds::rxData(const TetraIcd::UAVStatus &inData) switch (inData.uavState) { case TetraIcd::UAVState::On: - outData.uasState(ProjectDataManagement::UasState::UasState_On); + outData.uasState = ProjectDataManagement::UasState::UasState_On; break; case TetraIcd::UAVState::Off: - outData.uasState(ProjectDataManagement::UasState::UasState_Off); + outData.uasState = ProjectDataManagement::UasState::UasState_Off; break; case TetraIcd::UAVState::Init: - outData.uasState(ProjectDataManagement::UasState::UasState_Init); + outData.uasState = ProjectDataManagement::UasState::UasState_Init; break; case TetraIcd::UAVState::Shutdown: - outData.uasState(ProjectDataManagement::UasState::UasState_Shutdown); + outData.uasState = ProjectDataManagement::UasState::UasState_Shutdown; break; case TetraIcd::UAVState::Calibrating: - outData.uasState(ProjectDataManagement::UasState::UasState_Calibrating); + outData.uasState = ProjectDataManagement::UasState::UasState_Calibrating; break; case TetraIcd::UAVState::Manual: - outData.uasState(ProjectDataManagement::UasState::UasState_Manual); + outData.uasState = ProjectDataManagement::UasState::UasState_Manual; break; case TetraIcd::UAVState::Maintenance: - outData.uasState(ProjectDataManagement::UasState::UasState_Maintenance); + outData.uasState = ProjectDataManagement::UasState::UasState_Maintenance; break; case TetraIcd::UAVState::Standby: - outData.uasState(ProjectDataManagement::UasState::UasState_Standby); + outData.uasState = ProjectDataManagement::UasState::UasState_Standby; break; case TetraIcd::UAVState::Normal: - outData.uasState(ProjectDataManagement::UasState::UasState_Normal); + outData.uasState = ProjectDataManagement::UasState::UasState_Normal; break; case TetraIcd::UAVState::Auto: - outData.uasState(ProjectDataManagement::UasState::UasState_Auto); + outData.uasState = ProjectDataManagement::UasState::UasState_Auto; break; case TetraIcd::UAVState::Undefined: - outData.uasState(ProjectDataManagement::UasState::UasState_Undefined); + outData.uasState = ProjectDataManagement::UasState::UasState_Undefined; break; } @@ -1037,9 +1040,9 @@ bool SendToDds::setPosition(T &data, TrainingAreaBase::TabPosition tabPos; if (geoPos.isValid()) { - tabPos.position(Core::GeoPosition(geoPos.lon, geoPos.lat, geoPos.z)); - setOptionalBuildingRoomId(tabPos.moutObjectId(), opsPos.moutObjectId); - setOptionalBuildingRoomId(tabPos.moutRoomId(), opsPos.moutRoomId); + tabPos.position = Core::GeoPosition(geoPos.lon, geoPos.lat, geoPos.z); + setOptionalBuildingRoomId(tabPos.moutObjectId, opsPos.moutObjectId); + setOptionalBuildingRoomId(tabPos.moutRoomId, opsPos.moutRoomId); @@ -1049,15 +1052,15 @@ bool SendToDds::setPosition(T &data, if (bWlsLocationLost) { TrainingAreaBase::TabPosition lastTabPos = - m_posHandler->lastPosition(data.equipmentNumber()); - if (lastTabPos.reportingSource() == Core::PositionReportingSource::Wls || - std::isnan(lastTabPos.position().lon())) - tabPos.reportingSource(Core::PositionReportingSource::Gps); + m_posHandler->lastPosition(data.equipmentNumber); + if (lastTabPos.reportingSource == Core::PositionReportingSource::Wls || + std::isnan(lastTabPos.position.lon)) + tabPos.reportingSource = Core::PositionReportingSource::Gps; else std::swap(tabPos, lastTabPos); } else - tabPos.reportingSource(Core::PositionReportingSource::Wls); + tabPos.reportingSource = Core::PositionReportingSource::Wls; } else if (opsPos.opsId == 0) { @@ -1067,7 +1070,7 @@ bool SendToDds::setPosition(T &data, { - tabPos = m_posHandler->lastPosition(data.equipmentNumber()); + tabPos = m_posHandler->lastPosition(data.equipmentNumber); @@ -1075,14 +1078,14 @@ bool SendToDds::setPosition(T &data, - DEBUG_LOG(m_logger) << "ops == 0 got last Position its source is " << tabPos.reportingSource(); + DEBUG_LOG(m_logger) << "ops == 0 got last Position its source is " << tabPos.reportingSource; - if (tabPos.reportingSource() != Core::PositionReportingSource::Wls - && tabPos.reportingSource() != Core::PositionReportingSource::Ops - && tabPos.reportingSource() != Core::PositionReportingSource::OpsTunnel) + if (tabPos.reportingSource != Core::PositionReportingSource::Wls + && tabPos.reportingSource != Core::PositionReportingSource::Ops + && tabPos.reportingSource != Core::PositionReportingSource::OpsTunnel) tabPos = TrainingAreaBase::TabPosition(); - else if (tabPos.reportingSource() == Core::PositionReportingSource::Ops - || tabPos.reportingSource() == Core::PositionReportingSource::OpsTunnel) + else if (tabPos.reportingSource == Core::PositionReportingSource::Ops + || tabPos.reportingSource == Core::PositionReportingSource::OpsTunnel) changeReportSource = false; DEBUG_LOG(m_logger) << "ops == 0 changeSource is " << changeReportSource ; } @@ -1094,25 +1097,25 @@ bool SendToDds::setPosition(T &data, DEBUG_LOG(m_logger) << "bret = false"; bRet = false; } - tabPos.position(m_posHandler->relativeToGeographic(relPos)); - setOptionalBuildingRoomId(tabPos.moutObjectId(), opsPos.moutObjectId); - setOptionalBuildingRoomId(tabPos.moutRoomId(), opsPos.moutRoomId); + tabPos.position = m_posHandler->relativeToGeographic(relPos); + setOptionalBuildingRoomId(tabPos.moutObjectId, opsPos.moutObjectId); + setOptionalBuildingRoomId(tabPos.moutRoomId, opsPos.moutRoomId); - TrainingAreaBase::TabPosition lastPosition = m_posHandler->lastPosition(data.equipmentNumber()); + TrainingAreaBase::TabPosition lastPosition = m_posHandler->lastPosition(data.equipmentNumber); { - DEBUG_LOG(m_logger) << "lastPosition.reportingSource=" << lastPosition.reportingSource(); + DEBUG_LOG(m_logger) << "lastPosition.reportingSource=" << lastPosition.reportingSource; } - if (lastPosition.reportingSource() == Core::PositionReportingSource::Ops && - lastPosition.moutObjectId().is_set()) + if (lastPosition.reportingSource == Core::PositionReportingSource::Ops && + lastPosition.moutObjectId.is_set()) { - DEBUG_LOG(m_logger) << "Check leave Building equipmentNumber=" << data.equipmentNumber(); + DEBUG_LOG(m_logger) << "Check leave Building equipmentNumber=" << data.equipmentNumber; DEBUG_LOG(m_logger) << "relPos=" << relPos.offsetX << "/" << relPos.offsetY; DEBUG_LOG(m_logger) << "posInExtendedBuildingFootprint"; - const Core::GeoPosition &position = tabPos.position(); - int moutObjectId = lastPosition.moutObjectId().get(); - const int lastMountPointTypeId = m_posHandler->lastMountPointTypeId(data.equipmentNumber()); + const Core::GeoPosition &position = tabPos.position; + int moutObjectId = lastPosition.moutObjectId.get(); + const int lastMountPointTypeId = m_posHandler->lastMountPointTypeId(data.equipmentNumber); if (ism()->posInExtendedBuildingFootprint(moutObjectId, position, lastMountPointTypeId)) { moutCheck = false; @@ -1120,13 +1123,13 @@ bool SendToDds::setPosition(T &data, } else { - DEBUG_LOG(m_logger) << "lastMountPointTypeId =" << m_posHandler->lastMountPointTypeId(data.equipmentNumber()); + DEBUG_LOG(m_logger) << "lastMountPointTypeId =" << m_posHandler->lastMountPointTypeId(data.equipmentNumber); - if ( m_posHandler->lastMountPointTypeId(data.equipmentNumber()) == InfrastructureManagement::MountingPointType_def::IndoorIPS) + if ( m_posHandler->lastMountPointTypeId(data.equipmentNumber) == static_cast(InfrastructureManagement::MountingPointType::IndoorIPS)) { - double speed = m_posHandler->speed(relPos, data.equipmentNumber(), timeStamp); - bool checkSpeed = !m_posHandler->isTimeToPerformSpeedCheckExceeded(data.equipmentNumber(), + double speed = m_posHandler->speed(relPos, data.equipmentNumber, timeStamp); + bool checkSpeed = !m_posHandler->isTimeToPerformSpeedCheckExceeded(data.equipmentNumber, timeStamp, Settings::maxSpeedCheckTimeout()); DEBUG_LOG(m_logger) << "Check Speed speed=" << speed @@ -1148,7 +1151,7 @@ bool SendToDds::setPosition(T &data, } if (changeReportSource) - tabPos.reportingSource(Core::PositionReportingSource::Gps); + tabPos.reportingSource = Core::PositionReportingSource::Gps; } else { @@ -1160,13 +1163,13 @@ bool SendToDds::setPosition(T &data, opsData = ism()->dataFromOpsCode(opsPos.opsId); - DEBUG_LOG(m_logger) << "equipmentNumber=" << data.equipmentNumber() + DEBUG_LOG(m_logger) << "equipmentNumber=" << data.equipmentNumber << " AssetId=" << opsData.assetId << " opsData.structureElementId=" << opsData.structureElementId << " opsData.mseId=" << opsData.mainStructureElementId << " opsData.mptTypeId=" << opsData.mountingPointTypeId; if ( opsData.structureElementId != 0) - m_posHandler->setLastMountPointTypeId(data.equipmentNumber(), opsData.mountingPointTypeId); + m_posHandler->setLastMountPointTypeId(data.equipmentNumber, opsData.mountingPointTypeId); } if (opsData.opsCode != opsPos.opsId) @@ -1182,16 +1185,16 @@ bool SendToDds::setPosition(T &data, else { DEBUG_LOG(m_logger) << "ops id " << opsPos.opsId; - tabPos.moutObjectId(opsData.mainStructureElementId); - tabPos.moutRoomId(opsData.roomId); - tabPos.position(opsData.position); - m_posHandler->setLastBuildingId(data.equipmentNumber(), opsData.mainStructureElementId); - m_posHandler->setLastRoomId(data.equipmentNumber(), opsData.roomId); + tabPos.moutObjectId = opsData.mainStructureElementId; + tabPos.moutRoomId = opsData.roomId; + tabPos.position = opsData.position; + m_posHandler->setLastBuildingId(data.equipmentNumber, opsData.mainStructureElementId); + m_posHandler->setLastRoomId(data.equipmentNumber, opsData.roomId); } if (opsData.opsTunnel) - tabPos.reportingSource(Core::PositionReportingSource::OpsTunnel); + tabPos.reportingSource = Core::PositionReportingSource::OpsTunnel; else - tabPos.reportingSource(Core::PositionReportingSource::Ops); + tabPos.reportingSource = Core::PositionReportingSource::Ops; } if (!bRet) @@ -1199,19 +1202,19 @@ bool SendToDds::setPosition(T &data, if ( moutCheck ) { DEBUG_LOG(m_logger) << "POS = ungueltig"; - tabPos.position().lon(nan("")); - tabPos.position().lat(nan("")); + tabPos.position.lon = nan(""); + tabPos.position.lat = nan(""); } else { DEBUG_LOG(m_logger) << "POS = ungueltig => alte Pos mit aktueller Zeit verschicken"; - TrainingAreaBase::TabPosition lastPosition = m_posHandler->lastPosition(data.equipmentNumber()); - tabPos.position().lon(lastPosition.position().lon()); - tabPos.position().lat(lastPosition.position().lat()); - tabPos.position().z(lastPosition.position().z()); - tabPos.reportingSource(Core::PositionReportingSource::OpsBuilding); - tabPos.moutObjectId(m_posHandler->lastBuildingId(data.equipmentNumber())); - tabPos.moutRoomId(m_posHandler->lastRoomId(data.equipmentNumber())); + TrainingAreaBase::TabPosition lastPosition = m_posHandler->lastPosition(data.equipmentNumber); + tabPos.position.lon = lastPosition.position.lon; + tabPos.position.lat = lastPosition.position.lat; + tabPos.position.z = lastPosition.position.z; + tabPos.reportingSource = Core::PositionReportingSource::OpsBuilding; + tabPos.moutObjectId = m_posHandler->lastBuildingId(data.equipmentNumber); + tabPos.moutRoomId = m_posHandler->lastRoomId(data.equipmentNumber); bRet = true; } } @@ -1219,16 +1222,16 @@ bool SendToDds::setPosition(T &data, else { DEBUG_LOG(m_logger) << "set last Position"; - if (tabPos.reportingSource() == Core::PositionReportingSource::Ops) + if (tabPos.reportingSource == Core::PositionReportingSource::Ops) DEBUG_LOG(m_logger) << "ReportingSource=OPS"; - else if (tabPos.reportingSource() == Core::PositionReportingSource::Gps) + else if (tabPos.reportingSource == Core::PositionReportingSource::Gps) DEBUG_LOG(m_logger) << "ReportingSource=GPS"; - DEBUG_LOG(m_logger) << "tabPos.reportingSource=" << tabPos.reportingSource() + DEBUG_LOG(m_logger) << "tabPos.reportingSource=" << tabPos.reportingSource << " timeStamp=" << timeStamp; - m_posHandler->setLastPosition(data.equipmentNumber(), tabPos); - m_posHandler->setLastTime(data.equipmentNumber(), timeStamp); + m_posHandler->setLastPosition(data.equipmentNumber, tabPos); + m_posHandler->setLastTime(data.equipmentNumber, timeStamp); } - data.position(tabPos); + data.position = tabPos; return bRet; } @@ -1241,22 +1244,22 @@ bool SendToDds::setPosition2d(T &data, bool bRet = true; if (PositionHandler::isPositionMarkedInvalid(relPos)) - tabPos = m_posHandler->lastPosition(data.equipmentNumber()); + tabPos = m_posHandler->lastPosition(data.equipmentNumber); else { if (!m_posHandler->isInTrainingArea(relPos)) bRet = false; - DEBUG_LOG(m_logger) << "tabPos.reportingSource=" << tabPos.reportingSource(); - tabPos.position(m_posHandler->relativeToGeographic(relPos)); - m_posHandler->setLastPosition(data.equipmentNumber(), tabPos); + DEBUG_LOG(m_logger) << "tabPos.reportingSource=" << tabPos.reportingSource; + tabPos.position = m_posHandler->relativeToGeographic(relPos); + m_posHandler->setLastPosition(data.equipmentNumber, tabPos); } Core::GeoPosition2D pos2d; - pos2d.lat(tabPos.position().lat()); - pos2d.lon(tabPos.position().lon()); - data.position(pos2d); + pos2d.lat = tabPos.position.lat; + pos2d.lon = tabPos.position.lon; + data.position = pos2d; return bRet; } @@ -1271,16 +1274,16 @@ bool SendToDds::assignStateChangeBase(const S &inData, T &outData) { TrainingAreaBase::CtaDataError error; assignBase(inData, error); - error.reason(ProjectDataManagement::DataErrorReason_def::InvalidTacticalState); - error.originTelegramId(inData.id()); + error.reason = ProjectDataManagement::DataErrorReason::DataErrorReason_InvalidTacticalState; + error.originTelegramId = inData.id(); publish(error); return false; } - outData.vulnerabilityState(static_cast(inData.vulnerabilityState)); - outData.vulnerabilityKindId(pdm()->vulnerabilityKindId(inData.tasVulnerabilityKindId, inData.header.equipmentNumber)); - outData.vitality(inData.tasVitality); - outData.vulnerabilityBits(inData.vulnerabilityBits); + outData.vulnerabilityState = static_cast(inData.vulnerabilityState); + outData.vulnerabilityKindId = pdm()->vulnerabilityKindId(inData.tasVulnerabilityKindId, inData.header.equipmentNumber); + outData.vitality = inData.tasVitality; + outData.vulnerabilityBits = inData.vulnerabilityBits; return true; } @@ -1292,10 +1295,10 @@ void SendToDds::checkTimeStamp(const S &data) data.header.timeStamp < (partTime - Settings::timeDelayBack())) { TrainingAreaBase::CtaDataError error; - error.equipmentNumber(data.header.equipmentNumber); - error.sampleTime(data.header.timeStamp); - error.reason(ProjectDataManagement::DataErrorReason_def::InvalidTime); - error.originTelegramId(data.id()); + error.equipmentNumber = data.header.equipmentNumber; + error.sampleTime = data.header.timeStamp; + error.reason = ProjectDataManagement::DataErrorReason::DataErrorReason_InvalidTime; + error.originTelegramId = data.id(); publish(error); } } @@ -1339,7 +1342,7 @@ void SendToDds::onEmergencyCallTimerTimeout(int issi) if (m_mainHandler->ddsHandler()->emergencyCall()) { TrainingAreaBase::EmergencyCall emergCallData; - emergCallData.equipmentNumber(issi); + emergCallData.equipmentNumber = issi; if (!m_mainHandler->ddsHandler()->emergencyCall()->remove(emergCallData)) ERROR_LOG(m_logger) << Q_FUNC_INFO << " removing of TrainingAreaBase::EmergencyCall failed, issi = " << issi; } @@ -1366,25 +1369,25 @@ void SendToDds::onPvSanUniqueIdMapping(int uniqueId, int equipNo, qint64 sampleT if (oldEquipNo > 0) { TrainingAreaBase::ParticipantSanitaryMaterialStockReport sanReport; - sanReport.equipmentNumber(oldEquipNo); - sanReport.sampleTime(sampleTime); - sanReport.sanitaryMaterialCount(0); - sanReport.sanitaryMaterialStock(std::vector()); - sanReport.uniqueId(uniqueId); - sanReport.originatorEquipmentNumber(0); - sanReport.qualification(TrainingAreaBase::Qualification::NotDefined); + sanReport.equipmentNumber = oldEquipNo; + sanReport.sampleTime = sampleTime; + sanReport.sanitaryMaterialCount = 0; + sanReport.sanitaryMaterialStock = std::vector(); + sanReport.uniqueId = uniqueId; + sanReport.originatorEquipmentNumber = 0; + sanReport.qualification = TrainingAreaBase::Qualification::NotDefined; publish(sanReport); TrainingAreaBase::ParticipantSanitation sanitation; - sanitation.equipmentNumber(oldEquipNo); - sanitation.sampleTime(sampleTime); - sanitation.proceduresTaken(0); - sanitation.uniqueId(uniqueId); - sanitation.originatorEquipmentNumber(0); - sanitation.qualification(TrainingAreaBase::Qualification::NotDefined); - sanitation.sanitationResult(TrainingAreaBase::SanitationResult::NoEffect); - sanitation.sanitationEvaluation(TrainingAreaBase::SanitationEvaluation::NotApplicable); + sanitation.equipmentNumber = oldEquipNo; + sanitation.sampleTime = sampleTime; + sanitation.proceduresTaken = 0; + sanitation.uniqueId = uniqueId; + sanitation.originatorEquipmentNumber = 0; + sanitation.qualification = TrainingAreaBase::Qualification::NotDefined; + sanitation.sanitationResult = TrainingAreaBase::SanitationResult::NoEffect; + sanitation.sanitationEvaluation = TrainingAreaBase::SanitationEvaluation::NotApplicable; publish(sanitation); m_uniqueId2EquipmentNumber.insert(uniqueId, equipNo); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp index 9cb9e11f2..75400565f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/handler_aes_data.cpp @@ -335,9 +335,9 @@ void HandlerAesData::bcContaminations(const QByteArray &data) LtsUtils::get3Byte(data, pos, x); req.weatherPosition(dds::core::optional(relativeToGeoPosition(x, y))); LtsUtils::get1Byte(data, pos, tmp); - req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Chemical, tmp)); + req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass::Chemical, tmp)); if (req.chargeTypeId() == 0) - req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Biological, tmp)); + req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass::Biological, tmp)); LtsUtils::get1Byte(data, pos, tmp); DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "BC contamination: " << req; @@ -423,11 +423,11 @@ void HandlerAesData::explosionAreas(const QByteArray &data) LtsUtils::get2Byte(data, pos, tmp); LtsUtils::get1Byte(data, pos, tmp); - req.chargeStruct().chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Artillery, tmp)); + req.chargeStruct().chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass::Artillery, tmp)); if (req.chargeStruct().chargeTypeId() == 0) - req.chargeStruct().chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Mortar, tmp)); + req.chargeStruct().chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass::Mortar, tmp)); if (req.chargeStruct().chargeTypeId() == 0) - req.chargeStruct().chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::AirSupport, tmp)); + req.chargeStruct().chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass::AirSupport, tmp)); LtsUtils::get2Byte(data, pos, tmp); @@ -499,9 +499,9 @@ void HandlerAesData::explosionSingles(const QByteArray &data) else LtsUtils::get1Byte(data, pos, tmp); LtsUtils::get1Byte(data, pos, tmp); - req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Artillery, tmp)); + req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass::Artillery, tmp)); if (req.chargeTypeId() == 0) - req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Mortar, tmp)); + req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass::Mortar, tmp)); DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "explosion single: " << req; aesToBeDeleted.removeAll(req.id()); @@ -558,15 +558,15 @@ void HandlerAesData::functionalAreas(const QByteArray &data) LtsUtils::get1Byte(data, pos, tmp); - req.deconMode(static_cast(tmp)); + req.deconMode(static_cast(tmp)); LtsUtils::get1Byte(data, pos, tmp); req.deconTime(tmp * 10 * 60 * 1000); LtsUtils::get1Byte(data, pos, tmp); - req.maintMode(static_cast(tmp)); + req.maintMode(static_cast(tmp)); LtsUtils::get1Byte(data, pos, tmp); req.maintTime(tmp * 10 * 60 * 1000); LtsUtils::get1Byte(data, pos, tmp); - req.medicMode(static_cast(tmp)); + req.medicMode(static_cast(tmp)); LtsUtils::get1Byte(data, pos, tmp); req.medicTime(tmp * 10 * 60 * 1000); req.chargeTypeId(411); @@ -626,7 +626,7 @@ void HandlerAesData::nContaminations(const QByteArray &data) LtsUtils::get2Byte(data, pos, tmp); req.rotationAngle(mathToCompassAngle(tmp)); - req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::Nuclear, 1)); + req.chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass::Nuclear, 1)); DEBUG_LOG(m_logger) << (aesToBeDeleted.contains(req.id()) ? "Modifying " : "Creating ") << "N contamination: " << req; @@ -676,7 +676,7 @@ void HandlerAesData::mineAreas(const QByteArray &data) LtsUtils::get1Byte(data, pos, tmp); if (217 > tmp && 210 < tmp) - req.chargeStruct().chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass_def::MineArea, tmp)); + req.chargeStruct().chargeTypeId(chargeTypeIdFromChargeTasCode(ProjectDataManagement::GearClass::MineArea, tmp)); else req.chargeStruct().chargeTypeId(tmp); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp index d311fd2a4..a44db89a0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBaseOC/send_to_dds.cpp @@ -80,7 +80,7 @@ void SendToDds::rxData(const OcTelegrams::SpecificsEquipment &inData) outData.equipmentNumber(inData.equipmentNumber); outData.playerType(inData.playerType); - outData.language(static_cast(inData.language)); + outData.language(static_cast(inData.language)); outData.pyrotechnics(inData.pyrotechnics); outData.voiceOutput(inData.voiceOutput); outData.exerciseBreak(inData.exerciseBreak); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp index f0f307a5b..3f4ea339d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/data_manager.cpp @@ -16,6 +16,7 @@ namespace WarehouseManagement ClientMessageFactory::ClientMessageFactory(DataManager *dataManager) : LtsWebSocket::AbstractClientMessageFactory(getLogger("ClientMessageFactory")) + , m_logger(getLogger("ClientMessageFactory")) , m_dataManager(dataManager) {} @@ -265,7 +266,7 @@ ParticipantRegisterInExconReply::ParticipantRegisterInExconReply(int exerciseId, QJsonObject obj; obj[::WebSocketInterface::JsonKeys::EXERCISE_ID()] = exerciseId; obj[::WebSocketInterface::JsonKeys::PARTICIPANT_ID()] = participantId; - obj[::WebSocketInterface::JsonKeys::REGISTRATION_RETURN_VALUE()] = (int) retValue.underlying(); + obj[::WebSocketInterface::JsonKeys::REGISTRATION_RETURN_VALUE()] = static_cast(retValue); m_jsonRepresentation.insert(LtsWebSocket::JsonKeys::DATA(), obj); } @@ -275,21 +276,21 @@ void DataManager::handleEquipmentTypes(const ::EquipmentTypes &eTypes) INFO_LOG(m_logger) << "equipTypeMap size: " << equipTypeMap.size(); ParticipantManagement::ModifyEquipmentTypeDataRequest request; - request.deleteAll(true); - auto &dataVec = request.data(); + request.deleteAll = true; + auto &dataVec = request.data; dataVec.reserve(equipTypeMap.size()); for (const IWMS2ECC::EquipmentType &et : equipTypeMap) { ParticipantManagement::EquipmentType pEt; - pEt.id(et.id); - pEt.name(et.name.toStdString()); - pEt.minEquipNo(et.minEquipNo); - pEt.maxEquipNo(et.maxEquipNo); - pEt.traPlayerTypeId(et.taPlayerTypeId); - pEt.deletedInWms(et.deletedInWMS); - pEt.traVulnerabilityModelId(et.taVulnerabilityModelId); - ParticipantManagement::WmsTypeClass wmsTypeClass = static_cast(et.specialType); - pEt.wmsTypeClass(wmsTypeClass); + pEt.id = et.id; + pEt.name = et.name.toStdString(); + pEt.minEquipNo = et.minEquipNo; + pEt.maxEquipNo = et.maxEquipNo; + pEt.traPlayerTypeId = et.taPlayerTypeId; + pEt.deletedInWms = et.deletedInWMS; + pEt.traVulnerabilityModelId = et.taVulnerabilityModelId; + ParticipantManagement::WmsTypeClass wmsTypeClass = static_cast(et.specialType); + pEt.wmsTypeClass = wmsTypeClass; dataVec.push_back(std::move(pEt)); } @@ -331,7 +332,7 @@ void DataManager::onParticipantChanged(const ParticipantManagement::Participant if (!m_clientConnection || !m_wms2ecc) return; - DEBUG_LOG(m_logger) << "partyId: " << data.partyId() << "participantId: " << data.id(); + DEBUG_LOG(m_logger) << "partyId: " << data.partyId << "participantId: " << data.id; IWMS2ECC::PlayerInfo pl = m_wms2ecc->convert(data, exerciseId); pl.playerId = (exerciseId* 1000000) + pl.playerId; m_clientConnection->addReply(new ParticipantUpdate(pl, modType)); @@ -342,7 +343,7 @@ void DataManager::onExerciseChanged(const ExerciseManagement::Exercise &data, Da if (!m_clientConnection) return; - INFO_LOG(m_logger) << "IN onExerciseChanged: ExerciseUpdate: id = " << data.id(); + INFO_LOG(m_logger) << "IN onExerciseChanged: ExerciseUpdate: id = " << data.id; IWMS2ECC::Exercise exeData = IWMS2ECC_Impl::convert(data); m_clientConnection->addReply(new ExerciseUpdate(exeData, modType)); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp index 7ad6797d9..a476ef115 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/dds_handler.cpp @@ -45,7 +45,7 @@ bool DdsHandler::init(const QStringList &qosFileList) m_ppmFtc = ParticipantManagement::Interface::Ftc::create(m_ddsConnector); bRet &= m_ppmFtc->enableModifyEquipmentTypeData(); - m_pacemaker->setNewState(Core::RunningState::inner_enum::Starting); + m_pacemaker->setNewState(Core::RunningState::Starting); return bRet; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp index f1173cb3e..c809663cb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercise_participant_handler.cpp @@ -77,25 +77,25 @@ void ExerciseParticipantHandler::registerParticipant(qint32 participantId, const dds::core::optional &info) { ParticipantManagement::RegisterParticipantRequest req; - req.assignState(assignState); + req.assignState = assignState; if (equipNo.is_set()) - req.equipmentNumber(equipNo.get()); + req.equipmentNumber = equipNo.get(); if (identification.is_set()) - req.identification(identification.get().toStdString()); + req.identification = identification.get().toStdString(); if (info.is_set()) - req.info(info.get().toStdString()); + req.info = info.get().toStdString(); if (!equipNo.is_set() || !info.is_set() || !identification.is_set()) { const auto participant = m_ddsHandlerExercise->ppmDtc()->participant(participantId); - if (!equipNo.is_set() && participant.equipmentNumber().is_set()) - req.equipmentNumber(participant.equipmentNumber().get()); + if (!equipNo.is_set() && participant.equipmentNumber.is_set()) + req.equipmentNumber = participant.equipmentNumber.get(); if (!info.is_set()) - req.info(participant.info()); + req.info = participant.info; if (!identification.is_set()) - req.identification(participant.identification()); + req.identification = participant.identification; } - req.participantId(participantId); + req.participantId = participantId; INFO_LOG(m_logger) << "IN ::registerParticipant, ParticipantId: " << participantId << ", equipNo: " << equipNo << ", assignState: " << assignState; @@ -105,18 +105,18 @@ void ExerciseParticipantHandler::registerParticipant(qint32 participantId, void ExerciseParticipantHandler::onRegisterParticipantReply(const ParticipantManagement::RegisterReply &reply) { - INFO_LOG(m_logger) << "RegisterReply id " << reply.id() - << " - registerReturnValue: " << reply.registerReturnValue() - << " for exercise " << reply.exerciseId(); + INFO_LOG(m_logger) << "RegisterReply id " << reply.id + << " - registerReturnValue: " << reply.registerReturnValue + << " for exercise " << reply.exerciseId; + - Core::FunctionReplyObject fro; - fro.setStr(reply.errorString().c_str()); - for (const auto &arg : reply.errorParams()) + fro.setStr(reply.errorString.c_str()); + for (const auto &arg : reply.errorParams) fro = fro.arg(arg); - - emit registrationReturnValue(reply.exerciseId(), reply.id(), reply.registerReturnValue()); + + emit registrationReturnValue(reply.exerciseId, reply.id, reply.registerReturnValue); if (fro.error()) ERROR_LOG(m_logger) << "Error: " << fro(); @@ -125,13 +125,13 @@ void ExerciseParticipantHandler::onRegisterParticipantReply(const ParticipantMan void ExerciseParticipantHandler::participantAdded(const ParticipantManagement::Participant &participant) { - if (!participant.equipmentNumber().is_set() || participant.equipmentNumber().get() == 0) + if (!participant.equipmentNumber.is_set() || participant.equipmentNumber.get() == 0) { - + INFO_LOG(m_logger) << "New participant but no equipment number - ignoring"; return; } - addParticipant(participant.id(), participant.equipmentNumber().get()); + addParticipant(participant.id, participant.equipmentNumber.get()); } void ExerciseParticipantHandler::participantModified(const ParticipantManagement::Participant &participant) @@ -145,50 +145,50 @@ void ExerciseParticipantHandler::participantModified(const ParticipantManagement - const auto itEquipNumber = m_participantId2EquipmentNumber.constFind(participant.id()); + const auto itEquipNumber = m_participantId2EquipmentNumber.constFind(participant.id); if (itEquipNumber == m_participantId2EquipmentNumber.constEnd()) { - - - if (!participant.equipmentNumber().is_set() || participant.equipmentNumber() == 0) + + + if (!participant.equipmentNumber.is_set() || participant.equipmentNumber.get() == 0) { - + return; } - - addParticipant(participant.id(), participant.equipmentNumber().get()); + + addParticipant(participant.id, participant.equipmentNumber.get()); return; } - - if (itEquipNumber.value() == participant.equipmentNumber()) + + if (participant.equipmentNumber.is_set() && itEquipNumber.value() == participant.equipmentNumber.get()) { - + return; } - if (participant.equipmentNumber().is_set()) + if (participant.equipmentNumber.is_set()) { - INFO_LOG(m_logger) << "Participant with id " << participant.id() << " changed its equipment number from " - << itEquipNumber.value() << " to " << participant.equipmentNumber().get(); + INFO_LOG(m_logger) << "Participant with id " << participant.id << " changed its equipment number from " + << itEquipNumber.value() << " to " << participant.equipmentNumber.get(); } - if (participant.equipmentNumber() == 0) + if (participant.equipmentNumber.is_set() && participant.equipmentNumber.get() == 0) { - - removeParticipant(participant.id(), participant.equipmentNumber().get()); + + removeParticipant(participant.id, participant.equipmentNumber.get()); return; } - + removeParticipant(itEquipNumber.key(), itEquipNumber.value()); - if (participant.equipmentNumber().is_set()) - addParticipant(participant.id(), participant.equipmentNumber().get()); + if (participant.equipmentNumber.is_set()) + addParticipant(participant.id, participant.equipmentNumber.get()); } void ExerciseParticipantHandler::participantRemoved(const ParticipantManagement::Participant &participant) { - const auto itEquipNumber = m_participantId2EquipmentNumber.find(participant.id()); + const auto itEquipNumber = m_participantId2EquipmentNumber.find(participant.id); if (itEquipNumber == m_participantId2EquipmentNumber.end()) { @@ -200,10 +200,10 @@ void ExerciseParticipantHandler::participantRemoved(const ParticipantManagement: void ExerciseParticipantHandler::emitChangedForInferiors(const ParticipantManagement::Participant &participant) { - for (const int inferior : participant.inferiorIds()) + for (const int inferior : participant.inferiorIds) { const auto inf = m_ddsHandlerExercise->ppmDtc()->participant(inferior); - if (inf.id() != 0) + if (inf.id != 0) emit participantChanged(inf, DataModification::eModified, m_exerciseId); emitChangedForInferiors(inf); } @@ -258,10 +258,10 @@ void ExerciseParticipantHandler::onPartyChanged(const ParticipantManagement::Par { case DataModification::eAdded: case DataModification::eModified: - m_partyMap[data.id()] = data; + m_partyMap[data.id] = data; break; case DataModification::eRemoved: - m_partyMap.remove(data.id()); + m_partyMap.remove(data.id); break; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.cpp index 559c309e5..6bc2e51ca 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/exercises_handler.cpp @@ -8,7 +8,8 @@ namespace WarehouseManagement { ExercisesHandler::ExercisesHandler(const std::shared_ptr &ddsHandler) - : m_ddsHandler(ddsHandler) + : m_logger(getLogger("ExercisesHandler")) + , m_ddsHandler(ddsHandler) {} ExercisesHandler::~ExercisesHandler() @@ -23,7 +24,7 @@ bool ExercisesHandler::init() auto cb = [this](const ExerciseManagement::Exercise &exercise) { - exerciseAdded(exercise.id()); + exerciseAdded(exercise.id); }; m_ddsHandler->exmDtc()->exercises(cb); @@ -50,9 +51,9 @@ ParticipantManagement::TypeClass ExercisesHandler::typeClassIdFromEquipmentTypeI std::function cb = [equipTypeId, &ret](const ParticipantManagement::Type &t) -> bool { - if (t.equipmentTypeId() != equipTypeId) + if (t.equipmentTypeId != equipTypeId) return false; - ret = t.typeClass(); + ret = t.typeClass; return true; }; m_ddsHandler->ppmDtc()->types(cb); @@ -132,7 +133,7 @@ bool ExercisesHandler::unregisterParticipant(int exerciseId, qint32 equipNo) return false; - ParticipantManagement::ParticipantAssignState assignState = ParticipantManagement::ParticipantAssignState_def::NotAssigned; + ParticipantManagement::ParticipantAssignState assignState = ParticipantManagement::ParticipantAssignState::NotAssigned; m_exerciseHandler.value(exerciseId)->registerParticipant(participantId, assignState, 0, {}, {}); return true; @@ -142,8 +143,8 @@ bool ExercisesHandler::modifyEquipmentTypes(const std::vectorppmFtc()->modifyEquipmentTypeDataRequest(req, this); } @@ -254,19 +255,19 @@ QMultiHash::iterator ExercisesHandler::findParticipa void ExercisesHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType) { - if (!data.sendToWMS()) + if (!data.sendToWMS) { - if (m_exerciseHandler.contains(data.id())) - exerciseRemoved(data.id()); + if (m_exerciseHandler.contains(data.id)) + exerciseRemoved(data.id); emit exerciseChanged(data, DataModification::eRemoved); } else { - if (!m_exerciseHandler.contains(data.id())) + if (!m_exerciseHandler.contains(data.id)) { modType = DataModification::eAdded; - exerciseAdded(data.id()); + exerciseAdded(data.id); } else { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp index 4b9119a47..635a1142d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/interface_wms2ecc_impl.cpp @@ -16,7 +16,8 @@ namespace WarehouseManagement { IWMS2ECC_Impl::IWMS2ECC_Impl(const std::shared_ptr &exercisesHandler) - : m_exercisesHandler(exercisesHandler) + : m_logger(getLogger("Wms2Ecc")) + , m_exercisesHandler(exercisesHandler) { connect(m_exercisesHandler.get(), &ExercisesHandler::registrationReturnValue, this, &IWMS2ECC_Impl::onRegistrationReturnValue); @@ -25,17 +26,17 @@ IWMS2ECC_Impl::IWMS2ECC_Impl(const std::shared_ptr &exercisesH IWMS2ECC::Exercise IWMS2ECC_Impl::convert(const ExerciseManagement::Exercise &ex) { IWMS2ECC::Exercise ret; - ret.id = ex.id(); - ret.name = QString::fromStdString(ex.name()); - if (ex.state() == ExerciseManagement::ExerciseState_def::Started || - ex.state() == ExerciseManagement::ExerciseState_def::Paused) + ret.id = ex.id; + ret.name = QString::fromStdString(ex.name); + if (ex.state == ExerciseManagement::ExerciseState::Started || + ex.state == ExerciseManagement::ExerciseState::Paused) ret.actExercise = 1; else ret.actExercise = 0; - ret.start = ex.beginTime() / 1000; - ret.end = ex.endTime() / 1000; - ret.stateAsString = ExerciseManagement::toString(ex.state()); + ret.start = ex.beginTime / 1000; + ret.end = ex.endTime / 1000; + ret.stateAsString = ExerciseManagement::toString(ex.state); return ret; } @@ -43,42 +44,42 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::convert(const ParticipantManagement::Partici { IWMS2ECC::PlayerInfo pi; - pi.alias = QString::fromStdString(part.identification()); - pi.assignState = convert(part.assignState()); - pi.designator = QString::fromStdString(part.designator()); - if (part.equipmentNumber().is_set()) - pi.equipNo = part.equipmentNumber().get(); - else if (part.assignState() == ParticipantManagement::ParticipantAssignState_def::HandoutExcon) + pi.alias = QString::fromStdString(part.identification); + pi.assignState = convert(part.assignState); + pi.designator = QString::fromStdString(part.designator); + if (part.equipmentNumber.is_set()) + pi.equipNo = part.equipmentNumber.get(); + else if (part.assignState == ParticipantManagement::ParticipantAssignState::HandoutExcon) pi.equipNo = 0; pi.exerciseId = exerciseId; - pi.forceId = part.partyId(); + pi.forceId = part.partyId; DEBUG_LOG(m_logger) << "Force Id = " << pi.forceId; - pi.info = QString::fromStdString(part.info()); - pi.parentPlayerId = part.superiorId(); - pi.playerId = part.id(); - pi.playerState = part.isDeleted() ? IWMS2ECC::PlayerState::DELETED : IWMS2ECC::PlayerState::FOUND; + pi.info = QString::fromStdString(part.info); + pi.parentPlayerId = part.superiorId; + pi.playerId = part.id; + pi.playerState = part.isDeleted ? IWMS2ECC::PlayerState::DELETED : IWMS2ECC::PlayerState::FOUND; - pi.tactIdent = QString::fromStdString(part.tacticalIdentifier()); - const ParticipantManagement::Type partType = m_exercisesHandler->participantType(part.typeId()); - if (partType.id() == part.typeId()) + pi.tactIdent = QString::fromStdString(part.tacticalIdentifier); + const ParticipantManagement::Type partType = m_exercisesHandler->participantType(part.typeId); + if (partType.id == part.typeId) { - pi.equipTypeId = partType.equipmentTypeId(); - pi.typeClassId = convert(partType.typeClass()); - TRACE_LOG(m_logger) << "Found participant type with id " << part.typeId() << ", " << pi.typeClassId << ", " << pi.equipTypeId; + pi.equipTypeId = partType.equipmentTypeId; + pi.typeClassId = convert(partType.typeClass); + TRACE_LOG(m_logger) << "Found participant type with id " << part.typeId << ", " << pi.typeClassId << ", " << pi.equipTypeId; } else - WARNING_LOG(m_logger) << "Can not find participant type with id " << part.typeId(); - pi.typeId = part.typeId(); - pi.isDeleted = part.isDeleted(); + WARNING_LOG(m_logger) << "Can not find participant type with id " << part.typeId; + pi.typeId = part.typeId; + pi.isDeleted = part.isDeleted; - pi.hierarchy = m_exercisesHandler->getHierarchyFromParticipant(part.id(), exerciseId, allParticipants); - const ParticipantManagement::Party party = m_exercisesHandler->getParty(part.partyId(), exerciseId); - pi.forceName = QString::fromStdString(party.name()); + pi.hierarchy = m_exercisesHandler->getHierarchyFromParticipant(part.id, exerciseId, allParticipants); + const ParticipantManagement::Party party = m_exercisesHandler->getParty(part.partyId, exerciseId); + pi.forceName = QString::fromStdString(party.name); - pi.symbolColor = party.color(); + pi.symbolColor = party.color; DEBUG_LOG(m_logger) << "party.name: " << pi.forceName; DEBUG_LOG(m_logger) << "symbolColor: " << pi.symbolColor << ", playerId: " << pi.playerId << ", exerciseId: " << exerciseId; @@ -93,8 +94,8 @@ IWMS2ECC::exerciseMap IWMS2ECC_Impl::getExercises() const IWMS2ECC::exerciseMap retMap; for (const ExerciseManagement::Exercise &ex : exMap) { - if (ex.sendToWMS()) - retMap.insert(ex.id(), convert(ex)); + if (ex.sendToWMS) + retMap.insert(ex.id, convert(ex)); } INFO_LOG(m_logger) << "IN getExercises, exMap.size(): " << exMap.size() @@ -204,7 +205,7 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::getPlayerInfo(int playerId, int exerciseId) ParticipantManagement::Participant part = m_exercisesHandler->getParticipant(playerId, exerciseId); IWMS2ECC::PlayerInfo pi; - if (part.assignState() == ParticipantManagement::ParticipantAssignState_def::HandoutExcon) + if (part.assignState == ParticipantManagement::ParticipantAssignState::HandoutExcon) { pi.playerState = NOT_FOUND; return pi; @@ -212,7 +213,7 @@ IWMS2ECC::PlayerInfo IWMS2ECC_Impl::getPlayerInfo(int playerId, int exerciseId) pi = convert(part, exerciseId); - pi.forceName = QString::fromStdString(m_exercisesHandler->getParty(part.partyId(), exerciseId).name()); + pi.forceName = QString::fromStdString(m_exercisesHandler->getParty(part.partyId, exerciseId).name); pi.playerState = FOUND; @@ -236,10 +237,10 @@ QMap IWMS2ECC_Impl::getEquipRequirements(int exerciseId) const for (const ParticipantManagement::Participant &part : map) { - if (part.isDeleted()) + if (part.isDeleted) continue; - reqPartTypes[part.typeId()]++; + reqPartTypes[part.typeId]++; } QMap reqEquipTypes; @@ -248,12 +249,12 @@ QMap IWMS2ECC_Impl::getEquipRequirements(int exerciseId) const { const int typeId = cIt.key(); const ParticipantManagement::Type partType = m_exercisesHandler->participantType(typeId); - if (partType.id() == typeId) + if (partType.id == typeId) { DEBUG_LOG(m_logger) << "Key: " << typeId; - ParticipantManagement::TypeClass typeClass = partType.typeClass(); - int equipTypeId = partType.equipmentTypeId(); - if (typeClass != ParticipantManagement::TypeClass_def::Unit && typeClass != ParticipantManagement::TypeClass_def::SupportUnit) + ParticipantManagement::TypeClass typeClass = partType.typeClass; + int equipTypeId = partType.equipmentTypeId; + if (typeClass != ParticipantManagement::TypeClass::Unit && typeClass != ParticipantManagement::TypeClass::SupportUnit) { reqEquipTypes[equipTypeId] = cIt.value(); DEBUG_LOG(m_logger) << "equipTypeId: " << equipTypeId << ", amount: " << cIt.value(); @@ -287,29 +288,29 @@ QByteArray IWMS2ECC_Impl::getSymbol(int symbolId, int exerciseId, const QColor & IWMS2ECC::EquipmentType IWMS2ECC_Impl::convert(const ParticipantManagement::EquipmentType &et) { IWMS2ECC::EquipmentType ret; - ret.id = et.id(); - ret.name = QString::fromStdString(et.name()); - ret.minEquipNo = et.minEquipNo(); - ret.maxEquipNo = et.maxEquipNo(); - ret.specialType = int(et.wmsTypeClass().underlying()); - ret.taVulnerabilityModelId = et.traVulnerabilityModelId(); - ret.taPlayerTypeId = et.traPlayerTypeId(); - ret.deletedInWMS = et.deletedInWms(); + ret.id = et.id; + ret.name = QString::fromStdString(et.name); + ret.minEquipNo = et.minEquipNo; + ret.maxEquipNo = et.maxEquipNo; + ret.specialType = static_cast(et.wmsTypeClass); + ret.taVulnerabilityModelId = et.traVulnerabilityModelId; + ret.taPlayerTypeId = et.traPlayerTypeId; + ret.deletedInWMS = et.deletedInWms; return ret; } ParticipantManagement::EquipmentType IWMS2ECC_Impl::convert(const IWMS2ECC::EquipmentType &et) { ParticipantManagement::EquipmentType ret; - ret.id(et.id); - ret.name(et.name.toStdString()); - ret.minEquipNo(et.minEquipNo); - ret.maxEquipNo(et.maxEquipNo); + ret.id = et.id; + ret.name = et.name.toStdString(); + ret.minEquipNo = et.minEquipNo; + ret.maxEquipNo = et.maxEquipNo; ParticipantManagement::WmsTypeClass wmsTypeClass = convert(et.specialType); - ret.wmsTypeClass(wmsTypeClass); - ret.traVulnerabilityModelId(et.taVulnerabilityModelId); - ret.traPlayerTypeId(et.taPlayerTypeId); - ret.deletedInWms(et.deletedInWMS); + ret.wmsTypeClass = wmsTypeClass; + ret.traVulnerabilityModelId = et.taVulnerabilityModelId; + ret.traPlayerTypeId = et.taPlayerTypeId; + ret.deletedInWms = et.deletedInWMS; return ret; } @@ -318,26 +319,26 @@ ParticipantManagement::WmsTypeClass IWMS2ECC_Impl::convert(int specialType) switch (specialType) { case 0: - return ParticipantManagement::WmsTypeClass_def::None; + return ParticipantManagement::WmsTypeClass::None; case 1: - return ParticipantManagement::WmsTypeClass_def::Building; + return ParticipantManagement::WmsTypeClass::Building; case 2: - return ParticipantManagement::WmsTypeClass_def::Vehicle; + return ParticipantManagement::WmsTypeClass::Vehicle; case 3: - return ParticipantManagement::WmsTypeClass_def::Human; + return ParticipantManagement::WmsTypeClass::Human; case 4: - return ParticipantManagement::WmsTypeClass_def::TargetVehicle; + return ParticipantManagement::WmsTypeClass::TargetVehicle; case 5: - return ParticipantManagement::WmsTypeClass_def::TargetHuman; + return ParticipantManagement::WmsTypeClass::TargetHuman; case 6: - return ParticipantManagement::WmsTypeClass_def::Airborne; + return ParticipantManagement::WmsTypeClass::Airborne; case 7: - return ParticipantManagement::WmsTypeClass_def::VehicleMarker; + return ParticipantManagement::WmsTypeClass::VehicleMarker; default: Q_ASSERT(false); break; } - return ParticipantManagement::WmsTypeClass_def::None; + return ParticipantManagement::WmsTypeClass::None; } ParticipantManagement::TypeClass IWMS2ECC_Impl::convertTypeClass(int typeClass) @@ -345,49 +346,49 @@ ParticipantManagement::TypeClass IWMS2ECC_Impl::convertTypeClass(int typeClass) switch (typeClass) { case 1: - return ParticipantManagement::TypeClass_def::Unit; + return ParticipantManagement::TypeClass::Unit; case 2: - return ParticipantManagement::TypeClass_def::VehicleWithGear; + return ParticipantManagement::TypeClass::VehicleWithGear; case 3: case 4: - return ParticipantManagement::TypeClass_def::GroundVehicle; + return ParticipantManagement::TypeClass::GroundVehicle; case 5: - return ParticipantManagement::TypeClass_def::Human; + return ParticipantManagement::TypeClass::Human; case 6: case 7: - return ParticipantManagement::TypeClass_def::SupportEntity; + return ParticipantManagement::TypeClass::SupportEntity; case 8: - return ParticipantManagement::TypeClass_def::Aircraft; + return ParticipantManagement::TypeClass::Aircraft; case 10: - return ParticipantManagement::TypeClass_def::SupportUnit; + return ParticipantManagement::TypeClass::SupportUnit; default: Q_ASSERT(false); break; } - return ParticipantManagement::TypeClass_def::Unit; + return ParticipantManagement::TypeClass::Unit; } int IWMS2ECC_Impl::convert(ParticipantManagement::TypeClass typeClass) { - switch (typeClass.underlying()) + switch (typeClass) { - case ParticipantManagement::TypeClass_def::Unknown: + case ParticipantManagement::TypeClass::Unknown: return 0; - case ParticipantManagement::TypeClass_def::Unit: + case ParticipantManagement::TypeClass::Unit: return 1; - case ParticipantManagement::TypeClass_def::Human: + case ParticipantManagement::TypeClass::Human: return 5; - case ParticipantManagement::TypeClass_def::VehicleWithGear: - case ParticipantManagement::TypeClass_def::WeaponSystem: + case ParticipantManagement::TypeClass::VehicleWithGear: + case ParticipantManagement::TypeClass::WeaponSystem: return 2; - case ParticipantManagement::TypeClass_def::GroundVehicle: + case ParticipantManagement::TypeClass::GroundVehicle: return 3; - case ParticipantManagement::TypeClass_def::SupportUnit: + case ParticipantManagement::TypeClass::SupportUnit: return 10; - case ParticipantManagement::TypeClass_def::SupportEntity: + case ParticipantManagement::TypeClass::SupportEntity: return 7; - case ParticipantManagement::TypeClass_def::Aircraft: + case ParticipantManagement::TypeClass::Aircraft: return 8; default: Q_ASSERT(false); @@ -420,17 +421,17 @@ bool IWMS2ECC_Impl::setEquipmentTypes(const equipTypeMap &map) IWMS2ECC::PlayerAssignState IWMS2ECC_Impl::convert(const ParticipantManagement::ParticipantAssignState &state) { - switch (state.underlying()) + switch (state) { - case ParticipantManagement::ParticipantAssignState_def::NotAssigned: + case ParticipantManagement::ParticipantAssignState::NotAssigned: return IWMS2ECC::NOT_ASSIGNED; - case ParticipantManagement::ParticipantAssignState_def::AssignedWms: + case ParticipantManagement::ParticipantAssignState::AssignedWms: return IWMS2ECC::ASSIGNED; - case ParticipantManagement::ParticipantAssignState_def::HandoutWms: + case ParticipantManagement::ParticipantAssignState::HandoutWms: return IWMS2ECC::HANDOUT_WMS; - case ParticipantManagement::ParticipantAssignState_def::HandoutExcon: + case ParticipantManagement::ParticipantAssignState::HandoutExcon: return IWMS2ECC::HANDOUT_EXCON; - case ParticipantManagement::ParticipantAssignState_def::ExconWmsOverruled: + case ParticipantManagement::ParticipantAssignState::ExconWmsOverruled: return IWMS2ECC::HANDOUT_EXCON_OVERRULED_WMS; } @@ -443,38 +444,38 @@ ParticipantManagement::ParticipantAssignState IWMS2ECC_Impl::convert(const IWMS2 switch (state) { case IWMS2ECC::UNDEFINED: - return ParticipantManagement::ParticipantAssignState_def::NotAssigned; + return ParticipantManagement::ParticipantAssignState::NotAssigned; case IWMS2ECC::NOT_ASSIGNED: - return ParticipantManagement::ParticipantAssignState_def::NotAssigned; + return ParticipantManagement::ParticipantAssignState::NotAssigned; case IWMS2ECC::ASSIGNED: - return ParticipantManagement::ParticipantAssignState_def::AssignedWms; + return ParticipantManagement::ParticipantAssignState::AssignedWms; case IWMS2ECC::HANDOUT_WMS: - return ParticipantManagement::ParticipantAssignState_def::HandoutWms; + return ParticipantManagement::ParticipantAssignState::HandoutWms; case IWMS2ECC::HANDOUT_EXCON: - return ParticipantManagement::ParticipantAssignState_def::HandoutExcon; + return ParticipantManagement::ParticipantAssignState::HandoutExcon; case IWMS2ECC::HANDOUT_EXCON_OVERRULED_WMS: - return ParticipantManagement::ParticipantAssignState_def::ExconWmsOverruled; + return ParticipantManagement::ParticipantAssignState::ExconWmsOverruled; } Q_ASSERT(false); - return ParticipantManagement::ParticipantAssignState_def::NotAssigned; + return ParticipantManagement::ParticipantAssignState::NotAssigned; } IWMS2ECC::RegisterReturnValue IWMS2ECC_Impl::convert(const ParticipantManagement::RegisterReturnValue retValue) { - switch (retValue.underlying()) + switch (retValue) { - case ParticipantManagement::RegisterReturnValue_def::AssignmentIncorrect: + case ParticipantManagement::RegisterReturnValue::AssignmentIncorrect: return IWMS2ECC::AssignmentIncorrect; - case ParticipantManagement::RegisterReturnValue_def::PlayerDeleted: + case ParticipantManagement::RegisterReturnValue::PlayerDeleted: return IWMS2ECC::PlayerDeleted; - case ParticipantManagement::RegisterReturnValue_def::PlayerNotFound: + case ParticipantManagement::RegisterReturnValue::PlayerNotFound: return IWMS2ECC::PlayerNotFound; - case ParticipantManagement::RegisterReturnValue_def::RegistrationFailed: + case ParticipantManagement::RegisterReturnValue::RegistrationFailed: return IWMS2ECC::RegistrationFailed; - case ParticipantManagement::RegisterReturnValue_def::RegistrationOk: + case ParticipantManagement::RegisterReturnValue::RegistrationOk: return IWMS2ECC::RegistrationOk; - case ParticipantManagement::RegisterReturnValue_def::EquipNoAlreadyAssigned: + case ParticipantManagement::RegisterReturnValue::EquipNoAlreadyAssigned: return IWMS2ECC::EquipNoAlreadyAssigned; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp index ad4548361..242a8b715 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/WarehouseManagement/main_handler.cpp @@ -48,7 +48,7 @@ bool MainHandler::init(int domainId) connect(m_exercisesHandler.get(), &ExercisesHandler::registrationReturnValue, m_dataManager, &DataManager::onRegistrationReturnValue); - m_ddsHandler->pacemaker()->setNewState(Core::RunningState::inner_enum::Running); + m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running); return true; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp index 727c26479..c43dc0021 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AlarmManagement/ModuleTests/alm_tests.cpp @@ -111,12 +111,12 @@ void AlmTests::tryConfigureAlarms() alarms[0].setMarker(true); alarms[0].messageWindow(true); alarms[0].vulnerabilityState(-1); - alarms[0].eventTypeId(ProjectDataManagement::PdmEventType_def::Hit); + alarms[0].eventTypeId(ProjectDataManagement::PdmEventType::EventType_Hit); alarms[1].setMarker(true); alarms[1].messageWindow(true); alarms[1].vulnerabilityState(0); - alarms[1].eventTypeId(ProjectDataManagement::PdmEventType_def::EnterNuclear); + alarms[1].eventTypeId(ProjectDataManagement::PdmEventType::EventType_EnterNuclear); std::vector participantIds; participantIds.push_back(0); @@ -173,13 +173,13 @@ void AlmTests::tryConfigureAlarmsList() alarms[0].setMarker(true); alarms[0].messageWindow(true); - alarms[0].eventTypeId(ProjectDataManagement::PdmEventType_def::Hit); + alarms[0].eventTypeId(ProjectDataManagement::PdmEventType::EventType_Hit); alarms[0].vulnerabilityState(-1); alarms[1].setMarker(true); alarms[1].messageWindow(true); alarms[1].vulnerabilityState(-1); - alarms[1].eventTypeId(ProjectDataManagement::PdmEventType_def::WeaponAssignment); + alarms[1].eventTypeId(ProjectDataManagement::PdmEventType::EventType_WeaponAssignment); std::vector participantIds; participantIds.push_back(1); @@ -204,7 +204,7 @@ void AlmTests::trySendEvent() // publish new Event data here pe.id(100); //pe.aesItemId(5); - pe.eventTypeId(ProjectDataManagement::PdmEventType_def::Hit); // same as eventTypeId in ConfigureAlarms + pe.eventTypeId(ProjectDataManagement::PdmEventType::EventType_Hit); // same as eventTypeId in ConfigureAlarms pe.participantId(2); pe.equipmentNumber(55); pe.sampleTime(QDateTime::currentMSecsSinceEpoch()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp index 41b74b42e..d61cbfec7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/EffectorFiringStrategy/abstract_firing_strategy.cpp @@ -164,7 +164,7 @@ int AbstractFiringStrategy::sendChargeEffect(const TrajectoryTimeAware &trajecto chargeEffect.chargeTypeId = m_effector->effectorData().chargeStruct.chargeTypeId; chargeEffect.effectStart = trajectoryStartTime + trajectoryTimeAware.geometry.back().relativeTime; // Einschlag Zeit chargeEffect.igniterTypeId = m_effector->effectorData().chargeStruct.igniterTypeId; - chargeEffect.gearTypeId(gearTypeId(m_effector->effectorData().chargeStruct.chargeTypeId, m_effector->participantId())); + chargeEffect.gearTypeId = gearTypeId(m_effector->effectorData().chargeStruct.chargeTypeId, m_effector->participantId()); chargeEffect.originatorId = m_effector->aesItemId(); chargeEffect.originatorTypeId = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_AreaEffectSimulation; chargeEffect.properties = QJsonDocument(properties).toJson().toStdString(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp index 8c53cf4de..45fadbdcb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_EffectCluster/effect_cluster_module_test.cpp @@ -161,7 +161,7 @@ void ModuleTestEffectCluster::onAesItemViewChanged(const AesItemView &aesItemVie if (modType == DataModification::eRemoved) return; - AreaEffectSimulation::AesType::type aesType = aesItemView.aesTypeId().underlying(); + AreaEffectSimulation::AesType aesType = static_cast(aesItemView.aesTypeId()); if (aesType != AreaEffectSimulation::AesType::AtEffectCluster) return; @@ -198,7 +198,7 @@ void ModuleTestEffectCluster::onEffectsChanged(const Effects &effects, DataModif { if (modType == DataModification::eRemoved) return; - AreaEffectSimulation::AesType::type aesType = effects.aesTypeId().underlying(); + AreaEffectSimulation::AesType aesType = static_cast(effects.aesTypeId()); DEBUG_LOG(m_logger) << " got onEffectsChanged - m_data: " << m_data.id << ", aesType=" << aesType; ++m_counterDds.cntEffectClusterEffects; @@ -301,7 +301,7 @@ EffectCluster ModuleTestEffectCluster::getEcForTneVerification(const QString &ea DEBUG_LOG(m_logger) << " bottomLeft" << bottomLeft; - eaData.area.cornerBottomLeft(Core::GeoPosition(bottomLeft.x(), bottomLeft.y(), 0.0)); + eaData.area.cornerBottomLeft = Core::GeoPosition(bottomLeft.x(), bottomLeft.y(), 0.0); eaData.area.height = height; eaData.area.width = width; eaData.area.rotation = rot; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp index 6e80781d2..79b5e2823 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_ExplosionCluster/explosion_cluster_module_test.cpp @@ -209,7 +209,7 @@ void ModuleTestExplosionCluster::onAesItemViewChanged(const AesItemView &aesItem if (modType == DataModification::eRemoved) return; - AreaEffectSimulation::AesType::type aesType = aesItemView.aesTypeId().underlying(); + AreaEffectSimulation::AesType aesType = static_cast(aesItemView.aesTypeId()); DEBUG_LOG(m_logger) << " got onAesItemViewChanged - m_data: " << m_data.id << ", aesType=" << aesType; switch (aesType) { @@ -219,7 +219,7 @@ void ModuleTestExplosionCluster::onAesItemViewChanged(const AesItemView &aesItem case AreaEffectSimulation::AesType::AtExplosionClusterGunToTargetLine: ++m_counterDds.cntAtExplosionClusterGunToTargetLine; break; -// case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions: +// case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions: // ++m_counterDds.cntAtExplosionClusterSingleExplosions; // m_aesItemViewSingleExplosions = aesItemView; // break; @@ -232,7 +232,7 @@ void ModuleTestExplosionCluster::onEffectsChanged(const Effects &effects, DataMo { if (modType == DataModification::eRemoved) return; - AreaEffectSimulation::AesType::type aesType = effects.aesTypeId().underlying(); + AreaEffectSimulation::AesType aesType = static_cast(effects.aesTypeId()); DEBUG_LOG(m_logger) << " got onEffectsChanged - m_data: " << m_data.id << ", aesType=" << aesType; ++m_counterDds.cntExplosionClusterEffects; @@ -388,7 +388,7 @@ ExplosionCluster ModuleTestExplosionCluster::getEcForTneVerification(const QStri eaData.partyId = 2; eaData.participantId = 7; - eaData.mhPoints({Core::GeoPosition2D(0.0, 0.0)}); + eaData.mhPoints = {Core::GeoPosition2D(0.0, 0.0)}; eaData.impactCount = 10; // SubStruct FlightCurve @@ -409,7 +409,7 @@ ExplosionCluster ModuleTestExplosionCluster::getEcForTneVerification(const QStri qCritical() << " bottomLeft" << bottomLeft; - eaData.area.cornerBottomLeft(Core::GeoPosition(bottomLeft.x(), bottomLeft.y(), 0.0)); + eaData.area.cornerBottomLeft = Core::GeoPosition(bottomLeft.x(), bottomLeft.y(), 0.0); eaData.area.height = height; eaData.area.width = width; eaData.area.rotation = rot; @@ -459,7 +459,7 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor1104(const QString &eaName) const double rot = 0; // 0.202561460978929 0.916110427477059 == 32U PD 76937 18655 - eaData.area.cornerBottomLeft(Core::GeoPosition2D(0.202561460978929, 0.916110427477059)); + eaData.area.cornerBottomLeft = Core::GeoPosition2D(0.202561460978929, 0.916110427477059); eaData.area.height = height; eaData.area.width = width; eaData.area.rotation = rot; @@ -514,7 +514,7 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor1106(const QString &eaName) LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD7696018588")); // QPointF pos = utmPos.geographic(); - eaData.area.cornerBottomLeft(Core::GeoPosition2D(pos.x(), pos.y())); + eaData.area.cornerBottomLeft = Core::GeoPosition2D(pos.x(), pos.y()); eaData.area.height = height; eaData.area.width = width; eaData.area.rotation = rot; @@ -567,7 +567,7 @@ ExplosionCluster ModuleTestExplosionCluster::getEcForUBAHN(const QString &eaName LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32U PD 77154 18454")); // 32 U PD 77154 18454 QPointF pos = utmPos.geographic(); - eaData.area.cornerBottomLeft(Core::GeoPosition2D(pos.x(), pos.y())); + eaData.area.cornerBottomLeft = Core::GeoPosition2D(pos.x(), pos.y()); eaData.area.height = height; eaData.area.width = width; eaData.area.rotation = rot; @@ -620,7 +620,7 @@ ExplosionCluster ModuleTestExplosionCluster::getEcFor3101(const QString &eaName) LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD7722018559")); // 32 U PD 77220 18559 QPointF pos = utmPos.geographic(); - eaData.area.cornerBottomLeft(Core::GeoPosition2D(pos.x(), pos.y())); + eaData.area.cornerBottomLeft = Core::GeoPosition2D(pos.x(), pos.y()); eaData.area.height = height; eaData.area.width = width; eaData.area.rotation = rot; @@ -760,7 +760,7 @@ void ModuleTestExplosionCluster::setupParticipants() const LtsCoordTrans::UtmCoordinate &utmPos = LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD7690018000")); // 32U PD 76900 18000 QPointF pos = utmPos.geographic(); - req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0)); + req.position = Core::GeoPosition(pos.x(), pos.y(), 0.0); INFO_LOG(m_logger) << " setSimulatedPositionRequest ..."; m_replyError = true; @@ -780,7 +780,7 @@ void ModuleTestExplosionCluster::setupParticipants() const LtsCoordTrans::UtmCoordinate &utmPos = LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD7600019000")); // 32U PD 76000 19000 QPointF pos = utmPos.geographic(); - req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0)); + req.position = Core::GeoPosition(pos.x(), pos.y(), 0.0); INFO_LOG(m_logger) << " setSimulatedPositionRequest ..."; m_replyError = true; @@ -803,7 +803,7 @@ void ModuleTestExplosionCluster::setupParticipants() // LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD7500018000")); // 32U PD 75000 18000 LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD5000018000")); // 32U PD 50000 18000 QPointF pos = utmPos.geographic(); - req_SSPF.position(Core::GeoPosition(pos.x(), pos.y(), 0.0)); + req_SSPF.position = Core::GeoPosition(pos.x(), pos.y(), 0.0); QString prop = QString(QStringLiteral("{\"angle\":0,\"distance\":25,\"distanceSets\":{\"Aufgelockert\":50,\"Geschlossen\":25},\"geometry\":\"line\"}")); req_SSPF.formation = prop.toStdString() ; @@ -827,7 +827,7 @@ void ModuleTestExplosionCluster::setupParticipants() // LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD7500018000")); // 32U PD 75000 18000 LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD0100018000")); // 32U PD 01000 18000 QPointF pos = utmPos.geographic(); - req_SSPF.position(Core::GeoPosition(pos.x(), pos.y(), 0.0)); + req_SSPF.position = Core::GeoPosition(pos.x(), pos.y(), 0.0); QString prop = QString(QStringLiteral("{\"angle\":0,\"distance\":25,\"distanceSets\":{\"Aufgelockert\":50,\"Geschlossen\":25},\"geometry\":\"line\"}")); req_SSPF.formation = prop.toStdString() ; @@ -2074,7 +2074,7 @@ void ModuleTestExplosionCluster::test_point_geometry_bldg_1104() eaData.flightCurve.get().requestedRelativePeakHeight = 500; eaData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint; - eaData.area.cornerBottomLeft(Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705)); // !!bottomLeft!! should be interpreted at center of impact + eaData.area.cornerBottomLeft = Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705); // !!bottomLeft!! should be interpreted at center of impact // LtsCoordTrans::UtmCoordinate newTargetPosUtm_Hill = LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32U PD 77457 17613")); // 32U PD 77438 17632 // auto newPnt = newTargetPosUtm_Hill.geographic(); @@ -2134,7 +2134,7 @@ void ModuleTestExplosionCluster::test_point_geometry_bldg_1104_SMArt_Proximity() eaData.flightCurve.get().requestedRelativePeakHeight = 500; eaData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint; - eaData.area.cornerBottomLeft(Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705)); // !!bottomLeft!! should be interpreted at center of impact + eaData.area.cornerBottomLeft = Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705); // !!bottomLeft!! should be interpreted at center of impact // LtsCoordTrans::UtmCoordinate newTargetPosUtm_Hill = LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32U PD 77457 17613")); // 32U PD 77438 17632 // auto newPnt = newTargetPosUtm_Hill.geographic(); @@ -2192,7 +2192,7 @@ void ModuleTestExplosionCluster::test_bldg_1104_OC() name += QString::number(requestOC.effectStart); requestOC.name = name.toStdString(); - requestOC.area.cornerBottomLeft(Core::GeoPosition2D(0.2025, 0.91611)); // !!bottomLeft!! + requestOC.area.cornerBottomLeft = Core::GeoPosition2D(0.2025, 0.91611); // !!bottomLeft!! requestOC.area.width = 20; requestOC.area.height = 30; requestOC.area.rotation = 17; @@ -2246,7 +2246,7 @@ void ModuleTestExplosionCluster::test_point_geometry_bldg_1104_light() eaData.chargeStruct.chargeTypeId = s_ChargeTypeId1; eaData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint; - eaData.area.cornerBottomLeft(Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705)); // !!bottomLeft!! + eaData.area.cornerBottomLeft = Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705); // !!bottomLeft!! eaData.area.width = 10; eaData.area.height = 10; eaData.area.rotation = 0; @@ -2297,7 +2297,7 @@ void ModuleTestExplosionCluster:: test_point_geometry_bldg_1104_single_effect_on request.element = request.name; const QPointF impactPointF(0.20256382834808495, 0.9161105453111705); - request.impactPosition(Core::GeoPosition2D(impactPointF.x(), impactPointF.y())); + request.impactPosition = Core::GeoPosition2D(impactPointF.x(), impactPointF.y()); INFO_LOG(m_logger) << LOGFUNCTION << " requested impact position = " << LtsCoordTrans::UtmCoordinate::fromGeographic(impactPointF).mgrs(); request.chargeTypeId = 371; @@ -2413,7 +2413,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104() eaData.flightCurve.get().dropAngle = 45; eaData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint; - eaData.area.cornerBottomLeft(Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705)); // !!bottomLeft!! + eaData.area.cornerBottomLeft = Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705); // !!bottomLeft!! eaData.area.width = 25; eaData.area.height = 25; eaData.area.rotation = 0; @@ -2470,7 +2470,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify() eaData.flightCurve.get().dropAngle = 45; eaData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint; - eaData.area.cornerBottomLeft(Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705)); // !!bottomLeft!! + eaData.area.cornerBottomLeft = Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705); // !!bottomLeft!! eaData.area.width = 25; eaData.area.height = 25; eaData.area.rotation = 0; @@ -2574,7 +2574,7 @@ void ModuleTestExplosionCluster::test_vulcano_bldg_1104_withTargetModify2() eaData.flightCurve.get().dropAngle = 45; eaData.explosionGeometry = AreaEffectSimulation::AesExplosionGeometry::EgPoint; - eaData.area.cornerBottomLeft(Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705)); // !!bottomLeft!! + eaData.area.cornerBottomLeft = Core::GeoPosition2D(0.20256382834808495, 0.9161105453111705); // !!bottomLeft!! eaData.area.width = 25; eaData.area.height = 25; eaData.area.rotation = 0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp index 2ad75026f..0af83fd52 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_Limits/limits_module_test.cpp @@ -695,7 +695,7 @@ ExplosionAreaModifyRequest ModuleTestLimits::getEa() { auto ea = ExplosionAreaModifyRequest(); - ea.area(AreaEffectSimulation::Area(m_decentralPoint, 500, 600, 70)); + ea.area = AreaEffectSimulation::Area(m_decentralPoint, 500, 600, 70); ea.name = QStringLiteral("Test_AE__").toStdString(); ea.id = 0; ea.cannonCount = 10; @@ -821,7 +821,7 @@ FunctionalAreaModifyRequest ModuleTestLimits::getFA() fa.id = 0; fa.effectStart = QDateTime::currentMSecsSinceEpoch() + 30000000; fa.effectDuration = 100000; - fa.area(AreaEffectSimulation::Area(m_decentralPoint, 500, 600, 70)); + fa.area = AreaEffectSimulation::Area(m_decentralPoint, 500, 600, 70); fa.chargeTypeId = 311; fa.partyId = 2; fa.deconMode = AreaEffectSimulation::AesOperatingMode::OmWaitingTime; @@ -838,7 +838,7 @@ TechnicalAreaModifyRequest ModuleTestLimits::getTA() { auto ta = TechnicalAreaModifyRequest(); ta.id = 0; - ta.area(AreaEffectSimulation::Area(m_decentralPoint, 500, 600, 70)); + ta.area = AreaEffectSimulation::Area(m_decentralPoint, 500, 600, 70); ta.type = AreaEffectSimulation::AesTechnicalAreaType::TatRestingAreaVehicle; return ta; } @@ -1145,7 +1145,7 @@ void ModuleTestLimits::setupParticipant() req.participantId = 6; // according testDB req.onlyOutdatedParticipants = false; - req.position(Core::GeoPosition(m_partPos.lon, m_partPos.lat, 0.0)); + req.position = Core::GeoPosition(m_partPos.lon, m_partPos.lat, 0.0); INFO_LOG(m_logger) << " setSimulatedPositionRequest ..."; m_replyError = true; @@ -1189,7 +1189,7 @@ void ModuleTestLimits::deleteAesAreas() NOTICE_LOG(m_logger) << " removing most AesObject..."; - const QVector sts = {AesEffectState::EsExpired, AesEffectState::EsRemoved, AesEffectState::EsActivated}; + const QVector sts = {AesEffectState::EsExpired, AesEffectState::EsRemoved, AesEffectState::EsActivated}; auto clusters = m_aesDtc->explosionClusters(); for (auto cluster : qAsConst(clusters)) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp index a549846da..2407b65fa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTest_others/aes_others_module_test.cpp @@ -159,7 +159,7 @@ void ModuleTestAesOthers::onAesItemViewChanged(const AesItemView &aesItemView, D if (modType == DataModification::eRemoved) return; - AreaEffectSimulation::AesType::type aesType = aesItemView.aesTypeId().underlying(); + AreaEffectSimulation::AesType aesType = static_cast(aesItemView.aesTypeId()); DEBUG_LOG(m_logger) << " got onAesItemViewChanged, aesType=" << aesType; switch (aesType) @@ -302,7 +302,7 @@ void ModuleTestAesOthers::setupParticipants() const LtsCoordTrans::UtmCoordinate &utmPos = LtsCoordTrans::UtmCoordinate::fromMgrs(QStringLiteral("32UPD7690018100")); // 32U PD 76900 18100 QPointF pos = utmPos.geographic(); - req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0)); + req.position = Core::GeoPosition(pos.x(), pos.y(), 0.0); INFO_LOG(m_logger) << " setSimulatedPositionRequest ..."; m_replyError = true; @@ -390,7 +390,7 @@ int ModuleTestAesOthers::doMoveParticipant(int participantId, const QString &new const LtsCoordTrans::UtmCoordinate &utmPos = LtsCoordTrans::UtmCoordinate::fromMgrs(newPositionMGRS); // 32U PD 76900 18100 QPointF pos = utmPos.geographic(); - req.position(Core::GeoPosition(pos.x(), pos.y(), 0.0)); + req.position = Core::GeoPosition(pos.x(), pos.y(), 0.0); INFO_LOG(m_logger) << " setSimulatedPositionRequest ..."; m_replyError = true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp index 5c06f894b..b603361fc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_explosion_cluster.cpp @@ -114,7 +114,7 @@ void TestExplosionCluster::tryCreateExplosionCluster() eaData.effectDuration(), eaData.effectSourceId(), eaData.area(), - AreaEffectSimulation::AesExplosionGeometry_def::EgArea, + AreaEffectSimulation::AesExplosionGeometry::EgArea, 0, // zog eaData.mhPoints().size(), // mhpCount; dds::core::optional(), // mhpRotation for ExplosionClusterOcModify only diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp index b3d9335f9..e7810e552 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/ModuleTests/aes_test_mine_area.cpp @@ -106,7 +106,7 @@ void TestMineArea::tryCreateMineArea() esData.width(7.0); esData.partyId(7); esData.participantId(1234); - esData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType_def::LptArtillery); + esData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery); esData.isLaidHidden(true); std::vector segments; @@ -440,7 +440,7 @@ void TestMineArea::tryModifyMineArea() m_maData.width(7.0); m_maData.partyId(8); m_maData.participantId(1235); - m_maData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType_def::LptArtillery); + m_maData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery); m_maData.isLaidHidden(false); const AreaEffectSimulation::MineArea esData(m_maData); m_maData = AreaEffectSimulation::MineArea(); @@ -511,7 +511,7 @@ void TestMineArea::tryCreateAnotherMineArea() esData.width(7.0); esData.partyId(7); esData.participantId(1234); - esData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType_def::LptArtillery); + esData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery); esData.isLaidHidden(false); std::vector segments; @@ -571,7 +571,7 @@ void TestMineArea::tryCreateMineArea2(int chargeTypeId, double density) esData.width(7.0); esData.partyId(7); esData.participantId(1234); - esData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType_def::LptArtillery); + esData.layingProcedureType(AreaEffectSimulation::AesMaLayingProcedureType::LptArtillery); esData.isLaidHidden(false); std::vector segments; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h index b6d09e3a2..79c7f2d8f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_point.h @@ -44,8 +44,8 @@ Q_DECL_CONSTEXPR inline bool operator!=(const TrajectoryPoint &p1, const Traject return p1.position != p2.position || p1.time != p2.time; } +// Must live in this namespace so that ADL finds it from generic stream helpers +// (e.g. NGL::LogStreamHelper::operator<<), which rely on argument-dependent lookup. +TRAJECTORY_EXPORT std::ostream &operator<< (std::ostream &stream, const TrajectoryPoint &value); + } // namespace AreaEffectSimulation - - -// at global namespace: -TRAJECTORY_EXPORT std::ostream &operator<< (std::ostream &stream, const AreaEffectSimulation::TrajectoryPoint &value); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.cpp index ac30fda9d..9b6aa2b48 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/Trajectory/trajectory_transform.cpp @@ -75,12 +75,12 @@ QVector transformToNewTarget( } } // namespace TrajectoryTransform -} // namespace AreaEffectSimulation - -std::ostream &operator<< (std::ostream &stream, const AreaEffectSimulation::TrajectoryPoint &value) +std::ostream &operator<< (std::ostream &stream, const TrajectoryPoint &value) { stream << "TrajectoryPoint(" << "position=" << value.position << "; time=" << value.time; return stream; } +} // namespace AreaEffectSimulation + diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.cpp index 3cb779401..fb9cd2b8f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/_object_explosion_single_central.cpp @@ -82,7 +82,7 @@ void ObjectExplosionSingleCentral::onPublishData() partitionTimeMSec(), m_data.chargeTypeId, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, toOptional(m_data.partyId), toOptional(m_data.participantId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.h index f127bb3ee..3a9b1e970 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/effector_state_machine.h @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "logger.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h index 58b21a6a8..8f68f9f7c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_base.h @@ -218,7 +218,7 @@ public: } if (succ) return Core::FunctionReplyObject(); - return Core::FunctionReplyObject(id, tr_lts("dds", "Could not switch effect simulation with id %1 to state with id %2.")).arg(id).arg(effectState); + return Core::FunctionReplyObject(id, tr_lts("dds", "Could not switch effect simulation with id %1 to state with id %2.")).arg(id).arg(static_cast(effectState)); } Core::FunctionReplyObject aesItemRemove(const Core::RemoveElementRequest &request) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp index f93d46d14..2d1542a21 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_effect_cluster.cpp @@ -342,9 +342,9 @@ void HandlerEffectCluster::onEffectClusterSingleEffectOnlyModifyRequest(const rt ecCommonModifyRequest.effectDuration(1000); // charge and geometry: - ecCommonModifyRequest.explosionGeometry(AreaEffectSimulation::AesExplosionGeometry_def::EgPoint); + ecCommonModifyRequest.explosionGeometry(AreaEffectSimulation::AesExplosionGeometry::EgPoint); // ecCommonModifyRequest.zog(0); - ecCommonModifyRequest.fuseType(ProjectDataManagement::FuseType_def::FtImpact); + ecCommonModifyRequest.fuseType(ProjectDataManagement::FuseType::FtImpact); ecCommonModifyRequest.chargeTypeId(request.chargeTypeId()); // height, width are <=0 -> area will be adjusted using impactRadius of charge: @@ -491,7 +491,7 @@ Core::FunctionReplyObject HandlerEffectCluster::effectClusterCreateRequest(const const bool bChargeIsAirSupport = gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport; ifs->setAirSupportSource(bChargeIsAirSupport); // Now we always need to send fire ready, never without - newData.effectorState = AesEffectorState::EsNotReadyToFire; + newData.effectorState = static_cast(AesEffectorState::EsNotReadyToFire); const Core::FunctionReplyObject ret = ifs->createObject(newData, newEffectorDataVec); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp index 18d4de1e0..a9ddda9bb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_functional_area.cpp @@ -311,7 +311,7 @@ Core::FunctionReplyObject HandlerFunctionalArea::functionalAreaModifyRequest(con // Supply-Truck always isCentral - // if ( request.supplyMode() == AesOperatingMode_def::OmWaitingTime) + // if ( request.supplyMode() == AesOperatingMode::OmWaitingTime) // { // isCentral = true; // wasCentral = true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp index fead9a3f9..7e156d013 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_gas_pipe.cpp @@ -202,7 +202,7 @@ Core::FunctionReplyObject HandlerGasPipe::gasPipeModifyRequest(const GasPipeModi // bool isCentral = ifs->checkIsCentral(_form); // bool wasCentral = ifs->data().isCentral; // // Supply-Truck always isCentral -// // if ( request.supplyMode() == AesOperatingMode_def::OmWaitingTime) +// // if ( request.supplyMode() == AesOperatingMode::OmWaitingTime) // // { // // isCentral = true; // // wasCentral = true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp index 4c2ae27a1..e601d4a97 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_mine_area.cpp @@ -956,7 +956,7 @@ bool HandlerMineArea::fillFromMineAreaReferenceRequest(const MineAreaReferenceMo const auto chargeType = m_mainHandler->dds()->pdmDtc()->chargeType(inReq.chargeTypeId); const QJsonObject chargeTypePropObj = QJsonDocument::fromJson(chargeType.properties.c_str()).object(); - const qint64 effectStart = mineData->armingTime(); + const qint64 effectStart = mineData->armingTime; const int effectDurationMsec = inReq.effectDurationMsec; auto effectCluster = m_mainHandler->effectClusterHandler()->getEffectClusterObj(inReq.referenceAesItemId); // get partyId from effect cluster object if (!effectCluster) @@ -1001,14 +1001,14 @@ bool HandlerMineArea::fillFromMineAreaReferenceRequest(const MineAreaReferenceMo dbData.effectSourceId = effectCluster->data().effectSourceId; dbData.partyId = effectCluster->data().partyId; dbData.chargeTypeId = chargeType.id; - dbData.participantId = LtsUtils::toOptional(0); + dbData.participantId = 0; dbData.density = density; dbData.width = width; dbData.layingProcedureTypeId = layingProcedure; dbData.isLaidHidden = isLaidHidden; dbData.effectMarkingInTa = effectMarkingTa; dbData.isCenterLine = isCenterLine; - dbData.externalId = LtsUtils::toOptional(0LL); + dbData.externalId = 0; dbData.isCentral = true; return true; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp index 742eb66b5..c60deeac9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/handler_recon_area.cpp @@ -187,7 +187,7 @@ Core::FunctionReplyObject HandlerReconArea::switchTo(int id, AesEffectState effe } if (succ) return Core::FunctionReplyObject(); - return Core::FunctionReplyObject(id, tr_lts("dds", "Could not switch effect simulation with id %1 to state with id %2.")).arg(id).arg(effectState); + return Core::FunctionReplyObject(id, tr_lts("dds", "Could not switch effect simulation with id %1 to state with id %2.")).arg(id).arg(static_cast(effectState)); } void HandlerReconArea::onReconAreaRemoveRequest(const rti::core::SampleIdentity &cookie, diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_air_support_impact.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_air_support_impact.cpp index c2e357c05..1d3e3eb2d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_air_support_impact.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_air_support_impact.cpp @@ -71,7 +71,7 @@ void ObjectAirSupportImpact::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h index 411e31bc8..502c79035 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_base.h @@ -129,10 +129,10 @@ class ObjectBase : public QObject static qint64 toMSec(const QDateTime &dt); template dds::core::optional toOptional(T inVal) { return inVal != T() ? dds::core::optional(inVal) : dds::core::optional(); } - dds::core::optional toOptional(const QDateTime &dt) + dds::core::optional toOptional(const QDateTime &dt) { qint64 t = (dt.isValid() && !dt.isNull()) ? dt.toMSecsSinceEpoch() : 0; - return toOptional(t); + return toOptional(t); } template static inline void ddsVecFromPoly(const T &in, const U &heights, std::vector &out) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_bccontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_bccontamination.cpp index f2c045587..dfcf91130 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_bccontamination.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_bccontamination.cpp @@ -182,7 +182,7 @@ void ObjectBCContamination::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_booby_trap.cpp index c86823319..645259267 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_booby_trap.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_booby_trap.cpp @@ -130,7 +130,7 @@ void ObjectBoobyTrap::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId, 0,0 }, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.cpp index 7da02f399..3055478da 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_borderline.cpp @@ -182,7 +182,7 @@ void ObjectBorderline::onPublishData() ddsData.sampleTime = m_mainHandler->dds()->currentPartitionTimeMSec(); ddsData.chargeStruct.chargeTypeId = m_data.chargeTypeId; ddsData.effectDuration = m_data.effectDuration; - ddsData.effectStart = toOptional(toMSec(m_data.effectStart)); + ddsData.effectStart = toOptional(toMSec(m_data.effectStart)); ddsData.effectStateId = effectState(); ddsData.partyId = toOptional(m_data.partyId); ddsData.participantId = toOptional(m_data.participantId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h index c1defb550..975f25d85 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_charge_effect.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include class QTimer; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp index 4d89ecd0a..27e4afc8a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_danger_area.cpp @@ -163,7 +163,7 @@ void ObjectDangerArea::onPublishData() m_mainHandler->dds()->currentPartitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), effectState(), m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp index 4ffde8e5b..b0e3c1fbe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_effect_cluster.cpp @@ -817,9 +817,9 @@ Core::FunctionReplyObject ObjectEffectCluster::checkObjectData(const Database::A Core::FunctionReplyObject ret; - using geoType = AreaEffectSimulation::AesExplosionGeometry_def; - const geoType::type curExGeoType = data.explosionGeometryId.underlying(); - static const QVector ecValidGeos = {AreaEffectSimulation::AesExplosionGeometry::EgAimPoint, // 0 -> default + using geoType = AreaEffectSimulation::AesExplosionGeometry; + const geoType curExGeoType = data.explosionGeometryId; + static const QVector ecValidGeos = {AreaEffectSimulation::AesExplosionGeometry::EgAimPoint, // 0 -> default AreaEffectSimulation::AesExplosionGeometry::EgPoint, AreaEffectSimulation::AesExplosionGeometry::EgArea, AreaEffectSimulation::AesExplosionGeometry::EgRadial, @@ -1089,7 +1089,7 @@ void ObjectEffectCluster::onPublishData() 0, // partitionTimeMSec(), {m_effectorData.begin().value().chargeTypeId, m_effectorData.begin().value().igniterTypeId, m_effectorData.begin().value().igniterFunctionId}, m_data.effectDuration, // pause/resume: remainDuration - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), @@ -1289,7 +1289,7 @@ void ObjectEffectCluster::adjustTrajectoryToDetonationLocation(int explosionInde // Effects: std::vector &singleEffectsRef = m_effects.singleEffects; SingleEffect &ref = singleEffectsRef[explosionIndex]; - // ref.effectState(AesSingleEffectState_def::SesScheduled); + // ref.effectState(AesSingleEffectState::SesScheduled); ref.position = intersectionLocation; ref.zPlacement = AesZPlacement::ZpAbsolute; // intersection: change from draped to relative // m_effectsHaveChanged = true; @@ -1478,7 +1478,7 @@ void ObjectEffectCluster::publishAiv() // AtEffectClusterGunToTargetLine is suppressed at map display, when main object changes to EsActivated // So it does not have to be changed/published anymore. // Especially helpful while restarting scvAes! - static QVector relevantEffStates = {AesEffectState::EsReceived, + static QVector relevantEffStates = {AesEffectState::EsReceived, AesEffectState::EsCreated, AesEffectState::EsPrepared, AesEffectState::EsFired, @@ -3298,7 +3298,7 @@ bool ObjectEffectCluster::overrideEffectorStates(const AesEffectorState &newStat case AesEffectorState::EsReadyToFire: { // Override internal state in case DMF is not ready yet - m_data.effectorState = AesEffectorState::EsReadyToFire; + m_data.effectorState = static_cast(AesEffectorState::EsReadyToFire); DEBUG_LOG(m_logger) << "Set Ready to Fire !"; onPublishData(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp index bbab54327..453a5137e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_area.cpp @@ -227,7 +227,7 @@ void ObjectExplosionArea::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp index 60439c8ec..d87d7de9e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_cluster.cpp @@ -647,9 +647,9 @@ Core::FunctionReplyObject ObjectExplosionCluster::checkObjectData(const Database Core::FunctionReplyObject ret; - using geoType = AreaEffectSimulation::AesExplosionGeometry_def; - const geoType::type curExGeoType = data.explosionGeometryId.underlying(); - static const QVector ecValidGeos = {AreaEffectSimulation::AesExplosionGeometry::EgAimPoint, // 0 -> default + using geoType = AreaEffectSimulation::AesExplosionGeometry; + const geoType curExGeoType = data.explosionGeometryId; + static const QVector ecValidGeos = {AreaEffectSimulation::AesExplosionGeometry::EgAimPoint, // 0 -> default AreaEffectSimulation::AesExplosionGeometry::EgPoint, AreaEffectSimulation::AesExplosionGeometry::EgArea, AreaEffectSimulation::AesExplosionGeometry::EgRadial, @@ -675,7 +675,7 @@ Core::FunctionReplyObject ObjectExplosionCluster::checkObjectData(const Database else if (!ecValidGeos.contains(curExGeoType)) reason = QString(QStringLiteral("ExplosionGeometryType not supported yet (%1)")).arg(static_cast(curExGeoType)); - // else if ((curExGeoType == AreaEffectSimulation::AesExplosionGeometry_def::EgArea) && + // else if ((curExGeoType == AreaEffectSimulation::AesExplosionGeometry::EgArea) && // (data.impactCount <= 2)) // reason = QString(QStringLiteral("ImpactCount invalid (%1)")).arg(QStringLiteral("Area requires at least 2 impacts")); @@ -1065,7 +1065,7 @@ void ObjectExplosionCluster::onPublishData() 0, // partitionTimeMSec(), {m_data.chargeTypeId, m_data.igniterTypeId, m_data.igniterFunctionId}, m_data.effectDuration, // pause/resume: remainDuration - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), @@ -1297,7 +1297,7 @@ void ObjectExplosionCluster::adjustTrajectoryToDetonationLocation(int explosionI // Effects: std::vector &singleEffectsRef = m_effects.singleEffects; SingleEffect &ref = singleEffectsRef[explosionIndex]; - // ref.effectState(AesSingleEffectState_def::SesScheduled); + // ref.effectState(AesSingleEffectState::SesScheduled); ref.position = intersectionLocation; ref.zPlacement = AesZPlacement::ZpAbsolute; // intersection: change from draped to relative // m_effectsHaveChanged = true; @@ -1558,7 +1558,7 @@ void ObjectExplosionCluster::publishAiv() // AtExplosionClusterGunToTargetLine is suppressed at map display, when main object changes to EsActivated // So it does not have to be changed/published anymore. // Especially helpful while restarting scvAes! - static QVector relevantEffStates = { + static QVector relevantEffStates = { AesEffectState::EsCreated, AesEffectState::EsPrepared, AesEffectState::EsActivated, // 2026-05-27, N.Thoden: E01562-393: GTL auch bei EsFired anzeigen, daher auch bei EsActivated @@ -1886,9 +1886,9 @@ void ObjectExplosionCluster::checkNextFire() // continue; // SingleEffect &ref = singleEffectsRef[idx]; -// if (ref.singleEffectState().underlying() != AesSingleEffectState_def::SesTriggered) +// if (ref.singleEffectState().underlying() != AesSingleEffectState::SesTriggered) // { -// ref.singleEffectState(AesSingleEffectState_def::SesTriggered); +// ref.singleEffectState(AesSingleEffectState::SesTriggered); // ref.singleEffectTime(curPartTime); // bChanged = true; // } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_single.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_single.cpp index 04db053e3..9a8ec71a2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_single.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_explosion_single.cpp @@ -143,7 +143,7 @@ void ObjectExplosionSingle::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.cpp index ee5cb1eb5..db1797e99 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_functional_area.cpp @@ -156,7 +156,7 @@ void ObjectFunctionalArea::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.cpp index c964a1376..6ebe58565 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_gas_pipe.cpp @@ -190,7 +190,7 @@ void ObjectGasPipe::onPublishData() ddsData.sampleTime = m_mainHandler->dds()->currentPartitionTimeMSec(); ddsData.chargeStruct.chargeTypeId = m_data.chargeTypeId; ddsData.effectDuration = m_data.effectDuration; - ddsData.effectStart = toOptional(toMSec(m_data.effectStart)); + ddsData.effectStart = toOptional(toMSec(m_data.effectStart)); ddsData.width = m_data.width; ddsData.effectStateId = effectState(); ddsData.partyId = toOptional(m_data.partyId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp index 1a6a87d83..1f10e5bc1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area.cpp @@ -1370,7 +1370,7 @@ void ObjectMineArea::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId, 0, 0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp index b2e09c58e..b92e362f7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_area_null.cpp @@ -33,7 +33,7 @@ ObjectMineAreaNull::ObjectMineAreaNull(MainHandler *mainHandler, } // Set TriggeredExplosions Base Data - m_tis.id = AesType::AtMineAreaSingleMines; + m_tis.id = static_cast(AesType::AtMineAreaSingleMines); m_tis.aesItemId = 0; m_tis.aesTypeId = AesType::AtMineAreaSingleMines; @@ -259,7 +259,7 @@ void ObjectMineAreaNull::publishAiv() aiv2.boundingBoxBottomLeft = Core::GeoPosition2D(tmp.boundingRect().bottomLeft().x(), tmp.boundingRect().bottomLeft().y()); aiv2.boundingBoxTopRight = Core::GeoPosition2D(tmp.boundingRect().topRight().x(), tmp.boundingRect().topRight().y()); aiv2.aesTypeId = AesType::AtMineAreaSingleMines; - aiv2.id = AesType::AtMineAreaSingleMines; + aiv2.id = static_cast(AesType::AtMineAreaSingleMines); aiv2.effectStateId = AesEffectState::EsActivated; aiv2.setId = dds::core::optional(m_setId); if (m_data.partyId != 0) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp index 46fdb0e58..4cbfefe16 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_mine_corridor.cpp @@ -173,7 +173,7 @@ void ObjectMineCorridor::onPublishData() m_mainHandler->dds()->currentPartitionTimeMSec(), {m_data.chargeTypeId, 0,0 }, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), effectState(), m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_ncontamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_ncontamination.cpp index bb9e92cde..112e28953 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_ncontamination.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_ncontamination.cpp @@ -117,7 +117,7 @@ void ObjectNContamination::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_off_route_mine.cpp index 231221570..378d9d401 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_off_route_mine.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_off_route_mine.cpp @@ -136,7 +136,7 @@ void ObjectOffRouteMine::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, toOptional(m_data.partyId), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_recon_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_recon_area.cpp index 1fa8634ae..ed603f81d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_recon_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_recon_area.cpp @@ -94,7 +94,7 @@ void ObjectReconArea::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, dds::core::optional(), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_technical_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_technical_area.cpp index 7cd289094..3c5e5d2c4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_technical_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_technical_area.cpp @@ -90,7 +90,7 @@ void ObjectTechnicalArea::onPublishData() partitionTimeMSec(), {m_data.chargeTypeId,0,0}, m_data.effectDuration, - toOptional(toMSec(m_data.effectStart)), + toOptional(toMSec(m_data.effectStart)), m_data.effectStateId, m_data.effectSourceId, dds::core::optional(), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_trajectory.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_trajectory.h index eed918919..535184e6c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_trajectory.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AreaEffectSimulation/object_trajectory.h @@ -26,7 +26,7 @@ public: // [E01562-259] use originatorId, originatorTypeId (instead of aesItemId, aesTypeId) // int aesItemId = -1; - // AesType aesTypeId = AesType::inner_enum::AtUnknown; + // AesType aesTypeId = AesType::AtUnknown; int originatorId = -1; ProjectDataManagement::StateChangeOriginator originatorTypeId = ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Unknown; qint64 startTime = 0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler.cpp index ff2235dba..dc05b2c4b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/audio_video_handler.cpp @@ -49,7 +49,7 @@ public: const Streams &findStreams(Asset *asset) override { Q_ASSERT(asset); - return findStreams(asset->data().id()); + return findStreams(asset->data().id); } void insert(Streams &streams) override @@ -124,7 +124,7 @@ public: void remove(Asset *asset) override { Q_ASSERT(asset); - auto found = m_cache.find(asset->data().id()); + auto found = m_cache.find(asset->data().id); Q_ASSERT(found != m_cache.end()); const Streams &streams = found->second; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp index b72b4de76..369dba765 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_handler.cpp @@ -30,12 +30,12 @@ namespace bool isRadioStation(const InfrastructureManagement::MainStructureElement &mse) { - return mse.structureElementTypeId() == InfrastructureManagement::StructureElementType::RadioStation; + return mse.structureElementTypeId == InfrastructureManagement::StructureElementType::RadioStation; } QString hostnameForRadioStation(const InfrastructureManagement::MainStructureElement &mse) { - LtsUtils::JsonObject properties = LtsUtils::JsonObject::fromJson(mse.properties()); + LtsUtils::JsonObject properties = LtsUtils::JsonObject::fromJson(mse.properties); return properties.valueOr("hostname", QString()); } @@ -55,7 +55,7 @@ CnrChannel toDds(const Database::AvmCnrChannel &channel) channel.ssrc, channel.addacChannel, channel.pttControl, - static_cast(channel.frequencyBand)); + static_cast(channel.frequencyBand)); } ModifyCnrConfigRequest toRequest(const Database::AvmCnrConfig &dbData, const boost::optional &requestId = boost::none) @@ -72,28 +72,28 @@ ModifyCnrConfigRequest toRequest(const Database::AvmCnrConfig &dbData, const boo ModifyCnrConfigRequest toRequest(const CnrConfig &cnrConfig) { - return ModifyCnrConfigRequest(cnrConfig.id(), - cnrConfig.cnrChannelId(), - cnrConfig.exerciseId(), - cnrConfig.radioCircuit(), - cnrConfig.recording(), - cnrConfig.unitId(), - cnrConfig.partyId(), - cnrConfig.callSign()); + return ModifyCnrConfigRequest(cnrConfig.id, + cnrConfig.cnrChannelId, + cnrConfig.exerciseId, + cnrConfig.radioCircuit, + cnrConfig.recording, + cnrConfig.unitId, + cnrConfig.partyId, + cnrConfig.callSign); } Database::AvmCnrConfig toDb(const ModifyCnrConfigRequest &config) { Database::AvmCnrConfig result; - result.id = config.id(); - result.cnrChannelId = config.cnrChannelId(); - result.radioCircuit = QString::fromStdString(config.radioCircuit()); - result.callSign = QString::fromStdString(config.callSign()); - result.partyId = config.partyId(); + result.id = config.id; + result.cnrChannelId = config.cnrChannelId; + result.radioCircuit = QString::fromStdString(config.radioCircuit); + result.callSign = QString::fromStdString(config.callSign); + result.partyId = config.partyId; if (config.unitId.is_set()) result.unitId = config.unitId.get(); - result.recording = config.recording(); + result.recording = config.recording; if (config.exerciseId.is_set()) result.exerciseId = config.exerciseId.get(); @@ -120,22 +120,22 @@ public: void create(const CnrConfig &config) { - Q_ASSERT(!m_cache.contains(config.id())); + Q_ASSERT(!m_cache.contains(config.id)); Database::AvmDeviceConfig deviceConfig = m_handler->toDeviceConfig(config); bool status = m_db->insert(deviceConfig); if (!status) ERROR_LOG(m_logger) << "Error while inserting device config"; - m_cache.insert(config.id(), deviceConfig); + m_cache.insert(config.id, deviceConfig); emit m_handler->avDbReloadNeeded(); } void update(const CnrConfig &config) { - Q_ASSERT(m_cache.contains(config.id())); + Q_ASSERT(m_cache.contains(config.id)); - Database::AvmDeviceConfig oldDeviceConfig = m_cache.value(config.id()); + Database::AvmDeviceConfig oldDeviceConfig = m_cache.value(config.id); Database::AvmDeviceConfig newDeviceConfig = m_handler->toDeviceConfig(config); newDeviceConfig.id = oldDeviceConfig.id; @@ -143,13 +143,13 @@ public: if (!status) ERROR_LOG(m_logger) << "Error while updating device config"; - m_cache[config.id()] = newDeviceConfig; + m_cache[config.id] = newDeviceConfig; emit m_handler->avDbReloadNeeded(); } void createOrUpdate(const CnrConfig &config) { - if (m_cache.contains(config.id())) + if (m_cache.contains(config.id)) update(config); else create(config); @@ -283,7 +283,7 @@ void CnrHandler::onRemoveCnrConfigRequest(const rti::core::SampleIdentity &cooki void CnrHandler::onModifyCnrConfigRequest(const rti::core::SampleIdentity &cookie, const ModifyCnrConfigRequest &request) { - auto ret = (request.id() < 1 ? createCnrConfig(request) : modifyCnrConfig(request)); + auto ret = (request.id < 1 ? createCnrConfig(request) : modifyCnrConfig(request)); if (ret.error()) WARNING_LOG(m_logger) << ret(); m_fts->modifyCnrConfigReply(cookie, ret); @@ -365,10 +365,10 @@ void CnrHandler::onRadioStationChanged(const InfrastructureManagement::MainStruc { case DataModification::eAdded: case DataModification::eModified: - onRadioStationAdded(data.id(), QString::fromStdString(data.name()), hostnameForRadioStation(data)); + onRadioStationAdded(data.id, QString::fromStdString(data.name), hostnameForRadioStation(data)); break; case DataModification::eRemoved: - onRadioStationRemoved(data.id()); + onRadioStationRemoved(data.id); break; } } @@ -400,7 +400,7 @@ void CnrHandler::updateDeviceConfig() DBTransaction trans(m_db->database()); for (const auto &config : qAsConst(m_cache)) - if (config.isActive()) + if (config.isActive) m_deviceConfig->update(config); trans.commit(); @@ -419,7 +419,7 @@ CnrConfig CnrHandler::toDds(const Database::AvmCnrConfig &config) const false); if (needDeviceConfig(cnrConfig)) - cnrConfig.isActive(true); + cnrConfig.isActive = true; return cnrConfig; } @@ -429,11 +429,11 @@ Database::AvmDeviceConfig CnrHandler::toDeviceConfig(const CnrConfig &cnrConfig) static const QString recordingServer = QStringLiteral("EXCAVS01"); Database::AvmDeviceConfig deviceConfig; - const Database::AvmCnrChannel channel = channelById(cnrConfig.cnrChannelId()); + const Database::AvmCnrChannel channel = channelById(cnrConfig.cnrChannelId); deviceConfig.id = 0; deviceConfig.context = exerciseList(cnrConfig); deviceConfig.type = channel.addacChannel == 0 ? QStringLiteral("CNR_GUEZ_RT_CHANNEL") : QStringLiteral("ADDAC_RT_CHANNEL"); - deviceConfig.name = QString::fromStdString(cnrConfig.radioCircuit()); + deviceConfig.name = QString::fromStdString(cnrConfig.radioCircuit); deviceConfig.controller = stationList(channel.addacChannel); deviceConfig.definition = QStringLiteral("mode=1;ssrc=%1").arg(channel.ssrc); //for UAE we need pttc controll to! @@ -443,7 +443,7 @@ Database::AvmDeviceConfig CnrHandler::toDeviceConfig(const CnrConfig &cnrConfig) #endif if (channel.addacChannel) deviceConfig.definition += QStringLiteral(";channel=%1").arg(normalizedAddacChannel(channel.addacChannel)); - if (cnrConfig.recording()) + if (cnrConfig.recording) deviceConfig.definition.append(QStringLiteral(";recording=ECRS@%1").arg(recordingServer)); deviceConfig.link = 0; @@ -457,17 +457,17 @@ Core::FunctionReplyObject CnrHandler::validateRequest(const ModifyCnrConfigReque { Core::FunctionReplyObject reply; - if (request.id() > 0) + if (request.id > 0) { - reply.setId(request.id()); - if (!m_cache.contains(request.id())) - return reply.setStr(tr_lts("dds", "Could not modify CNR config because id %1 is unknown")).arg(request.id()); + reply.setId(request.id); + if (!m_cache.contains(request.id)) + return reply.setStr(tr_lts("dds", "Could not modify CNR config because id %1 is unknown")).arg(request.id); } - if (!isValidChannel(request.cnrChannelId())) - return reply.setStr(tr_lts("dds", "Could not create/modify CNR config because the channel with id %1 is invalid")).arg(request.cnrChannelId()); + if (!isValidChannel(request.cnrChannelId)) + return reply.setStr(tr_lts("dds", "Could not create/modify CNR config because the channel with id %1 is invalid")).arg(request.cnrChannelId); - if (!isStreamNameValid(request.radioCircuit())) + if (!isStreamNameValid(request.radioCircuit)) return reply.setStr(tr_lts("dds", "Could not create/modify CNR config because the circuit name is invalid")); if (!isNameUnique(request)) @@ -483,7 +483,7 @@ bool CnrHandler::checkConstraint(const std::function & { for (const CnrConfig &config : qAsConst(m_cache)) { - if (excludeId == config.id()) + if (excludeId == config.id) continue; // If both configs are local the constraint must hold if they are in the same exercise @@ -526,31 +526,31 @@ bool CnrHandler::isValidChannel(int64_t channelId) const bool CnrHandler::isFreeChannel(const ModifyCnrConfigRequest &request) const { - boost::optional exerciseId = toBoost(request.exerciseId()); + boost::optional exerciseId = toBoost(request.exerciseId); - if (request.id() <= 0) - return isFreeChannel(request.cnrChannelId(), exerciseId); - return isFreeChannel(request.cnrChannelId(), exerciseId, request.id()); + if (request.id <= 0) + return isFreeChannel(request.cnrChannelId, exerciseId); + return isFreeChannel(request.cnrChannelId, exerciseId, request.id); } bool CnrHandler::isFreeChannel(int32_t channelId, const boost::optional &exerciseId, const boost::optional &excludeId) const { - auto constraint = [&channelId] (const CnrConfig &config) { return config.cnrChannelId() != channelId; }; + auto constraint = [&channelId] (const CnrConfig &config) { return config.cnrChannelId != channelId; }; return checkConstraint(constraint, exerciseId, excludeId); } bool CnrHandler::isNameUnique(const ModifyCnrConfigRequest &request) { - boost::optional exerciseId = toBoost(request.exerciseId()); + boost::optional exerciseId = toBoost(request.exerciseId); - if (request.id() <= 0) - return isNameUnique(request.radioCircuit(), exerciseId); - return isNameUnique(request.radioCircuit(), exerciseId, request.id()); + if (request.id <= 0) + return isNameUnique(request.radioCircuit, exerciseId); + return isNameUnique(request.radioCircuit, exerciseId, request.id); } bool CnrHandler::isNameUnique(const std::string &name, const boost::optional &exerciseId, const boost::optional &excludeId) const { - auto constraint = [&name] (const CnrConfig &config) { return config.radioCircuit() != name; }; + auto constraint = [&name] (const CnrConfig &config) { return config.radioCircuit != name; }; return checkConstraint(constraint, exerciseId, excludeId); } @@ -576,10 +576,10 @@ Core::FunctionReplyObject CnrHandler::createCnrConfig(const ModifyCnrConfigReque } CnrConfig cnrConfig = toDds(dbConfigData); - m_cache.insert(cnrConfig.id(), cnrConfig); + m_cache.insert(cnrConfig.id, cnrConfig); m_dts->publish(cnrConfig); - if (cnrConfig.isActive()) + if (cnrConfig.isActive) m_deviceConfig->create(cnrConfig); return Core::FunctionReplyObject(dbConfigData.id); @@ -593,7 +593,7 @@ Core::FunctionReplyObject CnrHandler::modifyCnrConfig(const ModifyCnrConfigReque if (reply.error()) return reply; - auto found = m_cache.find(request.id()); + auto found = m_cache.find(request.id); Q_ASSERT(found != m_cache.end()); const CnrConfig &oldCnrConfig = *found; @@ -604,24 +604,24 @@ Core::FunctionReplyObject CnrHandler::modifyCnrConfig(const ModifyCnrConfigReque // But not every entry from the FrequencySet can be assigned, e.g. a CnrConfig of (channel-)type VHF cannot // be assigned to a FrequencySet-entry of type HF. // Thus changing the CnrChannel would possibly invalidate those assignments in the FrequencyPlanning. - if (request.cnrChannelId() != oldCnrConfig.cnrChannelId()) + if (request.cnrChannelId != oldCnrConfig.cnrChannelId) return reply.setStr(tr_lts("dds", "Changing the CNR channel is not allowed")); Database::AvmCnrConfig dbConfigData = toDb(request); CnrConfig newCnrConfig = toDds(dbConfigData); - if (newCnrConfig.isActive()) + if (newCnrConfig.isActive) m_deviceConfig->createOrUpdate(newCnrConfig); else - m_deviceConfig->tryRemove(newCnrConfig.id()); + m_deviceConfig->tryRemove(newCnrConfig.id); if (newCnrConfig == oldCnrConfig) return reply; if (!m_db->update(dbConfigData)) - return reply.setStr(tr_lts("dds", "Error updating CNR config data with id %1 in database")).arg(request.id()); + return reply.setStr(tr_lts("dds", "Error updating CNR config data with id %1 in database")).arg(request.id); - m_cache[newCnrConfig.id()] = newCnrConfig; + m_cache[newCnrConfig.id] = newCnrConfig; m_dts->publish(newCnrConfig); @@ -633,7 +633,7 @@ Core::FunctionReplyObject CnrHandler::removeCnrConfig(const Core::RemoveElementR { DEBUG_LOG(m_logger) << "RemoveCnrConfigRequest: " << request; - int32_t configId = request.id(); + int32_t configId = request.id; Core::FunctionReplyObject reply(configId); auto found = m_cache.find(configId); @@ -647,7 +647,7 @@ Core::FunctionReplyObject CnrHandler::removeCnrConfig(const Core::RemoveElementR m_dts->removeCnrConfigByKey(configId); if (!m_db->removeAvmCnrConfig(configId)) - return reply.setStr(tr_lts("dds", "Could not remove CNR config data with id %1")).arg(request.id()); + return reply.setStr(tr_lts("dds", "Could not remove CNR config data with id %1")).arg(request.id); emit cnrConfigRemoved(configId); @@ -675,7 +675,7 @@ bool CnrHandler::needDeviceConfig(const CnrConfig &config) const return false; // Config needs to be referenced. (Wonder if its possible to have a non-referenced one...) - if (m_frequencyPlanningHandler->isReferencedByActivePlan(exerciseId, config.id())) + if (m_frequencyPlanningHandler->isReferencedByActivePlan(exerciseId, config.id)) return true; return false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp index 9113f8103..c7e9356fe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.cpp @@ -48,18 +48,18 @@ CnrTvcProfile toDds(const Database::AvmCnrTvcProfile &circuitContainerDb, T circ std::sort(circuitsDb.begin(), circuitsDb.end(), lessRadioCircuitsContent); CnrTvcProfile circuitContainerDds(circuitContainerDb.id, circuitContainerDb.operatorId, circuitContainerDb.exerciseId, {}); - circuitContainerDds.data().reserve(circuitsDb.size()); + circuitContainerDds.data.reserve(circuitsDb.size()); for (const auto ¤tCircuitDb : qAsConst(circuitsDb)) - circuitContainerDds.data().push_back(toDds(currentCircuitDb)); + circuitContainerDds.data.push_back(toDds(currentCircuitDb)); return circuitContainerDds; } Database::AvmCnrTvcProfile toDb(const CnrTvcProfile &profileDds) { Database::AvmCnrTvcProfile profileDb; - profileDb.id = profileDds.id(); - profileDb.operatorId = profileDds.operatorId(); - profileDb.exerciseId = profileDds.exerciseId(); + profileDb.id = profileDds.id; + profileDb.operatorId = profileDds.operatorId; + profileDb.exerciseId = profileDds.exerciseId; return profileDb; } @@ -69,14 +69,14 @@ Database::AvmCnrTvcProfileData toDb(const CnrTvcProfileData &circuitDds, int32_t circuitDb.containerId = containerId; circuitDb.sortIndex = sortIndex; - switch (circuitDds.radioSystemId().underlying()) + switch (circuitDds.radioSystemId) { case RadioSystem::Cnr: - circuitDb.cnrConfigId = circuitDds.radioCircuitId(); + circuitDb.cnrConfigId = circuitDds.radioCircuitId; return circuitDb; case RadioSystem::Tvc: - circuitDb.tvcConfigId = circuitDds.radioCircuitId(); + circuitDb.tvcConfigId = circuitDds.radioCircuitId; return circuitDb; } Q_ASSERT(false); @@ -225,7 +225,7 @@ void CnrTvcProfileHandler::onModifyCnrTvcProfileRequest(const rti::core::SampleI const CnrTvcProfile &request) { Core::FunctionReplyObject rep; - if (request.id() <= 0) + if (request.id <= 0) rep = createProfile(request); else rep = modifyProfile(request); @@ -249,7 +249,7 @@ void CnrTvcProfileHandler::onRemoveCnrTvcProfileRequest(const rti::core::SampleI Core::FunctionReplyObject CnrTvcProfileHandler::createProfile(const CnrTvcProfile &createRequest) { - Q_ASSERT(createRequest.id() <= 0); + Q_ASSERT(createRequest.id <= 0); Core::FunctionReplyObject reply = validateRequest(createRequest); if (reply.error()) @@ -263,7 +263,7 @@ Core::FunctionReplyObject CnrTvcProfileHandler::createProfile(const CnrTvcProfil return reply.setStr(tr_lts("dds", "Failed to insert into 'avm.avm_cnr_tvc_profile'")); reply.setId(dbEntry.id); - const auto circuitDataDb = insert(createRequest.data(), dbEntry.id, status); + const auto circuitDataDb = insert(createRequest.data, dbEntry.id, status); if (!status) return reply.setStr(tr_lts("dds", "Failed to insert into 'avm.avm_cnr_tvc_profile_data'")); @@ -277,7 +277,7 @@ Core::FunctionReplyObject CnrTvcProfileHandler::createProfile(const CnrTvcProfil Core::FunctionReplyObject CnrTvcProfileHandler::modifyProfile(const CnrTvcProfile &modifyRequest) { - Q_ASSERT(modifyRequest.id() > 0); + Q_ASSERT(modifyRequest.id > 0); Core::FunctionReplyObject reply = validateRequest(modifyRequest); if (reply.error()) @@ -288,13 +288,13 @@ Core::FunctionReplyObject CnrTvcProfileHandler::modifyProfile(const CnrTvcProfil bool status = m_db->update(dbEntry); if (!status) - return reply.setStr(tr_lts("dds", "Failed to update 'avm.avm_cnr_tvc_profile' data with id %1")).arg(modifyRequest.id()); + return reply.setStr(tr_lts("dds", "Failed to update 'avm.avm_cnr_tvc_profile' data with id %1")).arg(modifyRequest.id); - status = m_db->removeAvmCnrTvcProfileDataByContainerId(modifyRequest.id()); + status = m_db->removeAvmCnrTvcProfileDataByContainerId(modifyRequest.id); if (!status) - return reply.setStr(tr_lts("dds", "Failed to remove from 'avm.avm_cnr_tvc_profile_data' with container_id %1")).arg(modifyRequest.id()); + return reply.setStr(tr_lts("dds", "Failed to remove from 'avm.avm_cnr_tvc_profile_data' with container_id %1")).arg(modifyRequest.id); - insert(modifyRequest.data(), modifyRequest.id(), status); + insert(modifyRequest.data, modifyRequest.id, status); if (!status) return reply.setStr(tr_lts("dds", "Failed to insert into 'avm.avm_cnr_tvc_profile_data'")); @@ -312,16 +312,16 @@ Core::FunctionReplyObject CnrTvcProfileHandler::removeProfile(const Core::Remove DBTransaction dbTransaction(m_db->database()); - bool status = m_db->removeAvmCnrTvcProfileDataByContainerId(request.id()); + bool status = m_db->removeAvmCnrTvcProfileDataByContainerId(request.id); if (!status) - return reply.setStr(tr_lts("dds", "Failed to remove from 'avm.avm_cnr_tvc_profile_data' with container_id %1")).arg(request.id()); + return reply.setStr(tr_lts("dds", "Failed to remove from 'avm.avm_cnr_tvc_profile_data' with container_id %1")).arg(request.id); - status = m_db->removeAvmCnrTvcProfile(request.id()); + status = m_db->removeAvmCnrTvcProfile(request.id); if (!status) - return reply.setStr(tr_lts("dds", "Failed to remove from 'avm.avm_cnr_tvc_profile' with id %1")).arg(request.id()); + return reply.setStr(tr_lts("dds", "Failed to remove from 'avm.avm_cnr_tvc_profile' with id %1")).arg(request.id); dbTransaction.commit(); - removeProfile(request.id()); + removeProfile(request.id); return reply; } @@ -350,18 +350,18 @@ std::vector CnrTvcProfileHandler::insert(const s void CnrTvcProfileHandler::addProfile(const CnrTvcProfile &profile) { - Q_ASSERT(profile.id() > 0); - Q_ASSERT(!m_cache.contains(profile.id())); + Q_ASSERT(profile.id > 0); + Q_ASSERT(!m_cache.contains(profile.id)); OperatorExerciseKey key(profile); Q_ASSERT(!m_uniqueKeys.contains(key)); - m_cache[profile.id()] = profile; + m_cache[profile.id] = profile; m_uniqueKeys.append(key); bool status = m_dts->publish(profile); if (!status) - ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (create)").arg(profile.id()); + ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (create)").arg(profile.id); } void CnrTvcProfileHandler::removeProfile(int64_t id) @@ -380,30 +380,30 @@ void CnrTvcProfileHandler::removeProfile(int64_t id) void CnrTvcProfileHandler::updateProfile(const CnrTvcProfile &profile) { - Q_ASSERT(profile.id() > 0); - Q_ASSERT(m_cache.contains(profile.id())); + Q_ASSERT(profile.id > 0); + Q_ASSERT(m_cache.contains(profile.id)); OperatorExerciseKey key(profile); Q_ASSERT(m_uniqueKeys.contains(key)); - if (m_cache[profile.id()] == profile) + if (m_cache[profile.id] == profile) return; - m_cache[profile.id()] = profile; + m_cache[profile.id] = profile; bool status = m_dts->publish(profile); if (!status) - ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (modify)").arg(profile.id()); + ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'CnrTvcProfile' data with id %1 (modify)").arg(profile.id); } void CnrTvcProfileHandler::onCnrConfigChanged(const CnrConfig &cnrConfig) { - onConfigChanged(cnrConfig.id(), RadioSystem::Cnr); + onConfigChanged(cnrConfig.id, RadioSystem::Cnr); } void CnrTvcProfileHandler::onTvcConfigChanged(const TvcConfig &tvcConfig) { - onConfigChanged(tvcConfig.id(), RadioSystem::Tvc); + onConfigChanged(tvcConfig.id, RadioSystem::Tvc); } /** @@ -461,38 +461,38 @@ Core::FunctionReplyObject CnrTvcProfileHandler::validateRequest(const CnrTvcProf { Core::FunctionReplyObject reply; - if (request.id() > 0) + if (request.id > 0) { // modify - reply.setId(request.id()); + reply.setId(request.id); - if (!m_cache.contains(request.id())) - return reply.setStr(tr_lts("dds", "CnrTvcProfile for operator %1 in exercise %2 does not exist")).arg(request.operatorId()).arg(request.exerciseId()); + if (!m_cache.contains(request.id)) + return reply.setStr(tr_lts("dds", "CnrTvcProfile for operator %1 in exercise %2 does not exist")).arg(request.operatorId).arg(request.exerciseId); - if (OperatorExerciseKey(m_cache.value(request.id())) != OperatorExerciseKey(request)) + if (OperatorExerciseKey(m_cache.value(request.id)) != OperatorExerciseKey(request)) return reply.setStr(tr_lts("dds", "operator or exercise may not be changed")); } else { // create if (m_uniqueKeys.contains(OperatorExerciseKey(request))) - return reply.setStr(tr_lts("dds", "CnrTvcProfile for operator %1 already exists in exercise %2")).arg(request.operatorId()).arg(request.exerciseId()); + return reply.setStr(tr_lts("dds", "CnrTvcProfile for operator %1 already exists in exercise %2")).arg(request.operatorId).arg(request.exerciseId); } - if (request.data().size() == 0) + if (request.data.size() == 0) return reply.setStr(tr_lts("dds", "CnrTvcProfile must not be empty")); - for (const auto &entry : request.data()) + for (const auto &entry : request.data) { - if (entry.radioSystemId() == RadioSystem::Tvc) + if (entry.radioSystemId == RadioSystem::Tvc) { - auto reply2 = isValidTvc(entry.radioCircuitId(), request.exerciseId(), request.id()); + auto reply2 = isValidTvc(entry.radioCircuitId, request.exerciseId, request.id); if (reply2.error()) return reply2; } - else if (entry.radioSystemId() == RadioSystem::Cnr) + else if (entry.radioSystemId == RadioSystem::Cnr) { - auto reply2 = isValidCnr(entry.radioCircuitId(), request.exerciseId(), request.id()); + auto reply2 = isValidCnr(entry.radioCircuitId, request.exerciseId, request.id); if (reply2.error()) return reply2; } @@ -503,11 +503,11 @@ Core::FunctionReplyObject CnrTvcProfileHandler::validateRequest(const CnrTvcProf Core::FunctionReplyObject CnrTvcProfileHandler::validateRequest(const Core::RemoveElementRequest &request) const { - Q_ASSERT(request.id() > 0); - Core::FunctionReplyObject reply(request.id()); + Q_ASSERT(request.id > 0); + Core::FunctionReplyObject reply(request.id); - if (!m_cache.contains(request.id())) - return reply.setStr(tr_lts("dds", "CnrTvcProfile %1 does not exist")).arg(request.id()); + if (!m_cache.contains(request.id)) + return reply.setStr(tr_lts("dds", "CnrTvcProfile %1 does not exist")).arg(request.id); return reply; } @@ -571,8 +571,8 @@ void CnrTvcProfileHandler::onConfigChanged(int32_t configId, RadioSystem type) // Find all CnrTvcProfiles where this config is referenced and reload those. // Hint: reloading might modify m_cache. Thus the reloading is done in a separate loop. for (const auto &profile : qAsConst(m_cache)) - for (const auto &data : profile.data()) - if (data.radioSystemId() == type && data.radioCircuitId() == configId) + for (const auto &data : profile.data) + if (data.radioSystemId == type && data.radioCircuitId == configId) { toBeReloaded.append(profile); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.h index ee20abce7..a463afcfd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/cnr_tvc_profile_handler.h @@ -102,8 +102,8 @@ private: {} explicit OperatorExerciseKey(const CnrTvcProfile &profile) - : operatorId(profile.operatorId()) - , exerciseId(profile.exerciseId()) + : operatorId(profile.operatorId) + , exerciseId(profile.exerciseId) {} qint64 operatorId{0}; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp index 61c660bee..4dae55eee 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/default_av_menus.cpp @@ -29,15 +29,15 @@ std::set mountingPointsOfInterest(const InfrastructureManagement::Mai { std::set mountingPoints; - for (const auto &se : building.elements()) + for (const auto &se : building.elements) { - if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::MountingPoint) + if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::MountingPoint) continue; - if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::AnnouncementUnit || - se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::IndoorCamera || - se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera) - mountingPoints.insert(se.id()); + if (se.mountingPointTypeId == InfrastructureManagement::MountingPointType::AnnouncementUnit || + se.mountingPointTypeId == InfrastructureManagement::MountingPointType::IndoorCamera || + se.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera) + mountingPoints.insert(se.id); } return mountingPoints; @@ -47,7 +47,7 @@ bool isStreamOfInterest(const AudioVideoManagement::Stream &stream, bool isAudio { using AudioVideoManagement::StreamType; - switch (stream.type().underlying()) + switch (stream.type) { case StreamType::Video: return !isAudio; @@ -94,7 +94,7 @@ DefaultAvMenus::~DefaultAvMenus() = default; void DefaultAvMenus::onStreamChanged(const Stream &stream) { - m_streams[stream.id()] = stream; + m_streams[stream.id] = stream; m_timer->start(); } @@ -109,20 +109,20 @@ void DefaultAvMenus::onMainStructureElementChanged(const InfrastructureManagemen if(modType == DataModification::eRemoved) { - m_buildingDisplayNameForId.remove(data.id()); + m_buildingDisplayNameForId.remove(data.id); m_timer->start(); } else if(modType == DataModification::eAdded) { - m_buildingDisplayNameForId[data.id()] = buildingDisplayName; + m_buildingDisplayNameForId[data.id] = buildingDisplayName; m_timer->start(); } else { - if(m_buildingDisplayNameForId.value(data.id(),buildingDisplayName) == buildingDisplayName) + if(m_buildingDisplayNameForId.value(data.id,buildingDisplayName) == buildingDisplayName) return; - m_buildingDisplayNameForId[data.id()] = buildingDisplayName; + m_buildingDisplayNameForId[data.id] = buildingDisplayName; m_timer->start(); } } @@ -150,17 +150,17 @@ void DefaultAvMenus::removeMenus() void DefaultAvMenus::updateMenu(bool isAudio) { MenuStruct menu; - menu.id(menuStructId(isAudio)); - menu.isDefault(true); - menu.name("Default"); - menu.isAudio(isAudio); + menu.id = menuStructId(isAudio); + menu.isDefault = true; + menu.name = "Default"; + menu.isAudio = isAudio; std::vector allEntries; const auto &buildings = m_ismDtc->mainStructureElements(); for (const auto &building : buildings) { - m_buildingDisplayNameForId[building.id()] = getDisplayNameForBuilding(building); + m_buildingDisplayNameForId[building.id] = getDisplayNameForBuilding(building); std::vector subMenu = subMenuForBuilding(building, isAudio); std::move(subMenu.begin(), subMenu.end(), std::back_inserter(allEntries)); } @@ -169,24 +169,24 @@ void DefaultAvMenus::updateMenu(bool isAudio) { bool addMenu = false; AvMenuEntry mvsStreams; - mvsStreams.id(1000000); - mvsStreams.parentId(menuStructId(isAudio)); - mvsStreams.name().set("MVS"); - mvsStreams.isGroup(true); + mvsStreams.id = 1000000; + mvsStreams.parentId = menuStructId(isAudio); + mvsStreams.name = "MVS"; + mvsStreams.isGroup = true; const auto &videoTeams = m_videoTeamHandler->videoTeams(); for (const auto &videoTeam : videoTeams) { - if (videoTeam.exerciseId() != m_context.id()) + if (videoTeam.exerciseId != m_context.id()) continue; addMenu = true; AvMenuEntry streamEntry; - streamEntry.id(videoTeam.id()); - streamEntry.parentId(mvsStreams.id()); - streamEntry.mountingPointId(-1*videoTeam.id()); + streamEntry.id = videoTeam.id; + streamEntry.parentId = mvsStreams.id; + streamEntry.mountingPointId = -1 * videoTeam.id; // Also set the stream name which makes it easier for the clients. - streamEntry.name().set(videoTeam.streamName()); - streamEntry.isGroup(false); + streamEntry.name = videoTeam.streamName; + streamEntry.isGroup = false; allEntries.push_back(streamEntry); // What about the rowId? } @@ -196,7 +196,7 @@ void DefaultAvMenus::updateMenu(bool isAudio) } } - menu.menuEntries(allEntries); + menu.menuEntries = allEntries; HandlerMenuStruct::sortEntries(menu); m_dts->publish(menu); @@ -210,11 +210,11 @@ void DefaultAvMenus::updateMenu(bool isAudio) QString DefaultAvMenus::getDisplayNameForBuilding(const InfrastructureManagement::MainStructureElement &data) { - for (auto structure : data.elements()) { - if(structure.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building) - return QString::fromStdString(structure.displayName()); + for (auto structure : data.elements) { + if(structure.structureElementTypeId == InfrastructureManagement::StructureElementType::Building) + return QString::fromStdString(structure.displayName); } - return QString::fromStdString(data.name()); + return QString::fromStdString(data.name); } std::vector DefaultAvMenus::subMenuForBuilding(const InfrastructureManagement::MainStructureElement &building, bool isAudio) @@ -227,10 +227,10 @@ std::vector DefaultAvMenus::subMenuForBuilding(const Infrastructure entries.reserve(streams.size() + 1); AvMenuEntry buildingEntry; - buildingEntry.id(building.id()); - buildingEntry.parentId(menuStructId(isAudio)); - buildingEntry.name(getDisplayNameForBuilding(building).toStdString()); - buildingEntry.isGroup(true); + buildingEntry.id = building.id; + buildingEntry.parentId = menuStructId(isAudio); + buildingEntry.name = getDisplayNameForBuilding(building).toStdString(); + buildingEntry.isGroup = true; // What about the rowId? entries.push_back(buildingEntry); @@ -238,12 +238,12 @@ std::vector DefaultAvMenus::subMenuForBuilding(const Infrastructure for (const auto &stream : streams) { AvMenuEntry streamEntry; - streamEntry.id(stream.mountingPointId()); - streamEntry.parentId(buildingEntry.id()); - streamEntry.mountingPointId(stream.mountingPointId()); + streamEntry.id = stream.mountingPointId; + streamEntry.parentId = buildingEntry.id; + streamEntry.mountingPointId = stream.mountingPointId; // Also set the stream name which makes it easier for the clients. - streamEntry.name().set(AudioVideoHandlerImpl::internalStreamName(stream.mountingPointId()).toStdString()); - streamEntry.isGroup(false); + streamEntry.name = AudioVideoHandlerImpl::internalStreamName(stream.mountingPointId).toStdString(); + streamEntry.isGroup = false; // What about the rowId? entries.push_back(streamEntry); @@ -263,7 +263,7 @@ std::vector DefaultAvMenus::streamsForBuilding(const InfrastructureManag if (!isStreamOfInterest(stream, isAudio)) continue; - if (!mountingPoints.count(stream.mountingPointId())) + if (!mountingPoints.count(stream.mountingPointId)) continue; streams.push_back(stream); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.cpp index d36000e2f..95ad07346 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercise_handler.cpp @@ -189,7 +189,7 @@ void ExerciseHandler::onLastSeenTimerTimeout() // and remove all device_config entries except the record/replay session // when the cleanup is finished (signal from A/V) we remove also the last two sessions and delete our self auto ex = exmDtc()->exercise(m_exContext.id()); - if (ex.id() == m_exContext.id()) + if (ex.id == m_exContext.id()) { // found -> update last seen timestamp m_lastSeen.context = m_exContext.toString(); @@ -263,7 +263,7 @@ void ExerciseHandler::onContextFilesDeleted(const ExerciseContext &context) AVControl::OperatingMode ExerciseHandler::avModeFromExerciseState(ExerciseManagement::ExerciseState state) { - switch (state.underlying()) + switch (state) { case ExerciseManagement::ExerciseState::Unknown: case ExerciseManagement::ExerciseState::Created: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp index e9231f662..dc1e4732f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/exercises_handler.cpp @@ -115,7 +115,7 @@ void ExercisesHandler::onExerciseChanged(const ExerciseManagement::Exercise &dat { case DataModification::eAdded: case DataModification::eModified: - exerciseModified(data.id(), data.state()); + exerciseModified(data.id, data.state); break; case DataModification::eRemoved: // nothing to do here diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp index 287b83d66..97bbfcbaf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_planning_handler.cpp @@ -29,9 +29,9 @@ FrequencyPlanningData toDds(const Database::AvmFrequencyPlanningData &dbEntry) { FrequencyPlanningData ddsEntry; - ddsEntry.cnrConfigId(dbEntry.cnrConfigId); - ddsEntry.frequencyPlanningId(dbEntry.frequencyPlanningId); - ddsEntry.properties(dbEntry.properties.toStdString()); + ddsEntry.cnrConfigId = dbEntry.cnrConfigId; + ddsEntry.frequencyPlanningId = dbEntry.frequencyPlanningId; + ddsEntry.properties = dbEntry.properties.toStdString(); return ddsEntry; } @@ -41,14 +41,14 @@ FrequencyPlanning toDds(const Database::AvmFrequencyPlanning &dbPlan, { FrequencyPlanning ddsPlan; - ddsPlan.id(dbPlan.id); - ddsPlan.date(dbPlan.dateOfCreation); + ddsPlan.id = dbPlan.id; + ddsPlan.date = dbPlan.dateOfCreation; if (!dbPlan.exerciseId.isNull()) - ddsPlan.exerciseId(dbPlan.exerciseId.value()); + ddsPlan.exerciseId = dbPlan.exerciseId.value(); - ddsPlan.frequencySetId(dbPlan.frequencySetId); - ddsPlan.name(dbPlan.name.toStdString()); + ddsPlan.frequencySetId = dbPlan.frequencySetId; + ddsPlan.name = dbPlan.name.toStdString(); std::vector ddsEntries; ddsEntries.reserve(dbEntries.size()); @@ -57,7 +57,7 @@ FrequencyPlanning toDds(const Database::AvmFrequencyPlanning &dbPlan, ddsEntries.push_back(toDds(dbEntry)); } - ddsPlan.data(ddsEntries); + ddsPlan.data = ddsEntries; return ddsPlan; } @@ -72,12 +72,12 @@ Database::AvmFrequencyPlanning toDb(const ModifyFrequencyPlanningRequest &reques { Database::AvmFrequencyPlanning result; - result.id = request.id(); - result.name = QString::fromStdString(request.name()); - if(request.exerciseId() != 0) - result.exerciseId = request.exerciseId(); - result.dateOfCreation = request.date(); - result.frequencySetId = request.frequencySetId(); + result.id = request.id; + result.name = QString::fromStdString(request.name); + if(request.exerciseId != 0) + result.exerciseId = request.exerciseId; + result.dateOfCreation = request.date; + result.frequencySetId = request.frequencySetId; return result; } @@ -85,11 +85,11 @@ Database::AvmFrequencyPlanning toDb(const ModifyFrequencyPlanningRequest &reques Database::AvmFrequencyPlanning toDb(const FrequencyPlanning &ddsPlan) { Database::AvmFrequencyPlanning dbPlan; - dbPlan.id = ddsPlan.id(); + dbPlan.id = ddsPlan.id; if (ddsPlan.exerciseId.is_set()) dbPlan.exerciseId = ddsPlan.exerciseId.get(); - dbPlan.dateOfCreation = ddsPlan.date(); - dbPlan.frequencySetId = ddsPlan.frequencySetId(); + dbPlan.dateOfCreation = ddsPlan.date; + dbPlan.frequencySetId = ddsPlan.frequencySetId; return dbPlan; } @@ -99,8 +99,8 @@ Database::AvmFrequencyPlanningData toDb(const FrequencyPlanningData &data, int32 Database::AvmFrequencyPlanningData result; result.frequencyPlanningId = frequencyPlanningId; - result.cnrConfigId = data.cnrConfigId(); - result.properties = QString::fromStdString(data.properties()); + result.cnrConfigId = data.cnrConfigId; + result.properties = QString::fromStdString(data.properties); return result; } @@ -183,7 +183,7 @@ bool FrequencyPlanningHandler::init() void FrequencyPlanningHandler::onModifyFrequencyPlanningRequest(const rti::core::SampleIdentity &cookie, const ModifyFrequencyPlanningRequest &request) { - auto ret = request.id() > 0 ? handleModify(request) : handleCreate(request); + auto ret = request.id > 0 ? handleModify(request) : handleCreate(request); if (ret.error()) WARNING_LOG(m_logger) << ret(); m_fts->modifyFrequencyPlanningReply(cookie, ret); @@ -229,9 +229,9 @@ bool FrequencyPlanningHandler::isReferencedByActivePlan(int32_t exerciseId, int3 Q_ASSERT(m_cache.contains(found->frequencyPlanningId)); const FrequencyPlanning &activePlan = m_cache.value(found->frequencyPlanningId); - for (const FrequencyPlanningData &entry : activePlan.data()) + for (const FrequencyPlanningData &entry : activePlan.data) { - if (entry.cnrConfigId() == cnrConfigId) + if (entry.cnrConfigId == cnrConfigId) return true; } @@ -240,7 +240,7 @@ bool FrequencyPlanningHandler::isReferencedByActivePlan(int32_t exerciseId, int3 Core::FunctionReplyObject FrequencyPlanningHandler::handleCreate(const ModifyFrequencyPlanningRequest &request) { - Q_ASSERT(request.id() <= 0); + Q_ASSERT(request.id <= 0); Core::FunctionReplyObject reply = validateRequest(request); if (reply.error()) @@ -256,7 +256,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::handleCreate(const ModifyFre bool status = false; std::vector dbEntries; - for(auto data = request.data().begin(); data != request.data().end(); data++) + for(auto data = request.data.begin(); data != request.data.end(); data++) { Database::AvmFrequencyPlanningData dbEntry = toDb((*data), dbPlanning.id); @@ -273,9 +273,9 @@ Core::FunctionReplyObject FrequencyPlanningHandler::handleCreate(const ModifyFre trans.commit(); addPlan(toDds(dbPlanning, dbEntries)); - if(request.exerciseId() == 0) //set global as active + if(request.exerciseId == 0) //set global as active { - ModifyActiveFrequencyPlanningRequest modRequest(request.exerciseId() , dbPlanning.id); + ModifyActiveFrequencyPlanningRequest modRequest(request.exerciseId , dbPlanning.id); modifyActiveFrequencyPlanningRequest(modRequest); } @@ -284,7 +284,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::handleCreate(const ModifyFre Core::FunctionReplyObject FrequencyPlanningHandler::handleModify(const ModifyFrequencyPlanningRequest &request) { -Q_ASSERT(request.id() > 0); +Q_ASSERT(request.id > 0); Core::FunctionReplyObject reply = validateRequest(request); if (reply.error()) @@ -294,13 +294,13 @@ Q_ASSERT(request.id() > 0); DBTransaction trans(m_db->database()); - if (!m_db->removeAvmFrequencyPlanningDataByFrequencyPlanningId(request.id()) || + if (!m_db->removeAvmFrequencyPlanningDataByFrequencyPlanningId(request.id) || !m_db->update(dbPlanning)) - return reply.setStr(tr_lts("dds", "Error updating FrequencyPlanning data with id %1")).arg(request.id()); + return reply.setStr(tr_lts("dds", "Error updating FrequencyPlanning data with id %1")).arg(request.id); bool status = false; std::vector dbEntries; - for(auto data = request.data().begin(); data != request.data().end(); data++) + for(auto data = request.data.begin(); data != request.data.end(); data++) { Database::AvmFrequencyPlanningData dbEntry = toDb((*data), dbPlanning.id); @@ -329,13 +329,13 @@ Core::FunctionReplyObject FrequencyPlanningHandler::handleRemove(const Core::Rem // first remove the data // removeAvmFrequencyPlanningDataByFrequencyPlanningId not really needed to due FK - if (!m_db->removeAvmFrequencyPlanningDataByFrequencyPlanningId(request.id()) || - !m_db->removeAvmFrequencyPlanning(request.id())) - return reply.setStr(tr_lts("dds", "Error removing FrequencyPlanningRequest data with id %1 from database")).arg(request.id()); + if (!m_db->removeAvmFrequencyPlanningDataByFrequencyPlanningId(request.id) || + !m_db->removeAvmFrequencyPlanning(request.id)) + return reply.setStr(tr_lts("dds", "Error removing FrequencyPlanningRequest data with id %1 from database")).arg(request.id); trans.commit(); - removePlan(request.id()); + removePlan(request.id); return reply; } @@ -344,7 +344,7 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Modify { Core::FunctionReplyObject reply; - if (request.id() > 0) + if (request.id > 0) { reply = validateModifyRequest(request); if (reply.error()) @@ -357,13 +357,13 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Modify // Validate that the FrequencySet-entries actually belong to the referenced FrequencySet. - for (const FrequencyPlanningData &entry : request.data()) + for (const FrequencyPlanningData &entry : request.data) { - QSet frequencySetEntries = AudioVideoManagement::frequencySetDataIds(entry.properties()); + QSet frequencySetEntries = AudioVideoManagement::frequencySetDataIds(entry.properties); for(const int &setEntry : qAsConst(frequencySetEntries)) { - if (setEntry != 0 && !m_frequencySetHandler->isValid(request.frequencySetId(), setEntry)) - return reply.setStr(tr_lts("dds", "FrequencySetData %1 does not belong to FrequencySet %2")).arg(setEntry).arg(request.frequencySetId()); + if (setEntry != 0 && !m_frequencySetHandler->isValid(request.frequencySetId, setEntry)) + return reply.setStr(tr_lts("dds", "FrequencySetData %1 does not belong to FrequencySet %2")).arg(setEntry).arg(request.frequencySetId); } } return reply; @@ -374,54 +374,54 @@ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Modify */ Core::FunctionReplyObject FrequencyPlanningHandler::validateModifyRequest(const ModifyFrequencyPlanningRequest &request) const { - Q_ASSERT(request.id() > 0); + Q_ASSERT(request.id > 0); - Core::FunctionReplyObject reply(request.id()); + Core::FunctionReplyObject reply(request.id); - auto found = m_cache.constFind(request.id()); + auto found = m_cache.constFind(request.id); if (found == m_cache.constEnd()) - return reply.setStr(tr_lts("dds", "FrequencyPlan %1 does not exist")).arg(request.id()); + return reply.setStr(tr_lts("dds", "FrequencyPlan %1 does not exist")).arg(request.id); const FrequencyPlanning &oldPlan = *found; - if ((oldPlan.exerciseId.is_set() && oldPlan.exerciseId.get() != request.exerciseId()) - || (!oldPlan.exerciseId.is_set() && request.exerciseId() != 0)) + if ((oldPlan.exerciseId.is_set() && oldPlan.exerciseId.get() != request.exerciseId) + || (!oldPlan.exerciseId.is_set() && request.exerciseId != 0)) return reply.setStr(tr_lts("dds", "Exercise may not be changed")); - if (request.frequencySetId() != oldPlan.frequencySetId()) + if (request.frequencySetId != oldPlan.frequencySetId) return reply.setStr(tr_lts("dds", "FrequencySet may not be changed")); // In case the plan is already active (in an active Exercise), we need to check for conflicts with active FrequencyPlans of other active Exercises. - if (!m_activeExercises->isActive(ExerciseContext(request.exerciseId()))) + if (!m_activeExercises->isActive(ExerciseContext(request.exerciseId))) return reply; - auto foundActivePlan = m_activePlannings.constFind(request.exerciseId()); + auto foundActivePlan = m_activePlannings.constFind(request.exerciseId); if (foundActivePlan == m_activePlannings.constEnd()) return reply; - bool currentlyActive = foundActivePlan->frequencyPlanningId == request.id(); + bool currentlyActive = foundActivePlan->frequencyPlanningId == request.id; if (!currentlyActive) return reply; - const std::vector activePlans = otherActivePlans(request.exerciseId()); - return testActivation(request.data(), activePlans, request.id()); + const std::vector activePlans = otherActivePlans(request.exerciseId); + return testActivation(request.data, activePlans, request.id); } Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const Core::RemoveElementRequest &request) const { - Q_ASSERT(request.id() > 0); - Core::FunctionReplyObject reply(request.id()); + Q_ASSERT(request.id > 0); + Core::FunctionReplyObject reply(request.id); - auto foundPlan = m_cache.constFind(request.id()); + auto foundPlan = m_cache.constFind(request.id); if (foundPlan == m_cache.constEnd()) - return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 does not exist")).arg(request.id()); + return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 does not exist")).arg(request.id); const FrequencyPlanning &plan = *foundPlan; int exerciseId = plan.exerciseId.is_set() ? plan.exerciseId.get() : 0; auto foundActivePlan = m_activePlannings.constFind(exerciseId); - bool isActive = foundActivePlan != m_activePlannings.constEnd() && foundActivePlan->frequencyPlanningId == plan.id(); + bool isActive = foundActivePlan != m_activePlannings.constEnd() && foundActivePlan->frequencyPlanningId == plan.id; if (isActive) - return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 cannot be removed because it is active")).arg(request.id()); + return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 cannot be removed because it is active")).arg(request.id); return reply; } @@ -451,27 +451,27 @@ Core::FunctionReplyObject FrequencyPlanningHandler::modifyActiveFrequencyPlannin return reply; Database::AvmActiveFrequencyPlanning dbData; - dbData.frequencyPlanningId = request.frequencyPlanningId(); - if(request.exerciseId() != 0) - dbData.exerciseId = request.exerciseId(); + dbData.frequencyPlanningId = request.frequencyPlanningId; + if(request.exerciseId != 0) + dbData.exerciseId = request.exerciseId; - if (!m_activePlannings.contains(request.exerciseId())) // create + if (!m_activePlannings.contains(request.exerciseId)) // create { if (!m_db->insert(dbData)) - return reply.setStr(tr_lts("dds", "Error inserting ActiveFrequencyPlanning data with id %1 into DB")).arg(request.exerciseId()); + return reply.setStr(tr_lts("dds", "Error inserting ActiveFrequencyPlanning data with id %1 into DB")).arg(request.exerciseId); } else // modify { - dbData.id = m_activePlannings.value(request.exerciseId()).id; + dbData.id = m_activePlannings.value(request.exerciseId).id; if (!m_db->update(dbData)) - return reply.setStr(tr_lts("dds", "Error updating ActiveFrequencyPlanning data with id %1 in DB")).arg(request.exerciseId()); + return reply.setStr(tr_lts("dds", "Error updating ActiveFrequencyPlanning data with id %1 in DB")).arg(request.exerciseId); } int exerciseId = dbData.exerciseId.isNull() ? 0 : dbData.exerciseId.value(); m_activePlannings[exerciseId] = dbData; if (!m_dts->publish(toDds(dbData))) - return reply.setStr(tr_lts("dds", "Error publishing ActiveFrequencyPlanning data with id %1 to DDS")).arg(request.exerciseId()); + return reply.setStr(tr_lts("dds", "Error publishing ActiveFrequencyPlanning data with id %1 to DDS")).arg(request.exerciseId); emit planningChanged(); @@ -482,22 +482,22 @@ Core::FunctionReplyObject FrequencyPlanningHandler::removeActiveFrequencyPlannin { DEBUG_LOG(m_logger) << "RemoveActiveFrequencyPlanningRequest: " << request; - Core::FunctionReplyObject reply(request.exerciseId()); + Core::FunctionReplyObject reply(request.exerciseId); - if (!m_activePlannings.contains(request.exerciseId())) - return reply.setStr(tr_lts("dds", "No ActiveFrequencyPlanning for exercise %1")).arg(request.exerciseId()); + if (!m_activePlannings.contains(request.exerciseId)) + return reply.setStr(tr_lts("dds", "No ActiveFrequencyPlanning for exercise %1")).arg(request.exerciseId); - Database::AvmActiveFrequencyPlanning activePlanning = m_activePlannings.value(request.exerciseId()); - if (activePlanning.exerciseId != request.exerciseId()) - return reply.setStr(tr_lts("dds", "Error removing ActiveFrequencyPlanning data with exercise id %1 - not found")).arg(request.exerciseId()); + Database::AvmActiveFrequencyPlanning activePlanning = m_activePlannings.value(request.exerciseId); + if (activePlanning.exerciseId != request.exerciseId) + return reply.setStr(tr_lts("dds", "Error removing ActiveFrequencyPlanning data with exercise id %1 - not found")).arg(request.exerciseId); - if (!m_dts->removeActiveFrequencyPlanningByKey(request.exerciseId())) - return reply.setStr(tr_lts("dds", "Error removing ActiveFrequencyPlanning data with exercise id %1 from DDS")).arg(request.exerciseId()); + if (!m_dts->removeActiveFrequencyPlanningByKey(request.exerciseId)) + return reply.setStr(tr_lts("dds", "Error removing ActiveFrequencyPlanning data with exercise id %1 from DDS")).arg(request.exerciseId); if (!m_db->removeAvmActiveFrequencyPlanning(activePlanning.id)) - return reply.setStr(tr_lts("dds", "Error removing ActiveFrequencyPlanning data with exercise id %1 from DB")).arg(request.exerciseId()); + return reply.setStr(tr_lts("dds", "Error removing ActiveFrequencyPlanning data with exercise id %1 from DB")).arg(request.exerciseId); - m_activePlannings.remove(request.exerciseId()); + m_activePlannings.remove(request.exerciseId); emit planningChanged(); @@ -509,25 +509,25 @@ Core::FunctionReplyObject FrequencyPlanningHandler::removeActiveFrequencyPlannin */ Core::FunctionReplyObject FrequencyPlanningHandler::validateRequest(const ModifyActiveFrequencyPlanningRequest &request) const { - Core::FunctionReplyObject reply(request.exerciseId()); + Core::FunctionReplyObject reply(request.exerciseId); - auto foundPlan = m_cache.constFind(request.frequencyPlanningId()); + auto foundPlan = m_cache.constFind(request.frequencyPlanningId); if (foundPlan == m_cache.constEnd()) - return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 does not exist")).arg(request.frequencyPlanningId()); + return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 does not exist")).arg(request.frequencyPlanningId); - if (!m_activeExercises->isActive(ExerciseContext(request.exerciseId()))) + if (!m_activeExercises->isActive(ExerciseContext(request.exerciseId))) return reply; const FrequencyPlanning &planToActivate = *foundPlan; - const std::vector activePlans = otherActivePlans(request.exerciseId()); + const std::vector activePlans = otherActivePlans(request.exerciseId); if (activePlans.empty()) return reply; if (!hasSameFrequencySet(planToActivate, *m_cache.constFind(activePlans.front()))) - return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 cannot be activated because another FrequencyPlanning with a different FrequencySet is active already")).arg(request.frequencyPlanningId()); + return reply.setStr(tr_lts("dds", "FrequencyPlanning %1 cannot be activated because another FrequencyPlanning with a different FrequencySet is active already")).arg(request.frequencyPlanningId); - return testActivation(planToActivate.data(), activePlans, request.exerciseId()); + return testActivation(planToActivate.data, activePlans, request.exerciseId); } Core::FunctionReplyObject FrequencyPlanningHandler::testActivation(const std::vector &entries, const std::vector &activePlans, int requestId) const @@ -541,27 +541,27 @@ Core::FunctionReplyObject FrequencyPlanningHandler::testActivation(const std::ve const std::vector takenCnrConfigs = takenGlobalCnrConfigs(activePlans); for (const FrequencyPlanningData &entry : entries) { - const CnrConfig &cnrConfig = m_cnrHandler->config(entry.cnrConfigId()); + const CnrConfig &cnrConfig = m_cnrHandler->config(entry.cnrConfigId); bool isGlobal = !cnrConfig.exerciseId.is_set(); if (!isGlobal) continue; - auto found = std::find(takenCnrConfigs.begin(), takenCnrConfigs.end(), cnrConfig.id()); + auto found = std::find(takenCnrConfigs.begin(), takenCnrConfigs.end(), cnrConfig.id); if (found != takenCnrConfigs.end()) - return reply.setStr(tr_lts("dds", "FrequencyPlanning cannot be activated because CnrConfig \"%1\" is used by some other active FrequencyPlanning")).arg(cnrConfig.radioCircuit()); + return reply.setStr(tr_lts("dds", "FrequencyPlanning cannot be activated because CnrConfig \"%1\" is used by some other active FrequencyPlanning")).arg(cnrConfig.radioCircuit); } // Check that the FrequencyPlanning does not reference an entry from the FrequencySet wich is already referenced by some other active FrequencyPlanning. QSet takenSetEntries = takenFrequencySetEntries(activePlans); for (const FrequencyPlanningData &fpdEntry : entries) { - QSet frequencySetEntries = AudioVideoManagement::frequencySetDataIds(fpdEntry.properties()); + QSet frequencySetEntries = AudioVideoManagement::frequencySetDataIds(fpdEntry.properties); for(const int &setEntry : qAsConst(frequencySetEntries)) { if(takenSetEntries.contains(setEntry)) { - const CnrConfig &cnrConfig = m_cnrHandler->config(fpdEntry.cnrConfigId()); - return reply.setStr(tr_lts("dds", "FrequencyPlanning cannot be activated because CnrConfig \"%1\" uses an entry in the FrequencySet which is used by some other active FrequencyPlanning")).arg(cnrConfig.radioCircuit()); + const CnrConfig &cnrConfig = m_cnrHandler->config(fpdEntry.cnrConfigId); + return reply.setStr(tr_lts("dds", "FrequencyPlanning cannot be activated because CnrConfig \"%1\" uses an entry in the FrequencySet which is used by some other active FrequencyPlanning")).arg(cnrConfig.radioCircuit); } } } @@ -614,14 +614,14 @@ std::vector FrequencyPlanningHandler::takenGlobalCnrConfigs(const std::vect for (auto planId : plans) { const FrequencyPlanning &plan = m_cache.value(planId); - Q_ASSERT(plan.id() == planId); + Q_ASSERT(plan.id == planId); - for (const FrequencyPlanningData &entry : plan.data()) + for (const FrequencyPlanningData &entry : plan.data) { - const CnrConfig &cnrConfig = m_cnrHandler->config(entry.cnrConfigId()); + const CnrConfig &cnrConfig = m_cnrHandler->config(entry.cnrConfigId); bool isGlobal = !cnrConfig.exerciseId.is_set(); if (isGlobal) - result.push_back(cnrConfig.id()); + result.push_back(cnrConfig.id); } } @@ -638,11 +638,11 @@ QSet FrequencyPlanningHandler::takenFrequencySetEntries(const std::vector FrequencyPlanningHandler::takenFrequencySetEntries(const std::vector 0); - Q_ASSERT(!m_cache.contains(plan.id())); + Q_ASSERT(plan.id > 0); + Q_ASSERT(!m_cache.contains(plan.id)); - m_cache.insert(plan.id(), plan); + m_cache.insert(plan.id, plan); bool status = m_dts->publish(plan); if (!status) - ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (create)").arg(plan.id()); + ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (create)").arg(plan.id); emit planningChanged(); } void FrequencyPlanningHandler::updatePlan(const FrequencyPlanning &plan) { - Q_ASSERT(plan.id() > 0); - auto found = m_cache.find(plan.id()); + Q_ASSERT(plan.id > 0); + auto found = m_cache.find(plan.id); Q_ASSERT(found != m_cache.end()); *found = plan; bool status = m_dts->publish(plan); if (!status) - ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (modify)").arg(plan.id()); + ERROR_LOG(m_logger) << QStringLiteral("Failed to publish 'FrequencyPlanning' data with id %1 (modify)").arg(plan.id); emit planningChanged(); } @@ -762,22 +762,22 @@ void FrequencyPlanningHandler::onCnrConfigRemoved(int cnrConfigId) for (FrequencyPlanning &fp : m_cache) { ModifyFrequencyPlanningRequest req; - req.data() = fp.data(); - auto found = std::find_if(req.data().begin(), req.data().end(), [cnrConfigId](const FrequencyPlanningData &data) + req.data = fp.data; + auto found = std::find_if(req.data.begin(), req.data.end(), [cnrConfigId](const FrequencyPlanningData &data) { - return data.cnrConfigId() == cnrConfigId; + return data.cnrConfigId == cnrConfigId; }); - if (found == req.data().end()) + if (found == req.data.end()) continue; // In this Frequency Planning, the (removed) cnrConfig ID is present. Therefore, we need to delete it also: - req.data().erase(found); + req.data.erase(found); - req.date() = fp.date(); - req.exerciseId() = fp.exerciseId.is_set() ? fp.exerciseId.get() : 0; - req.frequencySetId() = fp.frequencySetId(); - req.id() = fp.id(); - req.name() = fp.name(); + req.date = fp.date; + req.exerciseId = fp.exerciseId.is_set() ? fp.exerciseId.get() : 0; + req.frequencySetId = fp.frequencySetId; + req.id = fp.id; + req.name = fp.name; handleModify(req); } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp index 1f3e413df..d2cf256b7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/frequency_set_handler.cpp @@ -56,17 +56,17 @@ FrequencySet FrequencySetHandler::toDdsFrequencySet(const Database::AvmFrequency { FrequencySet result; - result.id(dbData.id); - result.name(dbData.name.toStdString()); - result.lastChange(dbData.lastChange); + result.id = dbData.id; + result.name = dbData.name.toStdString(); + result.lastChange = dbData.lastChange; auto cb = [&result] (const Database::AvmFrequencySetData ¤tData) { - result.data().push_back(toDdsFrequencySetDataWithId(currentData)); + result.data.push_back(toDdsFrequencySetDataWithId(currentData)); }; - m_db->selectByFrequencySetId(cb, result.id()); + m_db->selectByFrequencySetId(cb, result.id); - DEBUG_LOG(m_logger) << "Frequency Set with ID " << dbData.id << " has " << result.data().size() << " data entries"; + DEBUG_LOG(m_logger) << "Frequency Set with ID " << dbData.id << " has " << result.data.size() << " data entries"; return result; } @@ -75,37 +75,37 @@ FrequencyBand FrequencySetHandler::getFrequencyBand(const QString &deviceString) { QString intermediate = deviceString.left(3); if (QString::compare(intermediate, QStringLiteral("VHF"), Qt::CaseInsensitive) == 0) - return FrequencyBand_def::VHF; + return FrequencyBand::VHF; else if (QString::compare(intermediate, QStringLiteral("UHF"), Qt::CaseInsensitive) == 0) - return FrequencyBand_def::UHF; + return FrequencyBand::UHF; else if (QString::compare(intermediate, QStringLiteral("HF"), Qt::CaseInsensitive) == 0) - return FrequencyBand_def::HF; + return FrequencyBand::HF; else //if (QString::compare(intermediate.left(1), QStringLiteral("R"), Qt::CaseInsensitive) == 0) - return FrequencyBand_def::REL; + return FrequencyBand::REL; } FrequencySetDataWithId FrequencySetHandler::toDdsFrequencySetDataWithId(const Database::AvmFrequencySetData &dbData) { FrequencySetDataWithId result; - result.id(dbData.id); - result.function(dbData.function.toStdString()); - result.frequency(dbData.frequency); + result.id = dbData.id; + result.function = dbData.function.toStdString(); + result.frequency = dbData.frequency; // Todo: Put this into the database as well... - result.frequencyBand(getFrequencyBand(dbData.device)); + result.frequencyBand = getFrequencyBand(dbData.device); if (dbData.akwBundle >= 0) - result.akwBundle().set(dbData.akwBundle); + result.akwBundle = dbData.akwBundle; if (dbData.fsbBundle >= 0) - result.fsbBundle().set(dbData.fsbBundle); + result.fsbBundle = dbData.fsbBundle; if (dbData.akwRadioCircuit >= 0) - result.akwRadioCircuit().set(dbData.akwRadioCircuit); + result.akwRadioCircuit = dbData.akwRadioCircuit; if (dbData.comsec >= 0) - result.comsec().set(dbData.comsec); + result.comsec = dbData.comsec; return result; } @@ -114,15 +114,15 @@ void FrequencySetHandler::addFrequencySet(const FrequencySet &frequencySet) { QVector dataIds; - dataIds.reserve(frequencySet.data().size()); + dataIds.reserve(frequencySet.data.size()); - for (const FrequencySetDataWithId ¤tData : frequencySet.data()) - dataIds << currentData.id(); + for (const FrequencySetDataWithId ¤tData : frequencySet.data) + dataIds << currentData.id; - m_frequencySetDatas.insert(frequencySet.id(), dataIds); + m_frequencySetDatas.insert(frequencySet.id, dataIds); if (!m_dts->publish(frequencySet)) - ERROR_LOG(m_logger) << "Error while publishing Frequency Set with id " << frequencySet.id(); + ERROR_LOG(m_logger) << "Error while publishing Frequency Set with id " << frequencySet.id; } } // namespace AudioVideoManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp index ac569d5fd..bb11797bd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_frequency_planning_status.cpp @@ -18,31 +18,31 @@ namespace AudioVideoManagement //-------------------------------------------------------------------------------------------------- static FrequencyPlanningStatus convert(const ModifyFrequencyPlanningStatusRequest &request, const FrequencyPlanningStatus &oldData) { - Q_ASSERT(request.client() == oldData.client()); + Q_ASSERT(request.client == oldData.client); FrequencyPlanningStatus newData(oldData); - if (!oldData.uuid().empty()) + if (!oldData.uuid.empty()) { - if (oldData.uuid() != request.uuid()) + if (oldData.uuid != request.uuid) WARNING_LOG(getLogger("HandlerFrequencyPlanningStatus")) << "WARNING: Same client has concurrent GetConfigCNR requests."; } - newData.uuid() = request.uuid().empty() ? oldData.uuid() : request.uuid(); - newData.id() = oldData.id(); + newData.uuid = request.uuid.empty() ? oldData.uuid : request.uuid; + newData.id = oldData.id; if (request.sent.is_set()) { - newData.sent() = request.sent.get(); - newData.requester() = request.requester(); // ! Requester is only sent, when data gets sent. + newData.sent = request.sent.get(); + newData.requester = request.requester; // ! Requester is only sent, when data gets sent. } if (request.received.is_set()) - newData.received() = request.received.get(); + newData.received = request.received.get(); if (request.activated.is_set()) { - newData.activated() = request.activated.get(); - newData.requester() = request.requester(); // ! Requester is only sent, when data gets activated. + newData.activated = request.activated.get(); + newData.requester = request.requester; // ! Requester is only sent, when data gets activated. } - newData.isActive() = request.isActive(); - newData.content() = request.content(); - newData.reason() = request.reason(); + newData.isActive = request.isActive; + newData.content = request.content; + newData.reason = request.reason; return newData; } @@ -92,7 +92,7 @@ bool HandlerFrequencyPlanningStatus::init() ERROR_LOG(m_logger) << ret(); return false; } - m_data.insert(ifs->getData().client(), ifs); + m_data.insert(ifs->getData().client, ifs); } return true; } @@ -102,7 +102,7 @@ void HandlerFrequencyPlanningStatus::onModifyFrequencyPlanningStatusRequest(cons const ModifyFrequencyPlanningStatusRequest &request) { DEBUG_LOG(m_logger) << "onModifyFrequencyPlanningStatusRequest: " << request; - auto ret = m_data.contains(request.client()) ? frequencyPlanningStatusModifyRequest(request) : frequencyPlanningStatusCreateRequest(request); + auto ret = m_data.contains(request.client) ? frequencyPlanningStatusModifyRequest(request) : frequencyPlanningStatusCreateRequest(request); if (ret.error()) WARNING_LOG(m_logger) << ret(); m_fts->modifyFrequencyPlanningStatusReply(cookie, ret); @@ -127,9 +127,9 @@ void HandlerFrequencyPlanningStatus::onRemoveFrequencyPlanningStatusByClientRequ QVector clients; for (ObjectFrequencyPlanningStatus *ifs : qAsConst(m_data)) { - if (request.client() == 0 || ifs->getData().client() == request.client()) + if (request.client == 0 || ifs->getData().client == request.client) { - int client = ifs->getData().client(); + int client = ifs->getData().client; ret = ifs->removeObject(); if (ret.error()) ERROR_LOG(m_logger) << ret(); @@ -150,9 +150,9 @@ void HandlerFrequencyPlanningStatus::onRemoveFrequencyPlanningStatusByClientRequ //-------------------------------------------------------------------------------------------------- Core::FunctionReplyObject HandlerFrequencyPlanningStatus::frequencyPlanningStatusModifyRequest(const ModifyFrequencyPlanningStatusRequest &request) { - ObjectFrequencyPlanningStatus *ifs = m_data.value(request.client()); + ObjectFrequencyPlanningStatus *ifs = m_data.value(request.client); if (ifs == nullptr) - return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Team with id %1 not found")).arg(request.id()); + return Core::FunctionReplyObject(request.id, tr_lts("dds", "Video Team with id %1 not found")).arg(request.id); FrequencyPlanningStatus ddsData = convert(request, ifs->getData()); @@ -170,7 +170,7 @@ Core::FunctionReplyObject HandlerFrequencyPlanningStatus::frequencyPlanningStatu if (ret.error()) delete ifs; else - m_data.insert(ifs->getData().client(), ifs); + m_data.insert(ifs->getData().client, ifs); return ret; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp index 68e9c7be5..a804e3a52 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_menu_struct.cpp @@ -25,9 +25,9 @@ AudioVideoManagement::MenuStruct toDdsToplevel(const AudioVideoManagement::Datab Q_ASSERT(dbEntry.name.isValid()); AudioVideoManagement::MenuStruct ms; - ms.id(dbEntry.id); - ms.name(dbEntry.name.toString().toStdString()); - ms.isAudio(dbEntry.isAudio); + ms.id = dbEntry.id; + ms.name = dbEntry.name.toString().toStdString(); + ms.isAudio = dbEntry.isAudio; return ms; } @@ -46,13 +46,13 @@ void insertChildren(std::vector& contToAdd, bool lessToplevel(const AudioVideoManagement::AvMenuEntry &a, const AudioVideoManagement::AvMenuEntry &b) { - return a.id() < b.id(); + return a.id < b.id; } bool lessSublevel(const AudioVideoManagement::AvMenuEntry &a, const AudioVideoManagement::AvMenuEntry &b) { - return std::make_tuple(a.parentId(), a.rowId(), a.id()) < std::make_tuple(b.parentId(), b.rowId(), b.id()); + return std::make_tuple(a.parentId, a.rowId, a.id) < std::make_tuple(b.parentId, b.rowId, b.id); } } // anonymous namespace @@ -67,14 +67,14 @@ AvMenuEntry HandlerMenuStruct::toDds(const Database::AvmMenuStruct &dbEntry) AvMenuEntry ddsItem; - ddsItem.id(dbEntry.id); - ddsItem.parentId(dbEntry.parentId); - ddsItem.isGroup(dbEntry.isGroup); - ddsItem.rowId(dbEntry.rowid); + ddsItem.id = dbEntry.id; + ddsItem.parentId = dbEntry.parentId; + ddsItem.isGroup = dbEntry.isGroup; + ddsItem.rowId = dbEntry.rowid; if (dbEntry.isGroup) { Q_ASSERT(dbEntry.name.isValid()); - ddsItem.name().set(dbEntry.name.toString().toStdString()); + ddsItem.name = dbEntry.name.toString().toStdString(); } else { @@ -84,8 +84,8 @@ AvMenuEntry HandlerMenuStruct::toDds(const Database::AvmMenuStruct &dbEntry) // Using the internal stream name here makes it easy for clients to directly // use those when communicating with AVS. Q_ASSERT(dbEntry.mountingPointId.isValid()); - ddsItem.mountingPointId(dbEntry.mountingPointId.toInt()); - ddsItem.name().set(AudioVideoHandlerImpl::internalStreamName(dbEntry.mountingPointId.toInt()).toStdString()); + ddsItem.mountingPointId = dbEntry.mountingPointId.toInt(); + ddsItem.name = AudioVideoHandlerImpl::internalStreamName(dbEntry.mountingPointId.toInt()).toStdString(); } return ddsItem; @@ -93,11 +93,11 @@ AvMenuEntry HandlerMenuStruct::toDds(const Database::AvmMenuStruct &dbEntry) void HandlerMenuStruct::sortEntries(MenuStruct &menu) { - auto isToplevel = [&menu] (const AvMenuEntry& entry) { return entry.parentId() == menu.id(); }; - auto sublevelStart = std::partition(menu.menuEntries().begin(), menu.menuEntries().end(), isToplevel); + auto isToplevel = [&menu] (const AvMenuEntry& entry) { return entry.parentId == menu.id; }; + auto sublevelStart = std::partition(menu.menuEntries.begin(), menu.menuEntries.end(), isToplevel); - std::sort(menu.menuEntries().begin(), sublevelStart, lessToplevel); - std::sort(sublevelStart, menu.menuEntries().end(), lessSublevel); + std::sort(menu.menuEntries.begin(), sublevelStart, lessToplevel); + std::sort(sublevelStart, menu.menuEntries.end(), lessSublevel); } HandlerMenuStruct::HandlerMenuStruct(Interface::Dts *dts, Interface::Fts *fts, DatabaseInterface *db) @@ -163,7 +163,7 @@ void HandlerMenuStruct::reload() for (const auto &ms : dbItems) { - auto found = m_objMap.find(ms.id()); + auto found = m_objMap.find(ms.id); Q_ASSERT(found != m_objMap.end()); (*found)->updateFromDb(ms); } @@ -184,7 +184,7 @@ QList HandlerMenuStruct::loadFromDb(bool &status) for (auto dbEntry = vecMenuStruct.begin(); dbEntry != sublevelStart; ++dbEntry) { MenuStruct ms = toDdsToplevel(*dbEntry); - msMap.insert(ms.id(), ms); + msMap.insert(ms.id, ms); } // Go over all non-toplevel entries and create AvMenuEntries for those @@ -198,9 +198,9 @@ QList HandlerMenuStruct::loadFromDb(bool &status) MenuStruct &parent = it.value(); AudioVideoManagement::AvMenuEntry me = toDds(*dbEntry); - parent.menuEntries().push_back(me); + parent.menuEntries.push_back(me); - insertChildren(parent.menuEntries(), me.id(), vecMenuStruct); + insertChildren(parent.menuEntries, me.id, vecMenuStruct); } @@ -211,7 +211,7 @@ QList HandlerMenuStruct::loadFromDb(bool &status) for (auto &ms : msMap) { sortEntries(ms); - totalCount += ms.menuEntries().size(); + totalCount += ms.menuEntries.size(); } Q_ASSERT(totalCount == vecMenuStruct.size()); @@ -224,7 +224,7 @@ void HandlerMenuStruct::onModifyMenuStructRequest(const rti::core::SampleIdentit const MenuStruct &request) { DEBUG_LOG(m_logger) << "onModifyMenuStructRequest: " << request; - auto ret = request.id() > 0 ? modifyMenuStructRequest(request) : createMenuStructRequest(request); + auto ret = request.id > 0 ? modifyMenuStructRequest(request) : createMenuStructRequest(request); if (ret.error()) WARNING_LOG(m_logger) << ret(); m_fts->modifyMenuStructReply(cookie, ret); @@ -234,7 +234,7 @@ Core::FunctionReplyObject HandlerMenuStruct::createMenuStructRequest(const MenuS { ObjectMenuStruct *ifs = new ObjectMenuStruct(m_dts, m_db); - DEBUG_LOG(m_logger) << "request.menuEntries.size() : " << request.menuEntries().size(); + DEBUG_LOG(m_logger) << "request.menuEntries.size() : " << request.menuEntries.size(); Core::FunctionReplyObject ret = ifs->createFromDds(request); if (ret.error()) @@ -247,15 +247,15 @@ Core::FunctionReplyObject HandlerMenuStruct::createMenuStructRequest(const MenuS Core::FunctionReplyObject HandlerMenuStruct::modifyMenuStructRequest(const MenuStruct &request) { - ObjectMenuStruct *ifs = m_objMap.value(request.id()); + ObjectMenuStruct *ifs = m_objMap.value(request.id); if (ifs == nullptr) - return Core::FunctionReplyObject(request.id(), tr_lts("dds", "MenuStruct with id %1 not found")).arg(request.id()); + return Core::FunctionReplyObject(request.id, tr_lts("dds", "MenuStruct with id %1 not found")).arg(request.id); auto ret = ifs->updateFromDds(request); if (ret.error()) return ret; - Q_ASSERT(ifs->getId() == request.id()); + Q_ASSERT(ifs->getId() == request.id); return ret; } @@ -264,12 +264,12 @@ void HandlerMenuStruct::onRemoveMenuStructRequest(const rti::core::SampleIdentit { Core::FunctionReplyObject ret; - INFO_LOG(m_logger) << "onRemoveMenuStructRequest id = " << request.id(); + INFO_LOG(m_logger) << "onRemoveMenuStructRequest id = " << request.id; - ObjectMenuStruct *ifs = m_objMap.value(request.id()); + ObjectMenuStruct *ifs = m_objMap.value(request.id); if (ifs == nullptr) { - ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "MenuStruct with id %1 not found")).arg(request.id()); + ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "MenuStruct with id %1 not found")).arg(request.id); } else { @@ -277,7 +277,7 @@ void HandlerMenuStruct::onRemoveMenuStructRequest(const rti::core::SampleIdentit if (!ret.error()) { - m_objMap.remove(request.id()); + m_objMap.remove(request.id); delete ifs; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp index cd8e87e28..f672bcaf8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_receiver.cpp @@ -100,7 +100,7 @@ void HandlerVideoReceiver::onVideoReceiverModifyRequest(const rti::core::SampleI const VideoReceiverModifyRequest &request) { DEBUG_LOG(m_logger) << "onVideoReceiverModifyRequest: " << request; - auto ret = request.id() > 0 ? videoReceiverModifyRequest(request) : videoReceiverCreateRequest(request); + auto ret = request.id > 0 ? videoReceiverModifyRequest(request) : videoReceiverCreateRequest(request); if (ret.error()) WARNING_LOG(m_logger) << ret(); m_fts->videoReceiverModifyReply(cookie, ret); @@ -116,7 +116,7 @@ void HandlerVideoReceiver::onVideoReceiverModifyActiveRequest(const rti::core::S WARNING_LOG(m_logger) << ret(); else // activate channel here - activateChannel(request.id(), request.isActive()); + activateChannel(request.id, request.isActive); m_fts->videoReceiverModifyActiveReply(cookie, ret); } @@ -134,17 +134,17 @@ void HandlerVideoReceiver::onVideoReceiverModifyAvsRequest(const rti::core::Samp VideoReceiver HandlerVideoReceiver::convert(const VideoReceiverModifyRequest &request) { VideoReceiver newData; - ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id()); + ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id); if (ifs) newData = ifs->getData(); - newData.id(request.id()); - newData.mainStructureElementId(request.mainStructureElementId()); - newData.teamId(request.teamId()); - newData.streamName(request.streamName()); - newData.info(request.info()); - newData.hostName(request.hostName()); - newData.frequency(request.frequency()); - newData.isLocked(request.isLocked()); + newData.id = request.id; + newData.mainStructureElementId = request.mainStructureElementId; + newData.teamId = request.teamId; + newData.streamName = request.streamName; + newData.info = request.info; + newData.hostName = request.hostName; + newData.frequency = request.frequency; + newData.isLocked = request.isLocked; return newData; } @@ -152,12 +152,12 @@ VideoReceiver HandlerVideoReceiver::convert(const VideoReceiverModifyRequest &re VideoReceiver HandlerVideoReceiver::convertAvs(const VideoReceiverModifyAvsRequest &request) { VideoReceiver newData; - ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id()); + ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id); if (ifs) newData = ifs->getData(); - newData.id(request.id()); - newData.dbm(request.dbm()); - newData.snr(request.snr()); + newData.id = request.id; + newData.dbm = request.dbm; + newData.snr = request.snr; return newData; } @@ -165,11 +165,11 @@ VideoReceiver HandlerVideoReceiver::convertAvs(const VideoReceiverModifyAvsReque VideoReceiver HandlerVideoReceiver::convertActive(const VideoReceiverModifyActiveRequest &request) { VideoReceiver newData; - ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id()); + ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id); if (ifs) newData = ifs->getData(); - newData.id(request.id()); - newData.isActive(request.isActive()); + newData.id = request.id; + newData.isActive = request.isActive; return newData; } @@ -177,9 +177,9 @@ VideoReceiver HandlerVideoReceiver::convertActive(const VideoReceiverModifyActiv Core::FunctionReplyObject HandlerVideoReceiver::videoReceiverModifyRequest(const VideoReceiverModifyRequest &request) { DEBUG_LOG(m_logger) << "videoReceiverModifyRequest"; - ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id()); + ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id); if (ifs == nullptr) - return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Receiver with id %1 not found")).arg(request.id()); + return Core::FunctionReplyObject(request.id, tr_lts("dds", "Video Receiver with id %1 not found")).arg(request.id); return ifs->updateObject(convert(request)); } @@ -187,9 +187,9 @@ Core::FunctionReplyObject HandlerVideoReceiver::videoReceiverModifyRequest(const //-------------------------------------------------------------------------------------------------- Core::FunctionReplyObject HandlerVideoReceiver::videoReceiverModifyActiveRequest(const VideoReceiverModifyActiveRequest &request) { - ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id()); + ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id); if (ifs == nullptr) - return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Receiver with id %1 not found")).arg(request.id()); + return Core::FunctionReplyObject(request.id, tr_lts("dds", "Video Receiver with id %1 not found")).arg(request.id); return ifs->updateObject(convertActive(request)); } @@ -197,9 +197,9 @@ Core::FunctionReplyObject HandlerVideoReceiver::videoReceiverModifyActiveRequest //-------------------------------------------------------------------------------------------------- Core::FunctionReplyObject HandlerVideoReceiver::videoReceiverModifyAvsRequest(const VideoReceiverModifyAvsRequest &request) { - ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id()); + ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id); if (ifs == nullptr) - return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Receiver with id %1 not found")).arg(request.id()); + return Core::FunctionReplyObject(request.id, tr_lts("dds", "Video Receiver with id %1 not found")).arg(request.id); return ifs->updateObject(convertAvs(request)); } @@ -223,18 +223,18 @@ void HandlerVideoReceiver::onVideoReceiverRemoveRequest(const rti::core::SampleI const Core::RemoveElementRequest &request) { Core::FunctionReplyObject ret; - ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id()); + ObjectVideoReceiver *ifs = m_videoReceiverObjMap.value(request.id); if (ifs == nullptr) { - ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Receiver with id %1 not found")).arg(request.id()); + ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Video Receiver with id %1 not found")).arg(request.id); m_fts->videoReceiverRemoveReply(cookie, ret); return; } if (m_mainHandler->ddsHandler()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId())) { - ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Receiver '%1' is used by another user!")).arg(ifs->getId()); + ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Video Receiver '%1' is used by another user!")).arg(ifs->getId()); m_fts->videoReceiverRemoveReply(cookie, ret); return; } @@ -247,7 +247,7 @@ void HandlerVideoReceiver::onVideoReceiverRemoveRequest(const rti::core::SampleI { // delete ObjectVideoReceiver delete ifs; - m_videoReceiverObjMap.remove(request.id()); + m_videoReceiverObjMap.remove(request.id); } m_fts->videoReceiverRemoveReply(cookie, ret); @@ -266,16 +266,16 @@ void HandlerVideoReceiver::onGetStatus() { i.next(); ObjectVideoReceiver *objectVideoReceiver = i.value(); - QString host = QString::fromStdString(objectVideoReceiver->getData().hostName()).toLower(); + QString host = QString::fromStdString(objectVideoReceiver->getData().hostName).toLower(); - DEBUG_LOG(m_logger) << " streamName=" << objectVideoReceiver->getData().streamName() + DEBUG_LOG(m_logger) << " streamName=" << objectVideoReceiver->getData().streamName << " hostName=" << host - << " teamId=" << objectVideoReceiver->getData().teamId(); - if ((objectVideoReceiver->getData().teamId() == 1) + << " teamId=" << objectVideoReceiver->getData().teamId; + if ((objectVideoReceiver->getData().teamId == 1) && (!m_receiver.contains(host))) { DEBUG_LOG(m_logger) << " onSendHttpRequest host=" << host << " key=" << i.key() - << " id=" << objectVideoReceiver->getData().id(); + << " id=" << objectVideoReceiver->getData().id; m_receiver.insert(host, i.key()); onSendHttpRequest(i.key()); } @@ -289,7 +289,7 @@ void HandlerVideoReceiver::onSendHttpRequest(const int key) //request = QStringLiteral("http://localhost/set_param?remuxBitrate=90.0"); //request = QStringLiteral("http://localhost/status.json"); ObjectVideoReceiver *objectVideoReceiver = m_videoReceiverObjMap.value(key); - QString hostname = QString::fromStdString(objectVideoReceiver->getData().hostName()); + QString hostname = QString::fromStdString(objectVideoReceiver->getData().hostName); const QString request = QStringLiteral("http://%1/status.json").arg(hostname); startRequest(QUrl(request)); @@ -547,13 +547,13 @@ void HandlerVideoReceiver::onHttpFinished(QNetworkReply *reply) ObjectVideoReceiver *objectVideoReceiver = i.value(); DEBUG_LOG(m_logger) << "key=" << i.key() << " : value.Id=" << objectVideoReceiver->getId() - << " mse=" << objectVideoReceiver->getData().mainStructureElementId() - << " streamName=" << objectVideoReceiver->getData().streamName() - << " hostName=" << objectVideoReceiver->getData().hostName() - << " teamId=" << objectVideoReceiver->getData().teamId() - << " snr=" << objectVideoReceiver->getData().snr() - << " dbm=" << objectVideoReceiver->getData().dbm() - << " isActive=" << objectVideoReceiver->getData().isActive(); + << " mse=" << objectVideoReceiver->getData().mainStructureElementId + << " streamName=" << objectVideoReceiver->getData().streamName + << " hostName=" << objectVideoReceiver->getData().hostName + << " teamId=" << objectVideoReceiver->getData().teamId + << " snr=" << objectVideoReceiver->getData().snr + << " dbm=" << objectVideoReceiver->getData().dbm + << " isActive=" << objectVideoReceiver->getData().isActive; } reply->deleteLater(); checkActiveState(key, remuxInputMask); @@ -566,17 +566,17 @@ void HandlerVideoReceiver::updateObject(const int key, const double powerLevel, if (ifs) { newData = ifs->getData(); - newData.id(ifs->getId()); - newData.mainStructureElementId(ifs->getData().mainStructureElementId()); - newData.teamId(ifs->getData().teamId()); - newData.streamName(ifs->getData().streamName()); - newData.hostName(ifs->getData().hostName()); - newData.info(ifs->getData().info()); - newData.dbm(powerLevel); - newData.snr(snr); - newData.isActive(ifs->getData().isActive()); - newData.isLocked(lockstatus); - newData.frequency(frequency); + newData.id = ifs->getId(); + newData.mainStructureElementId = ifs->getData().mainStructureElementId; + newData.teamId = ifs->getData().teamId; + newData.streamName = ifs->getData().streamName; + newData.hostName = ifs->getData().hostName; + newData.info = ifs->getData().info; + newData.dbm = powerLevel; + newData.snr = snr; + newData.isActive = ifs->getData().isActive; + newData.isLocked = lockstatus; + newData.frequency = frequency; ifs->updateObject(newData); } } @@ -584,7 +584,7 @@ void HandlerVideoReceiver::updateObject(const int key, const double powerLevel, void HandlerVideoReceiver::activateChannel(const int channelId, const bool activate) { // send new Host HTTP-Request to VideoReceiver - QString hostName = QString::fromStdString(m_videoReceiverObjMap.value(channelId)->getData().hostName()); + QString hostName = QString::fromStdString(m_videoReceiverObjMap.value(channelId)->getData().hostName); int active1 = 0; int active2 = 0; int active = 0; @@ -592,7 +592,7 @@ void HandlerVideoReceiver::activateChannel(const int channelId, const bool activ DEBUG_LOG(m_logger) << "activateChannel channelId=" << channelId << " activate = " << activate << " hostname = " << hostName - << " teamId = " << m_videoReceiverObjMap.value(channelId)->getData().teamId(); + << " teamId = " << m_videoReceiverObjMap.value(channelId)->getData().teamId; // make sure there are 2 channels @@ -602,7 +602,7 @@ void HandlerVideoReceiver::activateChannel(const int channelId, const bool activ return; } - if (m_videoReceiverObjMap.value(channelId)->getData().teamId() == 1) + if (m_videoReceiverObjMap.value(channelId)->getData().teamId == 1) { id = channelId; active1 = activate; @@ -611,14 +611,14 @@ void HandlerVideoReceiver::activateChannel(const int channelId, const bool activ ERROR_LOG(m_logger) << "channelId " << id + 1 << " does not exist"; return; } - active2 = m_videoReceiverObjMap.value(id + 1)->getData().isActive(); + active2 = m_videoReceiverObjMap.value(id + 1)->getData().isActive; } else { id = channelId - 1; if (!m_videoReceiverObjMap.contains(id)) return; - active1 = m_videoReceiverObjMap.value(id)->getData().isActive(); + active1 = m_videoReceiverObjMap.value(id)->getData().isActive; active2 = activate; } active = active1 + active2 * 2; @@ -646,10 +646,10 @@ void HandlerVideoReceiver::checkActiveState(const int key, const int remuxInputM << " remuxInputMask=" << remuxInputMask << " channel1 == nullptr"; return; } - int channel1Active = channel1->getData().isActive(); - QString host = QString::fromStdString(channel1->getData().hostName()).toLower(); + int channel1Active = channel1->getData().isActive; + QString host = QString::fromStdString(channel1->getData().hostName).toLower(); ObjectVideoReceiver *channel2 = m_videoReceiverObjMap.value(key + 1); - int channel2Active = channel2->getData().isActive(); + int channel2Active = channel2->getData().isActive; int active = channel1Active + channel2Active * 2; DEBUG_LOG(m_logger) << "checkActiveState " << " key=" << key diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp index 117601f15..fb48ae323 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/handler_video_team.cpp @@ -31,36 +31,36 @@ public: void create(const VideoTeam &videoTeam) { - Q_ASSERT(!m_cache.contains(videoTeam.id())); + Q_ASSERT(!m_cache.contains(videoTeam.id)); Database::AvmDeviceConfig deviceConfig = toDeviceConfig(videoTeam); if (!m_db->insert(deviceConfig)) ERROR_LOG(m_logger) << "Error while inserting device config into database"; - m_cache.insert(videoTeam.id(), deviceConfig); + m_cache.insert(videoTeam.id, deviceConfig); emit m_handler->avDbReloadNeeded(); } void update(const VideoTeam &videoTeam) { - Q_ASSERT(m_cache.contains(videoTeam.id())); + Q_ASSERT(m_cache.contains(videoTeam.id)); Database::AvmDeviceConfig deviceConfig = toDeviceConfig(videoTeam); - const Database::AvmDeviceConfig &oldDeviceConfig = m_cache[videoTeam.id()]; + const Database::AvmDeviceConfig &oldDeviceConfig = m_cache[videoTeam.id]; deviceConfig.id = oldDeviceConfig.id; if (!m_db->update(deviceConfig)) ERROR_LOG(m_logger) << "Error while updating device config"; - m_cache[videoTeam.id()] = deviceConfig; + m_cache[videoTeam.id] = deviceConfig; emit m_handler->avDbReloadNeeded(); } void createOrUpdate(const VideoTeam &videoTeam) { - if (m_cache.contains(videoTeam.id())) + if (m_cache.contains(videoTeam.id)) update(videoTeam); else create(videoTeam); @@ -88,12 +88,12 @@ private: static Database::AvmDeviceConfig toDeviceConfig(const VideoTeam &videoTeam) { Database::AvmDeviceConfig result; - result.context = ExerciseContext(videoTeam.exerciseId()).toString(); + result.context = ExerciseContext(videoTeam.exerciseId).toString(); result.type = QStringLiteral("DEKTEC_VIDEO_CHANNEL"); - result.name = QString::fromStdString(videoTeam.streamName()); + result.name = QString::fromStdString(videoTeam.streamName); result.controller = QStringLiteral("EXCAVS01"); result.definition = QStringLiteral("mode=1;ssrc=%1;port=%2;programid=%3;programtimeoffset=%4;recording=ECRS@%5") - .arg(videoTeam.ssrc()).arg(videoTeam.vtPort()).arg(videoTeam.programId()).arg(videoTeam.timeOffset()).arg(result.controller); + .arg(videoTeam.ssrc).arg(videoTeam.vtPort).arg(videoTeam.programId).arg(videoTeam.timeOffset).arg(result.controller); return result; } @@ -178,7 +178,7 @@ void HandlerVideoTeam::onVideoTeamModifyRequest(const rti::core::SampleIdentity const VideoTeamModifyRequest &request) { DEBUG_LOG(m_logger) << "onVideoTeamModifyRequest: " << request; - auto ret = request.id() > 0 ? videoTeamModifyRequest(request) : videoTeamCreateRequest(request); + auto ret = request.id > 0 ? videoTeamModifyRequest(request) : videoTeamCreateRequest(request); if (ret.error()) WARNING_LOG(m_logger) << ret(); m_fts->videoTeamModifyReply(cookie, ret); @@ -186,9 +186,9 @@ void HandlerVideoTeam::onVideoTeamModifyRequest(const rti::core::SampleIdentity bool HandlerVideoTeam::needDeviceConfig(const VideoTeam &videoTeam) const { - if (videoTeam.exerciseId() == 0) + if (videoTeam.exerciseId == 0) return false; - return m_activeExercises->isActive(ExerciseContext(videoTeam.exerciseId())); + return m_activeExercises->isActive(ExerciseContext(videoTeam.exerciseId)); } void HandlerVideoTeam::onContextActivated(const ExerciseContext &context) @@ -196,7 +196,7 @@ void HandlerVideoTeam::onContextActivated(const ExerciseContext &context) for (const auto *ifs : qAsConst(m_videoTeamObjMap)) { VideoTeam ddsData = ifs->getData(); - if (ddsData.exerciseId() == context.id()) + if (ddsData.exerciseId == context.id()) m_deviceConfig->create(ddsData); } } @@ -208,10 +208,10 @@ void HandlerVideoTeam::onContextDeactivated(const ExerciseContext &context) if (ifs->exerciseId() == context.id()) { VideoTeam ddsData = ifs->getData(); - ddsData.exerciseId(0); - ddsData.streamName(std::string()); + ddsData.exerciseId = 0; + ddsData.streamName = std::string(); ifs->updateObject(ddsData); - m_deviceConfig->remove(ddsData.id()); + m_deviceConfig->remove(ddsData.id); } } } @@ -219,27 +219,27 @@ void HandlerVideoTeam::onContextDeactivated(const ExerciseContext &context) //-------------------------------------------------------------------------------------------------- static VideoTeam convert(const VideoTeamModifyRequest &request, const VideoTeam &oldData) { - Q_ASSERT(request.id() == oldData.id()); + Q_ASSERT(request.id == oldData.id); VideoTeam newData(oldData); - newData.streamName(request.streamName()); - newData.exerciseId(request.exerciseId()); + newData.streamName = request.streamName; + newData.exerciseId = request.exerciseId; return newData; } //-------------------------------------------------------------------------------------------------- Core::FunctionReplyObject HandlerVideoTeam::videoTeamModifyRequest(const VideoTeamModifyRequest &request) { - ObjectVideoTeam *ifs = m_videoTeamObjMap.value(request.id()); + ObjectVideoTeam *ifs = m_videoTeamObjMap.value(request.id); if (ifs == nullptr) - return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Video Team with id %1 not found")).arg(request.id()); - DEBUG_LOG(m_logger) << "on Modify Request" << request.streamName() << " ID: " << request.name() << " exId " << request.exerciseId(); + return Core::FunctionReplyObject(request.id, tr_lts("dds", "Video Team with id %1 not found")).arg(request.id); + DEBUG_LOG(m_logger) << "on Modify Request" << request.streamName << " ID: " << request.name << " exId " << request.exerciseId; VideoTeam ddsData = convert(request, ifs->getData()); if (needDeviceConfig(ddsData)) m_deviceConfig->createOrUpdate(ddsData); else - m_deviceConfig->tryRemove(ddsData.id()); + m_deviceConfig->tryRemove(ddsData.id); Core::FunctionReplyObject ret = ifs->updateObject(ddsData); emit mvsChanged(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/import_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/import_handler.cpp index 80c4d0010..733017481 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/import_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/import_handler.cpp @@ -26,7 +26,7 @@ Database::AvmDeviceConfig toDb(const ExerciseContext &context, const AssetManage deviceConfig.context = context.toString(); deviceConfig.type = QStringLiteral("IMPORT_VIDEO_CHANNEL"); deviceConfig.name = QStringLiteral("ECRS"); - deviceConfig.controller = QString::fromStdString(asset.name()); + deviceConfig.controller = QString::fromStdString(asset.name); deviceConfig.definition = QStringLiteral("recording=ECRS@EXCAVS01"); return deviceConfig; } @@ -91,11 +91,11 @@ void ImportHandler::onAssetChanged(const AssetManagement::Asset &asset, DataModi if (!m_isActive) return; - if (asset.assetTypeId() != AssetManagement::AssetType::Workstation) + if (asset.assetTypeId != AssetManagement::AssetType::Workstation) return; // Guard against a possible race condition, see comments in onContextActivated(). - auto found = m_deviceConfigs.find(asset.id()); + auto found = m_deviceConfigs.find(asset.id); if (found != m_deviceConfigs.end()) return; @@ -121,14 +121,14 @@ void ImportHandler::addToDb(const AssetManagement::Asset &asset) { Database::AvmDeviceConfig newConfig = ::toDb(m_context, asset); m_db->insert(newConfig); - auto insertResult = m_deviceConfigs.insert({asset.id(), newConfig}); + auto insertResult = m_deviceConfigs.insert({asset.id, newConfig}); Q_ASSERT(insertResult.second); emit avDbReloadNeeded(); } void ImportHandler::removeFromDb(const AssetManagement::Asset &asset) { - auto found = m_deviceConfigs.find(asset.id()); + auto found = m_deviceConfigs.find(asset.id); Q_ASSERT(found != m_deviceConfigs.end()); m_db->removeAvmDeviceConfig(found->second.id); m_deviceConfigs.erase(found); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.cpp index 8f1e48d9d..5a9fa7ea4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.cpp @@ -28,29 +28,29 @@ ObjectFrequencyPlanningStatus::~ObjectFrequencyPlanningStatus() Core::FunctionReplyObject ObjectFrequencyPlanningStatus::clearValues() { auto data(m_data); - data.uuid() = std::string(); - data.sent().reset(); - data.received().reset(); - data.activated().reset(); - data.isActive() = false; - data.requester() = std::string(); - data.content() = std::string(); - data.reason() = TransmissionReason::TR_Unknown; + data.uuid = std::string(); + data.sent.reset(); + data.received.reset(); + data.activated.reset(); + data.isActive = false; + data.requester = std::string(); + data.content = std::string(); + data.reason = TransmissionReason::TR_Unknown; return updateObject(data); } //------------------------------------------------------------------------------------------------------------- Core::FunctionReplyObject ObjectFrequencyPlanningStatus::createObject(const FrequencyPlanningStatus &data) { - Q_ASSERT(m_data.id() <= 0); - Q_ASSERT(data.id() > 0); // only allow creation from existing db-entries + Q_ASSERT(m_data.id <= 0); + Q_ASSERT(data.id > 0); // only allow creation from existing db-entries m_data = data; // Publish Data via DTS onPublishData(); - return Core::FunctionReplyObject(m_data.id()); + return Core::FunctionReplyObject(m_data.id); } //------------------------------------------------------------------------------------------------------------- @@ -60,52 +60,52 @@ Core::FunctionReplyObject ObjectFrequencyPlanningStatus::createObjectFromDDS(con Database::AvmFrequencyPlanningStatus dbData(toDbData(data)); if (!m_db->insert(dbData)) - return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating VideoTeam into database")); + return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating VideoTeam into database")); - m_data.id() = dbData.id; - DEBUG_LOG(m_logger) << "Data changed for VideoTeam Id: " << m_data.id(); + m_data.id = dbData.id; + DEBUG_LOG(m_logger) << "Data changed for VideoTeam Id: " << m_data.id; // Publish Data via DTS onPublishData(); - return Core::FunctionReplyObject(data.id()); + return Core::FunctionReplyObject(data.id); } //------------------------------------------------------------------------------------------------------------- Core::FunctionReplyObject ObjectFrequencyPlanningStatus::updateObject(const FrequencyPlanningStatus &data) { if (!isValid()) - return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked")); + return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked")); m_data = data; Database::AvmFrequencyPlanningStatus dbData(toDbData(m_data)); if (!m_db->update(dbData)) - return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating FrequencyPlanningStatus into database")); + return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating FrequencyPlanningStatus into database")); - DEBUG_LOG(m_logger) << "Data changed for FrequencyPlanningStatus Id: " << data.id(); + DEBUG_LOG(m_logger) << "Data changed for FrequencyPlanningStatus Id: " << data.id; // Publish Data via DTS onPublishData(); - return Core::FunctionReplyObject(data.id()); + return Core::FunctionReplyObject(data.id); } Core::FunctionReplyObject ObjectFrequencyPlanningStatus::removeObject() { - if (!m_db->removeAvmFrequencyPlanningStatus(m_data.id())) - return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "FrequencyPlanningStatus with id %1 can not be removed from DB")).arg(m_data.id()); + if (!m_db->removeAvmFrequencyPlanningStatus(m_data.id)) + return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "FrequencyPlanningStatus with id %1 can not be removed from DB")).arg(m_data.id); - if (!m_dts->removeFrequencyPlanningStatusByKey(m_data.id())) - return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "FrequencyPlanningStatus with id %1 can not be removed from DDS")).arg(m_data.id()); + if (!m_dts->removeFrequencyPlanningStatusByKey(m_data.id)) + return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "FrequencyPlanningStatus with id %1 can not be removed from DDS")).arg(m_data.id); - return Core::FunctionReplyObject(m_data.id()); + return Core::FunctionReplyObject(m_data.id); } //------------------------------------------------------------------------------------------------------------- void ObjectFrequencyPlanningStatus::onPublishData() { - INFO_LOG(m_logger) << "Publish ObjectFrequencyPlanningStatus to dds (" << m_data.id() << ") ..." << m_data.client() << ") ..."; + INFO_LOG(m_logger) << "Publish ObjectFrequencyPlanningStatus to dds (" << m_data.id << ") ..." << m_data.client << ") ..."; if (!m_dts->publish(m_data)) ERROR_LOG(m_logger) << "Error publishing ObjectFrequencyPlanningStatus to dds"; @@ -116,20 +116,20 @@ Database::AvmFrequencyPlanningStatus ObjectFrequencyPlanningStatus::toDbData(con { Database::AvmFrequencyPlanningStatus dbData; - dbData.id = ddsData.id(); - dbData.uuid = QString::fromStdString(ddsData.uuid()); - dbData.client = ddsData.client(); - dbData.isActive = ddsData.isActive(); - dbData.requester = QString::fromStdString(ddsData.requester()); - dbData.content = QString::fromStdString(ddsData.content()); - dbData.reason = ddsData.reason().underlying(); + dbData.id = ddsData.id; + dbData.uuid = QString::fromStdString(ddsData.uuid); + dbData.client = ddsData.client; + dbData.isActive = ddsData.isActive; + dbData.requester = QString::fromStdString(ddsData.requester); + dbData.content = QString::fromStdString(ddsData.content); + dbData.reason = static_cast(ddsData.reason); if (ddsData.sent.is_set()) - dbData.sent = ddsData.sent.get(); + dbData.sent = static_cast(ddsData.sent.get()); if (ddsData.received.is_set()) - dbData.received = ddsData.received.get(); + dbData.received = static_cast(ddsData.received.get()); if (ddsData.activated.is_set()) - dbData.activated = ddsData.activated.get(); + dbData.activated = static_cast(ddsData.activated.get()); return dbData; } @@ -139,20 +139,20 @@ AudioVideoManagement::FrequencyPlanningStatus ObjectFrequencyPlanningStatus::toD { AudioVideoManagement::FrequencyPlanningStatus ddsData; - ddsData.id(dbData.id); - ddsData.uuid() = dbData.uuid.toStdString(); - ddsData.client() = dbData.client; - ddsData.isActive() = dbData.isActive; - ddsData.requester() = dbData.requester.toStdString(); - ddsData.content() = dbData.content.toStdString(); - ddsData.reason() = static_cast(dbData.reason); + ddsData.id = dbData.id; + ddsData.uuid = dbData.uuid.toStdString(); + ddsData.client = dbData.client; + ddsData.isActive = dbData.isActive; + ddsData.requester = dbData.requester.toStdString(); + ddsData.content = dbData.content.toStdString(); + ddsData.reason = static_cast(dbData.reason); if (!dbData.sent.isNull()) - ddsData.sent(dbData.sent.value()); + ddsData.sent = dbData.sent.value(); if (!dbData.received.isNull()) - ddsData.received(dbData.received.value()); + ddsData.received = dbData.received.value(); if (!dbData.activated.isNull()) - ddsData.activated(dbData.activated.value()); + ddsData.activated = dbData.activated.value(); return ddsData; } // end of toDdsData() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.h index eff6a9da6..6bdb3ca11 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_frequency_planning_status.h @@ -21,7 +21,7 @@ public: DatabaseInterface *db); ~ObjectFrequencyPlanningStatus(); - int getId() const { return m_data.id(); } + int getId() const { return m_data.id; } FrequencyPlanningStatus getData() const { return m_data; } @@ -35,7 +35,7 @@ public: static Database::AvmFrequencyPlanningStatus toDbData(const FrequencyPlanningStatus &ddsData); // dds -> db static FrequencyPlanningStatus toDdsData(const Database::AvmFrequencyPlanningStatus &dbData); // db -> dds - bool isValid() const { return (m_data.client() > 0); } + bool isValid() const { return (m_data.client > 0); } protected: void onPublishData(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp index 73218e815..824bed513 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.cpp @@ -28,12 +28,12 @@ AudioVideoManagement::Database::AvmMenuStruct toDb(const AudioVideoManagement::A { AudioVideoManagement::Database::AvmMenuStruct dbItem; - dbItem.id = ddsItem.id() <= 0 ? 0 : ddsItem.id(); + dbItem.id = ddsItem.id <= 0 ? 0 : ddsItem.id; dbItem.parentId = parentId; - dbItem.isGroup = ddsItem.isGroup(); - dbItem.rowid = ddsItem.rowId(); + dbItem.isGroup = ddsItem.isGroup; + dbItem.rowid = ddsItem.rowId; - if (ddsItem.isGroup()) + if (ddsItem.isGroup) dbItem.name = QString::fromStdString(ddsItem.name.get()); else dbItem.mountingPointId = ddsItem.mountingPointId.get(); @@ -45,27 +45,27 @@ void checkHierarchy(const std::vector &entrie { std::vector entries = entries_; - auto isToplevel = [toplevelId] (const AudioVideoManagement::AvMenuEntry &entry) { return entry.parentId() == toplevelId; }; + auto isToplevel = [toplevelId] (const AudioVideoManagement::AvMenuEntry &entry) { return entry.parentId == toplevelId; }; auto sublevelStart = std::partition(entries.begin(), entries.end(), isToplevel); std::set ids; std::set groupIds; for (auto entry = entries.begin(); entry != sublevelStart; ++entry) { - auto result = ids.insert(entry->id()); + auto result = ids.insert(entry->id); Q_ASSERT(result.second); - if (entry->isGroup()) - groupIds.insert(entry->id()); + if (entry->isGroup) + groupIds.insert(entry->id); } for (auto entry = sublevelStart; entry != entries.end(); ++entry) { - auto result = ids.insert(entry->id()); + auto result = ids.insert(entry->id); Q_ASSERT(result.second); - Q_ASSERT(!entry->isGroup()); - Q_ASSERT(groupIds.count(entry->parentId()) > 0); + Q_ASSERT(!entry->isGroup); + Q_ASSERT(groupIds.count(entry->parentId) > 0); } } @@ -86,12 +86,12 @@ ObjectMenuStruct::ObjectMenuStruct(Interface::Dts *dts, DatabaseInterface *db) ObjectMenuStruct::~ObjectMenuStruct() { - m_dts->removeMenuStructByKey(m_data.id()); + m_dts->removeMenuStructByKey(m_data.id); } Core::FunctionReplyObject ObjectMenuStruct::createFromDds(const MenuStruct &data) { - Q_ASSERT(data.id() <= 0 && m_data.id() <= 0); + Q_ASSERT(data.id <= 0 && m_data.id <= 0); auto reply = insertUpdateDb(data); onPublishData(); return reply; @@ -99,7 +99,7 @@ Core::FunctionReplyObject ObjectMenuStruct::createFromDds(const MenuStruct &data Core::FunctionReplyObject ObjectMenuStruct::updateFromDds(const MenuStruct &data) { - Q_ASSERT(data.id() > 0 && data.id() == m_data.id()); + Q_ASSERT(data.id > 0 && data.id == m_data.id); auto reply = insertUpdateDb(data); onPublishData(); return reply; @@ -107,19 +107,19 @@ Core::FunctionReplyObject ObjectMenuStruct::updateFromDds(const MenuStruct &data void ObjectMenuStruct::createFromDb(const MenuStruct &data) { - Q_ASSERT(data.id() > 0 && m_data.id() <= 0); - checkHierarchy(data.menuEntries(), data.id()); + Q_ASSERT(data.id > 0 && m_data.id <= 0); + checkHierarchy(data.menuEntries, data.id); m_data = data; onPublishData(); } void ObjectMenuStruct::updateFromDb(const MenuStruct &data) { - Q_ASSERT(data.id() > 0 && data.id() == m_data.id()); + Q_ASSERT(data.id > 0 && data.id == m_data.id); if (data == m_data) return; - checkHierarchy(data.menuEntries(), data.id()); + checkHierarchy(data.menuEntries, data.id); m_data = data; onPublishData(); } @@ -128,31 +128,31 @@ Core::FunctionReplyObject ObjectMenuStruct::remove() { DBTransaction trans(m_db->database()); - INFO_LOG(m_logger) << "menuEntries.size(): " << m_data.menuEntries().size(); - for (const AudioVideoManagement::AvMenuEntry &me : m_data.menuEntries()) + INFO_LOG(m_logger) << "menuEntries.size(): " << m_data.menuEntries.size(); + for (const AudioVideoManagement::AvMenuEntry &me : m_data.menuEntries) { - INFO_LOG(m_logger) << "Remove entries with id/parentId: " << me.id(); + INFO_LOG(m_logger) << "Remove entries with id/parentId: " << me.id; // no recursion needed, only 2 levels allowed - if (me.isGroup()) - if (!m_db->removeAvmMenuStructByParentId(me.id())) - return Core::FunctionReplyObject(m_data.id(), "Error while removing menu entries"); - if (!m_db->removeAvmMenuStruct(me.id())) - return Core::FunctionReplyObject(m_data.id(), "Error while removing menu entries"); + if (me.isGroup) + if (!m_db->removeAvmMenuStructByParentId(me.id)) + return Core::FunctionReplyObject(m_data.id, "Error while removing menu entries"); + if (!m_db->removeAvmMenuStruct(me.id)) + return Core::FunctionReplyObject(m_data.id, "Error while removing menu entries"); } - if (!m_db->removeAvmMenuStruct(m_data.id())) - return Core::FunctionReplyObject(m_data.id(), "Error while removing menu struct"); + if (!m_db->removeAvmMenuStruct(m_data.id)) + return Core::FunctionReplyObject(m_data.id, "Error while removing menu struct"); trans.commit(); - m_dts->removeMenuStructByKey(m_data.id()); + m_dts->removeMenuStructByKey(m_data.id); - return Core::FunctionReplyObject(m_data.id()); + return Core::FunctionReplyObject(m_data.id); } void ObjectMenuStruct::onPublishData() { - INFO_LOG(m_logger) << "Publish MenuStruct-data to dds (" << m_data.id() << ") ..."; + INFO_LOG(m_logger) << "Publish MenuStruct-data to dds (" << m_data.id << ") ..."; if (!m_dts->publish(m_data)) ERROR_LOG(m_logger) << "Error publishing MenuStruct-data to dds"; @@ -161,24 +161,24 @@ void ObjectMenuStruct::onPublishData() Core::FunctionReplyObject ObjectMenuStruct::insertUpdateDb(const MenuStruct &data) { - checkHierarchy(data.menuEntries(), data.id()); + checkHierarchy(data.menuEntries, data.id); - const auto oldEntries = m_data.menuEntries(); + const auto oldEntries = m_data.menuEntries; m_data = data; Database::AvmMenuStruct ms; // Insert Parent ms.parentId = 0; - ms.name = QString::fromStdString(data.name()); - ms.isAudio = data.isAudio(); + ms.name = QString::fromStdString(data.name); + ms.isAudio = data.isAudio; ms.isGroup = true; DBTransaction trans(m_db->database()); - if (m_data.id() > 0) + if (m_data.id > 0) { - ms.id = m_data.id(); + ms.id = m_data.id; if (!m_db->update(ms)) return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AvmMenuStruct-data into database")); } @@ -188,14 +188,14 @@ Core::FunctionReplyObject ObjectMenuStruct::insertUpdateDb(const MenuStruct &dat return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AvmMenuStruct-data into database")); } - m_data.id(ms.id); - const int virtualMenuStructId = data.id(); - const int realMenuStructId = m_data.id(); + m_data.id = ms.id; + const int virtualMenuStructId = data.id; + const int realMenuStructId = m_data.id; std::vector newEntries; - newEntries.reserve(data.menuEntries().size()); + newEntries.reserve(data.menuEntries.size()); - auto ret = insertUpdateChildren(virtualMenuStructId, realMenuStructId, data.menuEntries(), newEntries); + auto ret = insertUpdateChildren(virtualMenuStructId, realMenuStructId, data.menuEntries, newEntries); if (ret.error()) return ret; @@ -203,23 +203,23 @@ Core::FunctionReplyObject ObjectMenuStruct::insertUpdateDb(const MenuStruct &dat for (const AvMenuEntry &me : oldEntries) { // new entries - ignore - if (me.id() <= 0) + if (me.id <= 0) continue; - auto found = std::find_if(newEntries.begin(), newEntries.end(), [&me] (const AvMenuEntry &newEntry) { return me.id() == newEntry.id(); }); + auto found = std::find_if(newEntries.begin(), newEntries.end(), [&me] (const AvMenuEntry &newEntry) { return me.id == newEntry.id; }); if (found == newEntries.end()) { - DEBUG_LOG(m_logger) << "Menu Entry with id not found - was removed: " << me.id(); - m_db->removeAvmMenuStruct(me.id()); + DEBUG_LOG(m_logger) << "Menu Entry with id not found - was removed: " << me.id; + m_db->removeAvmMenuStruct(me.id); } } - m_data.menuEntries(newEntries); + m_data.menuEntries = newEntries; HandlerMenuStruct::sortEntries(m_data); DEBUG_LOG(m_logger) << "new entries: " << m_data; trans.commit(); - return Core::FunctionReplyObject(m_data.id()); + return Core::FunctionReplyObject(m_data.id); } Core::FunctionReplyObject ObjectMenuStruct::insertUpdateChildren(int virtualParentId, @@ -229,7 +229,7 @@ Core::FunctionReplyObject ObjectMenuStruct::insertUpdateChildren(int virtualPare { for(const AudioVideoManagement::AvMenuEntry &ddsItem : entries) { - if (ddsItem.parentId() != virtualParentId) + if (ddsItem.parentId != virtualParentId) continue; Database::AvmMenuStruct dbEntry = ::toDb(ddsItem, realParentId); @@ -250,7 +250,7 @@ Core::FunctionReplyObject ObjectMenuStruct::insertUpdateChildren(int virtualPare if (dbEntry.isGroup) { - const int virtualId = ddsItem.id(); + const int virtualId = ddsItem.id; const int realId = dbEntry.id; insertUpdateChildren(virtualId, realId, entries, newEntries); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.h index 0b77d9cfb..88af237da 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_menu_struct.h @@ -47,7 +47,7 @@ public: /** Called as a result of a Remove-request. */ Core::FunctionReplyObject remove(); - long getId() const { return m_data.id(); } + long getId() const { return m_data.id; } private: void onPublishData(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.cpp index 81716640f..aae83e635 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.cpp @@ -30,7 +30,7 @@ ObjectVideoReceiver::~ObjectVideoReceiver() Core::FunctionReplyObject ObjectVideoReceiver::createObject(const VideoReceiver &data) { m_data = data; - if (m_data.id() <= 0) + if (m_data.id <= 0) { Database::AvmVideoReceiver dbData; dbData = toDbData(data); @@ -38,55 +38,55 @@ Core::FunctionReplyObject ObjectVideoReceiver::createObject(const VideoReceiver if (!m_db->insert(dbData)) return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AvmVideoReceiver-data into database")); - m_data.id(dbData.id); - DEBUG_LOG(m_logger) << "New Id: " << m_data.id(); + m_data.id = dbData.id; + DEBUG_LOG(m_logger) << "New Id: " << m_data.id; } // Publish Data via DTS onPublishData(); - return Core::FunctionReplyObject(m_data.id()); + return Core::FunctionReplyObject(m_data.id); } //------------------------------------------------------------------------------------------------------------- Core::FunctionReplyObject ObjectVideoReceiver::updateObject(const VideoReceiver &data) { m_data = data; - DEBUG_LOG(m_logger) << "ObjectVideoReceiver::updateObject id=" << data.id() - << " isActive=" << data.isActive() - << " hostName=" << data.hostName() - << " isLocked=" << data.isLocked(); + DEBUG_LOG(m_logger) << "ObjectVideoReceiver::updateObject id=" << data.id + << " isActive=" << data.isActive + << " hostName=" << data.hostName + << " isLocked=" << data.isLocked; Database::AvmVideoReceiver dbData(toDbData(data)); if (!m_db->update(dbData)) - return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating VideoReceiver2 into database")); + return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating VideoReceiver2 into database")); - DEBUG_LOG(m_logger) << "Data changed for VideoReceiver Id: " << data.id(); + DEBUG_LOG(m_logger) << "Data changed for VideoReceiver Id: " << data.id; // Publish Data via DTS onPublishData(); - return Core::FunctionReplyObject(data.id()); + return Core::FunctionReplyObject(data.id); } //------------------------------------------------------------------------------------------------------------- Core::FunctionReplyObject ObjectVideoReceiver::removeObject() { - if (!m_db->removeAvmVideoReceiver(m_data.id())) - return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Video Receiver with id %1 can not be removed from DB")).arg(m_data.id()); + if (!m_db->removeAvmVideoReceiver(m_data.id)) + return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Video Receiver with id %1 can not be removed from DB")).arg(m_data.id); - if (!m_dts->removeVideoReceiverByKey(m_data.id())) - return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Video Receiver with id %1 can not be removed from DDS")).arg(m_data.id()); + if (!m_dts->removeVideoReceiverByKey(m_data.id)) + return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Video Receiver with id %1 can not be removed from DDS")).arg(m_data.id); - return Core::FunctionReplyObject(m_data.id()); + return Core::FunctionReplyObject(m_data.id); } //------------------------------------------------------------------------------------------------------------- void ObjectVideoReceiver::onPublishData() { - INFO_LOG(m_logger) << "Publish MvsVideoReceiver-data to dds (" << m_data.id() << ") ..."; + INFO_LOG(m_logger) << "Publish MvsVideoReceiver-data to dds (" << m_data.id << ") ..."; if (!m_dts->publish(m_data)) ERROR_LOG(m_logger) << "Error publishing MvsVideoReceiver-data to dds"; @@ -97,15 +97,15 @@ Database::AvmVideoReceiver ObjectVideoReceiver::toDbData(const VideoReceiver &dd { Database::AvmVideoReceiver dbData; - dbData.id = ddsData.id(); - dbData.streamName = QString::fromStdString(ddsData.streamName()); - dbData.mainStructureElementId = ddsData.mainStructureElementId(); - dbData.teamId = ddsData.teamId(); - dbData.isActive = ddsData.isActive(); - dbData.info = QString::fromStdString(ddsData.info()); - dbData.hostName = QString::fromStdString(ddsData.hostName()); - dbData.frequency = ddsData.frequency(); - dbData.isLocked = ddsData.isLocked(); + dbData.id = ddsData.id; + dbData.streamName = QString::fromStdString(ddsData.streamName); + dbData.mainStructureElementId = ddsData.mainStructureElementId; + dbData.teamId = ddsData.teamId; + dbData.isActive = ddsData.isActive; + dbData.info = QString::fromStdString(ddsData.info); + dbData.hostName = QString::fromStdString(ddsData.hostName); + dbData.frequency = ddsData.frequency; + dbData.isLocked = ddsData.isLocked; return dbData; } @@ -114,19 +114,19 @@ Database::AvmVideoReceiver ObjectVideoReceiver::toDbData(const VideoReceiver &dd AudioVideoManagement::VideoReceiver ObjectVideoReceiver::toDdsData(const Database::AvmVideoReceiver &dbData) { AudioVideoManagement::VideoReceiver ddsData; - ddsData.id(dbData.id); - ddsData.streamName(dbData.streamName.toStdString()); - ddsData.mainStructureElementId(dbData.mainStructureElementId); - ddsData.teamId(dbData.teamId); - ddsData.isActive(dbData.isActive); - ddsData.isLocked(dbData.isLocked); - ddsData.info(dbData.info.toStdString()); - ddsData.hostName(dbData.hostName.toStdString()); - ddsData.frequency(dbData.frequency); + ddsData.id = dbData.id; + ddsData.streamName = dbData.streamName.toStdString(); + ddsData.mainStructureElementId = dbData.mainStructureElementId; + ddsData.teamId = dbData.teamId; + ddsData.isActive = dbData.isActive; + ddsData.isLocked = dbData.isLocked; + ddsData.info = dbData.info.toStdString(); + ddsData.hostName = dbData.hostName.toStdString(); + ddsData.frequency = dbData.frequency; // init data not in db - ddsData.dbm(0); - ddsData.snr(0); + ddsData.dbm = 0; + ddsData.snr = 0; return ddsData; } // end of toDdsData() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.h index a3aa49651..799d5abad 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_receiver.h @@ -31,13 +31,13 @@ public: Core::FunctionReplyObject updateObject(const VideoReceiver &data); Core::FunctionReplyObject removeObject(); - int getId() const { return m_data.id(); } + int getId() const { return m_data.id; } VideoReceiver getData() const { return m_data; } static Database::AvmVideoReceiver toDbData(const VideoReceiver &ddsData); // dds -> db static AudioVideoManagement::VideoReceiver toDdsData(const Database::AvmVideoReceiver &dbData); // db -> dds - bool isValid() const { return (m_data.id() > 0); } + bool isValid() const { return (m_data.id > 0); } protected: void onPublishData(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.cpp index 1967355e9..853b2e76c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.cpp @@ -28,39 +28,39 @@ ObjectVideoTeam::~ObjectVideoTeam() //------------------------------------------------------------------------------------------------------------- Core::FunctionReplyObject ObjectVideoTeam::createObject(const VideoTeam &data) { - Q_ASSERT(m_data.id() <= 0); - Q_ASSERT(data.id() > 0); // only allow creation from existing db-entries + Q_ASSERT(m_data.id <= 0); + Q_ASSERT(data.id > 0); // only allow creation from existing db-entries m_data = data; // Publish Data via DTS onPublishData(); - return Core::FunctionReplyObject(m_data.id()); + return Core::FunctionReplyObject(m_data.id); } //------------------------------------------------------------------------------------------------------------- Core::FunctionReplyObject ObjectVideoTeam::updateObject(const VideoTeam &data) { if (!isValid()) - return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked")); + return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked")); m_data = data; Database::AvmVideoTeam dbData(toDbData(data)); if (!m_db->update(dbData)) - return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating VideoTeam into database")); + return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating VideoTeam into database")); - DEBUG_LOG(m_logger) << "Data changed for VideoTeam Id: " << data.id(); + DEBUG_LOG(m_logger) << "Data changed for VideoTeam Id: " << data.id; // Publish Data via DTS onPublishData(); - return Core::FunctionReplyObject(data.id());} + return Core::FunctionReplyObject(data.id);} //------------------------------------------------------------------------------------------------------------- void ObjectVideoTeam::onPublishData() { - INFO_LOG(m_logger) << "Publish AvmVideoTeam-data to dds (" << m_data.id() << ") ..."; + INFO_LOG(m_logger) << "Publish AvmVideoTeam-data to dds (" << m_data.id << ") ..."; if (!m_dts->publish(m_data)) ERROR_LOG(m_logger) << "Error publishing AvmVideoTeam-data to dds"; @@ -71,14 +71,14 @@ Database::AvmVideoTeam ObjectVideoTeam::toDbData(const VideoTeam &ddsData) { Database::AvmVideoTeam dbData; - dbData.id = ddsData.id(); - dbData.name = QString::fromStdString(ddsData.name()); - dbData.ssrc = ddsData.ssrc(); - dbData.port = ddsData.vtPort(); - dbData.programId = ddsData.programId(); - dbData.timeOffset = ddsData.timeOffset(); - dbData.streamName = QString::fromStdString(ddsData.streamName()); - dbData.exerciseId = ddsData.exerciseId(); + dbData.id = ddsData.id; + dbData.name = QString::fromStdString(ddsData.name); + dbData.ssrc = ddsData.ssrc; + dbData.port = ddsData.vtPort; + dbData.programId = ddsData.programId; + dbData.timeOffset = ddsData.timeOffset; + dbData.streamName = QString::fromStdString(ddsData.streamName); + dbData.exerciseId = ddsData.exerciseId; return dbData; } @@ -88,14 +88,14 @@ AudioVideoManagement::VideoTeam ObjectVideoTeam::toDdsData(const Database::AvmVi { AudioVideoManagement::VideoTeam ddsData; - ddsData.id(dbData.id); - ddsData.name(dbData.name.toStdString()); - ddsData.ssrc(dbData.ssrc); - ddsData.vtPort(dbData.port); - ddsData.programId(dbData.programId); - ddsData.timeOffset(dbData.timeOffset); - ddsData.exerciseId(dbData.exerciseId); - ddsData.streamName(dbData.streamName.toStdString()); + ddsData.id = dbData.id; + ddsData.name = dbData.name.toStdString(); + ddsData.ssrc = dbData.ssrc; + ddsData.vtPort = dbData.port; + ddsData.programId = dbData.programId; + ddsData.timeOffset = dbData.timeOffset; + ddsData.exerciseId = dbData.exerciseId; + ddsData.streamName = dbData.streamName.toStdString(); return ddsData; } // end of toDdsData() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.h b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.h index 8844734ed..79d424a21 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/object_video_team.h @@ -24,15 +24,15 @@ public: Core::FunctionReplyObject createObject(const VideoTeam &data); Core::FunctionReplyObject updateObject(const VideoTeam &data); - int getId() const { return m_data.id(); } - int exerciseId() const { return m_data.exerciseId(); } + int getId() const { return m_data.id; } + int exerciseId() const { return m_data.exerciseId; } VideoTeam getData() const { return m_data; } - QString getName() const { return QString::fromStdString(m_data.name()); } + QString getName() const { return QString::fromStdString(m_data.name); } static Database::AvmVideoTeam toDbData(const VideoTeam &ddsData); // dds -> db static VideoTeam toDdsData(const Database::AvmVideoTeam &dbData); // db -> dds - bool isValid() const { return (m_data.id() > 0); } + bool isValid() const { return (m_data.id > 0); } protected: void onPublishData(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.cpp index fefc8d2e1..862033fe1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/stream_name_mapping_publisher.cpp @@ -21,12 +21,12 @@ namespace bool isMountingPointOfInterest(const InfrastructureManagement::StructureElement &se) { - if (se.structureElementTypeId() != InfrastructureManagement::StructureElementType::MountingPoint) + if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::MountingPoint) return false; - if (se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::IndoorCamera || - se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::OutdoorCamera || - se.mountingPointTypeId() == InfrastructureManagement::MountingPointType::AnnouncementUnit) + if (se.mountingPointTypeId == InfrastructureManagement::MountingPointType::IndoorCamera || + se.mountingPointTypeId == InfrastructureManagement::MountingPointType::OutdoorCamera || + se.mountingPointTypeId == InfrastructureManagement::MountingPointType::AnnouncementUnit) return true; return false; @@ -35,10 +35,10 @@ bool isMountingPointOfInterest(const InfrastructureManagement::StructureElement std::string displayName(const InfrastructureManagement::StructureElement &mp) { Q_ASSERT(isMountingPointOfInterest(mp)); - if (mp.displayName().size() > 0) - return mp.displayName(); + if (mp.displayName.size() > 0) + return mp.displayName; - return AudioVideoManagement::AudioVideoHandlerImpl::internalStreamName(mp.id()).toStdString(); + return AudioVideoManagement::AudioVideoHandlerImpl::internalStreamName(mp.id).toStdString(); } } // anonymous namespace @@ -78,7 +78,7 @@ void StreamNameMappingPublisher::onMainStructureElementChanged(const Infrastruct void StreamNameMappingPublisher::onMseChanged(const InfrastructureManagement::MainStructureElement &mse) { - const auto &structureElements = mse.elements(); + const auto &structureElements = mse.elements; for (auto &se : structureElements) if (isMountingPointOfInterest(se)) publish(se); @@ -86,7 +86,7 @@ void StreamNameMappingPublisher::onMseChanged(const InfrastructureManagement::Ma void StreamNameMappingPublisher::onMseRemoved(const InfrastructureManagement::MainStructureElement &mse) { - const auto &structureElements = mse.elements(); + const auto &structureElements = mse.elements; for (auto &se : structureElements) if (isMountingPointOfInterest(se)) remove(se); @@ -95,18 +95,18 @@ void StreamNameMappingPublisher::onMseRemoved(const InfrastructureManagement::Ma void StreamNameMappingPublisher::publish(const InfrastructureManagement::StructureElement &mountingPoint) { StreamName streamName; - streamName.mountingPointId(mountingPoint.id()); - streamName.internalName(AudioVideoHandlerImpl::internalStreamName(mountingPoint.id()).toStdString()); - streamName.displayName(displayName(mountingPoint)); + streamName.mountingPointId = mountingPoint.id; + streamName.internalName = AudioVideoHandlerImpl::internalStreamName(mountingPoint.id).toStdString(); + streamName.displayName = displayName(mountingPoint); - if (m_streamNames[mountingPoint.id()] != streamName) + if (m_streamNames[mountingPoint.id] != streamName) m_dts->publish(streamName); - m_streamNames[mountingPoint.id()] = streamName; + m_streamNames[mountingPoint.id] = streamName; } void StreamNameMappingPublisher::remove(const InfrastructureManagement::StructureElement &mountingPoint) { - m_dts->removeStreamNameByKey(mountingPoint.id()); + m_dts->removeStreamNameByKey(mountingPoint.id); } } // namespace AudioVideoManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp index 4f11bb615..1badc0abc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/AudioVideoManagement/tvc_handler.cpp @@ -61,11 +61,11 @@ Database::AvmTvcConfig toDb(const ModifyTvcConfigRequest &request) { Database::AvmTvcConfig result; - result.id = request.id(); - result.radioCircuit = QString::fromStdString(request.radioCircuit()); - result.info = QString::fromStdString(request.info()); - result.recording = request.recording(); - result.tetraChannelId = request.tetraChannelId(); + result.id = request.id; + result.radioCircuit = QString::fromStdString(request.radioCircuit); + result.info = QString::fromStdString(request.info); + result.recording = request.recording; + result.tetraChannelId = request.tetraChannelId; if (request.exerciseId.is_set()) result.exerciseId = request.exerciseId.get(); @@ -92,36 +92,36 @@ public: void create(const TvcConfig &config) { - Q_ASSERT(!m_cache.contains(config.id())); + Q_ASSERT(!m_cache.contains(config.id)); Database::AvmDeviceConfig deviceConfig = toDeviceConfig(config); if (!m_db->insert(deviceConfig)) ERROR_LOG(m_logger) << "Error while inserting device config into database"; - m_cache.insert(config.id(), deviceConfig); + m_cache.insert(config.id, deviceConfig); emit m_handler->avDbReloadNeeded(); } void update(const TvcConfig &config) { - Q_ASSERT(m_cache.contains(config.id())); + Q_ASSERT(m_cache.contains(config.id)); Database::AvmDeviceConfig deviceConfig = toDeviceConfig(config); - const Database::AvmDeviceConfig &oldDeviceConfig = m_cache[config.id()]; + const Database::AvmDeviceConfig &oldDeviceConfig = m_cache[config.id]; deviceConfig.id = oldDeviceConfig.id; if (!m_db->update(deviceConfig)) ERROR_LOG(m_logger) << "Error while updating device config"; - m_cache[config.id()] = deviceConfig; + m_cache[config.id] = deviceConfig; emit m_handler->avDbReloadNeeded(); } void createOrUpdate(const TvcConfig &config) { - if (m_cache.contains(config.id())) + if (m_cache.contains(config.id)) update(config); else create(config); @@ -234,8 +234,8 @@ void TvcHandler::onModifyTvcConfigRequest(const rti::core::SampleIdentity &cooki const ModifyTvcConfigRequest &request) { DEBUG_LOG(m_logger) << "onModifyTvcConfigRequest: " << request; - Q_ASSERT(request.id() >= 0); - auto ret = request.id() > 0 ? modifyTvcConfig(request) : createTvcConfig(request); + Q_ASSERT(request.id >= 0); + auto ret = request.id > 0 ? modifyTvcConfig(request) : createTvcConfig(request); if (ret.error()) WARNING_LOG(m_logger) << ret(); m_fts->modifyTvcConfigReply(cookie, ret); @@ -272,33 +272,33 @@ bool TvcHandler::isValidChannel(int64_t channelId) const // If there are conflicts between the then-active exercises the start of the new exercise must be denied. bool TvcHandler::isFreeChannel(const ModifyTvcConfigRequest &request) const { - boost::optional exerciseId = toBoost(request.exerciseId()); + boost::optional exerciseId = toBoost(request.exerciseId); - if (request.id() <= 0) - return isFreeChannel(request.tetraChannelId(), exerciseId); - return isFreeChannel(request.tetraChannelId(), exerciseId, request.id()); + if (request.id <= 0) + return isFreeChannel(request.tetraChannelId, exerciseId); + return isFreeChannel(request.tetraChannelId, exerciseId, request.id); } bool TvcHandler::isFreeChannel(int32_t channelId, const boost::optional &exerciseId, const boost::optional &excludeId) const { - auto constraint = [&channelId] (const TvcConfig &config) { return config.tetraChannelId() != channelId; }; + auto constraint = [&channelId] (const TvcConfig &config) { return config.tetraChannelId != channelId; }; return checkConstraint(constraint, exerciseId, excludeId); } bool TvcHandler::isNameUnique(const ModifyTvcConfigRequest &request) const { - boost::optional exerciseId = toBoost(request.exerciseId()); + boost::optional exerciseId = toBoost(request.exerciseId); - if (request.id() <= 0) - return isNameUnique(request.radioCircuit(), exerciseId); - return isNameUnique(request.radioCircuit(), exerciseId, request.id()); + if (request.id <= 0) + return isNameUnique(request.radioCircuit, exerciseId); + return isNameUnique(request.radioCircuit, exerciseId, request.id); } // Needs to be revised. // See isFreeChannel(). bool TvcHandler::isNameUnique(const std::string &name, const boost::optional &exerciseId, const boost::optional &excludeId) const { - auto constraint = [&name] (const TvcConfig &config) { return config.radioCircuit() != name; }; + auto constraint = [&name] (const TvcConfig &config) { return config.radioCircuit != name; }; return checkConstraint(constraint, exerciseId, excludeId); } @@ -321,13 +321,13 @@ Core::FunctionReplyObject TvcHandler::createTvcConfig(const ModifyTvcConfigReque } TvcConfig tvcConfig = toDds(dbConfigData); - m_cache.insert(tvcConfig.id(), tvcConfig); + m_cache.insert(tvcConfig.id, tvcConfig); m_dts->publish(tvcConfig); if (needDeviceConfig(tvcConfig)) m_deviceConfig->create(tvcConfig); - return Core::FunctionReplyObject(tvcConfig.id()); + return Core::FunctionReplyObject(tvcConfig.id); } Core::FunctionReplyObject TvcHandler::modifyTvcConfig(const ModifyTvcConfigRequest &request) @@ -339,17 +339,17 @@ Core::FunctionReplyObject TvcHandler::modifyTvcConfig(const ModifyTvcConfigReque Database::AvmTvcConfig dbConfigData = toDb(request); if (!m_db->update(dbConfigData)) - return reply.setStr(tr_lts("dds", "Could not update TVC config data in database with id %1")).arg(request.id()); + return reply.setStr(tr_lts("dds", "Could not update TVC config data in database with id %1")).arg(request.id); TvcConfig tvcConfig = toDds(dbConfigData); - m_cache[tvcConfig.id()] = tvcConfig; + m_cache[tvcConfig.id] = tvcConfig; m_dts->publish(tvcConfig); if (needDeviceConfig(tvcConfig)) m_deviceConfig->createOrUpdate(tvcConfig); else - m_deviceConfig->tryRemove(tvcConfig.id()); + m_deviceConfig->tryRemove(tvcConfig.id); emit tvcConfigChanged(tvcConfig); return reply; @@ -357,7 +357,7 @@ Core::FunctionReplyObject TvcHandler::modifyTvcConfig(const ModifyTvcConfigReque Core::FunctionReplyObject TvcHandler::removeTvcConfig(const Core::RemoveElementRequest &request) { - int32_t configId = request.id(); + int32_t configId = request.id; Core::FunctionReplyObject reply(configId); auto found = m_cache.find(configId); @@ -371,7 +371,7 @@ Core::FunctionReplyObject TvcHandler::removeTvcConfig(const Core::RemoveElementR m_dts->removeTvcConfigByKey(configId); if (!m_db->removeAvmTvcConfig(configId)) - return reply.setStr(tr_lts("dds", "Could not remove TVC config data with id %1")).arg(request.id()); + return reply.setStr(tr_lts("dds", "Could not remove TVC config data with id %1")).arg(request.id); return reply; } @@ -380,7 +380,7 @@ Database::AvmDeviceConfig TvcHandler::toDeviceConfig(const TvcConfig &tvcConfig) { Database::AvmDeviceConfig result; - Database::AvmTvcChannel tetraChannel = channelById(tvcConfig.tetraChannelId()); + Database::AvmTvcChannel tetraChannel = channelById(tvcConfig.tetraChannelId); QJsonObject settings = QJsonDocument::fromJson(tetraChannel.settings.toUtf8()).object(); QJsonObject data = settings[QStringLiteral("data")].toObject(); @@ -388,10 +388,10 @@ Database::AvmDeviceConfig TvcHandler::toDeviceConfig(const TvcConfig &tvcConfig) { result.context = exerciseList(tvcConfig); result.type = QStringLiteral("TETRA_RT_CHANNEL"); - result.name = QString::fromStdString(tvcConfig.radioCircuit()); + result.name = QString::fromStdString(tvcConfig.radioCircuit); result.controller = QStringLiteral("EXCAVS01"); result.definition = QStringLiteral("mode=1;ssrc=%1;port=%2").arg(data[QStringLiteral("ssrc")].toInt()).arg(data[QStringLiteral("port")].toInt()); - if (tvcConfig.recording()) + if (tvcConfig.recording) result.definition.append(QStringLiteral(";recording=ECRS@%1").arg(result.controller)); result.link = 0; } @@ -399,10 +399,10 @@ Database::AvmDeviceConfig TvcHandler::toDeviceConfig(const TvcConfig &tvcConfig) { result.context = exerciseList(tvcConfig); result.type = QStringLiteral("SOTAS_SIP_RT_CHANNEL"); - result.name = QString::fromStdString(tvcConfig.radioCircuit()); + result.name = QString::fromStdString(tvcConfig.radioCircuit); result.controller = QStringLiteral("EXCAVS01"); result.definition = QStringLiteral("mode=1;sip=%1@%2").arg(data[QStringLiteral("role")].toString()).arg(data[QStringLiteral("host")].toString()); - if (tvcConfig.recording()) + if (tvcConfig.recording) result.definition.append(QStringLiteral(";recording=ECRS@%1").arg(result.controller)); result.link = 0; } @@ -429,7 +429,7 @@ void TvcHandler::onContextActivated(const ExerciseContext &context) bool isLocal = tvcConfig.exerciseId.is_set(); if (isLocal) { - if (tvcConfig.exerciseId() == context.id()) + if (tvcConfig.exerciseId == context.id()) m_deviceConfig->create(tvcConfig); } else @@ -452,13 +452,13 @@ void TvcHandler::onContextDeactivated(const ExerciseContext &context) if (isLocal) { - if (tvcConfig.exerciseId() == context.id()) - m_deviceConfig->remove(tvcConfig.id()); + if (tvcConfig.exerciseId == context.id()) + m_deviceConfig->remove(tvcConfig.id); } else { if (!haveActiveExercise) - m_deviceConfig->remove(tvcConfig.id()); + m_deviceConfig->remove(tvcConfig.id); else m_deviceConfig->update(tvcConfig); } @@ -499,20 +499,20 @@ Core::FunctionReplyObject TvcHandler::validateRequest(const ModifyTvcConfigReque { Core::FunctionReplyObject reply; - if (request.id() > 0) + if (request.id > 0) { - reply.setId(request.id()); - if (!m_cache.contains(request.id())) - return reply.setStr(tr_lts("dds", "Could not modify TVC config because id %1 is unknown")).arg(request.id()); + reply.setId(request.id); + if (!m_cache.contains(request.id)) + return reply.setStr(tr_lts("dds", "Could not modify TVC config because id %1 is unknown")).arg(request.id); } - if (!isValidChannel(request.tetraChannelId())) - return reply.setStr(tr_lts("dds", "Could not create/modify TVC config because the channel with id %1 is invalid")).arg(request.tetraChannelId()); + if (!isValidChannel(request.tetraChannelId)) + return reply.setStr(tr_lts("dds", "Could not create/modify TVC config because the channel with id %1 is invalid")).arg(request.tetraChannelId); if (!isFreeChannel(request)) - return reply.setStr(tr_lts("dds", "Could not create/modify TVC config because channel id %1 is already taken")).arg(request.tetraChannelId()); + return reply.setStr(tr_lts("dds", "Could not create/modify TVC config because channel id %1 is already taken")).arg(request.tetraChannelId); - if (!isStreamNameValid(request.radioCircuit())) + if (!isStreamNameValid(request.radioCircuit)) return reply.setStr(tr_lts("dds", "Could not create/modify TVC config because the circuit name is invalid")); if (!isNameUnique(request)) @@ -528,7 +528,7 @@ bool TvcHandler::checkConstraint(const std::function & { for (const TvcConfig &config : qAsConst(m_cache)) { - if (excludeId == config.id()) + if (excludeId == config.id) continue; // If both configs are local the constraint must hold if they are in the same exercise diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/CMakeLists.txt index f2094d600..90adf71f9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CMakeLists.txt @@ -25,7 +25,7 @@ ADD_SUBDIRECTORY(MarkerManagement) ADD_SUBDIRECTORY(Messaging) ADD_SUBDIRECTORY(MeteoDataManagement) ADD_SUBDIRECTORY(NotificationManagement) -#ADD_SUBDIRECTORY(NmeaManagement) +ADD_SUBDIRECTORY(NmeaManagement) ADD_SUBDIRECTORY(OcBaseDownload) ADD_SUBDIRECTORY(OcSituationClient) ADD_SUBDIRECTORY(OcSituationServer) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp index fd39f0826..1b6efdb40 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests.cpp @@ -944,7 +944,7 @@ void CesTests::onSendCesHitRequest(const rti::core::SampleIdentity &cookie, void CesTests::checkParticipantEvent() { - ProjectDataManagement::PdmEventType expectedType = ProjectDataManagement::PdmEventType::Unknown; + ProjectDataManagement::PdmEventType expectedType = ProjectDataManagement::PdmEventType::EventType_Unknown; switch (m_testId) { case 8: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp index d6733d6c7..412ea3660 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_booby_trap.cpp @@ -303,7 +303,7 @@ void CesTestsBoobyTrap::onEventChanged(const CentralEffectSimulation::Participan if (modType == DataModification::eRemoved || modType == DataModification::eModified) return; - if (eventData.eventTypeId == ProjectDataManagement::PdmEventType::HitMine) + if (eventData.eventTypeId == ProjectDataManagement::PdmEventType::EventType_HitMine) { m_countEventBoobyTrap ++; DEBUG_LOG(m_logger) << "m_countEventBoobyTrap=" << m_countEventBoobyTrap diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp index feb380baf..a632697f8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_gas_pipe.cpp @@ -360,7 +360,7 @@ void CesTestsGasPipe::onEventChanged(const CentralEffectSimulation::ParticipantE if (modType == DataModification::eRemoved || modType == DataModification::eModified) return; - if (eventData.eventTypeId == ProjectDataManagement::PdmEventType::HitGasPipe) + if (eventData.eventTypeId == ProjectDataManagement::PdmEventType::EventType_HitGasPipe) { m_countEventGasPipe ++; DEBUG_LOG(m_logger) << "m_countEventGasPipe=" << m_countEventGasPipe; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp index 3840b82c2..1290bf0d5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/ModuleTests/ces_tests_mine_areas.cpp @@ -399,7 +399,7 @@ void CesTestsMineAreas::onEventChanged(const CentralEffectSimulation::Participan if (modType == DataModification::eRemoved || modType == DataModification::eModified) return; - if (eventData.eventTypeId == ProjectDataManagement::PdmEventType::HitGasPipe) + if (eventData.eventTypeId == ProjectDataManagement::PdmEventType::EventType_HitGasPipe) { m_countEventMineAreas ++; DEBUG_LOG(m_logger) << "m_countEventMineAreas=" << m_countEventMineAreas; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp index 89af757b5..2b83b8828 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ArtillerySound/handler_artillerie_sound.cpp @@ -66,16 +66,16 @@ void HandlerArtillerieSound::onExplosionSingleChanged(const AreaEffectSimulation return; } - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved) { DEBUG_LOG(m_logger) << "Remove SingleExplosion"; m_explosionSingleState.remove(data.id()); return; } // Only handle transitions from prepared or fired to activated - if ((m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsPrepared || - m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsFired) && - data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated) + if ((m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsPrepared || + m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsFired) && + data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated) { DEBUG_LOG(m_logger) << "Handle SingleExplosion"; handleExplosion = true; @@ -197,13 +197,13 @@ void HandlerArtillerieSound::onTechnicalAreaChanged(const AreaEffectSimulation:: return; } - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved) { DEBUG_LOG(m_logger) << "Remove TechnicalArea"; m_technicalAreas.remove(data.id()); return; } - if (data.type() == AreaEffectSimulation::AesTechnicalAreaType_def::TatSoundZone) + if (data.type() == AreaEffectSimulation::AesTechnicalAreaType::TatSoundZone) { int zone = -1; m_technicalAreas.insert(data.id(), data); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp index 8636a22c8..b1fc109ce 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Basic/handler_participant_borderline.cpp @@ -77,24 +77,24 @@ void HandlerParticipantBorderline::onBorderlineChanged(const AreaEffectSimulatio const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId(); switch (effectState.underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsReceived: - case AreaEffectSimulation::AesEffectState_def::EsFired: - case AreaEffectSimulation::AesEffectState_def::EsCreated: - case AreaEffectSimulation::AesEffectState_def::EsPrepared: - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsReceived: + case AreaEffectSimulation::AesEffectState::EsFired: + case AreaEffectSimulation::AesEffectState::EsCreated: + case AreaEffectSimulation::AesEffectState::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsActivated: { BorderlineUtm borderline(data); DEBUG_LOG(m_logger) << "m_borderlines.insert id=" << data.id(); m_borderlines.insert(data.id(), borderline); break; } - case AreaEffectSimulation::AesEffectState_def::EsRemoved: - case AreaEffectSimulation::AesEffectState_def::EsExpired: - case AreaEffectSimulation::AesEffectState_def::EsPaused: + case AreaEffectSimulation::AesEffectState::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsExpired: + case AreaEffectSimulation::AesEffectState::EsPaused: m_borderlines.remove(data.id()); break; - case AreaEffectSimulation::AesEffectState_def::EsUnknown: - case AreaEffectSimulation::AesEffectState_def::EsError: + case AreaEffectSimulation::AesEffectState::EsUnknown: + case AreaEffectSimulation::AesEffectState::EsError: break; } break; @@ -142,9 +142,9 @@ void HandlerParticipantBorderline::onParticipantPositionChanged(const CentralEff if (result) { if (borderline.operatorId <= 0) - sendParticipantEvent(borderline, partPos, ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline); + sendParticipantEvent(borderline, partPos, ProjectDataManagement::PdmEventType::EventType_CrossGlobalBorderline); else - sendParticipantEvent(borderline, partPos, ProjectDataManagement::PdmEventType_def::CrossLocalBorderline); + sendParticipantEvent(borderline, partPos, ProjectDataManagement::PdmEventType::EventType_CrossLocalBorderline); } } } // end of onParticipantPositionChanged() @@ -163,10 +163,10 @@ void HandlerParticipantBorderline::sendParticipantEvent(const BorderlineUtm &bor { ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId()); - if (typeClass == ParticipantManagement::TypeClass_def::Unit || - typeClass == ParticipantManagement::TypeClass_def::SupportUnit || - typeClass == ParticipantManagement::TypeClass_def::SupportEntity || - typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::Unit || + typeClass == ParticipantManagement::TypeClass::SupportUnit || + typeClass == ParticipantManagement::TypeClass::SupportEntity || + typeClass == ParticipantManagement::TypeClass::Unknown) return; int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp index 1c4c68603..ce7666f9e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_aes_data.cpp @@ -117,7 +117,7 @@ void HandlerAesData::onBoobyTrapChanged(const AreaEffectSimulation::BoobyTrap &d return; } AreaEffectSimulation::AesItemView itemView; - AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType_def::AtBoobyTrap; + AreaEffectSimulation::AesType aesType = AreaEffectSimulation::AesType::AtBoobyTrap; m_ddsHandler->dtcAes()->aesItemViewFromEntityId(data.id(), aesType, itemView); checkBuildingsHit(itemView); @@ -139,18 +139,18 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId(); if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired) { - INFO_LOG(m_logger) << "AesEffectState_def::EsExpired" + INFO_LOG(m_logger) << "AesEffectState::EsExpired" << " currentPartitionTime=" << m_ddsHandler->currentPartitionTime() << " effectStart=" << data.effectStart() << " diff = " << m_ddsHandler->currentPartitionTime() - data.effectStart() ; if (m_ddsHandler->currentPartitionTime() == 0) return; - if ((data.aesTypeId() == AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary) - || (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary)) + if ((data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMineSecondary) + || (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary)) { - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMineSecondary) { DEBUG_LOG(m_logger) << "AtOffRouteMineSecondary id=" << data.id() / 1000; auto offRouteMine = m_ddsHandler->dtcAes()->offRouteMine((int)(data.id() / 1000)); @@ -176,7 +176,7 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie return; } } - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary) { DEBUG_LOG(m_logger) << "AtBoobyTrapSecondary id=" << data.id() / 1000; //auto offRouteMine = m_ddsHandler->dtcAes()->offRouteMine((int) (data.id() / 1000)); @@ -214,7 +214,7 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie void HandlerAesData::removeStates(const AreaEffectSimulation::AesItemView &data) { - if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtExplosionArea) + if (data.aesTypeId() != AreaEffectSimulation::AesType::AtExplosionArea) return; DEBUG_LOG(m_logger) << "Remove aesItemId=" << data.aesItemId(); // remove State for each building @@ -349,16 +349,16 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos return; } - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved) { DEBUG_LOG(m_logger) << "Remove SingleExplosion"; m_explosionSingleState.remove(data.id()); return; } // Only handle transitions from prepared or fired to activated - if ((m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsPrepared || - m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsFired) && - data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated) + if ((m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsPrepared || + m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsFired) && + data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated) { DEBUG_LOG(m_logger) << "Handle SingleExplosion"; handleExplosion = true; @@ -399,7 +399,7 @@ void HandlerAesData::onEffectsChanged(const AreaEffectSimulation::Effects &effec if (modType == DataModification::eRemoved) return; - if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions) + if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions) return; DEBUG_LOG(m_logger) << " Got typechecked effects " << effects; @@ -548,14 +548,14 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac // check for correct AES type artillery only - static QVector s_relevantTypes = + static QVector s_relevantTypes = { - AreaEffectSimulation::AesType_def::AtExplosionArea, - AreaEffectSimulation::AesType_def::AtExplosionSingle, - AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions, + AreaEffectSimulation::AesType::AtExplosionArea, + AreaEffectSimulation::AesType::AtExplosionSingle, + AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions, }; - if (data.aesTypeId().underlying() == AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions) + if (data.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions) { bIsExplosionCluster = true; ignFuncBase = igniterFunctionBaseExplosionCluster(aesItemId); // assume that fuseType does not differ within a single ExplosionArea @@ -691,7 +691,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effects, const CentralEffectSimulation::HandlerBuildingData::Footprint &footprint) { - if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions) + if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions) return; const int aesItemId = effects.aesItemId(); @@ -715,7 +715,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec ++indexBitFieldIdx; // just SesTriggered are relevant: - if (singleEffect.singleEffectState() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered) + if (singleEffect.singleEffectState() != AreaEffectSimulation::AesSingleEffectState::SesTriggered) continue; // already processed? @@ -768,9 +768,9 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec properties += mseIdAsStr; - const AreaEffectSimulation::AesZPlacement_def::type zPlacement = singleEffect.zPlacement().underlying(); + const AreaEffectSimulation::AesZPlacement zPlacement = static_cast(singleEffect.zPlacement()); - if (zPlacement == AreaEffectSimulation::AesZPlacement_def::ZpDraped) + if (zPlacement == AreaEffectSimulation::AesZPlacement::ZpDraped) { // z-Value is 0 -> old: Buildings::SendCesHitOnBuildingRequest requestBld( @@ -793,7 +793,7 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::Effects &effec bitfieldState.insert(indexBitFieldIdx); } - else if (zPlacement == AreaEffectSimulation::AesZPlacement_def::ZpAbsolute) + else if (zPlacement == AreaEffectSimulation::AesZPlacement::ZpAbsolute) { // since HandlerBuildingModel::handleDetonationLocationRequest has already // calculated to ignFuncBase, the impactPosition is the detonationLocation: @@ -879,12 +879,12 @@ void HandlerAesData::checkBuildingsHit(const AreaEffectSimulation::AesItemView & tmpBldg.buildingId(buildingId); Core::GeoPosition impactPosition; - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary) { impactPosition.lat(m_ddsHandler->dtcAes()->boobyTrap(data.aesItemId()).impactPosition().lat()); impactPosition.lon(m_ddsHandler->dtcAes()->boobyTrap(data.aesItemId()).impactPosition().lon()); } - else if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary) + else if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMineSecondary) { int zone = -1; LtsCoordTrans::UtmCoordinate bottomLeft = LtsCoordTrans::UtmCoordinate::fromGeographic(data.boundingBoxBottomLeft().lon(), data.boundingBoxBottomLeft().lat(), zone); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp index c70135519..bccb626e1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_model.cpp @@ -151,7 +151,7 @@ void HandlerBuildingModel::onMainStructureElementChanged(const InfrastructureMan } // skip "Outdoor Cameras / Announcement Units" - if (data.structureElementTypeId() != InfrastructureManagement::StructureElementType_def::Building) + if (data.structureElementTypeId() != InfrastructureManagement::StructureElementType::Building) return; // Vor allem in der GUEZ-DB sind ca 23 Gebäude per Hand eingefügt. (Sakralbau, Bahnhof, Wasserwerk etc.) @@ -583,12 +583,12 @@ CentralEffectSimulation::DetonationLocationReply HandlerBuildingModel::handleDet { DEBUG_LOG(m_logger) << "RESULT: integrate free area..."; - // free area and FuseType_def::IfbDelay: + // free area and FuseType::IfbDelay: // We can´t move the detonation point _below_ the surface. // That would be identical to a neagative 'startHat' // In other words: lineOfSightElevation would deliver LineOfSight::LOS_ERROR // so: - if (detonationDistance > 0) // detonationDistance > 0 === FuseType_def::IfbDelay + if (detonationDistance > 0) // detonationDistance > 0 === FuseType::IfbDelay detonationDistance = 0; } } // if (bHasBuildingIntersection) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp index 26f9aba31..258a52180 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_building_ownership.cpp @@ -114,7 +114,7 @@ void HandlerBuildingOwnership::onParticipantPositionChanged(const CentralEffectS return; int floorId = m_handlerBuildingData->getFloorIdFromRoomId(partPos.roomId()); - if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) m_participantFloor.remove(participantId); else m_participantFloor.insert(participantId, floorId); @@ -214,7 +214,7 @@ int HandlerBuildingOwnership::calculateOwnershipByFloorId(const int floorId) if (floorId == iteratorFloor) { const CentralEffectSimulation::HandlerParticipant::CesParticipantData &localPartPos = m_handlerParticipant->position(iteratorParticipant); - if (localPartPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) + if (localPartPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) continue; // Don't count participants with catastrophic Kill const int partyId = localPartPos.partyId(); ++partyCount[partyId]; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp index b2c5f7731..fd8544b37 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Buildings/handler_contamination.cpp @@ -106,12 +106,12 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI << " data.aesTypeId()" << data.aesTypeId(); switch (data.effectStateId().underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: { double chargeHeight; // Alle Stockwerke beruecksichtigen double chargeDepression; // Alle Kellerraeume beruecksichtigen - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtNContamination) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtNContamination) { chargeHeight = 500.0; // Alle Stockwerke beruecksichtigen chargeDepression = -1000.0; // Alle Kellerraeume beruecksichtigen @@ -126,8 +126,8 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI << " chargeDepression=" << chargeDepression; } - if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtBCContamination - && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtNContamination) + if (data.aesTypeId() != AreaEffectSimulation::AesType::AtBCContamination + && data.aesTypeId() != AreaEffectSimulation::AesType::AtNContamination) { DEBUG_LOG(m_logger) << "return1: AesItemView: " << data.effectStateId(); return; @@ -135,8 +135,8 @@ void HandlerContamination::onAesItemViewChanged(const AreaEffectSimulation::AesI // Gebaeude die von einem sesshaften Kampfstoff betroffen sind, müssen als kontaminiert gelten. const ProjectDataManagement::VolatilityType volatilityType = m_ddsHandler->volatilityTypeId(data.chargeStruct()); - if (volatilityType != ProjectDataManagement::VolatilityType_def::Resident - && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtNContamination) + if (volatilityType != ProjectDataManagement::VolatilityType::Resident + && data.aesTypeId() != AreaEffectSimulation::AesType::AtNContamination) { DEBUG_LOG(m_logger) << "return2: AesItemView: " << data.effectStateId(); return; @@ -177,16 +177,16 @@ void HandlerContamination::calculateBuilding(int buildingId, QVector effectedRooms; QVector effectedFloors; - if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtBCContamination - && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtNContamination) + if (data.aesTypeId() != AreaEffectSimulation::AesType::AtBCContamination + && data.aesTypeId() != AreaEffectSimulation::AesType::AtNContamination) { DEBUG_LOG(m_logger) << "return: NO BC-Contamination AesItemView: " << data.effectStateId(); return; } const ProjectDataManagement::VolatilityType volatilityType = m_ddsHandler->volatilityTypeId(data.chargeStruct()); - if ( volatilityType != ProjectDataManagement::VolatilityType_def::Resident - && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtNContamination) + if ( volatilityType != ProjectDataManagement::VolatilityType::Resident + && data.aesTypeId() != AreaEffectSimulation::AesType::AtNContamination) return; DEBUG_LOG(m_logger) << "buildingId=" << buildingId; @@ -197,22 +197,22 @@ void HandlerContamination::calculateBuilding(int buildingId, if (!effectedRooms.empty()) { DEBUG_LOG(m_logger) << "effectedRooms.size=" << effectedRooms.size(); - ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::CombatReady; + ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady; // [GUEZE-2752] N-Contamination: Only Contamionation inside Range1 - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtNContamination + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtNContamination && !isInsideRange1(buildingId, data.aesItemId())) { DEBUG_LOG(m_logger) << "!isInsideRange1 buildingId=" << buildingId; return; } - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBCContamination + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBCContamination && !isInsideBCContamination(buildingId, data.aesItemId())) { DEBUG_LOG(m_logger) << "AtBCContamination !isInsideRange buildingId=" << buildingId << "return"; return; } - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtNContamination + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtNContamination && isInsideInnerCircle(buildingId, data.aesItemId())) { constexpr int TIME_2_SECONDS = 2000; @@ -220,7 +220,7 @@ void HandlerContamination::calculateBuilding(int buildingId, if ( m_ddsHandler->dtcCore()->partitionTime().timeStamp() < (data.effectStart() + TIME_2_SECONDS)) { DEBUG_LOG(m_logger) << "VulnerabilityState=CatastrophicKill"; - vulnerabilityState = ProjectDataManagement::VulnerabilityState::CatastrophicKill; + vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill; } } DEBUG_LOG(m_logger) << "setBuildingContaminationStateRequest buildingId=" << buildingId @@ -266,7 +266,7 @@ void HandlerContamination::onBuildingStateChanged(const Buildings::BuildingState double chargeHeight = 0.0; double chargeDepression = 0.0; - if (aesItemView.aesTypeId() == AreaEffectSimulation::AesType_def::AtNContamination) + if (aesItemView.aesTypeId() == AreaEffectSimulation::AesType::AtNContamination) { chargeHeight = 500.0; // Alle Stockwerke beruecksichtigen chargeDepression = -1000.0; // Alle Kellerraeume beruecksichtigen diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp index 42242a11e..29c15a3fb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_aes_data.cpp @@ -118,28 +118,28 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId(); switch (data.effectStateId().underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsUnknown: - case AreaEffectSimulation::AesEffectState_def::EsError: - case AreaEffectSimulation::AesEffectState_def::EsExpired: - case AreaEffectSimulation::AesEffectState_def::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsUnknown: + case AreaEffectSimulation::AesEffectState::EsError: + case AreaEffectSimulation::AesEffectState::EsExpired: + case AreaEffectSimulation::AesEffectState::EsRemoved: removeStates(data); m_aesItemViews.remove(data.aesItemId()); break; - case AreaEffectSimulation::AesEffectState_def::EsPrepared: - case AreaEffectSimulation::AesEffectState_def::EsPaused: - case AreaEffectSimulation::AesEffectState_def::EsActivated: - case AreaEffectSimulation::AesEffectState_def::EsFired: + case AreaEffectSimulation::AesEffectState::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsPaused: + case AreaEffectSimulation::AesEffectState::EsActivated: + case AreaEffectSimulation::AesEffectState::EsFired: m_aesItemViews.insert(data.aesItemId(), data); break; - case AreaEffectSimulation::AesEffectState_def::EsCreated: - case AreaEffectSimulation::AesEffectState_def::EsReceived: + case AreaEffectSimulation::AesEffectState::EsCreated: + case AreaEffectSimulation::AesEffectState::EsReceived: break; } } void HandlerAesData::removeStates(const AreaEffectSimulation::AesItemView &data) { - if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtExplosionArea) + if (data.aesTypeId() != AreaEffectSimulation::AesType::AtExplosionArea) return; DEBUG_LOG(m_logger) << "Remove aesItemId=" << data.aesItemId(); // remove State for each building @@ -157,15 +157,15 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos return; } - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved) { DEBUG_LOG(m_logger) << "Remove SingleExplosion"; m_explosionSingleState.remove(data.id()); return; } // Only handle transitions from prepared to activated - if (m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsPrepared - && data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated) + if (m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsPrepared + && data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated) { DEBUG_LOG(m_logger) << "Handle SingleExplosion"; handleExplosion = true; @@ -382,9 +382,9 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac // check for correct AES type artillery only switch (data.aesTypeId().underlying()) { - case AreaEffectSimulation::AesType_def::AtExplosionArea: - case AreaEffectSimulation::AesType_def::AtExplosionSingle: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: DEBUG_LOG(m_logger) << "Calculate"; break; default: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp index 17e8253e0..e7a57c6f7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Ces2D/handler_participant_area.cpp @@ -225,25 +225,25 @@ void HandlerParticipantArea::onSendCesHitReply(const Core::FunctionReplyObject & void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType) { // not needed, handled through HandlerParticipantGasPipe - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtGasPipe) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtGasPipe) return; - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtUnknown) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtUnknown) return; - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrap) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrap) return; - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtOffRouteMine) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMine) return; - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMineSecondary) return; - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtMineArea) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtMineArea) return; - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtMineCorridor) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtMineCorridor) return; if (m_ddsHandler->isSmartChargeType(data.chargeTypeId())) @@ -264,7 +264,7 @@ void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::Ae return; } - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtMineAreaSingleMines) { // build Polygon Mines: auto &formMines = m_aesItemViews[data.aesItemId()].formMines; @@ -281,26 +281,26 @@ void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::Ae DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius; switch (effectState.underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsPrepared: { m_aesItemViews.insert(data.aesItemId(), CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId()], impactRadius)); break; } - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: { const auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId()], impactRadius)); switch (data.aesTypeId().underlying()) { - case AreaEffectSimulation::AesType_def::AtExplosionArea: - case AreaEffectSimulation::AesType_def::AtExplosionSingle: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: - case AreaEffectSimulation::AesType_def::AtMineArea: - case AreaEffectSimulation::AesType_def::AtAirSupportImpact: + case AreaEffectSimulation::AesType::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtMineArea: + case AreaEffectSimulation::AesType::AtAirSupportImpact: m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm); break; - case AreaEffectSimulation::AesType_def::AtBCContamination: - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtBCContamination: + case AreaEffectSimulation::AesType::AtNContamination: // for each participant: // Bounding-Box Check, // form-Check @@ -308,31 +308,31 @@ void HandlerParticipantArea::onAesItemViewChanged(const AreaEffectSimulation::Ae calculateBcContamination(aesItemViewUtm); m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm); break; - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtDangerArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtDangerArea: calculateFunctionArea(aesItemViewUtm); m_aesItemViews.insert(data.aesItemId(), aesItemViewUtm); break; - case AreaEffectSimulation::AesType_def::AtUnknown: - case AreaEffectSimulation::AesType_def::AtMineCorridor: - case AreaEffectSimulation::AesType_def::AtBorderline: - case AreaEffectSimulation::AesType_def::AtReconArea: - case AreaEffectSimulation::AesType_def::AtTechnicalArea: - case AreaEffectSimulation::AesType_def::AtDusSingleMine: - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtGasPipe: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentral: - case AreaEffectSimulation::AesType_def::AtExplosionSingleCentralTrajectory: - case AreaEffectSimulation::AesType_def::AtBoobyTrap: - case AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary: - case AreaEffectSimulation::AesType_def::AtOffRouteMine: - case AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary: + case AreaEffectSimulation::AesType::AtUnknown: + case AreaEffectSimulation::AesType::AtMineCorridor: + case AreaEffectSimulation::AesType::AtBorderline: + case AreaEffectSimulation::AesType::AtReconArea: + case AreaEffectSimulation::AesType::AtTechnicalArea: + case AreaEffectSimulation::AesType::AtDusSingleMine: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtGasPipe: + case AreaEffectSimulation::AesType::AtExplosionSingleCentral: + case AreaEffectSimulation::AesType::AtExplosionSingleCentralTrajectory: + case AreaEffectSimulation::AesType::AtBoobyTrap: + case AreaEffectSimulation::AesType::AtBoobyTrapSecondary: + case AreaEffectSimulation::AesType::AtOffRouteMine: + case AreaEffectSimulation::AesType::AtOffRouteMineSecondary: break; } // switch aesTypeId break; } // case EsActivated - case AreaEffectSimulation::AesEffectState_def::EsRemoved: - case AreaEffectSimulation::AesEffectState_def::EsExpired: + case AreaEffectSimulation::AesEffectState::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsExpired: { aesItemViewRemoved(aesItemId); break; @@ -354,14 +354,14 @@ void HandlerParticipantArea::onDusSingleMineChanged(const AreaEffectSimulation:: case DataModification::eModified: switch (data.effectStateId().underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: { //DEBUG_LOG(m_logger) << "Got onDusSingleMineChanged data.id()=" << data.id(); CentralEffectSimulation::AesItemViewUtm itemView; itemView.aesItemId = data.id(); itemView.chargeTypeId = data.chargeTypeId(); itemView.partyId = data.partyId.is_set() ? data.partyId.get() : -1; - itemView.aesTypeId = AreaEffectSimulation::AesType_def::AtDusSingleMine; + itemView.aesTypeId = AreaEffectSimulation::AesType::AtDusSingleMine; itemView.effectStart = QDateTime::currentDateTimeUtc().toMSecsSinceEpoch(); itemView.formMines.push_back(CentralEffectSimulation::geographic2Utm(data.position(), &itemView.zone)); itemView.dusMineId = data.mineId(); @@ -372,9 +372,9 @@ void HandlerParticipantArea::onDusSingleMineChanged(const AreaEffectSimulation:: m_triggeredImpacts[itemView.aesItemId] = ti; break; } - case AreaEffectSimulation::AesEffectState_def::EsPrepared: - case AreaEffectSimulation::AesEffectState_def::EsExpired: - case AreaEffectSimulation::AesEffectState_def::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsExpired: + case AreaEffectSimulation::AesEffectState::EsRemoved: m_aesItemViews.remove(data.id()); break; default: @@ -395,14 +395,14 @@ void HandlerParticipantArea::onBCContaminationChanged(const AreaEffectSimulation case DataModification::eModified: switch (data.effectStateId().underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsReceived: - case AreaEffectSimulation::AesEffectState_def::EsCreated: - case AreaEffectSimulation::AesEffectState_def::EsPrepared: - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsReceived: + case AreaEffectSimulation::AesEffectState::EsCreated: + case AreaEffectSimulation::AesEffectState::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsActivated: { CentralEffectSimulation::AesItemViewUtm &ref = m_aesItemViews[data.id()]; const auto dtcPdm = m_ddsHandler->dtcPdm(); - if (dtcPdm->volatilityTypeId(data.chargeTypeId()) == ProjectDataManagement::VolatilityType_def::Resident) + if (dtcPdm->volatilityTypeId(data.chargeTypeId()) == ProjectDataManagement::VolatilityType::Resident) { ref.radials = {data.impactRadius()}; ref.center = CentralEffectSimulation::geographic2Utm(data.impactPosition(), &ref.zone); @@ -427,10 +427,10 @@ void HandlerParticipantArea::onNContaminationChanged(const AreaEffectSimulation: case DataModification::eModified: switch (data.effectStateId().underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsReceived: - case AreaEffectSimulation::AesEffectState_def::EsCreated: - case AreaEffectSimulation::AesEffectState_def::EsPrepared: - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsReceived: + case AreaEffectSimulation::AesEffectState::EsCreated: + case AreaEffectSimulation::AesEffectState::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsActivated: { CentralEffectSimulation::AesItemViewUtm &ref = m_aesItemViews[data.id()]; ref.radials = {data.impactRadius(), @@ -481,13 +481,13 @@ void HandlerParticipantArea::deleteFunctionalArea(const int aesItemId) if (m_handlerParticipant->isOutdated(participantPos)) continue; // Same as leave FunctionArea - if (itemView.aesTypeId == AreaEffectSimulation::AesType_def::AtFunctionalArea) + if (itemView.aesTypeId == AreaEffectSimulation::AesType::AtFunctionalArea) { - sendParticipantEvent(itemView, participantPos, ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea); + sendParticipantEvent(itemView, participantPos, ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea); sendEffectTypeEvent(itemView, participantPos, EffectType::FunctionalAreaLeave, -1, -1); } else - sendParticipantEvent(itemView, participantPos, ProjectDataManagement::PdmEventType_def::LeaveDangerArea); + sendParticipantEvent(itemView, participantPos, ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea); DEBUG_LOG(m_logger) << "Participant inside id=" << participantPos.participantId(); } // for all Participants } // deleteFunctionalArea @@ -503,7 +503,7 @@ void HandlerParticipantArea::calculateAesParticipant(const CentralEffectSimulati DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId; switch (itemView.aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineArea: if (inFormCheck(itemView, participantPos)) // Check, if Participant is in a circle of mine inMineRadiusCheck(itemView, participantPos); @@ -511,15 +511,15 @@ void HandlerParticipantArea::calculateAesParticipant(const CentralEffectSimulati // no longer in mine area - reset all EffectiveMineRangeEnter mineIndexes m_effectTypeBitFieldIndexes[itemView.aesItemId][participantPos.participantId()].clear(); break; - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: break; - case AreaEffectSimulation::AesType_def::AtDusSingleMine: + case AreaEffectSimulation::AesType::AtDusSingleMine: inMineRadiusCheck(itemView, participantPos); break; - case AreaEffectSimulation::AesType_def::AtBCContamination: - case AreaEffectSimulation::AesType_def::AtNContamination: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtDangerArea: + case AreaEffectSimulation::AesType::AtBCContamination: + case AreaEffectSimulation::AesType::AtNContamination: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtDangerArea: inFormCheck(itemView, participantPos); break; default: @@ -552,7 +552,7 @@ bool HandlerParticipantArea::inMineRadiusCheck(const CentralEffectSimulation::Ae continue; } - const int mineIdx = (itemView.aesTypeId == AreaEffectSimulation::AesType_def::AtDusSingleMine) + const int mineIdx = (itemView.aesTypeId == AreaEffectSimulation::AesType::AtDusSingleMine) ? itemView.dusMineId : bitFieldIdx + 1; // mineIdx in minefield starts at 1 // Check, if participant is inside danger-radius of the mine @@ -576,7 +576,7 @@ bool HandlerParticipantArea::inMineRadiusCheck(const CentralEffectSimulation::Ae bool HandlerParticipantArea::inBoundingBoxCheck(const CentralEffectSimulation::AesItemViewUtm &itemView, const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition) { - if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (itemView.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated) return false; if (m_handlerParticipant->isOutdated(participantPosition)) // Participant Position is not valid Todo Magic Number @@ -603,7 +603,7 @@ bool HandlerParticipantArea::inBoundingBoxCheck(const CentralEffectSimulation::A bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &itemView, const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPosition) { - if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (itemView.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated) return false; if (m_handlerParticipant->isOutdated(participantPosition)) // Participant Position is not valid @@ -626,23 +626,23 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV << ", aesItemId: " << itemView.aesItemId; switch (itemView.aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: sendEffectTypeEvent(itemView, participantPosition, effectTypeForBCContaminationArea(itemView, participantPosUtmPoint), -1, -1); break; - case AreaEffectSimulation::AesType_def::AtDangerArea: - sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::EnterDangerArea); + case AreaEffectSimulation::AesType::AtDangerArea: + sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType::EventType_EnterDangerArea); break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionArea: break; - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::EnterFunctionalArea); + case AreaEffectSimulation::AesType::AtFunctionalArea: + sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea); sendEffectTypeEvent(itemView, participantPosition, EffectType::FunctionalAreaEnter, -1, -1); break; - case AreaEffectSimulation::AesType_def::AtMineArea: - sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::EnterMineArea); + case AreaEffectSimulation::AesType::AtMineArea: + sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType::EventType_EnterMineArea); break; - case AreaEffectSimulation::AesType_def::AtNContamination: - sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::EnterNuclear); + case AreaEffectSimulation::AesType::AtNContamination: + sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType::EventType_EnterNuclear); sendEffectTypeEvent(itemView, participantPosition, effectTypeForNContaminationArea(itemView, participantPosUtmPoint, participantPosition.sampleTime()), -1, -1); break; default: @@ -655,23 +655,23 @@ bool HandlerParticipantArea::inFormCheck(const CentralEffectSimulation::AesItemV // outside switch (itemView.aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: sendEffectTypeEvent(itemView, participantPosition, EffectType::BCContaminationLeave, -1, -1); break; - case AreaEffectSimulation::AesType_def::AtDangerArea: - sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::LeaveDangerArea); + case AreaEffectSimulation::AesType::AtDangerArea: + sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea); break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionArea: break; - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea); + case AreaEffectSimulation::AesType::AtFunctionalArea: + sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea); sendEffectTypeEvent(itemView, participantPosition, EffectType::FunctionalAreaLeave, -1, -1); break; - case AreaEffectSimulation::AesType_def::AtMineArea: - sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::LeaveMineArea); + case AreaEffectSimulation::AesType::AtMineArea: + sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType::EventType_LeaveMineArea); break; - case AreaEffectSimulation::AesType_def::AtNContamination: - sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType_def::LeaveNuclear); + case AreaEffectSimulation::AesType::AtNContamination: + sendParticipantEvent(itemView, participantPosition, ProjectDataManagement::PdmEventType::EventType_LeaveNuclear); sendEffectTypeEvent(itemView, participantPosition, EffectType::NContaminationLeave, -1, -1); break; default: @@ -699,14 +699,14 @@ void HandlerParticipantArea::onTriggeredImpactsChanged(const AreaEffectSimulatio DEBUG_LOG(m_logger) << "Got TriggeredImpacts: " << data; switch (data.aesTypeId().underlying()) { - case AreaEffectSimulation::AesType_def::AtExplosionArea: - case AreaEffectSimulation::AesType_def::AtExplosionSingle: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: // explosion at the position of participant calculateImpacts(data); break; - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtMineArea: // participant run on mine // => store Mine-State and take into account when a participant runs to one of this mines m_triggeredImpacts.insert(data.aesItemId(), data); @@ -746,16 +746,16 @@ void HandlerParticipantArea::onExplosionSingleChanged(const AreaEffectSimulation modType != DataModification::eModified) return; - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved) { DEBUG_LOG(m_logger) << "Remove SingleExplosion"; m_explosionSingleStates.remove(data.id()); return; } // Only handle transitions from prepared or fired to activated - if ((m_explosionSingleStates.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsPrepared || - m_explosionSingleStates.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsFired) && - data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated) + if ((m_explosionSingleStates.value(data.id()) == AreaEffectSimulation::AesEffectState::EsPrepared || + m_explosionSingleStates.value(data.id()) == AreaEffectSimulation::AesEffectState::EsFired) && + data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated) { DEBUG_LOG(m_logger) << "Handle SingleExplosion"; handleExplosion = true; @@ -806,16 +806,16 @@ void HandlerParticipantArea::onExplosionSingleCentralChanged(const AreaEffectSim if (modType != DataModification::eAdded && modType != DataModification::eModified) return; - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) // EsExpired? EsError? EsUnknown? + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved) // EsExpired? EsError? EsUnknown? { DEBUG_LOG(m_logger) << "Remove ExplosionSingleCentral with aesId = " << data.id(); m_explosionSingleCentralStates.remove(data.id()); return; } // if - if ((m_explosionSingleCentralStates.value(data.id()) != AreaEffectSimulation::AesEffectState_def::EsPrepared && - m_explosionSingleCentralStates.value(data.id()) != AreaEffectSimulation::AesEffectState_def::EsFired) || - data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated) + if ((m_explosionSingleCentralStates.value(data.id()) != AreaEffectSimulation::AesEffectState::EsPrepared && + m_explosionSingleCentralStates.value(data.id()) != AreaEffectSimulation::AesEffectState::EsFired) || + data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated) { m_explosionSingleCentralStates.insert(data.id(), data.effectStateId()); return; @@ -915,7 +915,7 @@ void HandlerParticipantArea::calculateImpacts(const AreaEffectSimulation::Trigge const auto participantPositions = m_handlerParticipant->positions(); for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : participantPositions) { - if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) continue; if (pPos.insideBuilding()) continue; @@ -991,7 +991,7 @@ void HandlerParticipantArea::sendCesHitRequest(const CentralEffectSimulation::Ae return; } if (participantPosition.participantId() != 0 && - participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) { DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)"; return; @@ -1000,7 +1000,7 @@ void HandlerParticipantArea::sendCesHitRequest(const CentralEffectSimulation::Ae int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId, 0); const TrainingAreaBase::TabPosition pos(participantPosition.pos(), - Core::PositionReportingSource_def::Gps, // irrelevant + Core::PositionReportingSource::Gps, // irrelevant participantPosition.buildingId(), participantPosition.roomId()); const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(originatorParticipantId); @@ -1058,7 +1058,7 @@ void HandlerParticipantArea::sendCesHitRequest(const AreaEffectSimulation::AesIt } // if if (participantPosition.participantId() != 0 && - participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) { DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)"; return; @@ -1067,7 +1067,7 @@ void HandlerParticipantArea::sendCesHitRequest(const AreaEffectSimulation::AesIt int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId(), 0); const int originatorEquipmentNumber = m_ddsHandler->participantId2EquipNo(originatorParticipantId); const TrainingAreaBase::TabPosition pos( - participantPosition.pos(), Core::PositionReportingSource_def::Gps, participantPosition.buildingId(), + participantPosition.pos(), Core::PositionReportingSource::Gps, participantPosition.buildingId(), participantPosition.roomId() ); TrainingAreaBase::SendCesHitRequest requestTab( @@ -1092,12 +1092,12 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation: bool calculateAes = false; ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId()); // can happen since the positions are collected for all participants (no check if it is a SupportEntity or similar) - if (typeClass == ParticipantManagement::TypeClass_def::Unit || - typeClass == ParticipantManagement::TypeClass_def::SupportUnit || - typeClass == ParticipantManagement::TypeClass_def::SupportEntity || - typeClass == ParticipantManagement::TypeClass_def::Aircraft || - typeClass == ParticipantManagement::TypeClass_def::Vessel || - typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::Unit || + typeClass == ParticipantManagement::TypeClass::SupportUnit || + typeClass == ParticipantManagement::TypeClass::SupportEntity || + typeClass == ParticipantManagement::TypeClass::Aircraft || + typeClass == ParticipantManagement::TypeClass::Vessel || + typeClass == ParticipantManagement::TypeClass::Unknown) { DEBUG_LOG(m_logger) << "Participant with id " << participantPosition.participantId() << " has invalid typeClass: " << typeClass @@ -1131,12 +1131,12 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation: } // send hit events only with central AES Simulation if (calculateAes - && (eventType == ProjectDataManagement::PdmEventType_def::HitB - || eventType == ProjectDataManagement::PdmEventType_def::HitC - || eventType == ProjectDataManagement::PdmEventType_def::Hit - || eventType == ProjectDataManagement::PdmEventType_def::HitEffectSimulation - || eventType == ProjectDataManagement::PdmEventType_def::HitMine - || eventType == ProjectDataManagement::PdmEventType_def::HitN)) + && (eventType == ProjectDataManagement::PdmEventType::EventType_HitB + || eventType == ProjectDataManagement::PdmEventType::EventType_HitC + || eventType == ProjectDataManagement::PdmEventType::EventType_Hit + || eventType == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation + || eventType == ProjectDataManagement::PdmEventType::EventType_HitMine + || eventType == ProjectDataManagement::PdmEventType::EventType_HitN)) { DEBUG_LOG(m_logger) << "send hit events only with central AES Simulation participant=" << participantPosition.participantId(); return; @@ -1169,14 +1169,14 @@ void HandlerParticipantArea::sendParticipantEvent(const CentralEffectSimulation: // Criterion for friendly Fire: if (itemView.partyId != -1 - && ((eventType == ProjectDataManagement::PdmEventType_def::EnterMineArea - || eventType == ProjectDataManagement::PdmEventType_def::EnterNuclear - || eventType == ProjectDataManagement::PdmEventType_def::HitB - || eventType == ProjectDataManagement::PdmEventType_def::HitC - || eventType == ProjectDataManagement::PdmEventType_def::Hit - || eventType == ProjectDataManagement::PdmEventType_def::HitEffectSimulation - || eventType == ProjectDataManagement::PdmEventType_def::HitMine - || eventType == ProjectDataManagement::PdmEventType_def::HitN) + && ((eventType == ProjectDataManagement::PdmEventType::EventType_EnterMineArea + || eventType == ProjectDataManagement::PdmEventType::EventType_EnterNuclear + || eventType == ProjectDataManagement::PdmEventType::EventType_HitB + || eventType == ProjectDataManagement::PdmEventType::EventType_HitC + || eventType == ProjectDataManagement::PdmEventType::EventType_Hit + || eventType == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation + || eventType == ProjectDataManagement::PdmEventType::EventType_HitMine + || eventType == ProjectDataManagement::PdmEventType::EventType_HitN) && itemView.partyId == participantPosition.partyId())) pe.friendlyFire(true); else @@ -1268,29 +1268,29 @@ bool HandlerParticipantArea::eventMustBeSend(int aesItemId, // - remove opposite events (e.g remove Enter event when we leave the area) switch (eventType.underlying()) { - case ProjectDataManagement::PdmEventType_def::EnterDangerArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveDangerArea); + case ProjectDataManagement::PdmEventType::EventType_EnterDangerArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea); break; - case ProjectDataManagement::PdmEventType_def::LeaveDangerArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterDangerArea); + case ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterDangerArea); break; - case ProjectDataManagement::PdmEventType_def::EnterMineArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveMineArea); + case ProjectDataManagement::PdmEventType::EventType_EnterMineArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveMineArea); break; - case ProjectDataManagement::PdmEventType_def::LeaveMineArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterMineArea); + case ProjectDataManagement::PdmEventType::EventType_LeaveMineArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterMineArea); break; - case ProjectDataManagement::PdmEventType_def::EnterFunctionalArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea); + case ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea); break; - case ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterFunctionalArea); + case ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea); break; - case ProjectDataManagement::PdmEventType_def::EnterNuclear: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveNuclear); + case ProjectDataManagement::PdmEventType::EventType_EnterNuclear: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveNuclear); break; - case ProjectDataManagement::PdmEventType_def::LeaveNuclear: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterNuclear); + case ProjectDataManagement::PdmEventType::EventType_LeaveNuclear: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterNuclear); break; default: break; @@ -1424,29 +1424,29 @@ ProjectDataManagement::PdmEventType HandlerParticipantArea::leaveEventTypeForAes { switch (aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtDangerArea: - return ProjectDataManagement::PdmEventType::LeaveDangerArea; - case AreaEffectSimulation::AesType_def::AtMineArea: - return ProjectDataManagement::PdmEventType::LeaveMineArea; - case AreaEffectSimulation::AesType_def::AtNContamination: - return ProjectDataManagement::PdmEventType::LeaveNuclear; - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - return ProjectDataManagement::PdmEventType::LeaveFunctionalArea; + case AreaEffectSimulation::AesType::AtDangerArea: + return ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea; + case AreaEffectSimulation::AesType::AtMineArea: + return ProjectDataManagement::PdmEventType::EventType_LeaveMineArea; + case AreaEffectSimulation::AesType::AtNContamination: + return ProjectDataManagement::PdmEventType::EventType_LeaveNuclear; + case AreaEffectSimulation::AesType::AtFunctionalArea: + return ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea; default: break; } - return ProjectDataManagement::PdmEventType::Unknown; + return ProjectDataManagement::PdmEventType::EventType_Unknown; } EffectType HandlerParticipantArea::leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId) { switch (aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: return EffectType::BCContaminationLeave; - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtNContamination: return EffectType::NContaminationLeave; - case AreaEffectSimulation::AesType_def::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: return EffectType::FunctionalAreaLeave; default: break; @@ -1511,7 +1511,7 @@ void HandlerParticipantArea::aesItemViewRemoved(int aesItemId) } } const auto eventTypeLeave = leaveEventTypeForAesType(aiv.aesTypeId); - if (eventTypeLeave != ProjectDataManagement::PdmEventType::Unknown) + if (eventTypeLeave != ProjectDataManagement::PdmEventType::EventType_Unknown) { DEBUG_LOG(m_logger) << "aesItemViewRemoved, leaveEventType: " << eventTypeLeave; auto it = m_eventStates.find(aesItemId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp index 32f8ec299..a2f9125c8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_explosions.cpp @@ -112,10 +112,10 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem // NASAT, MIDAS, AirSupport // Der explizite HandlerAirSupport wird gestrichen. // Der HandlerExplosions übernimmt die Aufgaben mit, da quasi identisch!! - // if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeTypeId()) == ProjectDataManagement::GearClass_def::AirSupport) + // if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeTypeId()) == ProjectDataManagement::GearClass::AirSupport) // return; - static const QVector validAesTypes = {AesType_def::AtEffectCluster, AesType_def::AtExplosionAreaSingleExplosions, AesType_def::AtExplosionSingle, AesType_def::AtExplosionCluster}; + static const QVector validAesTypes = {AesType::AtEffectCluster, AesType::AtExplosionAreaSingleExplosions, AesType::AtExplosionSingle, AesType::AtExplosionCluster}; if (!validAesTypes.contains(data.aesTypeId())) return; @@ -137,7 +137,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem switch (aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionSingle: { const AreaEffectSimulation::ExplosionSingle &explosionSingle = m_ddsHandler->dtcAes()->explosionSingle(aesItemId); isCentral = explosionSingle.isCentral(); @@ -206,17 +206,17 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem switch (data.effectStateId().underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsUnknown: - case AreaEffectSimulation::AesEffectState_def::EsError: - case AreaEffectSimulation::AesEffectState_def::EsExpired: - case AreaEffectSimulation::AesEffectState_def::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsUnknown: + case AreaEffectSimulation::AesEffectState::EsError: + case AreaEffectSimulation::AesEffectState::EsExpired: + case AreaEffectSimulation::AesEffectState::EsRemoved: { DEBUG_LOG(m_logger) << " remove aesItemId=" << data.aesItemId(); // do some cleanup: m_handledImpactsStorage.removeAesItem(aesItemId); Q_FALLTHROUGH(); } - case AreaEffectSimulation::AesEffectState_def::EsPaused: + case AreaEffectSimulation::AesEffectState::EsPaused: { // Man kann den m_enteredHazardDistanceStore nutzen. // Und allen darin für dieses area/aesItemView gespeicherten participants @@ -245,7 +245,7 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem // cleanup: - if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsPaused) + if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsPaused) { DEBUG_LOG(m_logger) << "Expired, remove aesItemId=" << aesItemId << ", m_aesItemViewsUtm.remove(" << aesItemId << ")"; @@ -257,9 +257,9 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem } break; } - case AreaEffectSimulation::AesEffectState_def::EsPrepared: - case AreaEffectSimulation::AesEffectState_def::EsFired: - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsFired: + case AreaEffectSimulation::AesEffectState::EsActivated: { DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId() << " aesItemId=" << aesItemId @@ -274,9 +274,9 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem // a) Aiv changes to EsActivated or // b) Effects ? // So be prepared and calculate hazardDistanceForm already at EsPrepared - if (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster || aesTypeId == AreaEffectSimulation::AesType_def::AtEffectCluster) + if (aesTypeId == AreaEffectSimulation::AesType::AtExplosionCluster || aesTypeId == AreaEffectSimulation::AesType::AtEffectCluster) { - // useHazardDistance = (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionCluster); + // useHazardDistance = (aesTypeId == AreaEffectSimulation::AesType::AtExplosionCluster); const double hazardDistance = m_ddsHandler->dtcPdm()->hazardDistance(data.chargeStruct().chargeTypeId(), data.chargeStruct().igniterTypeId(), @@ -288,8 +288,8 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem aesItemViewUtm.hazardDistanceForm = ExpandPolygon::bufferUtmPolygon(aesItemViewUtm.form, aesItemViewUtm.zone, hazardDistance); } - if ((aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions) || - (aesTypeId == AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions)) + if ((aesTypeId == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions) || + (aesTypeId == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions)) m_aesItemViewsImpactsUtm.insert(aesItemId, aesItemViewUtm); else { @@ -318,8 +318,8 @@ void HandlerExplosions::onAesItemViewChanged(const AreaEffectSimulation::AesItem } // if (aesItemViewUtm.effectStart == AreaEffectSimulation::AesEffectState::EsActivated) break; } - case AreaEffectSimulation::AesEffectState_def::EsCreated: - case AreaEffectSimulation::AesEffectState_def::EsReceived: + case AreaEffectSimulation::AesEffectState::EsCreated: + case AreaEffectSimulation::AesEffectState::EsReceived: break; } // switch } // END onAesItemViewChanged @@ -334,10 +334,10 @@ void HandlerExplosions::onTriggeredImpactsChanged(const AreaEffectSimulation::Tr << " bitfield().size=" << data.bitfield().size(); switch (data.aesTypeId().underlying()) { - case AreaEffectSimulation::AesType_def::AtExplosionArea: - case AreaEffectSimulation::AesType_def::AtExplosionSingle: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: - case AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions: // explosion at the position of participant calculateImpacts(data); break; @@ -363,7 +363,7 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number continue; DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId(); - if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) continue; DEBUG_LOG(m_logger) << "pPos.vulnerabilityState=" << pPos.vulnerabilityState; if (pPos.insideBuilding()) @@ -392,7 +392,7 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect requestTab.chargeTypeId(data.chargeTypeId()); //default requestTab.aesId(0); - requestTab.eventType(ProjectDataManagement::EventType_def::FireEvent); + requestTab.eventType(ProjectDataManagement::EventType::FireEvent); // if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::Participant) { @@ -414,7 +414,7 @@ void HandlerExplosions::calculateImpact(const AreaEffectSimulation::ChargeEffect else if (data.originatorTypeId() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation) { requestTab.aesId(data.originatorId()); - requestTab.eventType(ProjectDataManagement::EventType_def::ExplosionCluster); + requestTab.eventType(ProjectDataManagement::EventType::ExplosionCluster); } requestTab.remainEffectPercent(remainEffectPercent); requestTab.position(tabPosition); @@ -514,7 +514,7 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp DEBUG_LOG(m_logger) << "onExplosionSingleChanged 1"; - if (data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (data.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated) return; DEBUG_LOG(m_logger) << "onExplosionSingleChanged" @@ -560,7 +560,7 @@ void HandlerExplosions::onExplosionSingleChanged(const AreaEffectSimulation::Exp if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number continue; DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId(); - if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) continue; DEBUG_LOG(m_logger) << "pPos.vulnerabilityState=" << pPos.vulnerabilityState; if (pPos.insideBuilding()) @@ -592,7 +592,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef Q_UNUSED(modType); // Until now (04/2024) AreaEffectSimulation::Effects is used at ExplosionCluster only: - if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions) + if (effects.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions) return; // older then 10sec? ignore @@ -649,7 +649,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef for (const AreaEffectSimulation::SingleEffect &se : qAsConst(singleEffectsRef)) { ++curSeIndex; - if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState_def::SesTriggered) + if (se.singleEffectState() != AreaEffectSimulation::AesSingleEffectState::SesTriggered) continue; // compare current triggered idx with triggered idx of the past @@ -672,7 +672,7 @@ void HandlerExplosions::onEffectsChanged(const AreaEffectSimulation::Effects &ef const auto &participantPositions = m_handlerParticipant->positions(); for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &pPos : qAsConst(participantPositions)) { - if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) continue; if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number continue; @@ -739,7 +739,7 @@ int HandlerExplosions::checkPartEnterLeaveArea(AES_ITEM_VIEW_UTM_CONST_ITER curr const CentralEffectSimulation::AesItemViewUtm &curAivUtmArea = *currentAreaIt; // check aiv: - if (curAivUtmArea.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (curAivUtmArea.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated) continue; if (!curAivUtmArea.hasHazardDistance()) continue; @@ -873,9 +873,9 @@ bool HandlerExplosions::inBoundingBoxCheck(const CentralEffectSimulation::AesIte DEBUG_LOG(m_logger) << "inBoundingBoxCheck 1" << ", aesItemId=" << itemViewUtm.aesItemId << ", effectStateId=" << itemViewUtm.effectStateId; - if ((itemViewUtm.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) && - (itemViewUtm.effectStateId != AreaEffectSimulation::AesEffectState_def::EsPrepared) && - (itemViewUtm.effectStateId != AreaEffectSimulation::AesEffectState_def::EsFired)) + if ((itemViewUtm.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated) && + (itemViewUtm.effectStateId != AreaEffectSimulation::AesEffectState::EsPrepared) && + (itemViewUtm.effectStateId != AreaEffectSimulation::AesEffectState::EsFired)) return false; DEBUG_LOG(m_logger) << "inBoundingBoxCheck 2"; @@ -961,12 +961,12 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId, << " typeClass=" << typeClass; // Only send, if Any Participant is in Smart-Range (save Tetra load) - if (!bHumanFound && typeClass == ParticipantManagement::TypeClass_def::Human) + if (!bHumanFound && typeClass == ParticipantManagement::TypeClass::Human) bHumanFound = inCircle(impactPos, impactRadius, participantPosUtmPoint); - if (typeClass != ParticipantManagement::TypeClass_def::GroundVehicle && - typeClass != ParticipantManagement::TypeClass_def::VehicleWithGear && - typeClass != ParticipantManagement::TypeClass_def::WeaponSystem) + if (typeClass != ParticipantManagement::TypeClass::GroundVehicle && + typeClass != ParticipantManagement::TypeClass::VehicleWithGear && + typeClass != ParticipantManagement::TypeClass::WeaponSystem) continue; DEBUG_LOG(m_logger) << "participantPosition.timestamp =" << participantPosition.sampleTime() @@ -1007,10 +1007,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId, { DEBUG_LOG(m_logger) << "size=1"; // send two single fire to the same vehicle - sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime , 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent - sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime + 1000, 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent - sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation); - sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation); + sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime , 100, ProjectDataManagement::EventType::HitEffectSimulation); // 100 Percent + sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, impactTime + 1000, 100, ProjectDataManagement::EventType::HitEffectSimulation); // 100 Percent + sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType::HitEffectSimulation); + sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.first().participantPosition, ProjectDataManagement::EventType::HitEffectSimulation); } else { @@ -1024,10 +1024,10 @@ void HandlerExplosions::calculateSmartExplosion(const int32_t aesItemId, }; std::sort(vehiclesInSmartExplosion.begin(), vehiclesInSmartExplosion.end(), mapSortLessThan); - sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, impactTime, 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent - sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, impactTime, 100, ProjectDataManagement::EventType_def::HitEffectSimulation); // 100 Percent - sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation); - sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation); + sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, impactTime, 100, ProjectDataManagement::EventType::HitEffectSimulation); // 100 Percent + sendCesHitRequest( itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, impactTime, 100, ProjectDataManagement::EventType::HitEffectSimulation); // 100 Percent + sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(0).participantPosition, ProjectDataManagement::EventType::HitEffectSimulation); + sendParticipantEvent(itemViewUtm, vehiclesInSmartExplosion.at(1).participantPosition, ProjectDataManagement::EventType::HitEffectSimulation); } } // calculateSmartExplosion @@ -1050,8 +1050,8 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm //CentralEffectSimulation::AesItemViewUtm aesItemViewUtm = m_aesItemViewsImpactsUtm.value(static_cast(data.aesItemId())); CentralEffectSimulation::AesItemViewUtm aesItemViewUtm; - if ((data.aesTypeId().underlying() == AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions) - || (data.aesTypeId().underlying() == AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions)) + if ((data.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions) + || (data.aesTypeId().underlying() == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions)) aesItemViewUtm = m_aesItemViewsImpactsUtm.value(static_cast(data.aesItemId())); else aesItemViewUtm = m_aesItemViewsUtm.value(static_cast(data.aesItemId())); @@ -1095,7 +1095,7 @@ void HandlerExplosions::calculateImpacts(const AreaEffectSimulation::TriggeredIm if (m_handlerParticipant->isOutdated(pPos)) // Participant Position is not valid Todo Magic Number continue; DEBUG_LOG(m_logger) << "pPos.participantId=" << pPos.participantId(); - if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) continue; DEBUG_LOG(m_logger) << "pPos.vulnerabilityState=" << pPos.vulnerabilityState; if (pPos.insideBuilding()) @@ -1158,7 +1158,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae // get radius of munition const ProjectDataManagement::GearClass &gearClass = m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(itemView.chargeStruct.chargeTypeId()); - const bool bIsAirSupport = (gearClass.underlying() == ProjectDataManagement::GearClass_def::AirSupport); + const bool bIsAirSupport = (gearClass.underlying() == ProjectDataManagement::GearClass::AirSupport); const QVector &rangesInMeter = chargeRanges(itemView.chargeStruct); DEBUG_LOG(m_logger) << "calculateImpactsEffect" << " chargeRanges:" @@ -1197,7 +1197,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae // // 1 range -> typical explosionCluster // == impactRadius - // 3 ranges -> typical explosionCluster with chargeTypeId of GearClass_def::AirSupport + // 3 ranges -> typical explosionCluster with chargeTypeId of GearClass::AirSupport // == lethalRadius, nonLethalRadius, hazardDistance // @@ -1218,7 +1218,7 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae effect = 3; // hazardDistance DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect; sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(), - effect, ProjectDataManagement::EventType_def::EnterHazardDistance); + effect, ProjectDataManagement::EventType::EnterHazardDistance); } break; case RANGE::NON_LETHAL: @@ -1243,14 +1243,14 @@ void HandlerExplosions::calculateImpactsEffect(const CentralEffectSimulation::Ae { DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << ", effect=" << effect; sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(), - effect, ProjectDataManagement::EventType_def::AirSupport); // AirSupport for both: LETHAL_RADIUS, NONLETHAL_RADIUS + effect, ProjectDataManagement::EventType::AirSupport); // AirSupport for both: LETHAL_RADIUS, NONLETHAL_RADIUS } #ifdef GUEZE_3136_IMPLEMENTED else { DEBUG_LOG(m_logger) << "Sende CES Hit Request: participantId=" << participantId << ", RANGE=" << toString(mostInnerRange) << " (Verdeckung -> EnterHazardDistance)"; sendCesHitRequest(itemView, participantPosition, QDateTime::currentMSecsSinceEpoch(), - effect, ProjectDataManagement::EventType_def::EnterHazardDistance); + effect, ProjectDataManagement::EventType::EnterHazardDistance); } #endif // GUEZE_3136_IMPLEMENTED } // case @@ -1410,7 +1410,7 @@ QVector HandlerExplosions::chargeRanges(const AreaEffectSimulation::Char const ProjectDataManagement::GearClass &gearClass = m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(chargeStruct.chargeTypeId()); DEBUG_LOG(m_logger) << "chargeTypeId = " << chargeStruct.chargeTypeId() << ", gearClass = " << gearClass; - if (gearClass.underlying() == ProjectDataManagement::GearClass_def::AirSupport) + if (gearClass.underlying() == ProjectDataManagement::GearClass::AirSupport) { const double lethalRadius = m_ddsHandler->getLethalRadius(chargeStruct); const double nonLethalRadius = m_ddsHandler->getNonLethalRadius(chargeStruct); @@ -1523,7 +1523,7 @@ void HandlerExplosions::sendEffectTypeEvent(const CentralEffectSimulation::AesIt //effectTime >= 0 ? effectTime : participantPosition.sampleTime(), QDateTime::currentMSecsSinceEpoch(), ctasEffectType, - ProjectDataManagement::EventType_def::HitEffectSimulation); + ProjectDataManagement::EventType::HitEffectSimulation); } // Send via TAB-Proxy to battlefield @@ -1565,7 +1565,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem return; } if (participantPosition.participantId() != 0 && - participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) { DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)"; return; @@ -1579,7 +1579,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem #endif // ORIGINATOR_AT_SENDCESHITREQUEST const TrainingAreaBase::TabPosition pos(participantPosition.pos(), - Core::PositionReportingSource_def::Gps, // irrelevant + Core::PositionReportingSource::Gps, // irrelevant participantPosition.buildingId(), participantPosition.roomId()); @@ -1618,7 +1618,7 @@ void HandlerExplosions::sendCesHitRequest(const CentralEffectSimulation::AesItem DEBUG_LOG(m_logger) << "ftcTab->SendCesHitRequest: " << requestTab; m_ddsHandler->ftcTab()->sendCesHitRequest(requestTab, this); if (!m_ddsHandler->isSmartChargeType(itemView.chargeStruct)) - sendParticipantEvent(m_aesItemViewsUtm.value(itemView.aesItemId), participantPosition, ProjectDataManagement::EventType_def::HitEffectSimulation); + sendParticipantEvent(m_aesItemViewsUtm.value(itemView.aesItemId), participantPosition, ProjectDataManagement::EventType::HitEffectSimulation); } double HandlerExplosions::getSquareDistance(const QPointF ¢erUtm, const QPointF &pointUtm) @@ -1645,13 +1645,13 @@ void HandlerExplosions::sendEnterHazardDistance(const int participantId, const i m_enteredHazardDistanceStore.participantEnteringArea(participantId, aesItemId); - ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType_def::EnterHazardDistance; + ProjectDataManagement::EventType eventType = ProjectDataManagement::EventType::EnterHazardDistance; sendCesHitRequest(m_aesItemViewsUtm.value(aesItemId), cesParticipantData, QDateTime::currentMSecsSinceEpoch(), ctasEffectType, eventType); - sendParticipantEvent(m_aesItemViewsUtm.value(aesItemId), cesParticipantData, ProjectDataManagement::EventType_def::EnterHazardDistance); + sendParticipantEvent(m_aesItemViewsUtm.value(aesItemId), cesParticipantData, ProjectDataManagement::EventType::EnterHazardDistance); } void HandlerExplosions::sendLeaveHazardDistance(const int participantId, const int aesItemId, const int remaining) @@ -1671,8 +1671,8 @@ void HandlerExplosions::sendLeaveHazardDistance(const int participantId, const i cesParticipantData, QDateTime::currentMSecsSinceEpoch(), ctasEffectType, - ProjectDataManagement::EventType_def::LeaveHazardDistance); - sendParticipantEvent(itemView, cesParticipantData, ProjectDataManagement::EventType_def::LeaveHazardDistance); + ProjectDataManagement::EventType::LeaveHazardDistance); + sendParticipantEvent(itemView, cesParticipantData, ProjectDataManagement::EventType::LeaveHazardDistance); } void HandlerExplosions::sendParticipantEvent(const CentralEffectSimulation::AesItemViewUtm &item, @@ -1682,10 +1682,10 @@ void HandlerExplosions::sendParticipantEvent(const CentralEffectSimulation::AesI DEBUG_LOG(m_logger) << "sendParticipantEvent participantId=" << participantPosition.participantId(); ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId()); - if (typeClass == ParticipantManagement::TypeClass_def::Unit || - typeClass == ParticipantManagement::TypeClass_def::SupportUnit || - typeClass == ParticipantManagement::TypeClass_def::SupportEntity || - typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::Unit || + typeClass == ParticipantManagement::TypeClass::SupportUnit || + typeClass == ParticipantManagement::TypeClass::SupportEntity || + typeClass == ParticipantManagement::TypeClass::Unknown) return; DEBUG_LOG(m_logger) << " sendParticipantEvent participantId=" << participantPosition.participantId(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp index be9d62f7f..7adc27311 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Explosions/handler_vulcano.cpp @@ -90,8 +90,8 @@ void HandlerVulcano::onExplosionClusterChanged(const AreaEffectSimulation::Explo { // order checks by effort: if ((modType == DataModification::eRemoved) - || (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired) - || (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated)) + || (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired) + || (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)) return; if (!data.effectStart.is_set()) @@ -101,7 +101,7 @@ void HandlerVulcano::onExplosionClusterChanged(const AreaEffectSimulation::Explo } // Kriterium fuer NASAT/MIDAS - if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass_def::AirSupport) + if (m_ddsHandler->dtcPdm()->gearClassFromChargeTypeId(data.chargeStruct().chargeTypeId()) == ProjectDataManagement::GearClass::AirSupport) return; if (!m_ddsHandler->isLaserGuidable(data.chargeStruct())) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp index bc1804e58..4ebf36c67 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.cpp @@ -166,7 +166,7 @@ void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::Ae { const int aesItemId = data.aesItemId(); const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId(); - if (data.aesTypeId().underlying() != AreaEffectSimulation::AesType_def::AtFunctionalArea) + if (data.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtFunctionalArea) return; const AreaEffectSimulation::FunctionalArea &fa = m_ddsHandler->dtcAes()->functionalArea(data.aesItemId()); @@ -192,12 +192,12 @@ void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::Ae switch (effectState.underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsPrepared: break; - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: { bool isSupplyTruck = false; - if (fa.supplyMode() == AreaEffectSimulation::AesOperatingMode_def::OmWaitingTime) + if (fa.supplyMode() == AreaEffectSimulation::AesOperatingMode::OmWaitingTime) { DEBUG_LOG(m_logger) << "isSupplyTruck = true"; isSupplyTruck = true; @@ -231,8 +231,8 @@ void HandlerFunctionalAreas::onAesItemViewChanged(const AreaEffectSimulation::Ae << ", type: " << data.aesTypeId(); break; } // case EsActivated - case AreaEffectSimulation::AesEffectState_def::EsRemoved: - case AreaEffectSimulation::AesEffectState_def::EsExpired: + case AreaEffectSimulation::AesEffectState::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsExpired: { aesItemViewRemoved(aesItemId); m_aesPolygonEncloseBuilding.remove(aesItemId); @@ -307,7 +307,7 @@ void HandlerFunctionalAreas::onNewParticipantPosition(const CentralEffectSimulat DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId; switch (itemView.aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: { /////////////////// /// \brief [GUEZE-2256] 3D Wirksim - Funktionsraum Nicht Kampffähig @@ -350,7 +350,7 @@ void HandlerFunctionalAreas::onNewIndoorParticipantPosition(const CentralEffectS DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId; switch (itemView.aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: { /////////////////// /// \brief [GUEZE-2256] 3D Wirksim - Funktionsraum Nicht Kampffähig @@ -405,7 +405,7 @@ void HandlerFunctionalAreas::onRestoreRadioReadinessChanged(const int participan bool HandlerFunctionalAreas::inBoundingBoxCheck(const CentralEffectSimulation::AesItemViewUtm &itemView, const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData) { - if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (itemView.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated) return false; // QRectF(topLeft, bottomRight) -> no need to mormalize, QRectF:contains() handles it correct @@ -429,7 +429,7 @@ bool HandlerFunctionalAreas::inBoundingBoxCheck(const CentralEffectSimulation::A bool HandlerFunctionalAreas::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &itemView, const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData) { - if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (itemView.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated) return false; const QRectF boundingBox(itemView.boundingBoxBottomLeft, @@ -476,11 +476,11 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae switch (eventType.underlying()) { - case ProjectDataManagement::PdmEventType_def::EnterFunctionalArea: + case ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea: DEBUG_LOG(m_logger) << "-------------- EnterFunctionalArea itemView =" << itemView.aesItemId; remaining = 1; break; - case ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea: + case ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea: remaining = 0; DEBUG_LOG(m_logger) << "-------------- LeaveFunctionalArea itemView =" << itemView.aesItemId; break; @@ -508,7 +508,7 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae return; } if (participantData.participantId() != 0 && - participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) { DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)"; return; @@ -517,7 +517,7 @@ void HandlerFunctionalAreas::sendCesHitRequest(const CentralEffectSimulation::Ae const AreaEffectSimulation::FunctionalArea &fa = m_ddsHandler->dtcAes()->functionalArea(itemView.aesItemId); const TrainingAreaBase::TabPosition pos(participantData.pos(), - Core::PositionReportingSource_def::Gps, // irrelevant + Core::PositionReportingSource::Gps, // irrelevant participantData.buildingId(), participantData.roomId()); const int medicTime = fa.medicTime() / 600000; //reserve 2 = medical treatment @@ -568,12 +568,12 @@ void HandlerFunctionalAreas::sendParticipantEvent(const CentralEffectSimulation: { ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantData.participantTypeId()); // can happen since the positions are collected for all participants (no check if it is a SupportEntity or similar) - if (typeClass == ParticipantManagement::TypeClass_def::Unit || - typeClass == ParticipantManagement::TypeClass_def::SupportUnit || - typeClass == ParticipantManagement::TypeClass_def::SupportEntity || - typeClass == ParticipantManagement::TypeClass_def::Aircraft || - typeClass == ParticipantManagement::TypeClass_def::Vessel || - typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::Unit || + typeClass == ParticipantManagement::TypeClass::SupportUnit || + typeClass == ParticipantManagement::TypeClass::SupportEntity || + typeClass == ParticipantManagement::TypeClass::Aircraft || + typeClass == ParticipantManagement::TypeClass::Vessel || + typeClass == ParticipantManagement::TypeClass::Unknown) { DEBUG_LOG(m_logger) << "Participant with id " << participantData.participantId() << " has invalid typeClass: " << typeClass @@ -676,7 +676,7 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt if (inForm) { - enterLeaveType.eventType = ProjectDataManagement::PdmEventType_def::EnterFunctionalArea; + enterLeaveType.eventType = ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea; if (itemView.isSupplyTruck) { enterLeaveType.isAlreadySupplied = true; @@ -695,8 +695,8 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt } else { - enterLeaveType.eventType = ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea; - if (itemView.isSupplyTruck && lastEnterLeaveType.eventType == ProjectDataManagement::PdmEventType_def::EnterFunctionalArea) + enterLeaveType.eventType = ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea; + if (itemView.isSupplyTruck && lastEnterLeaveType.eventType == ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea) { DEBUG_LOG(m_logger) << "sendEnterLeave.stopSupplyTimer"; enterLeaveType.isAlreadySupplied = false; @@ -710,8 +710,8 @@ void HandlerFunctionalAreas::sendEnterLeave(const CentralEffectSimulation::AesIt } } - if ((inForm && lastEnterLeaveType.eventType != ProjectDataManagement::PdmEventType_def::EnterFunctionalArea) - || (!inForm && lastEnterLeaveType.eventType == ProjectDataManagement::PdmEventType_def::EnterFunctionalArea)) + if ((inForm && lastEnterLeaveType.eventType != ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea) + || (!inForm && lastEnterLeaveType.eventType == ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea)) { CentralEffectSimulation::HandlerParticipant::CesParticipantData cesParticipantData = m_handlerParticipant.get()->getParticipantPosition(participantId); sendParticipantEvent(itemView, cesParticipantData, enterLeaveType.eventType); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.h index eea78d70b..0ea8a8ae1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/FunctionalAreas/handler_functional_area.h @@ -54,7 +54,7 @@ struct ParticipantDistance struct EnterLeaveType { - ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown; + ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown; bool isAlreadySupplied = false; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp index 381f2c18f..80e959773 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_aes_data.cpp @@ -76,27 +76,27 @@ void HandlerAesData::onAesItemViewChanged(const AreaEffectSimulation::AesItemVie DEBUG_LOG(m_logger) << "Got AesItemView: " << data.effectStateId(); switch (data.effectStateId().underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsUnknown: - case AreaEffectSimulation::AesEffectState_def::EsError: - case AreaEffectSimulation::AesEffectState_def::EsExpired: - case AreaEffectSimulation::AesEffectState_def::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsUnknown: + case AreaEffectSimulation::AesEffectState::EsError: + case AreaEffectSimulation::AesEffectState::EsExpired: + case AreaEffectSimulation::AesEffectState::EsRemoved: removeStates(data); m_aesItemViews.remove(data.aesItemId()); break; - case AreaEffectSimulation::AesEffectState_def::EsPrepared: - case AreaEffectSimulation::AesEffectState_def::EsPaused: - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsPaused: + case AreaEffectSimulation::AesEffectState::EsActivated: m_aesItemViews.insert(data.aesItemId(), data); break; - case AreaEffectSimulation::AesEffectState_def::EsCreated: - case AreaEffectSimulation::AesEffectState_def::EsReceived: + case AreaEffectSimulation::AesEffectState::EsCreated: + case AreaEffectSimulation::AesEffectState::EsReceived: break; } } void HandlerAesData::removeStates(const AreaEffectSimulation::AesItemView &data) { - if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtExplosionArea) + if (data.aesTypeId() != AreaEffectSimulation::AesType::AtExplosionArea) return; DEBUG_LOG(m_logger) << "Remove aesItemId=" << data.aesItemId(); } // end removeStates @@ -111,15 +111,15 @@ void HandlerAesData::onExplosionSingleChanged(const AreaEffectSimulation::Explos return; } - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsRemoved) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved) { DEBUG_LOG(m_logger) << "Remove SingleExplosion"; m_explosionSingleState.remove(data.id()); return; } // Only handle transitions from prepared to activated - if (m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState_def::EsPrepared - && data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated) + if (m_explosionSingleState.value(data.id()) == AreaEffectSimulation::AesEffectState::EsPrepared + && data.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated) { DEBUG_LOG(m_logger) << "Handle SingleExplosion"; handleExplosion = true; @@ -336,9 +336,9 @@ void HandlerAesData::calculateImpacts(const AreaEffectSimulation::TriggeredImpac // check for correct AES type artillery only switch (data.aesTypeId().underlying()) { - case AreaEffectSimulation::AesType_def::AtExplosionArea: - case AreaEffectSimulation::AesType_def::AtExplosionSingle: - case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: + case AreaEffectSimulation::AesType::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionSingle: + case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: DEBUG_LOG(m_logger) << "Calculate"; break; default: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp index 987ab5f99..cf3f7843d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/GasPipes/handler_participant_gas_pipe.cpp @@ -79,7 +79,7 @@ void HandlerParticipantGasPipe::onAesItemViewChanged(const AreaEffectSimulation: { INFO_LOG(m_logger) << "HandlerParticipantGasPipe::onAesItemViewChanged"; // - if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtGasPipe) + if (data.aesTypeId() != AreaEffectSimulation::AesType::AtGasPipe) return; @@ -101,7 +101,7 @@ void HandlerParticipantGasPipe::onAesItemViewChanged(const AreaEffectSimulation: const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId(); switch (effectState.underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: { CentralEffectSimulation::AesItemViewUtm prevData; const double impactRadius = 0; @@ -184,9 +184,9 @@ void HandlerParticipantGasPipe::calculateGasPipeParticipant(const CentralEffectS if (result) { DEBUG_LOG(m_logger) << "sendParticipantEvent"; - sendParticipantEvent(gasPipe, participantPosition, ProjectDataManagement::PdmEventType_def::HitGasPipe); + sendParticipantEvent(gasPipe, participantPosition, ProjectDataManagement::PdmEventType::EventType_HitGasPipe); DEBUG_LOG(m_logger) << "sendParticipantHit"; - sendParticipantHit(gasPipe, participantPosition, ProjectDataManagement::PdmEventType_def::HitGasPipe); + sendParticipantHit(gasPipe, participantPosition, ProjectDataManagement::PdmEventType::EventType_HitGasPipe); } } @@ -217,7 +217,7 @@ void HandlerParticipantGasPipe::onParticipantPositionChanged(const CentralEffect result = insideGasPipeArea(gasPipe.form, partPosGeo); DEBUG_LOG(m_logger) << "result gasPipe Explosion = " << result<< gasPipe.aesItemId; if (result) - sendParticipantEvent(gasPipe, partPos, ProjectDataManagement::PdmEventType_def::HitGasPipe); + sendParticipantEvent(gasPipe, partPos, ProjectDataManagement::PdmEventType::EventType_HitGasPipe); } } // end of onParticipantPositionChanged() //----------------------------------------------------------------------------- @@ -235,10 +235,10 @@ void HandlerParticipantGasPipe::sendParticipantEvent(const CentralEffectSimulati { ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId()); - if (typeClass == ParticipantManagement::TypeClass_def::Unit || - typeClass == ParticipantManagement::TypeClass_def::SupportUnit || - typeClass == ParticipantManagement::TypeClass_def::SupportEntity || - typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::Unit || + typeClass == ParticipantManagement::TypeClass::SupportUnit || + typeClass == ParticipantManagement::TypeClass::SupportEntity || + typeClass == ParticipantManagement::TypeClass::Unknown) return; int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp index b9e20fb5d..4285da414 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.cpp @@ -117,7 +117,7 @@ void HandlerJamming::onParticipantGearEventChanged(const ParticipantManagement:: { DEBUG_LOG(m_logger) << " Send Jamming to TAB and destroy uasId"; //sendCesHitRequest(data.charge().chargeTypeId(), data.participantId(),cesParticipantData); - if (cesParticipantData.vulnerabilityState != ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (cesParticipantData.vulnerabilityState != ProjectDataManagement::VulnerabilityState::CatastrophicKill) jammedUasIds.append(uasId); } else @@ -193,14 +193,14 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId, << " equipNo = " << equipNo << " chargeTypeId =" << chargeTypeId; - if (participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (participantData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) { DEBUG_LOG(m_logger) << "participantPosition.participantId == 0 CatastrophicKill)"; return; } const TrainingAreaBase::TabPosition pos(participantData.pos(), - Core::PositionReportingSource_def::Gps, // irrelevant + Core::PositionReportingSource::Gps, // irrelevant participantData.buildingId(), participantData.roomId()); @@ -216,7 +216,7 @@ void HandlerJamming::sendCesHitRequest(const int chargeTypeId, remaining, // remainEffectPercent ( no protection outside Building ) pos, effectTime, // effectTime - ProjectDataManagement::PdmEventType::Jamming, // EventType + ProjectDataManagement::PdmEventType::EventType_Jamming, // EventType originatorPartyId, // originPartyId mineId ); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.h index da4b6ffbb..994452131 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/Jamming/handler_jamming.h @@ -34,7 +34,7 @@ struct ParticipantDistance struct EnterLeaveType { - ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown; + ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown; bool isAlreadySupplied = false; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp index 5db9759a0..78f3b8399 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MineAreas/handler_mine_areas.cpp @@ -165,9 +165,9 @@ void HandlerMineAreas::onMineTriggeredReply(const Core::FunctionReplyObject &rep // /////////////////////////////////// void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType) { - if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtMineAreaSingleMines - && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtMineArea - && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtMineCorridor) + if (data.aesTypeId() != AreaEffectSimulation::AesType::AtMineAreaSingleMines + && data.aesTypeId() != AreaEffectSimulation::AesType::AtMineArea + && data.aesTypeId() != AreaEffectSimulation::AesType::AtMineCorridor) { DEBUG_LOG(m_logger) << "AesItemView return"; return; @@ -183,7 +183,7 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV return; - if (data.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsExpired) + if (data.effectStateId() == AreaEffectSimulation::AesEffectState::EsExpired) { DEBUG_LOG(m_logger) << "AesItemView expired return id=" << data.aesItemId(); aesItemViewRemoved(data.aesItemId()); @@ -212,7 +212,7 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV return; } - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtMineAreaSingleMines) { if (!m_aesItemViews.contains(aesItemId)) { @@ -237,11 +237,11 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV DEBUG_LOG(m_logger) << "impactRadius=" << impactRadius; switch (effectState.underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsPrepared: + case AreaEffectSimulation::AesEffectState::EsPrepared: { break; } - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: { const auto aesItemViewUtm(CentralEffectSimulation::AesItemViewUtm::create(data, m_aesItemViews[data.aesItemId()], impactRadius)); @@ -255,8 +255,8 @@ void HandlerMineAreas::onAesItemViewChanged(const AreaEffectSimulation::AesItemV } // case EsActivated - case AreaEffectSimulation::AesEffectState_def::EsRemoved: - case AreaEffectSimulation::AesEffectState_def::EsExpired: + case AreaEffectSimulation::AesEffectState::EsRemoved: + case AreaEffectSimulation::AesEffectState::EsExpired: { aesItemViewRemoved(aesItemId); break; @@ -284,12 +284,12 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId()); // can happen since the positions are collected for all participants (no check if it is a SupportEntity or similar) - if (typeClass == ParticipantManagement::TypeClass_def::Unit || - typeClass == ParticipantManagement::TypeClass_def::SupportUnit || - typeClass == ParticipantManagement::TypeClass_def::SupportEntity || - typeClass == ParticipantManagement::TypeClass_def::Aircraft || - typeClass == ParticipantManagement::TypeClass_def::Vessel || - typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::Unit || + typeClass == ParticipantManagement::TypeClass::SupportUnit || + typeClass == ParticipantManagement::TypeClass::SupportEntity || + typeClass == ParticipantManagement::TypeClass::Aircraft || + typeClass == ParticipantManagement::TypeClass::Vessel || + typeClass == ParticipantManagement::TypeClass::Unknown) { DEBUG_LOG(m_logger) << "return New Position Participant with id " << participantPosition.participantId() << " has invalid typeClass: " << typeClass; @@ -305,7 +305,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl return; } - if (participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) { DEBUG_LOG(m_logger) << "New Position CatastrophicKill return"; return; @@ -346,7 +346,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl // DEBUG_LOG(m_logger) << "minePosGeo lat=" << minePosGeo.lat() // << " lon=" << minePosGeo.lon() // << " z=" << minePosGeo.z(); - sendParticipantEvent(m_aesItemViews[aesItemId], minePosition, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantEvent(m_aesItemViews[aesItemId], minePosition, ProjectDataManagement::PdmEventType::EventType_HitMine); m_mineLists[participantPosition.participantId()].remove(index); @@ -379,19 +379,19 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl DEBUG_LOG(m_logger) << " itemView: " << itemView.aesItemId << ", " << itemView.aesTypeId << " remainingTasCode=" << remaining; - if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (itemView.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated) continue; - if (typeClass == ParticipantManagement::TypeClass_def::Human && remaining > 50) + if (typeClass == ParticipantManagement::TypeClass::Human && remaining > 50) { - DEBUG_LOG(m_logger) << "ParticipantManagement::TypeClass_def::Human && remaining > 50 continue"; + DEBUG_LOG(m_logger) << "ParticipantManagement::TypeClass::Human && remaining > 50 continue"; continue; } - if (typeClass == ParticipantManagement::TypeClass_def::Human && m_ddsHandler->isAtMine(itemView.chargeStruct)) + if (typeClass == ParticipantManagement::TypeClass::Human && m_ddsHandler->isAtMine(itemView.chargeStruct)) continue; - if (itemView.aesTypeId.underlying() == AreaEffectSimulation::AesType_def::AtMineArea) + if (itemView.aesTypeId.underlying() == AreaEffectSimulation::AesType::AtMineArea) { // checks whether the participant has been positioned in the minefield or across it. @@ -435,7 +435,7 @@ void HandlerMineAreas::onNewOutdoorPosition(const CentralEffectSimulation::Handl void HandlerMineAreas::onNewParticipantState(const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos) { DEBUG_LOG(m_logger) << "onNewParticipantState "; - if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady) + if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady) { DEBUG_LOG(m_logger) << "m_mineLists.contains(participantPos.participantId():" << m_mineLists.contains(participantPos.participantId()); if (m_mineLists.contains(participantPos.participantId())) @@ -485,7 +485,7 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A } } - const int mineIdx = (itemView.aesTypeId == AreaEffectSimulation::AesType_def::AtDusSingleMine) + const int mineIdx = (itemView.aesTypeId == AreaEffectSimulation::AesType::AtDusSingleMine) ? itemView.dusMineId : bitFieldIdx + 1; // mineIdx in minefield starts at 1 // Check, if participant is inside danger-radius of the mine @@ -542,7 +542,7 @@ bool HandlerMineAreas::intersectMineRadiusCheck(const CentralEffectSimulation::A // DEBUG_LOG(m_logger) << "minePosGeo lat=" << minePosGeo.lat() // << " lon=" << minePosGeo.lon() // << " z=" << minePosGeo.z(); - sendParticipantEvent(itemView, minePosition, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantEvent(itemView, minePosition, ProjectDataManagement::PdmEventType::EventType_HitMine); // aktuell verarbeitete Mine aus der Liste entfernen. m_mineLists[participantPosition.participantId()].remove(mineListItemIndex); } @@ -671,14 +671,14 @@ void HandlerMineAreas::onTriggeredImpactsChanged(const AreaEffectSimulation::Tri DEBUG_LOG(m_logger) << "Got TriggeredImpacts: "; switch (data.aesTypeId().underlying()) { - case AreaEffectSimulation::AesType_def::AtExplosionArea: - case AreaEffectSimulation::AesType_def::AtExplosionSingle: - //case AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions: Plugin Artillery + case AreaEffectSimulation::AesType::AtExplosionArea: + case AreaEffectSimulation::AesType::AtExplosionSingle: + //case AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions: Plugin Artillery // explosion at the position of participant calculateImpacts(data); break; - case AreaEffectSimulation::AesType_def::AtMineAreaSingleMines: - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtMineAreaSingleMines: + case AreaEffectSimulation::AesType::AtMineArea: // participant run on mine // => store Mine-State and take into account when a participant runs to one of this mines m_triggeredImpacts.insert(data.aesItemId(), data); @@ -693,8 +693,8 @@ void HandlerMineAreas::onTriggeredImpactsChanged(const AreaEffectSimulation::Tri void HandlerMineAreas::calculateImpacts(const AreaEffectSimulation::TriggeredImpacts &data) { - if ((data.aesTypeId() == AreaEffectSimulation::AesType_def::AtExplosionAreaSingleExplosions) - || (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtExplosionClusterSingleExplosions)) + if ((data.aesTypeId() == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions) + || (data.aesTypeId() == AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions)) return; @@ -743,7 +743,7 @@ void HandlerMineAreas::calculateImpacts(const AreaEffectSimulation::TriggeredImp << " buildingId=" << pPos.buildingId() << " insideBuilding=" << pPos.insideBuilding() << " positionValid=" << pPos.positionValid; - if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (pPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) continue; if (pPos.insideBuilding()) continue; @@ -801,7 +801,7 @@ void HandlerMineAreas::sendCesHitRequest(const CentralEffectSimulation::AesItemV return; } if (participantPosition.participantId() != 0 && - participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) { DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)"; return; @@ -810,12 +810,12 @@ void HandlerMineAreas::sendCesHitRequest(const CentralEffectSimulation::AesItemV int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId, 0); const TrainingAreaBase::TabPosition pos(participantPosition.pos(), - Core::PositionReportingSource_def::Gps, // irrelevant + Core::PositionReportingSource::Gps, // irrelevant participantPosition.buildingId(), participantPosition.roomId()); const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(originatorParticipantId); - const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown; + const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown; TrainingAreaBase::SendCesHitRequest requestTab( equipNo, // equipmentNumber @@ -866,7 +866,7 @@ void HandlerMineAreas::sendCesHitRequest(const AreaEffectSimulation::AesItemView } // if if (participantPosition.participantId() != 0 && - participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + participantPosition.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) { DEBUG_LOG(m_logger) << "participantPosition.participantId != 0 CatastrophicKill)"; return; @@ -875,10 +875,10 @@ void HandlerMineAreas::sendCesHitRequest(const AreaEffectSimulation::AesItemView int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId(), 0); const int originatorEquipmentNumber = m_ddsHandler->participantId2EquipNo(originatorParticipantId); const TrainingAreaBase::TabPosition pos( - participantPosition.pos(), Core::PositionReportingSource_def::Gps, participantPosition.buildingId(), + participantPosition.pos(), Core::PositionReportingSource::Gps, participantPosition.buildingId(), participantPosition.roomId() ); - const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown; + const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown; TrainingAreaBase::SendCesHitRequest requestTab( equipmentNumber, participantPosition.participantId(), legacyChargeTypeId, itemView.aesItemId(), originatorEquipmentNumber, @@ -903,27 +903,27 @@ void HandlerMineAreas::sendParticipantEventEnterLeave(const CentralEffectSimulat const ProjectDataManagement::PdmEventType &lastEvent = m_eventStates[itemView.aesItemId][participantPosition.participantId()]; - ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::EnterMineArea; + ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_EnterMineArea; if (inFormCheckResult) { - if (lastEvent == ProjectDataManagement::PdmEventType_def::EnterMineArea) + if (lastEvent == ProjectDataManagement::PdmEventType::EventType_EnterMineArea) return; else { - eventType = ProjectDataManagement::PdmEventType_def::EnterMineArea; - m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::PdmEventType_def::EnterMineArea; + eventType = ProjectDataManagement::PdmEventType::EventType_EnterMineArea; + m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::PdmEventType::EventType_EnterMineArea; } } else { - if (lastEvent == ProjectDataManagement::PdmEventType_def::LeaveMineArea) + if (lastEvent == ProjectDataManagement::PdmEventType::EventType_LeaveMineArea) return; else { - eventType = ProjectDataManagement::PdmEventType_def::LeaveMineArea; - m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::PdmEventType_def::LeaveMineArea; + eventType = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea; + m_eventStates[itemView.aesItemId][participantPosition.participantId()] = ProjectDataManagement::PdmEventType::EventType_LeaveMineArea; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp index 59b64fe28..e3a07b0bd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/MissionPlan/ces_mission_plan_handler.cpp @@ -110,7 +110,7 @@ void CesMissionPlanHandler::onUasChanged(const ParticipantManagement::UAS &data, DEBUG_LOG(m_logger)<<" -- onUasChanged : uas.id = "<volatilityTypeId(data.chargeStruct()) == ProjectDataManagement::VolatilityType_def::Resident) + if (m_ddsHandler->volatilityTypeId(data.chargeStruct()) == ProjectDataManagement::VolatilityType::Resident) { ref.radials = {data.impactRadius()}; ref.center = CentralEffectSimulation::geographic2Utm(data.impactPosition(), &ref.zone); @@ -345,7 +345,7 @@ void HandlerNBC::onNContaminationChanged(const AreaEffectSimulation::NContaminat case DataModification::eModified: switch (data.effectStateId().underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: { CentralEffectSimulation::AesItemViewUtm &ref = m_aesItemViews[data.id()]; ref.radials = {data.impactRadius(), @@ -440,7 +440,7 @@ void HandlerNBC::deleteDangerArea(const int aesItemId) const auto partPosMap = m_handlerParticipant->positions(); for (const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantPos : partPosMap) { - sendParticipantEvent(aesItemId, participantPos, ProjectDataManagement::PdmEventType_def::LeaveDangerArea); + sendParticipantEvent(aesItemId, participantPos, ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea); DEBUG_LOG(m_logger) << "Participant inside id=" << participantPos.participantId(); }// for all Participants } // deleteDangerArea @@ -473,7 +473,7 @@ void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation:: bool aesIsAvailable = m_ddsHandler->dtcAes()->aesItemViewFromEntityId(m_isInContaminatedRoom.value(participantData.participantId()),AreaEffectSimulation::AesType::AtUnknown, aesItemView ); if (aesIsAvailable - && (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState_def::EsActivated)) + && (aesItemView.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)) { DEBUG_LOG(m_logger) << "Feld ist nicht mehr da. id=" << aesItemView.aesItemId(); m_isInContaminatedRoom.remove(participantData.participantId()); @@ -512,9 +512,9 @@ void HandlerNBC::onNewOutdoorParticipantPosition(const CentralEffectSimulation:: } switch (itemView.aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: - case AreaEffectSimulation::AesType_def::AtNContamination: - case AreaEffectSimulation::AesType_def::AtDangerArea: + case AreaEffectSimulation::AesType::AtBCContamination: + case AreaEffectSimulation::AesType::AtNContamination: + case AreaEffectSimulation::AesType::AtDangerArea: inFormCheck(itemView, participantData); break; default: @@ -569,7 +569,7 @@ void HandlerNBC::onRestoreRadioReadinessChanged(const int participantId) bool HandlerNBC::inBoundingBoxCheck(const CentralEffectSimulation::AesItemViewUtm &itemView, const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData) { - if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (itemView.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated) return false; // QRectF(topLeft, bottomRight) -> no need to mormalize, QRectF:contains() handles it correct @@ -616,7 +616,7 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation: const QPointF participantPosUtmPoint = CentralEffectSimulation::geographic2Utm(participantData.pos(), zone); switch (aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: { // since buildings can only be contaminated by resident bccontaminations // effectType is EffectType::BCContaminationEnterResident if isIndoor @@ -626,16 +626,16 @@ void HandlerNBC::sendEnterEvent(const int aesItemId, const AreaEffectSimulation: sendEffectTypeEvent(aesItemId, participantData, effectType); break; } - case AreaEffectSimulation::AesType_def::AtDangerArea: - sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::EnterDangerArea); + case AreaEffectSimulation::AesType::AtDangerArea: + sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_EnterDangerArea); break; - case AreaEffectSimulation::AesType_def::AtNContamination: - sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::EnterNuclear); + case AreaEffectSimulation::AesType::AtNContamination: + sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_EnterNuclear); sendEffectTypeEvent(aesItemId, participantData, effectTypeForNContaminationArea(m_aesItemViews.value(aesItemId), participantPosUtmPoint, participantData.sampleTime(), participantData.insideBuilding())); break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: - case AreaEffectSimulation::AesType_def::AtMineArea: + case AreaEffectSimulation::AesType::AtExplosionArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtMineArea: default: INFO_LOG(m_logger) << "sendEvent Unhandled AES-Type" << aesTypeId; break; @@ -646,7 +646,7 @@ void HandlerNBC::sendLeaveEvent(const int aesItemId, const CentralEffectSimulati { AreaEffectSimulation::AesItemView aesItemView; - m_ddsHandler->dtcAes()->aesItemViewFromEntityId(aesItemId, AreaEffectSimulation::AesType_def::AtUnknown, aesItemView); + m_ddsHandler->dtcAes()->aesItemViewFromEntityId(aesItemId, AreaEffectSimulation::AesType::AtUnknown, aesItemView); DEBUG_LOG(m_logger) << "sendLeaveEvent" << " aesId=" << aesItemId @@ -656,21 +656,21 @@ void HandlerNBC::sendLeaveEvent(const int aesItemId, const CentralEffectSimulati switch (aesItemView.aesTypeId().underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: sendEffectTypeEvent(aesItemId, participantData, EffectType::BCContaminationLeave); break; - case AreaEffectSimulation::AesType_def::AtDangerArea: - sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::LeaveDangerArea); + case AreaEffectSimulation::AesType::AtDangerArea: + sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea); break; - case AreaEffectSimulation::AesType_def::AtMineArea: - sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::LeaveMineArea); + case AreaEffectSimulation::AesType::AtMineArea: + sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_LeaveMineArea); break; - case AreaEffectSimulation::AesType_def::AtNContamination: - sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType_def::LeaveNuclear); + case AreaEffectSimulation::AesType::AtNContamination: + sendParticipantEvent(aesItemId, participantData, ProjectDataManagement::PdmEventType::EventType_LeaveNuclear); sendEffectTypeEvent(aesItemId, participantData, EffectType::NContaminationLeave); break; - case AreaEffectSimulation::AesType_def::AtExplosionArea: - case AreaEffectSimulation::AesType_def::AtFunctionalArea: + case AreaEffectSimulation::AesType::AtExplosionArea: + case AreaEffectSimulation::AesType::AtFunctionalArea: default: break; } // end switch @@ -681,7 +681,7 @@ void HandlerNBC::sendLeaveEvent(const int aesItemId, const CentralEffectSimulati bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &itemView, const CentralEffectSimulation::HandlerParticipant::CesParticipantData &participantData) { - if (itemView.effectStateId != AreaEffectSimulation::AesEffectState_def::EsActivated) + if (itemView.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated) return false; const QRectF boundingBoxImpact(itemView.boundingBoxBottomLeft, @@ -715,7 +715,7 @@ bool HandlerNBC::inFormCheck(const CentralEffectSimulation::AesItemViewUtm &item << " roomFound=" << roomFound << " offsetZ=" << structureElement.relPosition().offsetZ(); - if ( (itemView.aesTypeId.underlying() != AreaEffectSimulation::AesType_def::AtNContamination) + if ( (itemView.aesTypeId.underlying() != AreaEffectSimulation::AesType::AtNContamination) && itemView.offsetIsSet && ( ( structureElement.relPosition().offsetZ() + 1.5 > itemView.upperOffset ) || ( structureElement.relPosition().offsetZ() + 1.5 < itemView.lowerOffset))) @@ -779,12 +779,12 @@ void HandlerNBC::sendCesHitRequest(const CentralEffectSimulation::AesItemViewUtm int32_t originatorParticipantId = m_aesItemId2partIdMap.value(itemView.aesItemId, 0); const TrainingAreaBase::TabPosition pos(participantData.pos(), - Core::PositionReportingSource_def::Gps, // irrelevant + Core::PositionReportingSource::Gps, // irrelevant participantData.buildingId(), participantData.roomId()); const int originatorEquipNo = m_ddsHandler->participantId2EquipNo(originatorParticipantId); - const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown; + const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown; TrainingAreaBase::SendCesHitRequest requestTab( equipNo, // equipmentNumber participantData.participantId(), // participantId @@ -878,10 +878,10 @@ void HandlerNBC::sendCesHitRequest(const int aesItemId, int32_t originatorParticipantId = m_aesItemId2partIdMap.value(aesItemId, 0); const int originatorEquipmentNumber = m_ddsHandler->participantId2EquipNo(originatorParticipantId); const TrainingAreaBase::TabPosition pos( - participantData.pos(), Core::PositionReportingSource_def::Gps, participantData.buildingId(), + participantData.pos(), Core::PositionReportingSource::Gps, participantData.buildingId(), participantData.roomId() ); - const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::Unknown; + const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_Unknown; TrainingAreaBase::SendCesHitRequest requestTab( equipmentNumber, participantData.participantId(), legacyChargeTypeId, aesItemId, originatorEquipmentNumber, remaining, pos, effectTime, eventType, partyId, mineFieldBitIndex @@ -903,12 +903,12 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId, { ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantData.participantTypeId()); // can happen since the positions are collected for all participants (no check if it is a SupportEntity or similar) - if (typeClass == ParticipantManagement::TypeClass_def::Unit || - typeClass == ParticipantManagement::TypeClass_def::SupportUnit || - typeClass == ParticipantManagement::TypeClass_def::SupportEntity || - typeClass == ParticipantManagement::TypeClass_def::Aircraft || - typeClass == ParticipantManagement::TypeClass_def::Vessel || - typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::Unit || + typeClass == ParticipantManagement::TypeClass::SupportUnit || + typeClass == ParticipantManagement::TypeClass::SupportEntity || + typeClass == ParticipantManagement::TypeClass::Aircraft || + typeClass == ParticipantManagement::TypeClass::Vessel || + typeClass == ParticipantManagement::TypeClass::Unknown) { DEBUG_LOG(m_logger) << "Participant with id " << participantData.participantId() << " has invalid typeClass: " << typeClass @@ -931,12 +931,12 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId, } // send hit events only with central AES Simulation - if (eventType == ProjectDataManagement::PdmEventType_def::HitB - || eventType == ProjectDataManagement::PdmEventType_def::HitC - || eventType == ProjectDataManagement::PdmEventType_def::Hit - || eventType == ProjectDataManagement::PdmEventType_def::HitEffectSimulation - || eventType == ProjectDataManagement::PdmEventType_def::HitMine - || eventType == ProjectDataManagement::PdmEventType_def::HitN) + if (eventType == ProjectDataManagement::PdmEventType::EventType_HitB + || eventType == ProjectDataManagement::PdmEventType::EventType_HitC + || eventType == ProjectDataManagement::PdmEventType::EventType_Hit + || eventType == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation + || eventType == ProjectDataManagement::PdmEventType::EventType_HitMine + || eventType == ProjectDataManagement::PdmEventType::EventType_HitN) { DEBUG_LOG(m_logger) << "send hit events only with central AES Simulation participant=" << participantData.participantId(); return; @@ -963,17 +963,17 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId, pe.aesItemId(aesItemId); pe.partyId(participantData.partyId()); - if (eventType == ProjectDataManagement::PdmEventType_def::BCContamination) + if (eventType == ProjectDataManagement::PdmEventType::EventType_BCContamination) { const AreaEffectSimulation::BCContamination &bc = m_ddsHandler->dtcAes()->bCContamination(aesItemId); pe.aesName(bc.name()); } - else if (eventType == ProjectDataManagement::PdmEventType_def::DangerArea) + else if (eventType == ProjectDataManagement::PdmEventType::EventType_DangerArea) { const AreaEffectSimulation::DangerArea &da = m_ddsHandler->dtcAes()->dangerArea(aesItemId); pe.aesName(da.name()); } - else if (eventType == ProjectDataManagement::PdmEventType_def::NContamination) + else if (eventType == ProjectDataManagement::PdmEventType::EventType_NContamination) { const AreaEffectSimulation::NContamination &nc = m_ddsHandler->dtcAes()->nContamination(aesItemId); pe.aesName(nc.name()); @@ -988,14 +988,14 @@ void HandlerNBC::sendParticipantEvent(const int aesItemId, // Criterion for friendly Fire: if (aesItem.partyId() != -1 - && ((eventType == ProjectDataManagement::PdmEventType_def::EnterMineArea - || eventType == ProjectDataManagement::PdmEventType_def::EnterNuclear - || eventType == ProjectDataManagement::PdmEventType_def::HitB - || eventType == ProjectDataManagement::PdmEventType_def::HitC - || eventType == ProjectDataManagement::PdmEventType_def::Hit - || eventType == ProjectDataManagement::PdmEventType_def::HitEffectSimulation - || eventType == ProjectDataManagement::PdmEventType_def::HitMine - || eventType == ProjectDataManagement::PdmEventType_def::HitN) + && ((eventType == ProjectDataManagement::PdmEventType::EventType_EnterMineArea + || eventType == ProjectDataManagement::PdmEventType::EventType_EnterNuclear + || eventType == ProjectDataManagement::PdmEventType::EventType_HitB + || eventType == ProjectDataManagement::PdmEventType::EventType_HitC + || eventType == ProjectDataManagement::PdmEventType::EventType_Hit + || eventType == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation + || eventType == ProjectDataManagement::PdmEventType::EventType_HitMine + || eventType == ProjectDataManagement::PdmEventType::EventType_HitN) && aesItem.partyId() == participantData.partyId())) pe.friendlyFire(true); else @@ -1060,26 +1060,26 @@ bool HandlerNBC::eventMustBeSend(int aesItemId, // - remove opposite events (e.g remove Enter event when we leave the area) switch (eventType.underlying()) { - case ProjectDataManagement::PdmEventType_def::EnterDangerArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveDangerArea); + case ProjectDataManagement::PdmEventType::EventType_EnterDangerArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea); break; - case ProjectDataManagement::PdmEventType_def::LeaveDangerArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterDangerArea); + case ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterDangerArea); break; - case ProjectDataManagement::PdmEventType_def::EnterMineArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveMineArea); + case ProjectDataManagement::PdmEventType::EventType_EnterMineArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveMineArea); break; - case ProjectDataManagement::PdmEventType_def::LeaveMineArea: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterMineArea); + case ProjectDataManagement::PdmEventType::EventType_LeaveMineArea: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterMineArea); break; - case ProjectDataManagement::PdmEventType_def::EnterNuclear: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::LeaveNuclear); + case ProjectDataManagement::PdmEventType::EventType_EnterNuclear: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_LeaveNuclear); break; - case ProjectDataManagement::PdmEventType_def::LeaveNuclear: - activeEvents.remove(ProjectDataManagement::PdmEventType_def::EnterNuclear); + case ProjectDataManagement::PdmEventType::EventType_LeaveNuclear: + activeEvents.remove(ProjectDataManagement::PdmEventType::EventType_EnterNuclear); break; - case ProjectDataManagement::PdmEventType_def::EnterFunctionalArea: - case ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea: + case ProjectDataManagement::PdmEventType::EventType_EnterFunctionalArea: + case ProjectDataManagement::PdmEventType::EventType_LeaveFunctionalArea: default: break; } @@ -1200,25 +1200,25 @@ ProjectDataManagement::PdmEventType HandlerNBC::leaveEventTypeForAesType(AreaEff { switch (aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtDangerArea: - return ProjectDataManagement::PdmEventType::LeaveDangerArea; - case AreaEffectSimulation::AesType_def::AtMineArea: - return ProjectDataManagement::PdmEventType::LeaveMineArea; - case AreaEffectSimulation::AesType_def::AtNContamination: - return ProjectDataManagement::PdmEventType::LeaveNuclear; + case AreaEffectSimulation::AesType::AtDangerArea: + return ProjectDataManagement::PdmEventType::EventType_LeaveDangerArea; + case AreaEffectSimulation::AesType::AtMineArea: + return ProjectDataManagement::PdmEventType::EventType_LeaveMineArea; + case AreaEffectSimulation::AesType::AtNContamination: + return ProjectDataManagement::PdmEventType::EventType_LeaveNuclear; default: break; } - return ProjectDataManagement::PdmEventType::Unknown; + return ProjectDataManagement::PdmEventType::EventType_Unknown; } EffectType HandlerNBC::leaveEffectTypeForAesType(AreaEffectSimulation::AesType aesTypeId) { switch (aesTypeId.underlying()) { - case AreaEffectSimulation::AesType_def::AtBCContamination: + case AreaEffectSimulation::AesType::AtBCContamination: return EffectType::BCContaminationLeave; - case AreaEffectSimulation::AesType_def::AtNContamination: + case AreaEffectSimulation::AesType::AtNContamination: return EffectType::NContaminationLeave; default: break; @@ -1329,7 +1329,7 @@ void HandlerNBC::aesItemViewRemoved(int aesItemId) } } const auto eventTypeLeave = leaveEventTypeForAesType(aiv.aesTypeId); - if (eventTypeLeave != ProjectDataManagement::PdmEventType::Unknown) + if (eventTypeLeave != ProjectDataManagement::PdmEventType::EventType_Unknown) { DEBUG_LOG(m_logger) << "aesItemViewRemoved, leaveEventType: " << eventTypeLeave; auto it = m_eventStates.find(aesItemId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_blocked_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_blocked_areas.cpp index 9833a1b60..bef5ba234 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_blocked_areas.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_blocked_areas.cpp @@ -62,7 +62,7 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula TrainingAreaBase::SendParticipantBlockedAreaRequest pba; pba.equipmentNumber(m_ddsHandler->participantId2EquipNo(partPos.participantId())); pba.participantId(partPos.participantId()); -// if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady) +// if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady) // m_blockedAreas.remove(participantId); if (!partPos.insideBuilding()) @@ -71,7 +71,7 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula if (it != m_blockedAreas.end()) { DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber(); - pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode_def::Leave); + pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Leave); m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this); m_blockedAreas.erase(it); } @@ -84,7 +84,7 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula (m_handlerParticipantBuilding->getDamagePercentFromRoom(partPos.roomId()) < damagePercentBlockedAreas)) { DEBUG_LOG(m_logger) << "Blocked Area Leave equipment-No. =" << pba.equipmentNumber(); - pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode_def::Leave); + pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Leave); m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this); m_blockedAreas.remove(participantId); return; @@ -106,7 +106,7 @@ void HandlerBlockedAreas::onParticipantPositionChanged(const CentralEffectSimula && !m_blockedAreas.contains(participantId)) { DEBUG_LOG(m_logger) << "Send Enter Blocked Area to Participant:" << participantId; - pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode_def::Enter); + pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Enter); m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this); m_blockedAreas.insert(participantId, partPos.roomId()); } @@ -128,7 +128,7 @@ void HandlerBlockedAreas::onBuildingStateChanged(const int32_t buildingId) TrainingAreaBase::SendParticipantBlockedAreaRequest pba; pba.equipmentNumber(m_ddsHandler->participantId2EquipNo(participantId)); pba.participantId(participantId); - pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode_def::Leave); + pba.blockedAreaMode(TrainingAreaBase::BlockedAreaMode::Leave); m_ddsHandler->ftcTab()->sendParticipantBlockedAreaRequest(pba, this); m_blockedAreas.remove(participantId); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp index 50e07584b..44d32e278 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/ParticipantBuildings/handler_participant_building.cpp @@ -181,7 +181,7 @@ void HandlerParticipantBuilding::onBuildingStateChanged(const Buildings::Buildin const int participantId = participantPos.participantId(); if (participantPos.roomId() != roomState.id()) continue; - if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) continue; const int equipNo = m_ddsHandler->participantId2EquipNo(participantId); if (equipNo <= 0) @@ -219,7 +219,7 @@ void HandlerParticipantBuilding::sendCesHitToParticipant(const Buildings::Buildi CentralEffectSimulation::HandlerParticipant::CesParticipantData participantPos = participantsMap.value(participantId); - const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType_def::HitBuilding; + const ProjectDataManagement::PdmEventType eventType = ProjectDataManagement::PdmEventType::EventType_HitBuilding; AreaEffectSimulation::AesItem aesItem; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp index 113161948..237d25e25 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.cpp @@ -139,9 +139,9 @@ void HandlerTargetAreas::onParticipantChanged(const ParticipantManagement::Parti // No OC in CES ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.typeId()); - if (typeClass == ParticipantManagement::TypeClass_def::SupportEntity - || typeClass == ParticipantManagement::TypeClass_def::SupportUnit - || typeClass == ParticipantManagement::TypeClass_def::Unit) + if (typeClass == ParticipantManagement::TypeClass::SupportEntity + || typeClass == ParticipantManagement::TypeClass::SupportUnit + || typeClass == ParticipantManagement::TypeClass::Unit) return; m_participantData[data.id()] = data; @@ -153,7 +153,7 @@ void HandlerTargetAreas::onParticipantChanged(const ParticipantManagement::Parti << " id=" << data.id() << " typeId=" << data.typeId() << " designator=" << data.designator(); - if (typeClass == ParticipantManagement::TypeClass_def::Target) + if (typeClass == ParticipantManagement::TypeClass::Target) DEBUG_LOG(m_logger) << "Typeclass = Target"; } @@ -423,7 +423,7 @@ void HandlerTargetAreas::sendRequestsToTab(int participantId, int32_t effectPercentFt = effectPercent; rti::core::int64 effectTimeFt = m_ddsHandler->currentPartitionTime(); - TrainingAreaBase::ControlDataCode controlCodeFt = TrainingAreaBase::ControlDataCode_def::Flashing; + TrainingAreaBase::ControlDataCode controlCodeFt = TrainingAreaBase::ControlDataCode::Flashing; std::vector< uint8_t > controlDataFt; @@ -471,19 +471,19 @@ void HandlerTargetAreas::on_preWarningIntervalFinished(int participantId, int ta switch (shootbackTarget.targetInformation.prewarningEffect().underlying()) { - case ProjectDataManagement::VulnerabilityState_def::NoChange: + case ProjectDataManagement::VulnerabilityState::NoChange: countBlink = 1; effectPercent = 0; break; - case ProjectDataManagement::VulnerabilityState_def::MobilityKill: + case ProjectDataManagement::VulnerabilityState::MobilityKill: effectPercent = 30; countBlink = 2; break; - case ProjectDataManagement::VulnerabilityState_def::NearMiss: + case ProjectDataManagement::VulnerabilityState::NearMiss: countBlink = 3; effectPercent = 60; break; - case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::CatastrophicKill: countBlink = 4; effectPercent = 100; break; @@ -520,11 +520,11 @@ void HandlerTargetAreas::on_TimeToEffectFinished(int participantId, int targetPa switch (shootbackTarget.targetInformation.takedownEffect().underlying()) { - case ProjectDataManagement::VulnerabilityState_def::MobilityKill: + case ProjectDataManagement::VulnerabilityState::MobilityKill: effectPercent = 50; countBlink = 5; break; - case ProjectDataManagement::VulnerabilityState_def::CatastrophicKill: + case ProjectDataManagement::VulnerabilityState::CatastrophicKill: countBlink = 6; effectPercent = 100; break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h index dc829e459..405e00cbf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/TargetAreas/handler_target_areas.h @@ -42,7 +42,7 @@ public: struct ParticipantPosition : public ParticipantManagement::ParticipantPosition { - ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::CombatReady; + ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::CombatReady; Core::GeoPosition lastGeoPosition; bool positionValid = false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp index e40731d53..683a8f43e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_booby_trap.cpp @@ -115,9 +115,9 @@ void HandlerParticipantBoobyTrap::onBoobyTrapChanged(const AreaEffectSimulation: // prevData.aesItemId = 0; // const CentralEffectSimulation::AesItemViewUtm boobyTrapUtm = CentralEffectSimulation::AesItemViewUtm::create(data, prevData, impactRadius); -// if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrap) +// if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrap) // m_boobyTrapItems.insert(data.aesItemId(), boobyTrapUtm); -// if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary) +// if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary) // m_boobyTrapItemsSecondary.insert(data.aesItemId(), boobyTrapUtm); // DEBUG_LOG(m_logger) << "Check each participant" // << " aesTypeId=" << data.aesTypeId(); @@ -137,7 +137,7 @@ void HandlerParticipantBoobyTrap::onBoobyTrapChanged(const AreaEffectSimulation: DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue"; continue; } - if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill) + if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) { DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue"; continue; @@ -165,7 +165,7 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio || data.effectStateId() == AreaEffectSimulation::AesEffectState::EsRemoved || modType == DataModification::eRemoved) { - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary) { m_boobyTraps.remove(data.id()); m_boobyTrapItems.remove(data.id()); @@ -179,8 +179,8 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio } // - if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtBoobyTrap - && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary) + if (data.aesTypeId() != AreaEffectSimulation::AesType::AtBoobyTrap + && data.aesTypeId() != AreaEffectSimulation::AesType::AtBoobyTrapSecondary) return; const int aesItemId = data.aesItemId(); @@ -196,16 +196,16 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId(); switch (effectState.underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: { CentralEffectSimulation::AesItemViewUtm prevData; const double impactRadius = 0; prevData.aesItemId = 0; const CentralEffectSimulation::AesItemViewUtm boobyTrapUtm = CentralEffectSimulation::AesItemViewUtm::create(data, prevData, impactRadius); - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrap) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrap) m_boobyTrapItems.insert(data.aesItemId(), boobyTrapUtm); - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrapSecondary) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrapSecondary) m_boobyTrapItemsSecondary.insert(data.aesItemId(), boobyTrapUtm); DEBUG_LOG(m_logger) << "Check each participant" << " aesTypeId=" << data.aesTypeId(); @@ -224,14 +224,14 @@ void HandlerParticipantBoobyTrap::onAesItemViewChanged(const AreaEffectSimulatio // DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue"; // continue; // } -// if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill) +// if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) // { // DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue"; // continue; // } // // Nur Positionsmeldungen, die neuer sind als die Mine koennen sie ausloesen! // if ((participantPos.sampleTime() < data.sampleTime()) -// && (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBoobyTrap)) +// && (data.aesTypeId() == AreaEffectSimulation::AesType::AtBoobyTrap)) // { // DEBUG_LOG(m_logger) << " the time of the participant is older than the BoobyTrap participantId=" << participantPos.participantId() // << " participantPos.sampleTime()=" << participantPos.sampleTime() @@ -282,7 +282,7 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantsSecondary(int ae DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue"; continue; } - if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill) + if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) { DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue"; continue; @@ -373,9 +373,9 @@ void HandlerParticipantBoobyTrap::calculateBoobyTrapParticipantSecondary(const C if (result) { DEBUG_LOG(m_logger) << "sendParticipantEvent"; - sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType::EventType_HitMine); DEBUG_LOG(m_logger) << "sendParticipantHit"; - sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType::EventType_HitMine); } } // calculateBoobyTrapParticipantSecondary @@ -472,9 +472,9 @@ bool HandlerParticipantBoobyTrap::calculateBoobyTrapParticipant(const CentralEff DEBUG_LOG(m_logger) << "sendFtcBoobyTrapTrigger id=" << aesItemView.aesItemId; sendFtcBoobyTrapTrigger(aesItemView.aesItemId); DEBUG_LOG(m_logger) << "sendParticipantEvent"; - sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType::EventType_HitMine); DEBUG_LOG(m_logger) << "sendParticipantHit"; - sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType::EventType_HitMine); //calculateBoobyTrapParticipantsSecondary(aesItemView.aesItemId, participantPos.participantId() ); } return true; @@ -490,7 +490,7 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe << " lon=" << partPos.pos().lon() << " Anzahl BoobyTraps=" << m_boobyTrapItems.size(); - if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill) + if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) { DEBUG_LOG(m_logger) << "Not handle position: participant has vulnerability state CatastrophicKill"; return; @@ -519,7 +519,7 @@ void HandlerParticipantBoobyTrap::onParticipantPositionChanged(const CentralEffe const bool result = enteredOrCrossedArea(boobyTrap.form, posStepPoly); DEBUG_LOG(m_logger) << "result BoobyTrap Explosion = " << result; if (result) - sendParticipantEvent(boobyTrap, partPos, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantEvent(boobyTrap, partPos, ProjectDataManagement::PdmEventType::EventType_HitMine); } } // end of onParticipantPositionChanged() //----------------------------------------------------------------------------- @@ -549,10 +549,10 @@ void HandlerParticipantBoobyTrap::sendParticipantEvent(const CentralEffectSimula m_triggeredMineParticipant.insert(boobyTrapItem.aesItemId, participantPosition.participantId()); ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId()); - if (typeClass == ParticipantManagement::TypeClass_def::Unit || - typeClass == ParticipantManagement::TypeClass_def::SupportUnit || - typeClass == ParticipantManagement::TypeClass_def::SupportEntity || - typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::Unit || + typeClass == ParticipantManagement::TypeClass::SupportUnit || + typeClass == ParticipantManagement::TypeClass::SupportEntity || + typeClass == ParticipantManagement::TypeClass::Unknown) return; int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp index b4e68edcb..f382cc457 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/Plugins/VirtualMines/handler_participant_off_route_mine.cpp @@ -108,8 +108,8 @@ void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimula } // - if (data.aesTypeId() != AreaEffectSimulation::AesType_def::AtOffRouteMine - && data.aesTypeId() != AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary) + if (data.aesTypeId() != AreaEffectSimulation::AesType::AtOffRouteMine + && data.aesTypeId() != AreaEffectSimulation::AesType::AtOffRouteMineSecondary) return; const int aesItemId = data.aesItemId(); @@ -125,16 +125,16 @@ void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimula const AreaEffectSimulation::AesEffectState &effectState = data.effectStateId(); switch (effectState.underlying()) { - case AreaEffectSimulation::AesEffectState_def::EsActivated: + case AreaEffectSimulation::AesEffectState::EsActivated: { CentralEffectSimulation::AesItemViewUtm prevData; const double impactRadius = 0; prevData.aesItemId = 0; const CentralEffectSimulation::AesItemViewUtm aesItemViewUtm = CentralEffectSimulation::AesItemViewUtm::create(data, prevData, impactRadius); - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtOffRouteMine) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMine) m_offRouteMineItems.insert(data.aesItemId(), aesItemViewUtm); - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtOffRouteMineSecondary) + if (data.aesTypeId() == AreaEffectSimulation::AesType::AtOffRouteMineSecondary) m_offRouteMineItemsSecondary.insert(data.aesItemId(), aesItemViewUtm); // DEBUG_LOG(m_logger) << "Check each participant"; // // Check each participant @@ -151,7 +151,7 @@ void HandlerParticipantOffRouteMine::onAesItemViewChanged(const AreaEffectSimula // DEBUG_LOG(m_logger) << "inside Building participantId=" << participantPos.participantId() << " continue"; // continue; // } -// if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill) +// if (participantPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) // { // DEBUG_LOG(m_logger) << "CatastrophicKill participantId=" << participantPos.participantId() << " continue"; // continue; @@ -271,9 +271,9 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipantSecondary(c if (result) { DEBUG_LOG(m_logger) << "sendParticipantEvent"; - sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); //69 + sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType::EventType_HitMine); //69 DEBUG_LOG(m_logger) << "sendParticipantHit"; - sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); // 49 + sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType::EventType_HitMine); // 49 } } // calculateOffRouteMineParticipantSecondary @@ -306,9 +306,9 @@ void HandlerParticipantOffRouteMine::calculateOffRouteMineParticipant(const Cent DEBUG_LOG(m_logger) << "sendFtcOffRouteMineTrigger id=" << aesItemView.aesItemId; sendFtcOffRouteMineTrigger(aesItemView.aesItemId); DEBUG_LOG(m_logger) << "sendParticipantEvent"; - sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantEvent(aesItemView, participantPos, ProjectDataManagement::PdmEventType::EventType_HitMine); DEBUG_LOG(m_logger) << "sendParticipantHit"; - sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantHit(aesItemView, participantPos, ProjectDataManagement::PdmEventType::EventType_HitMine); calculateOffRouteMineParticipantsSecondary(aesItemView.aesItemId); } } // calculateOffRouteMineParticipant @@ -326,15 +326,15 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE << " lon=" << partPos.pos().lon() << " Anzahl OffRouteMines=" << m_offRouteMineItems.size(); - if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill) + if (partPos.vulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill) { DEBUG_LOG(m_logger) << "Not handle position: participant has vulnerability state CatastrophicKill"; return; } - if (typeClass != ParticipantManagement::TypeClass_def::GroundVehicle - && typeClass != ParticipantManagement::TypeClass_def::WeaponSystem - && typeClass != ParticipantManagement::TypeClass_def::VehicleWithGear) + if (typeClass != ParticipantManagement::TypeClass::GroundVehicle + && typeClass != ParticipantManagement::TypeClass::WeaponSystem + && typeClass != ParticipantManagement::TypeClass::VehicleWithGear) { INFO_LOG(m_logger) << "Not handle position: No type vehicle "; return; @@ -377,7 +377,7 @@ void HandlerParticipantOffRouteMine::onParticipantPositionChanged(const CentralE const bool result = enteredOrCrossedArea(offRouteMine.form, posStepPoly); DEBUG_LOG(m_logger) << "result offRouteMine Explosion = " << result; if (result) - sendParticipantEvent(offRouteMine, partPos, ProjectDataManagement::PdmEventType_def::HitMine); + sendParticipantEvent(offRouteMine, partPos, ProjectDataManagement::PdmEventType::EventType_HitMine); } } // end of onParticipantPositionChanged() //----------------------------------------------------------------------------- @@ -395,10 +395,10 @@ void HandlerParticipantOffRouteMine::sendParticipantEvent(const CentralEffectSim { ParticipantManagement::TypeClass typeClass = m_handlerParticipant->typeClassFromTypeId(participantPosition.participantTypeId()); - if (typeClass == ParticipantManagement::TypeClass_def::Unit || - typeClass == ParticipantManagement::TypeClass_def::SupportUnit || - typeClass == ParticipantManagement::TypeClass_def::SupportEntity || - typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::Unit || + typeClass == ParticipantManagement::TypeClass::SupportUnit || + typeClass == ParticipantManagement::TypeClass::SupportEntity || + typeClass == ParticipantManagement::TypeClass::Unknown) return; int equipmentNumber = m_ddsHandler->participantId2EquipNo(participantPosition.participantId()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.cpp index 683008e32..4b5d87481 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.cpp @@ -21,23 +21,23 @@ AesItemViewUtm AesItemViewUtm::create(const AreaEffectSimulation::AesItemView &a double lowerOffset) { if (prevData.aesItemId != 0) - Q_ASSERT(prevData.aesItemId == aiv.aesItemId()); - if (aiv.aesTypeId() == AreaEffectSimulation::AesType_def::AtMineAreaSingleMines) + Q_ASSERT(prevData.aesItemId == aiv.aesItemId); + if (aiv.aesTypeId == AreaEffectSimulation::AesType::AtMineAreaSingleMines) Q_ASSERT(false); AesItemViewUtm ret = prevData; //ret.zone; - ret.aesItemId = aiv.aesItemId(); - ret.chargeStruct = aiv.chargeStruct(); + ret.aesItemId = aiv.aesItemId; + ret.chargeStruct = aiv.chargeStruct; ret.partyId = aiv.partyId.is_set() ? aiv.partyId.get() : -1; ret.dusMineId = -1; ret.isSupplyTruck = isSupplyTruck; - ret.aesTypeId = aiv.aesTypeId(); - ret.effectStateId = aiv.effectStateId(); - ret.effectStart = aiv.effectStart(); - ret.boundingBoxBottomLeft = CentralEffectSimulation::geographic2Utm(aiv.boundingBoxBottomLeft(), &ret.zone); + ret.aesTypeId = aiv.aesTypeId; + ret.effectStateId = aiv.effectStateId; + ret.effectStart = aiv.effectStart; + ret.boundingBoxBottomLeft = CentralEffectSimulation::geographic2Utm(aiv.boundingBoxBottomLeft, &ret.zone); ret.boundingBoxBottomLeft.setX(ret.boundingBoxBottomLeft.x() - impactRadius); - ret.boundingBoxTopRight = CentralEffectSimulation::geographic2Utm(aiv.boundingBoxTopRight(), ret.zone); + ret.boundingBoxTopRight = CentralEffectSimulation::geographic2Utm(aiv.boundingBoxTopRight, ret.zone); ret.boundingBoxTopRight.setX(ret.boundingBoxTopRight.x() + impactRadius); if ( ret.boundingBoxBottomLeft.y() > ret.boundingBoxTopRight.y()) { @@ -61,9 +61,9 @@ AesItemViewUtm AesItemViewUtm::create(const AreaEffectSimulation::AesItemView &a ret.form.clear(); ret.formGeo.clear(); - ret.form.reserve(aiv.form().size()); - ret.formGeo.reserve(aiv.form().size()); - for (const Core::GeoPosition2D &pointGeo : aiv.form()) + ret.form.reserve(aiv.form.size()); + ret.formGeo.reserve(aiv.form.size()); + for (const Core::GeoPosition2D &pointGeo : aiv.form) { ret.form.push_back(CentralEffectSimulation::geographic2Utm(pointGeo, ret.zone)); ret.formGeo.push_back(pointGeo); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.h index 6627c1b26..cb4f5360a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/aes_item_view_utm.h @@ -32,7 +32,7 @@ struct SVCCESDDSCOMMON_EXPORT AesItemViewUtm bool offsetIsSet = false; double upperOffset = -1.0; double lowerOffset = -1.0; - AreaEffectSimulation::AesType aesTypeId = AreaEffectSimulation::AesType_def::AtUnknown; + AreaEffectSimulation::AesType aesTypeId = AreaEffectSimulation::AesType::AtUnknown; AreaEffectSimulation::AesEffectState effectStateId = AreaEffectSimulation::AesEffectState::EsExpired; qint64 effectStart = 0; QPointF boundingBoxBottomLeft; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp index 034d2335e..0cd815507 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/dds_handler.cpp @@ -208,7 +208,7 @@ bool DdsHandler::init(const QStringList &qosFileList) qint64 DdsHandler::currentPartitionTime() const { - return m_dtcCore->partitionTime().timeStamp(); + return m_dtcCore->partitionTime().timeStamp; } int DdsHandler::participantId2EquipNo(const int participantId) const @@ -227,116 +227,116 @@ int DdsHandler::equipNo2ParticipantId(const int equipmentNumber) const // /////////////////////////////////// double DdsHandler::chargeTypeRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const double radius = m_dtcPdm->impactRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + const double radius = m_dtcPdm->impactRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); DEBUG_LOG(m_logger) << "chargeTypeRadius = " << radius; return radius; } // getRadiusOfMunition double DdsHandler::chargeHeight(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const double height = m_dtcPdm->height(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + const double height = m_dtcPdm->height(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); DEBUG_LOG(m_logger) << "chargeHeight = " << height; return height; } bool DdsHandler::isSmartChargeType(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const bool isSmart = m_dtcPdm->isSmart(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + const bool isSmart = m_dtcPdm->isSmart(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); DEBUG_LOG(m_logger) << "isSmartChargeType = " << isSmart; return isSmart; } // isSmartType bool DdsHandler::isSmoke(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const bool isSmoke = m_dtcPdm->isSmoke(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + const bool isSmoke = m_dtcPdm->isSmoke(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); DEBUG_LOG(m_logger) << "isSmoke = " << isSmoke; return isSmoke; } // isSmoke bool DdsHandler::isLaserGuidable(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const bool isLaserGuidable = m_dtcPdm->isLaserGuidable(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + const bool isLaserGuidable = m_dtcPdm->isLaserGuidable(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); DEBUG_LOG(m_logger) << "isLaserGuidable = " << isLaserGuidable; return isLaserGuidable; } bool DdsHandler::isJamming(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const bool isJamming = m_dtcPdm->isJamming(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + const bool isJamming = m_dtcPdm->isJamming(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); DEBUG_LOG(m_logger) << "isJamming = " << isJamming; return isJamming; } bool DdsHandler::isDus(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const bool isDus = m_dtcPdm->mineClass(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId())== AreaEffectSimulation::MineClass::Concrete; + const bool isDus = m_dtcPdm->mineClass(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId)== AreaEffectSimulation::MineClass::Concrete; DEBUG_LOG(m_logger) << "isDus = " << isDus; return isDus; } bool DdsHandler::isAtMine(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const bool isAtMine = m_dtcPdm->isAtMine(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + const bool isAtMine = m_dtcPdm->isAtMine(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); DEBUG_LOG(m_logger) << "isAtMine = " << isAtMine; return isAtMine; } ProjectDataManagement::VolatilityType DdsHandler::volatilityTypeId(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const ProjectDataManagement::VolatilityType volatilityType= m_dtcPdm->volatilityTypeId(chargeStruct.chargeTypeId(), - chargeStruct.igniterTypeId(), - chargeStruct.igniterFunctionId()); + const ProjectDataManagement::VolatilityType volatilityType= m_dtcPdm->volatilityTypeId(chargeStruct.chargeTypeId, + chargeStruct.igniterTypeId, + chargeStruct.igniterFunctionId); DEBUG_LOG(m_logger) << "volatilityType=" << volatilityType; return volatilityType; } int DdsHandler::remainingTasCode(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->remainingTasCode(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->remainingTasCode(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } int DdsHandler::secondaryRemainingTasCode(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->secondaryRemainingTasCode(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->secondaryRemainingTasCode(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } int DdsHandler::getLethalRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->getLethalRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->getLethalRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } int DdsHandler::getNonLethalRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->getNonLethalRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->getNonLethalRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } int DdsHandler::getHazardDistance(const AreaEffectSimulation::ChargeStruct &chargeStruct) const { - return m_dtcPdm->hazardDistance(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->hazardDistance(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } ProjectDataManagement::IgniterFunctionBase DdsHandler::getIgniterFunctionBaseFromChargeTypeId(int chargeTypeId, int igniterTypeId, int igniterFunctionId) { - return m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeTypeId, igniterTypeId, igniterFunctionId).igniterFunctionBaseId(); + return m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeTypeId, igniterTypeId, igniterFunctionId).igniterFunctionBaseId; } QVector DdsHandler::getCasEffects(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - return m_dtcPdm->casEffects(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + return m_dtcPdm->casEffects(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); } int32_t DdsHandler::getLegacyIdFromChargeTypeId(const AreaEffectSimulation::ChargeStruct &chargeStruct) { int32_t legacyId = 0; - legacyId = m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()).chargeLegacyId(); + legacyId = m_dtcPdm->getChargeTypeIgniterTypeIgniterFunction(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId).chargeLegacyId; DEBUG_LOG(m_logger) << "legacyId = " << legacyId; return legacyId; } int DdsHandler::searchRadius(const AreaEffectSimulation::ChargeStruct &chargeStruct) { - const int searchRadius = m_dtcPdm->searchRadius(chargeStruct.chargeTypeId(), chargeStruct.igniterTypeId(), chargeStruct.igniterFunctionId()); + const int searchRadius = m_dtcPdm->searchRadius(chargeStruct.chargeTypeId, chargeStruct.igniterTypeId, chargeStruct.igniterFunctionId); DEBUG_LOG(m_logger) << "searchRadius = " << searchRadius; return searchRadius; } // searchRadius diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp index 926482316..d0b22992d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_building_data.cpp @@ -66,53 +66,53 @@ bool HandlerBuildingData::init() // /////////////////////////////////// void HandlerBuildingData::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType) { - INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id(); + INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id; if (modType == DataModification::eRemoved || !m_ddsHandler->dtcIsm()->isElementAssignedToExercise(data, m_ddsHandler->getExerciseId())) { - INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id() << " remove"; - m_mainStructureElements.remove(data.id()); - m_footprints.remove(data.id()); + INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id << " remove"; + m_mainStructureElements.remove(data.id); + m_footprints.remove(data.id); return; } - m_mainStructureElements.insert(data.id(), data); + m_mainStructureElements.insert(data.id, data); DEBUG_LOG(m_logger) << "Got MainStructureElement: " << data; - for (const InfrastructureManagement::StructureElement &ele : qAsConst(data.elements())) + for (const InfrastructureManagement::StructureElement &ele : qAsConst(data.elements)) { - if (ele.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Room) + if (ele.structureElementTypeId == InfrastructureManagement::StructureElementType::Room) { - const std::vector &path = ele.path(); + const std::vector &path = ele.path; if (path.size() < 3) continue; const int structureElementId = path.at(0); const int floorId = path.at(1); const int roomId = path.at(2); - DEBUG_LOG(m_logger) << "ele.id=" << ele.id() << " name =" << ele.name() - << " ele.StructureElementType=" << ele.structureElementTypeId() + DEBUG_LOG(m_logger) << "ele.id=" << ele.id << " name =" << ele.name + << " ele.StructureElementType=" << ele.structureElementTypeId << " buildingId = " << structureElementId << " floorId =" << floorId << " roomId = " << roomId; m_floorRoom.insert(roomId, floorId); m_structureElementToFloor.insert(floorId, structureElementId); - m_buildingFloor.insert(floorId, data.id()); + m_buildingFloor.insert(floorId, data.id); } // get assetPositions { - if (ele.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) + if (ele.mountingPointTypeId == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) { - DEBUG_LOG(m_logger) << "EGCU id=" << ele.id() - << " displayName=" << ele.displayName() - << " name=" << ele.name() - << " type=" << ele.mountingPointTypeId(); + DEBUG_LOG(m_logger) << "EGCU id=" << ele.id + << " displayName=" << ele.displayName + << " name=" << ele.name + << " type=" << ele.mountingPointTypeId; AssetPosition assetPosition; - assetPosition.structureElementId = ele.id(); - assetPosition.mountingPointType = ele.mountingPointTypeId(); - assetPosition.relPosition = ele.relPosition(); - assetPosition.geoPosition = ele.geoPosition(); + assetPosition.structureElementId = ele.id; + assetPosition.mountingPointType = ele.mountingPointTypeId; + assetPosition.relPosition = ele.relPosition; + assetPosition.geoPosition = ele.geoPosition; const QPointF &posUtm = CentralEffectSimulation::geographic2Utm(assetPosition.geoPosition, m_zone); - qreal x = posUtm.x() + assetPosition.relPosition.offsetX(); - qreal y = posUtm.y() + assetPosition.relPosition.offsetY(); + qreal x = posUtm.x() + assetPosition.relPosition.offsetX; + qreal y = posUtm.y() + assetPosition.relPosition.offsetY; const QPointF posAssetUtm(x, y); assetPosition.positionUtm = posAssetUtm; assetPosition.zone = m_zone; @@ -140,11 +140,11 @@ void HandlerBuildingData::onMountingPointAssetChanged(const InfrastructureManage if (modType == DataModification::eRemoved) return; - DEBUG_LOG(m_logger) << "onMountingPointAssetChanged id=" << data.id() - << " assetId=" << data.assetId() - << " structureElementId=" << data.structureElementId(); - m_mountingPointAsset.insert(data.structureElementId(), m_assetMountingPoint.value(data.assetId())); - m_assetMountingPoint.insert(data.assetId(), data.structureElementId()); + DEBUG_LOG(m_logger) << "onMountingPointAssetChanged id=" << data.id + << " assetId=" << data.assetId + << " structureElementId=" << data.structureElementId; + m_mountingPointAsset.insert(data.structureElementId, m_assetMountingPoint.value(data.assetId)); + m_assetMountingPoint.insert(data.assetId, data.structureElementId); } void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureManagement::InstrumentationAsset &data, DataModification modType) @@ -152,15 +152,15 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana if (modType == DataModification::eRemoved) return; - if (data.mountingPointTypeId() == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) + if (data.mountingPointTypeId == InfrastructureManagement::MountingPointType::EffectGenerationControlUnit) { - DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged id=" << data.id() - << " hostname=" << data.hostname(); - QString hostname = QString::fromStdString(data.hostname()); - m_instrumentationAssets.insert(data.id(), hostname); - if (m_assetMountingPoint.contains(data.id())) + DEBUG_LOG(m_logger) << "onInstrumentationAssetChanged id=" << data.id + << " hostname=" << data.hostname; + QString hostname = QString::fromStdString(data.hostname); + m_instrumentationAssets.insert(data.id, hostname); + if (m_assetMountingPoint.contains(data.id)) { - int assetId = data.id(); + int assetId = data.id; int mountpointId = m_assetMountingPoint.value(assetId); DEBUG_LOG(m_logger) << "m_instrumentationAsset.contains(" << assetId << ")" << " assetId=" << assetId @@ -169,7 +169,7 @@ void HandlerBuildingData::onInstrumentationAssetChanged(const InfrastructureMana { AssetPosition assetPosition = m_assetPositions.value(mountpointId); assetPosition.hostname = hostname; - assetPosition.mountingPointType = data.mountingPointTypeId(); + assetPosition.mountingPointType = data.mountingPointTypeId; m_assetPositions.insert(assetPosition.structureElementId, assetPosition); DEBUG_LOG(m_logger) << "m_assetPositions.insert assetPosition structureElementId= " << assetPosition.structureElementId << " type=" << assetPosition.mountingPointType diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp index 63f13c138..6da30ca55 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.cpp @@ -119,10 +119,10 @@ void HandlerParticipant::onParticipantPositionChanged(const ParticipantManagemen else { ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.participantTypeId()); - if (typeClass == ParticipantManagement::TypeClass_def::SupportEntity - || typeClass == ParticipantManagement::TypeClass_def::SupportUnit - || typeClass == ParticipantManagement::TypeClass_def::Unit - || typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::SupportEntity + || typeClass == ParticipantManagement::TypeClass::SupportUnit + || typeClass == ParticipantManagement::TypeClass::Unit + || typeClass == ParticipantManagement::TypeClass::Unknown) return; // [GUEZE-3102] Aufgesessene Teilnehmer bekommen den Schaden vom Fahrzeug, auf dem sie aufgesessen sind. @@ -224,14 +224,14 @@ void HandlerParticipant::onDynamicParticipantDataChanged(const ParticipantManage CesParticipantData &participantPosition = m_positionsMap[data.participantId()]; // reference! // save vulnerabilityState in participantHandler - ProjectDataManagement::VulnerabilityState newVulnerabilityState = ProjectDataManagement::VulnerabilityState_def::CombatReady; + ProjectDataManagement::VulnerabilityState newVulnerabilityState = ProjectDataManagement::VulnerabilityState::CombatReady; if (data.stateHistory().size() > 0) { const ParticipantManagement::StateInformation &vul = ParticipantManagement::youngestStateInformation(data.stateHistory()); newVulnerabilityState = vul.vulnerabilityState(); DEBUG_LOG(m_logger) << "newVulnerabilityState" << vul.vulnerabilityState(); - if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CombatReady) + if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady) { emit participantDecontaminated(participantPosition.participantId()); DEBUG_LOG(m_logger) << "emit participantDecontaminated id=" << participantPosition.participantId(); @@ -259,10 +259,10 @@ void HandlerParticipant::onParticipantChanged(const ParticipantManagement::Parti // No OC in CES ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(data.typeId()); - if (typeClass == ParticipantManagement::TypeClass_def::SupportEntity - || typeClass == ParticipantManagement::TypeClass_def::SupportUnit - || typeClass == ParticipantManagement::TypeClass_def::Unit - || typeClass == ParticipantManagement::TypeClass_def::Unknown) + if (typeClass == ParticipantManagement::TypeClass::SupportEntity + || typeClass == ParticipantManagement::TypeClass::SupportUnit + || typeClass == ParticipantManagement::TypeClass::Unit + || typeClass == ParticipantManagement::TypeClass::Unknown) return; m_participantData[data.id()] = data; @@ -353,7 +353,7 @@ QHash HandlerParticipant::positions for (const HandlerParticipant::CesParticipantData &pos : m_positionsMap) { ParticipantManagement::TypeClass typeClass = typeClassFromTypeId(pos.participantTypeId()); - if (typeClass != ParticipantManagement::TypeClass_def::Aircraft) + if (typeClass != ParticipantManagement::TypeClass::Aircraft) continue; if (!m_participantData.contains(pos.participantId())) continue; @@ -391,7 +391,7 @@ bool HandlerParticipant::handleCheating(const ParticipantManagement::TypeClass t if (typeClass == ParticipantManagement::TypeClass::Human) { DEBUG_LOG(m_logger) << "handle Cheating for Human"; - if (newVulnerabilityState >= ProjectDataManagement::VulnerabilityState::MediumDamage) + if (newVulnerabilityState >= ProjectDataManagement::VulnerabilityState::VulnerabilityState_MediumDamage) return true; } if (typeClass == ParticipantManagement::TypeClass::GroundVehicle @@ -399,8 +399,8 @@ bool HandlerParticipant::handleCheating(const ParticipantManagement::TypeClass t || typeClass == ParticipantManagement::TypeClass::VehicleWithGear) { DEBUG_LOG(m_logger) << "handle Cheating for Vehicle"; - if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::MobilityKill - || newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VisibleMobilityKill) + if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_MobilityKill + || newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleMobilityKill) return true; } return false; @@ -427,7 +427,7 @@ void HandlerParticipant::checkCheating(const int participantId, } else { - if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::CombatReady) + if (newVulnerabilityState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady) { DEBUG_LOG(m_logger) << "checkCheating remove id= " << participantId; m_positionsCheatingMap.remove(participantId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h index 18b23a618..de19aeac8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/handler_participant.h @@ -40,7 +40,7 @@ public: struct CesParticipantData : public ParticipantManagement::ParticipantPosition { - ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState_def::CombatReady; + ProjectDataManagement::VulnerabilityState vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady; Core::GeoPosition lastGeoPosition; bool positionValid{false}; bool lastPositionValid{false}; @@ -50,7 +50,7 @@ public: mutable LtsCoordTrans::LtsCoordinate m_ltsCoordinate; - bool insideWlsArea() const { return reportingSource() == Core::PositionReportingSource::Wls; } + bool insideWlsArea() const { return reportingSource == Core::PositionReportingSource::Wls; } bool insideBuilding() const { return insideBuildingValue; } LtsCoordTrans::LtsCoordinate <sCoordinate() @@ -65,7 +65,7 @@ public: CesParticipantData() = default; explicit CesParticipantData(const ParticipantManagement::ParticipantPosition &p) : ParticipantManagement::ParticipantPosition(p) - , lastGeoPosition(p.pos()) + , lastGeoPosition(p.pos) , positionValid(true) {} }; // struct CesParticipantData @@ -97,7 +97,7 @@ public: ParticipantManagement::TypeClass typeClassFromTypeId(int typeId) const { return m_typeMap.value(typeId); } bool isOutdated(const CesParticipantData &pos) const { - return LtsUtils::isPositionTimeOutdated(m_ddsHandler->currentPartitionTime(), pos.sampleTime()); + return LtsUtils::isPositionTimeOutdated(m_ddsHandler->currentPartitionTime(), pos.sampleTime); } QPolygonF getParticipantStep(int participantId, int zone) const; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h index 0aa7d4c55..fb4f19838 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/CentralEffectSimulation/point_helpers.h @@ -28,7 +28,7 @@ inline QPointF geographic2Utm(double lon, double lat, int *zone = nullptr) inline QPointF geographic2Utm(const Core::GeoPosition2D &geoPos, int *zone = nullptr) { const int zoneToUse = zone ? *zone : -1; - auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), zoneToUse); + auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat, zoneToUse); if (zone) *zone = utm.zone; return QPointF(utm.x, utm.y); @@ -37,7 +37,7 @@ inline QPointF geographic2Utm(const Core::GeoPosition2D &geoPos, int *zone = nul inline QPointF geographic2Utm(const Core::GeoPosition &geoPos, int *zone = nullptr) { const int zoneToUse = zone ? *zone : -1; - auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), zoneToUse); + auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat, zoneToUse); if (zone) *zone = utm.zone; return QPointF(utm.x, utm.y); @@ -45,13 +45,13 @@ inline QPointF geographic2Utm(const Core::GeoPosition &geoPos, int *zone = nullp inline QString geographic2mgrs(const Core::GeoPosition2D &geoPos, int zone) { - auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), zone); + auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat, zone); return utm.mgrs(); } inline QPointF geographic2Utm(const Core::GeoPosition2D &geoPos, int zone) { - auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon(), geoPos.lat(), zone); + auto utm = LtsCoordTrans::UtmCoordinate::fromGeographic(geoPos.lon, geoPos.lat, zone); return QPointF(utm.x, utm.y); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp index ea5d35bd6..355c5c350 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp @@ -180,7 +180,7 @@ void HandlerFiringExplosion::onSafetyConfirmation(const SafetyConfirmation_e &sa m_firingExplosionEntity.isActive() && !m_firingExplosionEntity.carriedOutEnabled()) { if (m_firingExplosionEntity.idEffectShow() > 0) - m_mainHandler->handlerOrder()->updateOrderWithId(m_firingExplosionEntity.idEffectShow(), QString(), EffectShowManagement::OrderConfirmation_e_def::InterruptExecution); + m_mainHandler->handlerOrder()->updateOrderWithId(m_firingExplosionEntity.idEffectShow(), QString(), EffectShowManagement::OrderConfirmation_e::InterruptExecution); onEffectShowInterrupted(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp index d75670fda..e2a116557 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp @@ -106,15 +106,15 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesFireStatus(const CardRid } // if if (fireStatus.cardrige1) - m_operatingCondition.smokeCartridge1(StatusSmokeCartridge_e_def::Smoking); + m_operatingCondition.smokeCartridge1(StatusSmokeCartridge_e::Smoking); if (fireStatus.cardrige2) - m_operatingCondition.smokeCartridge2(StatusSmokeCartridge_e_def::Smoking); + m_operatingCondition.smokeCartridge2(StatusSmokeCartridge_e::Smoking); if (fireStatus.cardrige3) - m_operatingCondition.smokeCartridge3(StatusSmokeCartridge_e_def::Smoking); + m_operatingCondition.smokeCartridge3(StatusSmokeCartridge_e::Smoking); if (fireStatus.cardrige4) - m_operatingCondition.smokeCartridge4(StatusSmokeCartridge_e_def::Smoking); + m_operatingCondition.smokeCartridge4(StatusSmokeCartridge_e::Smoking); if (fireStatus.cardrige5) - m_operatingCondition.smokeCartridge5(StatusSmokeCartridge_e_def::Smoking); + m_operatingCondition.smokeCartridge5(StatusSmokeCartridge_e::Smoking); if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition)) ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data (Somoking) to dds"; @@ -124,15 +124,15 @@ void HandlerOperatingCondition::onVehicleSmokeCardridgesStatus(const CardRidges { m_readyCardridges = fireStatus; if (!m_smokingCardridges.cardrige1) - m_operatingCondition.smokeCartridge1(m_readyCardridges.cardrige1 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady); + m_operatingCondition.smokeCartridge1(m_readyCardridges.cardrige1 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady); if (!m_smokingCardridges.cardrige2) - m_operatingCondition.smokeCartridge2(m_readyCardridges.cardrige2 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady); + m_operatingCondition.smokeCartridge2(m_readyCardridges.cardrige2 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady); if (!m_smokingCardridges.cardrige3) - m_operatingCondition.smokeCartridge3(m_readyCardridges.cardrige3 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady); + m_operatingCondition.smokeCartridge3(m_readyCardridges.cardrige3 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady); if (!m_smokingCardridges.cardrige4) - m_operatingCondition.smokeCartridge4(m_readyCardridges.cardrige4 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady); + m_operatingCondition.smokeCartridge4(m_readyCardridges.cardrige4 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady); if (!m_smokingCardridges.cardrige5) - m_operatingCondition.smokeCartridge5(m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e_def::Ready : StatusSmokeCartridge_e_def::NotReady); + m_operatingCondition.smokeCartridge5(m_readyCardridges.cardrige5 ? StatusSmokeCartridge_e::Ready : StatusSmokeCartridge_e::NotReady); if (!m_mainHandler->dds()->dts()->publish(m_operatingCondition)) ERROR_LOG(m_logger) << "Error publishing OperatingConditionEntity-data to dds"; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp index c1a160dce..3aebf3ffd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp @@ -70,9 +70,9 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh if (it.value()->getData().idOrder == effectShowOrder.idEffectShow) data = it.value()->getData(); } - bool sendStart = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::FiringReadiness) - || (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::Execution) - || (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::InterruptExecution)); + bool sendStart = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::FiringReadiness) + || (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution) + || (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::InterruptExecution)); data.typeOfOrder = 1; data.idOrder = effectShowOrder.idEffectShow; @@ -88,7 +88,7 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh data.numOfVolley = effectShowOrder.numOfVolley; data.shotsPerVolley = effectShowOrder.shotsInTotal; data.typeOfAmmunition = effectShowOrder.typeOfAmmunition; - //data.orderConfirmation = EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance; //no reset + //data.orderConfirmation = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance; //no reset data.info = effectShowOrder.name; ObjectOrder *ifs(new ObjectOrder(m_mainHandler, this)); @@ -100,13 +100,13 @@ void HandlerOrder::createOrder(const ConvertFromTab::EffectShowOrder_t &effectSh return; } m_orderObjMap.insert(ifs->getId(), ifs); - if (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::Execution && data.startTime == 0) + if (data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution && data.startTime == 0) { m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SICHERHEIT_WIDERRUFEN); m_mainHandler->handlerControlUnit()->send(CommandSignal::FT_SE_CB_SALVE_UNTERBRECHEN); m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Stop); } - bool orignalIsTimeout = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e_def::Execution) && data.startTime > 0 && (data.startTime + data.duration < QDateTime::currentMSecsSinceEpoch())) ; + bool orignalIsTimeout = ((data.orderConfirmation == EffectShowManagement::OrderConfirmation_e::Execution) && data.startTime > 0 && (data.startTime + data.duration < QDateTime::currentMSecsSinceEpoch())) ; if (sendStart && !orignalIsTimeout) emit startHandlerFiring(data); } @@ -118,7 +118,7 @@ void HandlerOrder::createOrder(const ConvertFromTab::RelocationOrder_t &relocati data.idOrder = relocationOrder.idRelocation; data.startTime = relocationOrder.executionTime * 1000; // s -> msec data.centerPosition = QPointF(relocationOrder.centerPosition.lon(), relocationOrder.centerPosition.lat()); - data.orderConfirmation = EffectShowManagement::OrderConfirmation_e_def::WaitingForAcceptance; + data.orderConfirmation = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance; data.info = relocationOrder.infoText; ObjectOrder *ifs(new ObjectOrder(m_mainHandler, this)); @@ -148,9 +148,9 @@ void HandlerOrder::removeOrder(const ConvertFromTab::OrderRetract_t &orderRetrac ERROR_LOG(m_logger) << LOGFUNCTION << ret(); else { - if (def == EffectShowManagement::OrderConfirmation_e_def::Execution || - def == EffectShowManagement::OrderConfirmation_e_def::InterruptExecution || - def == EffectShowManagement::OrderConfirmation_e_def::FiringReadiness) + if (def == EffectShowManagement::OrderConfirmation_e::Execution || + def == EffectShowManagement::OrderConfirmation_e::InterruptExecution || + def == EffectShowManagement::OrderConfirmation_e::FiringReadiness) { DEBUG_LOG(m_logger) << "EndFireHandler from Remove"; @@ -226,21 +226,21 @@ bool HandlerOrder::updateOrder(ObjectOrder *order, ERROR_LOG(m_logger) << "Update Order " << oc.orderId << " / "; switch (orderConf.underlying()) { - case EffectShowManagement::OrderConfirmation_e_def::FiringReadiness: + case EffectShowManagement::OrderConfirmation_e::FiringReadiness: emit startHandlerFiring(order->getData()); break; - case EffectShowManagement::OrderConfirmation_e_def::Execution: + case EffectShowManagement::OrderConfirmation_e::Execution: DEBUG_LOG(m_logger) << "start execution"; m_mainHandler->handlerVehicle()->effectShowControl(EffectShowClient::EffectShowControl_e::Start); emit effectShowStarted(); break; - case EffectShowManagement::OrderConfirmation_e_def::InterruptExecution: + case EffectShowManagement::OrderConfirmation_e::InterruptExecution: //stop current volley m_mainHandler->handlerVehicle()->effectShowControl(EffectShowClient::EffectShowControl_e::Stop); //revoke safety emit effectShowInterrupted(); break; - case EffectShowManagement::OrderConfirmation_e_def::Abort: + case EffectShowManagement::OrderConfirmation_e::Abort: if (checkForActiveOrder(escOrder.idOrder)) { DEBUG_LOG(m_logger) << "idOrder is " << escOrder.idOrder << " send abbort as is active"; @@ -248,11 +248,11 @@ bool HandlerOrder::updateOrder(ObjectOrder *order, m_mainHandler->handlerVehicle()->effectShowControl(EffectShowControl_e::Abort); } Q_FALLTHROUGH(); - case EffectShowManagement::OrderConfirmation_e_def::Nonacceptance: - case EffectShowManagement::OrderConfirmation_e_def::OrderCarriedOut: - case EffectShowManagement::OrderConfirmation_e_def::PositionReached: + case EffectShowManagement::OrderConfirmation_e::Nonacceptance: + case EffectShowManagement::OrderConfirmation_e::OrderCarriedOut: + case EffectShowManagement::OrderConfirmation_e::PositionReached: { - if (orderConf.underlying() == EffectShowManagement::OrderConfirmation_e_def::PositionReached && + if (orderConf.underlying() == EffectShowManagement::OrderConfirmation_e::PositionReached && oc.orderType != ConvertToTab::OrderType_e::Relocation) return true; emit endHandlerFiring(order->getData()); @@ -263,7 +263,7 @@ bool HandlerOrder::updateOrder(ObjectOrder *order, break; } default: - ERROR_LOG(m_logger) << "Unhandled EffectShowManagement::OrderConfirmation_e_def in HandlerOrder::onOrderModifyRequest"; // todo + ERROR_LOG(m_logger) << "Unhandled EffectShowManagement::OrderConfirmation in HandlerOrder::onOrderModifyRequest"; // todo break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp index 5482e8f7b..d652aa9fe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp @@ -105,7 +105,7 @@ void HandlerVehicle::setSmokeParameter(int lengthOfFogZone, int directionOfFogZo m_statusSmokeFiring.remainingDistance_m = lengthOfFogZone; m_statusSmokeFiring.remainingTime_s = burningTimeSmokeCartridge_s(); - EffectShowClient::SafetyConfirmation_e sc = EffectShowClient::SafetyConfirmation_e_def::SafetyConfirmed; + EffectShowClient::SafetyConfirmation_e sc = EffectShowClient::SafetyConfirmation_e::SafetyConfirmed; emit safetyConfirmation(sc); emit readyForSmokeFiring(true); @@ -145,7 +145,7 @@ void HandlerVehicle::effectShowControl(EffectShowControl_e effectShowControl) m_statusExplosionFiring.remainingShots = 0; m_statusExplosionFiring.remainingVolley = 0; - EffectShowClient::SafetyConfirmation_e sc = EffectShowClient::SafetyConfirmation_e_def::SafetyNotConfirmed; + EffectShowClient::SafetyConfirmation_e sc = EffectShowClient::SafetyConfirmation_e::SafetyNotConfirmed; emit safetyConfirmation(sc); break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp index 54306e01b..bc0237b29 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.cpp @@ -85,7 +85,7 @@ void ObjectOrder::onPublishData() ddsData.idOrder(m_data.idOrder); ddsData.numOfVolley(m_data.numOfVolley); ddsData.shotsPerVolley(m_data.shotsPerVolley); - EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e::inner_enum(m_data.orderConfirmation); + EffectShowManagement::OrderConfirmation_e oc = EffectShowManagement::OrderConfirmation_e(m_data.orderConfirmation); ddsData.orderConfirmation(oc); ddsData.position(Core::GeoPosition2D(m_data.centerPosition.x(), m_data.centerPosition.y())); ddsData.lowerLeftPosition(Core::GeoPosition2D(m_data.lowerLeftPosition.x(), m_data.lowerLeftPosition.y())); @@ -135,9 +135,9 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat notif.contentArgs(args); notif.timeStamp(m_mainHandler->dds()->currentPartitionTime()); notif.expiryTime(expiryTime); - notif.priority(NotificationManagement::Priority_def::High); - notif.processedPriority(NotificationManagement::Priority_def::Low); - notif.messageType(NotificationManagement::MessageType_def::Info); + notif.priority(NotificationManagement::Priority::High); + notif.processedPriority(NotificationManagement::Priority::Low); + notif.messageType(NotificationManagement::MessageType::Info); notif.exerciseId(m_mainHandler->dds()->getExerciseId()); NotificationManagement::Address wsAddr; @@ -145,7 +145,7 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat wsAddr.isRead(false); QString name = localHostName; wsAddr.name(name.toStdString()); - wsAddr.addressType(NotificationManagement::AddressType_def::Workstation); + wsAddr.addressType(NotificationManagement::AddressType::Workstation); notif.recipientIds().reserve(1); notif.recipientIds().push_back(wsAddr); @@ -153,7 +153,7 @@ void ObjectOrder::getCreateNotificationRequestData(NotificationManagement::Creat NotificationManagement::Address addrSender; addrSender.addressId(EffectShowClient::Offset); addrSender.name(QStringLiteral("svcEffectShowClient").toStdString()); - addrSender.addressType(NotificationManagement::AddressType_def::Service); + addrSender.addressType(NotificationManagement::AddressType::Service); notif.sender(addrSender); data.notification(notif); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.cpp index 4ac6dc0fb..ee38eb0d2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/esm_convert_from_tab.cpp @@ -42,7 +42,7 @@ OrderConfirmation_t getOrderConfirmation(const TrainingAreaBase::FireSmokeMarker res.orderType = OrderType_e(byte); LtsUtils::get2Byte(tele, k, res.orderId); LtsUtils::get1Byte(tele, k, byte); - res.confirmation = EffectShowManagement::OrderConfirmation_e::inner_enum(byte); + res.confirmation = static_cast(byte); QByteArray qbArr; int ie = data.payload.size() - 5; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp index d7c48ccf2..e317bd602 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show.cpp @@ -591,8 +591,8 @@ void HandlerEffectShow::removeEffectShowsRelatedToAes(int idAes, bool retract) bool remove = false; if (it.value()->getIdAES() == idAes) { - if ((it.value()->getData().orderConfirmation != static_cast(EffectShowManagement::OrderConfirmation_e::Execution))) && - (it.value()->getData().orderConfirmation != static_cast(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)) + if ((it.value()->getData().orderConfirmation != static_cast(EffectShowManagement::OrderConfirmation_e::Execution)) && + (it.value()->getData().orderConfirmation != static_cast(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut))) remove = true; else INFO_LOG(m_logger) << "Effect Show: " << it.value()->getId() << " not removed due to EXECUTION / ORDER CARRIED OUT"; @@ -897,8 +897,8 @@ void HandlerEffectShow::onSendMeteoData() if (effectShow.esmParticipantId == -1) continue; // no actor allocated - if ((effectShow.orderConfirmation < static_cast(EffectShowManagement::OrderConfirmation_e::DriveOff))) || - (effectShow.orderConfirmation >= static_cast(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut)) + if ((effectShow.orderConfirmation < static_cast(EffectShowManagement::OrderConfirmation_e::DriveOff)) || + (effectShow.orderConfirmation >= static_cast(EffectShowManagement::OrderConfirmation_e::OrderCarriedOut))) continue; // effect show not processed triggerMeteoData(obj); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp index 45bf9e835..b031931c0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/handler_effect_show_actor_relocation.cpp @@ -75,7 +75,7 @@ void HandlerEffectShowActorRelocation::relocationOrderConfirmationReceived(const // add confirmation data auto data = ifs->getData(); - data.orderConfirmation = orderConfirmation.confirmation; + data.orderConfirmation = static_cast(orderConfirmation.confirmation); data.answertText = orderConfirmation.answerText; ifs->updateObject(data); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp index 1d823d8fe..7bfb03a32 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_aes_data.cpp @@ -102,7 +102,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Exp Database::EsmAesData res; res.idAes = data.id; res.nameAes = QString::fromStdString(data.name); - res.effectStateId = data.effectStateId; + res.effectStateId = static_cast(data.effectStateId); res.position = QPointF(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat); res.rotationAngle = data.area.rotation; res.depth = data.area.height; @@ -118,7 +118,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Exp Database::EsmAesData res; res.idAes = data.id; res.nameAes = QString::fromStdString(data.name); - res.effectStateId = data.effectStateId; + res.effectStateId = static_cast(data.effectStateId); res.position = QPointF(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat); res.rotationAngle = data.area.rotation; res.depth = data.area.height; @@ -135,7 +135,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Eff Database::EsmAesData res; res.idAes = data.id; res.nameAes = QString::fromStdString(data.name); - res.effectStateId = data.effectStateId; + res.effectStateId = static_cast(data.effectStateId); res.position = QPointF(data.area.cornerBottomLeft.lon, data.area.cornerBottomLeft.lat); res.rotationAngle = data.area.rotation; res.depth = data.area.height; @@ -164,7 +164,7 @@ Database::EsmAesData ObjectAesData::asEsmAesData(const AreaEffectSimulation::Min res.width = line.length(); res.idAes = data.id; res.nameAes = QString::fromStdString(data.name); - res.effectStateId = data.effectStateId; + res.effectStateId = static_cast(data.effectStateId); res.position = QPointF(segment.positionStart.lon, segment.positionStart.lat); res.depth = data.width; res.effectStart = data.effectStart.is_set() ? data.effectStart.get() : 0; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp index 31e214acb..df0e7975d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show.cpp @@ -115,7 +115,7 @@ Core::FunctionReplyObject ObjectEffectShow::updateObject(const EffectShowManagem m_data.areaDepth = data.areaDepth; m_data.areaWidth = data.areaWidth; m_data.areaRotation = data.areaRotation; - m_data.orderConfirmation = data.orderConfirmation; + m_data.orderConfirmation = static_cast(data.orderConfirmation); m_data.answerText = QString::fromStdString((data.answerText)); if (!m_mainHandler->db()->update(m_data)) @@ -135,7 +135,7 @@ bool ObjectEffectShow::updateObject(const ConvertFromTab::OrderConfirmation_t &d << "\n orderConfirmation " << m_data.orderConfirmation << " new: " << data.confirmation << "\n answerText " << m_data.answerText << " new: " << data.answerText; - m_data.orderConfirmation = data.confirmation; + m_data.orderConfirmation = static_cast(data.confirmation); m_data.answerText = data.answerText; if (!m_mainHandler->db()->update(m_data)) @@ -190,7 +190,7 @@ bool ObjectEffectShow::updateObject(const Database::EsmEffectShow &data) //============================================================================= bool ObjectEffectShow::resetOrderConfirmation() { - m_data.orderConfirmation = EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance; + m_data.orderConfirmation = static_cast(EffectShowManagement::OrderConfirmation_e::WaitingForAcceptance); m_data.answerText.clear(); if (!m_mainHandler->db()->update(m_data)) @@ -282,7 +282,7 @@ void ObjectEffectShow::onPublishData() ddsData.areaRotation = m_data.areaRotation; ddsData.typeOfAmmunition = m_data.typeOfAmmunition; - ddsData.orderConfirmation = EffectShowManagement::OrderConfirmation_e::inner_enum(m_data.orderConfirmation); + ddsData.orderConfirmation = static_cast(m_data.orderConfirmation); ddsData.answerText = m_data.answerText.toStdString(); ddsData.isDeleted = false; ddsData.isUsed = false; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.cpp index d891b22b2..313c208f4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_actor_relocation.cpp @@ -76,7 +76,7 @@ void ObjectEffectShowActorRelocation::onPublishData() ddsData.arrival_time = m_data.arrivalTime; ddsData.position = Core::GeoPosition2D(m_data.position.x(), m_data.position.y()); ddsData.info = m_data.info.toStdString(); - ddsData.orderConfirmation = EffectShowManagement::OrderConfirmation_e::inner_enum(m_data.orderConfirmation); + ddsData.orderConfirmation = static_cast(m_data.orderConfirmation); ddsData.answerText = m_data.answertText.toStdString(); ddsData.isDeleted = false; ddsData.isUsed = false; @@ -114,7 +114,7 @@ Database::EsmEffectShowActorRelocation ObjectEffectShowActorRelocation::ddsToDb( dbData.arrivalTime = ddsData.arrival_time.get(); dbData.position = QPointF(ddsData.position.lon, ddsData.position.lat); dbData.info = QString::fromStdString(ddsData.info); - dbData.orderConfirmation = ddsData.orderConfirmation; + dbData.orderConfirmation = static_cast(ddsData.orderConfirmation); dbData.answertText = QString::fromStdString(ddsData.answerText); return dbData; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.cpp index 47dbb40dd..8b0b6caf9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowManagement/object_effect_show_vehicle_status.cpp @@ -104,7 +104,7 @@ void ObjectEffectShowVehicleStatus::onPublishData() ddsData.ammunitionAvailable = m_data.ammunitionAvailable; ddsData.ammunitionMagazine = m_data.ammunitionMagazine; ddsData.controlComputerFail = m_data.controlComputerFail; - ddsData.feature = EffectShowManagement::Feature_e::type(m_data.feature); + ddsData.feature = EffectShowManagement::Feature_e(m_data.feature); ddsData.esmParticipantId = m_data.esmParticipantId; ddsData.inclinationSensorFail = m_data.inclinationSensorFail; ddsData.magazineFail = m_data.magazineFail; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp index a7b015cf7..2699e0419 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Evaluations/ModuleTests/evl_tests.cpp @@ -346,8 +346,8 @@ void EvlTests::tryCreateSanNineLiner() data.id = 0; data.lastModified = QDateTime::currentMSecsSinceEpoch(); - data.line1_position(Core::GeoPosition2D(0.100000, 0.2450000)); - data.line2_radioFrequencyCallSignSuffix("32.00 FM, Troublemaker"); + data.line1_position = Core::GeoPosition2D(0.100000, 0.2450000); + data.line2_radioFrequencyCallSignSuffix = "32.00 FM, Troublemaker"; Database::SanCategoryLine cl; std::vector vecCl; @@ -422,8 +422,8 @@ void EvlTests::tryModifySanNineLiner() data.id = m_sanNineLinerId; data.lastModified = QDateTime::currentMSecsSinceEpoch(); - data.line1_position(Core::GeoPosition2D(0.200000, 0.4560000)); - data.line2_radioFrequencyCallSignSuffix("39.000 FM, Troublemaker"); + data.line1_position = Core::GeoPosition2D(0.200000, 0.4560000); + data.line2_radioFrequencyCallSignSuffix = "39.000 FM, Troublemaker"; Database::SanCategoryLine cl; std::vector vecCl; @@ -730,8 +730,8 @@ void EvlTests::getCriteriumModifyRequestData(EvlCriteriumModifyRequest &data) //----------------------------------------------------------------------------- void EvlTests::getSanNineLinerModifyRequestData(SanNineLinerModifyRequest &data) { - data.line1_position(Core::GeoPosition2D(0.200000, 0.4560000)); - data.line2_radioFrequencyCallSignSuffix("39.000 FM, Troublemaker"); + data.line1_position = Core::GeoPosition2D(0.200000, 0.4560000); + data.line2_radioFrequencyCallSignSuffix = "39.000 FM, Troublemaker"; } // end of getNineLinerModifyRequestData() //----------------------------------------------------------------------------- diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp index 695795df6..82eae48c1 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp @@ -130,7 +130,7 @@ void EemTests::startTest() tryCreateDynamicParticipantData(2, ProjectDataManagement::VulnerabilityState::VulnerabilityState_LightDamage, time - 5000 * 30, 0, ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Sanitation); QTest::qWait(500); - checkEvents(ProjectDataManagement::PdmEventType::Sanitation, 3); + checkEvents(ProjectDataManagement::PdmEventType::EventType_Sanitation, 3); } if (m_testId <= 0 || m_testId > 6) @@ -264,8 +264,8 @@ void EemTests::trySendFireEvent() for(const ExerciseEventManagement::Event &e : events) { INFO_LOG(m_logger) << "eventId: " << e.id << ", eventType: " << e.eventTypeId; - if (e.eventTypeId == ProjectDataManagement::PdmEventType::WeaponAssignment || - e.eventTypeId == ProjectDataManagement::PdmEventType::FireEvent) + if (e.eventTypeId == ProjectDataManagement::PdmEventType::EventType_WeaponAssignment || + e.eventTypeId == ProjectDataManagement::PdmEventType::EventType_FireEvent) noEvents ++; } @@ -385,7 +385,7 @@ void EemTests::checkEvents(const ProjectDataManagement::PdmEventType &et, int ex int ot = prop[QStringLiteral("OriginatorType")].toInt(); if (et == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation && ot == 20) //ImprovisedExplosiveDevice noEvents ++; - if (et == ProjectDataManagement::PdmEventType::Sanitation && ot == 10) // Sanitation + if (et == ProjectDataManagement::PdmEventType::EventType_Sanitation && ot == 10) // Sanitation noEvents ++; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp index a3e470426..e0d56285b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp @@ -133,10 +133,10 @@ void HandlerDynamicParticipantData::onAesItemViewChanged(const AreaEffectSimulat { case DataModification::eAdded: case DataModification::eModified: - m_itemViews.insert(data.aesItemId(), data.aesTypeId()); + m_itemViews.insert(data.aesItemId, data.aesTypeId); break; case DataModification::eRemoved: - m_itemViews.remove(data.aesItemId()); + m_itemViews.remove(data.aesItemId); } } @@ -145,30 +145,30 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData, { DEBUG_LOG(m_logger) << "tryCreateHitEvent"; // special values - ignore - const ProjectDataManagement::VulnerabilityState vulnState = stateInfo.vulnerabilityState(); - if (vulnState == ProjectDataManagement::VulnerabilityState_def::VulnerabilityBitsChanged || - vulnState == ProjectDataManagement::VulnerabilityState_def::TemporarySeverance) + const ProjectDataManagement::VulnerabilityState vulnState = stateInfo.vulnerabilityState; + if (vulnState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged || + vulnState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance) return; // combat ready is no hit - if (vulnState == ProjectDataManagement::VulnerabilityState_def::CombatReady) + if (vulnState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady) return; // only handle 'real' hit events - switch (stateInfo.originatorType().underlying()) + switch (stateInfo.originatorType.underlying()) { case ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation: case ProjectDataManagement::StateChangeOriginator::ImprovisedExplosiveDevice: case ProjectDataManagement::StateChangeOriginator::DusMine: - eData.eventTypeId = ProjectDataManagement::PdmEventType::HitEffectSimulation; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation; break; case ProjectDataManagement::StateChangeOriginator::Participant: case ProjectDataManagement::StateChangeOriginator::ObserverController: case ProjectDataManagement::StateChangeOriginator::ExerciseControl: - eData.eventTypeId = ProjectDataManagement::PdmEventType::Hit; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Hit; break; case ProjectDataManagement::StateChangeOriginator::Sanitation: - eData.eventTypeId = ProjectDataManagement::PdmEventType::Sanitation; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Sanitation; break; case ProjectDataManagement::StateChangeOriginator::Unknown: case ProjectDataManagement::StateChangeOriginator::WoundTreatmentDevice: @@ -181,47 +181,47 @@ void HandlerDynamicParticipantData::tryCreateHitEvent(Database::EemEvent eData, QJsonObject obj; obj[QStringLiteral("VulnerabilityState")] = vulnState.underlying(); - obj[QStringLiteral("OriginatorId")] = stateInfo.originatorId(); - obj[QStringLiteral("OriginatorType")] = stateInfo.originatorType().underlying(); - obj[QStringLiteral("OriginatorChargeTypeId")] = stateInfo.originatorChargeTypeId(); + obj[QStringLiteral("OriginatorId")] = stateInfo.originatorId; + obj[QStringLiteral("OriginatorType")] = stateInfo.originatorType.underlying(); + obj[QStringLiteral("OriginatorChargeTypeId")] = stateInfo.originatorChargeTypeId; - if (stateInfo.originatorType() == ProjectDataManagement::StateChangeOriginator::Participant) + if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::Participant) { - ParticipantManagement::Participant originData = m_partMap.value(stateInfo.originatorId()); + ParticipantManagement::Participant originData = m_partMap.value(stateInfo.originatorId); if (originData.equipmentNumber.is_set()) obj[QStringLiteral("OriginatorEquipmentNumber")] = originData.equipmentNumber.get(); - if (originData.partyId() == eData.partyId) + if (originData.partyId == eData.partyId) obj[QStringLiteral("FriendlyFire")] = true; else obj[QStringLiteral("FriendlyFire")] = false; } - if (eData.eventTypeId == ProjectDataManagement::PdmEventType::HitEffectSimulation) + if (eData.eventTypeId == ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation) { - DEBUG_LOG(m_logger) << "Event HitEffectSimulation from originatorId = " << stateInfo.originatorId(); - obj[QStringLiteral("AesId")] = stateInfo.originatorId(); - obj[QStringLiteral("AesType")] = m_itemViews.value(stateInfo.originatorId()).underlying(); + DEBUG_LOG(m_logger) << "Event HitEffectSimulation from originatorId = " << stateInfo.originatorId; + obj[QStringLiteral("AesId")] = stateInfo.originatorId; + obj[QStringLiteral("AesType")] = m_itemViews.value(stateInfo.originatorId).underlying(); AreaEffectSimulation::AesItem aesItem; - if (m_aesDtc->aesItemFromId(stateInfo.originatorId(), aesItem)) - obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name())); + if (m_aesDtc->aesItemFromId(stateInfo.originatorId, aesItem)) + obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name)); } - if (eData.eventTypeId == ProjectDataManagement::PdmEventType::Sanitation) + if (eData.eventTypeId == ProjectDataManagement::PdmEventType::EventType_Sanitation) { // ignore these events - if (stateInfo.sanitationProceduresTaken() == 0 && stateInfo.originatorChargeTypeId() == 0) //qualification + if (stateInfo.sanitationProceduresTaken == 0 && stateInfo.originatorChargeTypeId == 0) //qualification return; DEBUG_LOG(m_logger) << "Event sanitation "; - obj[QStringLiteral("Vitality")] = stateInfo.vitality(); - obj[QStringLiteral("SanitationResult")] = stateInfo.sanitationResult().underlying(); - obj[QStringLiteral("SanitationProceduresTaken")] = stateInfo.sanitationProceduresTaken(); + obj[QStringLiteral("Vitality")] = stateInfo.vitality; + obj[QStringLiteral("SanitationResult")] = stateInfo.sanitationResult.underlying(); + obj[QStringLiteral("SanitationProceduresTaken")] = stateInfo.sanitationProceduresTaken; } eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); eData.id = 0; if (eData.sampleTime <= 0) - eData.sampleTime = stateInfo.stateTime(); + eData.sampleTime = stateInfo.stateTime; if (!m_dbHandler->db()->insert(eData)) ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << eData.participantId; @@ -237,105 +237,105 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic return; DEBUG_LOG(m_logger) << "onDynamicParticipantDataChanged()" - << ", participantId: " << data.participantId() - << ", size stateHistory: " << data.stateHistory().size(); + << ", participantId: " << data.participantId + << ", size stateHistory: " << data.stateHistory.size(); - auto itLastDynData = m_lastDynData.find(data.participantId()); + auto itLastDynData = m_lastDynData.find(data.participantId); // the first insert does not trigger any updates if (itLastDynData == m_lastDynData.end()) { - itLastDynData = m_lastDynData.insert(data.participantId(), data); + itLastDynData = m_lastDynData.insert(data.participantId, data); return; } ParticipantManagement::DynamicParticipantData &lastDynData = itLastDynData.value(); // get corresponding participant data - auto itParticipant = m_partMap.find(data.participantId()); + auto itParticipant = m_partMap.find(data.participantId); if (itParticipant == m_partMap.end()) { m_ppmDtc->waitForHistoricalDataParticipant(2000); - itParticipant = m_partMap.find(data.participantId()); + itParticipant = m_partMap.find(data.participantId); if (itParticipant == m_partMap.end()) { - ERROR_LOG(m_logger) << "Participant does not exist: participantId: " << data.participantId(); + ERROR_LOG(m_logger) << "Participant does not exist: participantId: " << data.participantId; return; } } static const ParticipantManagement::ParticipantPosition emptyPos; - auto itParticipantPos = m_partPosMap.find(data.participantId()); + auto itParticipantPos = m_partPosMap.find(data.participantId); const ParticipantManagement::ParticipantPosition &pPos = itParticipantPos == m_partPosMap.end() ? emptyPos : itParticipantPos.value(); const ParticipantManagement::Participant &pData = itParticipant.value(); Database::EemEvent eData; - eData.participantId = data.participantId(); + eData.participantId = data.participantId; eData.equipmentNumber = pData.equipmentNumber.is_set() ? pData.equipmentNumber.get() : -1; - eData.partyId = pData.partyId(); - eData.sampleTime = data.sampleTime(); - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::Unknown; - eData.position = LtsUtils::QPoint3D(pPos.pos().lon(), pPos.pos().lat(), pPos.pos().z()); + eData.partyId = pData.partyId; + eData.sampleTime = data.sampleTime; + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_Unknown; + eData.position = LtsUtils::QPoint3D(pPos.pos.lon, pPos.pos.lat, pPos.pos.z); - if (data.stateHistory() != lastDynData.stateHistory()) + if (data.stateHistory != lastDynData.stateHistory) { // we assume that the order of the state information do *not* change (it's current true: january 2020) - for (size_t i = 0; i < data.stateHistory().size(); ++i) + for (size_t i = 0; i < data.stateHistory.size(); ++i) { - if (i < lastDynData.stateHistory().size() && - data.stateHistory().at(i) == lastDynData.stateHistory().at(i)) + if (i < lastDynData.stateHistory.size() && + data.stateHistory.at(i) == lastDynData.stateHistory.at(i)) continue; - tryCreateHitEvent(eData, data.stateHistory().at(i)); + tryCreateHitEvent(eData, data.stateHistory.at(i)); } } const auto gearIsKnown = [ &lastDynData](const ParticipantManagement::GearInformation & gi) -> bool { - return std::any_of(lastDynData.gear().begin(), lastDynData.gear().end(), + return std::any_of(lastDynData.gear.begin(), lastDynData.gear.end(), [&gi](const ParticipantManagement::GearInformation & other) { - return gi.gearTypeId() == other.gearTypeId() && gi.gearId() == other.gearId(); + return gi.gearTypeId == other.gearTypeId && gi.gearId == other.gearId; }); }; - for (const ParticipantManagement::GearInformation &gi : data.gear()) + for (const ParticipantManagement::GearInformation &gi : data.gear) { if (gearIsKnown(gi)) continue; - DEBUG_LOG(m_logger) << "Found new gear " << gi << " for participant " << data.participantId(); + DEBUG_LOG(m_logger) << "Found new gear " << gi << " for participant " << data.participantId; QJsonObject obj; - obj[QStringLiteral("GearId")] = QJsonValue(gi.gearId()); - obj[QStringLiteral("GearTypeId")] = QJsonValue(gi.gearTypeId()); - obj[QStringLiteral("DryFire")] = QJsonValue(gi.chargeCounting()); + obj[QStringLiteral("GearId")] = QJsonValue(gi.gearId); + obj[QStringLiteral("GearTypeId")] = QJsonValue(gi.gearTypeId); + obj[QStringLiteral("DryFire")] = QJsonValue(gi.chargeCounting); eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); - eData.sampleTime = gi.lastUpdate(); - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::WeaponAssignment; + eData.sampleTime = gi.lastUpdate; + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_WeaponAssignment; eData.id = 0; if (!m_dbHandler->db()->insert(eData)) - ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId(); + ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId; else publishData(eData); } - if (data.manipulation() != lastDynData.manipulation()) + if (data.manipulation != lastDynData.manipulation) { - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::Manipulation; + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_Manipulation; const auto isOldManipulation = [&lastDynData](const ParticipantManagement::ManipulationInformation & mani) -> bool { - auto it = std::find(lastDynData.manipulation().begin(), lastDynData.manipulation().end(), mani); - return it != lastDynData.manipulation().end(); + auto it = std::find(lastDynData.manipulation.begin(), lastDynData.manipulation.end(), mani); + return it != lastDynData.manipulation.end(); }; // we can *not* assume that the old and the new manipulation is in the same order - for (const auto &mani : data.manipulation()) + for (const auto &mani : data.manipulation) { if (isOldManipulation(mani)) continue; - const QJsonObject obj({{QStringLiteral("DeviceType"), mani.equipmentFunctionId()}}); + const QJsonObject obj({{QStringLiteral("DeviceType"), mani.equipmentFunctionId}}); eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); - eData.sampleTime = mani.manipulationTime(); + eData.sampleTime = mani.manipulationTime; eData.id = 0; if (!m_dbHandler->db()->insert(eData)) - ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId(); + ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId; else publishData(eData); } @@ -353,45 +353,45 @@ void HandlerDynamicParticipantData::onParticipantGearEventChanged(const Particip return; // get corresponding participant data - auto itParticipant = m_partMap.find(data.participantId()); + auto itParticipant = m_partMap.find(data.participantId); if (itParticipant == m_partMap.end()) { m_ppmDtc->waitForHistoricalDataParticipant(2000); - itParticipant = m_partMap.find(data.participantId()); + itParticipant = m_partMap.find(data.participantId); if (itParticipant == m_partMap.end()) { - ERROR_LOG(m_logger) << "Participant does not exist: participantId: " << data.participantId(); + ERROR_LOG(m_logger) << "Participant does not exist: participantId: " << data.participantId; return; } } static const ParticipantManagement::ParticipantPosition emptyPos; - auto itParticipantPos = m_partPosMap.find(data.participantId()); + auto itParticipantPos = m_partPosMap.find(data.participantId); const ParticipantManagement::ParticipantPosition &pPos = itParticipantPos == m_partPosMap.end() ? emptyPos : itParticipantPos.value(); const ParticipantManagement::Participant &pData = itParticipant.value(); Database::EemEvent eData; eData.id = 0; - eData.participantId = data.participantId(); + eData.participantId = data.participantId; eData.equipmentNumber = pData.equipmentNumber.is_set() ? pData.equipmentNumber.get() : -1; - eData.partyId = pData.partyId(); - eData.sampleTime = data.sampleTime(); - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::FireEvent; - eData.position = LtsUtils::QPoint3D(pPos.pos().lon(), pPos.pos().lat(), pPos.pos().z()); + eData.partyId = pData.partyId; + eData.sampleTime = data.sampleTime; + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_FireEvent; + eData.position = LtsUtils::QPoint3D(pPos.pos.lon, pPos.pos.lat, pPos.pos.z); QJsonObject obj; - obj[QStringLiteral("GearId")] = QJsonValue(data.charge().gearId()); - obj[QStringLiteral("GearTypeId")] = QJsonValue(data.charge().gearTypeId()); - obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.charge().chargeTypeId()); - obj[QStringLiteral("Amount")] = QJsonValue(data.chargeAmount()); - if (data.charge().remain() >= 0) - obj[QStringLiteral("Remain")] = QJsonValue(data.charge().remain()); + obj[QStringLiteral("GearId")] = QJsonValue(data.charge.gearId); + obj[QStringLiteral("GearTypeId")] = QJsonValue(data.charge.gearTypeId); + obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.charge.chargeTypeId); + obj[QStringLiteral("Amount")] = QJsonValue(data.chargeAmount); + if (data.charge.remain >= 0) + obj[QStringLiteral("Remain")] = QJsonValue(data.charge.remain); eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); eData.id = 0; - DEBUG_LOG(m_logger) << "create fire event for participant " << data.participantId(); + DEBUG_LOG(m_logger) << "create fire event for participant " << data.participantId; if (!m_dbHandler->db()->insert(eData)) - ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId(); + ERROR_LOG(m_logger) << "Error while inserting event data for participant: " << data.participantId; else publishData(eData); } @@ -404,13 +404,13 @@ void HandlerDynamicParticipantData::onParticipantChanged(const ParticipantManage case DataModification::eAdded: case DataModification::eModified: DEBUG_LOG(m_logger) << "added/modified"; - m_partMap.insert(data.id(), data); - DEBUG_LOG(m_logger) << "data.participantId: " << data.id() - << ", data.partyId: " << data.partyId() - << ". data.equipmentNumber: " << data.equipmentNumber(); + m_partMap.insert(data.id, data); + DEBUG_LOG(m_logger) << "data.participantId: " << data.id + << ", data.partyId: " << data.partyId + << ". data.equipmentNumber: " << data.equipmentNumber; break; case DataModification::eRemoved: - m_partMap.remove(data.id()); + m_partMap.remove(data.id); break; } } @@ -422,13 +422,13 @@ void HandlerDynamicParticipantData::onParticipantPositionChanged(const Participa { case DataModification::eAdded: case DataModification::eModified: - m_partPosMap.insert(data.participantId(), data); - DEBUG_LOG(m_logger) << "data.participantId: " << data.participantId() - << ", position lat: " << data.pos().lat() - << ", position lon: " << data.pos().lon(); + m_partPosMap.insert(data.participantId, data); + DEBUG_LOG(m_logger) << "data.participantId: " << data.participantId + << ", position lat: " << data.pos.lat + << ", position lon: " << data.pos.lon; break; case DataModification::eRemoved: - m_partPosMap.remove(data.participantId()); + m_partPosMap.remove(data.participantId); break; } } @@ -442,37 +442,37 @@ void HandlerDynamicParticipantData::onBiteChanged(const ParticipantManagement::B Database::EemEvent eData; eData.id = 0; - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::BiteMessage; - eData.equipmentNumber = data.equipmentNumber(); - eData.participantId = data.participantId(); - eData.sampleTime = data.sampleTime(); + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_BiteMessage; + eData.equipmentNumber = data.equipmentNumber; + eData.participantId = data.participantId; + eData.sampleTime = data.sampleTime; QJsonObject obj; - obj[QStringLiteral("BatteryState")] = QJsonValue(data.batteryState()); - obj[QStringLiteral("BiteState")] = QJsonValue(data.biteState()); - obj[QStringLiteral("ConfigState")] = QJsonValue(data.configState()); + obj[QStringLiteral("BatteryState")] = QJsonValue(data.batteryState); + obj[QStringLiteral("BiteState")] = QJsonValue(data.biteState); + obj[QStringLiteral("ConfigState")] = QJsonValue(data.configState); QJsonArray array; - for (const ParticipantManagement::BiteError &be : data.biteErrors()) + for (const ParticipantManagement::BiteError &be : data.biteErrors) { QJsonObject object; - object[QStringLiteral("ErrorNo")] = QJsonValue(be.errorNumber()); - object[QStringLiteral("CanDeviceNumber")] = QJsonValue(be.canDeviceNumber()); - object[QStringLiteral("SubdeviceNumber")] = QJsonValue(be.subdeviceNumber()); - object[QStringLiteral("UniqueId")] = QJsonValue(be.uniqueId()); + object[QStringLiteral("ErrorNo")] = QJsonValue(be.errorNumber); + object[QStringLiteral("CanDeviceNumber")] = QJsonValue(be.canDeviceNumber); + object[QStringLiteral("SubdeviceNumber")] = QJsonValue(be.subdeviceNumber); + object[QStringLiteral("UniqueId")] = QJsonValue(be.uniqueId); array.append(object); } obj[QStringLiteral("BiteErrors")] = QJsonValue(array); eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); - ParticipantManagement::Participant part = m_partMap.value(data.participantId()); - if (part.id() > 0) + ParticipantManagement::Participant part = m_partMap.value(data.participantId); + if (part.id > 0) { - eData.partyId = part.partyId(); + eData.partyId = part.partyId; ParticipantManagement::ParticipantPosition pPos = m_partPosMap.value(eData.participantId); - eData.position = LtsUtils::QPoint3D(pPos.pos().lon(), pPos.pos().lat(), pPos.pos().z()); + eData.position = LtsUtils::QPoint3D(pPos.pos.lon, pPos.pos.lat, pPos.pos.z); } else { @@ -481,7 +481,7 @@ void HandlerDynamicParticipantData::onBiteChanged(const ParticipantManagement::B } if (!m_dbHandler->db()->insert(eData)) - ERROR_LOG(m_logger) << "Error while inserting event data for participantId: " << data.participantId(); + ERROR_LOG(m_logger) << "Error while inserting event data for participantId: " << data.participantId; else publishData(eData); } @@ -489,56 +489,56 @@ void HandlerDynamicParticipantData::onBiteChanged(const ParticipantManagement::B //----------------------------------------------------------------------------- void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::BuildingState &data, DataModification modType) { - if (modType == DataModification::eRemoved || data.damagePercent() <= 0) // only add hits + if (modType == DataModification::eRemoved || data.damagePercent <= 0) // only add hits return; Database::EemEvent eData; eData.id = 0; - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitBuilding; - eData.sampleTime = data.sampleTime(); + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitBuilding; + eData.sampleTime = data.sampleTime; QJsonObject obj; - obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeTypeId()); - obj[QStringLiteral("damagePercent")] = QJsonValue(data.damagePercent()); - obj[QStringLiteral("damagePercentOld")] = QJsonValue(data.damagePercentOld()); + obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeTypeId); + obj[QStringLiteral("damagePercent")] = QJsonValue(data.damagePercent); + obj[QStringLiteral("damagePercentOld")] = QJsonValue(data.damagePercentOld); // obj[QStringLiteral("Name")] = QJsonValue(data.name()); - obj[QStringLiteral("VulnerabilityState")] = QJsonValue(data.vulnerabilityState().underlying()); + obj[QStringLiteral("VulnerabilityState")] = QJsonValue(data.vulnerabilityState.underlying()); - if (data.originatorType() == ProjectDataManagement::StateChangeOriginator::Participant) + if (data.originatorType == ProjectDataManagement::StateChangeOriginator::Participant) { - ParticipantManagement::Participant originData = m_partMap.value(data.originatorParticipantId()); + ParticipantManagement::Participant originData = m_partMap.value(data.originatorParticipantId); if (originData.equipmentNumber.is_set()) obj[QStringLiteral("OriginatorEquipmentNumber")] = originData.equipmentNumber.get(); } - if (data.originatorType() == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation) + if (data.originatorType == ProjectDataManagement::StateChangeOriginator::AreaEffectSimulation) { - obj[QStringLiteral("AesId")] = data.aesId(); - obj[QStringLiteral("AesType")] = m_itemViews.value(data.aesId()).underlying(); + obj[QStringLiteral("AesId")] = data.aesId; + obj[QStringLiteral("AesType")] = m_itemViews.value(data.aesId).underlying(); AreaEffectSimulation::AesItem aesItem; - if (m_aesDtc->aesItemFromId(data.aesId(), aesItem)) - obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name())); + if (m_aesDtc->aesItemFromId(data.aesId, aesItem)) + obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name)); } //obj[QStringLiteral("StructureElementId")] = QJsonValue(data.structureElementId()); - obj[QStringLiteral("MainStructureElementId")] = QJsonValue(data.id()); + obj[QStringLiteral("MainStructureElementId")] = QJsonValue(data.id); QJsonArray contaminationArr; - for (const auto &cs: data.contaminationStates()) + for (const auto &cs: data.contaminationStates) { QJsonArray roomArr; - for (const auto &roomId : qAsConst(cs.rooms())) + for (const auto &roomId : qAsConst(cs.rooms)) roomArr.append(QJsonValue(roomId)); - contaminationArr.append(QJsonObject({{QStringLiteral("aesId") , cs.aesId()}, + contaminationArr.append(QJsonObject({{QStringLiteral("aesId") , cs.aesId}, {QStringLiteral("rooms"), roomArr}})); } obj[QStringLiteral("contaminationStates")] = contaminationArr; - int mainStructureElementId = data.id(); - Core::GeoPosition geoPosition = m_mainStructureElements.value(mainStructureElementId).geoPosition(); - LtsUtils::QPoint3D pos3D(geoPosition.lon(), geoPosition.lat(), geoPosition.z()); + int mainStructureElementId = data.id; + Core::GeoPosition geoPosition = m_mainStructureElements.value(mainStructureElementId).geoPosition; + LtsUtils::QPoint3D pos3D(geoPosition.lon, geoPosition.lat, geoPosition.z); eData.position = pos3D; eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); @@ -560,7 +560,7 @@ void HandlerDynamicParticipantData::publishData(const Database::EemEvent &data) ERROR_LOG(m_logger) << "Error publishing event-data to dds"; // take data from dds-bus after 10s, we need just to make sure the recording service got it - m_mainHandler->addEventIdToRemove(ddsData.id()); + m_mainHandler->addEventIdToRemove(ddsData.id); } //----------------------------------------------------------------------------- @@ -568,20 +568,20 @@ ExerciseEventManagement::Event HandlerDynamicParticipantData::toDdsData(const Da { ExerciseEventManagement::Event ddsData; - ddsData.id(data.id); - ddsData.sampleTime(data.sampleTime); - ddsData.participantId(data.participantId); - ddsData.partyId(data.partyId); - ddsData.equipmentNumber(data.equipmentNumber); - ddsData.eventTypeId(data.eventTypeId); - ddsData.properties(data.properties.toStdString()); - ddsData.position(Core::GeoPosition(data.position.x(), data.position.y(), data.position.z())); + ddsData.id = data.id; + ddsData.sampleTime = data.sampleTime; + ddsData.participantId = data.participantId; + ddsData.partyId = data.partyId; + ddsData.equipmentNumber = data.equipmentNumber; + ddsData.eventTypeId = data.eventTypeId; + ddsData.properties = data.properties.toStdString(); + ddsData.position = Core::GeoPosition(data.position.x(), data.position.y(), data.position.z()); - if (data.eventTypeId == ProjectDataManagement::PdmEventType_def::HitBuilding) + if (data.eventTypeId == ProjectDataManagement::PdmEventType::PdmEventType_HitBuilding) { - int mainStructureElementId = LtsUtils::JsonObject::fromJson(ddsData.properties()).valueOr(QStringLiteral("MainStructureElementId"), 0); + int mainStructureElementId = LtsUtils::JsonObject::fromJson(ddsData.properties).valueOr(QStringLiteral("MainStructureElementId"), 0); DEBUG_LOG(m_logger) << "MainStructureElementId=" << mainStructureElementId; - ddsData.position(m_mainStructureElements.value(mainStructureElementId).geoPosition()); + ddsData.position = m_mainStructureElements.value(mainStructureElementId).geoPosition; } return ddsData; @@ -596,11 +596,11 @@ void HandlerDynamicParticipantData::onMainStructureElementChanged(const Infrastr if (modType != DataModification::eAdded && modType != DataModification::eModified) { - m_mainStructureElements.remove(data.id()); + m_mainStructureElements.remove(data.id); return; } - m_mainStructureElements.insert(data.id(), data); + m_mainStructureElements.insert(data.id, data); DEBUG_LOG(m_logger) << "Got MainStructureElement: " << data; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp index f65b4ee68..f7e53b43a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp @@ -76,21 +76,21 @@ bool HandlerEquipmentErrorRegistration::init() void HandlerEquipmentErrorRegistration::onEquipmentErrorRegistrationChanged(const OcSituationServer::EquipmentErrorRegistration &data, DataModification modType) { INFO_LOG(m_logger) << "onEquipmentErrorRegistrationChanged()" - << ", equipmentNr: " << data.equipmentNumber() - << ", text: " << QString::fromStdString(data.text()); + << ", equipmentNr: " << data.equipmentNumber + << ", text: " << QString::fromStdString(data.text); if (modType == DataModification::eRemoved) return; Database::EemEvent eData; - eData.sampleTime = data.sampleTime(); - eData.equipmentNumber = data.equipmentNumber(); - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EquipmentErrorReport; + eData.sampleTime = data.sampleTime; + eData.equipmentNumber = data.equipmentNumber; + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EquipmentErrorReport; QJsonObject obj; - obj[QStringLiteral("text")] = QString::fromStdString(data.text()); - obj[QStringLiteral("device")] = QString::fromStdString(data.device()); - obj[QStringLiteral("participant")] = QString::fromStdString(data.participant()); + obj[QStringLiteral("text")] = QString::fromStdString(data.text); + obj[QStringLiteral("device")] = QString::fromStdString(data.device); + obj[QStringLiteral("participant")] = QString::fromStdString(data.participant); eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); @@ -112,21 +112,21 @@ void HandlerEquipmentErrorRegistration::publishData(const Database::EemEvent &da ERROR_LOG(m_logger) << "Error publishing event-data to dds"; // take data from dds-bus after 10s, we need just to make sure the recording service got it - m_mainHandler->addEventIdToRemove(ddsData.id()); + m_mainHandler->addEventIdToRemove(ddsData.id); } ExerciseEventManagement::Event HandlerEquipmentErrorRegistration::toDdsData(const Database::EemEvent &data) { ExerciseEventManagement::Event ddsData; - ddsData.id(data.id); - ddsData.sampleTime(data.sampleTime); - ddsData.participantId(data.participantId); - ddsData.partyId(data.partyId); - ddsData.equipmentNumber(data.equipmentNumber); - ddsData.eventTypeId(data.eventTypeId); - ddsData.properties(data.properties.toStdString()); - ddsData.position(Core::GeoPosition(data.position.x(), data.position.y(), data.position.z())); + ddsData.id = data.id; + ddsData.sampleTime = data.sampleTime; + ddsData.participantId = data.participantId; + ddsData.partyId = data.partyId; + ddsData.equipmentNumber = data.equipmentNumber; + ddsData.eventTypeId = data.eventTypeId; + ddsData.properties = data.properties.toStdString(); + ddsData.position = Core::GeoPosition(data.position.x(), data.position.y(), data.position.z()); return ddsData; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp index bfed90b88..bb0b485e9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp @@ -85,10 +85,10 @@ bool HandlerParticipantEvent::init() void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::AesItemView &data, DataModification modType) { - DEBUG_LOG(m_logger) << "AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId(); + DEBUG_LOG(m_logger) << "AesItemId: " << data.aesItemId << ", effectState: " << data.effectStateId; - Database::EemEvent eData = m_aesMap[data.id()]; - eData.sampleTime = data.effectStart(); + Database::EemEvent eData = m_aesMap[data.id]; + eData.sampleTime = data.effectStart; if (data.partyId.is_set()) eData.partyId = data.partyId.get(); @@ -96,24 +96,24 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A switch(modType) { case DataModification::eAdded: - m_itemViews.insert(data.aesItemId(), data.aesTypeId()); - DEBUG_LOG(m_logger) << "eAdded: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId(); - m_aesEffectState.insert(data.aesItemId(), data.effectStateId()); + m_itemViews.insert(data.aesItemId, data.aesTypeId); + DEBUG_LOG(m_logger) << "eAdded: AesItemId: " << data.aesItemId << ", effectState: " << data.effectStateId; + m_aesEffectState.insert(data.aesItemId, data.effectStateId); - if (data.aesTypeId() == AreaEffectSimulation::AesType_def::AtBorderline) + if (data.aesTypeId == AreaEffectSimulation::AesType::AesType_AtBorderline) { AreaEffectSimulation::AesItem aesItem; - m_aesDtc->aesItemFromId(data.aesItemId(), aesItem); + m_aesDtc->aesItemFromId(data.aesItemId, aesItem); QJsonObject obj; - obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id()); - obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name())); - obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId().underlying()); + obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id); + obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name)); + obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId.underlying()); eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); - eData.eventTypeId = ProjectDataManagement::PdmEventType::Borderline; - eData.position = LtsUtils::QPoint3D(data.boundingBoxBottomLeft().lon(), - data.boundingBoxBottomLeft().lat(), 0.0); + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Borderline; + eData.position = LtsUtils::QPoint3D(data.boundingBoxBottomLeft.lon, + data.boundingBoxBottomLeft.lat, 0.0); if (!m_dbHandler->db()->insert(eData)) ERROR_LOG(m_logger) << "Error while inserting event data from AES "; @@ -123,89 +123,89 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A break; case DataModification::eModified: { - AreaEffectSimulation::AesEffectState effectState = m_aesEffectState.value(data.aesItemId()); + AreaEffectSimulation::AesEffectState effectState = m_aesEffectState.value(data.aesItemId); - DEBUG_LOG(m_logger) << "eModified: AesItemId: " << data.aesItemId() << ", effectState: " << data.effectStateId(); + DEBUG_LOG(m_logger) << "eModified: AesItemId: " << data.aesItemId << ", effectState: " << data.effectStateId; DEBUG_LOG(m_logger) << "effectState: " << effectState; // insert event only once if (effectState != AreaEffectSimulation::AesEffectState::EsPrepared && - (effectState == AreaEffectSimulation::AesEffectState_def::EsActivated && data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsExpired)) + (effectState == AreaEffectSimulation::AesEffectState::AesEffectState_EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::AesEffectState_EsExpired)) return; - INFO_LOG(m_logger) << "new/update event: aesId: " << data.aesItemId(); + INFO_LOG(m_logger) << "new/update event: aesId: " << data.aesItemId; - m_aesEffectState.insert(data.aesItemId(), data.effectStateId()); - m_itemViews.insert(data.aesItemId(), data.aesTypeId()); - eData.position = LtsUtils::QPoint3D(data.boundingBoxBottomLeft().lon(), - data.boundingBoxBottomLeft().lat(), 0.0); + m_aesEffectState.insert(data.aesItemId, data.effectStateId); + m_itemViews.insert(data.aesItemId, data.aesTypeId); + eData.position = LtsUtils::QPoint3D(data.boundingBoxBottomLeft.lon, + data.boundingBoxBottomLeft.lat, 0.0); - INFO_LOG(m_logger) << "aesType: " << data.aesTypeId(); + INFO_LOG(m_logger) << "aesType: " << data.aesTypeId; - switch (data.aesTypeId().underlying()) + switch (data.aesTypeId.underlying()) { case AreaEffectSimulation::AesType::AtMineArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType::MineArea; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_MineArea; break; case AreaEffectSimulation::AesType::AtExplosionArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType::HitEffectSimulation; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_HitEffectSimulation; break; case AreaEffectSimulation::AesType::AtExplosionCluster: - eData.eventTypeId = ProjectDataManagement::PdmEventType::ExplosionCluster; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_ExplosionCluster; break; case AreaEffectSimulation::AesType::AtMineAreaSingleMines: return; case AreaEffectSimulation::AesType::AtNContamination: - eData.eventTypeId = ProjectDataManagement::PdmEventType::NContamination; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_NContamination; break; case AreaEffectSimulation::AesType::AtBCContamination: - eData.eventTypeId = ProjectDataManagement::PdmEventType::BCContamination; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_BCContamination; break; case AreaEffectSimulation::AesType::AtBorderline: - eData.eventTypeId = ProjectDataManagement::PdmEventType::Borderline; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_Borderline; break; case AreaEffectSimulation::AesType::AtDangerArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType::DangerArea; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_DangerArea; break; case AreaEffectSimulation::AesType::AtFunctionalArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType::FunctionalArea; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_FunctionalArea; break; case AreaEffectSimulation::AesType::AtMineCorridor: - eData.eventTypeId = ProjectDataManagement::PdmEventType::MineCorridor; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_MineCorridor; break; case AreaEffectSimulation::AesType::AtTechnicalArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType::TechnicalArea; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_TechnicalArea; break; case AreaEffectSimulation::AesType::AtGasPipe: - eData.eventTypeId = ProjectDataManagement::PdmEventType::GasPipe; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_GasPipe; break; // No ExerciseEvent for AesType default: { - INFO_LOG(m_logger) << "No ExerciseEvent for AesType:" << data.aesTypeId().underlying(); + INFO_LOG(m_logger) << "No ExerciseEvent for AesType:" << data.aesTypeId.underlying(); return; } } AreaEffectSimulation::AesItem aesItem; - m_aesDtc->aesItemFromId(data.aesItemId(), aesItem); + m_aesDtc->aesItemFromId(data.aesItemId, aesItem); - if (eData.eventTypeId == ProjectDataManagement::PdmEventType::ExplosionCluster) + if (eData.eventTypeId == ProjectDataManagement::PdmEventType::EventType_ExplosionCluster) { - ProjectDataManagement::GearClass gearClass = m_pdmDtc->gearClassFromChargeTypeId(aesItem.chargeStruct().chargeTypeId()); - if (gearClass == ProjectDataManagement::GearClass_def::AirSupport) - eData.eventTypeId = ProjectDataManagement::PdmEventType::AirSupport; + ProjectDataManagement::GearClass gearClass = m_pdmDtc->gearClassFromChargeTypeId(aesItem.chargeStruct.chargeTypeId); + if (gearClass == ProjectDataManagement::GearClass::GearClass_AirSupport) + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_AirSupport; } QJsonObject obj; - obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id()); - obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name())); - obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId().underlying()); - if (data.aesTypeId().underlying() != AreaEffectSimulation::AesType::AtBorderline) + obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id); + obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name)); + obj[QStringLiteral("AesType")] = QJsonValue(data.aesTypeId.underlying()); + if (data.aesTypeId.underlying() != AreaEffectSimulation::AesType::AtBorderline) { - obj[QStringLiteral("duration")] = QJsonValue(aesItem.effectDuration()); - obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeStruct().chargeTypeId()); - obj[QStringLiteral("endTime")] = QJsonValue(data.effectStart() + aesItem.effectDuration()); + obj[QStringLiteral("duration")] = QJsonValue(aesItem.effectDuration); + obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeStruct.chargeTypeId); + obj[QStringLiteral("endTime")] = QJsonValue(data.effectStart + aesItem.effectDuration); } eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); @@ -216,7 +216,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A ERROR_LOG(m_logger) << "Error while inserting event data from AES "; break; } - m_aesMap.insert(data.id(), eData); + m_aesMap.insert(data.id, eData); } else { @@ -231,8 +231,8 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A } case DataModification::eRemoved: { - m_itemViews.remove(data.aesItemId()); - m_aesMap.remove(data.id()); + m_itemViews.remove(data.aesItemId); + m_aesMap.remove(data.id); break; } } @@ -241,7 +241,7 @@ void HandlerParticipantEvent::onAesItemViewChanged(const AreaEffectSimulation::A void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulation::ExplosionSingle &data, DataModification modType) { - Database::EemEvent eData = m_aesMap[data.id()]; + Database::EemEvent eData = m_aesMap[data.id]; if ( !data.effectStart.is_set()) { return; @@ -254,37 +254,37 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio switch(modType) { case DataModification::eAdded: - m_aesEffectState.insert(data.id(), data.effectStateId()); + m_aesEffectState.insert(data.id, data.effectStateId); break; case DataModification::eModified: { - AreaEffectSimulation::AesEffectState effectState = m_aesEffectState.value(data.id()); + AreaEffectSimulation::AesEffectState effectState = m_aesEffectState.value(data.id); // insert event only once if (effectState != AreaEffectSimulation::AesEffectState::EsPrepared && - (effectState == AreaEffectSimulation::AesEffectState_def::EsActivated && data.effectStateId() != AreaEffectSimulation::AesEffectState_def::EsExpired)) + (effectState == AreaEffectSimulation::AesEffectState::AesEffectState_EsActivated && data.effectStateId != AreaEffectSimulation::AesEffectState::AesEffectState_EsExpired)) return; - m_aesEffectState.insert(data.id(), data.effectStateId()); + m_aesEffectState.insert(data.id, data.effectStateId); //m_itemViews.insert(data.id(), data.aesTypeId()); - eData.eventTypeId = ProjectDataManagement::PdmEventType::FireEvent; + eData.eventTypeId = ProjectDataManagement::PdmEventType::EventType_FireEvent; AreaEffectSimulation::AesItem aesItem; - m_aesDtc->aesItemFromId(data.id(), aesItem); + m_aesDtc->aesItemFromId(data.id, aesItem); QJsonObject obj; - obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id()); - obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name())); + obj[QStringLiteral("AesId")] = QJsonValue(aesItem.id); + obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(aesItem.name)); obj[QStringLiteral("AesType")] = QJsonValue(AreaEffectSimulation::AesType::AtExplosionSingle); - obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeStruct().chargeTypeId()); - obj[QStringLiteral("duration")] = QJsonValue(aesItem.effectDuration()); - obj[QStringLiteral("endTime")] = QJsonValue(data.effectStart.get() + aesItem.effectDuration()); + obj[QStringLiteral("ChargeTypeId")] = QJsonValue(data.chargeStruct.chargeTypeId); + obj[QStringLiteral("duration")] = QJsonValue(aesItem.effectDuration); + obj[QStringLiteral("endTime")] = QJsonValue(data.effectStart.get() + aesItem.effectDuration); eData.properties = QString::fromUtf8(QJsonDocument(obj).toJson(QJsonDocument::Compact)); //const Core::GeoPosition geoPosition ( data.impactPosition().lon(), data.impactPosition().lat(), 0); - const LtsUtils::QPoint3D pos3D (data.impactPosition().lon(), data.impactPosition().lat(), 0); + const LtsUtils::QPoint3D pos3D (data.impactPosition.lon, data.impactPosition.lat, 0); eData.position = pos3D; if (eData.id <= 0) @@ -294,7 +294,7 @@ void HandlerParticipantEvent::onExplosionSingleChanged(const AreaEffectSimulatio ERROR_LOG(m_logger) << "Error while inserting event data from AES "; break; } - m_aesMap.insert(data.id(), eData); + m_aesMap.insert(data.id, eData); } else { @@ -319,77 +319,77 @@ void HandlerParticipantEvent::onParticipantEventChanged(const CentralEffectSimul Database::EemEvent eData; - eData.participantId = data.participantId(); - eData.equipmentNumber = data.equipmentNumber(); - eData.partyId = data.partyId(); - eData.sampleTime = data.eventTime(); - eData.position = LtsUtils::QPoint3D(data.position().lon(), data.position().lat(), data.position().z()); + eData.participantId = data.participantId; + eData.equipmentNumber = data.equipmentNumber; + eData.partyId = data.partyId; + eData.sampleTime = data.eventTime; + eData.position = LtsUtils::QPoint3D(data.position.lon, data.position.lat, data.position.z); DEBUG_LOG(m_logger) << " onParticipantEventChanged " - << " position=" << data.position() + << " position=" << data.position << " eData.position=" << eData.position; - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::Unknown; + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_Unknown; QJsonObject obj; - obj[QStringLiteral("AesId")] = QJsonValue(data.aesItemId()); - obj[QStringLiteral("AesType")] = QJsonValue(m_itemViews.value(data.aesItemId()).underlying()); - obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(data.aesName())); - obj[QStringLiteral("FriendlyFire")] = QJsonValue(data.friendlyFire()); + obj[QStringLiteral("AesId")] = QJsonValue(data.aesItemId); + obj[QStringLiteral("AesType")] = QJsonValue(m_itemViews.value(data.aesItemId).underlying()); + obj[QStringLiteral("AesName")] = QJsonValue(QString::fromStdString(data.aesName)); + obj[QStringLiteral("FriendlyFire")] = QJsonValue(data.friendlyFire); - switch(data.eventTypeId().underlying()) + switch(data.eventTypeId.underlying()) { - case ProjectDataManagement::PdmEventType_def::HitEffectSimulation: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitEffectSimulation; + case ProjectDataManagement::PdmEventType::PdmEventType_HitEffectSimulation: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitEffectSimulation; break; - case ProjectDataManagement::PdmEventType_def::HitMine: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitMine; + case ProjectDataManagement::PdmEventType::PdmEventType_HitMine: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitMine; break; - case ProjectDataManagement::PdmEventType_def::HitN: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitN; + case ProjectDataManagement::PdmEventType::PdmEventType_HitN: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitN; break; - case ProjectDataManagement::PdmEventType_def::HitC: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::HitC; + case ProjectDataManagement::PdmEventType::PdmEventType_HitC: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_HitC; break; - case ProjectDataManagement::PdmEventType_def::EnterDangerArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterDangerArea; + case ProjectDataManagement::PdmEventType::PdmEventType_EnterDangerArea: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterDangerArea; break; - case ProjectDataManagement::PdmEventType_def::LeaveDangerArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveDangerArea; + case ProjectDataManagement::PdmEventType::PdmEventType_LeaveDangerArea: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveDangerArea; break; - case ProjectDataManagement::PdmEventType_def::EnterMineArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterMineArea; + case ProjectDataManagement::PdmEventType::PdmEventType_EnterMineArea: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterMineArea; break; - case ProjectDataManagement::PdmEventType_def::LeaveMineArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveMineArea; + case ProjectDataManagement::PdmEventType::PdmEventType_LeaveMineArea: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveMineArea; break; - case ProjectDataManagement::PdmEventType_def::EnterNuclear: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterNuclear; + case ProjectDataManagement::PdmEventType::PdmEventType_EnterNuclear: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterNuclear; break; - case ProjectDataManagement::PdmEventType_def::LeaveNuclear: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveNuclear; + case ProjectDataManagement::PdmEventType::PdmEventType_LeaveNuclear: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveNuclear; break; - case ProjectDataManagement::PdmEventType_def::CrossLocalBorderline: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::CrossLocalBorderline; + case ProjectDataManagement::PdmEventType::PdmEventType_CrossLocalBorderline: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_CrossLocalBorderline; obj[QStringLiteral("Global")] = QJsonValue(false); break; - case ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::CrossGlobalBorderline; + case ProjectDataManagement::PdmEventType::PdmEventType_CrossGlobalBorderline: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_CrossGlobalBorderline; obj[QStringLiteral("Global")] = QJsonValue(true); break; - case ProjectDataManagement::PdmEventType_def::EnterFunctionalArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterFunctionalArea; + case ProjectDataManagement::PdmEventType::PdmEventType_EnterFunctionalArea: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterFunctionalArea; break; - case ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveFunctionalArea; + case ProjectDataManagement::PdmEventType::PdmEventType_LeaveFunctionalArea: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveFunctionalArea; break; - case ProjectDataManagement::PdmEventType_def::EnterHazardDistance: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::EnterHazardDistance; + case ProjectDataManagement::PdmEventType::PdmEventType_EnterHazardDistance: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_EnterHazardDistance; break; - case ProjectDataManagement::PdmEventType_def::LeaveHazardDistance: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::LeaveHazardDistance; + case ProjectDataManagement::PdmEventType::PdmEventType_LeaveHazardDistance: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_LeaveHazardDistance; break; - case ProjectDataManagement::PdmEventType_def::AirSupport: - eData.eventTypeId = ProjectDataManagement::PdmEventType_def::AirSupport; + case ProjectDataManagement::PdmEventType::PdmEventType_AirSupport: + eData.eventTypeId = ProjectDataManagement::PdmEventType::PdmEventType_AirSupport; break; default: return; @@ -416,22 +416,22 @@ void HandlerParticipantEvent::publishData(const Database::EemEvent &data) ERROR_LOG(m_logger) << "Error publishing event-data to dds"; // take data from dds-bus after 10s, we need just to make sure the recording service got it - m_mainHandler->addEventIdToRemove(ddsData.id()); + m_mainHandler->addEventIdToRemove(ddsData.id); } ExerciseEventManagement::Event HandlerParticipantEvent::toDdsData(const Database::EemEvent &data) { ExerciseEventManagement::Event ddsData; - ddsData.id(data.id); - ddsData.sampleTime(data.sampleTime); - ddsData.participantId(data.participantId); - ddsData.partyId(data.partyId); - ddsData.equipmentNumber(data.equipmentNumber); - ddsData.eventTypeId(data.eventTypeId); - ddsData.properties(data.properties.toStdString()); + ddsData.id = data.id; + ddsData.sampleTime = data.sampleTime; + ddsData.participantId = data.participantId; + ddsData.partyId = data.partyId; + ddsData.equipmentNumber = data.equipmentNumber; + ddsData.eventTypeId = data.eventTypeId; + ddsData.properties = data.properties.toStdString(); // Core::GeoPosition LtsUtils::QPoint3D Core::GeoPosition position(data.position.x(), data.position.y(),data.position.z()); - ddsData.position(position); + ddsData.position = position; return ddsData; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp index 4f6813d48..fbf2fb27c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp @@ -29,16 +29,16 @@ ProjectDataManagement::PdmEventType avsEventTypeToPdmEventType(int avsEventType case 305: //MVS case 301: // CAMERA_AUDIO case 302: // CAMERA_VIDEO - eventType = ProjectDataManagement::PdmEventType::CameraVideo; + eventType = ProjectDataManagement::PdmEventType::EventType_CameraVideo; break; case 303: // RADIO_CNR - eventType = ProjectDataManagement::PdmEventType::RadioCnr; + eventType = ProjectDataManagement::PdmEventType::EventType_RadioCnr; break; case 304: // RADIO_TVC - eventType = ProjectDataManagement::PdmEventType::RadioTvc; + eventType = ProjectDataManagement::PdmEventType::EventType_RadioTvc; break; default: - eventType = ProjectDataManagement::PdmEventType::Unknown; + eventType = ProjectDataManagement::PdmEventType::EventType_Unknown; break; } return eventType; @@ -118,16 +118,16 @@ AvsData WebSocketAvs::jsonObjectToAvsData(const QJsonObject &obj) { case 301: // CAMERA_AUDIO case 302: // CAMERA_VIDEO - eventType = ProjectDataManagement::PdmEventType::CameraVideo; + eventType = ProjectDataManagement::PdmEventType::EventType_CameraVideo; break; case 303: // RADIO_CNR - eventType = ProjectDataManagement::PdmEventType::RadioCnr; + eventType = ProjectDataManagement::PdmEventType::EventType_RadioCnr; break; case 304: // RADIO_TVC - eventType = ProjectDataManagement::PdmEventType::RadioTvc; + eventType = ProjectDataManagement::PdmEventType::EventType_RadioTvc; break; default: - eventType = ProjectDataManagement::PdmEventType::Unknown; + eventType = ProjectDataManagement::PdmEventType::EventType_Unknown; ERROR_LOG(m_logger) << "Unknown avsEventType: " << avsEventType; break; } @@ -168,9 +168,9 @@ Database::EemEvent WebSocketAvs::avsDataToEemEvent(const AvsData &data) ExerciseEventManagement::Event WebSocketAvs::avsDataToEvent(const AvsData &data) { ExerciseEventManagement::Event event; - event.id(data.id); - event.sampleTime(data.eventTime); - event.eventTypeId(data.eventType); + event.id = data.id; + event.sampleTime = data.eventTime; + event.eventTypeId = data.eventType; QJsonObject obj; obj[QStringLiteral("streamName")] = data.streamName; @@ -181,7 +181,7 @@ ExerciseEventManagement::Event WebSocketAvs::avsDataToEvent(const AvsData &data) } obj[QStringLiteral("endTime")] = data.endTime; obj[QStringLiteral("MainStructureElementId")] = data.mainStructureElementId; - event.properties(QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString()); + event.properties = QJsonDocument(obj).toJson(QJsonDocument::Compact).toStdString(); return event; } @@ -216,7 +216,7 @@ void WebSocketAvs::handleAvsData(const AvsData &data, const bool &lastRangeClose DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && (data.endTime == -1)"; return; } - if ( (data.endTime == -1) && (data.eventType == ProjectDataManagement::PdmEventType::RadioCnr)) + if ( (data.endTime == -1) && (data.eventType == ProjectDataManagement::PdmEventType::EventType_RadioCnr)) { DEBUG_LOG(m_logger) << "kein Publish (avsData.endTime == -1) && RadioCnr"; return; @@ -370,7 +370,7 @@ int WebSocketAvs::publishData(const QString &streamName) { if (!m_dbHandler->db()->insert(dbData)) ERROR_LOG(m_logger) << "Error while inserting avsData in db: streamName: " << data.streamName; - ddsEvent.id(dbData.id); + ddsEvent.id = dbData.id; } // publish data @@ -501,7 +501,7 @@ void WebSocketAvs::onCleanUpDbInternal() if (!collection.contains(eItem.eventTime)) { AvsData add = eItem; - bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::CameraVideo; + bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::EventType_CameraVideo; int mountingPointId = 0; if (checkMsi && m_avmDtc->mountingPointForStreamName(eItem.streamName, mountingPointId)) @@ -520,7 +520,7 @@ void WebSocketAvs::onCleanUpDbInternal() } for ( auto item : list) { - bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::CameraVideo; + bool checkMsi = eItem.eventType == ProjectDataManagement::PdmEventType::EventType_CameraVideo; if (item.endTime == eItem.endTime ) { @@ -672,9 +672,9 @@ QMap> WebSocketAvs::getAllInternalDbData() QVector dataVec; //qCritical() << "START reading internal db "; - m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::CameraVideo); - m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::RadioCnr); - m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::RadioTvc); + m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::EventType_CameraVideo); + m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::EventType_RadioCnr); + m_dbHandler->db()->selectByEventTypeId(dataVec, ProjectDataManagement::PdmEventType::EventType_RadioTvc); // m_dbHandler->db()->select(dataVec); //qCritical() << "END select reading internal db "; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h index d7e55d7ce..afe2f0529 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h @@ -44,7 +44,7 @@ struct AvsData : id(0) , eventTime(0) , endTime(-1) - , eventType(ProjectDataManagement::PdmEventType::Unknown) + , eventType(ProjectDataManagement::PdmEventType::EventType_Unknown) , mainStructureElementId(0) , timer(new QTimer) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp index e925bb75e..a36e5c59a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp @@ -232,7 +232,7 @@ void WebSocketEventServer::historyDataRequested(const QSqlDatabase &db, QWebSock { int i = 0; data.id = q.value(i++).toInt(); - data.eventTypeId = static_cast(q.value(i++).toInt()); + data.eventTypeId = static_cast(q.value(i++).toInt()); data.participantId = q.value(i++).toInt(); data.partyId = q.value(i++).toInt(); data.equipmentNumber = q.value(i++).toInt(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h index 750f6b46a..3fd3de1eb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/UnitTests/data_topic_tests.h @@ -18,6 +18,9 @@ #include #include +#include +#include +#include namespace NGL { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/data_manager.cpp index 607089969..a6e865894 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/data_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseManagement/WebSocketInterface/data_manager.cpp @@ -55,7 +55,7 @@ LtsWebSocket::ReplyMessage *DataManager::exerciseInformation(const QString &uuid exInfo.startTime = exData.startTime.toMSecsSinceEpoch(); exInfo.stopTime = exData.stopTime.toMSecsSinceEpoch(); exInfo.timeZone = exData.defaultTimeZone; - exInfo.status = exData.exerciseStateId; + exInfo.status = static_cast(exData.exerciseStateId); exInfo.description = exData.description; data.append(exInfo); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp index e49fd223b..ef85f377b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/handler_ied.cpp @@ -182,7 +182,7 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da Database::GimIed newData; assignBaseData(data, newData); - newData.typeId = static_cast(data.type()); + newData.typeId = static_cast(data.type()); newData.remoteTrigger = data.remoteTrigger(); newData.switchTrigger = data.switchTrigger(); newData.lightBarrierTrigger = data.lightBarrierTrigger(); @@ -194,16 +194,16 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da else newData.partyId = getPartyIdFromParticipantEquipmentNumber(data.equipmentNumber()); // use party from equipmentNumber - newData.pairingStateId = static_cast(data.pairingState()); + newData.pairingStateId = static_cast(data.pairingState()); switch (newData.pairingStateId.underlying()) { - case IedPairingState_def::PairedToParticipant: + case IedPairingState::PairedToParticipant: newData.pairedParticipantId.setValue(data.pairedId().get()); break; - case IedPairingState_def::PairedToOps: + case IedPairingState::PairedToOps: newData.pairedOpsId.setValue(data.pairedId().get()); break; - case IedPairingState_def::NotPaired: + case IedPairingState::NotPaired: break; } @@ -217,11 +217,11 @@ void HandlerIed::onDefinitionIed(const TrainingAreaBase::DefinitionIed &data, Da // handled at guez_ied_to_map.cpp and gim_info_dialog.cpp switch (newData.typeId.underlying()) { - case IedType_def::SuicideIed: + case IedType::SuicideIed: newData.symbol = QStringLiteral("AP6D|CMPL|10014000001103040000"); //SIDC for suicide bomber break; - case IedType_def::IedSmallPyro: - case IedType_def::IedBigPyro: + case IedType::IedSmallPyro: + case IedType::IedBigPyro: newData.symbol = QStringLiteral("AP6D|CMPL|10014000001103000000"); // SIDC for IED (OHNE ZickZack) break; } // switch @@ -319,18 +319,18 @@ void HandlerIed::onPairIedRequest(const rti::core::SampleIdentity &cookie, switch (request.pairingState().underlying()) { - case IedPairingState_def::PairedToParticipant: + case IedPairingState::PairedToParticipant: { data.pairedParticipantId.setValue(request.pairedParticipantId.get()); data.partyId = m_ppmDtc->participant(request.pairedParticipantId.get()).partyId(); break; } - case IedPairingState_def::PairedToOps: + case IedPairingState::PairedToOps: { data.pairedOpsId.setValue(request.pairedOpsId.get()); break; } - case IedPairingState_def::NotPaired: + case IedPairingState::NotPaired: break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.cpp index 415a4f9eb..cf3c6751e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/GuezIedManagement/object_ied.cpp @@ -133,20 +133,20 @@ void ObjectIed::onPublishData() switch(ddsData.pairingState().underlying()) { - case IedPairingState_def::PairedToParticipant: + case IedPairingState::PairedToParticipant: { ddsData.pairedParticipantId().set(m_data.pairedParticipantId.toInt()); connect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged, this, &ObjectIed::onParticipantPositionChanged); break; } - case IedPairingState_def::PairedToOps: + case IedPairingState::PairedToOps: { ddsData.pairedOpsId().set(m_data.pairedOpsId.toInt()); //todo: connect to ISM for OPS-Position disconnect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged, this, &ObjectIed::onParticipantPositionChanged); break; } - case IedPairingState_def::NotPaired: + case IedPairingState::NotPaired: { disconnect(m_ppmDtc.get(), &ParticipantManagement::Interface::Dtc::participantPositionChanged, this, &ObjectIed::onParticipantPositionChanged); //todo: disconnect from ISM for OPS-Position @@ -195,18 +195,18 @@ void ObjectIed::assignPairingState(const Database::GimIed &data) switch(data.pairingStateId.underlying()) { - case IedPairingState_def::PairedToParticipant: + case IedPairingState::PairedToParticipant: { ParticipantManagement::ParticipantPosition position = m_ppmDtc->participantPosition(m_data.pairedParticipantId.toInt()); setPosition(position.sampleTime(), position.pos()); break; } - case IedPairingState_def::PairedToOps: + case IedPairingState::PairedToOps: { // todo get Ops-Position break; } - case IedPairingState_def::NotPaired: + case IedPairingState::NotPaired: { break; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp index b9e0fe4fe..d95f849c0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/InfrastructureManagement/ImportBuildings/ism_import_buildings.cpp @@ -979,7 +979,7 @@ int main(int argc, char **argv) // bauabschnitt // Normally '-1', but Steve and Iuliana use '0' as default. - data.bauabschnitt = InfrastructureManagement::BuildingGroup::type::UnknownGroup; + data.bauabschnitt = InfrastructureManagement::BuildingGroup::UnknownGroup; if ((cfi.idxBauabschnitt>=0) && (parts.size() > cfi.idxBauabschnitt)) { // postprocessing uses ba0 -> 0 , ba1 -> 1 ... @@ -987,25 +987,25 @@ int main(int argc, char **argv) const int ba = parts.at(cfi.idxBauabschnitt).toInt(); switch (ba) { case 0: - data.bauabschnitt = InfrastructureManagement::BuildingGroup::type::Section0; + data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section0; break; case 1: - data.bauabschnitt = InfrastructureManagement::BuildingGroup::type::Section1; + data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section1; break; case 2: - data.bauabschnitt = InfrastructureManagement::BuildingGroup::type::Section2; + data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section2; break; case 3: - data.bauabschnitt = InfrastructureManagement::BuildingGroup::type::Section3; + data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section3; break; case 4: - data.bauabschnitt = InfrastructureManagement::BuildingGroup::type::Section4; + data.bauabschnitt = InfrastructureManagement::BuildingGroup::Section4; break; case 5: - data.bauabschnitt = InfrastructureManagement::BuildingGroup::type::Salchau; + data.bauabschnitt = InfrastructureManagement::BuildingGroup::Salchau; break; default: - data.bauabschnitt = InfrastructureManagement::BuildingGroup::type::UnknownGroup; + data.bauabschnitt = InfrastructureManagement::BuildingGroup::UnknownGroup; break; } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp index d7ef61ef0..a5e2c00b7 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/MarkerManagement/ModuleTests/mrk_tests.cpp @@ -504,13 +504,13 @@ void MrkTests::getMarkerDescriptionCreateRequestData(MarkerModifyRequest &data) // Info: FK fuer markerId wird in object_marker gesetzt. data.descriptions.resize(3); data.descriptions[0].markerType = MarkerManagement::MarkerType::Audio; - data.descriptions[0].content("Audio07, Audio08*, Audio09"); + data.descriptions[0].content = "Audio07, Audio08*, Audio09"; data.descriptions[1].markerType = MarkerManagement::MarkerType::Video; - data.descriptions[1].content("cam07, cam08, cam09*"); + data.descriptions[1].content = "cam07, cam08, cam09*"; data.descriptions[2].markerType = MarkerManagement::MarkerType::Video; - data.descriptions[2].content("cam06, cam07, cam08, cam09*"); + data.descriptions[2].content = "cam06, cam07, cam08, cam09*"; } // end of getMarkerDescriptionCreateRequestData() //----------------------------------------------------------------------------- diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp index 7863901c8..9340eb7ab 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/ModuleTests/msg_tests.cpp @@ -123,8 +123,8 @@ void MsgTests::tryCreateOperatorMessage() { case TestCase::CreateOperator: { - receiverType = Messaging::AddressType_def::type::Operator; - senderType = Messaging::AddressType_def::type::Operator; + receiverType = Messaging::AddressType::Operator; + senderType = Messaging::AddressType::Operator; m_expectedMessage = "msg Operator: " + QDateTime::currentDateTimeUtc().toString().toStdString(); recipientIds[0] = 1; recipientIds[1] = 2; @@ -132,8 +132,8 @@ void MsgTests::tryCreateOperatorMessage() } case TestCase::SendToTetra: { - receiverType = Messaging::AddressType_def::type::ObserverController; - senderType = Messaging::AddressType_def::type::Operator; + receiverType = Messaging::AddressType::ObserverController; + senderType = Messaging::AddressType::Operator; m_expectedMessage = "msg to OC: " + QDateTime::currentDateTimeUtc().toString().toStdString(); recipientIds[0] = 57; // Participant id for eq-number 2500 recipientIds[1] = 58; // Participant id for eq-number 2501 @@ -141,8 +141,8 @@ void MsgTests::tryCreateOperatorMessage() } case TestCase::ReceiveFromTetra: { - receiverType = Messaging::AddressType_def::type::Operator; - senderType = Messaging::AddressType_def::type::ObserverController; + receiverType = Messaging::AddressType::Operator; + senderType = Messaging::AddressType::ObserverController; m_expectedMessage = "msg from OC: " + QDateTime::currentDateTimeUtc().toString().toStdString(); sender = 2500; recipientIds[0] = 1; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.cpp index e8c43c0d1..3dd4e8ad3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/Messaging/handler_operator_message.cpp @@ -109,7 +109,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::createOperatorMessageRequest(c newMsg.recipientText = recipientText; // Only Operator messages Core::FunctionReplyObject ret(newMsg.id); - if (newMsg.senderType == Messaging::AddressType::type::Operator) + if (newMsg.senderType == Messaging::AddressType::Operator) ret = insertInDbAndPublish(newMsg); const int correspondingOutboxMsgId = ret.id(); @@ -192,12 +192,12 @@ OperatorMessage HandlerOperatorMessage::toDdsData(const Database::MsgMessageData Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database::MsgMessageData newMsg) { // Length Check: - if (newMsg.recipientType == Messaging::AddressType::type::ObserverController) + if (newMsg.recipientType == Messaging::AddressType::ObserverController) { newMsg.subject = newMsg.subject.left(m_maxSubjectLength); newMsg.message = newMsg.message.left(m_maxOcContentLength); } - if (newMsg.recipientType == Messaging::AddressType::type::Participant) + if (newMsg.recipientType == Messaging::AddressType::Participant) { newMsg.subject = newMsg.subject.left(m_maxSubjectLength); newMsg.message.clear(); @@ -208,8 +208,8 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database: m_dbOperatorMessageData.insert(newMsg.id, newMsg); - if ((newMsg.recipientType == Messaging::AddressType::type::ObserverController) - || (newMsg.recipientType == Messaging::AddressType::type::Participant)) + if ((newMsg.recipientType == Messaging::AddressType::ObserverController) + || (newMsg.recipientType == Messaging::AddressType::Participant)) { int32_t equipmentNumber = m_exercisesHandler->findEquipmentNumber(newMsg.recipientId, newMsg.exerciseId); @@ -236,7 +236,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database: << " subject=" << subject << " message=" << message; static int s_requestId = 1; - if (newMsg.recipientType == Messaging::AddressType::type::ObserverController) + if (newMsg.recipientType == Messaging::AddressType::ObserverController) { INFO_LOG(m_logger) << "Send to OC senderId=" << newMsg.senderId << " sendertype: " << newMsg.senderType << " subject " << subject; m_exercisesHandler->sendOcEquipmentMessage({s_requestId++, @@ -267,7 +267,7 @@ Core::FunctionReplyObject HandlerOperatorMessage::insertInDbAndPublish(Database: m_ddsHandler->dts()->publish(toDdsData(newMsg)); INFO_LOG(m_logger) << "insertInDbAndPublish id=" << newMsg.id; - if (newMsg.recipientType == Messaging::AddressType::type::ObserverController && newMsg.recipientId > 0) + if (newMsg.recipientType == Messaging::AddressType::ObserverController && newMsg.recipientId > 0) { INFO_LOG(m_logger) << "O/C-Message in Member-Variable kopieren: id = " << newMsg.id; } @@ -317,10 +317,10 @@ void HandlerOperatorMessage::onEquipmentMessageChanged(const TrainingAreaBase::E CreateOperatorMessageRequest request; DEBUG_LOG(m_logger) << "onEquipmentMessageChanged: " << data; - request.senderType = Messaging::AddressType::type::Participant; + request.senderType = Messaging::AddressType::Participant; request.senderId = data.sender; DEBUG_LOG(m_logger) << "request.senderId = " << request.senderId; - request.recipientType = Messaging::AddressType::type::Operator; + request.recipientType = Messaging::AddressType::Operator; request.recipientIds.push_back(data.receiver); request.subject = data.subject; request.message = data.text; @@ -357,7 +357,7 @@ QString HandlerOperatorMessage::toAddressStr(const AddressType addressType, cons default: result = QString::fromStdString("No valid addressType:"); QString numberStr ; - numberStr.setNum(addressType); + numberStr = QString::number(static_cast(addressType)); result.append(numberStr); } return result; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp index b141c111b..331abaa2e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NmeaManagement/nmea_handler.cpp @@ -66,7 +66,7 @@ void NmeaHandler::IIXDR(QString package) NmeaManagement::BatteryState batteryState; NmeaManagement::ServiceControl serviceControl; QRegularExpression sep(QStringLiteral("(\\,|\\*)")); - QStringList pkt_data = package.split(sep.pattern()); + QStringList pkt_data = package.split(sep); INFO_LOG(m_logger) << "----------------------------------------------------"; INFO_LOG(m_logger) << "batteryState pkt_data.size=" << pkt_data.size(); for (int i = 0; i < pkt_data.size(); i++) @@ -80,17 +80,17 @@ void NmeaHandler::IIXDR(QString package) if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_PRESHUTDOWN")) { INFO_LOG(m_logger) << "SERVICE_CONTROL_PRESHUTDOWN"; - serviceControl.ServiceControlState(ServiceControlEnum_def::PRESHUTDOWN); + serviceControl.ServiceControlState = ServiceControlEnum::PRESHUTDOWN; } if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_SHUTDOWN")) { INFO_LOG(m_logger) << "SERVICE_CONTROL_SHUTDOWN"; - serviceControl.ServiceControlState(ServiceControlEnum_def::SHUTDOWN); + serviceControl.ServiceControlState = ServiceControlEnum::SHUTDOWN; } if (pkt_data[4] == QStringLiteral("SERVICE_CONTROL_STOP")) { INFO_LOG(m_logger) << "SERVICE_CONTROL_STOP"; - serviceControl.ServiceControlState(ServiceControlEnum_def::STOP); + serviceControl.ServiceControlState = ServiceControlEnum::STOP; } m_ddsHandler->dts()->publish(serviceControl); return; @@ -109,7 +109,7 @@ void NmeaHandler::IIXDR(QString package) m_batteries.append(serialNumber); } - batteryState.id(m_batteries.indexOf(serialNumber)); + batteryState.id = m_batteries.indexOf(serialNumber); } index = pkt_data.indexOf(QLatin1String("B")) + 1; @@ -117,28 +117,28 @@ void NmeaHandler::IIXDR(QString package) battery = pkt_data[index].toInt() ; else battery = -1; - batteryState.battery(battery ); + batteryState.battery = battery; index = pkt_data.indexOf(QLatin1String("C")) + 1; if ( index >= 0) temperature = pkt_data[index].toInt() ; else temperature = -1; - batteryState.temperature(temperature); + batteryState.temperature = temperature; index = pkt_data.indexOf(QLatin1String("F")) + 1; if ( index >= 0) frequency = pkt_data[index].toInt() ; else frequency = -1; - batteryState.frequency(frequency); + batteryState.frequency = frequency; index = pkt_data.indexOf(QLatin1String("F")) + 1; if ( index >= 0) generic = pkt_data[index].toDouble() ; else generic = -1.0; - batteryState.generic(generic); + batteryState.generic = generic; index = pkt_data.lastIndexOf(QLatin1String("I")) + 1; @@ -146,22 +146,22 @@ void NmeaHandler::IIXDR(QString package) current = pkt_data[index].toInt(); else current = -1; - batteryState.current(current); + batteryState.current = current; index = pkt_data.indexOf(QLatin1String("S")) + 1; switchOrValue = false; if ( index >= 0) if ( pkt_data[index].toInt() == 1 ) switchOrValue = true; - batteryState.switchOrValue(switchOrValue); + batteryState.switchOrValue = switchOrValue; index = pkt_data.indexOf(QLatin1String("U")) + 1; if ( index >= 0) voltage = pkt_data[index].toInt() ; else voltage = -1; - batteryState.voltage(voltage); + batteryState.voltage = voltage; - batteryState.serialNumber(serialNumber.toStdString()) ; + batteryState.serialNumber = serialNumber.toStdString(); INFO_LOG(m_logger) << "publish batteryState serialNumber=" << serialNumber; m_ddsHandler->dts()->publish(batteryState); } @@ -187,7 +187,7 @@ void NmeaHandler::IIALR(QString package) { NmeaManagement::BatteryAlarm batteryAlarm; QRegularExpression sep(QStringLiteral("(\\,|\\*)")); - QStringList pkt_data = package.split(sep.pattern()); + QStringList pkt_data = package.split(sep); alarm_state packageData; INFO_LOG(m_logger) << "pkt_data.size=" << pkt_data.size(); // for ( int i = 0; i < pkt_data.size(); i++) @@ -214,12 +214,12 @@ void NmeaHandler::IIALR(QString package) << " condition=" << packageData.condition << " acknowledgeState=" << packageData.acknowledgeState << " description=" << packageData.description; - batteryAlarm.id(0); - batteryAlarm.time(timeAlarm); - batteryAlarm.description(packageData.description.toStdString()); - batteryAlarm.acknowledge(packageData.acknowledgeState); - batteryAlarm.condition(packageData.condition); - batteryAlarm.uniqueAlarmNumber(packageData.number); + batteryAlarm.id = 0; + batteryAlarm.time = timeAlarm; + batteryAlarm.description = packageData.description.toStdString(); + batteryAlarm.acknowledge = packageData.acknowledgeState; + batteryAlarm.condition = packageData.condition; + batteryAlarm.uniqueAlarmNumber = packageData.number; m_ddsHandler->dts()->publish(batteryAlarm); } @@ -231,7 +231,7 @@ void NmeaHandler::GPGGA(QString package) double latDecimal; double lonDecimal; QRegularExpression sep(QStringLiteral("(\\,|\\*)")); - QStringList pkt_data = package.split(sep.pattern()); + QStringList pkt_data = package.split(sep); gpgga_data packageData; @@ -306,9 +306,9 @@ void NmeaHandler::GPGGA(QString package) << " latitude=" << latDecimal; - PositionExcon.position().lat(latDecimal * M_PI / 180.0); - PositionExcon.position().lon(lonDecimal * M_PI / 180.0); - PositionExcon.valid(true); + PositionExcon.position.lat = latDecimal * M_PI / 180.0; + PositionExcon.position.lon = lonDecimal * M_PI / 180.0; + PositionExcon.valid = true; m_ddsHandler->dts()->publish(PositionExcon); } @@ -318,7 +318,7 @@ void NmeaHandler::GPGGA(QString package) void NmeaHandler::GPRMC(QString package) { QRegularExpression sep(QStringLiteral("(\\,|\\*)")); - QStringList pkt_data = package.split(sep.pattern()); + QStringList pkt_data = package.split(sep); gprmc_data packageData; packageData.A_hour = (int)pkt_data[1].toFloat(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp index fcac8817f..082034dbe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/ModuleTests/nom_tests.cpp @@ -165,7 +165,7 @@ void NomTests::tryCreateHQ() notif.timeStamp = currentTime; notif.expiryTime = expiryTime; - notif.priority = static_cast(Settings::notificationPriority()); + notif.priority = static_cast(Settings::notificationPriority()); notif.processedPriority = NotificationManagement::Priority::Highest; notif.exerciseId = m_exerciseId; @@ -184,7 +184,7 @@ void NomTests::tryCreateHQ() // NotificationManagement::Address addrSender; // addrSender.addressId(FileManagement::Offset); // addrSender.name(tr("[FileManagement2](flmHQReport)").toStdString()); - // addrSender.addressType(NotificationManagement::AddressType_def::Service); + // addrSender.addressType(NotificationManagement::AddressType::Service); // addrSender.addressSubId(321); // notif.sender(addrSender); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp index 70ae8b472..d8dc611d9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/NotificationManagement/object_notification.cpp @@ -351,8 +351,8 @@ Database::NomNotification ObjectNotification::toDbData(const NomNotification &dd QString properties = contentArgsToJson(); dbData.properties = properties; dbData.title = QString::fromStdString(ddsData.title); - dbData.messageType = ddsData.messageType; - dbData.notificationType = ddsData.notificationType; + dbData.messageType = static_cast(ddsData.messageType); + dbData.notificationType = static_cast(ddsData.notificationType); dbData.processTime = ddsData.processTime; dbData.processed = ddsData.processed; dbData.processedPriority = ddsData.processedPriority; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp index 9c71fbbec..b0f4af220 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/WebSocketInterface/Messages/client_message.cpp @@ -260,10 +260,10 @@ void PdfListMessage::process() data.pdfData.append({obj.value(FILE_ID()).toInt(), obj.value(NAME()).toString(), obj.value(FILE_SIZE()).toInt(), - FileManagement::FileCategory::inner_enum(obj.value(FILE_CATEGORY()).toInt()), + FileManagement::FileCategory(obj.value(FILE_CATEGORY()).toInt()), obj.value(IS_TEMPLATE()).toBool(), obj.value(PROPERTIES()), - FileManagement::FileStatus::inner_enum(obj.value(FILE_STATUS()).toInt()), + FileManagement::FileStatus(obj.value(FILE_STATUS()).toInt()), obj.value(FOLDER_ID()).toInt(), obj.value(PHASE_ID()).toInt(), obj.value(OPERATOR_ID()).toInt(), diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp index aa4545e31..b654f67ff 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_base_download.cpp @@ -575,9 +575,9 @@ void HandlerBaseDownload::receiveFlmData() data.name = query->value(i++).toString(); data.isTemplate = query->value(i++).toBool(); data.folderId = query->value(i++).toLongLong(); - data.fileCategoryId = static_cast(query->value(i++).toInt()); - data.fileTypeId = static_cast(query->value(i++).toInt()); - data.fileStatusId = static_cast(query->value(i++).toInt()); + data.fileCategoryId = static_cast(query->value(i++).toInt()); + data.fileTypeId = static_cast(query->value(i++).toInt()); + data.fileStatusId = static_cast(query->value(i++).toInt()); data.exerciseId = query->value(i++); data.phaseId = query->value(i++); data.operatorId = query->value(i++).toInt(); @@ -725,15 +725,15 @@ void HandlerBaseDownload::updateBaseDownloadReply() void HandlerBaseDownload::onStartBaseDownloadRequest(const rti::core::SampleIdentity &cookie, const StartBaseDownloadRequest &request) { - DEBUG_LOG(m_logger) << "Got Request, check for old one : " << request.hostname(); + DEBUG_LOG(m_logger) << "Got Request, check for old one : " << request.hostname; - if (request.timeStamp() < (QDateTime::currentMSecsSinceEpoch() - 10 * 1000)) //(5Sekunden) + if (request.timeStamp < (QDateTime::currentMSecsSinceEpoch() - 10 * 1000)) //(5Sekunden) { DEBUG_LOG(m_logger) << "old call? ignore! "; - m_reply.progress(0); - m_reply.errorString(std::string()); - m_reply.currentStep(std::string()); - m_reply.replyState(Core::FtReplyState::Error); + m_reply.progress = 0; + m_reply.errorString = std::string(); + m_reply.currentStep = std::string(); + m_reply.replyState = Core::FtReplyState::Error; m_fts->startBaseDownloadReply(m_baseDownloadCookie, m_reply); @@ -742,13 +742,13 @@ void HandlerBaseDownload::onStartBaseDownloadRequest(const rti::core::SampleIden // m_webSocket->setCurrentDownload(WebSocketInterface::CurrentDownload::BASE); m_baseDownloadCookie = cookie; - m_exerciseId = request.exerciseId(); - m_operatorId = request.loggedInOperatorId(); + m_exerciseId = request.exerciseId; + m_operatorId = request.loggedInOperatorId; m_hostname = Settings::remoteDbHostName(); - m_reply.progress(0); - m_reply.errorString(std::string()); - m_reply.currentStep(std::string()); - m_reply.replyState(Core::FtReplyState::InProgress); + m_reply.progress = 0; + m_reply.errorString = std::string(); + m_reply.currentStep = std::string(); + m_reply.replyState = Core::FtReplyState::InProgress; m_fts->startBaseDownloadReply(m_baseDownloadCookie, m_reply); @@ -763,7 +763,7 @@ void HandlerBaseDownload::onLifeUpdateRequest(const rti::core::SampleIdentity &c // handling PPM ExN data using namespace ParticipantManagement; - m_exerciseId = request.timeStamp(); + m_exerciseId = request.timeStamp; //m_hostname = QStringLiteral("EXCDBS01"); openRemoteDbConnection(QStringLiteral("lts_ets_pro")); openDbConnection(currentDatabaseName()); @@ -786,15 +786,15 @@ void HandlerBaseDownload::switchLog(HandlerBaseDownload::State state, const std: { NOTICE_LOG(m_logger) << "Switching state from " << m_currentState << " to " << state << " - " << currentStep; m_currentState = state; - m_reply.currentStep(currentStep); + m_reply.currentStep = currentStep; if (state != Finished) { - m_reply.progress(m_reply.progress() + SingleStepSize); + m_reply.progress = m_reply.progress + SingleStepSize; updateBaseDownloadReply(); } else - m_reply.progress(100); // updateBaseDownloadReply is called in cleanup which is executed next + m_reply.progress = 100; // updateBaseDownloadReply is called in cleanup which is executed next m_baseDownloadReplyUpdateTimer->start(); } @@ -949,7 +949,7 @@ void HandlerBaseDownload::dropOldDatabase() const int idx = dbNameTmpl.lastIndexOf(QLatin1Char('_')); Q_ASSERT(idx > 0); bool bOk; - const int curId = dbNameTmpl.midRef(idx + 1).toInt(&bOk); + const int curId = dbNameTmpl.mid(idx + 1).toInt(&bOk); if (!openDbConnection(currentDatabaseName())) { @@ -967,7 +967,7 @@ void HandlerBaseDownload::dropOldDatabase() while (q.next()) { const QString val = q.value(0).toString(); - const int revId = val.midRef(idx + 1).toInt(&bOk); + const int revId = val.mid(idx + 1).toInt(&bOk); if (!bOk) continue; DEBUG_LOG(m_logger) << val << ", " << revId << ", " << curId; @@ -1599,8 +1599,8 @@ void HandlerBaseDownload::cleanup(const Core::FtReplyState &replyState, const st closeDb(m_remoteDbConnection); // prepare reply - m_reply.errorString(errStr); - m_reply.replyState(replyState); + m_reply.errorString = errStr; + m_reply.replyState = replyState; m_baseDownloadReplyUpdateTimer->stop(); @@ -1608,9 +1608,9 @@ void HandlerBaseDownload::cleanup(const Core::FtReplyState &replyState, const st m_currentState = NotStarted; m_exerciseId = 0; - m_reply.progress(0); - m_reply.errorString(std::string()); - m_reply.currentStep(std::string()); + m_reply.progress = 0; + m_reply.errorString = std::string(); + m_reply.currentStep = std::string(); m_hostname = NGL::Connections::hostName(NGL::Connections::eConnection::SCM_WEBSOCKET); } @@ -1871,7 +1871,7 @@ void HandlerBaseDownload::copyOldFlmData(const QSqlDatabase &dbIn, const QSqlDat for (auto data : qAsConst(flmData)) { if (data.folderId == folderId || //snapshots - (data.fileTypeId.underlying() == FileManagement::FileType::Pdf)) //old PDF + (data.fileTypeId == FileManagement::FileType::Pdf)) //old PDF { data.id = 0; flmDataToCopy.push_back(data); @@ -2161,15 +2161,15 @@ void HandlerBaseDownload::updateLtsConfig() const QMap groups = m_scmDtc->groupInformations(); for (const auto &group : groups) { - if (group.type() == Core::ServiceGroupType::Master || - group.type() == Core::ServiceGroupType::Core) + if (group.type == Core::ServiceGroupType::Master || + group.type == Core::ServiceGroupType::Core) continue; - request.type(group.type()); - request.domainId(group.domainId()); - request.exercisePartitionId(group.exercisePartitionId()); - request.replayPartitionId(group.replayPartitionId()); - request.requestId(group.id()); - m_stopGroupIds += group.id(); + request.type = group.type; + request.domainId = group.domainId; + request.exercisePartitionId = group.exercisePartitionId; + request.replayPartitionId = group.replayPartitionId; + request.requestId = group.id; + m_stopGroupIds += group.id; m_scmFtc->stopGroupRequest(request, this); } @@ -2201,19 +2201,19 @@ void HandlerBaseDownload::restartCoreGroup() const QMap groups = m_scmDtc->groupInformations(); for (const auto &group : groups) { - if (group.type() != Core::ServiceGroupType::Core) + if (group.type != Core::ServiceGroupType::Core) continue; - request.type(group.type()); - request.domainId(group.domainId()); - request.exercisePartitionId(group.exercisePartitionId()); - request.replayPartitionId(group.replayPartitionId()); - request.requestId(group.id()); + request.type = group.type; + request.domainId = group.domainId; + request.exercisePartitionId = group.exercisePartitionId; + request.replayPartitionId = group.replayPartitionId; + request.requestId = group.id; break; // only one core } // we are also restarted... so answer here directly with 'finished' stateFinished(); - if (request.type() != Core::ServiceGroupType::Core) + if (request.type != Core::ServiceGroupType::Core) WARNING_LOG(m_logger) << "Could not find core group to restart..."; const auto restartCb = [this, request]() @@ -2246,7 +2246,7 @@ QString HandlerBaseDownload::nextDatabaseName() const const QString dbName = currentDatabaseName(); int idx = dbName.lastIndexOf(QLatin1Char('_')); bool bOk; - int id = dbName.midRef(idx + 1).toInt(&bOk) + 1; + int id = dbName.mid(idx + 1).toInt(&bOk) + 1; return bOk ? QString(dbName.left(idx + 1) + QString::number(id)) : QString(dbName + QLatin1Char('_') + QString::number(id)); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp index 1160069fa..20266093b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcBaseDownload/handler_pdf_download.cpp @@ -72,7 +72,7 @@ void HandlerPdfDownload::handleServicePortsInformation(const QVector(Core::CorePortType::WebSocketServer)) { flmPort = port.number; break; @@ -100,7 +100,7 @@ void HandlerPdfDownload::handlePdfListData(const WebSocketInterface::Messages::P PdfListReply rep; - auto &documentInformation = rep.documents(); + auto &documentInformation = rep.documents; documentInformation.reserve(pdfListData.pdfData.size()); for (const WebSocketInterface::Messages::PdfListMessage::PdfInformation ¤tInfo : pdfListData.pdfData) documentInformation.emplace_back(currentInfo.id, @@ -126,9 +126,9 @@ void HandlerPdfDownload::onGetPdfListRequest(const rti::core::SampleIdentity &co m_currentPort = NGL::Connections::port(NGL::Connections::eConnection::SCM_WEBSOCKET); m_pdfListCookie = cookie; - m_hostname = QString::fromStdString(request.hostname()); - m_currentPort = request.portNumber(); - m_exerciseId = request.exerciseId(); + m_hostname = QString::fromStdString(request.hostname); + m_currentPort = request.portNumber; + m_exerciseId = request.exerciseId; connect(m_webSocket.get(), &WebSocketInterface::WebSocketInterfaceHandler::connected, this, &HandlerPdfDownload::onConnected); connect(m_webSocket.get(), &WebSocketInterface::WebSocketInterfaceHandler::disconnected, this, &HandlerPdfDownload::onDisconnected); @@ -147,7 +147,7 @@ void HandlerPdfDownload::onStartPdfDownloadRequest(const rti::core::SampleIdenti { QString str = QStringLiteral("Got PDF download request for ids: "); - for (int32_t id : request.documentIds()) + for (int32_t id : request.documentIds) str.append(QString::number(id) + QStringLiteral(" ")); DEBUG_LOG(m_logger) << str; @@ -157,7 +157,7 @@ void HandlerPdfDownload::onStartPdfDownloadRequest(const rti::core::SampleIdenti { QString errorStr = QStringLiteral("Not able to start PDF download. Hostname not set."); ERROR_LOG(m_logger) << errorStr; - m_downloadReply.errorString(errorStr.toStdString()); + m_downloadReply.errorString = errorStr.toStdString(); m_fts->startPdfDownloadReply(m_downloadCookie, m_downloadReply); return; } @@ -174,7 +174,7 @@ void HandlerPdfDownload::onStartPdfDownloadRequest(const rti::core::SampleIdenti QVector pdfInfoVec; for (const auto ¤t : qAsConst(m_pdfData)) { - if (!containsId(request.documentIds(), current.id)) + if (!containsId(request.documentIds, current.id)) continue; pdfInfoVec.append(current); @@ -208,28 +208,28 @@ void HandlerPdfDownload::onOcPdfDownloadRequest(const rti::core::SampleIdentity { QString errorStr = QStringLiteral("Not able to open remote connection to DB"); ERROR_LOG(m_logger) << errorStr; - m_ocPdfDownloadReply.errorString(errorStr.toStdString()); + m_ocPdfDownloadReply.errorString = errorStr.toStdString(); m_fts->ocPdfDownloadReply(m_ocPdfDownloadCookie, m_ocPdfDownloadReply); return; } - DEBUG_LOG(m_logger) << "Got PDF download request for ids: "<< request.folderId(); + DEBUG_LOG(m_logger) << "Got PDF download request for ids: "<< request.folderId; - m_folderId = request.folderId(); + m_folderId = request.folderId; if(m_folderId == -1) { QString errorStr = QStringLiteral("Not able to start PDF download. Folder id not valid."); ERROR_LOG(m_logger) << errorStr; - m_ocPdfDownloadReply.errorString(errorStr.toStdString()); + m_ocPdfDownloadReply.errorString = errorStr.toStdString(); m_fts->ocPdfDownloadReply(m_ocPdfDownloadCookie, m_ocPdfDownloadReply); return; } - m_operatorName = QString::fromStdString(request.matrixOperator()); + m_operatorName = QString::fromStdString(request.matrixOperator); if (m_hostname.isEmpty()) { QString errorStr = QStringLiteral("Not able to start PDF download. Hostname not set."); ERROR_LOG(m_logger) << errorStr; - m_ocPdfDownloadReply.errorString(errorStr.toStdString()); + m_ocPdfDownloadReply.errorString = errorStr.toStdString(); m_fts->ocPdfDownloadReply(m_ocPdfDownloadCookie, m_ocPdfDownloadReply); return; } @@ -249,7 +249,7 @@ void HandlerPdfDownload::exportOcPdfFileContent() if (!remoteDb->init(0, m_remoteDbConnection)) { const QString err = tr("Can't open remote Database"); - m_ocPdfDownloadReply.errorString(err.toStdString()); + m_ocPdfDownloadReply.errorString = err.toStdString(); return; } @@ -283,14 +283,14 @@ void HandlerPdfDownload::exportOcPdfFileContent() if(folderId < 0) { const QString err = tr("Can't find user folder in remote Database"); - m_ocPdfDownloadReply.errorString(err.toStdString()); + m_ocPdfDownloadReply.errorString = err.toStdString(); return; } /// check first if the pdf file is not alreay exist and oudated without loading file content /// get ids of pdf file matching the named condition QString where = QStringLiteral(" WHERE folder_id =%1 ").arg(QString::number(folderId)) + - QStringLiteral(" AND file_type_id=%1 ").arg(FileManagement::FileType_def::Pdf); + QStringLiteral(" AND file_type_id=%1 ").arg(static_cast(FileManagement::FileType::Pdf)); QString tableName(QStringLiteral("flm.flm_file_content")); @@ -330,7 +330,7 @@ void HandlerPdfDownload::exportOcPdfFileContent() /// or file doesn't exist /// folderId is used in the first statement so no need to reuse it for second one. just use id offlm_file_content where = QStringLiteral(" WHERE id IN (%1)").arg(idsList.join(QStringLiteral(","))) + - QStringLiteral(" AND file_type_id=%1 ").arg(FileManagement::FileType_def::Pdf); + QStringLiteral(" AND file_type_id=%1 ").arg(static_cast(FileManagement::FileType::Pdf)); tableName = (QStringLiteral("flm.flm_file_content")); stmt = (QStringLiteral("SELECT id, name, file_status_id, content, last_modified FROM ") + tableName + where); @@ -347,7 +347,7 @@ void HandlerPdfDownload::exportOcPdfFileContent() int i = 0; data.id = query->value(i++).toLongLong(); data.name = query->value(i++).toString(); - data.fileStatusId = static_cast(query->value(i++).toInt()); + data.fileStatusId = static_cast(query->value(i++).toInt()); data.content = query->value(i++).toByteArray(); data.lastModified = query->value(i++).toLongLong(); @@ -363,7 +363,7 @@ void HandlerPdfDownload::exportOcPdfFileContent() { const QString errorStr = tr("Not able to export PDF."); ERROR_LOG(m_logger) << errorStr; - m_ocPdfDownloadReply.errorString(errorStr.toStdString()); + m_ocPdfDownloadReply.errorString = errorStr.toStdString(); return; } @@ -384,7 +384,7 @@ void HandlerPdfDownload::exportOcPdfFileContent() if(!file.open(QIODevice::WriteOnly)) { QString err = tr("Failed to write file: ") + (data.name); - m_ocPdfDownloadReply.errorString(err.toStdString()); + m_ocPdfDownloadReply.errorString = err.toStdString(); return; } @@ -464,18 +464,18 @@ void HandlerPdfDownload::onDisconnected() void HandlerPdfDownload::onNewDownloadState(int progress, const QString &msg) { DEBUG_LOG(m_logger) << msg; - m_downloadReply.replyState(Core::FtReplyState::InProgress); - m_downloadReply.progress(progress); - m_downloadReply.currentStep(msg.toStdString()); + m_downloadReply.replyState = Core::FtReplyState::InProgress; + m_downloadReply.progress = progress; + m_downloadReply.currentStep = msg.toStdString(); m_fts->startPdfDownloadReply(m_downloadCookie, m_downloadReply); } void HandlerPdfDownload::onAllDownloadsFinished() { DEBUG_LOG(m_logger) << "Downloads finished"; - m_downloadReply.replyState(Core::FtReplyState::Completed); - m_downloadReply.currentStep(tr("Downloads finished").toStdString()); - m_downloadReply.progress(100); + m_downloadReply.replyState = Core::FtReplyState::Completed; + m_downloadReply.currentStep = tr("Downloads finished").toStdString(); + m_downloadReply.progress = 100; m_fts->startPdfDownloadReply(m_downloadCookie, m_downloadReply); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp index 6b3865dfe..bd4b478af 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_aes_data.cpp @@ -253,14 +253,14 @@ void HandlerOcAesData::handleIedPositions(const QByteArray &data, size_t pos) LtsUtils::get2Byte(data, pos, eqNumber); const GuezIedManagement::Ied &ied = ieds.value(IedEqNumberToDdsId.value(eqNumber)); def.iedId = eqNumber; - def.type = ied.type; + def.type = static_cast(ied.type); def.tautWireTrigger = ied.tautWireTrigger; def.lightBarrierTrigger = ied.lightBarrierTrigger; def.switchTrigger = ied.switchTrigger; def.remoteTrigger = ied.remoteTrigger; def.explosiveForce = ied.explosiveForce; def.partyId = ied.partyId; - def.tacticalState = ied.tacticalState; + def.tacticalState = static_cast(ied.tacticalState); LtsUtils::get3Byte(data, pos, x); LtsUtils::get3Byte(data, pos, y); def.position = relativeFromGeoPosition(x, y); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp index 1b9575937..37beaae7d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_data.cpp @@ -328,7 +328,7 @@ void HandlerOcData::onOwnPosition(const TrainingAreaBaseOC::OwnPosition &data, D TrainingAreaBase::EquipmentPosition out; out.sampleTime = data.timeStamp; - out.position.position(Core::GeoPosition(data.position.lon, data.position.lat, 0)); + out.position.position = Core::GeoPosition(data.position.lon, data.position.lat, 0); if (data.moutObjectId.is_set()) out.position.moutObjectId.set(data.moutObjectId.get()); if (data.moutRoomId.is_set()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp index ba2690ca0..eb6583772 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OcSituationClient/handler_oc_situation_data.cpp @@ -429,7 +429,7 @@ bool HandlerOcSituationData::getVBG(const QByteArray &buf, size_t &pos, Training // vulnerabilityState, vulnerabilityBits, originatorParty, sampleTime uint64_t tmp; bRet &= LtsUtils::get1Byte(buf, pos, tmp); - equipmentState.vulnerabilityState = ProjectDataManagement::VulnerabilityState::inner_enum(tmp); + equipmentState.vulnerabilityState = static_cast(tmp); bRet &= LtsUtils::get4Byte(buf, pos, tmp); equipmentState.vulnerabilityKindId = tmp; bRet &= LtsUtils::get2Byte(buf, pos, tmp); @@ -459,7 +459,7 @@ bool HandlerOcSituationData::getVBG(const QByteArray &buf, size_t &pos, Training { int vit = (vitRest & 0x0F) * 10; equipmentState.vitality = vit; - TrainingAreaBase::SanitationResult result = static_cast(vitRest >> 4); + TrainingAreaBase::SanitationResult result = static_cast(vitRest >> 4); sanitation.sanitationResult = result; sanitation.proceduresTaken = 1; sanitation.qualification = TrainingAreaBase::Qualification::SANPers; @@ -468,7 +468,7 @@ bool HandlerOcSituationData::getVBG(const QByteArray &buf, size_t &pos, Training qint8 originator = 0; bRet &= LtsUtils::get1Byte(buf, pos, originator); if (bRet) - equipmentState.originatorType = ProjectDataManagement::StateChangeOriginator::inner_enum(originator); + equipmentState.originatorType = static_cast(originator); return bRet; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp index fe1b88870..197bf7f8b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/OperatorManagement/handler_locked_topics.cpp @@ -127,7 +127,7 @@ void HandlerLockedTopics::onTryLockEntityRequest(const rti::core::SampleIdentity auto ret = tryLock(request); if (!ret.errorString.empty()) { - WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString, ret.errorParams).translated() << " - " << request; + WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id, ret.errorString, ret.errorParams).translated() << " - " << request; } else if (ret.alreadyLocked) { @@ -306,7 +306,7 @@ void HandlerLockedTopics::onTryUnlockEntityRequest(const rti::core::SampleIdenti auto ret = tryUnlock(request); if (!ret.errorString.empty()) { - WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id(), ret.errorString, ret.errorParams).translated() << " - " << request; + WARNING_LOG(m_logger) << Core::FunctionReplyObject(ret.FunctionReply::id, ret.errorString, ret.errorParams).translated() << " - " << request; } m_ftsTryUnlockEntity->sendReply(cookie, ret); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp index f7027b4a4..b40a860ea 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant.cpp @@ -81,7 +81,7 @@ bool Participant::isValidPosition(qint64 sampleTime, const Core::GeoPosition &po return false; // an operator can set an invalid position (so the participant is not displayed on the map) - if (repSource == Core::PositionReportingSource_def::SetByOperator) + if (repSource == Core::PositionReportingSource::SetByOperator) return true; if (std::isnan(pos.lon()) || @@ -224,7 +224,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int // search for CombatReady state, ignore newState if it is older for (const auto &s : stateHistory) { - if (s.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::inner_enum::CombatReady && + if (s.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady && s.stateTime() > newState.sampleTime()) { return false; @@ -235,7 +235,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int bits.set(static_cast(newState.vulnerabilityState().underlying())); QStringList bitsList; - for (int i = (int)ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill; i > 0; --i) + for (int i = (int)ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill; i > 0; --i) { if (bits.test(i)) bitsList += QString::number(i); @@ -244,9 +244,9 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int bool vulnIgnored = true; // find current main state ProjectDataManagement::VulnerabilityState mainVulState = newState.vulnerabilityState(); - if (newState.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::TemporarySeverance && - newState.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::NearMiss && - newState.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::HitWithNoEffect) + if (newState.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::VulnerabilityState_TemporarySeverance && + newState.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss && + newState.vulnerabilityState() != ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect) { vulnIgnored = false; @@ -254,11 +254,11 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int /* NOTE: 'i > 0' is intended. This ignores vuln CR (VBG0). That's because CR is a special case where * the history is resetted, etc. Fortunately the TNE never sends a BC (VBG12) if the last vuln is CR, * but sends a CR instead. */ - for (int i = (int)ProjectDataManagement::VulnerabilityState::inner_enum::CatastrophicKill; i > 0; --i) + for (int i = (int)ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill; i > 0; --i) { if (bits.test(i)) { - mainVulState = static_cast(i); + mainVulState = static_cast(i); //WARNING_LOG(m_logger) << "mainVulState was manipulated into: " << i; break; } @@ -266,7 +266,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int } // if mainVulnState *still* is BC (VBG12), something went wrong on the sender side (TNE?) - if (mainVulState == ProjectDataManagement::VulnerabilityState::VulnerabilityBitsChanged) + if (mainVulState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VulnerabilityBitsChanged) WARNING_LOG(m_logger) << "Sending a BC (VBG12) if the last vuln is CR (VBG0) is not allowed! Something went wrong on the sender side (TNE?)"; DEBUG_LOG(m_logger) << "setState for eqid: " << newState.equipmentNumber() @@ -287,7 +287,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int } // check if it is a (younger) CombatReady state - remove older - if (mainVulState == ProjectDataManagement::VulnerabilityState::inner_enum::CombatReady) + if (mainVulState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady) { std::vector currentStates; for (const auto &s : stateHistory) @@ -338,15 +338,15 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int WARNING_LOG(m_logger) << "Cannot cast lower 6 Bits to SanResult! Defaulting to Unhandled"; sanResultVal = 1; } - sanEvaluation = static_cast(sanEvaluationVal); - sanResult = static_cast(sanResultVal); + sanEvaluation = static_cast(sanEvaluationVal); + sanResult = static_cast(sanResultVal); } #endif //new state Temp Vis Damage - if(newState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage || - newState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::NearMiss || - newState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::HitWithNoEffect) + if(newState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_VisibleWeaponSystemDamage || + newState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_NearMiss || + newState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect) { //Get last state in history and use that result const ParticipantManagement::StateInformation lastState = ParticipantManagement::youngestStateInformation(stateHistory, false, false); //Don't Skip Sanitation! @@ -355,7 +355,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int } - if(mainVulState == ProjectDataManagement::VulnerabilityState::CombatReady || + if(mainVulState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady || newState.originatorType() == ProjectDataManagement::StateChangeOriginator::FunctionalArea) sanResult = SanitationResult::NoEffect; @@ -363,7 +363,7 @@ bool Participant::setState(const TrainingAreaBase::EquipmentState &newState, int // ICD 52 Kapitel 3.3.2.6.72 VBA / Vitalitaet / Anzeigeindex int32_t vitality = newState.vitality(); - if(mainVulState == ProjectDataManagement::VulnerabilityState::CombatReady) + if(mainVulState == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady) vitality = 100; ParticipantManagement::StateInformation state(mainVulState, @@ -510,8 +510,8 @@ bool Participant::setSanitation(qint64 sanitationProceduresTaken, TrainingAreaBa state.vulnerabilityKindId(lastState.vulnerabilityKindId()); state.vulnerabilityState(lastState.vulnerabilityState()); state.sanitationProceduresTaken(sanitationProceduresTaken); - state.sanitationResult(static_cast(sanitationResult.underlying())); - state.sanitationEvaluation(static_cast(sanitationEvaluation.underlying())); + state.sanitationResult(static_cast(sanitationResult.underlying())); + state.sanitationEvaluation(static_cast(sanitationEvaluation.underlying())); state.stateTime(sampleTime); m_mutex.lock(); @@ -542,8 +542,8 @@ bool Participant::setOperatorAction(int action, int originatorId, qint64 sampleT state.vulnerabilityState(lastState.vulnerabilityState()); // 08: Wound paused // 35: Wound Continued - state.sanitationResult(ParticipantManagement::SanitationResult_def::NoEffect); - state.sanitationEvaluation(ParticipantManagement::SanitationEvaluation_def::NotApplicable); + state.sanitationResult(ParticipantManagement::SanitationResult::NoEffect); + state.sanitationEvaluation(ParticipantManagement::SanitationEvaluation::NotApplicable); state.stateTime(sampleTime); m_mutex.lock(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp index ab093b8ad..e9e47da2a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler.cpp @@ -202,7 +202,7 @@ void ParticipantHandler::onNewStateFromProxy(const TrainingAreaBase::EquipmentSt // Make Laser Designations to Laser Designations auto dtcPdm = m_bdp->pdmDtc(); - if (dtcPdm && dtcPdm->getChargeTypeSpecialProperty(data.originatorChargeTypeId(), 0, 0) == ProjectDataManagement::ChargeTypeProperty_def::LTD && originParticipant) + if (dtcPdm && dtcPdm->getChargeTypeSpecialProperty(data.originatorChargeTypeId(), 0, 0) == ProjectDataManagement::ChargeTypeProperty::LTD && originParticipant) { QSet ldGearTypes{1043}; // Need Property for LTD... DynamicParticipantData dpd = originParticipant->dynamicParticipantData(); @@ -459,7 +459,7 @@ void ParticipantHandler::onBuildingHitLineInfo(const Buildings::BuildingHitLineI << "BuildingId=" << data.buildingId() << " originatorParticipantId=" << data.originatorParticipantId(); auto dtcPdm = m_bdp->pdmDtc(); // NOTE: igniterTypeId/IgniterFunction = 0 as long as BuildingHitLineInfo does not contain values - if (dtcPdm->getChargeTypeSpecialProperty(data.chargeTypeId(), 0, 0) != ProjectDataManagement::ChargeTypeProperty_def::LTD) + if (dtcPdm->getChargeTypeSpecialProperty(data.chargeTypeId(), 0, 0) != ProjectDataManagement::ChargeTypeProperty::LTD) return; Participant *participant = participantById(data.originatorParticipantId()); @@ -511,7 +511,7 @@ void ParticipantHandler::onSanitaryMaterialStockReport(const TrainingAreaBase::P data.sanitaryMaterialStock(), data.uniqueId(), data.sampleTime(), - static_cast(data.qualification().underlying()), + static_cast(data.qualification().underlying()), data.originatorEquipmentNumber()); } participant->publishDynamicData(); @@ -603,7 +603,7 @@ void ParticipantHandler::onNewFunctionalAreaEntryChanged(const TrainingAreaBase: state.originatorId(data.aesItemId()); state.originatorType(ProjectDataManagement::StateChangeOriginator::FunctionalArea); state.sampleTime(data.sampleTime()); - state.vulnerabilityState(ProjectDataManagement::VulnerabilityState::HitWithNoEffect); // no effect - it's an entry into a functional area + state.vulnerabilityState(ProjectDataManagement::VulnerabilityState::VulnerabilityState_HitWithNoEffect); // no effect - it's an entry into a functional area state.vulnerabilityBits(oldState.vulnerabilityBits()); state.vulnerabilityKindId(oldState.vulnerabilityKindId()); state.vitality(oldState.vitality()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp index dfbc89f39..fddb5b57e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ParticipantHandling/participant_handler_for_exercise.cpp @@ -1259,7 +1259,7 @@ Core::FunctionReplyObject ParticipantHandlerForExercise::setSanitationRequest(co tabRequest.equipmentNumber(participant->equipmentNumber()); tabRequest.originatorEquipmentNumber(request.data().originatorEquipmentNumber()); tabRequest.participantId(request.id()); - tabRequest.qualification(static_cast(request.data().qualification().underlying())); + tabRequest.qualification(static_cast(request.data().qualification().underlying())); tabRequest.sanitationProceduresTaken(request.data().sanitationProceduresTaken()); return m_proxyListener->sendSetSanitationRequest(cookie, tabRequest); @@ -1916,7 +1916,7 @@ void ParticipantHandlerForExercise::customedSetGearCharges(Participant *particip { const auto ppType = m_mainHandler->typeHandler()->typeById(participant->typeId()); - if (!ppType || ppType->typeClass() == TypeClass_def::Unknown || ppType->properties().empty()) + if (!ppType || ppType->typeClass() == TypeClass::Unknown || ppType->properties().empty()) return; const QJsonObject &typObj = QJsonDocument::fromJson(QByteArray::fromStdString(ppType->properties())).object(); if (typObj.isEmpty()) @@ -1924,10 +1924,10 @@ void ParticipantHandlerForExercise::customedSetGearCharges(Participant *particip const bool isArtillery = typObj[QStringLiteral("isArtillery")].toBool(false); const int gearClassId = typObj[QStringLiteral("gearClassId")].toInt(0); - const ProjectDataManagement::GearClass_def::type gearClass = static_cast(gearClassId); - static QVector validGearTypes{ProjectDataManagement::GearClass_def::Mortar, - ProjectDataManagement::GearClass_def::Rocket, - ProjectDataManagement::GearClass_def::Artillery}; + const ProjectDataManagement::GearClass gearClass = static_cast(gearClassId); + static QVector validGearTypes{ProjectDataManagement::GearClass::Mortar, + ProjectDataManagement::GearClass::Rocket, + ProjectDataManagement::GearClass::Artillery}; if (!isArtillery || !validGearTypes.contains(gearClass)) return; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party.cpp index 2489985da..17c7ae080 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party.cpp @@ -50,7 +50,7 @@ ParticipantManagement::Party ParticipantManagement::PartyHandling::Party::toDdsP result.fadingColor(m_data.fadingColor); result.name(m_data.name.toStdString()); result.role(m_data.roleId); - result.hlaForceIdentifier(static_cast(m_data.hlaForceIdentifier)); + result.hlaForceIdentifier(static_cast(m_data.hlaForceIdentifier)); result.isUsedBy(m_data.isUsedBy); result.sampleTime(QDateTime::currentMSecsSinceEpoch()); result.properties(m_data.properties.toStdString()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp index 19fa0ebd9..ab735074b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/PartyHandling/party_handler.cpp @@ -305,7 +305,7 @@ void PartyHandling::PartyHandler::onSyncPartiesRequest(const rti::core::SampleId req.fadingColor(partyEx0.fadingColor); req.name(partyEx0.name.toStdString()); req.role(partyEx0.roleId); - req.hlaForceIdentifier(static_cast(partyEx0.hlaForceIdentifier)); + req.hlaForceIdentifier(static_cast(partyEx0.hlaForceIdentifier)); // this remains as it is req.isUsedBy(partyEx->isUsedBy()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp index ba66473b0..a9e5c69f9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TargetHandling/object_target_information.cpp @@ -237,9 +237,9 @@ TargetInformation ObjectTargetInformation::toDdsData(const Database::PpmTargetIn ddsData.participantId(dbData.participantId); ddsData.prewarningInterval(dbData.preWarningInterval); - ddsData.prewarningEffect(static_cast(dbData.preWarningEffect)); + ddsData.prewarningEffect(static_cast(dbData.preWarningEffect)); ddsData.takedownInterval(dbData.takeDownInterval); - ddsData.takedownEffect(static_cast(dbData.takeDownEffect)); + ddsData.takedownEffect(static_cast(dbData.takeDownEffect)); const QByteArray &propertiesBa = dbData.properties.toUtf8(); QJsonParseError parserError; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp index cb5c84e20..de843fdd8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/TypeHandling/type_handler.cpp @@ -44,17 +44,17 @@ bool TypeHandler::isSupportType(int typeId) const switch (type->typeClass().underlying()) { - case TypeClass_def::SupportEntity: - case TypeClass_def::SupportUnit: + case TypeClass::SupportEntity: + case TypeClass::SupportUnit: return true; - case TypeClass_def::Unit: - case TypeClass_def::Human: - case TypeClass_def::GroundVehicle: - case TypeClass_def::WeaponSystem: - case TypeClass_def::Aircraft: - case TypeClass_def::Vessel: - case TypeClass_def::VehicleWithGear: - case TypeClass_def::Unknown: + case TypeClass::Unit: + case TypeClass::Human: + case TypeClass::GroundVehicle: + case TypeClass::WeaponSystem: + case TypeClass::Aircraft: + case TypeClass::Vessel: + case TypeClass::VehicleWithGear: + case TypeClass::Unknown: return false; } return false; @@ -68,17 +68,17 @@ bool TypeHandler::isParticipantType(int typeId) const switch (type->typeClass().underlying()) { - case TypeClass_def::SupportEntity: - case TypeClass_def::SupportUnit: - case TypeClass_def::Unknown: + case TypeClass::SupportEntity: + case TypeClass::SupportUnit: + case TypeClass::Unknown: return false; - case TypeClass_def::Unit: - case TypeClass_def::Human: - case TypeClass_def::GroundVehicle: - case TypeClass_def::WeaponSystem: - case TypeClass_def::Aircraft: - case TypeClass_def::Vessel: - case TypeClass_def::VehicleWithGear: + case TypeClass::Unit: + case TypeClass::Human: + case TypeClass::GroundVehicle: + case TypeClass::WeaponSystem: + case TypeClass::Aircraft: + case TypeClass::Vessel: + case TypeClass::VehicleWithGear: return true; } return false; @@ -92,8 +92,8 @@ bool TypeHandler::isUnitType(int typeId) const switch (type->typeClass().underlying()) { - case TypeClass_def::Unit: - case TypeClass_def::SupportUnit: + case TypeClass::Unit: + case TypeClass::SupportUnit: return true; default: break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp index cfbbd886f..721d5d854 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/mission_plan_handler.cpp @@ -223,7 +223,7 @@ bool MissionPlanHandler::isUasCombatReady(int participantId) youngestState = si; } - return (youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady); + return (youngestState.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady); } Core::FunctionReplyObject MissionPlanHandler::createMissionPlanRequest(const ModifyMissionPlanRequest &request) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas.cpp index 509cf5d3e..a84047326 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/UasHandling/uas.cpp @@ -76,7 +76,7 @@ UAS Uas::toDdsUas() const result.id(m_data.id); result.deviceIdentifier(m_data.deviceIdentifier.toStdString()); - result.uasState(static_cast(m_data.uasStateId)); + result.uasState(static_cast(m_data.uasStateId)); result.participantId(m_data.participantId); result.exerciseId(m_data.exerciseId); result.hostname(m_data.hostname.toStdString()); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp index dbfd82153..2d7e3cff6 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ParticipantManagement/ppm_common.cpp @@ -39,9 +39,9 @@ StateInformation youngestStateInformation(const std::vector #include +#include #include namespace PresentationManagement @@ -21,7 +22,7 @@ Initialization::Initialization(QObject *parent) : QObject(parent) , m_logger(getLogger("Initialization")) { - qsrand(time(nullptr)); + srand(time(nullptr)); } Initialization::~Initialization() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h index b444b617f..9db4a988e 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h @@ -6,9 +6,9 @@ * $Author$ */ -#include -#include -#include +#include "pdm_export.h" +#include +#include #include namespace ProjectDataManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp index a7733974f..ec66288bd 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp @@ -108,7 +108,6 @@ bool PvSanImport::readFile(QVector &procedures, QVector &mater bool skip = true; QTextStream in(&csvFile); - in.setCodec("latin1"); //version while (!in.atEnd()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp index 9121f7656..63b42c9a2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Analyzer/handler_dynamic_participant_data.cpp @@ -203,7 +203,7 @@ void HandlerDynamicParticipantData::onParticipantPositionChanged(const Participa ttData.partyId = data.partyId; ttData.vitality = lastVitality(data.participantId, data.sampleTime); ttData.vulnerability = lastVulnerabilityKind(data.participantId, data.sampleTime); - ttData.vulnerabilityState = m_vulnStateMap[data.participantId]; + ttData.vulnerabilityState = static_cast(m_vulnStateMap[data.participantId]); ttData.eventTime = timeMounted; ttData.eventTypeId = ReportManagement::EventType::TransportInitiated; ttData.id = 0; // force insert @@ -360,7 +360,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic tData.participantId = data.participantId; tData.participantTypeId = pData.typeId; tData.partyId = pData.partyId; - tData.qualification = data.qualification; + tData.qualification = static_cast(data.qualification); // Report Treatment Timeline Database::RepTreatmentTimelineData ttData; @@ -388,10 +388,10 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic // Report Unit Power upData.ready = isCombatReady; - upData.vulnerabilityState = vulnState; + upData.vulnerabilityState = static_cast(vulnState); // Report Treatment (add vulnerabiltyState without treatment ) - tData.vulnerabilityState = vulnState; + tData.vulnerabilityState = static_cast(vulnState); tData.timeVulnerability = stateInfo.stateTime; tData.timeTreatment = 0; @@ -405,11 +405,11 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic } // Report Firings - fData.vulnerabilityState = vulnState; + fData.vulnerabilityState = static_cast(vulnState); fData.chargeTypeId = stateInfo.originatorChargeTypeId; // here we keep the original chargeId // Report AirSupport - airSupData.vulnerabilityState = vulnState; + airSupData.vulnerabilityState = static_cast(vulnState); airSupData.chargeTypeId = stateInfo.originatorChargeTypeId; // get the corresponding originator participant, it should be already in the map @@ -454,7 +454,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic //save TreatmentTimeline events too { - ttData.vulnerabilityState = stateInfo.vulnerabilityState; + ttData.vulnerabilityState = static_cast(stateInfo.vulnerabilityState); ttData.vulnerability = stateInfo.vulnerabilityKindId; ttData.vitality = stateInfo.vitality; @@ -510,7 +510,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic //save TreatmentTimeline events too { - ttData.vulnerabilityState = stateInfo.vulnerabilityState; + ttData.vulnerabilityState = static_cast(stateInfo.vulnerabilityState); ttData.vulnerability = stateInfo.vulnerabilityKindId; ttData.vitality = stateInfo.vitality; @@ -614,7 +614,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic { if (nbcData.nbcId == 0) // get the id from AES Item View ? nbcData.nbcId = aesItemView.aesItemId; - nbcData.aesType = aesType; + nbcData.aesType = static_cast(aesType); nbcData.chargeTypeId = aesItemView.chargeStruct.chargeTypeId; if (nbcData.nbcId > 0 && nbcData.chargeTypeId > 0) { @@ -635,7 +635,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic ERROR_LOG(m_logger) << "Error while inserting maintenance data for participantId: " << vrData.participantId; // treatment timeline event EnterFunctionalArea - ttData.vulnerabilityState = stateInfo.vulnerabilityState; + ttData.vulnerabilityState = static_cast(stateInfo.vulnerabilityState); ttData.vulnerability = stateInfo.vulnerabilityKindId; ttData.vitality = stateInfo.vitality; ttData.eventTime = stateInfo.stateTime; @@ -671,7 +671,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic { //const ParticipantManagement::StateInformation &lastState = m_ppmDtc->youngestStateInformation(data.stateHistory()); - tData.vulnerabilityState = stateInfo.vulnerabilityState; + tData.vulnerabilityState = static_cast(stateInfo.vulnerabilityState); tData.vulnerability = stateInfo.vulnerabilityKindId; tData.vitality = stateInfo.vitality; @@ -696,8 +696,8 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic } tData.timeTreatment = data.sampleTime; - tData.sanitationResult = stateInfo.sanitationResult; - tData.sanitationEvaluation = stateInfo.sanitationEvaluation; + tData.sanitationResult = static_cast(stateInfo.sanitationResult); + tData.sanitationEvaluation = static_cast(stateInfo.sanitationEvaluation); tData.sanitationProceduresTaken = stateInfo.sanitationProceduresTaken; tData.timePositionChanged = getLastSignificantParticipantPositionChanged(tData.participantId, tData.timeTreatment, getLastPosition(tData.participantId)); @@ -723,7 +723,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic // now treatment timeline events { - ttData.vulnerabilityState = stateInfo.vulnerabilityState; + ttData.vulnerabilityState = static_cast(stateInfo.vulnerabilityState); ttData.vulnerability = stateInfo.vulnerabilityKindId; ttData.vitality = stateInfo.vitality; @@ -780,7 +780,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic // treatment timeline events NineLinerSet and TransportRequested if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ObserverController) { - ttData.vulnerabilityState = stateInfo.vulnerabilityState; + ttData.vulnerabilityState = static_cast(stateInfo.vulnerabilityState); ttData.vulnerability = stateInfo.vulnerabilityKindId; ttData.vitality = stateInfo.vitality; if (stateInfo.originatorChargeTypeId == 1) // 9Liner created @@ -806,7 +806,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic // DemandVulnerabilityStateChange TAB -> StateChange -> SetInjury if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_ExerciseControl) { - ttData.vulnerabilityState = stateInfo.vulnerabilityState; + ttData.vulnerabilityState = static_cast(stateInfo.vulnerabilityState); ttData.vulnerability = stateInfo.vulnerabilityKindId; ttData.vitality = stateInfo.vitality; ttData.eventTime = stateInfo.stateTime; @@ -821,9 +821,9 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic // Vitality and Vulnerability reset manually if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_Initialization) -// && stateInfo.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::CombatReady) +// && stateInfo.vulnerabilityState() == ProjectDataManagement::VulnerabilityState::VulnerabilityState_CombatReady) { - ttData.vulnerabilityState = stateInfo.vulnerabilityState; + ttData.vulnerabilityState = static_cast(stateInfo.vulnerabilityState); ttData.vulnerability = stateInfo.vulnerabilityKindId; ttData.vitality = stateInfo.vitality; ttData.eventTime = stateInfo.stateTime; @@ -837,7 +837,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic // StateChange -> VBGSet if (stateInfo.originatorType == ProjectDataManagement::StateChangeOriginator::StateChangeOriginator_MedicalTimeout) { - ttData.vulnerabilityState = stateInfo.vulnerabilityState; + ttData.vulnerabilityState = static_cast(stateInfo.vulnerabilityState); ttData.vulnerability = stateInfo.vulnerabilityKindId; ttData.vitality = stateInfo.vitality; ttData.eventTime = stateInfo.stateTime; @@ -970,7 +970,7 @@ void HandlerDynamicParticipantData::onDynamicParticipantDataChanged(const Partic sanData.participantTypeId = pData.typeId; sanData.eventTime = data.sampleTime; sanData.sanitationUniqueId = data.sanitationUniqueId; - sanData.qualification = data.qualification; + sanData.qualification = static_cast(data.qualification); DEBUG_LOG(m_logger) << "Qualification = " << sanData.qualification; @@ -1006,7 +1006,7 @@ void HandlerDynamicParticipantData::onBuildingStateChanged(const Buildings::Buil airSupData.buildingId = data.structureElementId; airSupData.chargeTypeId = data.chargeTypeId; // Hits on Building will be stored as catastrophic kill - airSupData.vulnerabilityState = ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill; + airSupData.vulnerabilityState = static_cast(ProjectDataManagement::VulnerabilityState::VulnerabilityState_CatastrophicKill); airSupData.hitBuilding = 1; airSupData.eventTime = data.sampleTime; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_air_support.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_air_support.cpp index 443ea3659..07ccbe222 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_air_support.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_air_support.cpp @@ -238,9 +238,9 @@ bool HandlerReportData::generateAirSupportResult(const CreateModifyReportRequest if (!vbgMap.contains(vbg)) vbgMap.insert(vbg, {0, 0, 0}); - if (vbg == ProjectDataManagement::VulnerabilityState_def::CombatReady || - vbg == ProjectDataManagement::VulnerabilityState_def::NearMiss || - vbg == ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect) + if (vbg == ProjectDataManagement::VulnerabilityState::CombatReady || + vbg == ProjectDataManagement::VulnerabilityState::NearMiss || + vbg == ProjectDataManagement::VulnerabilityState::HitWithNoEffect) continue; vbgMap[vbg][0] += qSelect2.value(1).toInt(); // hits @@ -274,7 +274,7 @@ bool HandlerReportData::generateAirSupportResult(const CreateModifyReportRequest if (vbgMap.isEmpty()) { - qInsert.bindValue(QStringLiteral(":vbg"),ProjectDataManagement::VulnerabilityState_def::NearMiss); + qInsert.bindValue(QStringLiteral(":vbg"),ProjectDataManagement::VulnerabilityState::NearMiss); qInsert.bindValue(QStringLiteral(":impacts"), impacts); qInsert.bindValue(QStringLiteral(":hit"), 0); qInsert.bindValue(QStringLiteral(":hit_ff"), 0); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp index cf4386bae..34017996b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp @@ -207,7 +207,7 @@ void HandlerReportData::onCreateModifyReportRequest(const rti::core::SampleIdent break; } - case ReportManagement::ReportType_def::MedevacNineLiner: + case ReportManagement::ReportType::MedevacNineLiner: { ok = generateMedevacNineLinerResult(request, reportId); break; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_firings.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_firings.cpp index 68096cc4d..586985f0f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_firings.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_firings.cpp @@ -105,9 +105,9 @@ bool HandlerReportData::generateFiringsResult(const CreateModifyReportRequest &r int vbg = qSelect.value(0).toInt(); if (!vbgMap.contains(vbg)) vbgMap.insert(vbg, {0, 0, 0}); - if (vbg == ProjectDataManagement::VulnerabilityState_def::CombatReady || - vbg == ProjectDataManagement::VulnerabilityState_def::NearMiss || - vbg == ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect) + if (vbg == ProjectDataManagement::VulnerabilityState::CombatReady || + vbg == ProjectDataManagement::VulnerabilityState::NearMiss || + vbg == ProjectDataManagement::VulnerabilityState::HitWithNoEffect) vbgMap[vbg][0] ++; // firings vbgMap[vbg][1] += qSelect.value(1).toInt(); // hits diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp index f868b77c9..e8364be61 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp @@ -147,7 +147,7 @@ bool HandlerReportData::generateTreatmentResult(const CreateModifyReportRequest bool kiaAfterWia = false; // Check if KIA is also KIA after WIA - if (tData.vulnerabilityState == ProjectDataManagement::VulnerabilityState_def::CatastrophicKill) + if (tData.vulnerabilityState == ProjectDataManagement::VulnerabilityState::CatastrophicKill) kiaAfterWia = checkVulnerabilityStateWIA(tData.participantId, tData.time_vulnerability); qInsert.bindValue(QStringLiteral(":kia_after_wia"), kiaAfterWia); @@ -549,8 +549,8 @@ bool HandlerReportData::checkVulnerabilityStateWIA(int participantId, qint64 cur qSelect.prepare(stmtSelect); qSelect.bindValue(QStringLiteral(":currTime"), currTime); - qSelect.bindValue(QStringLiteral(":eventTypeId"), ReportManagement::EventType_def::VBGSet); - qSelect.bindValue(QStringLiteral(":vulnerabilityState"), ProjectDataManagement::VulnerabilityState_def::CatastrophicKill); + qSelect.bindValue(QStringLiteral(":eventTypeId"), ReportManagement::EventType::VBGSet); + qSelect.bindValue(QStringLiteral(":vulnerabilityState"), ProjectDataManagement::VulnerabilityState::CatastrophicKill); qSelect.bindValue(QStringLiteral(":participantId"), participantId); if (!qSelect.exec()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp index f7dad5304..86432e65b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/ModuleTests/rep_tests.cpp @@ -157,7 +157,7 @@ void RepTests::tryCreate(ReportType repType, VisualisationType visType) INFO_LOG(m_logger) << "trying to send createRequest Report"; CreateModifyReportRequest request; - QString repName = QStringLiteral("Test Report - type ") + QString::number(repType); + QString repName = QStringLiteral("Test Report - type ") + QString::number(static_cast(repType)); request.name = repName.toStdString(); request.description = "Test Report Description"; request.reportType = repType; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h index b7c8307e0..5f54a6c4f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ServiceManagement/UnitTests/data_topic_tests.h @@ -18,6 +18,9 @@ #include #include #include +#include +#include +#include namespace NGL { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp index 6eae07125..73199d7f9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/SituationReplay/static_publisher.cpp @@ -167,7 +167,7 @@ void StaticPublisher::publishMainStructureElement(const std::shared_ptr(SoundManagement::PlayControl::StopSound); QString category = enumToString(soundCategory); QString request = QStringLiteral("http://%1/bgsound.php?category=%2&sound=%3&control=%4") .arg(host) @@ -420,7 +420,7 @@ QString HandlerSounds::stopAllSounds(const int egcuId) // 200{ "ID":"0x510","Name":"Sound Report","sounds":[{"category":"Explosions","sound":"0001"}]} // 200{ "ID":"0x510","Name":"Sound Report","sounds":[{"category":"Explosions","sound":"0001"},{"category":"Explosions","sound":"0001"}]} QUrl url; - const int control = SoundManagement::PlayControl::StopAllSounds; + const int control = static_cast(SoundManagement::PlayControl::StopAllSounds); const QString request = QStringLiteral("http://%1/bgsound.php?control=%2") .arg(host) .arg(control); @@ -462,7 +462,7 @@ void HandlerSounds::getActiveSound(const int egcuId) // 200{ "ID":"0x510","Name":"Sound Report","sounds":[{"category":"Explosions","sound":"0001"}]} // 200{ "ID":"0x510","Name":"Sound Report","sounds":[{"category":"Explosions","sound":"0001"},{"category":"Explosions","sound":"0001"}]} QUrl url; - int control = SoundManagement::PlayControl::GetState; + int control = static_cast(SoundManagement::PlayControl::GetState); QString request = QStringLiteral("http://%1/bgsound.php?control=%2") .arg(host) .arg(control); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp index 39d828551..48456983f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/TargetManagement/handler_target_config.cpp @@ -49,8 +49,8 @@ void HandlerTargetConfig::onTargetDataChanged(const TrainingAreaBase::TargetData if (targetData.payload.size() < 6) return; tgtTargetData.id = 0; - tgtTargetData.tgtCommand = static_cast (targetData.payload[0] - responseCmd); - tgtTargetData.mode = static_cast (targetData.payload[1]); + tgtTargetData.tgtCommand = static_cast (targetData.payload[0] - responseCmd); + tgtTargetData.mode = static_cast (targetData.payload[1]); tgtTargetData.weapon = targetData.payload[2]; INFO_LOG(m_logger) << "tgtTargetData.tgtCommand =" << tgtTargetData.tgtCommand << " mode=" << tgtTargetData.mode diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp index 0aae870b8..c5017d8de 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/WsBaseDataInterface/data_manager.cpp @@ -486,8 +486,9 @@ void DataManager::onNotification(const QString &name, QSqlDriver::NotificationSo const QString triggerNameEx0 = triggerName(0); if (name.contains(triggerNameEx0)) { - QStringRef name_(&name); - name_ = name_.mid(triggerNameEx0.size() + 1); + // Qt6: QStringRef removed; QString::mid returns a QString with the + // same substring semantics. + QString name_ = name.mid(triggerNameEx0.size() + 1); int exerciseId = name_.toInt(); int participantId = payload.toInt(); INFO_LOG(m_logger) << "exerciseId: " << exerciseId << ", participantId: " << participantId; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.cpp index 332766a17..158121bce 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/handler_equipment_type_wh.cpp @@ -57,18 +57,18 @@ void convert(Database::EquipmentTypeWh &data, const EquipmentTypeWh &request) { data.id = request.id; data.name = QString::fromStdString(request.name); - data.canAbeSprache = request.configurationAbeLanguage; - data.agdusHelmWeste = request.configurationAgdusHV; + data.canAbeSprache = static_cast(request.configurationAbeLanguage); + data.agdusHelmWeste = static_cast(request.configurationAgdusHV); data.canAbeSprAusg = request.configurationAudioResponse; data.canWirkdarstPyro = request.configurationCedPyrotechnic; - data.anzeigeAdag = request.configurationDisplayAdag; - data.adagUntergruppe = request.configurationDisplayAdagSubUnit; + data.anzeigeAdag = static_cast(request.configurationDisplayAdag); + data.adagUntergruppe = static_cast(request.configurationDisplayAdagSubUnit); data.canMhgrEnergie = request.configurationMhgrEnergieSave; - data.canMhgrBetrArt = request.configurationMhgrOperatingMode; + data.canMhgrBetrArt = static_cast(request.configurationMhgrOperatingMode); data.canSsFirSan = request.configurationSsFirSan; - data.canSsFirFunkt = request.configurationSsFirFunction; - data.canSsMvFunkt = request.configurationSsMineFitFunction; - data.canSsStdFunkt = request.configurationSsStandardFunction; + data.canSsFirFunkt = static_cast(request.configurationSsFirFunction); + data.canSsMvFunkt = static_cast(request.configurationSsMineFitFunction); + data.canSsStdFunkt = static_cast(request.configurationSsStandardFunction); data.canStartupZeit = request.configurationStartupTime; data.ausstgGrp = request.equipGroup; data.ausstgNrMax = request.maxEquipNo; @@ -79,7 +79,7 @@ void convert(Database::EquipmentTypeWh &data, const EquipmentTypeWh &request) data.vbMinenIed = request.vbMineIed; data.vbAcWaffen = request.vbNc; data.canDevices = request.canDevices; - data.posUpdate = request.posUpdate; + data.posUpdate = static_cast(request.posUpdate); } void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const EquipmentTypeWh &request) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.cpp index 584dbd0f5..686351a12 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/WarehouseGuez/object_equipment_type_wh.cpp @@ -66,24 +66,24 @@ void ObjectEquipmentTypeWh::onPublishData() WarehouseGuez::EquipmentTypeWh ddsData; ddsData.id = m_data.id; - ddsData.configurationAbeLanguage = static_cast(m_data.canAbeSprache); - ddsData.configurationAgdusHV = static_cast(m_data.agdusHelmWeste); + ddsData.configurationAbeLanguage = static_cast(m_data.canAbeSprache); + ddsData.configurationAgdusHV = static_cast(m_data.agdusHelmWeste); ddsData.configurationAudioResponse = m_data.canAbeSprAusg; ddsData.configurationCedPyrotechnic = m_data.canWirkdarstPyro; - ddsData.configurationDisplayAdag = static_cast(m_data.anzeigeAdag); - ddsData.configurationDisplayAdagSubUnit = static_cast(m_data.adagUntergruppe); + ddsData.configurationDisplayAdag = static_cast(m_data.anzeigeAdag); + ddsData.configurationDisplayAdagSubUnit = static_cast(m_data.adagUntergruppe); ddsData.configurationMhgrEnergieSave = m_data.canMhgrEnergie; - ddsData.configurationMhgrOperatingMode = static_cast(m_data.canMhgrBetrArt); + ddsData.configurationMhgrOperatingMode = static_cast(m_data.canMhgrBetrArt); ddsData.configurationSsFirSan = m_data.canSsFirSan; - ddsData.configurationSsFirFunction = static_cast(m_data.canSsFirFunkt); - ddsData.configurationSsMineFitFunction = static_cast(m_data.canSsMvFunkt); - ddsData.configurationSsStandardFunction = static_cast(m_data.canSsStdFunkt); + ddsData.configurationSsFirFunction = static_cast(m_data.canSsFirFunkt); + ddsData.configurationSsMineFitFunction = static_cast(m_data.canSsMvFunkt); + ddsData.configurationSsStandardFunction = static_cast(m_data.canSsStdFunkt); ddsData.configurationStartupTime = m_data.canStartupZeit; ddsData.equipGroup = m_data.ausstgGrp; ddsData.maxEquipNo = m_data.ausstgNrMax; ddsData.minEquipNo = m_data.ausstgNrMin; ddsData.name = m_data.name.toStdString(); - ddsData.posUpdate = static_cast(m_data.posUpdate); + ddsData.posUpdate = static_cast(m_data.posUpdate); ddsData.vbAgdusId = m_data.vbAgdus; ddsData.vbAirSupport = m_data.vbEinsatzmittel; ddsData.vbFireArea = m_data.vbSteilfeuer; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/configurator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/configurator.cpp index 9965c8d93..94ab19ef2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/configurator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/ConfigX/configurator.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp index e641f775c..7caa1f157 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/EEMFakeServer/Server.cpp @@ -12,22 +12,20 @@ #include #include #include +#include Server::Server() : QObject(nullptr) , m_server(new QWebSocketServer(QString(), QWebSocketServer::NonSecureMode, this)) { - qsrand(time(nullptr)); + QRandomGenerator::global()->seed(); } qint64 randomBetween(qint64 min, qint64 max) { - qint64 val = qrand(); // qrand returns int (32 bit) - val <<= 32; - val |= qrand(); - return val % (max - min) + min; + return QRandomGenerator::global()->bounded(min, max); } @@ -156,7 +154,7 @@ bool Server::init(quint16 port) if (!k) limit = -1; - QStringList typesStringList(typesString.split(QLatin1Char(','), QString::SkipEmptyParts)); + QStringList typesStringList(typesString.split(QLatin1Char(','), Qt::SkipEmptyParts)); qWarning() << "new request" << from << to << typesString << "limit" << limit; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/httprequesthandler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/httprequesthandler.cpp index dec7e0794..4786e56c8 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/httprequesthandler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/VapixConfig/httprequesthandler.cpp @@ -65,9 +65,9 @@ QVector> HTTPRequestHandler::getParams(const QString &gro QByteArray replyBytes = reply->readAll(); QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size()); QRegularExpression re(QLatin1String("(\\w++=[^_]++)")); - const QVector replyList = replyText.splitRef(QRegExp(QLatin1String("\n|\r\n|\r"))); + const QStringList replyList = replyText.split(QRegularExpression(QLatin1String("\n|\r\n|\r"))); QMap paramMap; - for (const QStringRef &string : replyList) + for (const QString &string : replyList) { QRegularExpressionMatch match = re.match(string, 0, QRegularExpression::PartialPreferCompleteMatch); if (!match.captured(0).isNull()) @@ -92,12 +92,12 @@ void HTTPRequestHandler::removeParams(const QString &groupName, QNetworkAccessMa QByteArray replyBytes = reply->readAll(); QString replyText = QString::fromUtf8(replyBytes.data(), replyBytes.size()); QRegularExpression re(QLatin1String("(\\b\\w{2}\\b)")); - const QVector replyList = replyText.splitRef(QRegExp(QLatin1String("\n|\r\n|\r"))); + const QStringList replyList = replyText.split(QRegularExpression(QLatin1String("\n|\r\n|\r"))); QStringList tempList; - for (const QStringRef &string : replyList) + for (const QString &string : replyList) { QRegularExpressionMatch match = re.match(string, 0, QRegularExpression::NormalMatch); - if (match.capturedRef(0).isNull()) + if (match.captured(0).isEmpty()) continue; const QString removeUrl = buildHttpPrefix() + QLatin1String("/axis-cgi/admin/param.cgi?action=remove&group=") + @@ -133,7 +133,7 @@ int HTTPRequestHandler::getAmount(const QString &groupName, QNetworkAccessManage QByteArray replyBytes = reply->readAll(); QString bytesString = QString::fromUtf8(replyBytes.data(), replyBytes.size()); QString replyText = QVariant(bytesString).toString(); - QStringList replyList = replyText.split(QRegExp(QLatin1String("\n|\r\n|\r"))); + QStringList replyList = replyText.split(QRegularExpression(QLatin1String("\n|\r\n|\r"))); reply->deleteLater(); return replyList.count() - 1; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp index 6ac87831a..6f51f0812 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/main_handler.cpp @@ -113,16 +113,16 @@ void VulnerabilityStateGenerator::MainHandler::setNewState() void VulnerabilityStateGenerator::MainHandler::fillMapFromEnum() { - m_vsMap.insert(0, ProjectDataManagement::VulnerabilityState_def::CombatReady); - m_vsMap.insert(1, ProjectDataManagement::VulnerabilityState_def::LightDamage); - m_vsMap.insert(2, ProjectDataManagement::VulnerabilityState_def::MediumDamage); - m_vsMap.insert(3, ProjectDataManagement::VulnerabilityState_def::HeavyDamage); - m_vsMap.insert(4, ProjectDataManagement::VulnerabilityState_def::MobilityKill); - m_vsMap.insert(5, ProjectDataManagement::VulnerabilityState_def::VisibleMobilityKill); - m_vsMap.insert(6, ProjectDataManagement::VulnerabilityState_def::WeaponSystemDamage); - m_vsMap.insert(7, ProjectDataManagement::VulnerabilityState_def::VisibleWeaponSystemDamage); - m_vsMap.insert(8, ProjectDataManagement::VulnerabilityState_def::CatastrophicKill); - m_vsMap.insert(9, ProjectDataManagement::VulnerabilityState_def::TemporarySeverance); - m_vsMap.insert(10, ProjectDataManagement::VulnerabilityState_def::NearMiss); - m_vsMap.insert(11, ProjectDataManagement::VulnerabilityState_def::HitWithNoEffect); + m_vsMap.insert(0, ProjectDataManagement::VulnerabilityState::CombatReady); + m_vsMap.insert(1, ProjectDataManagement::VulnerabilityState::LightDamage); + m_vsMap.insert(2, ProjectDataManagement::VulnerabilityState::MediumDamage); + m_vsMap.insert(3, ProjectDataManagement::VulnerabilityState::HeavyDamage); + m_vsMap.insert(4, ProjectDataManagement::VulnerabilityState::MobilityKill); + m_vsMap.insert(5, ProjectDataManagement::VulnerabilityState::VisibleMobilityKill); + m_vsMap.insert(6, ProjectDataManagement::VulnerabilityState::WeaponSystemDamage); + m_vsMap.insert(7, ProjectDataManagement::VulnerabilityState::VisibleWeaponSystemDamage); + m_vsMap.insert(8, ProjectDataManagement::VulnerabilityState::CatastrophicKill); + m_vsMap.insert(9, ProjectDataManagement::VulnerabilityState::TemporarySeverance); + m_vsMap.insert(10, ProjectDataManagement::VulnerabilityState::NearMiss); + m_vsMap.insert(11, ProjectDataManagement::VulnerabilityState::HitWithNoEffect); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/proxy_emulator.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/proxy_emulator.cpp index 29d672b39..68503be38 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/proxy_emulator.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/VulnerabilityStateGenerator/proxy_emulator.cpp @@ -53,7 +53,7 @@ void VulnerabilityStateGenerator::ProxyEmulator::giveInitState(const QMappublish(state); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h index 27c3fe51a..1965b08f4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Symbology/symbol_data_to_render_role.h @@ -27,19 +27,19 @@ AdvancedSymbology::Role roleToRole(const PARTICIPANT_ROLE_TYPE role) { switch (role.underlying()) { - case ParticipantManagement::Role_def::Unknown: + case ParticipantManagement::Role::Unknown: return AdvancedSymbology::Role::Unknown; - case ParticipantManagement::Role_def::Friend: + case ParticipantManagement::Role::Friend: return AdvancedSymbology::Role::Friend; - case ParticipantManagement::Role_def::Neutral: + case ParticipantManagement::Role::Neutral: return AdvancedSymbology::Role::Neutral; - case ParticipantManagement::Role_def::Enemy: + case ParticipantManagement::Role::Enemy: return AdvancedSymbology::Role::HostileFaker; - case ParticipantManagement::Role_def::Pending: + case ParticipantManagement::Role::Pending: return AdvancedSymbology::Role::Pending; - case ParticipantManagement::Role_def::AssumedFriend: + case ParticipantManagement::Role::AssumedFriend: return AdvancedSymbology::Role::AssumedFriend; - case ParticipantManagement::Role_def::Suspect: + case ParticipantManagement::Role::Suspect: return AdvancedSymbology::Role::SuspectJoker; } // switch diff --git a/qt6-after/qt6-migrated-legatus/docker_build.sh b/qt6-after/qt6-migrated-legatus/docker_build.sh index 1d6987b42..4b8ad0023 100755 --- a/qt6-after/qt6-migrated-legatus/docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/docker_build.sh @@ -137,6 +137,7 @@ docker run --rm \ svcMrkClient svcMrkCommon svcMrkServer \ svcMsgClient svcMsgCommon svcMsgServer \ svcNomClient svcNomCommon svcNomServer svcNotificationManagement \ + svcNmeClient svcNmeCommon svcNmeServer svcNmeaManagement \ svcObdClient svcObdCommon svcObdServer \ svcOcBaseDownload svcOcSituationClient svcOcSituationServer \ svcOperatorManagement \ diff --git a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_mounting_point.h b/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_mounting_point.h index d6ed96463..88aa46b44 100755 --- a/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_mounting_point.h +++ b/qt6-after/qt6-migrated-legatus/include/InfrastructureManagement/ism_mounting_point.h @@ -114,7 +114,7 @@ public: // // Some methods regarding ImageTable: // - static QMap &getImageTable(); // contains images in good quality (100*100px) + static QMap &getImageTable(); // contains images in good quality (100*100px) static bool getImageAttributePlanActivity(const MountingPoint& mp, QImage &imgOut, QString &attribNameOut); @@ -125,7 +125,7 @@ public: QImage &img, QString &attribName); private: - static QMap &getImageTableInternal(); + static QMap &getImageTableInternal(); static void insertHelper(MountingPointType::type type, const QString &name, const QString &colorCodeGray, diff --git a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt index 1a65d633b..3a87ad024 100644 --- a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt @@ -129,7 +129,8 @@ if(BUILD_TESTING) svcAesCommon svcAlmCommon svcAsmCommon svcAvmCommon svcCodCommon svcEemCommon svcEsmCommon svcEscCommon svcEvlCommon svcExmCommon svcGimCommon svcIsmCommon svcMdmCommon svcMsgCommon svcMrkCommon - svcNomCommon svcOpmCommon svcOssCommon svcPdmCommon svcPpmCommon + svcNomCommon svcNmeCommon svcOpmCommon svcOssCommon svcPdmCommon + svcPpmCommon svcPreCommon svcRepCommon svcSomCommon svcSrmCommon svcSrpCommon svcTgtCommon svcWhgCommon) if(TARGET ${_svc_common}) @@ -164,6 +165,15 @@ if(BUILD_TESTING) add_dependencies(migration_tests svcBldCommon) endif() + # test_nme_dtc / test_nmea_handler include the server-topic + # interfaces (nme_dts.h, nme_fts.h) that CODEGEN_SERVER_TOPICS + # generates into the svcNmeServer target - same ordering + # requirement as the blocks above (without it a parallel make + # can start migration_tests before those headers exist). + if(TARGET svcNmeServer) + add_dependencies(migration_tests svcNmeServer) + endif() + # Enable Qt Meta-Object Compiler for tests with Q_OBJECT set_target_properties(migration_tests PROPERTIES AUTOMOC ON) @@ -270,6 +280,13 @@ endif() target_link_libraries(migration_tests PRIVATE nglwidgets) endif() + # NmeaManagement tests instantiate the generated nme types (nme.hpp + # default ctors, ServiceControlEnum stream operator) and the service + # logger (logger.cpp) - both compiled into svcNmeCommon. + if(TARGET svcNmeCommon) + target_link_libraries(migration_tests PRIVATE svcNmeCommon) + endif() + # FLM/FLT service tests include the Q_OBJECT custom headers of the # migrated services (flm_db_impl_custom.h, flm_dtc_impl_custom.h). # Their moc output references the generated bases' staticMetaObject diff --git a/qt6-after/qt6-migrated-legatus/tests/test_nme_dtc.cpp b/qt6-after/qt6-migrated-legatus/tests/test_nme_dtc.cpp new file mode 100644 index 000000000..16b398fb3 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_nme_dtc.cpp @@ -0,0 +1,231 @@ +/** + * @file test_nme_dtc.cpp + * @brief Verhaltenstests für die generierte NmeaManagement Dtc/Ftc/Dts/Fts-Schnittstelle + * + * Diese Tests prüfen die von CODEGEN_CLIENT_TOPICS_IFC / CODEGEN_SERVER_TOPICS + * aus nme_service.xml generierten Header (NmeaManagement/nme_dtc.h, nme_ftc.h, + * nme_dts.h, nme_fts.h) aus dem Build-Tree sowie die plainen DDS-Typ-Member + * aus nme.hpp (BatteryState, BatteryAlarm, PositionExcon, ServiceControl, + * TurnRadioMasterOffRequest), die der migrierte NmeaHandler, DdsHandler und + * SocketHandler direkt als Felder und Member-Assignment nutzen. + */ + +#include "NmeaManagement/nme.hpp" +#include "NmeaManagement/nme_dtc.h" +#include "NmeaManagement/nme_dts.h" +#include "NmeaManagement/nme_ftc.h" +#include "NmeaManagement/nme_fts.h" + +#include +#include +#include + +/** + * @test Der generierte Dtc ist von QObject abgeleitet (Signale für + * Topic-Updates); alle vier Interfaces sind abstrakt. + */ +TEST(nme_dtc_Generated, InterfacesAreAbstract) +{ + static_assert(std::is_base_of::value, + "generierter Dtc muss von QObject abgeleitet sein"); + static_assert(std::is_abstract::value, "Dtc muss abstrakt sein"); + static_assert(std::is_abstract::value, "Ftc muss abstrakt sein"); + static_assert(std::is_abstract::value, "Dts muss abstrakt sein"); + static_assert(std::is_abstract::value, "Fts muss abstrakt sein"); + SUCCEED(); +} + +/** + * @test DdsHandler::init nutzt diese Dts-Enable-Methoden — sie müssen + * über nme_dts.h vorliegen (Adresse ableitbar = existiert und ist + * public). + */ +TEST(nme_dtc_Generated, DtsEnableMethodsExist) +{ + using Dts = NmeaManagement::Interface::Dts; + // Member-Funktionszeiger: auto deduziert ohne '*' (auto* kann + // Member-Pointer-Typen nicht deduzieren). + auto enableBatteryAlarm = &Dts::enableBatteryAlarm; + auto enableServiceControl = &Dts::enableServiceControl; + auto enableBatteryState = &Dts::enableBatteryState; + auto enablePositionExcon = &Dts::enablePositionExcon; + (void)enableBatteryAlarm; + (void)enableServiceControl; + (void)enableBatteryState; + (void)enablePositionExcon; + SUCCEED(); +} + +/** + * @test SocketHandler erbt von Fts::TurnRadioMasterOffRequestHandler und + * antwortet über Fts::turnRadioMasterOffReply — beides muss über + * nme_fts.h vollständig vorliegen. + */ +TEST(nme_dtc_Generated, FtsTurnRadioMasterOffInterface) +{ + using namespace NmeaManagement::Interface; + static_assert(std::is_class::value, + "Fts::TurnRadioMasterOffRequestHandler fehlt"); + // turnRadioMasterOffReply ist überladen (FunctionReply / FunctionReplyObject) — + // den vom SocketHandler genutzten FunctionReplyObject-Overload explizit nehmen. + auto reply = static_cast( + &Fts::turnRadioMasterOffReply); + (void)reply; + SUCCEED(); +} + +/** + * @test Die DDS-Typen aus nme.hpp müssen plain-Member bereitstellen + * (rtiddsgen 7.7): BatteryState, den der migrierte NmeaHandler + * (IIXDR) per Member-Assignment befüllt. + */ +TEST(nme_dtc_Generated, BatteryStateHasPlainMembers) +{ + using BatteryState = NmeaManagement::BatteryState; + + static_assert(std::is_same::value, "id muss ein plain int32_t-Member sein"); + static_assert(std::is_same::value, + "battery muss ein plain int32_t-Member sein"); + static_assert(std::is_same::value, + "temperature muss ein plain int32_t-Member sein"); + static_assert(std::is_same::value, + "frequency muss ein plain int32_t-Member sein"); + static_assert(std::is_same::value, + "generic muss ein plain double-Member sein"); + static_assert(std::is_same::value, + "current muss ein plain int32_t-Member sein"); + static_assert(std::is_same::value, + "switchOrValue muss ein plain bool-Member sein"); + static_assert(std::is_same::value, + "voltage muss ein plain int32_t-Member sein"); + static_assert(std::is_same::value, + "serialNumber muss ein plain std::string-Member sein"); + + // Wie im migrierten IIXDR-Pfad: Member-Assignment statt Setter. + BatteryState bs; + bs.id = 1; + bs.battery = 4; + bs.temperature = 25; + bs.frequency = 100; + bs.generic = 1.5; + bs.current = 55; + bs.switchOrValue = true; + bs.voltage = 3300; + bs.serialNumber = "SER123"; + EXPECT_EQ(bs.id, 1); + EXPECT_EQ(bs.battery, 4); + EXPECT_EQ(bs.temperature, 25); + EXPECT_EQ(bs.frequency, 100); + EXPECT_DOUBLE_EQ(bs.generic, 1.5); + EXPECT_EQ(bs.current, 55); + EXPECT_TRUE(bs.switchOrValue); + EXPECT_EQ(bs.voltage, 3300); + EXPECT_EQ(bs.serialNumber, "SER123"); +} + +/** + * @test BatteryAlarm (IIALR-Pfad) muss plain-Member bereitstellen. + */ +TEST(nme_dtc_Generated, BatteryAlarmHasPlainMembers) +{ + using BatteryAlarm = NmeaManagement::BatteryAlarm; + + static_assert(std::is_same::value, "id muss ein plain int32_t-Member sein"); + static_assert(std::is_same::value, + "description muss ein plain std::string-Member sein"); + static_assert(std::is_same::value, + "acknowledge muss ein plain bool-Member sein"); + static_assert(std::is_same::value, + "condition muss ein plain bool-Member sein"); + static_assert(std::is_same::value, + "uniqueAlarmNumber muss ein plain int32_t-Member sein"); + static_assert(std::is_same::value, + "time muss ein plain int64_t-Member sein"); + + BatteryAlarm alarm; + alarm.id = 0; + alarm.time = 1700000000000LL; + alarm.description = "overvoltage"; + alarm.acknowledge = true; + alarm.condition = false; + alarm.uniqueAlarmNumber = 7; + EXPECT_EQ(alarm.id, 0); + EXPECT_EQ(alarm.time, 1700000000000LL); + EXPECT_EQ(alarm.description, "overvoltage"); + EXPECT_TRUE(alarm.acknowledge); + EXPECT_FALSE(alarm.condition); + EXPECT_EQ(alarm.uniqueAlarmNumber, 7); +} + +/** + * @test PositionExcon (GPGGA-Pfad): position ist Core::GeoPosition2D mit + * plain double-Member lat/lon; valid ist plain bool. + */ +TEST(nme_dtc_Generated, PositionExconHasPlainMembers) +{ + using PositionExcon = NmeaManagement::PositionExcon; + + static_assert(std::is_same::value, + "position muss ein plain Core::GeoPosition2D-Member sein"); + static_assert(std::is_same::value, + "position.lat muss ein plain double-Member sein"); + static_assert(std::is_same::value, + "position.lon muss ein plain double-Member sein"); + static_assert(std::is_same::value, "valid muss ein plain bool-Member sein"); + + // Wie im migrierten GPGGA-Pfad: Member-Assignment statt Setter. + PositionExcon pos; + pos.position.lat = 1.0; + pos.position.lon = 2.0; + pos.valid = true; + EXPECT_DOUBLE_EQ(pos.position.lat, 1.0); + EXPECT_DOUBLE_EQ(pos.position.lon, 2.0); + EXPECT_TRUE(pos.valid); +} + +/** + * @test ServiceControl (IIXDR-ServiceControl-Pfad) muss das + * ServiceControlState-Enum-Member bereitstellen. + */ +TEST(nme_dtc_Generated, ServiceControlHasEnumMember) +{ + using ServiceControl = NmeaManagement::ServiceControl; + + static_assert( + std::is_same::value, + "ServiceControlState muss ein plain ServiceControlEnum-Member sein"); + + ServiceControl sc; + sc.ServiceControlState = NmeaManagement::ServiceControlEnum::SHUTDOWN; + EXPECT_EQ(sc.ServiceControlState, NmeaManagement::ServiceControlEnum::SHUTDOWN); +} + +/** + * @test TurnRadioMasterOffRequest muss das plain bool-Member shutdown + * bereitstellen (Request-Typ der Fts-Funktions-Topic). + */ +TEST(nme_dtc_Generated, TurnRadioMasterOffRequestHasPlainMember) +{ + using TurnRadioMasterOffRequest = NmeaManagement::TurnRadioMasterOffRequest; + + static_assert(std::is_same::value, + "shutdown muss ein plain bool-Member sein"); + + TurnRadioMasterOffRequest req; + req.shutdown = true; + EXPECT_TRUE(req.shutdown); +} + +/** + * @test Include-Guard: mehrfaches Einbinden der generierten Header ist erlaubt. + */ +TEST(nme_dtc_Generated, MultipleIncludeGuard) +{ +// Including the header multiple times should not cause errors +#include "NmeaManagement/nme.hpp" +#include "NmeaManagement/nme_dtc.h" +#include "NmeaManagement/nme_dts.h" +#include "NmeaManagement/nme_ftc.h" +#include "NmeaManagement/nme_fts.h" + SUCCEED(); +} diff --git a/qt6-after/qt6-migrated-legatus/tests/test_nme_enums.cpp b/qt6-after/qt6-migrated-legatus/tests/test_nme_enums.cpp new file mode 100644 index 000000000..bdec514cf --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_nme_enums.cpp @@ -0,0 +1,54 @@ +/** + * @file test_nme_enums.cpp + * @brief Verhaltenstests für die generierten NmeaManagement-Enumerationen + * + * Diese Tests prüfen den von CODEGEN_IDL_SVC + rtiddsgen aus nme_service.xml + * generierten Header (Lts/Services/NmeaManagement/nme_enums.hpp) aus dem + * Build-Tree. Sie sichern die Enum-Form ab, die der migrierte NmeaHandler + * (IIXDR-Pfad) direkt nutzt: ServiceControlEnum::{PRESHUTDOWN,SHUTDOWN,STOP} + * ohne die legacy *_def-Wrapper (rtiddsgen 7.7 generiert plain enum class). + */ + +#include "NmeaManagement/nme_enums.hpp" + +#include +#include + +/** + * @test ServiceControlEnum muss mit den Werten aus nme_service.xml generiert + * werden (PRESHUTDOWN=0, SHUTDOWN=1, STOP=2). + */ +TEST(nme_enums_Generated, ServiceControlEnumValues) +{ + static_assert(std::is_enum<::NmeaManagement::ServiceControlEnum>::value, + "ServiceControlEnum muss aus nme_enums.hpp vorliegen"); + static_assert(static_cast(::NmeaManagement::ServiceControlEnum::PRESHUTDOWN) == 0, + "ServiceControlEnum::PRESHUTDOWN muss 0 sein"); + static_assert(static_cast(::NmeaManagement::ServiceControlEnum::SHUTDOWN) == 1, + "ServiceControlEnum::SHUTDOWN muss 1 sein"); + static_assert(static_cast(::NmeaManagement::ServiceControlEnum::STOP) == 2, + "ServiceControlEnum::STOP muss 2 sein"); + SUCCEED(); +} + +/** + * @test Die Enum-Werte müssen wie im migrierten NmeaHandler zugewiesen + * werden können (IIXDR: ServiceControl.ServiceControlState = ...). + */ +TEST(nme_enums_Generated, ServiceControlEnumAssignable) +{ + ::NmeaManagement::ServiceControlEnum state = ::NmeaManagement::ServiceControlEnum::PRESHUTDOWN; + state = ::NmeaManagement::ServiceControlEnum::SHUTDOWN; + state = ::NmeaManagement::ServiceControlEnum::STOP; + EXPECT_EQ(state, ::NmeaManagement::ServiceControlEnum::STOP); +} + +/** + * @test Include-Guard: mehrfaches Einbinden des generierten Headers ist erlaubt. + */ +TEST(nme_enums_Generated, MultipleIncludeGuard) +{ +// Including the header multiple times should not cause errors +#include "NmeaManagement/nme_enums.hpp" + SUCCEED(); +} diff --git a/qt6-after/qt6-migrated-legatus/tests/test_nmea_handler.cpp b/qt6-after/qt6-migrated-legatus/tests/test_nmea_handler.cpp new file mode 100644 index 000000000..c6c45cc9a --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_nmea_handler.cpp @@ -0,0 +1,101 @@ +/** + * @file test_nmea_handler.cpp + * @brief Verhaltenstests für den migrierten NmeaHandler (Lts/Services/NmeaManagement) + * + * Der NmeaHandler gehört zu den Executable-Quellen von svcNmeaManagement + * (kein Library-Symbol), daher wird nmea_handler.cpp hier direkt in das + * Test-Binary kompiliert. Vollständiges DDS-Publishing ist ohne laufende + * DDS-Domain nicht testbar (wie bei flmTests) — getestet wird deshalb: + * + * - Checksummen-Verhalten (Annahme und Ablehnung), + * - der regex-basierte NMEA-Paket-Split (Qt5 QRegExp -> Qt6 + * QRegularExpression: package.split(sep) statt package.split(sep.pattern()), + * das letztere auf das Literal "(,|*)" splitten würde und das Parsing + * aus dem Ruder laufen ließe), + * - den GPRMC-Parse-Pfad End-to-end (liest pkt_data[1..11] — mit kaputtem + * Split out-of-range und damit crash-geprüft), + * - die Dispatch-Verdrahtung (GPGGA mit gültiger Checksumme erreicht den + * Publish auf dem leeren DdsHandler — der Crash ist der beobachtbare + * Nachweis, dass Dispatch statt Parse-Abbruch stattfand). + */ + +#include "NmeaManagement/nmea_handler.h" + +#include +#include + +// Die Service-Implementierung direkt in dieses Test-Binary kompilieren — +// keine Library stellt die NmeaHandler-Symbole bereit. +#include "../Lts/Services/NmeaManagement/nmea_handler.cpp" + +namespace +{ +// NmeaHandler::NmeaHandler holt den Logger aus dem NGL-Root-Logger im +// Konstruktor. createNGLRootLogger() ist idempotent (ignorealreadycreated), +// daher sicher pro Test aufrufbar. +NGL::INGLLogger& ensureRootLogger() +{ + return NGL::NGLLoggerBootstrap::createNGLRootLogger(QString(), true, QString(), true); +} + +// NmeaHandler mit leerem DdsHandler: Pfade ohne Publish (GPRMC) sind damit +// lauffähig; Pfade mit Publish (IIXDR/IIALR/GPGGA) liefern null-Deref — +// dort ist der Crash der Observable (siehe GpggaValidChecksumDispatches). +NmeaManagement::NmeaHandler makeHandler() +{ + ensureRootLogger(); + std::shared_ptr noDds; + return NmeaManagement::NmeaHandler(noDds, nullptr); +} +} // namespace + +/** + * @test GPRMC mit gültiger Checksumme durchläuft den kompletten Parse-Pfad + * (Split auf ,/* via QRegularExpression und pkt_data[1..11]); GPRMC + * publiziert nicht, daher läuft der Test ohne DDS. Wäre der Split auf + * das Literal "(,|*)" kaputt, würde pkt_data[2..11] out-of-range und + * der Test crashen. + */ +TEST(nmea_handler_Decode, GprmcValidChecksumParses) +{ + NmeaManagement::NmeaHandler handler = makeHandler(); + // Checksumme 0x6A ist gültig (XOR aller Zeichen zwischen $ und *). + EXPECT_NO_THROW( + handler.decode(QStringLiteral("$GPRMC,123519,A,4807.038,N,01131.000,E,022.4,084.4,230394,003.1,W*6A"))); +} + +/** + * @test GPGGA mit gültiger Checksumme (0x73) wird nicht abgebrochen, sondern + * nach GPGGA() publiziert — auf dem leeren DdsHandler ist das eine + * null-Deref: der Crash beweist, dass Checksumme + Dispatch korrekt + * sind. + */ +TEST(nmea_handler_Decode, GpggaValidChecksumDispatches) +{ + NmeaManagement::NmeaHandler handler = makeHandler(); + EXPECT_DEATH( + handler.decode(QStringLiteral("$GPGGA,123519,4807.038,N,01131.000,E,1,08,0.9,54.5,M,46.9,M,00,0000*73")), ".*"); +} + +/** + * @test GPGGA mit ungültiger Checksumme (0x00 statt 0x73) wird verworfen: + * kein GPGGA()-Aufruf, kein Publish, kein Crash. + */ +TEST(nmea_handler_Decode, GpggaBadChecksumRejected) +{ + NmeaManagement::NmeaHandler handler = makeHandler(); + EXPECT_NO_THROW( + handler.decode(QStringLiteral("$GPGGA,123519,4807.038,N,01131.000,E,1,08,0.9,54.5,M,46.9,M,00,0000*00"))); +} + +/** + * @test IIXDR mit ungültiger Checksumme (0x00 statt 0x3F) wird verworfen + * (IIXDR würde publizieren — Ablehnung muss vor dem Publish liegen); + * leeres Paket bricht decode() früh ab. + */ +TEST(nmea_handler_Decode, IixdrBadChecksumRejectedAndEmptyPackage) +{ + NmeaManagement::NmeaHandler handler = makeHandler(); + EXPECT_NO_THROW(handler.decode(QStringLiteral("$IIXDR,123519,SER123,B,42,C,25,F,100,I,55,S,0,U,3300*00"))); + EXPECT_NO_THROW(handler.decode(QStringLiteral(""))); +}