Commit 1b946f02 authored by Xavier de Blas's avatar Xavier de Blas

run interval execute unlimited (Fixes task 283)

run interval more
run interval cancel
run interval finish (three above fixed task 281)
"more" windows get hided when clic on "accept" (now suitable to clic cancel or finish)

fixed bugs in unlimited RJ jumps and interval runs

chronojump.cs moved to src
cleaned gui sensitive code in chronojump.cs
parent 2d7fafb2
......@@ -41,11 +41,12 @@ DLL_CHRONOPIC = chronopic
NAME5= chronojump-mini
DEP5 = $(NAME5).cs $(DLL_CHRONOPIC).dll
DEP5 = src/chronojump-mini.cs $(DLL_CHRONOPIC).dll
#-- Construccion del chronojump-mini que funciona por consola
chronojump-mini: $(NAME5).exe
#chronojump-mini: $(NAME5).exe
chronojump-mini: chronojump-mini.exe
#--------------------------
# Reglas
......@@ -85,7 +86,7 @@ sg-serial.o : sg-serial.h
# EJEMPLOS DE PRUEBA EN C#
#-------------------------------
$(NAME5).exe: $(DEP5)
$(MCS) $(NAME5).cs -unsafe -r $(DLL_CHRONOPIC).dll -o $(NAME5).exe
$(MCS) src/$(NAME5).cs -unsafe -r $(DLL_CHRONOPIC).dll -o $(NAME5).exe
clean::
rm -f $(NAME5).exe
......
CHANGELOG:
17 aug 2005
run interval execute unlimited
run interval more
run interval cancel
run interval finish
"more" windows get hided when clic on "accept" (now suitable to clic cancel or finish)
fixed bugs in unlimited RJ jumps and interval runs
chronojump.cs moved to src
cleaned gui sensitive code in chronojump.cs
17 aug 2005
run interval implemented:
combo
......
No preview for this file type
No preview for this file type
......@@ -2880,7 +2880,7 @@
<property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox73">
<widget class="GtkHBox" id="hbox_runs_interval">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
......@@ -6402,15 +6402,15 @@ comments</property>
<property name="spacing">0</property>
<child>
<widget class="GtkButton" id="button_close">
<widget class="GtkButton" id="button_cancel">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-close</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_button_close_clicked" last_modification_time="Tue, 08 Mar 2005 19:07:36 GMT"/>
<signal name="clicked" handler="on_button_cancel_clicked" last_modification_time="Wed, 17 Aug 2005 15:46:43 GMT"/>
</widget>
</child>
......
......@@ -43,6 +43,8 @@ public class ChronoJump
[Widget] Gtk.Box hbox_combo_person_current;
[Widget] Gtk.Box hbox_jumps;
[Widget] Gtk.Box hbox_jumps_rj;
[Widget] Gtk.Box hbox_runs;
[Widget] Gtk.Box hbox_runs_interval;
[Widget] Gtk.Combo combo_jumps;
[Widget] Gtk.Combo combo_jumps_rj;
[Widget] Gtk.Combo combo_runs;
......@@ -189,7 +191,8 @@ public class ChronoJump
private static JumpRj currentJumpRj;
private static Run currentRun;
private static RunInterval currentRunInterval;
private static bool lastEventWasJump; //if last event was Jump (true) or Run (false)
private static bool currentEventIsJump; //if current event is Jump (true) or Run (false). Used by Cancel and Finish
private static bool lastEventWasJump; //if last event was Jump (true) or Run (false). Used by Last Jump or run delete
private static bool lastJumpIsReactive; //if last Jump is reactive or not
private static bool lastRunIsInterval; //if last run is interval or not (obvious)
private static JumpType currentJumpType;
......@@ -211,7 +214,7 @@ public class ChronoJump
RunExtraWindow runExtraWin; //for normal and intervaled runs
RunsMoreWindow runsMoreWin;
//RunsIntervalMoreWindow runsIntervalMoreWin;
RunsIntervalMoreWindow runsIntervalMoreWin;
//RunTypeAddWindow runTypeAddWin;
EditRunWindow editRunWin;
EditRunIntervalWindow editRunIntervalWin;
......@@ -1202,10 +1205,19 @@ public class ChronoJump
Console.WriteLine("Cancel");
//this will cancel jumps or runs
if (currentJumpType.IsRepetitive) {
currentJumpRj.Cancel = true;
if(currentEventIsJump) {
if (currentJumpType.IsRepetitive) {
currentJumpRj.Cancel = true;
} else {
currentJump.Cancel = true;
}
} else {
currentJump.Cancel = true;
if (currentRunType.HasIntervals) {
currentRunInterval.Cancel = true;
} else {
currentRun.Cancel = true;
}
}
}
......@@ -1214,7 +1226,11 @@ public class ChronoJump
Console.WriteLine("Finish (not implemented)");
//this will finish jumps or runs
currentJumpRj.Finish = true;
if(currentEventIsJump) {
currentJumpRj.Finish = true;
} else {
currentRunInterval.Finish = true;
}
}
......@@ -1248,7 +1264,8 @@ public class ChronoJump
jumpsMoreWin.SelectedExtraWeight,
false, //isRepetitive
false, //jumpsLimited (false, because is not repetitive)
0 //limitValue
0, //limitValue
false //unlimited
);
if( ! currentJumpType.StartIn || currentJumpType.HasWeight) {
......@@ -1299,9 +1316,11 @@ public class ChronoJump
myFall = jumpExtraWin.Fall;
}
//used by cancel and finish
currentEventIsJump = true;
//hide jumping buttons
sensitiveGuiJumping();
sensitiveGuiJumpingOrRunning();
currentJump = new Jump(currentPerson.UniqueID, currentSession.UniqueID, currentJumpType.Name, myFall, myWeight,
cp, progressBar, appbar2, app1, prefsDigitsNumber);
......@@ -1341,7 +1360,7 @@ public class ChronoJump
}
//unhide buttons that allow jumping
sensitiveGuiJumped();
sensitiveGuiJumpedOrRunned();
//unhide buttons for delete last jump
sensitiveGuiYesJump();
}
......@@ -1372,15 +1391,19 @@ public class ChronoJump
//used from the dialogue "jumps rj more"
private void on_more_jumps_rj_accepted (object o, EventArgs args)
{
Console.WriteLine("--1 jumpsRjMoreWin.SelectedLimited: {0}", jumpsRjMoreWin.SelectedLimited);
currentJumpType = new JumpType(
jumpsRjMoreWin.SelectedJumpType,
jumpsRjMoreWin.SelectedStartIn,
jumpsRjMoreWin.SelectedExtraWeight,
true, //isRepetitive
jumpsRjMoreWin.SelectedLimited,
jumpsRjMoreWin.SelectedLimitedValue
jumpsRjMoreWin.SelectedLimitedValue,
jumpsRjMoreWin.SelectedUnlimited
);
if( ! currentJumpType.StartIn || currentJumpType.HasWeight || currentJumpType.FixedValue == 0) {
if( ! currentJumpType.StartIn || currentJumpType.HasWeight ||
(currentJumpType.FixedValue == 0 && ! currentJumpType.Unlimited) ) {
on_jump_extra_activate(o, args);
} else {
on_rj_accepted(o, args);
......@@ -1390,51 +1413,20 @@ public class ChronoJump
private void on_rj_activate (object o, EventArgs args) {
if(o == (object) button_rj_j || o == (object) rj_j)
{
/*
currentJumpType = new JumpType(
"RJ(j)",
false, //startIn
false, //hasWeight
true, //isRepetitive
true, //jumpsLimited
0 //limitValue
);
*/
currentJumpType = new JumpType("RJ(j)");
jumpExtraWin = JumpExtraWindow.Show(app1, currentJumpType);
jumpExtraWin.Button_accept.Clicked += new EventHandler(on_rj_accepted);
} else if(o == (object) button_rj_t || o == (object) rj_t)
{
/*
currentJumpType = new JumpType(
"RJ(t)",
false, //startIn
false, //hasWeight
true, //isRepetitive
false, //jumpsLimited
0 //limitValue
);
*/
currentJumpType = new JumpType("RJ(t)");
jumpExtraWin = JumpExtraWindow.Show(app1, currentJumpType);
jumpExtraWin.Button_accept.Clicked += new EventHandler(on_rj_accepted);
} else if(o == (object) button_rj_unlimited || o == (object) rj_unlimited)
{
/*
currentJumpType = new JumpType(
"RJ(unlimited)",
true, //startIn
false, //hasWeight
true, //isRepetitive
true, //jumpsLimited
-1 //limitValue //don't ask for limit of jumps or seconds
);
*/
currentJumpType = new JumpType("RJ(unlimited)");
//in this jump type, don't ask for limit of jumps or seconds
on_rj_accepted(o, args);
} else {
}
}
......@@ -1442,8 +1434,8 @@ public class ChronoJump
{
double myLimit = 0;
//if it's a unlimited interval jump, put -1 as limit value
if(o == (object) button_rj_unlimited || o == (object) rj_unlimited) {
//if it's a unlimited interval run, put -1 as limit value
if(currentJumpType.Unlimited) {
myLimit = -1;
} else {
if(currentJumpType.FixedValue > 0) {
......@@ -1462,8 +1454,11 @@ public class ChronoJump
myFall = jumpExtraWin.Fall;
}
//used by cancel and finish
currentEventIsJump = true;
//hide jumping buttons
sensitiveGuiJumping();
sensitiveGuiJumpingOrRunning();
currentJumpRj = new JumpRj(currentPerson.UniqueID, currentSession.UniqueID, currentJumpType.Name, myFall, myWeight,
myLimit, currentJumpType.JumpsLimited,
......@@ -1517,7 +1512,7 @@ public class ChronoJump
}
//unhide buttons that allow jumping
sensitiveGuiJumped();
sensitiveGuiJumpedOrRunned();
//unhide buttons for delete last jump
sensitiveGuiYesJump();
}
......@@ -1553,7 +1548,8 @@ public class ChronoJump
false, //hasIntervals
runsMoreWin.SelectedDistance, //distance
false, //tracksLimited (false, because has not intervals)
0 //fixedValue (0, because has not intervals)
0, //fixedValue (0, because has not intervals)
false //unlimited (false, because has not intervals)
);
if( currentRunType.Distance == 0 ) {
......@@ -1608,8 +1604,11 @@ public class ChronoJump
myDistance = (int) currentRunType.Distance;
}
//used by cancel and finish
currentEventIsJump = false;
//hide jumping (running) buttons
sensitiveGuiRunning();
sensitiveGuiJumpingOrRunning();
currentRun = new Run(currentPerson.UniqueID, currentSession.UniqueID,
currentRunType.Name, myDistance,
......@@ -1649,7 +1648,7 @@ public class ChronoJump
}
//unhide buttons that allow jumping, running
sensitiveGuiRunned();
sensitiveGuiJumpedOrRunned();
//unhide buttons for delete last jump
sensitiveGuiYesJump();
}
......@@ -1662,7 +1661,29 @@ public class ChronoJump
private void on_button_run_interval_more_clicked (object o, EventArgs args)
{
Console.WriteLine("button run interval more (not implemented)");
Console.WriteLine("button run interval more");
runsIntervalMoreWin = RunsIntervalMoreWindow.Show(app1);
runsIntervalMoreWin.Button_accept.Clicked += new EventHandler(on_more_runs_interval_accepted);
}
private void on_more_runs_interval_accepted (object o, EventArgs args)
{
currentRunType = new RunType(
runsIntervalMoreWin.SelectedRunType, //name
true, //hasIntervals
runsIntervalMoreWin.SelectedDistance,
runsIntervalMoreWin.SelectedTracksLimited,
runsIntervalMoreWin.SelectedLimitedValue,
runsIntervalMoreWin.SelectedUnlimited
);
//go to run extra if we need something to define
if( currentRunType.Distance == 0 ||
(currentRunType.FixedValue == 0 && ! runsIntervalMoreWin.SelectedUnlimited) ) {
on_run_extra_activate(o, args);
} else {
on_run_interval_accepted(o, args);
}
}
private void on_button_run_interval_last_clicked (object o, EventArgs args)
......@@ -1670,7 +1691,8 @@ public class ChronoJump
on_run_interval_activate(o, args);
}
//suitable for all runs repetitive
//interval runs clicked from user interface
//(not suitable for the other runs we found in "more")
private void on_run_interval_activate (object o, EventArgs args)
{
if(o == (object) button_run_interval_by_laps || o == (object) menuitem_run_interval_by_laps)
......@@ -1683,6 +1705,7 @@ public class ChronoJump
{
currentRunType = new RunType("unlimited");
}
runExtraWin = RunExtraWindow.Show(app1, currentRunType);
runExtraWin.Button_accept.Clicked += new EventHandler(on_run_interval_accepted);
......@@ -1715,8 +1738,11 @@ public class ChronoJump
}
//used by cancel and finish
currentEventIsJump = false;
//hide running buttons
sensitiveGuiRunning();
sensitiveGuiJumpingOrRunning();
currentRunInterval = new RunInterval(currentPerson.UniqueID, currentSession.UniqueID, currentRunType.Name,
distanceInterval, myLimit, currentRunType.TracksLimited,
......@@ -1736,24 +1762,22 @@ public class ChronoJump
private void on_run_interval_finished (object o, EventArgs args)
{
//currentJumpRj.FalseButtonFinished.Clicked -= new EventHandler(on_jump_rj_finished);
currentRunInterval.FalseButtonFinished.Clicked -= new EventHandler(on_run_interval_finished);
//if ( ! currentJumpRj.Cancel ) {
if ( ! currentRunInterval.Cancel ) {
lastEventWasJump = false;
lastRunIsInterval = true;
//if user clicked in finish earlier
/*
if(currentJumpRj.Finish) {
currentJumpRj.Jumps = Util.GetNumberOfJumps(currentJumpRj.TvString);
if(currentJumpRj.JumpsLimited) {
currentJumpRj.Limited = currentJumpRj.Jumps.ToString() + "J";
if(currentRunInterval.Finish) {
currentRunInterval.Tracks = Util.GetNumberOfJumps(currentRunInterval.IntervalTimesString);
if(currentRunInterval.TracksLimited) {
currentRunInterval.Limited = currentRunInterval.Tracks.ToString() + "R";
} else {
currentJumpRj.Limited = Util.GetTotalTime(
currentJumpRj.TcString, currentJumpRj.TvString) + "T";
currentRunInterval.Limited = Util.GetTotalTime(
currentRunInterval.IntervalTimesString) + "T";
}
}
*/
myTreeViewRunsInterval.Add(currentPerson.Name, currentRunInterval);
if(createdStatsWin) {
......@@ -1764,11 +1788,11 @@ public class ChronoJump
if(notebook.CurrentPage < 4) {
notebook.NextPage();
}
//}
}
sensitiveGuiYesJump();
//unhide buttons that allow jumping, running
sensitiveGuiRunned();
sensitiveGuiJumpedOrRunned();
//unhide buttons for delete last jump
sensitiveGuiYesJump();
}
......@@ -2281,84 +2305,63 @@ public class ChronoJump
button_finish.Sensitive = false;
}
private void sensitiveGuiJumping () {
private void sensitiveGuiJumpingOrRunning () {
//hbox
hbox_jumps.Sensitive = false;
hbox_jumps_rj.Sensitive = false;
hbox_runs.Sensitive = false;
hbox_runs_interval.Sensitive = false;
//menu
menu_jumps.Sensitive = false;
menu_runs.Sensitive = false;
//cancel, finish jump, delete last
//cancel, delete last, finish
button_cancel.Sensitive = true;
if (currentJumpType.IsRepetitive) {
button_finish.Sensitive = true;
}
button_last_delete.Sensitive = false;
}
private void sensitiveGuiRunning () {
//hbox
hbox_jumps.Sensitive = false;
hbox_jumps_rj.Sensitive = false;
//menu
menu_jumps.Sensitive = false;
menu_runs.Sensitive = false;
//cancel, finish jump, delete last
button_cancel.Sensitive = true;
if (currentRunType.HasIntervals) {
button_finish.Sensitive = true;
}
button_last_delete.Sensitive = false;
}
private void sensitiveGuiJumped () {
Console.WriteLine("GuiJumped");
//hbox
hbox_jumps.Sensitive = true;
hbox_jumps_rj.Sensitive = true;
//allow repeat last jump (check also if it wasn't cancelled)
if(currentJumpType.IsRepetitive) {
if(! currentJumpRj.Cancel) {
button_rj_last.Sensitive = true;
button_last.Sensitive = false;
if(currentEventIsJump) {
if (currentJumpType.IsRepetitive) {
button_finish.Sensitive = true;
}
} else {
if(! currentJump.Cancel) {
button_last.Sensitive = true;
button_rj_last.Sensitive = false;
if (currentRunType.HasIntervals) {
button_finish.Sensitive = true;
}
}
//menu
menu_jumps.Sensitive = true;
menu_runs.Sensitive = true;
//cancel, finish jump
button_cancel.Sensitive = false;
button_finish.Sensitive = false;
}
private void sensitiveGuiRunned () {
Console.WriteLine("GuiRunned");
private void sensitiveGuiJumpedOrRunned () {
//hbox
hbox_jumps.Sensitive = true;
hbox_jumps_rj.Sensitive = true;
//allow repeat last run (check also if it wasn't cancelled)
if(currentRunType.HasIntervals) {
if(! currentRunInterval.Cancel) {
button_run_interval_last.Sensitive = true;
button_run_last.Sensitive = false;
hbox_runs.Sensitive = true;
hbox_runs_interval.Sensitive = true;
//allow repeat last jump or run (check also if it wasn't cancelled)
if(currentEventIsJump) {
if(currentJumpType.IsRepetitive) {
if(! currentJumpRj.Cancel) {
button_rj_last.Sensitive = true;
button_last.Sensitive = false;
}
} else {
if(! currentJump.Cancel) {
button_last.Sensitive = true;
button_rj_last.Sensitive = false;
}
}
} else {
if(! currentRun.Cancel) {
button_run_last.Sensitive = true;
button_run_interval_last.Sensitive = false;
if(currentRunType.HasIntervals) {
if(! currentRunInterval.Cancel) {
button_run_interval_last.Sensitive = true;
button_run_last.Sensitive = false;
}
} else {
if(! currentRun.Cancel) {
button_run_last.Sensitive = true;
button_run_interval_last.Sensitive = false;
}
}
}
......
......@@ -551,7 +551,7 @@ public class JumpsMoreWindow
}
}
void on_button_close_clicked (object o, EventArgs args)
void on_button_cancel_clicked (object o, EventArgs args)
{
JumpsMoreWindowBox.jumps_runs_more.Hide();
JumpsMoreWindowBox = null;
......@@ -565,7 +565,7 @@ public class JumpsMoreWindow
void on_button_accept_clicked (object o, EventArgs args)
{
Console.Write("SELECTED");
JumpsMoreWindowBox.jumps_runs_more.Hide();
}
public Button Button_accept
......@@ -623,6 +623,7 @@ public class JumpsRjMoreWindow
private bool selectedExtraWeight;
private bool selectedLimited;
private double selectedLimitedValue;
private bool selectedUnlimited;
JumpsRjMoreWindow (Gtk.Window parent) {
//the glade window is the same as jumps_more
......@@ -684,13 +685,22 @@ public class JumpsRjMoreWindow
myStringFull[3] = Catalog.GetString("No");
}
//limited
string myLimiter = Catalog.GetString("Jumps");
if(myStringFull[4] == "0") {
myLimiter = Catalog.GetString("Seconds");
}
string myLimiterValue = "?";
if(Convert.ToDouble(myStringFull[5]) > 0) {
myLimiterValue = myStringFull[5];
string myLimiter = "";
string myLimiterValue = "";
//check if it's unlimited
if(myStringFull[5] == "-1") { //unlimited mark
myLimiter= Catalog.GetString("Unlimited");
myLimiterValue = "-";
} else {
myLimiter = Catalog.GetString("Jumps");
if(myStringFull[4] == "0") {
myLimiter = Catalog.GetString("Seconds");
}
myLimiterValue = "?";
if(Convert.ToDouble(myStringFull[5]) > 0) {
myLimiterValue = myStringFull[5];
}
}
iter = store.AppendValues (
......@@ -717,15 +727,24 @@ public class JumpsRjMoreWindow
selectedExtraWeight = false;
selectedLimited = false;
selectedLimitedValue = 0;
selectedUnlimited = false; //true if it's an unlimited reactive jump
// you get the iter and the model if something is selected
if (tv.Selection.GetSelected (out model, out iter)) {
selectedJumpType = (string) model.GetValue (iter, 0);
if( (string) model.GetValue (iter, 1) == Catalog.GetString("Unlimited") ) {
selectedUnlimited = true;
selectedLimited = true; //unlimited jumps will be limited by clicking on "finish"
//and this will be always done by the user when
//some jumps are done (not time like in runs)
}
if( (string) model.GetValue (iter, 1) == Catalog.GetString("Jumps") ) {
selectedLimited = true;
}
if( (string) model.GetValue (iter, 2) == "?") {
if( (string) model.GetValue (iter, 2) == "?" || (string) model.GetValue (iter, 2) == "-") {
selectedLimitedValue = 0;
} else {
selectedLimitedValue = Convert.ToDouble( (string) model.GetValue (iter, 2) );
......@@ -749,11 +768,19 @@ public class JumpsRjMoreWindow
if (tv.Selection.GetSelected (out model, out iter)) {
selectedJumpType = (string) model.GetValue (iter, 0);
if( (string) model.GetValue (iter, 1) == Catalog.GetString("Unlimited") ) {
selectedUnlimited = true;
selectedLimited = true; //unlimited jumps will be limited by clicking on "finish"
//and this will be always done by the user when
//some jumps are done (not time like in runs)
}
if( (string) model.GetValue (iter, 1) == Catalog.GetString("Jumps") ) {
selectedLimited = true;
}
if( (string) model.GetValue (iter, 2) == "?") {
if( (string) model.GetValue (iter, 2) == "?" || (string) model.GetValue (iter, 2) == "-") {
selectedLimitedValue = 0;
} else {
selectedLimitedValue = Convert.ToDouble( (string) model.GetValue (iter, 2) );
......@@ -772,7 +799,7 @@ public class JumpsRjMoreWindow
}
void on_button_close_clicked (object o, EventArgs args)
void on_button_cancel_clicked (object o, EventArgs args)
{
JumpsRjMoreWindowBox.jumps_runs_more.Hide();
JumpsRjMoreWindowBox = null;
......@@ -786,52 +813,44 @@ public class JumpsRjMoreWindow
void on_button_accept_clicked (object o, EventArgs args)
{
Console.Write("Selected");
JumpsRjMoreWindowBox.jumps_runs_more.Hide();
}
public Button Button_accept
{
set {
button_accept = value;
}
get {
return button_accept;
}
set { button_accept = value; }
get { return button_accept; }
}
public string SelectedJumpType
{
get {
return selectedJumpType;
}
get { return selectedJumpType; }
}
public bool SelectedLimited
{
get {
return selectedLimited;
}
get { return selectedLimited; }
}
public double SelectedLimitedValue
{
get {
return selectedLimitedValue;
}
get { return selectedLimitedValue; }
}
public bool SelectedStartIn
{
get {
return selectedStartIn;
}
get { return selectedStartIn; }
}
public bool SelectedExtraWeight
{
get {
return selectedExtraWeight;
}
get { return selectedExtraWeight; }
}
public bool SelectedUnlimited
{
get { return selectedUnlimited; }
}
}
......@@ -538,6 +538,8 @@ public class JumpRj : Jump
//if it's a unlimited reactive jump and it's simulated, put random value in limitAsDouble (will be jumps)
if(limitAsDouble == -1) {
limitAsDouble = Convert.ToInt32(rand.NextDouble() * 7);
jumpsLimited = true;
limited = limitAsDouble.ToString() + "J";
}
for (double i=0 ; i < limitAsDouble ; i = i +.5) {
......@@ -627,12 +629,13 @@ public class JumpRj : Jump
{
double timestamp;
bool success = false;
double pbUnlimited = 0;
Chronopic.Respuesta respuesta; //ok, error, or timeout in calling the platform
Chronopic.Plataforma platformState; //on (in platform), off (jumping), or unknow
//limitAsDouble
//jumpsLimited
Console.WriteLine("jumpsLimited: {0}", jumpsLimited);
Console.WriteLine("limitAsDouble: {0}", limitAsDouble);
do {
/*
......@@ -642,12 +645,12 @@ public class JumpRj : Jump
}
*/
//update the progressBar if limit is time
if ( ! jumpsLimited) {
//update the progressBar if limit is time (and it's not an unlimited reactive jump)
if ( ! jumpsLimited && limitAsDouble != -1) {
double myPb = Util.GetTotalTime (tcString, tvString) / limitAsDouble ;
//if(myPb > 1.0) { myPb = 1.0; }
//don't allow progressBar be 1.0 before falseButtonClick is called
if(myPb == 1.0 || myPb > 1.0) { myPb = 0.99; }
if(myPb >= 1.0) { myPb = 0.99; }
progressBar.Fraction = myPb;
}
......@@ -659,16 +662,17 @@ public class JumpRj : Jump
//if reactive jump is "unlimited" not limited by jumps, nor time,
//then play with the progress bar until finish button is pressed
if(limitAsDouble == -1) {