Adding virtual key stringification and adapting parameters

Author: PapeCoding

CMakeLists.txt

@@ -59,6 +59,7 @@ set(SOURCE_FILES
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherModel.cpp
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherModule.cpp
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherNode.cpp
+	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherTypes.cpp
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherView.cpp
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DasherViewSquare.cpp
 	${CMAKE_CURRENT_LIST_DIR}/Src/DasherCore/DefaultFilter.cpp

Src/DasherCore/DasherTypes.cpp

@@ -0,0 +1,16 @@
+#include "DasherTypes.h"
+#include <array>
+#include <algorithm>
+
+namespace Dasher {
+
+namespace Keys {
+  static std::array<std::string, 104> keyNames = {"Invalid","Big_Start_Stop","Button_1","Button_2","Button_3","Button_4","Button_5","Button_6","Button_7","Button_8","Button_9","Button_10","Button_11","Button_12","Button_13","Button_14","Button_15","Button_16","Button_17","Button_18","Button_19","Button_20","Button_21","Button_22","Button_23","Button_24","Button_25","Button_26","Button_27","Button_28","Button_29","Button_30","Button_31","Button_32","Button_33","Button_34","Button_35","Button_36","Button_37","Button_38","Button_39","Button_40","Button_41","Button_42","Button_43","Button_44","Button_45","Button_46","Button_47","Button_48","Button_49","Button_50","Button_51","Button_52","Button_53","Button_54","Button_55","Button_56","Button_57","Button_58","Button_59","Button_60","Button_61","Button_62","Button_63","Button_64","Button_65","Button_66","Button_67","Button_68","Button_69","Button_70","Button_71","Button_72","Button_73","Button_74","Button_75","Button_76","Button_77","Button_78","Button_79","Button_80","Button_81","Button_82","Button_83","Button_84","Button_85","Button_86","Button_87","Button_88","Button_89","Button_90","Button_91","Button_92","Button_93","Button_94","Button_95","Button_96","Button_97","Button_98","Button_99","Primary","Secondary","Tertiary"};
+  const std::string& VirtualKeyToString(VirtualKey key) {return keyNames[key+1];};
+  const VirtualKey StringToVirtualKey(const std::string& name) {
+    auto elem = std::find(keyNames.begin(), keyNames.end(), name);
+    if(elem == keyNames.end()) return Invalid_Key;
+    return static_cast<VirtualKey>(std::distance(keyNames.begin(), elem) - 1);
+  };
+}
+}

Src/DasherCore/DasherTypes.h

@@ -102,6 +102,8 @@ namespace Keys
 		Tertiary_Input = 102, //Typically Third Mouse Button
 		Invalid_Key = -1
 	};
+  const std::string& VirtualKeyToString(VirtualKey key);
+  const VirtualKey StringToVirtualKey(const std::string& name);
 }
 
   // Types added so model can report back what it has done for

Src/DasherCore/Parameters.cpp

@@ -138,12 +138,8 @@ namespace Dasher{
 		{SP_INPUT_FILTER         , Parameter_Value{ "InputFilter"      , PARAM_STRING, Persistence::PERSISTENT, std::string("Normal Control"), "Input filter used to provide the current control mode"}},
 #endif                            
 		{SP_INPUT_DEVICE         , Parameter_Value{ "InputDevice"      , PARAM_STRING, Persistence::PERSISTENT, std::string("Mouse Input")   , "Driver for the input device"}},
-		{SP_BUTTON_0             , Parameter_Value{ "Button0"          , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "Assignment to button 0"}},
-		{SP_BUTTON_1             , Parameter_Value{ "Button1"          , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "Assignment to button 1"}},
-		{SP_BUTTON_2             , Parameter_Value{ "Button2"          , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "Assignment to button 2"}},
-		{SP_BUTTON_3             , Parameter_Value{ "Button3"          , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "Assignment to button 3"}},
-		{SP_BUTTON_4             , Parameter_Value{ "Button4"          , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "Assignment to button 4"}},
-		{SP_BUTTON_10            , Parameter_Value{ "Button10"         , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "Assignment to button 10"}},
+		{SP_BUTTON_MAPPINGS      , Parameter_Value{ "ButtonMap"        , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "Button assignments used in UI"}},
+		{SP_JOYSTICK_DEVICE      , Parameter_Value{ "JoystickDevice"   , PARAM_STRING, Persistence::PERSISTENT, std::string("")			  , "UUID of Joystick Device"}}
 	};
 
 	ParameterType GetParameterType(Parameter parameter) {

Src/DasherCore/Parameters.h

@@ -50,7 +50,7 @@ namespace Dasher
 		SP_ALPHABET_ID, SP_ALPHABET_1, SP_ALPHABET_2, SP_ALPHABET_3, SP_ALPHABET_4, 
 		SP_COLOUR_ID, SP_DASHER_FONT, SP_GAME_TEXT_FILE,
 		SP_INPUT_FILTER, SP_INPUT_DEVICE,
-		SP_BUTTON_0, SP_BUTTON_1, SP_BUTTON_2, SP_BUTTON_3, SP_BUTTON_4, SP_BUTTON_10,
+		SP_BUTTON_MAPPINGS, SP_JOYSTICK_DEVICE,
 		END_OF_SPS,
 		PM_INVALID
 	};