Removing some unused parameters

Author: PapeCoding

Src/DasherCore/AlternatingDirectMode.cpp

@@ -15,9 +15,9 @@ using namespace Dasher;
 
 static SModuleSettings sSettings[] = {
   /* TRANSLATORS: The number of time steps over which to perform the zooming motion in button mode. */
-  {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Frames over which to perform zoom")},
+  {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Frames over which to perform zoom")}
   /* TRANSLATORS: Intercept keyboard events for 'special' keys even when the Dasher window doesn't have keyboard focus.*/
-  {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
+  // {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
 };
 
 CAlternatingDirectMode::CAlternatingDirectMode(CSettingsStore* pSettingsStore, CDasherInterfaceBase *pInterface)

Src/DasherCore/ButtonMode.cpp

@@ -25,9 +25,9 @@ static SModuleSettings sSettings[] = {
    * however the code seems to use ratio = (129/127)^-r, instead of
    * ratio = exp(r/128) used in the design document
    */
-  {LP_R, T_LONG, -89, 89, 1, 10, _("Box non-uniformity")},
+  {LP_R, T_LONG, -89, 89, 1, 10, _("Box non-uniformity")}
   /* TRANSLATORS: Intercept keyboard events for 'special' keys even when the Dasher window doesn't have keyboard focus.*/
-  {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
+  // {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
 };
 
 void CButtonMode::GetUISettings(std::vector<Dasher::Parameter>& List) {

Src/DasherCore/CompassMode.cpp

@@ -16,9 +16,9 @@ static SModuleSettings sSettings[] = {
   /* TRANSLATORS: The number of time steps over which to perform the zooming motion in button mode. */
   {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Frames over which to perform zoom")},
   /* TRANSLATORS: The zoom factor per press when moving to the right in compass mode. */
-  {LP_RIGHTZOOM, T_LONG, 1024, 10240, 1024, 1024, _("Right zoom")},
+  {LP_RIGHTZOOM, T_LONG, 1024, 10240, 1024, 1024, _("Right zoom")}
   /* TRANSLATORS: Intercept keyboard events for 'special' keys even when the Dasher window doesn't have keyboard focus.*/
-  {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
+  // {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
 };
 
 void CCompassMode::GetUISettings(std::vector<Dasher::Parameter>& List) {

Src/DasherCore/DasherButtons.cpp

@@ -21,7 +21,7 @@ CDasherButtons::~CDasherButtons()
 
 void CDasherButtons::GetUISettings(std::vector<Dasher::Parameter>& List) {
   CStaticFilter::GetUISettings(List);
-  AddSettings(List, {LP_BUTTON_SCAN_TIME});
+  if(m_bMenu) AddSettings(List, {LP_BUTTON_SCAN_TIME});
 }
 
 void CDasherButtons::Activate() {

Src/DasherCore/Parameters.cpp

@@ -23,9 +23,7 @@ namespace Dasher{
 		{BP_REMAP_XTREME          , Parameter_Value{"RemapXtreme"          , PARAM_BOOL, Persistence::PERSISTENT, false, "Pointer at extreme Y translates more and zooms less", "", Settings::UIControlType::Switch}},
 		{BP_AUTO_SPEEDCONTROL     , Parameter_Value{"AutoSpeedControl"     , PARAM_BOOL, Persistence::PERSISTENT, true , "AutoSpeedControl", "", Settings::UIControlType::Switch}},
 		{BP_LM_ADAPTIVE           , Parameter_Value{"LMAdaptive"           , PARAM_BOOL, Persistence::PERSISTENT, true , "Whether language model should learn as you enter text"}},
-		{BP_SOCKET_DEBUG          , Parameter_Value{"SocketInputDebug"     , PARAM_BOOL, Persistence::PERSISTENT, false, "Print information about socket input processing to console"}},
 		{BP_CIRCLE_START          , Parameter_Value{"CircleStart"          , PARAM_BOOL, Persistence::PERSISTENT, false, "Start on circle mode", "", Settings::UIControlType::Switch}},
-		{BP_GLOBAL_KEYBOARD       , Parameter_Value{"GlobalKeyboard"       , PARAM_BOOL, Persistence::PERSISTENT, false, "Whether to assume global control of the keyboard"}},
 		{BP_NONLINEAR_Y           , Parameter_Value{"NonlinearY"           , PARAM_BOOL, Persistence::PERSISTENT, true , "Apply nonlinearities to Y axis (i.e. compress top & bottom)"}},
 		{BP_STOP_OUTSIDE          , Parameter_Value{"PauseOutside"         , PARAM_BOOL, Persistence::PERSISTENT, false, "Whether to stop when pointer leaves canvas area", "", Settings::UIControlType::Switch}},
 #ifdef TARGET_OS_IPHONE                              
@@ -41,7 +39,6 @@ namespace Dasher{
 		{BP_SPEAK_WORDS           , Parameter_Value{"SpeakWords"           , PARAM_BOOL, Persistence::PERSISTENT, false, "Speak words as they are written"}},
 		{BP_GAME_HELP_DRAW_PATH   , Parameter_Value{"GameDrawPath"         , PARAM_BOOL, Persistence::PERSISTENT, true , "When we give help, show the shortest path to the target sentence"}},
 		{BP_TWO_PUSH_RELEASE_TIME , Parameter_Value{"TwoPushReleaseTime"   , PARAM_BOOL, Persistence::PERSISTENT, false, "Use push and release times of single press rather than push times of two presses", "", Settings::UIControlType::Switch}},
-		{BP_SLOW_CONTROL_BOX      , Parameter_Value{"SlowControlBox"       , PARAM_BOOL, Persistence::PERSISTENT, true , "Slow down when going through control box" }},
 		{BP_SIMULATE_TRANSPARENCY , Parameter_Value{"SimulateTransparency" , PARAM_BOOL, Persistence::PERSISTENT, false, "Enable the internal color mixing and thus the need to support alpha blending in the renderer." }},
 
 		{LP_ORIENTATION           , Parameter_Value{ "ScreenOrientation"         , PARAM_LONG, Persistence::PERSISTENT, -2l  , "Screen Orientation"}},
@@ -52,7 +49,6 @@ namespace Dasher{
 		{LP_MESSAGE_FONTSIZE      , Parameter_Value{ "MessageFontSize"           , PARAM_LONG, Persistence::PERSISTENT, 14l   , "Size of font for messages (in points)"}},
 		{LP_SHAPE_TYPE            , Parameter_Value{ "RenderStyle"               , PARAM_LONG, Persistence::PERSISTENT, static_cast<long>(Options::OVERLAPPING_RECTANGLE), "Shapes to render in (see Options::Rendering_Shape_Types)"}},
 		{LP_UNIFORM               , Parameter_Value{ "UniformTimes1000"          , PARAM_LONG, Persistence::PERSISTENT, 50l   , "UniformTimes1000"}},
-		{LP_YSCALE                , Parameter_Value{ "YScaling"                  , PARAM_LONG, Persistence::PERSISTENT, 0l    , "YScaling"}},
 		{LP_MOUSEPOSDIST          , Parameter_Value{ "MousePositionBoxDistance"  , PARAM_LONG, Persistence::PERSISTENT, 50l   , "MousePositionBoxDistance"}},
 		{LP_PY_PROB_SORT_THRES    , Parameter_Value{ "PYProbabilitySortThreshold", PARAM_LONG, Persistence::PERSISTENT, 85l   , "Sort converted syms in descending probability order up to this percentage"}},
 		{LP_MESSAGE_TIME          , Parameter_Value{ "MessageTime"               , PARAM_LONG, Persistence::PERSISTENT, 2500l , "Time for which non-modal messages are displayed, in ms"}},
@@ -136,8 +132,6 @@ namespace Dasher{
 		{ SP_COLOUR_ID           , Parameter_Value{ "ColourID"         , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "ColourID" }},
 		{SP_DASHER_FONT          , Parameter_Value{ "DasherFont"       , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "DasherFont"}},
 		{SP_GAME_TEXT_FILE       , Parameter_Value{ "GameTextFile"     , PARAM_STRING, Persistence::PERSISTENT, std::string("")              , "User-specified file with strings to practice writing"}},
-		{SP_SOCKET_INPUT_X_LABEL , Parameter_Value{ "SocketInputXLabel", PARAM_STRING, Persistence::PERSISTENT, std::string("x")             , "Label preceding X values for network input"}},
-		{SP_SOCKET_INPUT_Y_LABEL , Parameter_Value{ "SocketInputYLabel", PARAM_STRING, Persistence::PERSISTENT, std::string("y")             , "Label preceding Y values for network input"}},
 #ifdef TARGET_OS_IPHONE           
 		{SP_INPUT_FILTER        , Parameter_Value{ "InputFilter"      , PARAM_STRING, Persistence::PERSISTENT, std::string("Stylus Control"), "Input filter used to provide the current control mode"}},
 #else                             
@@ -150,7 +144,6 @@ namespace Dasher{
 		{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_JOYSTICK_DEVICE      , Parameter_Value{ "JoystickDevice"   , PARAM_STRING, Persistence::PERSISTENT, std::string("/dev/input/js0"), "Joystick device"}}
 	};
 
 	ParameterType GetParameterType(Parameter parameter) {

Src/DasherCore/Parameters.h

@@ -12,23 +12,23 @@ namespace Dasher
 	enum Parameter{ 
 		BP_DRAW_MOUSE_LINE, BP_DRAW_MOUSE, BP_CURVE_MOUSE_LINE,
 		BP_START_MOUSE,
-		BP_START_SPACE, BP_CONTROL_MODE, BP_SMOOTH_PRESS_MODE, BP_SMOOTH_ONLY_FORWARD, BP_SMOOTH_DRAW_MOUSE, BP_SMOOTH_DRAW_MOUSE_LINE,
+		BP_START_SPACE, BP_SMOOTH_PRESS_MODE, BP_SMOOTH_ONLY_FORWARD, BP_SMOOTH_DRAW_MOUSE, BP_SMOOTH_DRAW_MOUSE_LINE,
 		BP_MOUSEPOS_MODE,
 		BP_PALETTE_CHANGE, BP_TURBO_MODE, BP_EXACT_DYNAMICS,
 		BP_AUTOCALIBRATE, BP_REMAP_XTREME,
 		BP_AUTO_SPEEDCONTROL,
-		BP_LM_ADAPTIVE, BP_SOCKET_DEBUG, 
-		BP_CIRCLE_START, BP_GLOBAL_KEYBOARD, BP_NONLINEAR_Y,
+		BP_LM_ADAPTIVE,
+		BP_CIRCLE_START, BP_NONLINEAR_Y,
 		BP_STOP_OUTSIDE, BP_BACKOFF_BUTTON,
 		BP_TWOBUTTON_REVERSE, BP_2B_INVERT_DOUBLE, BP_SLOW_START,
 		BP_COPY_ALL_ON_STOP, BP_SPEAK_ALL_ON_STOP, BP_SPEAK_WORDS,
 		BP_GAME_HELP_DRAW_PATH, BP_TWO_PUSH_RELEASE_TIME,
-		BP_SLOW_CONTROL_BOX, BP_SIMULATE_TRANSPARENCY,
+		BP_SIMULATE_TRANSPARENCY,
 		END_OF_BPS,
 
 		LP_ORIENTATION, LP_MAX_BITRATE, LP_FRAMERATE,
-		LP_LANGUAGE_MODEL_ID, LP_DASHER_FONTSIZE, LP_DASHER_FONTSIZING, LP_MESSAGE_FONTSIZE, LP_SHAPE_TYPE,
-		LP_UNIFORM, LP_YSCALE, LP_MOUSEPOSDIST, LP_PY_PROB_SORT_THRES, LP_MESSAGE_TIME,
+		LP_LANGUAGE_MODEL_ID, LP_DASHER_FONTSIZE, LP_MESSAGE_FONTSIZE, LP_SHAPE_TYPE,
+		LP_UNIFORM, LP_MOUSEPOSDIST, LP_PY_PROB_SORT_THRES, LP_MESSAGE_TIME,
 		LP_LM_MAX_ORDER, LP_LM_EXCLUSION,
 		LP_LM_UPDATE_EXCLUSION, LP_LM_ALPHA, LP_LM_BETA,
 		LP_LM_MIXTURE, LP_LINE_WIDTH, LP_GEOMETRY,
@@ -47,11 +47,10 @@ namespace Dasher
 		LP_GAME_HELP_DIST, LP_GAME_HELP_TIME,
 		END_OF_LPS,
 
-
 		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_SOCKET_INPUT_X_LABEL, SP_SOCKET_INPUT_Y_LABEL, 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_JOYSTICK_DEVICE,
+		SP_INPUT_FILTER, SP_INPUT_DEVICE,
+		SP_BUTTON_0, SP_BUTTON_1, SP_BUTTON_2, SP_BUTTON_3, SP_BUTTON_4, SP_BUTTON_10,
 		END_OF_SPS,
 		PM_INVALID
 	};

Src/DasherCore/UserLog.cpp

@@ -22,7 +22,6 @@ static UserLogParamMask s_UserLogParamMaskTable [] = {
                             userLogParamForceInTrial |
                             userLogParamShortInCycle},
   {LP_UNIFORM,              userLogParamOutputToSimple},
-  {LP_YSCALE,               userLogParamOutputToSimple},
   {LP_LANGUAGE_MODEL_ID,    userLogParamOutputToSimple},
   {LP_LM_MAX_ORDER,         userLogParamOutputToSimple},
   {LP_LM_EXCLUSION,         userLogParamOutputToSimple},