Rewrite Medical GUI #6831

mharis001 · 2019-02-22T23:23:03Z

When merged this pull request will:

Rewrite medical_gui component to be more refined and cleaned up
Functionality on the surface remains the same with improvements to UX made where applicable
Component is more unified with different UIs being updated by common functions
Includes Improve medical body image/interaction colouring #6288 as that was necessary to proceed with work on component

Todo:

Icons for interact menu actions
Move strings used by medical_gui to component stringtable
Change cross icons to use new icon color functionality (keep for tourniquet versions)
Decide on what to do with painVisualization and showPainInMenu settings
Remove unused strings and any remaining unused files
Use macros for blood loss and damage color scales (leaving in functions for now)
Update triage status names, close small adjust to the triage status names #5016

The issue is actually the other way round, the factor of 20 would instantly make bodyparts red on taking a wound.

This replaces the old method of colouring the interaction menu icons and body image selections with a new method that has 10 distinct color steps (matching across the icons and the body image).

This re-adds visualisation for colouring based on damage. The case where a limb has a tourniquet will hopefully be handled by an overlayed icon.

…dical-rewrite-work

TheMagnetar · 2019-03-17T20:41:32Z

addons/medical_gui/XEH_postInit.sqf

    if (CBA_missionTime - GVAR(lastOpenedOn) > 0.5) exitWith {
        [objNull] call FUNC(openMenu);
    };
    false
-}, [35, [false, false, false]], false, 0] call CBA_fnc_addKeybind;
+},
+[35, [false, false, false]], false, 0] call CBA_fnc_addKeybind;


Magic number

TheMagnetar · 2019-03-17T20:53:22Z

addons/medical_gui/functions/fnc_displayPatientInformation.sqf

- * 1: Show <NUMBER> (default: 0)
- * 2: Selection <NUMBER> (default: 0)
+ * 0: Target <OBJECT>
+ * 2: Body part <NUMBER>


1: Body part

TheMagnetar · 2019-03-17T20:56:16Z

addons/medical_gui/functions/fnc_modifyAction.sqf

 * 2: Body part index <NUMBER>
- * 3: The action to modify <OBJECT>
+ * 3: Action data <ARRAY>


Argument number is false:
1: Body part index
2: Action data

TheMagnetar · 2019-03-17T20:56:53Z

addons/medical_gui/functions/fnc_onMenuClose.sqf

