[chronojump] Constants.Menuitem_modes -> Constants.Modes
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Constants.Menuitem_modes -> Constants.Modes
- Date: Fri, 30 Jul 2021 08:14:46 +0000 (UTC)
commit 33a468339c54414cd354c05628c015297f2e0521
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Jul 30 10:13:56 2021 +0200
Constants.Menuitem_modes -> Constants.Modes
src/config.cs | 8 +-
src/constants.cs | 2 +-
src/encoder.cs | 4 +-
src/gui/app1/chronojump.cs | 328 +++++++++++++++++-----------------
src/gui/app1/contactsExercise.cs | 36 ++--
src/gui/app1/encoder.cs | 20 +--
src/gui/app1/forceSensor.cs | 2 +-
src/gui/app1/jump.cs | 4 +-
src/gui/app1/run.cs | 4 +-
src/gui/app1/runEncoder.cs | 2 +-
src/gui/app1/session/loadAndImport.cs | 16 +-
src/gui/chronopic.cs | 4 +-
src/gui/dialogThreshold.cs | 6 +-
src/gui/encoderTreeviews.cs | 16 +-
src/gui/eventExecute.cs | 28 +--
src/gui/guiTests.cs | 32 ++--
src/gui/networks.cs | 30 ++--
src/gui/preferences.cs | 20 +--
src/gui/sendLogAndPoll.cs | 2 +-
src/gui/webcam.cs | 24 +--
src/preferences.cs | 2 +-
src/sqlite/main.cs | 2 +-
src/sqlite/preferences.cs | 6 +-
src/threshold.cs | 12 +-
24 files changed, 306 insertions(+), 304 deletions(-)
---
diff --git a/src/config.cs b/src/config.cs
index b4811bf65..f70c92208 100644
--- a/src/config.cs
+++ b/src/config.cs
@@ -49,7 +49,7 @@ public class Config
public int CompujumpStationID = -1;
public int CompujumpAdminID = -1; //undefined
public string CompujumpAdminEmail = ""; //undefined
- public Constants.Menuitem_modes CompujumpStationMode = Constants.Menuitem_modes.UNDEFINED;
+ public Constants.Modes CompujumpStationMode = Constants.Modes.UNDEFINED;
public string RunScriptOnExit;
public bool PlaySoundsFromFile;
@@ -117,9 +117,9 @@ public class Config
CompujumpAdminID = Convert.ToInt32(parts[1]);
else if(parts[0] == "CompujumpAdminEmail" && parts[1] != "")
CompujumpAdminEmail = parts[1];
- else if(parts[0] == "CompujumpStationMode" &&
Enum.IsDefined(typeof(Constants.Menuitem_modes), parts[1]))
- CompujumpStationMode = (Constants.Menuitem_modes)
- Enum.Parse(typeof(Constants.Menuitem_modes),
parts[1]);
+ else if(parts[0] == "CompujumpStationMode" &&
Enum.IsDefined(typeof(Constants.Modes), parts[1]))
+ CompujumpStationMode = (Constants.Modes)
+ Enum.Parse(typeof(Constants.Modes), parts[1]);
else if(parts[0] == "SessionMode" &&
Enum.IsDefined(typeof(SessionModeEnum), parts[1]))
SessionMode = (SessionModeEnum)
Enum.Parse(typeof(SessionModeEnum), parts[1]);
diff --git a/src/constants.cs b/src/constants.cs
index 433b029ee..ec9b2b73d 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -1040,7 +1040,7 @@ public class Constants
JUMPS, RUNS, ENCODERGRAVITATORY, ENCODERINERTIAL, FORCESENSOR
}
- public enum Menuitem_modes {
+ public enum Modes {
UNDEFINED,
JUMPSSIMPLE, JUMPSREACTIVE,
RUNSSIMPLE, RUNSINTERVALLIC, RUNSENCODER,
diff --git a/src/encoder.cs b/src/encoder.cs
index e65c67ce2..d4115970f 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -427,7 +427,7 @@ public class EncoderCurve
//ecChar adds an 'e', 'c' or nothing to N
//if e or c then N will be /2
- public string ToCSV (bool captureOrAnalyze, Constants.Menuitem_modes currentMode,
+ public string ToCSV (bool captureOrAnalyze, Constants.Modes currentMode,
string decimalSeparator, bool useWorkKcal, string ecChar)
{
//latin: 2,3 ; 2,5
@@ -452,7 +452,7 @@ public class EncoderCurve
Series + sep + Exercise + sep + Laterality + sep +
ExtraWeight + sep + DisplacedWeight + sep;
- if(currentMode == Constants.Menuitem_modes.POWERINERTIAL)
+ if(currentMode == Constants.Modes.POWERINERTIAL)
str += Inertia + sep + Util.TrimDecimals(Diameter,1) + sep +
Util.TrimDecimals(EquivalentMass,3) + sep;
str +=
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index f81152897..ebea554ea 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -797,7 +797,7 @@ public partial class ChronoJumpWindow
check_menu_session.Click(); //have sesion menu opened
if(! showSendLog && ! showSocialNetworkPoll && preferences.loadLastModeAtStart &&
- preferences.lastMode != Constants.Menuitem_modes.UNDEFINED && !
configChronojump.Compujump)
+ preferences.lastMode != Constants.Modes.UNDEFINED && !
configChronojump.Compujump)
{
// 0) note this code is repeated on gui/sendLog.cs on_button_open_chronojump_clicked()
// 1) to avoid impossibility to start Chronojump if there's any problem with this
mode, first put this to false
@@ -1133,7 +1133,7 @@ public partial class ChronoJumpWindow
if(radio_mode_pulses_small.Active)
{
sensitiveLastTestButtons(false);
- notebooks_change(Constants.Menuitem_modes.OTHER);
+ notebooks_change(Constants.Modes.OTHER);
on_extra_window_pulses_test_changed(obj, args);
event_graph_label_graph_test.Visible = true;
@@ -1148,7 +1148,7 @@ public partial class ChronoJumpWindow
if(radio_mode_multi_chronopic_small.Active)
{
sensitiveLastTestButtons(false);
- notebooks_change(Constants.Menuitem_modes.OTHER);
+ notebooks_change(Constants.Modes.OTHER);
on_extra_window_multichronopic_test_changed(obj, args);
event_graph_label_graph_test.Visible = true;
@@ -1347,7 +1347,7 @@ public partial class ChronoJumpWindow
myTreeViewRunsInterval.SelectPerson(currentPerson.Name);
//1) change on jumps, runs, pulse capture graph
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
{
if(! configChronojump.Exhibition)
updateGraphJumpsSimple();
@@ -1364,7 +1364,7 @@ public partial class ChronoJumpWindow
else if(notebook_analyze.CurrentPage ==
Convert.ToInt32(notebook_analyze_pages.JUMPSEVOLUTION))
jumpsEvolutionDo(true); //calculate data
}
- else if(current_mode == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if(current_mode == Constants.Modes.JUMPSREACTIVE)
{
updateGraphJumpsReactive();
@@ -1374,14 +1374,14 @@ public partial class ChronoJumpWindow
if(notebook_analyze.CurrentPage ==
Convert.ToInt32(notebook_analyze_pages.JUMPSRJFATIGUE))
createComboSelectJumpsRjFatigueNum (false);
}
- else if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(current_mode == Constants.Modes.RUNSSIMPLE)
{
updateGraphRunsSimple();
if(notebook_analyze.CurrentPage ==
Convert.ToInt32(notebook_analyze_pages.RUNSEVOLUTION))
runsEvolutionDo(true, true); //calculate data
}
- else if(current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(current_mode == Constants.Modes.RUNSINTERVALLIC)
{
updateGraphRunsInterval();
if(currentPerson != null)
@@ -1396,10 +1396,10 @@ public partial class ChronoJumpWindow
label_sprint_export_result.Text = "";
button_sprint_export_result_open.Visible = false;
}
- //else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ //else if(current_mode == Constants.Modes.RUNSENCODER)
//{
//}
- else if(current_mode == Constants.Menuitem_modes.RT)
+ else if(current_mode == Constants.Modes.RT)
updateGraphReactionTimes();
//2) changes on encoder and forceSensor
@@ -2669,7 +2669,7 @@ public partial class ChronoJumpWindow
sessionAddEditShow (App1saeModes.ADDSESSION);
}
- private void setApp1Title(string sessionName, Constants.Menuitem_modes mode)
+ private void setApp1Title(string sessionName, Constants.Modes mode)
{
string title = progName;
@@ -2682,28 +2682,28 @@ public partial class ChronoJumpWindow
label_current_session.TooltipText = "----";
}
- if(mode != Constants.Menuitem_modes.UNDEFINED)
+ if(mode != Constants.Modes.UNDEFINED)
{
string modePrint = "";
- if(mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(mode == Constants.Modes.JUMPSSIMPLE)
modePrint = Catalog.GetString("Jumps simple");
- else if(mode == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if(mode == Constants.Modes.JUMPSREACTIVE)
modePrint = Catalog.GetString("Jumps multiple");
- else if(mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(mode == Constants.Modes.RUNSSIMPLE)
modePrint = Catalog.GetString("Races simple");
- else if(mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(mode == Constants.Modes.RUNSINTERVALLIC)
modePrint = Catalog.GetString("Races intervallic");
- else if(mode == Constants.Menuitem_modes.RUNSENCODER)
+ else if(mode == Constants.Modes.RUNSENCODER)
modePrint = Catalog.GetString("Race analyzer");
- else if(mode == Constants.Menuitem_modes.POWERGRAVITATORY)
+ else if(mode == Constants.Modes.POWERGRAVITATORY)
modePrint = Catalog.GetString("Encoder (gravitatory)");
- else if(mode == Constants.Menuitem_modes.POWERINERTIAL)
+ else if(mode == Constants.Modes.POWERINERTIAL)
modePrint = Catalog.GetString("Encoder (inertial)");
- else if(mode == Constants.Menuitem_modes.FORCESENSOR)
+ else if(mode == Constants.Modes.FORCESENSOR)
modePrint = Catalog.GetString("Force sensor");
- else if(mode == Constants.Menuitem_modes.RT)
+ else if(mode == Constants.Modes.RT)
modePrint = Catalog.GetString("Reaction time");
- else if(mode == Constants.Menuitem_modes.OTHER)
+ else if(mode == Constants.Modes.OTHER)
modePrint = Catalog.GetString("Other");
else
modePrint = ""; //should never happen
@@ -2912,15 +2912,15 @@ public partial class ChronoJumpWindow
if (currentSession == null || currentPerson == null)
return;
- Constants.Menuitem_modes m = current_mode;
+ Constants.Modes m = current_mode;
- if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
+ if(m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
{
overviewWin = EncoderOverviewWindow.Show (app1, currentEncoderGI,
currentSession.UniqueID, currentPerson.UniqueID);
}
- else if(m == Constants.Menuitem_modes.FORCESENSOR)
+ else if(m == Constants.Modes.FORCESENSOR)
overviewWin = ForceSensorOverviewWindow.Show (app1, currentSession.UniqueID,
currentPerson.UniqueID);
- else if(m == Constants.Menuitem_modes.RUNSENCODER)
+ else if(m == Constants.Modes.RUNSENCODER)
overviewWin = RunEncoderOverviewWindow.Show (app1, currentSession.UniqueID,
currentPerson.UniqueID);
overviewWin.Button_select_this_person.Clicked -= new EventHandler(on_overview_select_person);
@@ -2970,7 +2970,7 @@ public partial class ChronoJumpWindow
private void on_preferences_activate (object o, EventArgs args)
{
if(notebook_sup.CurrentPage == Convert.ToInt32(notebook_sup_pages.START))
- preferencesWin = PreferencesWindow.Show(preferences,
Constants.Menuitem_modes.UNDEFINED, configChronojump.Compujump, progVersion);
+ preferencesWin = PreferencesWindow.Show(preferences, Constants.Modes.UNDEFINED,
configChronojump.Compujump, progVersion);
else
preferencesWin = PreferencesWindow.Show(preferences, current_mode,
configChronojump.Compujump, progVersion);
@@ -3053,7 +3053,7 @@ public partial class ChronoJumpWindow
treeview_multi_chronopic_storeReset(false);
fillTreeView_multi_chronopic();
- if(current_mode == Constants.Menuitem_modes.POWERGRAVITATORY){
+ if(current_mode == Constants.Modes.POWERGRAVITATORY){
label_gravitatory_vpf_propulsive.Visible = preferences.encoderPropulsive;
}
}
@@ -3088,7 +3088,7 @@ public partial class ChronoJumpWindow
setForceSensorAnalyzeMaxAVGInWindow();
// update force_capture_drawingarea
- if(current_mode == Constants.Menuitem_modes.FORCESENSOR)// &&
radiobutton_force_sensor_analyze_manual.Active)
+ if(current_mode == Constants.Modes.FORCESENSOR)// &&
radiobutton_force_sensor_analyze_manual.Active)
forceSensorDoGraphAI(false);
// <---------- end of force sensor changes --------------
@@ -3109,7 +3109,7 @@ public partial class ChronoJumpWindow
if(currentSession != null)
tempSessionName = currentSession.Name;
- setApp1Title(tempSessionName, Constants.Menuitem_modes.UNDEFINED);
+ setApp1Title(tempSessionName, Constants.Modes.UNDEFINED);
new ChronojumpLogo (notebook_chronojump_logo, drawingarea_chronojump_logo,
viewport_chronojump_logo, preferences.logoAnimatedShow, preferences.fontType.ToString());
}
@@ -3135,54 +3135,54 @@ public partial class ChronoJumpWindow
//this will take care on top radios and then call changeMode()
//is called on start notebook or on start chronojump by networks configuration or by lastMode
- private void changeModeCheckRadios (Constants.Menuitem_modes m)
+ private void changeModeCheckRadios (Constants.Modes m)
{
- if (m == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if (m == Constants.Modes.JUMPSSIMPLE)
{
if(radio_change_modes_contacts_jumps_simple.Active)
- changeMode (Constants.Menuitem_modes.JUMPSSIMPLE);
+ changeMode (Constants.Modes.JUMPSSIMPLE);
else
radio_change_modes_contacts_jumps_simple.Active = true;
}
- else if (m == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if (m == Constants.Modes.JUMPSREACTIVE)
{
if(radio_change_modes_contacts_jumps_reactive.Active)
- changeMode (Constants.Menuitem_modes.JUMPSREACTIVE);
+ changeMode (Constants.Modes.JUMPSREACTIVE);
else
radio_change_modes_contacts_jumps_reactive.Active = true;
}
- else if (m == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if (m == Constants.Modes.RUNSSIMPLE)
{
if(radio_change_modes_contacts_runs_simple.Active)
- changeMode (Constants.Menuitem_modes.RUNSSIMPLE);
+ changeMode (Constants.Modes.RUNSSIMPLE);
else
radio_change_modes_contacts_runs_simple.Active = true;
}
- else if (m == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if (m == Constants.Modes.RUNSINTERVALLIC)
{
if(radio_change_modes_contacts_runs_intervallic.Active)
- changeMode (Constants.Menuitem_modes.RUNSINTERVALLIC);
+ changeMode (Constants.Modes.RUNSINTERVALLIC);
else
radio_change_modes_contacts_runs_intervallic.Active = true;
}
- else if (m == Constants.Menuitem_modes.RUNSENCODER)
+ else if (m == Constants.Modes.RUNSENCODER)
{
if(radio_change_modes_contacts_runs_encoder.Active)
- changeMode (Constants.Menuitem_modes.RUNSENCODER);
+ changeMode (Constants.Modes.RUNSENCODER);
else
radio_change_modes_contacts_runs_encoder.Active = true;
}
- else if (m == Constants.Menuitem_modes.POWERGRAVITATORY)
+ else if (m == Constants.Modes.POWERGRAVITATORY)
{
if(radio_change_modes_encoder_gravitatory.Active)
- changeMode (Constants.Menuitem_modes.POWERGRAVITATORY);
+ changeMode (Constants.Modes.POWERGRAVITATORY);
else
radio_change_modes_encoder_gravitatory.Active = true;
}
- else if (m == Constants.Menuitem_modes.POWERINERTIAL)
+ else if (m == Constants.Modes.POWERINERTIAL)
{
if(radio_change_modes_encoder_inertial.Active)
- changeMode (Constants.Menuitem_modes.POWERINERTIAL);
+ changeMode (Constants.Modes.POWERINERTIAL);
else
radio_change_modes_encoder_inertial.Active = true;
}
@@ -3190,12 +3190,12 @@ public partial class ChronoJumpWindow
changeMode (m);
}
- private Constants.Menuitem_modes current_mode;
- private Constants.Menuitem_modes last_menuitem_mode; //store it to decide not change threshold when
change from jumps to jumpsRj
+ private Constants.Modes current_mode;
+ private Constants.Modes last_menuitem_mode; //store it to decide not change threshold when change
from jumps to jumpsRj
private bool last_menuitem_mode_defined = false; //undefined when first time entry on a mode (jumps,
jumpRj, ...)
//this is called by above method changeModeCheckRadios or directly by clicking the top radio buttons
- private void changeMode (Constants.Menuitem_modes m)
+ private void changeMode (Constants.Modes m)
{
LogB.Information("MODE", m.ToString());
current_mode = m;
@@ -3263,9 +3263,9 @@ public partial class ChronoJumpWindow
//on OSX R is not installed by default. Check if it's installed. Needed for encoder and force
sensor
if(
- ( m == Constants.Menuitem_modes.POWERGRAVITATORY ||
- m == Constants.Menuitem_modes.POWERINERTIAL ||
- m == Constants.Menuitem_modes.FORCESENSOR ) &&
+ ( m == Constants.Modes.POWERGRAVITATORY ||
+ m == Constants.Modes.POWERINERTIAL ||
+ m == Constants.Modes.FORCESENSOR ) &&
operatingSystem == UtilAll.OperatingSystems.MACOSX &&
! Util.FileExists(Constants.ROSX) )
{
@@ -3282,7 +3282,7 @@ public partial class ChronoJumpWindow
Pixbuf pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes.png");
Pixbuf pixbufModeCurrent;
- if(m == Constants.Menuitem_modes.JUMPSSIMPLE || m == Constants.Menuitem_modes.JUMPSREACTIVE)
+ if(m == Constants.Modes.JUMPSSIMPLE || m == Constants.Modes.JUMPSREACTIVE)
{
button_execute_test_show_connect_or_execute(!
cp2016.SuccededConnectContactsRealThread);
@@ -3296,7 +3296,7 @@ public partial class ChronoJumpWindow
hbox_change_modes_jumps.Visible = true;
- if(m == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(m == Constants.Modes.JUMPSSIMPLE)
{
notebooks_change(m);
on_extra_window_jumps_test_changed(new object(), new EventArgs());
@@ -3339,7 +3339,7 @@ public partial class ChronoJumpWindow
pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes_jump.png");
}
- else if(m == Constants.Menuitem_modes.RUNSSIMPLE || m ==
Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(m == Constants.Modes.RUNSSIMPLE || m == Constants.Modes.RUNSINTERVALLIC)
{
button_execute_test_show_connect_or_execute(!
cp2016.SuccededConnectContactsRealThread);
@@ -3353,7 +3353,7 @@ public partial class ChronoJumpWindow
hbox_change_modes_runs.Visible = true;
- if(m == Constants.Menuitem_modes.RUNSSIMPLE)
+ if(m == Constants.Modes.RUNSSIMPLE)
{
notebooks_change(m);
on_extra_window_runs_test_changed(new object(), new EventArgs());
@@ -3391,7 +3391,7 @@ public partial class ChronoJumpWindow
pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes_run.png");
}
- else if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
+ else if(m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
{
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.ENCODER);
@@ -3417,7 +3417,7 @@ public partial class ChronoJumpWindow
*/
bool changed = false;
- if(m == Constants.Menuitem_modes.POWERGRAVITATORY)
+ if(m == Constants.Modes.POWERGRAVITATORY)
{
//change encoderConfigurationCurrent if needed
if(encoderConfigurationCurrent.has_inertia)
@@ -3502,7 +3502,7 @@ public partial class ChronoJumpWindow
pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) +
"image_modes_encoder.png");
}
- else if(m == Constants.Menuitem_modes.FORCESENSOR)
+ else if(m == Constants.Modes.FORCESENSOR)
{
button_execute_test_show_connect_or_execute(false);
@@ -3548,7 +3548,7 @@ public partial class ChronoJumpWindow
pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"force_sensor_icon.png");
pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) +
"image_modes_force.png");
}
- else if(m == Constants.Menuitem_modes.RUNSENCODER)
+ else if(m == Constants.Modes.RUNSENCODER)
{
button_execute_test_show_connect_or_execute(false);
@@ -3588,7 +3588,7 @@ public partial class ChronoJumpWindow
pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"race_encoder_icon.png");
pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes_run.png");
}
- else if(m == Constants.Menuitem_modes.RT)
+ else if(m == Constants.Modes.RT)
{
button_execute_test_show_connect_or_execute(!
cp2016.SuccededConnectContactsRealThread);
@@ -3608,7 +3608,7 @@ public partial class ChronoJumpWindow
pixbufModeCurrent = new Pixbuf (null, Util.GetImagePath(false) +
"reaction_time_icon.png");
pixbufModeGrid = new Pixbuf (null, Util.GetImagePath(false) + "image_modes_rt.png");
}
- else { //m == Constants.Menuitem_modes.OTHER (contacts / other)
+ else { //m == Constants.Modes.OTHER (contacts / other)
button_execute_test_show_connect_or_execute(!
cp2016.SuccededConnectContactsRealThread);
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
@@ -3635,7 +3635,7 @@ public partial class ChronoJumpWindow
image_button_show_modes_contacts_grid.Pixbuf = pixbufModeGrid;
image_button_show_modes_encoder_grid.Pixbuf = pixbufModeGrid;
- if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
+ if(m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
image_encoder_exercise.Pixbuf = pixbufModeCurrent;
else
image_contacts_exercise.Pixbuf = pixbufModeCurrent;
@@ -3644,17 +3644,17 @@ public partial class ChronoJumpWindow
Pixbuf pixbufBellActive = new Pixbuf (null, Util.GetImagePath(false) +
"stock_bell_active.png");
Pixbuf pixbufBellInactive = new Pixbuf (null, Util.GetImagePath(false) +
"stock_bell_none.png");
if(
- ( (m == Constants.Menuitem_modes.JUMPSSIMPLE || m ==
Constants.Menuitem_modes.JUMPSREACTIVE) &&
+ ( (m == Constants.Modes.JUMPSSIMPLE || m == Constants.Modes.JUMPSREACTIVE) &&
repetitiveConditionsWin.FeedbackActive(Constants.BellModes.JUMPS)) ||
- ( (m == Constants.Menuitem_modes.RUNSSIMPLE || m ==
Constants.Menuitem_modes.RUNSINTERVALLIC) &&
+ ( (m == Constants.Modes.RUNSSIMPLE || m == Constants.Modes.RUNSINTERVALLIC) &&
repetitiveConditionsWin.FeedbackActive(Constants.BellModes.RUNS)) ||
- ( m == Constants.Menuitem_modes.FORCESENSOR &&
+ ( m == Constants.Modes.FORCESENSOR &&
repetitiveConditionsWin.FeedbackActive(Constants.BellModes.FORCESENSOR)) )
image_contacts_bell.Pixbuf = pixbufBellActive;
else
image_contacts_bell.Pixbuf = pixbufBellInactive;
- if( (m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
+ if( (m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
&&
repetitiveConditionsWin.FeedbackActive(Constants.BellModes.ENCODERGRAVITATORY) )
image_encoder_bell.Pixbuf = pixbufBellActive;
else
@@ -3664,19 +3664,19 @@ public partial class ChronoJumpWindow
//show the program
notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
- if(m != Constants.Menuitem_modes.POWERGRAVITATORY && m !=
Constants.Menuitem_modes.POWERINERTIAL)
+ if(m != Constants.Modes.POWERGRAVITATORY && m != Constants.Modes.POWERINERTIAL)
{
//don't change threshold if changing from jumpssimple to jumpsreactive ...
if(! last_menuitem_mode_defined ||
- ( m == Constants.Menuitem_modes.JUMPSSIMPLE &&
- last_menuitem_mode != Constants.Menuitem_modes.JUMPSREACTIVE ) ||
- ( m == Constants.Menuitem_modes.JUMPSREACTIVE &&
- last_menuitem_mode != Constants.Menuitem_modes.JUMPSSIMPLE ) ||
- ( m == Constants.Menuitem_modes.RUNSSIMPLE &&
- last_menuitem_mode != Constants.Menuitem_modes.RUNSINTERVALLIC ) ||
- ( m == Constants.Menuitem_modes.RUNSINTERVALLIC &&
- last_menuitem_mode != Constants.Menuitem_modes.RUNSSIMPLE ) ||
- m == Constants.Menuitem_modes.RT || m ==
Constants.Menuitem_modes.OTHER )
+ ( m == Constants.Modes.JUMPSSIMPLE &&
+ last_menuitem_mode != Constants.Modes.JUMPSREACTIVE ) ||
+ ( m == Constants.Modes.JUMPSREACTIVE &&
+ last_menuitem_mode != Constants.Modes.JUMPSSIMPLE ) ||
+ ( m == Constants.Modes.RUNSSIMPLE &&
+ last_menuitem_mode != Constants.Modes.RUNSINTERVALLIC ) ||
+ ( m == Constants.Modes.RUNSINTERVALLIC &&
+ last_menuitem_mode != Constants.Modes.RUNSSIMPLE ) ||
+ m == Constants.Modes.RT || m == Constants.Modes.OTHER )
{
if(threshold.SelectTresholdForThisMode(m))
{
@@ -3703,9 +3703,9 @@ public partial class ChronoJumpWindow
}
- private void radio_mode_contacts_analyze_buttons_visible (Constants.Menuitem_modes m)
+ private void radio_mode_contacts_analyze_buttons_visible (Constants.Modes m)
{
- if(m == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(m == Constants.Modes.JUMPSSIMPLE)
{
hbox_radio_mode_contacts_analyze_buttons.Visible = true;
hbox_radio_mode_contacts_analyze_jump_simple_buttons.Visible = true;
@@ -3713,7 +3713,7 @@ public partial class ChronoJumpWindow
radio_mode_contacts_runs_evolution.Visible = false;
radio_mode_contacts_sprint.Visible = false;
}
- else if(m == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if(m == Constants.Modes.JUMPSREACTIVE)
{
hbox_radio_mode_contacts_analyze_buttons.Visible = true;
hbox_radio_mode_contacts_analyze_jump_simple_buttons.Visible = false;
@@ -3723,7 +3723,7 @@ public partial class ChronoJumpWindow
radio_mode_contacts_jumps_rj_fatigue.Active = true;
}
- else if(m == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(m == Constants.Modes.RUNSSIMPLE)
{
hbox_radio_mode_contacts_analyze_buttons.Visible = true;
hbox_radio_mode_contacts_analyze_jump_simple_buttons.Visible = false;
@@ -3733,7 +3733,7 @@ public partial class ChronoJumpWindow
radio_mode_contacts_runs_evolution.Active = true;
}
- else if(m == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(m == Constants.Modes.RUNSINTERVALLIC)
{
hbox_radio_mode_contacts_analyze_buttons.Visible = true;
hbox_radio_mode_contacts_analyze_jump_simple_buttons.Visible = false;
@@ -3745,9 +3745,9 @@ public partial class ChronoJumpWindow
}
}
- private void showHideCaptureSpecificControls(Constants.Menuitem_modes m)
+ private void showHideCaptureSpecificControls(Constants.Modes m)
{
- hbox_capture_phases_time.Visible = (m != Constants.Menuitem_modes.FORCESENSOR && m !=
Constants.Menuitem_modes.RUNSENCODER);
+ hbox_capture_phases_time.Visible = (m != Constants.Modes.FORCESENSOR && m !=
Constants.Modes.RUNSENCODER);
if(! configChronojump.Compujump)
showWebcamCaptureContactsControls(true);
@@ -3769,9 +3769,9 @@ public partial class ChronoJumpWindow
/*
ChronopicDetect cpDetect;
- private void autoDetectChronopic(Constants.Menuitem_modes m)
+ private void autoDetectChronopic(Constants.Modes m)
{
- if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
+ if(m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
{
hbox_chronopic_encoder_detecting.Visible = true;
viewport_chronopic_encoder.Visible = false;
@@ -3882,19 +3882,19 @@ public partial class ChronoJumpWindow
private void on_button_selector_start_jumps_simple_clicked(object o, EventArgs args)
{
- changeModeCheckRadios (Constants.Menuitem_modes.JUMPSSIMPLE);
+ changeModeCheckRadios (Constants.Modes.JUMPSSIMPLE);
}
private void on_button_selector_start_jumps_reactive_clicked(object o, EventArgs args)
{
- changeModeCheckRadios (Constants.Menuitem_modes.JUMPSREACTIVE);
+ changeModeCheckRadios (Constants.Modes.JUMPSREACTIVE);
}
private void on_radio_change_modes_contacts_jumps_simple_toggled (object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.JUMPSSIMPLE);
+ changeMode (Constants.Modes.JUMPSSIMPLE);
}
private void on_radio_change_modes_contacts_jumps_reactive_toggled (object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.JUMPSREACTIVE);
+ changeMode (Constants.Modes.JUMPSREACTIVE);
}
private void on_button_selector_start_runs_clicked(object o, EventArgs args)
@@ -3909,27 +3909,27 @@ public partial class ChronoJumpWindow
}
private void on_button_selector_start_runs_simple_clicked(object o, EventArgs args)
{
- changeModeCheckRadios (Constants.Menuitem_modes.RUNSSIMPLE);
+ changeModeCheckRadios (Constants.Modes.RUNSSIMPLE);
}
private void on_button_selector_start_runs_intervallic_clicked(object o, EventArgs args)
{
- changeModeCheckRadios (Constants.Menuitem_modes.RUNSINTERVALLIC);
+ changeModeCheckRadios (Constants.Modes.RUNSINTERVALLIC);
}
private void on_button_selector_start_race_encoder_clicked(object o, EventArgs args)
{
- changeModeCheckRadios (Constants.Menuitem_modes.RUNSENCODER);
+ changeModeCheckRadios (Constants.Modes.RUNSENCODER);
}
private void on_radio_change_modes_contacts_runs_simple_toggled (object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.RUNSSIMPLE);
+ changeMode (Constants.Modes.RUNSSIMPLE);
}
private void on_radio_change_modes_contacts_runs_intervallic_toggled (object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.RUNSINTERVALLIC);
+ changeMode (Constants.Modes.RUNSINTERVALLIC);
}
private void on_radio_change_modes_contacts_runs_encoder_toggled (object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.RUNSENCODER);
+ changeMode (Constants.Modes.RUNSENCODER);
}
private void on_button_selector_start_encoder_clicked(object o, EventArgs args)
@@ -3940,34 +3940,34 @@ public partial class ChronoJumpWindow
private void on_button_selector_start_encoder_gravitatory_clicked(object o, EventArgs args)
{
- changeModeCheckRadios (Constants.Menuitem_modes.POWERGRAVITATORY);
+ changeModeCheckRadios (Constants.Modes.POWERGRAVITATORY);
}
private void on_button_selector_start_encoder_inertial_clicked(object o, EventArgs args)
{
- changeModeCheckRadios (Constants.Menuitem_modes.POWERINERTIAL);
+ changeModeCheckRadios (Constants.Modes.POWERINERTIAL);
}
private void on_radio_change_modes_encoder_gravitatory_toggled (object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.POWERGRAVITATORY);
+ changeMode (Constants.Modes.POWERGRAVITATORY);
}
private void on_radio_change_modes_encoder_inertial_toggled (object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.POWERINERTIAL);
+ changeMode (Constants.Modes.POWERINERTIAL);
}
private void on_button_selector_start_force_sensor_clicked(object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.FORCESENSOR);
+ changeMode (Constants.Modes.FORCESENSOR);
}
private void on_button_selector_start_rt_clicked(object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.RT);
+ changeMode (Constants.Modes.RT);
}
private void on_button_selector_start_other_clicked(object o, EventArgs args)
{
- changeMode (Constants.Menuitem_modes.OTHER);
+ changeMode (Constants.Modes.OTHER);
}
private void on_button_start_back_clicked(object o, EventArgs args)
@@ -4119,7 +4119,7 @@ public partial class ChronoJumpWindow
void on_button_execute_test_clicked (object o, EventArgs args)
{
- if(current_mode == Constants.Menuitem_modes.FORCESENSOR)
+ if(current_mode == Constants.Modes.FORCESENSOR)
{
//LogB.Debug("radio_mode_force_sensor");
/*
@@ -4130,7 +4130,7 @@ public partial class ChronoJumpWindow
on_buttons_force_sensor_clicked(button_execute_test, new EventArgs ());
return;
}
- if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ if(current_mode == Constants.Modes.RUNSENCODER)
{
LogB.Debug("runs_encoder");
/*
@@ -4147,14 +4147,14 @@ public partial class ChronoJumpWindow
stopCapturingInertialBG();
}
- if(current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC && compujumpAutologout != null)
+ if(current_mode == Constants.Modes.RUNSINTERVALLIC && compujumpAutologout != null)
compujumpAutologout.StartCapturingRunInterval();
chronopicRegisterUpdate(false);
if( chronopicRegister.NumConnectedOfType(ChronopicRegisterPort.Types.RUN_WIRELESS) == 1 && (
- current_mode == Constants.Menuitem_modes.RUNSSIMPLE ||
- current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC) )
+ current_mode == Constants.Modes.RUNSSIMPLE ||
+ current_mode == Constants.Modes.RUNSINTERVALLIC) )
{
//cp2016.StoredCanCaptureContacts = true;
cp2016.StoredWireless = true;
@@ -4168,7 +4168,7 @@ public partial class ChronoJumpWindow
LogB.Information("numContacts: " + numContacts);
//check if chronopics have changed
- if(numContacts >= 2 && current_mode == Constants.Menuitem_modes.OTHER &&
radio_mode_multi_chronopic_small.Active)
+ if(numContacts >= 2 && current_mode == Constants.Modes.OTHER &&
radio_mode_multi_chronopic_small.Active)
{
chronopicConnectionSequenceInit(2);
}
@@ -4259,21 +4259,21 @@ public partial class ChronoJumpWindow
event_execute_ButtonCancel.Clicked -= new EventHandler(on_cancel_clicked);
event_execute_ButtonFinish.Clicked -= new EventHandler(on_finish_clicked);
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
{
on_normal_jump_activate(canCaptureC);
}
- else if(current_mode == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if(current_mode == Constants.Modes.JUMPSREACTIVE)
{
on_rj_activate(canCaptureC);
}
- else if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(current_mode == Constants.Modes.RUNSSIMPLE)
{
extra_window_runs_distance =
Convert.ToDouble(label_runs_simple_track_distance_value.Text);
on_normal_run_activate(canCaptureC, wireless);
}
- else if(current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(current_mode == Constants.Modes.RUNSINTERVALLIC)
{
//RSA runs cannot be simulated because it's complicated to manage the countdown
event...
if(currentRunIntervalType.IsRSA && ! canCaptureC) {
@@ -4288,7 +4288,7 @@ public partial class ChronoJumpWindow
on_run_interval_activate(canCaptureC, wireless);
}
- else if(current_mode == Constants.Menuitem_modes.RT)
+ else if(current_mode == Constants.Modes.RT)
{
if(extra_window_radio_reaction_time_discriminative.Active)
reaction_time_discriminative_lights_prepare();
@@ -4325,17 +4325,17 @@ public partial class ChronoJumpWindow
if(currentPerson == null || currentSession == null)
return;
- if(current_mode == Constants.Menuitem_modes.FORCESENSOR)
+ if(current_mode == Constants.Modes.FORCESENSOR)
force_sensor_load();
- else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ else if(current_mode == Constants.Modes.RUNSENCODER)
run_encoder_load();
}
private void on_button_contacts_recalculate_clicked (object o, EventArgs args)
{
- if(current_mode == Constants.Menuitem_modes.FORCESENSOR)
+ if(current_mode == Constants.Modes.FORCESENSOR)
force_sensor_recalculate();
- else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ else if(current_mode == Constants.Modes.RUNSENCODER)
run_encoder_recalculate();
}
@@ -4346,12 +4346,12 @@ public partial class ChronoJumpWindow
}
void on_button_contacts_signal_save_comment_clicked (object o, EventArgs args)
{
- if(current_mode == Constants.Menuitem_modes.FORCESENSOR)
+ if(current_mode == Constants.Modes.FORCESENSOR)
{
currentForceSensor.Comments =
UtilGtk.TextViewGetCommentValidSQL(textview_contacts_signal_comment);
currentForceSensor.UpdateSQLJustComments(false);
}
- else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ else if(current_mode == Constants.Modes.RUNSENCODER)
{
currentRunEncoder.Comments =
UtilGtk.TextViewGetCommentValidSQL(textview_contacts_signal_comment);
currentRunEncoder.UpdateSQLJustComments(false);
@@ -4361,17 +4361,17 @@ public partial class ChronoJumpWindow
button_contacts_signal_save_comment.Sensitive = false;
}
- private Constants.BellModes getBellMode (Constants.Menuitem_modes m)
+ private Constants.BellModes getBellMode (Constants.Modes m)
{
- if(m == Constants.Menuitem_modes.JUMPSREACTIVE)
+ if(m == Constants.Modes.JUMPSREACTIVE)
return Constants.BellModes.JUMPS;
- else if(m == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(m == Constants.Modes.RUNSINTERVALLIC)
return Constants.BellModes.RUNS;
- else if(m == Constants.Menuitem_modes.POWERGRAVITATORY)
+ else if(m == Constants.Modes.POWERGRAVITATORY)
return Constants.BellModes.ENCODERGRAVITATORY;
- else if(m == Constants.Menuitem_modes.POWERINERTIAL)
+ else if(m == Constants.Modes.POWERINERTIAL)
return Constants.BellModes.ENCODERINERTIAL;
- else if(m == Constants.Menuitem_modes.FORCESENSOR)
+ else if(m == Constants.Modes.FORCESENSOR)
return Constants.BellModes.FORCESENSOR;
//default to JUMPSREACTIVE
@@ -4380,10 +4380,10 @@ public partial class ChronoJumpWindow
private void on_button_contacts_bells_clicked (object o, EventArgs args)
{
- Constants.Menuitem_modes m = current_mode;
- if(m != Constants.Menuitem_modes.JUMPSREACTIVE &&
- m != Constants.Menuitem_modes.RUNSINTERVALLIC &&
- m != Constants.Menuitem_modes.FORCESENSOR)
+ Constants.Modes m = current_mode;
+ if(m != Constants.Modes.JUMPSREACTIVE &&
+ m != Constants.Modes.RUNSINTERVALLIC &&
+ m != Constants.Modes.FORCESENSOR)
return;
repetitiveConditionsWin.View(getBellMode(m), preferences, encoderRhythm, true);
@@ -4757,8 +4757,8 @@ public partial class ChronoJumpWindow
return true;
}
- if(current_mode == Constants.Menuitem_modes.POWERGRAVITATORY ||
- current_mode == Constants.Menuitem_modes.POWERINERTIAL)
+ if(current_mode == Constants.Modes.POWERGRAVITATORY ||
+ current_mode == Constants.Modes.POWERINERTIAL)
{
updateTopRestTimesEncoder();
} else {
@@ -5671,7 +5671,7 @@ public partial class ChronoJumpWindow
{
/*
ChronopicWindow.ChronojumpMode cmode = ChronopicWindow.ChronojumpMode.JUMPORRUN;
- if(current_mode == Constants.Menuitem_modes.OTHER)
+ if(current_mode == Constants.Modes.OTHER)
cmode = ChronopicWindow.ChronojumpMode.OTHER;
chronopicWin = ChronopicWindow.View(cmode, preferences.volumeOn);
@@ -5938,19 +5938,19 @@ LogB.Debug("mc finished 5");
try {
switch (currentEventType.Type) {
case EventType.Types.JUMP:
- if(lastJumpIsSimple && current_mode ==
Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(lastJumpIsSimple && current_mode == Constants.Modes.JUMPSSIMPLE)
PrepareJumpSimpleGraph(currentEventExecute.PrepareEventGraphJumpSimpleObject, false);
- else if(current_mode == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if(current_mode == Constants.Modes.JUMPSREACTIVE)
PrepareJumpReactiveGraph(
Util.GetLast(currentJumpRj.TvString),
Util.GetLast(currentJumpRj.TcString),
currentJumpRj.TvString,
currentJumpRj.TcString,
preferences.volumeOn, preferences.gstreamer,
repetitiveConditionsWin);
break;
case EventType.Types.RUN:
- if(lastRunIsSimple && current_mode ==
Constants.Menuitem_modes.RUNSSIMPLE)
+ if(lastRunIsSimple && current_mode == Constants.Modes.RUNSSIMPLE)
PrepareRunSimpleGraph(currentEventExecute.PrepareEventGraphRunSimpleObject, false,
currentEventExecute.RunPTL);
- else if(current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(current_mode == Constants.Modes.RUNSINTERVALLIC)
{
RunType runType =
SqliteRunIntervalType.SelectAndReturnRunIntervalType(currentRunInterval.Type, false);
double distanceTotal =
Util.GetRunITotalDistance(currentRunInterval.DistanceInterval,
@@ -5977,7 +5977,7 @@ LogB.Debug("mc finished 5");
LogB.Information("Cannot update of force sensor");
break;
case EventType.Types.REACTIONTIME:
- if(current_mode == Constants.Menuitem_modes.RT)
+ if(current_mode == Constants.Modes.RT)
PrepareReactionTimeGraph(currentEventExecute.PrepareEventGraphReactionTimeObject, false);
break;
case EventType.Types.PULSE:
@@ -6269,12 +6269,12 @@ LogB.Debug("mc finished 5");
private void on_delete_last_test_clicked (object o, EventArgs args)
{
- if(current_mode == Constants.Menuitem_modes.FORCESENSOR)
+ if(current_mode == Constants.Modes.FORCESENSOR)
{
force_sensor_delete_current_test_pre_question();
return;
}
- else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ else if(current_mode == Constants.Modes.RUNSENCODER)
{
run_encoder_delete_current_test_pre_question();
return;
@@ -6988,7 +6988,7 @@ LogB.Debug("mc finished 5");
*/
//changed by chronojump when it's needed
- private void notebooks_change(Constants.Menuitem_modes mode)
+ private void notebooks_change(Constants.Modes mode)
{
LogB.Information("notebooks_change");
//LogB.Debug(new StackFrame(1).GetMethod().Name);
@@ -6996,42 +6996,42 @@ LogB.Debug("mc finished 5");
//LogB.Information("currentPage" + notebook_execute.CurrentPage.ToString());
//LogB.Information("desiredPage" + desiredPage.ToString());
- if(mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(mode == Constants.Modes.JUMPSSIMPLE)
{
notebook_execute.CurrentPage = 0;
notebook_options_top.CurrentPage = 0;
notebook_results.CurrentPage = 0;
changeTestImage(EventType.Types.JUMP.ToString(),
currentJumpType.Name, currentJumpType.ImageFileName);
- } else if(mode == Constants.Menuitem_modes.JUMPSREACTIVE)
+ } else if(mode == Constants.Modes.JUMPSREACTIVE)
{
notebook_execute.CurrentPage = 1;
notebook_options_top.CurrentPage = 1;
notebook_results.CurrentPage = 1;
changeTestImage(EventType.Types.JUMP.ToString(),
currentJumpRjType.Name, currentJumpRjType.ImageFileName);
- } else if(mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ } else if(mode == Constants.Modes.RUNSSIMPLE)
{
notebook_execute.CurrentPage = 2;
notebook_options_top.CurrentPage = 2;
notebook_results.CurrentPage = 2;
changeTestImage(EventType.Types.RUN.ToString(),
currentRunType.Name, currentRunType.ImageFileName);
- } else if(mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ } else if(mode == Constants.Modes.RUNSINTERVALLIC)
{
notebook_execute.CurrentPage = 3;
notebook_options_top.CurrentPage = 3;
notebook_results.CurrentPage = 3;
changeTestImage(EventType.Types.RUN.ToString(),
currentRunIntervalType.Name, currentRunIntervalType.ImageFileName);
- } else if(mode == Constants.Menuitem_modes.RUNSENCODER)
+ } else if(mode == Constants.Modes.RUNSENCODER)
{
notebook_execute.CurrentPage = 8;
notebook_options_top.CurrentPage = 8;
notebook_results.CurrentPage = 8;
changeTestImage("", "", "RUNSENCODER");
event_execute_button_finish.Sensitive = false;
- } else if(mode == Constants.Menuitem_modes.FORCESENSOR)
+ } else if(mode == Constants.Modes.FORCESENSOR)
{
notebook_execute.CurrentPage = 4;
notebook_options_top.CurrentPage = 4; //but at FORCESENSOR this notebook is not shown
until adjust button is clicked
@@ -7043,14 +7043,14 @@ LogB.Debug("mc finished 5");
changeTestImage("", "", "FORCESENSOR_NOT_ELASTIC");
event_execute_button_finish.Sensitive = false;
- } else if(mode == Constants.Menuitem_modes.RT)
+ } else if(mode == Constants.Modes.RT)
{
notebook_execute.CurrentPage = 5;
notebook_options_top.CurrentPage = 5;
notebook_results.CurrentPage = 5;
changeTestImage(EventType.Types.REACTIONTIME.ToString(),
currentReactionTimeType.Name, currentReactionTimeType.ImageFileName);
- } else if(mode == Constants.Menuitem_modes.OTHER)
+ } else if(mode == Constants.Modes.OTHER)
{
if(radio_mode_multi_chronopic_small.Active)
{
@@ -7077,7 +7077,7 @@ LogB.Debug("mc finished 5");
//else has to be sensitive
//if there are persons
- if(mode == Constants.Menuitem_modes.OTHER && radio_mode_multi_chronopic_small.Active)
+ if(mode == Constants.Modes.OTHER && radio_mode_multi_chronopic_small.Active)
{
/*
* disabled on 1.6.3
@@ -7358,11 +7358,11 @@ LogB.Debug("mc finished 5");
private void on_repetitive_conditions_closed(object o, EventArgs args)
{
//update bell color if feedback exists
- Constants.Menuitem_modes m = current_mode;
+ Constants.Modes m = current_mode;
Pixbuf pixbuf;
Constants.BellModes bellMode = getBellMode(m);
- if(m == Constants.Menuitem_modes.JUMPSREACTIVE || m ==
Constants.Menuitem_modes.RUNSINTERVALLIC)
+ if(m == Constants.Modes.JUMPSREACTIVE || m == Constants.Modes.RUNSINTERVALLIC)
{
if(repetitiveConditionsWin.FeedbackActive(bellMode))
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"stock_bell_active.png");
@@ -7371,7 +7371,7 @@ LogB.Debug("mc finished 5");
image_contacts_bell.Pixbuf = pixbuf;
}
- else if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
+ else if(m == Constants.Modes.POWERGRAVITATORY || m == Constants.Modes.POWERINERTIAL)
{
if(repetitiveConditionsWin.FeedbackActive(bellMode))
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"stock_bell_active.png");
@@ -7496,7 +7496,7 @@ LogB.Debug("mc finished 5");
//updates preferences object and Sqlite preferences
preferences.UpdateEncoderRhythm(encoderRhythm);
}
- else if(m == Constants.Menuitem_modes.FORCESENSOR)
+ else if(m == Constants.Modes.FORCESENSOR)
{
if(repetitiveConditionsWin.FeedbackActive(bellMode))
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
"stock_bell_active.png");
@@ -7581,14 +7581,14 @@ LogB.Debug("mc finished 5");
if(! radio_mode_contacts_analyze.Active)
return;
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE ||
- current_mode == Constants.Menuitem_modes.JUMPSREACTIVE ||
- current_mode == Constants.Menuitem_modes.RUNSSIMPLE ||
- current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE ||
+ current_mode == Constants.Modes.JUMPSREACTIVE ||
+ current_mode == Constants.Modes.RUNSSIMPLE ||
+ current_mode == Constants.Modes.RUNSINTERVALLIC)
{
radio_mode_contacts_analyze_buttons_visible (current_mode);
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
{
if(radio_mode_contacts_jumps_profile.Active)
{
@@ -7614,7 +7614,7 @@ LogB.Debug("mc finished 5");
jumpsEvolutionDo(true);
}
}
- else if (current_mode == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if (current_mode == Constants.Modes.JUMPSREACTIVE)
{
if(radio_mode_contacts_jumps_rj_fatigue.Active)
{
@@ -7629,7 +7629,7 @@ LogB.Debug("mc finished 5");
combo_select_jumps_rj_fatigue_num.Active =
comboSelectJumpsRjFatigueNum.Count -1;
}
}
- else if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(current_mode == Constants.Modes.RUNSSIMPLE)
{
if(radio_mode_contacts_runs_evolution.Active)
{
@@ -7638,9 +7638,9 @@ LogB.Debug("mc finished 5");
}
}
}
- else if(current_mode == Constants.Menuitem_modes.FORCESENSOR)
+ else if(current_mode == Constants.Modes.FORCESENSOR)
notebook_analyze.CurrentPage = Convert.ToInt32(notebook_analyze_pages.FORCESENSOR);
- else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ else if(current_mode == Constants.Modes.RUNSENCODER)
notebook_analyze.CurrentPage = Convert.ToInt32(notebook_analyze_pages.RACEENCODER);
else
notebook_analyze.CurrentPage = Convert.ToInt32(notebook_analyze_pages.STATISTICS);
@@ -7984,12 +7984,12 @@ LogB.Debug("mc finished 5");
event_execute_button_update.Sensitive = true;
//forceSensor and runEncoder does not use currentEventExecute
- if(current_mode == Constants.Menuitem_modes.FORCESENSOR)
+ if(current_mode == Constants.Modes.FORCESENSOR)
{
sensitiveLastTestButtons(! forceProcessCancel && ! forceProcessError);
LogB.Information(" sensitiveGuiEventDone end (forceSensor)");
return;
- } else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ } else if(current_mode == Constants.Modes.RUNSENCODER)
{
sensitiveLastTestButtons(! runEncoderProcessCancel && ! runEncoderProcessError);
LogB.Information(" sensitiveGuiEventDone end (forceSensor)");
@@ -8110,7 +8110,7 @@ LogB.Debug("mc finished 5");
hbox_jump_auto_controls.Visible = start;
radio_mode_contacts_analyze.Visible = ! start;
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
hbox_radio_mode_contacts_analyze_buttons.Visible = ! start;
//when start, put button delete_last_test as not sensitive
diff --git a/src/gui/app1/contactsExercise.cs b/src/gui/app1/contactsExercise.cs
index 69f20088d..6a5da9c88 100644
--- a/src/gui/app1/contactsExercise.cs
+++ b/src/gui/app1/contactsExercise.cs
@@ -66,21 +66,21 @@ public partial class ChronoJumpWindow
private void on_button_image_test_zoom_clicked(object o, EventArgs args)
{
EventType myType;
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
myType = currentJumpType;
- else if(current_mode == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if(current_mode == Constants.Modes.JUMPSREACTIVE)
myType = currentJumpRjType;
- else if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(current_mode == Constants.Modes.RUNSSIMPLE)
myType = currentRunType;
- else if(current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(current_mode == Constants.Modes.RUNSINTERVALLIC)
myType = currentRunIntervalType;
- //else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ //else if(current_mode == Constants.Modes.RUNSENCODER)
// myType = currentRunIntervalType;
- //else if(current_mode == Constants.Menuitem_modes.FORCESENSOR
+ //else if(current_mode == Constants.Modes.FORCESENSOR
// myType = currentForceType;
- else if(current_mode == Constants.Menuitem_modes.RT)
+ else if(current_mode == Constants.Modes.RT)
myType = currentReactionTimeType;
- else //if(current_mode == Constants.Menuitem_modes.OTHER
+ else //if(current_mode == Constants.Modes.OTHER
{
if(radio_mode_multi_chronopic_small.Active)
myType = currentMultiChronopicType;
@@ -96,20 +96,20 @@ public partial class ChronoJumpWindow
new DialogImageTest(myType);
}
- private void setLabelContactsExerciseSelected(Constants.Menuitem_modes m)
+ private void setLabelContactsExerciseSelected(Constants.Modes m)
{
string name = "";
- if(m == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(m == Constants.Modes.JUMPSSIMPLE)
name = UtilGtk.ComboGetActive(combo_select_jumps);
- else if(m == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if(m == Constants.Modes.JUMPSREACTIVE)
name = UtilGtk.ComboGetActive(combo_select_jumps_rj);
- else if(m == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(m == Constants.Modes.RUNSSIMPLE)
name = UtilGtk.ComboGetActive(combo_select_runs);
- else if(m == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(m == Constants.Modes.RUNSINTERVALLIC)
name = UtilGtk.ComboGetActive(combo_select_runs_interval);
- else if(m == Constants.Menuitem_modes.FORCESENSOR)
+ else if(m == Constants.Modes.FORCESENSOR)
name = UtilGtk.ComboGetActive(combo_force_sensor_exercise);
- else if(m == Constants.Menuitem_modes.RUNSENCODER)
+ else if(m == Constants.Modes.RUNSENCODER)
name = UtilGtk.ComboGetActive(combo_run_encoder_exercise);
if(name == "")
@@ -132,9 +132,9 @@ public partial class ChronoJumpWindow
LogB.Information("TT0");
LogB.Information(current_mode.ToString());
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
setLabelContactsExerciseSelectedOptionsJumpsSimple();
- if(current_mode == Constants.Menuitem_modes.JUMPSREACTIVE)
+ if(current_mode == Constants.Modes.JUMPSREACTIVE)
setLabelContactsExerciseSelectedOptionsJumpsReactive();
}
@@ -252,4 +252,6 @@ public partial class ChronoJumpWindow
label_contacts_exercise_selected_options.Text = name;
}
*/
+
+ //hbox_combo_select_contacts_top ...
}
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 6d106e193..5e34e34ea 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -4508,7 +4508,7 @@ public partial class ChronoJumpWindow
private Constants.EncoderGI getEncoderGIByMenuitemMode()
{
Constants.EncoderGI encoderGI = Constants.EncoderGI.GRAVITATORY;
- if(current_mode == Constants.Menuitem_modes.POWERINERTIAL)
+ if(current_mode == Constants.Modes.POWERINERTIAL)
encoderGI = Constants.EncoderGI.INERTIAL;
return encoderGI;
@@ -5230,10 +5230,10 @@ public partial class ChronoJumpWindow
}
// No problem
else {
- if(current_mode == Constants.Menuitem_modes.POWERGRAVITATORY) {
+ if(current_mode == Constants.Modes.POWERGRAVITATORY) {
radio_encoder_exercise_gravitatory.Sensitive = true;
radio_encoder_exercise_inertial.Sensitive = false;
- } else { // (current_mode == Constants.Menuitem_modes.POWERINERTIAL)
+ } else { // (current_mode == Constants.Modes.POWERINERTIAL)
radio_encoder_exercise_gravitatory.Sensitive = false;
radio_encoder_exercise_inertial.Sensitive = true;
}
@@ -5265,18 +5265,18 @@ public partial class ChronoJumpWindow
entry_encoder_exercise_resistance.Text = "";
entry_encoder_exercise_description.Text = "";
- if(current_mode == Constants.Menuitem_modes.POWERGRAVITATORY) {
+ if(current_mode == Constants.Modes.POWERGRAVITATORY) {
radio_encoder_exercise_gravitatory.Sensitive = true;
radio_encoder_exercise_inertial.Sensitive = false;
- } else { // (current_mode == Constants.Menuitem_modes.POWERINERTIAL)
+ } else { // (current_mode == Constants.Modes.POWERINERTIAL)
radio_encoder_exercise_gravitatory.Sensitive = false;
radio_encoder_exercise_inertial.Sensitive = true;
}
hbox_encoder_exercise_speed_1rm.Sensitive = true;
- if(current_mode == Constants.Menuitem_modes.POWERGRAVITATORY)
+ if(current_mode == Constants.Modes.POWERGRAVITATORY)
radio_encoder_exercise_gravitatory.Active = true;
- else if(current_mode == Constants.Menuitem_modes.POWERINERTIAL)
+ else if(current_mode == Constants.Modes.POWERINERTIAL)
radio_encoder_exercise_inertial.Active = true;
else //this could not happen
radio_encoder_exercise_all.Active = true;
@@ -5495,7 +5495,7 @@ public partial class ChronoJumpWindow
/* called on:
* encoderPersonChanged()
- * changeModeCheckRadios (Constants.Menuitem_modes m)
+ * changeModeCheckRadios (Constants.Modes m)
*/
private void blankEncoderInterface()
{
@@ -7389,7 +7389,7 @@ public partial class ChronoJumpWindow
}
//on inertial, check after capture if string was not fully extended and was corrected
- if(current_mode == Constants.Menuitem_modes.POWERINERTIAL &&
+ if(current_mode == Constants.Modes.POWERINERTIAL &&
action == encoderActions.CURVES_AC &&
Util.FileExists(UtilEncoder.GetEncoderSpecialDataTempFileName()))
{
@@ -7524,7 +7524,7 @@ public partial class ChronoJumpWindow
{
UploadEncoderDataObject uo = new UploadEncoderDataObject(encoderCaptureCurves,
lastEncoderSQLSignal.eccon);
- if(current_mode == Constants.Menuitem_modes.POWERINERTIAL)
+ if(current_mode == Constants.Modes.POWERINERTIAL)
{
//discard first reps on inertial and if there are not enough reps, then do not upload
if(! uo.InertialDiscardFirstN(preferences.encoderCaptureInertialDiscardFirstN))
diff --git a/src/gui/app1/forceSensor.cs b/src/gui/app1/forceSensor.cs
index c7fbbb905..301740008 100644
--- a/src/gui/app1/forceSensor.cs
+++ b/src/gui/app1/forceSensor.cs
@@ -3058,7 +3058,7 @@ LogB.Information(" fs R ");
frame_force_sensor_elastic.Visible = false;
changeTestImage("", "", "FORCESENSOR_NOT_ELASTIC");
- setLabelContactsExerciseSelected(Constants.Menuitem_modes.FORCESENSOR);
+ setLabelContactsExerciseSelected(Constants.Modes.FORCESENSOR);
combo_force_sensor_button_sensitive_exercise(false);
return;
}
diff --git a/src/gui/app1/jump.cs b/src/gui/app1/jump.cs
index 73a127062..6f5ce8a7b 100644
--- a/src/gui/app1/jump.cs
+++ b/src/gui/app1/jump.cs
@@ -218,7 +218,7 @@ public partial class ChronoJumpWindow
{
currentEventType = myJumpType;
changeTestImage(EventType.Types.JUMP.ToString(), myJumpType.Name, myJumpType.ImageFileName);
- setLabelContactsExerciseSelected(Constants.Menuitem_modes.JUMPSSIMPLE);
+ setLabelContactsExerciseSelected(Constants.Modes.JUMPSSIMPLE);
LastJumpSimpleTypeParams ljstp = new LastJumpSimpleTypeParams(myJumpType.Name);
if(myJumpType.HasWeight || myJumpType.HasFall)
@@ -359,7 +359,7 @@ public partial class ChronoJumpWindow
{
currentEventType = myJumpType;
changeTestImage(EventType.Types.JUMP.ToString(), myJumpType.Name, myJumpType.ImageFileName);
- setLabelContactsExerciseSelected(Constants.Menuitem_modes.JUMPSREACTIVE);
+ setLabelContactsExerciseSelected(Constants.Modes.JUMPSREACTIVE);
checkbutton_allow_finish_rj_after_time.Visible = false;
LastJumpRjTypeParams ljrtp = SqliteJumpType.LastJumpRjTypeParamsSelect(myJumpType.Name);
//search it on DB
diff --git a/src/gui/app1/run.cs b/src/gui/app1/run.cs
index 9d3b8c59a..9b7023283 100644
--- a/src/gui/app1/run.cs
+++ b/src/gui/app1/run.cs
@@ -148,7 +148,7 @@ public partial class ChronoJumpWindow
{
currentEventType = myRunType;
changeTestImage(EventType.Types.RUN.ToString(), myRunType.Name, myRunType.ImageFileName);
- setLabelContactsExerciseSelected(Constants.Menuitem_modes.RUNSSIMPLE);
+ setLabelContactsExerciseSelected(Constants.Modes.RUNSSIMPLE);
label_runs_simple_track_distance_units.Text = "m";
@@ -228,7 +228,7 @@ public partial class ChronoJumpWindow
{
currentEventType = myRunType;
changeTestImage(EventType.Types.RUN.ToString(), myRunType.Name, myRunType.ImageFileName);
- setLabelContactsExerciseSelected(Constants.Menuitem_modes.RUNSINTERVALLIC);
+ setLabelContactsExerciseSelected(Constants.Modes.RUNSINTERVALLIC);
if(myRunType.Distance > 0) {
label_runs_interval_track_distance_value.Text = myRunType.Distance.ToString();
diff --git a/src/gui/app1/runEncoder.cs b/src/gui/app1/runEncoder.cs
index 7bfb10749..f3074da40 100644
--- a/src/gui/app1/runEncoder.cs
+++ b/src/gui/app1/runEncoder.cs
@@ -1706,7 +1706,7 @@ public partial class ChronoJumpWindow
private void on_combo_run_encoder_exercise_changed(object o, EventArgs args)
{
- setLabelContactsExerciseSelected(Constants.Menuitem_modes.RUNSENCODER);
+ setLabelContactsExerciseSelected(Constants.Modes.RUNSENCODER);
//sensitivity of left/right buttons
button_combo_run_encoder_exercise_capture_left.Sensitive = (combo_run_encoder_exercise.Active
0);
diff --git a/src/gui/app1/session/loadAndImport.cs b/src/gui/app1/session/loadAndImport.cs
index e684c9da2..6a44af5d5 100644
--- a/src/gui/app1/session/loadAndImport.cs
+++ b/src/gui/app1/session/loadAndImport.cs
@@ -124,14 +124,14 @@ public partial class ChronoJumpWindow
app1s_checkbutton_show_data_jump_run.Active = preferences.sessionLoadDisplay.ShowJumpsRaces;
app1s_checkbutton_show_data_other_tests.Active =
preferences.sessionLoadDisplay.ShowOtherTests;
*/
- app1s_checkbutton_show_data_jumps.Active = (current_mode ==
Constants.Menuitem_modes.JUMPSSIMPLE ||
- current_mode == Constants.Menuitem_modes.JUMPSREACTIVE);
- app1s_checkbutton_show_data_runs.Active = (current_mode ==
Constants.Menuitem_modes.RUNSSIMPLE ||
- current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC ||
- current_mode == Constants.Menuitem_modes.RUNSENCODER);
- app1s_checkbutton_show_data_force_sensor.Active = (current_mode ==
Constants.Menuitem_modes.FORCESENSOR);
- app1s_checkbutton_show_data_encoder.Active = (current_mode ==
Constants.Menuitem_modes.POWERGRAVITATORY ||
- current_mode == Constants.Menuitem_modes.POWERINERTIAL);
+ app1s_checkbutton_show_data_jumps.Active = (current_mode == Constants.Modes.JUMPSSIMPLE ||
+ current_mode == Constants.Modes.JUMPSREACTIVE);
+ app1s_checkbutton_show_data_runs.Active = (current_mode == Constants.Modes.RUNSSIMPLE ||
+ current_mode == Constants.Modes.RUNSINTERVALLIC ||
+ current_mode == Constants.Modes.RUNSENCODER);
+ app1s_checkbutton_show_data_force_sensor.Active = (current_mode ==
Constants.Modes.FORCESENSOR);
+ app1s_checkbutton_show_data_encoder.Active = (current_mode ==
Constants.Modes.POWERGRAVITATORY ||
+ current_mode == Constants.Modes.POWERINERTIAL);
sessionLoadWinSignals = true;
diff --git a/src/gui/chronopic.cs b/src/gui/chronopic.cs
index 9df00a2d5..7b3af1306 100644
--- a/src/gui/chronopic.cs
+++ b/src/gui/chronopic.cs
@@ -121,8 +121,8 @@ public partial class ChronoJumpWindow
new EventHandler(on_connection_contacts_real_done);
string message = Catalog.GetString("Please, touch the platform or click Chronopic TEST
button.");
- if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE ||
- current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ if(current_mode == Constants.Modes.RUNSSIMPLE ||
+ current_mode == Constants.Modes.RUNSINTERVALLIC)
message = Catalog.GetString("Please, cut photocell barrier or click Chronopic TEST
button.");
cp2016.ConnectContactsReal(app1, crp, numCP, message);
diff --git a/src/gui/dialogThreshold.cs b/src/gui/dialogThreshold.cs
index a1a68467c..fb3c173d8 100644
--- a/src/gui/dialogThreshold.cs
+++ b/src/gui/dialogThreshold.cs
@@ -50,7 +50,7 @@ public class DialogThreshold
private int thresholdCurrent;
public Button FakeButtonClose;
- public DialogThreshold (Constants.Menuitem_modes m, int thresholdCurrent)
+ public DialogThreshold (Constants.Modes m, int thresholdCurrent)
{
Glade.XML gladeXML;
gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "dialog_threshold.glade",
"dialog_threshold", null);
@@ -79,12 +79,12 @@ public class DialogThreshold
writeTexts();
- if(m == Constants.Menuitem_modes.JUMPSSIMPLE || m == Constants.Menuitem_modes.JUMPSREACTIVE)
+ if(m == Constants.Modes.JUMPSSIMPLE || m == Constants.Modes.JUMPSREACTIVE)
{
label_threshold_name.Text = "<b>" + Catalog.GetString("Threshold for jumps") + "</b>";
radio_jumps.Active = true;
}
- else if(m == Constants.Menuitem_modes.RUNSSIMPLE || m ==
Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(m == Constants.Modes.RUNSSIMPLE || m == Constants.Modes.RUNSINTERVALLIC)
{
label_threshold_name.Text = "<b>" + Catalog.GetString("Threshold for runs") + "</b>";
radio_races.Active = true;
diff --git a/src/gui/encoderTreeviews.cs b/src/gui/encoderTreeviews.cs
index ced7ee6ff..7451206ba 100644
--- a/src/gui/encoderTreeviews.cs
+++ b/src/gui/encoderTreeviews.cs
@@ -303,7 +303,7 @@ public partial class ChronoJumpWindow
return;
int inertialStart = 0;
- if( current_mode == Constants.Menuitem_modes.POWERINERTIAL)
+ if( current_mode == Constants.Modes.POWERINERTIAL)
{
if(ecconLast == "c")
inertialStart = preferences.encoderCaptureInertialDiscardFirstN;
@@ -397,7 +397,7 @@ public partial class ChronoJumpWindow
int bestN = Convert.ToInt32(spin_encoder_capture_curves_best_n.Value);
int inertialStart = 0;
- if( current_mode == Constants.Menuitem_modes.POWERINERTIAL)
+ if( current_mode == Constants.Modes.POWERINERTIAL)
{
if(ecconLast == "c")
inertialStart = preferences.encoderCaptureInertialDiscardFirstN;
@@ -459,7 +459,7 @@ public partial class ChronoJumpWindow
//discard first rows
bool thisRowDiscarded = false;
- if( current_mode == Constants.Menuitem_modes.POWERINERTIAL &&
+ if( current_mode == Constants.Modes.POWERINERTIAL &&
( (ecconLast == "c" && i <
preferences.encoderCaptureInertialDiscardFirstN) ||
(ecconLast != "c" && i < 2 *
preferences.encoderCaptureInertialDiscardFirstN) ) )
{
@@ -589,7 +589,7 @@ public partial class ChronoJumpWindow
//on screen shown on s but export is in ms
- public string [] GetTreeviewEncoderAnalyzeHeaders(bool screenOrCSV, Constants.Menuitem_modes
encoderMode)
+ public string [] GetTreeviewEncoderAnalyzeHeaders(bool screenOrCSV, Constants.Modes encoderMode)
{
string timeUnits = "(s)";
string distanceUnits = "(cm)";
@@ -639,7 +639,7 @@ public partial class ChronoJumpWindow
Catalog.GetString("Impulse") + "\n (N*s)"
};
- if(encoderMode == Constants.Menuitem_modes.POWERGRAVITATORY)
+ if(encoderMode == Constants.Modes.POWERGRAVITATORY)
{
string [] headers = new string[startArray.Length + endArray.Length];
startArray.CopyTo(headers, 0);
@@ -656,12 +656,12 @@ public partial class ChronoJumpWindow
bool lastTreeviewEncoderAnalyzeIsNeuromuscular = false;
- private int createTreeViewEncoderAnalyze(string contents, Constants.Menuitem_modes encoderMode)
+ private int createTreeViewEncoderAnalyze(string contents, Constants.Modes encoderMode)
{
//note we pass powerinertial because we want here all columns but only relevant will shown
//on the other hand, on_button_encoder_save_table_file_selected will need to show the
relevant columns
string [] columnsString = GetTreeviewEncoderAnalyzeHeaders(true, //screen
- Constants.Menuitem_modes.POWERINERTIAL);
+ Constants.Modes.POWERINERTIAL);
ArrayList encoderAnalyzeCurves = new ArrayList ();
@@ -775,7 +775,7 @@ public partial class ChronoJumpWindow
foreach(string myCol in columnsString)
{
//do not show inertia moment, diameter, equivalent mass on powergravitatory
- if(encoderMode == Constants.Menuitem_modes.POWERGRAVITATORY && (i == 6 || i == 7 || i
== 8))
+ if(encoderMode == Constants.Modes.POWERGRAVITATORY && (i == 6 || i == 7 || i == 8))
{
i ++;
continue;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 3229a6b7c..79527d223 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -541,17 +541,17 @@ public partial class ChronoJumpWindow
if(sizeChanged)
{
//LogB.Information("caring for resize screen and correctly update
event_execute_drawingarea");
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
on_extra_window_jumps_test_changed(o, new EventArgs ());
- else if(current_mode == Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if(current_mode == Constants.Modes.JUMPSREACTIVE)
on_extra_window_jumps_rj_test_changed(o, new EventArgs());
- else if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(current_mode == Constants.Modes.RUNSSIMPLE)
on_extra_window_runs_test_changed(o, new EventArgs());
- else if(current_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(current_mode == Constants.Modes.RUNSINTERVALLIC)
on_extra_window_runs_interval_test_changed(o, new EventArgs());
- else if(current_mode == Constants.Menuitem_modes.RT)
+ else if(current_mode == Constants.Modes.RT)
on_extra_window_reaction_times_test_changed(o, new EventArgs());
- else if(current_mode == Constants.Menuitem_modes.OTHER) {
+ else if(current_mode == Constants.Modes.OTHER) {
if(radio_mode_pulses_small.Active)
on_extra_window_pulses_test_changed(o, new EventArgs());
else
@@ -707,11 +707,11 @@ public partial class ChronoJumpWindow
/*
string [] str;
string testName;
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE) {
+ if(current_mode == Constants.Modes.JUMPSSIMPLE) {
str = SqliteJump.SelectTestMaxStuff(currentPerson.UniqueID, currentJumpType);
testName = currentJumpType.Name;
}
- else if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE) {
+ else if(current_mode == Constants.Modes.RUNSSIMPLE) {
str = SqliteRun.SelectTestMaxStuff(currentPerson.UniqueID, currentRunType);
testName = currentRunType.Name;
} else
@@ -2774,25 +2774,25 @@ public partial class ChronoJumpWindow
private void on_spin_contacts_graph_last_limit_value_changed (object o, EventArgs args)
{
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
updateGraphJumpsSimple ();
- else if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(current_mode == Constants.Modes.RUNSSIMPLE)
updateGraphRunsSimple ();
}
private void on_radio_contacts_graph_test_toggled (object o, EventArgs args)
{
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
updateGraphJumpsSimple ();
- else if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(current_mode == Constants.Modes.RUNSSIMPLE)
updateGraphRunsSimple ();
}
private void on_radio_contacts_graph_person_toggled (object o, EventArgs args)
{
- if(current_mode == Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(current_mode == Constants.Modes.JUMPSSIMPLE)
updateGraphJumpsSimple ();
- else if(current_mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ else if(current_mode == Constants.Modes.RUNSSIMPLE)
updateGraphRunsSimple ();
}
diff --git a/src/gui/guiTests.cs b/src/gui/guiTests.cs
index 5395a8188..bcc0b934d 100644
--- a/src/gui/guiTests.cs
+++ b/src/gui/guiTests.cs
@@ -367,19 +367,19 @@ public partial class ChronoJumpWindow
switch(cjTest.GetSequencePos())
{
case CJTests.Types.MODE_JUMPSSIMPLE:
- chronojumpWindowTestsMode(Constants.Menuitem_modes.JUMPSSIMPLE);
+ chronojumpWindowTestsMode(Constants.Modes.JUMPSSIMPLE);
break;
case CJTests.Types.MODE_JUMPSREACTIVE:
- chronojumpWindowTestsMode(Constants.Menuitem_modes.JUMPSREACTIVE);
+ chronojumpWindowTestsMode(Constants.Modes.JUMPSREACTIVE);
break;
case CJTests.Types.MODE_RUNSSIMPLE:
- chronojumpWindowTestsMode(Constants.Menuitem_modes.RUNSSIMPLE);
+ chronojumpWindowTestsMode(Constants.Modes.RUNSSIMPLE);
break;
case CJTests.Types.MODE_POWERGRAVITATORY:
- chronojumpWindowTestsMode(Constants.Menuitem_modes.POWERGRAVITATORY);
+ chronojumpWindowTestsMode(Constants.Modes.POWERGRAVITATORY);
break;
case CJTests.Types.MODE_POWERINERTIAL:
- chronojumpWindowTestsMode(Constants.Menuitem_modes.POWERINERTIAL);
+ chronojumpWindowTestsMode(Constants.Modes.POWERINERTIAL);
break;
case CJTests.Types.SESSION_LOAD:
chronojumpWindowTestsLoadSession(sessionID); //this also selects first person
@@ -462,23 +462,23 @@ public partial class ChronoJumpWindow
* TESTS START
*/
- private void chronojumpWindowTestsMode(Constants.Menuitem_modes m)
+ private void chronojumpWindowTestsMode(Constants.Modes m)
{
LogB.TestStart("chronojumpWindowTestsMode", m.ToString());
//disable autodetect
//configAutodetectPort = Config.AutodetectPortEnum.INACTIVE;
- if(m == Constants.Menuitem_modes.JUMPSSIMPLE)
- changeMode (Constants.Menuitem_modes.JUMPSSIMPLE);
- else if(m == Constants.Menuitem_modes.JUMPSREACTIVE)
- changeMode (Constants.Menuitem_modes.JUMPSREACTIVE);
- else if(m == Constants.Menuitem_modes.RUNSSIMPLE)
- changeMode (Constants.Menuitem_modes.RUNSSIMPLE);
- else if(m == Constants.Menuitem_modes.POWERGRAVITATORY)
- changeMode (Constants.Menuitem_modes.POWERGRAVITATORY);
- else if(m == Constants.Menuitem_modes.POWERINERTIAL)
- changeMode (Constants.Menuitem_modes.POWERINERTIAL);
+ if(m == Constants.Modes.JUMPSSIMPLE)
+ changeMode (Constants.Modes.JUMPSSIMPLE);
+ else if(m == Constants.Modes.JUMPSREACTIVE)
+ changeMode (Constants.Modes.JUMPSREACTIVE);
+ else if(m == Constants.Modes.RUNSSIMPLE)
+ changeMode (Constants.Modes.RUNSSIMPLE);
+ else if(m == Constants.Modes.POWERGRAVITATORY)
+ changeMode (Constants.Modes.POWERGRAVITATORY);
+ else if(m == Constants.Modes.POWERINERTIAL)
+ changeMode (Constants.Modes.POWERINERTIAL);
LogB.TestEnd("chronojumpWindowTestsMode");
}
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 592f118be..b84fbe51d 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -129,7 +129,7 @@ public partial class ChronoJumpWindow
{
configChronojump.Read();
- if(configChronojump.CompujumpStationMode != Constants.Menuitem_modes.UNDEFINED)
+ if(configChronojump.CompujumpStationMode != Constants.Modes.UNDEFINED)
{
button_show_modes_contacts.Visible = false;
@@ -144,7 +144,7 @@ public partial class ChronoJumpWindow
configChronojump.CompujumpServerURL != null &&
configChronojump.CompujumpServerURL != "" &&
configChronojump.CompujumpStationID != -1 &&
- configChronojump.CompujumpStationMode != Constants.Menuitem_modes.UNDEFINED
+ configChronojump.CompujumpStationMode != Constants.Modes.UNDEFINED
)
{
LogB.Information(configChronojump.Compujump.ToString());
@@ -196,19 +196,19 @@ public partial class ChronoJumpWindow
configChronojump.PersonWinHide = true;
showPersonsOnTop(true);
- if(configChronojump.CompujumpStationMode != Constants.Menuitem_modes.UNDEFINED)
+ if(configChronojump.CompujumpStationMode != Constants.Modes.UNDEFINED)
{
//changeModeCheckRadios (configChronojump.CompujumpStationMode);
//better do like this because radiobuttons are not set. TODO: remove
radiobuttons checks
- if(configChronojump.CompujumpStationMode ==
Constants.Menuitem_modes.JUMPSSIMPLE)
+ if(configChronojump.CompujumpStationMode == Constants.Modes.JUMPSSIMPLE)
on_button_selector_start_jumps_simple_clicked(new object (), new
EventArgs());
- else if(configChronojump.CompujumpStationMode ==
Constants.Menuitem_modes.JUMPSREACTIVE)
+ else if(configChronojump.CompujumpStationMode ==
Constants.Modes.JUMPSREACTIVE)
on_button_selector_start_jumps_reactive_clicked(new object (), new
EventArgs());
- else if(configChronojump.CompujumpStationMode ==
Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(configChronojump.CompujumpStationMode ==
Constants.Modes.RUNSINTERVALLIC)
on_button_selector_start_runs_intervallic_clicked(new object (), new
EventArgs());
- else if(configChronojump.CompujumpStationMode ==
Constants.Menuitem_modes.POWERGRAVITATORY)
+ else if(configChronojump.CompujumpStationMode ==
Constants.Modes.POWERGRAVITATORY)
on_button_selector_start_encoder_gravitatory_clicked(new object (),
new EventArgs());
- else //if(configChronojump.CompujumpStationMode ==
Constants.Menuitem_modes.POWERINERTIAL)
+ else //if(configChronojump.CompujumpStationMode ==
Constants.Modes.POWERINERTIAL)
on_button_selector_start_encoder_inertial_clicked(new object (), new
EventArgs());
vbox_runs_interval.Visible = false;
@@ -488,7 +488,7 @@ public partial class ChronoJumpWindow
/*
if(linuxType == linuxTypeEnum.NETWORKS) {
//mostrar directament el power
- changeModeCheckRadios (Constants.Menuitem_modes.POWER);
+ changeModeCheckRadios (Constants.Modes.POWER);
//no mostrar menu
@@ -968,11 +968,11 @@ public partial class ChronoJumpWindow
List<Task> tasks = json.GetTasks(currentPerson.UniqueID, configChronojump.CompujumpStationID);
//2) get exercises and insert if needed (only on encoder)
- if(configChronojump.CompujumpStationMode == Constants.Menuitem_modes.POWERGRAVITATORY ||
- configChronojump.CompujumpStationMode ==
Constants.Menuitem_modes.POWERINERTIAL)
+ if(configChronojump.CompujumpStationMode == Constants.Modes.POWERGRAVITATORY ||
+ configChronojump.CompujumpStationMode == Constants.Modes.POWERINERTIAL)
{
Constants.EncoderGI type = Constants.EncoderGI.GRAVITATORY;
- if(configChronojump.CompujumpStationMode == Constants.Menuitem_modes.POWERINERTIAL)
+ if(configChronojump.CompujumpStationMode == Constants.Modes.POWERINERTIAL)
type = Constants.EncoderGI.INERTIAL;
ArrayList encoderExercisesOnLocal = SqliteEncoder.SelectEncoderExercises(false, -1,
false, type);
@@ -1057,7 +1057,7 @@ public partial class ChronoJumpWindow
dialogPersonPopup.DestroyDialog();
LogB.Information("Selected task from gui/networks.cs:" + task.ToString());
- if(configChronojump.CompujumpStationMode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ if(configChronojump.CompujumpStationMode == Constants.Modes.RUNSINTERVALLIC)
compujumpTaskStartRunInterval(task);
else
compujumpTaskStartEncoder(task);
@@ -1230,8 +1230,8 @@ public partial class ChronoJumpWindow
}
else {
//notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
- if(configChronojump.CompujumpStationMode == Constants.Menuitem_modes.POWERGRAVITATORY
||
- configChronojump.CompujumpStationMode ==
Constants.Menuitem_modes.POWERINERTIAL)
+ if(configChronojump.CompujumpStationMode == Constants.Modes.POWERGRAVITATORY ||
+ configChronojump.CompujumpStationMode ==
Constants.Modes.POWERINERTIAL)
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.ENCODER);
else
notebook_sup.CurrentPage = Convert.ToInt32(notebook_sup_pages.CONTACTS);
diff --git a/src/gui/preferences.cs b/src/gui/preferences.cs
index e9fccc4e4..858379dc6 100644
--- a/src/gui/preferences.cs
+++ b/src/gui/preferences.cs
@@ -312,7 +312,7 @@ public class PreferencesWindow
static public PreferencesWindow Show (
Preferences preferences,
- Constants.Menuitem_modes menu_mode, bool compujump, string progVersion)
+ Constants.Modes menu_mode, bool compujump, string progVersion)
{
if (PreferencesWindowBox == null) {
PreferencesWindowBox = new PreferencesWindow ();
@@ -333,21 +333,21 @@ public class PreferencesWindow
}
PreferencesWindowBox.frame_networks.Visible = compujump;
- if(menu_mode != Constants.Menuitem_modes.JUMPSSIMPLE && menu_mode !=
Constants.Menuitem_modes.JUMPSREACTIVE) {
+ if(menu_mode != Constants.Modes.JUMPSSIMPLE && menu_mode != Constants.Modes.JUMPSREACTIVE) {
PreferencesWindowBox.notebook.GetNthPage(JUMPSPAGE).Hide();
PreferencesWindowBox.check_view_jumps.Active = false;
- } if(menu_mode != Constants.Menuitem_modes.RUNSSIMPLE && menu_mode !=
Constants.Menuitem_modes.RUNSINTERVALLIC) {
+ } if(menu_mode != Constants.Modes.RUNSSIMPLE && menu_mode != Constants.Modes.RUNSINTERVALLIC)
{
PreferencesWindowBox.notebook.GetNthPage(RUNSPAGE).Hide();
PreferencesWindowBox.check_view_runs.Active = false;
- } if(menu_mode != Constants.Menuitem_modes.POWERGRAVITATORY && menu_mode !=
Constants.Menuitem_modes.POWERINERTIAL) {
+ } if(menu_mode != Constants.Modes.POWERGRAVITATORY && menu_mode !=
Constants.Modes.POWERINERTIAL) {
PreferencesWindowBox.notebook.GetNthPage(ENCODERCAPTUREPAGE).Hide();
PreferencesWindowBox.notebook.GetNthPage(ENCODEROTHERPAGE).Hide();
PreferencesWindowBox.check_view_encoder.Active = false;
}
- if(menu_mode != Constants.Menuitem_modes.FORCESENSOR) {
+ if(menu_mode != Constants.Modes.FORCESENSOR) {
PreferencesWindowBox.notebook.GetNthPage(FORCESENSORPAGE).Hide();
PreferencesWindowBox.check_view_force_sensor.Active = false;
- } if(menu_mode != Constants.Menuitem_modes.RUNSENCODER) {
+ } if(menu_mode != Constants.Modes.RUNSENCODER) {
PreferencesWindowBox.notebook.GetNthPage(RUNENCODERPAGE).Hide();
PreferencesWindowBox.check_view_race_analyzer.Active = false;
}
@@ -569,9 +569,9 @@ public class PreferencesWindow
PreferencesWindowBox.image_encoder_capture_cut_by_triggers_help.Pixbuf = pixbuf;
PreferencesWindowBox.image_encoder_inertial_analyze_eq_mass_help.Pixbuf = pixbuf;
- if(menu_mode == Constants.Menuitem_modes.RUNSSIMPLE)
+ if(menu_mode == Constants.Modes.RUNSSIMPLE)
PreferencesWindowBox.notebook_races_double_contacts.CurrentPage = 0;
- else if(menu_mode == Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(menu_mode == Constants.Modes.RUNSINTERVALLIC)
PreferencesWindowBox.notebook_races_double_contacts.CurrentPage = 1;
PreferencesWindowBox.checkbutton_runs_prevent_double_contact.Active =
@@ -615,9 +615,9 @@ public class PreferencesWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "image_encoder_triggers_no.png");
PreferencesWindowBox.image_encoder_triggers.Pixbuf = pixbuf;
- if(menu_mode == Constants.Menuitem_modes.POWERGRAVITATORY)
+ if(menu_mode == Constants.Modes.POWERGRAVITATORY)
PreferencesWindowBox.notebook_encoder_capture_gi.CurrentPage = 0;
- else if(menu_mode == Constants.Menuitem_modes.POWERINERTIAL)
+ else if(menu_mode == Constants.Modes.POWERINERTIAL)
PreferencesWindowBox.notebook_encoder_capture_gi.CurrentPage = 1;
PreferencesWindowBox.spin_encoder_capture_min_height_gravitatory.Value =
preferences.encoderCaptureMinHeightGravitatory;
diff --git a/src/gui/sendLogAndPoll.cs b/src/gui/sendLogAndPoll.cs
index fec44b09f..9c457e54f 100644
--- a/src/gui/sendLogAndPoll.cs
+++ b/src/gui/sendLogAndPoll.cs
@@ -279,7 +279,7 @@ public partial class ChronoJumpWindow
notebook_start.CurrentPage = Convert.ToInt32(notebook_start_pages.PROGRAM);
if(preferences.loadLastModeAtStart &&
- preferences.lastMode != Constants.Menuitem_modes.UNDEFINED && !
configChronojump.Compujump)
+ preferences.lastMode != Constants.Modes.UNDEFINED && !
configChronojump.Compujump)
{
// 0) note this code is repeated on gui/app1/chronojump.cs public ChronoJumpWindow()
// 1) to avoid impossibility to start Chronojump if there's any problem with this
mode, first put this to false
diff --git a/src/gui/webcam.cs b/src/gui/webcam.cs
index 316c8b2e0..4dfa6ed32 100644
--- a/src/gui/webcam.cs
+++ b/src/gui/webcam.cs
@@ -205,9 +205,9 @@ public partial class ChronoJumpWindow
notebook_video_contacts.CurrentPage = 1;
}
- if(current_mode == Constants.Menuitem_modes.FORCESENSOR)
+ if(current_mode == Constants.Modes.FORCESENSOR)
forceSensorCapturePre3_GTK_cameraCalled();
- else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ else if(current_mode == Constants.Modes.RUNSENCODER)
runEncoderCapturePre3_GTK_cameraCalled();
else
on_button_execute_test_accepted ();
@@ -248,11 +248,11 @@ public partial class ChronoJumpWindow
/*
* in the past we pass here an string, and an option was ALL
- * now we use Menuitem_modes an UNDEFINED will work as ALL
+ * now we use Modes an UNDEFINED will work as ALL
*/
- private void button_video_play_selected_test(Constants.Menuitem_modes m)
+ private void button_video_play_selected_test(Constants.Modes m)
{
- if(m == Constants.Menuitem_modes.JUMPSSIMPLE || m == Constants.Menuitem_modes.UNDEFINED)
+ if(m == Constants.Modes.JUMPSSIMPLE || m == Constants.Modes.UNDEFINED)
button_video_play_selected_jump.Sensitive =
(myTreeViewJumps.EventSelectedID > 0 &&
File.Exists(Util.GetVideoFileName(
@@ -260,7 +260,7 @@ public partial class ChronoJumpWindow
Constants.TestTypes.JUMP,
myTreeViewJumps.EventSelectedID)));
- if(m == Constants.Menuitem_modes.JUMPSREACTIVE || m == Constants.Menuitem_modes.UNDEFINED)
+ if(m == Constants.Modes.JUMPSREACTIVE || m == Constants.Modes.UNDEFINED)
button_video_play_selected_jump_rj.Sensitive =
(myTreeViewJumpsRj.EventSelectedID > 0
&& File.Exists(Util.GetVideoFileName(
@@ -268,7 +268,7 @@ public partial class ChronoJumpWindow
Constants.TestTypes.JUMP_RJ,
myTreeViewJumpsRj.EventSelectedID)));
- if(m == Constants.Menuitem_modes.RUNSSIMPLE || m == Constants.Menuitem_modes.UNDEFINED)
+ if(m == Constants.Modes.RUNSSIMPLE || m == Constants.Modes.UNDEFINED)
button_video_play_selected_run.Sensitive =
(myTreeViewRuns.EventSelectedID > 0 &&
File.Exists(Util.GetVideoFileName(
@@ -276,7 +276,7 @@ public partial class ChronoJumpWindow
Constants.TestTypes.RUN,
myTreeViewRuns.EventSelectedID)));
- if(m == Constants.Menuitem_modes.RUNSINTERVALLIC || m == Constants.Menuitem_modes.UNDEFINED)
+ if(m == Constants.Modes.RUNSINTERVALLIC || m == Constants.Modes.UNDEFINED)
button_video_play_selected_run_interval.Sensitive =
(myTreeViewRunsInterval.EventSelectedID > 0
&& File.Exists(Util.GetVideoFileName(
@@ -285,7 +285,7 @@ public partial class ChronoJumpWindow
myTreeViewRunsInterval.EventSelectedID)));
- if(m == Constants.Menuitem_modes.RT || m == Constants.Menuitem_modes.UNDEFINED)
+ if(m == Constants.Modes.RT || m == Constants.Modes.UNDEFINED)
button_video_play_selected_reaction_time.Sensitive =
(myTreeViewReactionTimes.EventSelectedID > 0 &&
File.Exists(Util.GetVideoFileName(
@@ -293,7 +293,7 @@ public partial class ChronoJumpWindow
Constants.TestTypes.RT,
myTreeViewReactionTimes.EventSelectedID)));
- if(m == Constants.Menuitem_modes.OTHER || m == Constants.Menuitem_modes.UNDEFINED)
+ if(m == Constants.Modes.OTHER || m == Constants.Modes.UNDEFINED)
{
button_video_play_selected_pulse.Sensitive =
(myTreeViewPulses.EventSelectedID > 0 &&
@@ -772,7 +772,7 @@ public partial class ChronoJumpWindow
private void on_button_video_play_this_test_contacts_clicked (object o, EventArgs args)
{
- if(current_mode == Constants.Menuitem_modes.FORCESENSOR)
+ if(current_mode == Constants.Modes.FORCESENSOR)
{
if(currentForceSensor == null || currentForceSensor.UniqueID == -1)
new DialogMessage(Constants.MessageTypes.WARNING, "Sorry, file not found");
@@ -781,7 +781,7 @@ public partial class ChronoJumpWindow
return;
}
- else if(current_mode == Constants.Menuitem_modes.RUNSENCODER)
+ else if(current_mode == Constants.Modes.RUNSENCODER)
{
if(currentRunEncoder == null || currentRunEncoder.UniqueID == -1)
new DialogMessage(Constants.MessageTypes.WARNING, "Sorry, file not found");
diff --git a/src/preferences.cs b/src/preferences.cs
index 990e58a95..7151fa782 100644
--- a/src/preferences.cs
+++ b/src/preferences.cs
@@ -54,7 +54,7 @@ public class Preferences
public bool loadLastSessionAtStart;
public int lastSessionID;
public bool loadLastModeAtStart;
- public Constants.Menuitem_modes lastMode;
+ public Constants.Modes lastMode;
public SessionLoadDisplay sessionLoadDisplay;
public enum UnitsEnum { METRIC, IMPERIAL };
diff --git a/src/sqlite/main.cs b/src/sqlite/main.cs
index 286245b01..bd7ec30a9 100644
--- a/src/sqlite/main.cs
+++ b/src/sqlite/main.cs
@@ -2773,7 +2773,7 @@ class Sqlite
SqlitePreferences.Insert (SqlitePreferences.LoadLastSessionAtStart, "True");
SqlitePreferences.Insert (SqlitePreferences.LastSessionID, "-1");
SqlitePreferences.Insert (SqlitePreferences.LoadLastModeAtStart, "True");
- SqlitePreferences.Insert (SqlitePreferences.LastMode,
Constants.Menuitem_modes.UNDEFINED.ToString());
+ SqlitePreferences.Insert (SqlitePreferences.LastMode,
Constants.Modes.UNDEFINED.ToString());
currentVersion = updateVersion("1.97");
}
diff --git a/src/sqlite/preferences.cs b/src/sqlite/preferences.cs
index ff3665a3b..f14499c42 100644
--- a/src/sqlite/preferences.cs
+++ b/src/sqlite/preferences.cs
@@ -377,7 +377,7 @@ class SqlitePreferences : Sqlite
Insert (LoadLastSessionAtStart, "True", dbcmdTr);
Insert (LastSessionID, "-1", dbcmdTr);
Insert (LoadLastModeAtStart, "True", dbcmdTr);
- Insert (LastMode, Constants.Menuitem_modes.UNDEFINED.ToString(), dbcmdTr);
+ Insert (LastMode, Constants.Modes.UNDEFINED.ToString(), dbcmdTr);
Insert (SessionLoadDisplay, "0", dbcmdTr);
//export
@@ -847,8 +847,8 @@ class SqlitePreferences : Sqlite
else if(reader[0].ToString() == LoadLastModeAtStart)
preferences.loadLastModeAtStart = reader[1].ToString() == "True";
else if(reader[0].ToString() == LastMode)
- preferences.lastMode = (Constants.Menuitem_modes)
- Enum.Parse(typeof(Constants.Menuitem_modes), reader[1].ToString());
+ preferences.lastMode = (Constants.Modes)
+ Enum.Parse(typeof(Constants.Modes), reader[1].ToString());
else if(reader[0].ToString() == SessionLoadDisplay)
preferences.sessionLoadDisplay = new
SessionLoadDisplay(Convert.ToInt32(reader[1].ToString()));
diff --git a/src/threshold.cs b/src/threshold.cs
index bf810bf85..ee98c0602 100644
--- a/src/threshold.cs
+++ b/src/threshold.cs
@@ -42,7 +42,7 @@ public class Threshold
}
//called when menuitem mode changes
- public bool SelectTresholdForThisMode(Constants.Menuitem_modes m)
+ public bool SelectTresholdForThisMode(Constants.Modes m)
{
//declare it with default value to solve potential SQL problems
string newThreshold = "5";
@@ -71,7 +71,7 @@ public class Threshold
}
//called on test execution
- public void UpdateAtDatabaseIfNeeded(Constants.Menuitem_modes m)
+ public void UpdateAtDatabaseIfNeeded(Constants.Modes m)
{
if(t != t_previous_on_this_mode)
{
@@ -121,13 +121,13 @@ public class Threshold
return Convert.ToInt32(t / 10);
}
- private string nameAtSQL(Constants.Menuitem_modes m)
+ private string nameAtSQL(Constants.Modes m)
{
- if(m == Constants.Menuitem_modes.JUMPSSIMPLE || m == Constants.Menuitem_modes.JUMPSREACTIVE)
+ if(m == Constants.Modes.JUMPSSIMPLE || m == Constants.Modes.JUMPSREACTIVE)
return "thresholdJumps";
- else if(m == Constants.Menuitem_modes.RUNSSIMPLE || m ==
Constants.Menuitem_modes.RUNSINTERVALLIC)
+ else if(m == Constants.Modes.RUNSSIMPLE || m == Constants.Modes.RUNSINTERVALLIC)
return "thresholdRuns";
- else // (m == Constants.Menuitem_modes.OTHER)
+ else // (m == Constants.Modes.OTHER)
return "thresholdOther";
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
