[chronojump] Pulses gui reorganization
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Pulses gui reorganization
- Date: Wed, 11 Dec 2019 16:06:57 +0000 (UTC)
commit 08ca585f9e50c94b433992dc9ffa1b8028c237e1
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Dec 11 17:06:51 2019 +0100
Pulses gui reorganization
po/POTFILES.in | 1 +
src/Makefile.am | 1 +
src/gui/app1/pulse.cs | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/gui/pulse.cs | 76 --------------------------------------
4 files changed, 102 insertions(+), 76 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 848e931e..5935251b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -61,6 +61,7 @@ src/gui/app1/chronojump.cs
src/gui/app1/contactsExercise.cs
src/gui/app1/forceSensor.cs
src/gui/app1/jump.cs
+src/gui/app1/pulse.cs
src/gui/app1/run.cs
src/gui/chronopic.cs
src/gui/chronopicRegister.cs
diff --git a/src/Makefile.am b/src/Makefile.am
index f7d746f3..2d777a90 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@ SOURCES = \
gui/app1/contactsExercise.cs\
gui/app1/forceSensor.cs\
gui/app1/jump.cs\
+ gui/app1/pulse.cs\
gui/app1/run.cs\
gui/chronojumpIcons.cs\
gui/chronojumpImporter.cs\
diff --git a/src/gui/app1/pulse.cs b/src/gui/app1/pulse.cs
new file mode 100644
index 00000000..b55f119f
--- /dev/null
+++ b/src/gui/app1/pulse.cs
@@ -0,0 +1,100 @@
+/*
+ * This file is part of ChronoJump
+ *
+ * ChronoJump is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * ChronoJump is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Copyright (C) 2004-2017 Xavier de Blas <xaviblas gmail com>
+ */
+
+using System;
+using Gtk;
+using Glade;
+using System.Text; //StringBuilder
+
+using Mono.Unix;
+
+
+
+public partial class ChronoJumpWindow
+{
+ [Widget] Gtk.RadioButton extra_window_radio_pulses_custom;
+ [Widget] Gtk.RadioButton extra_window_radio_pulses_free;
+
+ [Widget] Gtk.HBox hbox_extra_window_pulses;
+ [Widget] Gtk.SpinButton extra_window_pulses_spinbutton_pulse_step;
+ [Widget] Gtk.SpinButton extra_window_pulses_spinbutton_ppm;
+ [Widget] Gtk.SpinButton extra_window_pulses_spinbutton_total_pulses;
+ [Widget] Gtk.CheckButton extra_window_pulses_checkbutton_unlimited;
+ [Widget] Gtk.HBox extra_window_pulses_hbox_total_pulses;
+
+
+ double extra_window_pulseStep = 1.000;
+ int extra_window_totalPulses = 10;
+
+ private void on_extra_window_pulses_test_changed(object o, EventArgs args)
+ {
+ if(extra_window_radio_pulses_free.Active) currentPulseType = new PulseType("Free");
+ else if (extra_window_radio_pulses_custom.Active) currentPulseType = new PulseType("Custom");
+
+ extra_window_pulses_initialize(currentPulseType);
+ }
+
+ private void extra_window_pulses_initialize(PulseType myPulseType)
+ {
+ currentEventType = myPulseType;
+ changeTestImage(EventType.Types.PULSE.ToString(), myPulseType.Name,
myPulseType.ImageFileName);
+ bool hasOptions = false;
+
+ if(myPulseType.Name == "Custom") {
+ hasOptions = true;
+ extra_window_pulses_spinbutton_pulse_step.Value = extra_window_pulseStep;
+ extra_window_pulses_spinbutton_total_pulses.Value = extra_window_totalPulses;
+ setLabelContactsExerciseSelected(Catalog.GetString("Custom"));
+ } else
+ setLabelContactsExerciseSelected(Catalog.GetString("Free"));
+
+ extra_window_pulses_showNoOptions(hasOptions);
+ }
+
+ private void extra_window_pulses_showNoOptions(bool hasOptions) {
+ hbox_extra_window_pulses.Visible = hasOptions;
+ }
+
+
+ void on_extra_window_pulses_checkbutton_unlimited_clicked (object o, EventArgs args)
+ {
+ extra_window_pulses_hbox_total_pulses.Visible = !
extra_window_pulses_checkbutton_unlimited.Active;
+ }
+
+ void on_extra_window_pulses_spinbutton_pulse_step_changed (object o, EventArgs args)
+ {
+ if((double) extra_window_pulses_spinbutton_pulse_step.Value == 0)
+ extra_window_pulses_spinbutton_ppm.Value = 0;
+ else
+ extra_window_pulses_spinbutton_ppm.Value = 60 /
+ (double) extra_window_pulses_spinbutton_pulse_step.Value;
+ }
+
+ void on_extra_window_pulses_spinbutton_ppm_changed (object o, EventArgs args)
+ {
+ if((int) extra_window_pulses_spinbutton_ppm.Value == 0)
+ extra_window_pulses_spinbutton_pulse_step.Value = 0;
+ else
+ extra_window_pulses_spinbutton_pulse_step.Value = 60 /
+ (double) extra_window_pulses_spinbutton_ppm.Value;
+ }
+
+}
+
diff --git a/src/gui/pulse.cs b/src/gui/pulse.cs
index c98e6b96..7a864582 100644
--- a/src/gui/pulse.cs
+++ b/src/gui/pulse.cs
@@ -24,7 +24,6 @@ using Glade;
using System.Text; //StringBuilder
using System.Collections; //ArrayList
-using System.Threading;
using Mono.Unix;
@@ -115,81 +114,6 @@ public class EditPulseWindow : EditEventWindow
}
-//--------------------------------------------------------
-//---------------- pulse extra WIDGET --------------------
-//--------------------------------------------------------
-
-public partial class ChronoJumpWindow
-{
- [Widget] Gtk.RadioButton extra_window_radio_pulses_custom;
- [Widget] Gtk.RadioButton extra_window_radio_pulses_free;
-
- [Widget] Gtk.HBox hbox_extra_window_pulses;
- [Widget] Gtk.SpinButton extra_window_pulses_spinbutton_pulse_step;
- [Widget] Gtk.SpinButton extra_window_pulses_spinbutton_ppm;
- [Widget] Gtk.SpinButton extra_window_pulses_spinbutton_total_pulses;
- [Widget] Gtk.CheckButton extra_window_pulses_checkbutton_unlimited;
- [Widget] Gtk.HBox extra_window_pulses_hbox_total_pulses;
-
-
- double extra_window_pulseStep = 1.000;
- int extra_window_totalPulses = 10;
-
- private void on_extra_window_pulses_test_changed(object o, EventArgs args)
- {
- if(extra_window_radio_pulses_free.Active) currentPulseType = new PulseType("Free");
- else if (extra_window_radio_pulses_custom.Active) currentPulseType = new PulseType("Custom");
-
- extra_window_pulses_initialize(currentPulseType);
- }
-
- private void extra_window_pulses_initialize(PulseType myPulseType)
- {
- currentEventType = myPulseType;
- changeTestImage(EventType.Types.PULSE.ToString(), myPulseType.Name,
myPulseType.ImageFileName);
- bool hasOptions = false;
-
- if(myPulseType.Name == "Custom") {
- hasOptions = true;
- extra_window_pulses_spinbutton_pulse_step.Value = extra_window_pulseStep;
- extra_window_pulses_spinbutton_total_pulses.Value = extra_window_totalPulses;
- setLabelContactsExerciseSelected(Catalog.GetString("Custom"));
- } else
- setLabelContactsExerciseSelected(Catalog.GetString("Free"));
-
- extra_window_pulses_showNoOptions(hasOptions);
- }
-
- private void extra_window_pulses_showNoOptions(bool hasOptions) {
- hbox_extra_window_pulses.Visible = hasOptions;
- }
-
-
- void on_extra_window_pulses_checkbutton_unlimited_clicked (object o, EventArgs args)
- {
- extra_window_pulses_hbox_total_pulses.Visible = !
extra_window_pulses_checkbutton_unlimited.Active;
- }
-
- void on_extra_window_pulses_spinbutton_pulse_step_changed (object o, EventArgs args)
- {
- if((double) extra_window_pulses_spinbutton_pulse_step.Value == 0)
- extra_window_pulses_spinbutton_ppm.Value = 0;
- else
- extra_window_pulses_spinbutton_ppm.Value = 60 /
- (double) extra_window_pulses_spinbutton_pulse_step.Value;
- }
-
- void on_extra_window_pulses_spinbutton_ppm_changed (object o, EventArgs args)
- {
- if((int) extra_window_pulses_spinbutton_ppm.Value == 0)
- extra_window_pulses_spinbutton_pulse_step.Value = 0;
- else
- extra_window_pulses_spinbutton_pulse_step.Value = 60 /
- (double) extra_window_pulses_spinbutton_ppm.Value;
- }
-
-}
-
//--------------------------------------------------------
//---------------- Repair pulse WIDGET -------------------
//--------------------------------------------------------
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]