Add direction indicator (#81)

* Rename marker scripts folder

* Add direction to framework

* Add script for creating direction markers

* Fix offsets and generate HQ markers

* Add short direction in dropdown

* Make preview smaller to fit direction

* Add direction markers

* Correct spelling

addons/markers/CfgMarkers.hpp

@@ -4,14 +4,14 @@ class CfgMarkers {
     class mts_##TYPE##_##MODIFIER##_##NAME##: mts_##TYPE##_frameshape { \
         icon = QPATHTOF(data\TYPE\MODIFIER\MARKERFILE(TYPE,MODIFIER,NAME)); \
     }
-    #define NUMMARKER(TYPE,POSITION,NUMBER) \
-    class mts_##TYPE##_num_##POSITION##_##NUMBER##: mts_##TYPE##_frameshape { \
-        icon = QPATHTOF(data\TYPE\num\POSITION\MARKERFILE(TYPE,POSITION,NUMBER)); \
-    }
+
+    // Common markers
     #define COMMARKER(MODIFIER,NAME) \
     class mts_com_##MODIFIER##_##NAME##: mts_blu_frameshape { \
         icon = QPATHTOF(data\com\MODIFIER\MARKERFILE(com,MODIFIER,NAME)); \
     }
+
+    // Character markers
     #define ALPHANUMMARKERFILE(ANCHOR,POSITION,LETTER) mts_markers_alphanum_##ANCHOR##_##POSITION##_##LETTER##.paa
     #define ALPHANUMMARKER(ANCHOR,POSITION,LETTER) \
     class mts_alphanum_##ANCHOR##_##POSITION##_##LETTER##: mts_blu_frameshape { \
@@ -22,12 +22,26 @@ class CfgMarkers {
     class mts_special_##ANCHOR##_##POSITION##_##LETTER##: mts_blu_frameshape { \
         icon = QPATHTOF(data\special\ANCHOR\POSITION\SPECIALCHARMARKERFILE(ANCHOR,POSITION,LETTER)); \
     }
+
+    // Date-Time Group markers
     #define DTGMARKERFILE(POSITION,LETTER) mts_markers_dtg_##POSITION##_##LETTER##.paa
     #define DTGMARKER(POSITION,LETTER) \
     class mts_dtg_##POSITION##_##LETTER##: mts_blu_frameshape { \
         icon = QPATHTOF(data\dtg\POSITION\DTGMARKERFILE(POSITION,LETTER)); \
     }
 
+    // Direction of Movement markers
+    #define DIRMARKERFILE(TYPE,DIRECTION) mts_markers_##TYPE##_dir_##DIRECTION##.paa
+    #define DIRMARKER(TYPE,DIRECTION) \
+    class mts_##TYPE##_dir_##DIRECTION##: mts_##TYPE##_frameshape { \
+        icon = QPATHTOF(data\TYPE\dir\DIRMARKERFILE(TYPE,DIRECTION)); \
+    }
+    #define ALTDIRMARKERFILE(TYPE,MOD,DIRECTION) mts_markers_##TYPE##_dir_##MOD##_##DIRECTION##.paa
+    #define ALTDIRMARKER(TYPE,MOD,DIRECTION) \
+    class mts_##TYPE##_dir_##MOD##_##DIRECTION##: mts_##TYPE##_frameshape { \
+        icon = QPATHTOF(data\TYPE\dir\MOD\ALTDIRMARKERFILE(TYPE,MOD,DIRECTION)); \
+    }
+
     class b_unknown;
     class o_unknown;
     class n_unknown;

addons/markers/CfgMarkers/CfgMarkersBlufor.hpp

@@ -70,3 +70,6 @@ MARKER(blu,size,9);
 MARKER(blu,size,10);
 MARKER(blu,size,11);
 MARKER(blu,size,12);
+
+//Blufor Direction of Movement
+#include "CfgMarkersBluforDir.hpp"

addons/markers/CfgMarkers/CfgMarkersBluforDir.hpp

