[chronojump] Nicer Autodetect
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Nicer Autodetect
- Date: Sun, 5 Apr 2015 10:44:29 +0000 (UTC)
commit 8756c9a3bafe4d8f5394ebe74d0776986ebdcacb
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Apr 5 12:43:14 2015 +0200
Nicer Autodetect
glade/chronojump.glade | 135 ++++++++++++++++++++++++++++++++++
src/chronopicDialogAutoController.cs | 7 +-
src/gui/chronojump.cs | 19 +----
src/gui/chronopicAuto.cs | 5 +
4 files changed, 146 insertions(+), 20 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 9c3523c..bd7060c 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -6612,6 +6612,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -7474,6 +7477,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -8588,6 +8594,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -9343,6 +9352,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -18683,6 +18695,84 @@ Just select port and then close this window.</property>
</widget>
</child>
</widget>
+ <widget class="GtkDialog" id="dialog_chronopic_auto">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="type_hint">dialog</property>
+ <signal name="delete_event" handler="on_delete_event" swapped="no"/>
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <widget class="GtkButton" id="button_cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Autodetecting hardware ...</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkProgressBar" id="progressbar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
<widget class="GtkDialog" id="dialog_help_ports">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -19881,6 +19971,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -20544,6 +20637,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -21699,6 +21795,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -21911,6 +22010,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -31828,6 +31930,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -33871,6 +33991,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -34572,6 +34695,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37239,6 +37365,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -37566,6 +37695,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37908,6 +38040,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/chronopicDialogAutoController.cs b/src/chronopicDialogAutoController.cs
index cd50649..29500de 100644
--- a/src/chronopicDialogAutoController.cs
+++ b/src/chronopicDialogAutoController.cs
@@ -60,12 +60,12 @@ public class ChronopicDialogAutoController
private void detectEncoder()
{
/*
- * testing a fault in drivers
+ //testing a fault in drivers
int count = 0;
bool crash = true;
while(crash) {
count ++;
- if(count >= 1000) {
+ if(count >= 10000) {
LogB.Debug(" at detectEncoder\n ");
count = 0;
}
@@ -86,7 +86,8 @@ public class ChronopicDialogAutoController
if(cancel)
thread.Abort();
- FakeButtonDone.Click();
+ cp_dialog_auto.Done(); //close dialog window
+ FakeButtonDone.Click(); //send signal to gui/chronojump.cs to read Detected
LogB.ThreadEnded();
return false;
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 212c685..e22ceae 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -2884,22 +2884,6 @@ public partial class ChronoJumpWindow
ChronopicDialogAutoController cp_dialog_auto_c;
private void autoDetectChronopic(menuitem_modes m)
{
- /*
- ChronopicAutoDetect cad;
- if(m == menuitem_modes.POWER) {
- LogB.Information("Detecting encoder... ");
- cad = new ChronopicAutoDetect(ChronopicAutoDetect.ChronopicType.ENCODER);
-
- if(cad.Detected != "") {
- LogB.Information("Detected at port: " + cad.Detected);
- createChronopicWindow(true, cad.Detected);
- }
- else {
- LogB.Warning("Not detected.");
- createChronopicWindow(true, Util.GetDefaultPort());
- }
- } else {
- */
if(m == menuitem_modes.POWER)
{
cp_dialog_auto_c = new ChronopicDialogAutoController();
@@ -2914,7 +2898,6 @@ public partial class ChronoJumpWindow
LogB.Warning("Disabled until full chronopic connection is done on 4MHz Chronopics");
}
}
-
private void on_autoDetectChronopic_done(object o, EventArgs args)
{
cp_dialog_auto_c.FakeButtonDone.Clicked -= new EventHandler(on_autoDetectChronopic_done);
@@ -2923,9 +2906,11 @@ public partial class ChronoJumpWindow
if(str != null && str != "") {
LogB.Information("Detected at port: " + str);
+ createChronopicWindow(true, str);
}
else {
LogB.Information("Not detected.");
+ createChronopicWindow(true, Util.GetDefaultPort());
}
}
diff --git a/src/gui/chronopicAuto.cs b/src/gui/chronopicAuto.cs
index eb33b8d..7f42d4d 100644
--- a/src/gui/chronopicAuto.cs
+++ b/src/gui/chronopicAuto.cs
@@ -41,6 +41,11 @@ public class ChronopicDialogAuto
LogB.Information("ChronopicDialogAuto");
}
+ //when detection has ended
+ public void Done () {
+ dialog_chronopic_auto.Destroy ();
+ }
+
private void on_button_cancel_clicked (object o, EventArgs args) {
dialog_chronopic_auto.Destroy ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
