[chronojump] multichronopic done

[Xavier de Blas <xaviblas src gnome org>]

commit 28cd4aff141387e090cb0f0c1e3201766ac32377
Author: Xavier de Blas <xaviblas gmail com>
Date:   Sat Apr 2 00:43:02 2011 +0200

    multichronopic done

 glade/chronojump.glade        |    4 +++-
 src/execute/event.cs          |    3 +--
 src/execute/multiChronopic.cs |    7 ++++---
 src/gui/chronojump.cs         |   17 -----------------
 src/gui/eventExecute.cs       |   39 +++++++++++++++++++++------------------
 5 files changed, 29 insertions(+), 41 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 6ef3e8b..e1d6c3e 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -13807,7 +13807,7 @@ by you</property>
                       <widget class="GtkViewport" id="viewport_mode">
                         <property name="visible">True</property>
                         <property name="resize_mode">queue</property>
-                        <property name="hadjustment">0 0 738 73.799999999999997 664.20000000000005 738</property>
+                        <property name="hadjustment">0 0 769 76.900000000000006 692.10000000000002 769</property>
                         <property name="shadow_type">out</property>
                         <child>
                           <widget class="GtkHButtonBox" id="hbuttonbox2">
@@ -14127,6 +14127,7 @@ Chronopic</property>
                               <widget class="GtkNotebook" id="notebook_execute">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="show_tabs">False</property>
                                 <property name="show_border">False</property>
                                 <child>
                                   <widget class="GtkFrame" id="frame2">
@@ -15982,6 +15983,7 @@ Chronopic</property>
                                             <child>
                                               <widget class="GtkNotebook" id="notebook_options">
                                                 <property name="visible">True</property>
+                                                <property name="show_tabs">False</property>
                                                 <property name="show_border">False</property>
                                                 <child>
                                                   <widget class="GtkVBox" id="vbox11">
diff --git a/src/execute/event.cs b/src/execute/event.cs
index 6d30a2c..898eb0b 100644
--- a/src/execute/event.cs
+++ b/src/execute/event.cs
@@ -330,8 +330,7 @@ public class EventExecute
 	}
 	
 	private void runATouchPlatform() {
-		string message = Catalog.GetString("Always remember to touch platform at ending. If you don't do it, Chronojump will crash at next execution.") + "\n" + 
-			Catalog.GetString("At this version, this message doesn't quit.");
+		string message = Catalog.GetString("Always remember to touch platform at ending. If you don't do it, Chronojump will crash at next execution.");
 		egd.Textview_message.Buffer = UtilGtk.TextViewPrint(message);
 	}
 
diff --git a/src/execute/multiChronopic.cs b/src/execute/multiChronopic.cs
index 79b5cf8..c11fe1e 100644
--- a/src/execute/multiChronopic.cs
+++ b/src/execute/multiChronopic.cs
@@ -386,9 +386,9 @@ public class MultiChronopicExecute : EventExecute
 		bool isFirstIn = true;
 
 		syncStates syncing = syncStates.DONE;
-		if(type != Constants.RunAnalysisName || syncFirst) {
+		if(syncFirst) {
 			syncing = syncStates.NOTHING;
-			syncMessage = Catalog.GetString("Press Test button in all Chronopics simultaneously.");
+			syncMessage = Catalog.GetString("Press and mantain Test button in all Chronopics simultaneously.");
 			needShowSyncMessage = true;
 		}
 
@@ -467,7 +467,8 @@ public class MultiChronopicExecute : EventExecute
 						PrepareEventGraphMultiChronopicObject = new PrepareEventGraphMultiChronopic(
 								//timestamp/1000.0, 
 								cp1StartedIn, cp2StartedIn, cp3StartedIn, cp4StartedIn,
-								cp1InStr, cp1OutStr, cp2InStr, cp2OutStr, cp3InStr, cp3OutStr, cp4InStr, cp4OutStr);
+								cp1InStr, cp1OutStr, cp2InStr, cp2OutStr, 
+								cp3InStr, cp3OutStr, cp4InStr, cp4OutStr);
 						needUpdateGraphType = eventType.MULTICHRONOPIC;
 						needUpdateGraph = true;
 
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 0976ed2..86e95d0 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -3982,26 +3982,9 @@ Log.WriteLine("CCCCC");
 	}
 
 