@@ -0,0 +1,39 @@
+// ------------------------------------------------
+// Character markers for Direction of Movement
+// This file is generated and should not be edited!
+// ------------------------------------------------
+
+DIRMARKER(blu,N);
+DIRMARKER(blu,NNE);
+DIRMARKER(blu,NE);
+DIRMARKER(blu,ENE);
+DIRMARKER(blu,E);
+DIRMARKER(blu,ESE);
+DIRMARKER(blu,SE);
+DIRMARKER(blu,SSE);
+DIRMARKER(blu,S);
+DIRMARKER(blu,SSW);
+DIRMARKER(blu,SW);
+DIRMARKER(blu,WSW);
+DIRMARKER(blu,W);
+DIRMARKER(blu,WNW);
+DIRMARKER(blu,NW);
+DIRMARKER(blu,NNW);
+
+ALTDIRMARKER(blu,hq,N);
+ALTDIRMARKER(blu,hq,NNE);
+ALTDIRMARKER(blu,hq,NE);
+ALTDIRMARKER(blu,hq,ENE);
+ALTDIRMARKER(blu,hq,E);
+ALTDIRMARKER(blu,hq,ESE);
+ALTDIRMARKER(blu,hq,SE);
+ALTDIRMARKER(blu,hq,SSE);
+ALTDIRMARKER(blu,hq,S);
+ALTDIRMARKER(blu,hq,SSW);
+ALTDIRMARKER(blu,hq,SW);
+ALTDIRMARKER(blu,hq,WSW);
+ALTDIRMARKER(blu,hq,W);
+ALTDIRMARKER(blu,hq,WNW);
+ALTDIRMARKER(blu,hq,NW);
+ALTDIRMARKER(blu,hq,NNW);
+

addons/markers/CfgMarkers/CfgMarkersNeutral.hpp

@@ -70,3 +70,6 @@ MARKER(neu,size,9);
 MARKER(neu,size,10);
 MARKER(neu,size,11);
 MARKER(neu,size,12);
+
+//Neutral Direction of Movement
+#include "CfgMarkersNeutralDir.hpp"

addons/markers/CfgMarkers/CfgMarkersNeutralDir.hpp

@@ -0,0 +1,39 @@
+// ------------------------------------------------
+// Character markers for Direction of Movement
+// This file is generated and should not be edited!
+// ------------------------------------------------
+
+DIRMARKER(neu,N);
+DIRMARKER(neu,NNE);
+DIRMARKER(neu,NE);
+DIRMARKER(neu,ENE);
+DIRMARKER(neu,E);
+DIRMARKER(neu,ESE);
+DIRMARKER(neu,SE);
+DIRMARKER(neu,SSE);
+DIRMARKER(neu,S);
+DIRMARKER(neu,SSW);
+DIRMARKER(neu,SW);
+DIRMARKER(neu,WSW);
+DIRMARKER(neu,W);
+DIRMARKER(neu,WNW);
+DIRMARKER(neu,NW);
+DIRMARKER(neu,NNW);
+
+ALTDIRMARKER(neu,hq,N);
+ALTDIRMARKER(neu,hq,NNE);
+ALTDIRMARKER(neu,hq,NE);
+ALTDIRMARKER(neu,hq,ENE);
+ALTDIRMARKER(neu,hq,E);
+ALTDIRMARKER(neu,hq,ESE);
+ALTDIRMARKER(neu,hq,SE);
+ALTDIRMARKER(neu,hq,SSE);
+ALTDIRMARKER(neu,hq,S);
+ALTDIRMARKER(neu,hq,SSW);
+ALTDIRMARKER(neu,hq,SW);
+ALTDIRMARKER(neu,hq,WSW);
+ALTDIRMARKER(neu,hq,W);
+ALTDIRMARKER(neu,hq,WNW);
+ALTDIRMARKER(neu,hq,NW);
+ALTDIRMARKER(neu,hq,NNW);
+

addons/markers/CfgMarkers/CfgMarkersRedfor.hpp

@@ -70,3 +70,6 @@ MARKER(red,size,9);
 MARKER(red,size,10);
 MARKER(red,size,11);
 MARKER(red,size,12);
+
+//Redfor Direction of Movement
+#include "CfgMarkersRedforDir.hpp"

addons/markers/CfgMarkers/CfgMarkersRedforDir.hpp