@@ -1,7 +1,8 @@
 #include "script_component.hpp"
 /*
 * Author: joko // Jonas
- * Handle medical menu closed
+ * Handles closing the Medical Menu.
+ * Called from onUnload event.


One line description

TheMagnetar · 2019-03-17T20:57:01Z

addons/medical_gui/functions/fnc_onMenuOpen.sqf

- * Handle medical menu opened
+ * Author: Glowbal, mharis001
+ * Handles opening the Medical Menu.
+ * Called from onLoad event.


One line description

TheMagnetar · 2019-03-17T20:58:44Z

addons/medical_gui/functions/fnc_updateCategories.sqf

+    _x params ["_idc", "_category"];
+
+    private _ctrl = _display displayCtrl _idc;
+    private _enable = GVAR(actions) findIf {_category == _x select 1 && {call (_x select 2)}} > -1;


_x select 1 is _idc
_x select 2 is _category

I don't understand. The _x select 1 and _x select 2 are for GVAR(actions). https://github.com/acemod/ACE3/pull/6831/files#diff-bf942c8fb9c049e3175d1488896d9eb4R28

You are right.

TheMagnetar · 2019-03-17T21:00:22Z

addons/medical_gui/functions/fnc_updateInjuryList.sqf

+{
+    _x params ["", "_woundClassID", "_bodyPartN", "_amountOf", "", "", "_category"];
+    if (_selectionN == _bodyPartN && {_amountOf > 0}) then {
+        _woundEntries pushBack [format ["[S] %1", call _fnc_getWoundDescription], [0.7, 0.7, 0.7, 1]];


Wha is the [S] for?

[S] was there previously, I assume to indicate a stitched wound.

TheMagnetar · 2019-03-17T21:00:57Z

addons/medical_gui/functions/fnc_updateInjuryList.sqf

+            _woundEntries pushBack [call _fnc_getWoundDescription, [1, 1, 1, 1]];
+        } else {
+            if !(EGVAR(medical_treatment,advancedBandages) && {EGVAR(medical_treatment,woundReopening)}) then {
+                _woundEntries pushBack [format ["[B] %1", call _fnc_getWoundDescription], [0.7, 0.7, 0.7, 1]];


What is the [B] for?

[B] was there previously, I assume to indicate a bandaged wound.

…rewrite-work

addons/medical_gui/gui.hpp

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

…rewrite-work

TheMagnetar · 2019-03-24T13:03:37Z

addons/medical_engine/script_macros_medical.hpp

@@ -84,6 +90,19 @@

 #define DEFAULT_TOURNIQUET_VALUES [0,0,0,0,0,0]

+// Triage colors, for consistency across UIs and functions
+#define TRIAGE_COLOR_NONE      0, 0, 0, 0.9


These should be defined as arrays.

Left those out so they could be used for configs too.

TheMagnetar · 2019-03-24T13:14:15Z

addons/medical_gui/functions/fnc_displayPatientInformation.sqf


-params ["_target", ["_show", 0], ["_selectionN", 0]];
+#define MAX_DISTANCE 4


I experimented with distance a bit for ACRE2 external radios. It always gave me trouble around these values since it allowed for 0 movement. If you tested and think it is fine, ignore this comment.

Do you mean that the distance is not enough? This controls how far the target has to move away for the patient info display to be hidden. 4 meters seems okay, haven't tested it fully though and can increase if needed.

It may be. We will just keep it in mind

kymckay · 2019-03-25T15:32:13Z

Apologies for not reviewing this in good time, I haven't been home all week due to a massive workload.

* Add a macro for the bloodloss scaling factor * Adjust bloodloss threshold for red icon * Remove bloodloss color scaling factor The issue is actually the other way round, the factor of 20 would instantly make bodyparts red on taking a wound. * Implemet 10 color steps provided by ShackTac This replaces the old method of colouring the interaction menu icons and body image selections with a new method that has 10 distinct color steps (matching across the icons and the body image). * Use macros for constants * Implement blue damage colouring This re-adds visualisation for colouring based on damage. The case where a limb has a tourniquet will hopefully be handled by an overlayed icon. * Tidy up file structure * Move patient information display to medical_ui * Make common colour conversion code into functions * Add tourniquet icon overlay to body image * Fix mispelling I forgot to commit * Update icon paths to new white cross icon * Clean mess after rebase * Add new medical menu gui * Add updating injury list and body image * Add updating treatment category buttons * Update onMenuClose function * Delete unused functions * Add action buttons and triage card to menu * Move medical menu PFH to separate function * Move setTriageStatus to treatment * Add triage select dropdown * Add toggle button action * Fix mouse moving randomly when opening * Add logs list update and remove unused functions * Hide tourniquet icons by default * Remove CfgInGameUI (already in feedback) * Update patient info display * Update triage card display * Add settings to control interact menu actions * Cleanup files/paths * Move triage status update to common function * Add icons for interact menu actions * Modify icon color for interact menu actions * Update canOpenMenu for new setting * Hide pain information for unconscious * Stringtable cleanup * Use switch for pain text * Change minor triage status to minimal * Fix injury list to use new stringtable entry names * Fix medical actions check when disabled * Skip distance check in same vehicle * More cleanup * Fix CI error * Requested changes * Fix INJURIES string * Fix include after comment block * Fix missing ; Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

kymckay and others added 30 commits July 18, 2018 20:12

Add a macro for the bloodloss scaling factor

42ce917

Adjust bloodloss threshold for red icon

f75c389

Remove bloodloss color scaling factor

dd874c8

The issue is actually the other way round, the factor of 20 would instantly make bodyparts red on taking a wound.

Implemet 10 color steps provided by ShackTac

43c066e

This replaces the old method of colouring the interaction menu icons and body image selections with a new method that has 10 distinct color steps (matching across the icons and the body image).

Use macros for constants

7300afb

Implement blue damage colouring

947ae3e

This re-adds visualisation for colouring based on damage. The case where a limb has a tourniquet will hopefully be handled by an overlayed icon.

Tidy up file structure

015b734

Move patient information display to medical_ui

f16ec8b

Make common colour conversion code into functions

37632db

Add tourniquet icon overlay to body image

2b0ef1e

Fix mispelling I forgot to commit

7763583

Update icon paths to new white cross icon

2f1f1af

Clean mess after rebase

8f80eac

Merge branch 'medical-rewrite' into medical-rw-icon-color

9aec56c

Merge remote-tracking branch 'upstream/medical-rw-icon-color' into me…

20b393f

…dical-rewrite-work

Add new medical menu gui

a35e979

Add updating injury list and body image

3740f98

Add updating treatment category buttons

7246667

Update onMenuClose function

f1d9d71

Delete unused functions

57e5a45

Add action buttons and triage card to menu

2527ef5

Move medical menu PFH to separate function

24a0447

Move setTriageStatus to treatment

c61ca7b

Add triage select dropdown

6220a44

Add toggle button action

5ecfcaf

Fix mouse moving randomly when opening

473c010

Add logs list update and remove unused functions

6b39ad5

Hide tourniquet icons by default

e7233f7

Remove CfgInGameUI (already in feedback)

6da5975

Update patient info display

adcb9f4

TheMagnetar requested changes Mar 17, 2019

View reviewed changes

mharis001 added 2 commits March 17, 2019 17:05

Fix CI error

7253d2c

Requested changes

9715ed2

TheMagnetar approved these changes Mar 18, 2019

View reviewed changes

TheMagnetar requested a review from kymckay March 18, 2019 07:47

mharis001 added 3 commits March 21, 2019 13:00

Merge remote-tracking branch 'upstream/medical-rewrite' into medical-…

bac39ec

…rewrite-work

Fix INJURIES string

2ebce59

Fix include after comment block

8445836

TheMagnetar requested changes Mar 21, 2019

View reviewed changes

addons/medical_gui/gui.hpp Outdated Show resolved Hide resolved

jonpas and others added 2 commits March 21, 2019 17:24

Fix missing ;

c109b39

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

Merge remote-tracking branch 'upstream/medical-rewrite' into medical-…

7d3798b

…rewrite-work

mharis001 requested a review from TheMagnetar March 24, 2019 04:17

Merge remote-tracking branch 'upstream/medical-rewrite' into medical-…

0d57d6b

…rewrite-work

TheMagnetar requested changes Mar 24, 2019

View reviewed changes

TheMagnetar reviewed Mar 24, 2019

View reviewed changes

TheMagnetar approved these changes Mar 24, 2019

View reviewed changes

mharis001 merged commit 8d2bba4 into acemod:medical-rewrite Mar 24, 2019

mharis001 deleted the medical-rewrite-work branch March 24, 2019 22:17

mharis001 mentioned this pull request Mar 24, 2019

Improve medical body image/interaction colouring #6288

Closed

kymckay mentioned this pull request May 24, 2019

Damage required to turn a body part red is too high in advanced medical #4347

Closed

PabstMirror modified the milestones: Medical Rewrite, 3.13.0, 3.13.0-temp3 Dec 30, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rewrite Medical GUI #6831

Rewrite Medical GUI #6831

mharis001 commented Feb 22, 2019 •

edited by TheMagnetar

Loading

TheMagnetar Mar 17, 2019

TheMagnetar Mar 17, 2019

TheMagnetar Mar 17, 2019

TheMagnetar Mar 17, 2019

TheMagnetar Mar 17, 2019

TheMagnetar Mar 17, 2019

mharis001 Mar 17, 2019

TheMagnetar Mar 18, 2019

TheMagnetar Mar 17, 2019

mharis001 Mar 17, 2019

TheMagnetar Mar 17, 2019

mharis001 Mar 17, 2019 •

edited

Loading

TheMagnetar Mar 24, 2019

mharis001 Mar 24, 2019

TheMagnetar Mar 24, 2019

TheMagnetar Mar 24, 2019

mharis001 Mar 24, 2019

TheMagnetar Mar 24, 2019

kymckay commented Mar 25, 2019


		params ["_target", ["_show", 0], ["_selectionN", 0]];
		#define MAX_DISTANCE 4

Rewrite Medical GUI #6831

Rewrite Medical GUI #6831

Conversation

mharis001 commented Feb 22, 2019 • edited by TheMagnetar Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mharis001 Mar 17, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kymckay commented Mar 25, 2019

mharis001 commented Feb 22, 2019 •

edited by TheMagnetar

Loading

mharis001 Mar 17, 2019 •

edited

Loading