[chronojump] Cleaned warnings. 7 remaining.
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Cleaned warnings. 7 remaining.
- Date: Mon, 9 Jan 2017 22:48:38 +0000 (UTC)
commit 2fe2b6ddbd390177081b1ed7a6f8b7a89eabd0c8
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Jan 9 23:41:38 2017 +0100
Cleaned warnings. 7 remaining.
src/chronopicDetect.cs | 2 --
src/encoderCapture.cs | 2 +-
src/gui/chronojump.cs | 42 ++++++++++++++++--------------------------
src/gui/encoder.cs | 2 +-
src/gui/guiTests.cs | 2 +-
src/gui/networks.cs | 4 ----
src/log.cs | 4 +++-
src/logB.cs | 4 ++--
src/logConsoleCrayon.cs | 2 +-
9 files changed, 25 insertions(+), 39 deletions(-)
---
diff --git a/src/chronopicDetect.cs b/src/chronopicDetect.cs
index aa0699f..e2b18b6 100644
--- a/src/chronopicDetect.cs
+++ b/src/chronopicDetect.cs
@@ -30,7 +30,6 @@ public class ChronopicDetect
Gtk.ProgressBar progressbar;
Gtk.Button button_cancel;
- Gtk.Button button_info;
private static bool cancel;
private static bool needToChangeProgressbarText;
@@ -50,7 +49,6 @@ public class ChronopicDetect
this.sp = sp;
this.progressbar = progressbar;
this.button_cancel = button_cancel;
- this.button_info = button_info;
this.configAutoDetect = configAutoDetect;
button_cancel.Clicked += new EventHandler(on_button_cancel_clicked);
diff --git a/src/encoderCapture.cs b/src/encoderCapture.cs
index b47864d..db793d7 100644
--- a/src/encoderCapture.cs
+++ b/src/encoderCapture.cs
@@ -83,7 +83,7 @@ public abstract class EncoderCapture
protected bool capturingFirstPhase;
//capture is simulated (a signal file is readed)
- private static bool simulated;
+ private static bool simulated = false;
private int [] simulatedInts;
private int simulatedCount;
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 93acbbe..6ad7a32 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -354,7 +354,6 @@ public partial class ChronoJumpWindow
Random rand;
//persons
- private TreeStore treeview_persons_store;
private TreeViewPersons myTreeViewPersons;
//normal jumps
private TreeViewJumps myTreeViewJumps;
@@ -434,13 +433,11 @@ public partial class ChronoJumpWindow
EditMultiChronopicWindow editMultiChronopicWin;
ConfirmWindowJumpRun confirmWinJumpRun; //for deleting jumps and RJ jumps (and runs)
- ErrorWindow errorWin;
ReportWindow reportWin;
RepetitiveConditionsWindow repetitiveConditionsWin;
GenericWindow genericWin;
ExecuteAutoWindow executeAutoWin;
- EncoderOverviewWindow encoderOverviewWindow;
static Thread pingThread;
@@ -1145,7 +1142,7 @@ public partial class ChronoJumpWindow
}
//return true if selection is done (there's any person)
- private bool selectRowTreeView_persons(Gtk.TreeView tv, TreeStore store, int rowNum)
+ private bool selectRowTreeView_persons(Gtk.TreeView tv, int rowNum)
{
myTreeViewPersons.SelectRow(rowNum);
@@ -2522,7 +2519,7 @@ public partial class ChronoJumpWindow
resetAllTreeViews(true); //boolean means: "also persons"
- bool foundPersons = selectRowTreeView_persons(treeview_persons, treeview_persons_store, 0);
+ bool foundPersons = selectRowTreeView_persons(treeview_persons, 0);
//show hidden widgets
sensitiveGuiNoSession();
@@ -2625,9 +2622,7 @@ public partial class ChronoJumpWindow
int rowToSelect = myTreeViewPersons.FindRow(currentPerson.UniqueID);
if(rowToSelect != -1) {
- selectRowTreeView_persons(treeview_persons,
- treeview_persons_store,
- rowToSelect);
+ selectRowTreeView_persons(treeview_persons, rowToSelect);
sensitiveGuiYesPerson();
}
}
@@ -2647,9 +2642,7 @@ public partial class ChronoJumpWindow
fillTreeView_persons();
int rowToSelect = myTreeViewPersons.FindRow(currentPerson.UniqueID);
if(rowToSelect != -1) {
- selectRowTreeView_persons(treeview_persons,
- treeview_persons_store,
- rowToSelect);
+ selectRowTreeView_persons(treeview_persons, rowToSelect);
sensitiveGuiYesPerson();
}
}
@@ -2700,9 +2693,7 @@ public partial class ChronoJumpWindow
int rowToSelect = myTreeViewPersons.FindRow(currentPerson.UniqueID);
if(rowToSelect != -1) {
- selectRowTreeView_persons(treeview_persons,
- treeview_persons_store,
- rowToSelect);
+ selectRowTreeView_persons(treeview_persons, rowToSelect);
sensitiveGuiYesPerson();
//appbar2.Push( 1, Catalog.GetString("Successfully added") + " " +
currentPerson.Name );
}
@@ -2732,9 +2723,7 @@ public partial class ChronoJumpWindow
fillTreeView_persons();
int rowToSelect = myTreeViewPersons.FindRow(currentPerson.UniqueID);
if(rowToSelect != -1) {
- selectRowTreeView_persons(treeview_persons,
- treeview_persons_store,
- rowToSelect);
+ selectRowTreeView_persons(treeview_persons, rowToSelect);
sensitiveGuiYesPerson();
// string myString = string.Format(
@@ -2774,9 +2763,7 @@ public partial class ChronoJumpWindow
int rowToSelect = myTreeViewPersons.FindRow(currentPerson.UniqueID);
if(rowToSelect != -1) {
- selectRowTreeView_persons(treeview_persons,
- treeview_persons_store,
- rowToSelect);
+ selectRowTreeView_persons(treeview_persons, rowToSelect);
sensitiveGuiYesPerson();
}
@@ -2823,7 +2810,7 @@ public partial class ChronoJumpWindow
currentSession.UniqueID.ToString(), currentPerson.UniqueID.ToString());
resetAllTreeViews(true); //boolean means: "also persons"
- bool foundPersons = selectRowTreeView_persons(treeview_persons, treeview_persons_store, 0);
+ bool foundPersons = selectRowTreeView_persons(treeview_persons, 0);
if(createdStatsWin) {
stats_win_fillTreeView_stats(false, true);
@@ -2989,6 +2976,7 @@ public partial class ChronoJumpWindow
}
private Constants.Menuitem_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, ...)
private void select_menuitem_mode_toggled(Constants.Menuitem_modes m)
{
menuitem_mode_selected_jumps_simple.Visible = false;
@@ -3075,7 +3063,7 @@ public partial class ChronoJumpWindow
* interface has to change to YESPERSON (meaning no_signal).
* But, if there's no person shoud continue on NOPERSON
*/
- if(selectRowTreeView_persons(treeview_persons, treeview_persons_store, 0))
+ if(selectRowTreeView_persons(treeview_persons, 0))
encoderButtonsSensitive(encoderSensEnum.YESPERSON);
blankEncoderInterface();
@@ -3147,7 +3135,7 @@ public partial class ChronoJumpWindow
if(m != Constants.Menuitem_modes.POWERGRAVITATORY && m !=
Constants.Menuitem_modes.POWERINERTIAL)
{
//don't change threshold if changing from jumpssimple to jumpsreactive ...
- if(last_menuitem_mode == null ||
+ if(! last_menuitem_mode_defined ||
( m == Constants.Menuitem_modes.JUMPSSIMPLE &&
last_menuitem_mode != Constants.Menuitem_modes.JUMPSREACTIVE ) ||
( m == Constants.Menuitem_modes.JUMPSREACTIVE &&
@@ -3165,6 +3153,7 @@ public partial class ChronoJumpWindow
}
}
}
+ last_menuitem_mode_defined = true;
chronopicRegisterUpdate(false);
@@ -5071,7 +5060,7 @@ LogB.Debug("X");
}
}
catch {
- errorWin = ErrorWindow.Show(Catalog.GetString("Cannot update. Probably this test was
deleted."));
+ ErrorWindow.Show(Catalog.GetString("Cannot update. Probably this test was deleted."));
}
}
@@ -6087,7 +6076,7 @@ LogB.Debug("X");
int rowToSelect = myTreeViewPersons.FindRow(ea.personUniqueID);
if(rowToSelect != -1) {
//this will update also currentPerson
- selectRowTreeView_persons(treeview_persons, treeview_persons_store, rowToSelect);
+ selectRowTreeView_persons(treeview_persons, rowToSelect);
label_jump_auto_current_person.Text = currentPerson.Name;
//select the test
@@ -6703,8 +6692,9 @@ LogB.Debug("X");
openWindow = true;
if(openWindow) {
- ChronopicRegisterWindow crWin = new ChronopicRegisterWindow(app1,
chronopicRegister.Crpl.L);
+ //ChronopicRegisterWindow crWin = new ChronopicRegisterWindow(app1,
chronopicRegister.Crpl.L);
//crWin.FakeButtonCloseSerialPort.Clicked += new EventHandler(closeSerialPort);
+ new ChronopicRegisterWindow(app1, chronopicRegister.Crpl.L);
cp2016.WindowOpened = true;
}
}
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index ee8ddb2..74e637e 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -1487,7 +1487,7 @@ public partial class ChronoJumpWindow
void on_menuitem_encoder_session_overview_activate (object o, EventArgs args)
{
- encoderOverviewWindow = EncoderOverviewWindow.Show (app1, currentEncoderGI,
currentSession.UniqueID);
+ EncoderOverviewWindow.Show (app1, currentEncoderGI, currentSession.UniqueID);
}
void on_button_encoder_export_all_curves_file_selected (string selectedFileName)
diff --git a/src/gui/guiTests.cs b/src/gui/guiTests.cs
index aaa2ff6..eb0a377 100644
--- a/src/gui/guiTests.cs
+++ b/src/gui/guiTests.cs
@@ -451,7 +451,7 @@ public partial class ChronoJumpWindow
{
LogB.TestStart("chronojumpWindowTestsSelectPerson");
- selectRowTreeView_persons(treeview_persons, treeview_persons_store, count);
+ selectRowTreeView_persons(treeview_persons, count);
//for three persons, count: 0,1,2, CountRows() 3,3,3
if(count +1 >= myTreeViewPersons.CountRows()) {
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 62aaa48..2f84e42 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -56,7 +56,6 @@ public partial class ChronoJumpWindow
private bool useVideo = true;
- private Config.AutodetectPortEnum configAutodetectPort = Config.AutodetectPortEnum.ACTIVE;
private enum linuxTypeEnum { NOTLINUX, LINUX, RASPBERRY, NETWORKS }
private bool encoderUpdateTreeViewWhileCapturing = true;
@@ -102,9 +101,6 @@ public partial class ChronoJumpWindow
alignment_video_encoder.Visible = false;
}
- //Auto-detect stuff
- configAutodetectPort = config.AutodetectPort;
-
//show only power
if(config.OnlyEncoderGravitatory)
select_menuitem_mode_toggled(Constants.Menuitem_modes.POWERGRAVITATORY);
diff --git a/src/log.cs b/src/log.cs
index e773bdc..b885200 100644
--- a/src/log.cs
+++ b/src/log.cs
@@ -25,7 +25,7 @@ public class Log
{
//1.4.10 have log again by default to all windows users
//only two logs: current execution log and previous execution log
- private static TextWriter writer;
+ //private static TextWriter writer;
private static bool useConsole;
@@ -79,11 +79,13 @@ public class Log
{
if(useConsole)
System.Console.Out.Close();
+ /*
else {
try {
((IDisposable)writer).Dispose();
} catch {}
}
+ */
}
diff --git a/src/logB.cs b/src/logB.cs
index 50f5eb2..90b3a1f 100644
--- a/src/logB.cs
+++ b/src/logB.cs
@@ -260,7 +260,7 @@ public static class LogB
if(messagesOtherThreads != null) {
try {
Console.Write(messagesOtherThreads);
- } catch (System.IndexOutOfRangeException e) {
+ } catch (System.IndexOutOfRangeException) {
Console.Write("CATCHED printing messagesOtherThreads");
}
}
@@ -275,7 +275,7 @@ public static class LogB
else
Console.WriteLine(" {0}", message);
}
- catch (System.IndexOutOfRangeException e) {
+ catch (System.IndexOutOfRangeException) {
Console.Write("CATCHED printing main thread");
}
} else {
diff --git a/src/logConsoleCrayon.cs b/src/logConsoleCrayon.cs
index c3bdcf0..6adc247 100644
--- a/src/logConsoleCrayon.cs
+++ b/src/logConsoleCrayon.cs
@@ -82,7 +82,7 @@ public static class ConsoleCrayon
Console.BackgroundColor = color;
}
}
- } catch (System.IndexOutOfRangeException e) {
+ } catch (System.IndexOutOfRangeException) {
Console.Write("CATCHED at SetColor");
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