-	/*
-	private void on_extra_window_spin_run_analysis_distance_changed (object o, EventArgs args) {
-		if(Util.IsNumber(extra_window_spin_run_analysis_distance.Text, false) && extra_window_spin_run_analysis_distance.Text != "0" &&
-				chronopicWin.NumConnected()>=2) {
-			button_run_analysis.Sensitive = true;
-		} else {
-			button_run_analysis.Sensitive = false;
-		}
-	}
-	*/
-
 	private void on_multi_chronopic_start_clicked (object o, EventArgs args) {
 		Log.WriteLine("multi chronopic accepted");
 		
-//		if(o == (object) button_multi_chronopic_start || o == (object) menuitem_multi_chronopic_start) 
-//			currentMultiChronopicType = new MultiChronopicType(Constants.MultiChronopicName);
-//		else if(o == (object) button_run_analysis || o == (object) menuitem_run_analysis)
-//			currentMultiChronopicType = new MultiChronopicType(Constants.RunAnalysisName);
-
-
 		bool syncAvailable = false;
 		if(currentMultiChronopicType.SyncAvailable && extra_window_check_multichronopic_sync.Active)
 			syncAvailable = true;
diff --git a/src/gui/eventExecute.cs b/src/gui/eventExecute.cs
index 66f8622..0a4a404 100644
--- a/src/gui/eventExecute.cs
+++ b/src/gui/eventExecute.cs
@@ -1546,9 +1546,9 @@ Log.WriteLine("Preparing reactive A");
 	}
 
 	int yCp1Out = 20;
-	int yCp2Out = 90;
-	int yCp3Out = 160;
-	int yCp4Out = 230;
+	int yCp2Out = 75;
+	int yCp3Out = 130;
+	int yCp4Out = 185;
 
 	//TODO: fix this method
 	private void paintMultiChronopic (Gtk.DrawingArea drawingarea, 
@@ -1579,12 +1579,14 @@ Log.WriteLine("Preparing reactive A");
 		Console.WriteLine("total time: {0}", timeTotal);
 
 
+		/*
 		//TODO: done this now because we come here with only 1 string filled and this does problems
 		if(timeTotal == 0) {
 			event_execute_alignment.SetSizeRequest(700, 300);
 			sizeChanged = true;
 			return;
 		}
+		*/
 
 		int ancho=drawingarea.Allocation.Width;
 
@@ -1795,21 +1797,6 @@ Log.WriteLine("Preparing reactive A");
 		event_execute_pixmap.DrawLayout (pen_gris, 20, yCp2Out -20, layout);
 	}
 
-	/*
-	public void event_execute_RunATouchPlatform() {
-		//new DialogMessage(Constants.MessageTypes.INFO, "Please, touch a platform now. (from gui/eventExecute.cs");
-		this.event_execute_label_message1.Text = "<b>" + "Always remember to touch platform at ending. If you don't do it, Chronojump will crash at next execution.\nAt this version, this message doesn't quit." + "</b>";
-		event_execute_label_message1.UseMarkup = true;
-	}
-	*/
-	/*
-	public void event_execute_RunANoStrides() {
-		//new DialogMessage(Constants.MessageTypes.WARNING, "This Run Analysis is not valid because there are no strides.");
-		this.event_execute_label_message2.Text = "<b>" + "This Run Analysis is not valid because there are no strides." + "</b>";
-		event_execute_label_message2.UseMarkup = true;
-	}
-	*/
-			
 	private void on_event_execute_update_graph_in_progress_clicked(object o, EventArgs args) {
 		switch (currentEventType.Type) {
 			case EventType.Types.JUMP:
@@ -1856,6 +1843,22 @@ Log.WriteLine("Preparing reactive A");
 							currentEventExecute.PrepareEventGraphPulseObject.lastTime,
 							currentEventExecute.PrepareEventGraphPulseObject.timesString);
 				break;
+			case EventType.Types.MULTICHRONOPIC:
+					Log.Write("update graph: MULTICHRONOPIC");
+					PrepareMultiChronopicGraph(
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp1StartedIn,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp2StartedIn,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp3StartedIn,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp4StartedIn,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp1InStr,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp1OutStr,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp2InStr,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp2OutStr, 
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp3InStr,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp3OutStr,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp4InStr,
+							currentEventExecute.PrepareEventGraphMultiChronopicObject.cp4OutStr);
+					break;
 		}
 
 	}