[chronojump] Fixed behaviour of updateStats button
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Fixed behaviour of updateStats button
- Date: Mon, 11 Apr 2011 14:21:48 +0000 (UTC)
commit b698749cf8d9c4f006fa14f2ebbbcd8eff656362
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Apr 9 13:26:24 2011 +0200
Fixed behaviour of updateStats button
src/chronojump.cs | 2 +-
src/gui/chronojump.cs | 61 +++++++++++++------------------------------------
src/gui/stats.cs | 11 ---------
3 files changed, 17 insertions(+), 57 deletions(-)
---
diff --git a/src/chronojump.cs b/src/chronojump.cs
index 672387d..fe03483 100644
--- a/src/chronojump.cs
+++ b/src/chronojump.cs
@@ -502,7 +502,7 @@ Console.WriteLine("--6--");
Thread.Sleep (50);
- Log.Write(" (PulseGTK:" + thread.ThreadState.ToString() + ") ");
+ //Log.Write(" (PulseGTK:" + thread.ThreadState.ToString() + ") ");
return true;
}
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index dcf61b3..9d90e02 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2627,7 +2627,7 @@ public partial class ChronoJumpWindow
//because it crashes in some thread problem
//that will be fixed in other release
//if(createdStatsWin)
- // stats_win_showUpdateStatsButton();
+ // showUpdateStatsAndHideData(true);
}
private void on_cancel_multi_clicked (object o, EventArgs args)
@@ -2714,7 +2714,7 @@ public partial class ChronoJumpWindow
//let update stats
if(createdStatsWin)
- stats_win_showUpdateStatsButton();
+ showUpdateStatsAndHideData(true);
}
//mark to only get inside on_multi_chronopic_finished one time
@@ -2744,7 +2744,7 @@ public partial class ChronoJumpWindow
//let update stats
//if(createdStatsWin)
- // stats_win_showUpdateStatsButton();
+ // showUpdateStatsAndHideData(true);
}
//if user doesn't touch the platform after pressing "finish", sometimes it gets waiting a Read_event
@@ -3099,7 +3099,7 @@ Console.WriteLine("X");
//don't let update until test finishes
if(createdStatsWin)
- stats_win_hideUpdateStatsButton();
+ showUpdateStatsAndHideData(false);
//eventExecuteWin = EventExecuteWindow.Show(
ExecutingGraphData egd = event_execute_initializeVariables(
@@ -3171,8 +3171,7 @@ Console.WriteLine("X");
showHideActionEventButtons(true, "Jump"); //show
if(createdStatsWin) {
- //stats_win_fillTreeView_stats(false, false);
- stats_win_showUpdateStatsButton();
+ showUpdateStatsAndHideData(true);
}
//unhide buttons for delete last jump
@@ -3235,7 +3234,7 @@ Console.WriteLine("X");
//don't let update until test finishes
if(createdStatsWin)
- stats_win_hideUpdateStatsButton();
+ showUpdateStatsAndHideData(false);
//show the event doing window
//eventExecuteWin = EventExecuteWindow.Show(
@@ -3322,8 +3321,7 @@ Console.WriteLine("X");
//currentEventExecute.StopThread();
if(createdStatsWin) {
- //stats_win_fillTreeView_stats(false, false);
- stats_win_showUpdateStatsButton();
+ showUpdateStatsAndHideData(true);
}
lastJumpIsSimple = false;
@@ -3405,7 +3403,7 @@ Console.WriteLine("X");
//don't let update until test finishes
if(createdStatsWin)
- stats_win_hideUpdateStatsButton();
+ showUpdateStatsAndHideData(false);
//eventExecuteWin = EventExecuteWindow.Show(
ExecutingGraphData egd = event_execute_initializeVariables(
@@ -3470,7 +3468,7 @@ Console.WriteLine("X");
showHideActionEventButtons(true, "Run"); //show
if(createdStatsWin) {
- stats_win_showUpdateStatsButton();
+ showUpdateStatsAndHideData(true);
}
//unhide buttons for delete last jump
@@ -3563,7 +3561,7 @@ Console.WriteLine("X");
//don't let update until test finishes
if(createdStatsWin)
- stats_win_hideUpdateStatsButton();
+ showUpdateStatsAndHideData(false);
//show the event doing window
//eventExecuteWin = EventExecuteWindow.Show(
@@ -3640,8 +3638,7 @@ Console.WriteLine("X");
showHideActionEventButtons(true, "RunInterval"); //show
if(createdStatsWin) {
- //stats_win_fillTreeView_stats(false, false);
- stats_win_showUpdateStatsButton();
+ showUpdateStatsAndHideData(true);
}
lastRunIsSimple = false;
@@ -3690,7 +3687,7 @@ Console.WriteLine("X");
//don't let update until test finishes
if(createdStatsWin)
- stats_win_hideUpdateStatsButton();
+ showUpdateStatsAndHideData(false);
//eventExecuteWin = EventExecuteWindow.Show(
ExecutingGraphData egd = event_execute_initializeVariables(
@@ -3756,8 +3753,7 @@ Console.WriteLine("X");
showHideActionEventButtons(true, "ReactionTime"); //show
if(createdStatsWin) {
- //stats_win_fillTreeView_stats(false, false);
- stats_win_showUpdateStatsButton();
+ showUpdateStatsAndHideData(true);
}
//unhide buttons for delete last reaction time
@@ -3826,7 +3822,7 @@ Console.WriteLine("X");
//don't let update until test finishes
if(createdStatsWin)
- stats_win_hideUpdateStatsButton();
+ showUpdateStatsAndHideData(false);
//show the event doing window
// eventExecuteWin = EventExecuteWindow.Show(
@@ -3904,8 +3900,7 @@ Console.WriteLine("X");
showHideActionEventButtons(true, "Pulse"); //show
if(createdStatsWin) {
- //stats_win_fillTreeView_stats(false, false);
- stats_win_showUpdateStatsButton();
+ showUpdateStatsAndHideData(true);
}
//unhide buttons for delete last jump
@@ -3985,7 +3980,7 @@ Console.WriteLine("X");
//don't let update until test finishes
if(createdStatsWin)
- stats_win_hideUpdateStatsButton();
+ showUpdateStatsAndHideData(false);
//show the event doing window
//eventExecuteWin = EventExecuteWindow.Show(
@@ -4398,10 +4393,6 @@ Console.WriteLine("X");
treeview_reaction_times_storeReset();
fillTreeView_reaction_times();
}
-
- //if(createdStatsWin) {
- // stats_win_fillTreeView_stats(false, false);
- //}
}
private void on_edit_selected_pulse_clicked (object o, EventArgs args) {
@@ -4432,10 +4423,6 @@ Console.WriteLine("X");
treeview_pulses_storeReset();
fillTreeView_pulses(UtilGtk.ComboGetActive(combo_pulses));
}
-
- //if(createdStatsWin) {
- // stats_win_fillTreeView_stats(false, false);
- //}
}
private void on_edit_selected_multi_chronopic_clicked (object o, EventArgs args) {
@@ -4837,11 +4824,6 @@ Console.WriteLine("X");
myTreeViewReactionTimes.DelEvent(id);
showHideActionEventButtons(false, "ReactionTime");
- /*
- if(createdStatsWin) {
- stats_win_fillTreeView_stats(false, false);
- }
- */
Util.DeleteVideo(currentSession.UniqueID, Constants.TestTypes.RT, id );
try {
if(currentReactionTime.UniqueID == id)
@@ -4879,11 +4861,6 @@ Console.WriteLine("X");
myTreeViewPulses.DelEvent(id);
showHideActionEventButtons(false, "Pulse");
- /*
- if(createdStatsWin) {
- stats_win_fillTreeView_stats(false, false);
- }
- */
Util.DeleteVideo(currentSession.UniqueID, Constants.TestTypes.PULSE, id );
try {
if(currentPulse.UniqueID == id)
@@ -5102,12 +5079,6 @@ Console.WriteLine("X");
treeview_pulses_storeReset();
fillTreeView_pulses(UtilGtk.ComboGetActive(combo_pulses));
-
- /*
- if(createdStatsWin) {
- stats_win_fillTreeView_stats(false, false);
- }
- */
}
private void on_repair_selected_multi_chronopic_clicked (object o, EventArgs args) {
diff --git a/src/gui/stats.cs b/src/gui/stats.cs
index f42d27e..c93a8ff 100644
--- a/src/gui/stats.cs
+++ b/src/gui/stats.cs
@@ -962,17 +962,6 @@ public partial class ChronoJumpWindow {
}
- //allows to click on updateStatsButton (from chronojump.cs)
- //now checkbox of stats automatic is disabled
- //and user has to do it always by hand
- //workaround to bug ???????
- private void stats_win_hideUpdateStatsButton() {
- button_stats.Visible = false;
- }
- private void stats_win_showUpdateStatsButton() {
- button_stats.Visible = true;
- }
-
private void on_checkbutton_show_enunciate_clicked(object o, EventArgs args) {
if (checkbutton_show_enunciate.Active) {
textview_enunciate.Show();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]