@@ -0,0 +1,39 @@
+// ------------------------------------------------
+// Character markers for Direction of Movement
+// This file is generated and should not be edited!
+// ------------------------------------------------
+
+DIRMARKER(red,N);
+DIRMARKER(red,NNE);
+DIRMARKER(red,NE);
+DIRMARKER(red,ENE);
+DIRMARKER(red,E);
+DIRMARKER(red,ESE);
+DIRMARKER(red,SE);
+DIRMARKER(red,SSE);
+DIRMARKER(red,S);
+DIRMARKER(red,SSW);
+DIRMARKER(red,SW);
+DIRMARKER(red,WSW);
+DIRMARKER(red,W);
+DIRMARKER(red,WNW);
+DIRMARKER(red,NW);
+DIRMARKER(red,NNW);
+
+ALTDIRMARKER(red,hq,N);
+ALTDIRMARKER(red,hq,NNE);
+ALTDIRMARKER(red,hq,NE);
+ALTDIRMARKER(red,hq,ENE);
+ALTDIRMARKER(red,hq,E);
+ALTDIRMARKER(red,hq,ESE);
+ALTDIRMARKER(red,hq,SE);
+ALTDIRMARKER(red,hq,SSE);
+ALTDIRMARKER(red,hq,S);
+ALTDIRMARKER(red,hq,SSW);
+ALTDIRMARKER(red,hq,SW);
+ALTDIRMARKER(red,hq,WSW);
+ALTDIRMARKER(red,hq,W);
+ALTDIRMARKER(red,hq,WNW);
+ALTDIRMARKER(red,hq,NW);
+ALTDIRMARKER(red,hq,NNW);
+

addons/markers/CfgMarkers/CfgMarkersUnknown.hpp

@@ -70,3 +70,6 @@ MARKER(unk,size,9);
 MARKER(unk,size,10);
 MARKER(unk,size,11);
 MARKER(unk,size,12);
+
+//Unknown Direction of Movement
+#include "CfgMarkersUnknownDir.hpp"

addons/markers/CfgMarkers/CfgMarkersUnknownDir.hpp

@@ -0,0 +1,39 @@
+// ------------------------------------------------
+// Character markers for Direction of Movement
+// This file is generated and should not be edited!
+// ------------------------------------------------
+
+DIRMARKER(unk,N);
+DIRMARKER(unk,NNE);
+DIRMARKER(unk,NE);
+DIRMARKER(unk,ENE);
+DIRMARKER(unk,E);
+DIRMARKER(unk,ESE);
+DIRMARKER(unk,SE);
+DIRMARKER(unk,SSE);
+DIRMARKER(unk,S);
+DIRMARKER(unk,SSW);
+DIRMARKER(unk,SW);
+DIRMARKER(unk,WSW);
+DIRMARKER(unk,W);
+DIRMARKER(unk,WNW);
+DIRMARKER(unk,NW);
+DIRMARKER(unk,NNW);
+
+ALTDIRMARKER(unk,hq,N);
+ALTDIRMARKER(unk,hq,NNE);
+ALTDIRMARKER(unk,hq,NE);
+ALTDIRMARKER(unk,hq,ENE);
+ALTDIRMARKER(unk,hq,E);
+ALTDIRMARKER(unk,hq,ESE);
+ALTDIRMARKER(unk,hq,SE);
+ALTDIRMARKER(unk,hq,SSE);
+ALTDIRMARKER(unk,hq,S);
+ALTDIRMARKER(unk,hq,SSW);
+ALTDIRMARKER(unk,hq,SW);
+ALTDIRMARKER(unk,hq,WSW);
+ALTDIRMARKER(unk,hq,W);
+ALTDIRMARKER(unk,hq,WNW);
+ALTDIRMARKER(unk,hq,NW);
+ALTDIRMARKER(unk,hq,NNW);
+

addons/markers/XEH_preInit.sqf

@@ -76,6 +76,27 @@ GVAR(monthAbbreviations) = createHashMapFromArray [
     [12, "dec"]
 ];
 
