[dasher: 126/217] cleanup of unused number parameters



commit 772573c4baa2407fcc7720a402a22c75146c7a61
Author: ipomoena <amajorek google com>
Date:   Mon Nov 16 15:44:31 2015 -0800

    cleanup of unused number parameters

 Src/DasherCore/DasherInterfaceBase.cpp |    2 --
 Src/DasherCore/Parameters.cpp          |    6 +-----
 Src/DasherCore/Parameters.h            |    6 +++---
 3 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/Src/DasherCore/DasherInterfaceBase.cpp b/Src/DasherCore/DasherInterfaceBase.cpp
index fadc5bc..c79bc22 100644
--- a/Src/DasherCore/DasherInterfaceBase.cpp
+++ b/Src/DasherCore/DasherInterfaceBase.cpp
@@ -657,8 +657,6 @@ void CDasherInterfaceBase::ScreenResized(CDasherScreen *pScreen) {
 }
 
 void CDasherInterfaceBase::ChangeView() {
-  // TODO: Actually respond to LP_VIEW_ID parameter (although there is only one view at the moment)
-
   if(m_DasherScreen != 0 /*&& m_pDasherModel != 0*/) {
     CDasherView *pNewView = new CDasherViewSquare(this, m_DasherScreen, ComputeOrientation());
     //the previous sends an event to all listeners registered with it, but there aren't any atm!
diff --git a/Src/DasherCore/Parameters.cpp b/Src/DasherCore/Parameters.cpp
index d639239..9bbc7cd 100644
--- a/Src/DasherCore/Parameters.cpp
+++ b/Src/DasherCore/Parameters.cpp
@@ -48,7 +48,6 @@ const lp_table longparamtable[] = {
   {LP_ORIENTATION, "ScreenOrientation", -2, "Screen Orientation"},
   {LP_MAX_BITRATE, "MaxBitRateTimes100", 80, "Max Bit Rate Times 100"},
   {LP_FRAMERATE, "FrameRate", 3200, "Decaying average of last known frame rates, *100"},
-  {LP_VIEW_ID, "ViewID", 1, "ViewID"},
   {LP_LANGUAGE_MODEL_ID, "LanguageModelID", 0, "LanguageModelID"},
   {LP_DASHER_FONTSIZE, "DasherFontSize", 2, "DasherFontSize"},
   {LP_MESSAGE_FONTSIZE, "MessageFontSize", 14, "Size of font for messages (in points)"},
@@ -59,7 +58,7 @@ const lp_table longparamtable[] = {
   {LP_PY_PROB_SORT_THRES, "PYProbabilitySortThreshold", 85, "Sort converted syms in descending probability 
order up to this percentage"},
   {LP_MESSAGE_TIME, "MessageTime", 2500, "Time for which non-modal messages are displayed, in ms"},
   {LP_LM_MAX_ORDER, "LMMaxOrder", 5, "LMMaxOrder"},
-  {LP_LM_EXCLUSION, "LMExclusion", 0, "LMExclusion"},
+  { LP_LM_EXCLUSION, "LMExclusion", 0, "LMExclusion" },
   {LP_LM_UPDATE_EXCLUSION, "LMUpdateExclusion", 1, "LMUpdateExclusion"},
   {LP_LM_ALPHA, "LMAlpha", 49, "LMAlpha"},
   {LP_LM_BETA, "LMBeta", 77, "LMBeta"},
@@ -96,14 +95,11 @@ const lp_table longparamtable[] = {
   {LP_SOCKET_INPUT_X_MAX, "SocketInputXMaxTimes1000", 1000, "Top of range of X values expected from network 
input"},
   {LP_SOCKET_INPUT_Y_MIN, "SocketInputYMinTimes1000", 0, "Bottom of range of Y values expected from network 
input"},
   {LP_SOCKET_INPUT_Y_MAX, "SocketInputYMaxTimes1000", 1000, "Top of range of Y values expected from network 
input"},
-  {LP_INPUT_FILTER, "InputFilterID", 3, "Module ID of input filter"},
   {LP_CIRCLE_PERCENT, "CirclePercent", 10, "Percentage of nominal vertical range to use for radius of start 
circle"},
   {LP_TWO_BUTTON_OFFSET, "TwoButtonOffset", 1638, "Offset for two button dynamic mode"},
   {LP_HOLD_TIME, "HoldTime", 1000, "Time for which buttons must be held to count as long presses, in ms"},
   {LP_MULTIPRESS_TIME, "MultipressTime", 1000, "Time in which multiple presses must occur, in ms"},
   {LP_SLOW_START_TIME, "SlowStartTime", 1000, "Time over which slow start occurs"},
-  {LP_CONVERSION_ORDER, "ConversionOrder", 0, "Conversion ordering"},
-  {LP_CONVERSION_TYPE, "ConversionType", 0, "Conversion type"},
   {LP_TWO_PUSH_OUTER, "TwoPushOuter", 1792, "Offset for one button dynamic mode outer marker"},
   {LP_TWO_PUSH_LONG, "TwoPushLong", 512, "Distance between down markers (long gap)"},
   {LP_TWO_PUSH_SHORT, "TwoPushShort", 80, "Distance between up markers, as percentage of long gap"},
diff --git a/Src/DasherCore/Parameters.h b/Src/DasherCore/Parameters.h
index 6516920..3cfd36e 100644
--- a/Src/DasherCore/Parameters.h
+++ b/Src/DasherCore/Parameters.h
@@ -46,7 +46,7 @@ enum {
 
 enum { 
   LP_ORIENTATION = END_OF_BPS, LP_MAX_BITRATE, LP_FRAMERATE,
-  LP_VIEW_ID, LP_LANGUAGE_MODEL_ID, LP_DASHER_FONTSIZE, LP_MESSAGE_FONTSIZE, LP_SHAPE_TYPE,
+  LP_LANGUAGE_MODEL_ID, LP_DASHER_FONTSIZE, LP_MESSAGE_FONTSIZE, LP_SHAPE_TYPE,
   LP_UNIFORM, LP_YSCALE, 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,
@@ -55,9 +55,9 @@ enum {
   LP_ZOOMSTEPS, LP_B, LP_S, LP_BUTTON_SCAN_TIME, LP_R, LP_RIGHTZOOM,
   LP_NODE_BUDGET, LP_OUTLINE_WIDTH, LP_MIN_NODE_SIZE, LP_NONLINEAR_X,
   LP_AUTOSPEED_SENSITIVITY, LP_SOCKET_PORT, LP_SOCKET_INPUT_X_MIN, LP_SOCKET_INPUT_X_MAX,
-  LP_SOCKET_INPUT_Y_MIN, LP_SOCKET_INPUT_Y_MAX, LP_INPUT_FILTER, 
+  LP_SOCKET_INPUT_Y_MIN, LP_SOCKET_INPUT_Y_MAX,
   LP_CIRCLE_PERCENT, LP_TWO_BUTTON_OFFSET, LP_HOLD_TIME, LP_MULTIPRESS_TIME,
-  LP_SLOW_START_TIME, LP_CONVERSION_ORDER, LP_CONVERSION_TYPE,
+  LP_SLOW_START_TIME,
   LP_TWO_PUSH_OUTER, LP_TWO_PUSH_LONG, LP_TWO_PUSH_SHORT, LP_TWO_PUSH_TOLERANCE,
   LP_DYNAMIC_BUTTON_LAG, LP_STATIC1B_TIME, LP_STATIC1B_ZOOM,
   LP_DEMO_SPRING, LP_DEMO_NOISE_MEM, LP_DEMO_NOISE_MAG, LP_MAXZOOM, 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]