+// Cardinal and ordinal moving directions
+GVAR(directions) = ["N", "NNE", "NE", "ENE", "E", "ESE", "SE", "SSE", "S", "SSW", "SW", "WSW", "W", "WNW", "NW", "NNW"];
+GVAR(directionLocalization) = [
+    ["str_q_north", LSTRING(ui_direction_n_short)],
+    [LSTRING(ui_direction_nne), LSTRING(ui_direction_nne_short)],
+    ["str_q_north_east", LSTRING(ui_direction_ne_short)],
+    [LSTRING(ui_direction_ene), LSTRING(ui_direction_ene_short)],
+    ["str_q_east", LSTRING(ui_direction_e_short)],
+    [LSTRING(ui_direction_ese), LSTRING(ui_direction_ese_short)],
+    ["str_q_south_east", LSTRING(ui_direction_se_short)],
+    [LSTRING(ui_direction_sse), LSTRING(ui_direction_sse_short)],
+    ["str_q_south", LSTRING(ui_direction_s_short)],
+    [LSTRING(ui_direction_ssw), LSTRING(ui_direction_ssw_short)],
+    ["str_q_south_west", LSTRING(ui_direction_sw_short)],
+    [LSTRING(ui_direction_wsw), LSTRING(ui_direction_wsw_short)],
+    ["str_q_west", LSTRING(ui_direction_w_short)],
+    [LSTRING(ui_direction_wnw), LSTRING(ui_direction_wnw_short)],
+    ["str_q_north_west", LSTRING(ui_direction_nw_short)],
+    [LSTRING(ui_direction_nnw), LSTRING(ui_direction_nnw_short)]
+];
+
 GVAR(lastSelection) = [];
 
 if (is3DEN) then {

addons/markers/functions/fnc_createMarker.sqf

@@ -29,6 +29,7 @@
  *          7: ARRAY - Date-Time Group.
  *              0: ARRAY - Date in format [year, month, day, hour, minute] (all NUMBER).
  *              1: STRING - Time zone identifier.
+ *          8: STRING - Direction of Movement (N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW). Empty string for no direction.
  *      4: NUMBER - Scale of the marker. (Optional, default: 1.3)
  *      5: NUMBER - Alpha of the marker. (Optional, default: 1)
  *

addons/markers/functions/fnc_createMarkerLocal.sqf

@@ -31,6 +31,7 @@
  *          7: ARRAY - Date-Time Group.
  *              0: ARRAY - Date in format [year, month, day, hour, minute] (all NUMBER).
  *              1: STRING - Time zone identifier.
+ *          8: STRING - Direction of Movement Arrow (N, NNE, NE, ENE, E, ESE, SE, SSE, S, SSW, SW, WSW, W, WNW, NW, NNW). Empty string for no direction.
  *      4: NUMBER - Scale of the marker. (Optional, default: 1.3)
  *      5: NUMBER - Alpha of the marker. (Optional, default: 1)
  *
@@ -59,7 +60,8 @@ _markerParameter params [
     ["_additionalInfo", "", [""]],
     ["_higherFormation", [], [[]]],
     ["_operationalCondition", OC_FULLY_CAPABLE, [0]],
-    ["_dateTimeGroup", [], [[]]]
+    ["_dateTimeGroup", [], [[]]],
+    ["_direction", "", [""]]
 ];
 _size params [["_grpsize", 0, [0]], ["_reinforced", false, [false]], ["_reduced", false, [false]]];
 
@@ -82,11 +84,16 @@ if (_alpha < 0 || _alpha > 1) then {
 };
 
 if !(_identity in ["blu", "red", "neu", "unk"]) exitWith {
-    ERROR_1("Unkown Identity %1", _identity);
+    ERROR_1("Unknown Identity %1", _identity);
 };
 
 CHECKRET(_operationalCondition < 0 || _operationalCondition > 2, ERROR("Operational condition must be a number between 0 and 2."));
 
+_direction = toUpper _direction;
+if (_direction isNotEqualTo "" && {!(_direction in GVAR(directions))}) exitWith {
+    ERROR_2("Unknown direction of movement %1. Allowed values: %2", _direction, GVAR(directions) joinString ", ");
+};
+
 //create frameshape marker
 private _identityComplete = if (_dashedFrameshape) then {
     format ["%1dash", _identity]
@@ -117,7 +124,10 @@ CHECKRET(_frameshapeColor isEqualTo "", ERROR_1("Could not get corresponding van
 
 _markerFrame setMarkerColorLocal _frameshapeColor;
 
-if (_isHq) then {
+// Headquaters
+// This is adding standalone HQ marker.
+// If direction is given, the HQ marker will be replaced by direction.
+if (_direction isEqualTo "" && _isHq) then {
     private _markerHq = createMarkerLocal [format ["%1_hq", _namePrefix], _pos];
     _markerHq setMarkerTypeLocal format ["mts_%1_hq", _identity];
     _markerHq setMarkerSizeLocal [_scale, _scale];
@@ -126,6 +136,20 @@ if (_isHq) then {
     _markerFamily pushBack _markerHq;
 };
 
+// Direction of Movement Arrow
+if (_direction isNotEqualTo "") then {
+    private _mod = if (_isHq) then { "dir_hq" } else { "dir" };
+    private _markerName = format ["%1_%2_%3", _namePrefix, _mod, _direction];
+    private _markerType = format ["mts_%1_%2_%3", _identity, _mod, _direction];
+
+    private _markerDir = createMarkerLocal [_markerName, _pos];
+    _markerDir setMarkerTypeLocal _markerType;
+    _markerDir setMarkerSizeLocal [_scale, _scale];
+    _markerDir setMarkerAlphaLocal _alpha;
+
+    _markerFamily pushBack _markerDir;
+};
+
 //create group size marker
 if (_grpsize > 0) then {
     private _unitsize = format ["mts_%1_size_%2", _identity, _grpsize];
@@ -256,6 +280,7 @@ if ((count _higherFormation) > 0) then {
     } forEach _higherFormation;
 };
 
+// Operational condition marker
 if (_operationalCondition > 0) then {
     private _opCondAmplifier = "mts_com_opcond";
     if (_operationalCondition isEqualTo OC_DAMAGED) then {
@@ -289,12 +314,12 @@ if ((count _dateTimeGroup) > 0) then {
         private _markerName = format ["%1_dtg_%2_%3", _namePrefix, _letterPos, _x];
         private _markerType = format ["mts_dtg_%1_%2", _letterPos, _x];
 
-        private _dtgMarker = createMarkerLocal [_markerName, _pos];
-        _dtgMarker setMarkerTypeLocal _markerType;
-        _dtgMarker setMarkerSizeLocal [_scale, _scale];
-        _dtgMarker setMarkerAlphaLocal _alpha;
+        private _markerDtg = createMarkerLocal [_markerName, _pos];
+        _markerDtg setMarkerTypeLocal _markerType;
+        _markerDtg setMarkerSizeLocal [_scale, _scale];
+        _markerDtg setMarkerAlphaLocal _alpha;
 
-        _markerFamily pushBack _dtgMarker;
+        _markerFamily pushBack _markerDtg;
 
         _letterPos = _letterPos + 1;
     } forEachReversed _dtgCharacters;

addons/markers/functions/fnc_getUIData.sqf

@@ -66,5 +66,23 @@ if (cbChecked (_mainDisplay displayCtrl DESTROYED_CHECKBOX)) then {
 // Get the Date-Time Group saved in the button
 private _dateTimeGroup = (_mainDisplay displayCtrl DTG_BUTTON) getVariable [QGVAR(dateTimeGroup), []];
 
-// This will be the marker parameters in createMarker
-[[_identity, _dashedFrameshape, _isHq], _modifier, [_grpsize, _reinforced, _reduced], _uniqueDesignation, _additionalInfo, _higherFormation, _operationalCondition, _dateTimeGroup]
+// Get direction of movement
+private _directionSelIndex = lbCurSel (_mainDisplay displayCtrl DIRECTION_DROPDOWN);
+// Direction index 0 is no direction, 1 is N, 2 is NNE, ...
+private _direction = "";
+if (_directionSelIndex > 0 && _directionSelIndex < (count GVAR(directions) + 1)) then {
+    _direction = GVAR(directions) select (_directionSelIndex - 1);
+};
+
+// These will be the marker parameters in createMarker
+[
+    [_identity, _dashedFrameshape, _isHq],
+    _modifier,
+    [_grpsize, _reinforced, _reduced],
+    _uniqueDesignation,
+    _additionalInfo,
+    _higherFormation,
+    _operationalCondition,
+    _dateTimeGroup,
+    _direction
+]

addons/markers/functions/fnc_initializeDTGUI.sqf

@@ -55,7 +55,7 @@ private _currentTimeZone = [systemTime, systemTimeUTC] call FUNC(getTimeZoneIden
     _timeZoneCtrl lbSetValue [_index, _timeZoneId];
     _timeZoneCtrl lbSetTooltip [_index, _tooltip];
 
-    // Set transparent picture to the right this will be the padding right for the test right
+    // Set transparent picture to the right this will be the padding right for the text right
     _timeZoneCtrl lbSetPictureRight [_index, "#(argb,8,8,3)color(0,0,0,0)"];
     _timeZoneCtrl lbSetTextRight [_index, _timeZone];
 } forEach [