chronojump r463 - in trunk: . build/data glade images images/mini src src/gui src/stats src/stats/graphs

From: xaviblas svn gnome org
To: svn-commits-list gnome org
Subject: chronojump r463 - in trunk: . build/data glade images images/mini src src/gui src/stats src/stats/graphs
Date: Thu, 26 Feb 2009 15:49:11 +0000 (UTC)
Author: xaviblas
Date: Thu Feb 26 15:49:11 2009
New Revision: 463
URL: http://svn.gnome.org/viewvc/chronojump?rev=463&view=rev

Log:
Fixed bug in axis of intersession global graphs (axis creation bug when there are no sj, cmj or abk (left axis data))

Added info on gui help ports: MyPC can be system (equipo), also MyPC can be a link to real MyPC and have no properties

not modal windows to allow lusers (on all platforms) unsensitive app perception:
-DialogMessage: not modal, center always
-DialogHelpPorts: not modal

added evaluator device images
	
uploadSession with try/catch again



Added:
   trunk/images/infrared.png   (contents, props changed)
   trunk/images/mini/infrared.png   (contents, props changed)
   trunk/images/mini/modular_platform_with_chronopic.jpg   (contents, props changed)
   trunk/images/mini/plataforma_contactos.jpg   (contents, props changed)
   trunk/images/modular_platform_with_chronopic.jpg   (contents, props changed)
   trunk/images/plataforma_contactos.jpg   (contents, props changed)
Modified:
   trunk/Makefile
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/changelog.txt
   trunk/glade/chronojump.glade
   trunk/src/constants.cs
   trunk/src/gui/evaluator.cs
   trunk/src/gui/helpPorts.cs
   trunk/src/server.cs
   trunk/src/stats/graphs/global.cs
   trunk/src/stats/main.cs

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Feb 26 15:49:11 2009
@@ -75,6 +75,9 @@
 		-resource:images/chronopic1.jpg,chronopic1.jpg			-resource:images/mini/chronopic1.jpg,mini/chronopic1.jpg \
 		-resource:images/chronopic2.jpg,chronopic2.jpg			-resource:images/mini/chronopic2.jpg,mini/chronopic2.jpg \
 		-resource:images/chronopic3.jpg,chronopic3.jpg			-resource:images/mini/chronopic3.jpg,mini/chronopic3.jpg \
+		-resource:images/modular_platform_with_chronopic.jpg,modular_platform_with_chronopic.jpg			-resource:images/mini/modular_platform_with_chronopic.jpg,mini/modular_platform_with_chronopic.jpg \
+		-resource:images/plataforma_contactos.jpg,plataforma_contactos.jpg			-resource:images/mini/plataforma_contactos.jpg,mini/plataforma_contactos.jpg \
+		-resource:images/infrared.png,infrared.png			-resource:images/mini/infrared.png,mini/infrared.png \
 		-resource:images/stock_bell.png,stock_bell.png \
 		-resource:images/stock_bell_green.png,stock_bell_green.png \
 		-resource:images/stock_bell_red.png,stock_bell_red.png \

Modified: trunk/build/data/chronojump.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/chronojump_mini.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Thu Feb 26 15:49:11 2009
@@ -17,13 +17,26 @@
 if a ping to server gets more than 5s, then abort, specially on start. Can be
 a network problem
 
-
-
 upload SEvaluator and edit it and re-upload
 add chronopic and device code th SEvaluator and update the diagram
-Add device images
 
 
+26 feb 2009
+	Fixed bug in axis of intersession global graphs (axis creation bug
+	when there are no sj, cmj or abk (left axis data))
+
+	Added info on gui help ports: MyPC can be system (equipo), also MyPC
+	can be a link to real MyPC and have no properties
+
+	not modal windows to allow lusers (on all platforms) unsensitive app
+	perception:
+	-DialogMessage: not modal, center always
+	-DialogHelpPorts: not modal
+
+	added evaluator device images
+
+	uploadSession with try/catch again
+
 24 feb 2009
 	Copy database available from preferences window
 	evaluator code added device

Modified: trunk/glade/chronojump.glade
==============================================================================
--- trunk/glade/chronojump.glade	(original)
+++ trunk/glade/chronojump.glade	Thu Feb 26 15:49:11 2009
@@ -13480,7 +13480,7 @@
   <property name="title" translatable="yes">Chronopic port help</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
+  <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -13907,8 +13907,8 @@
   <property name="visible">True</property>
   <property name="title" translatable="yes">Message</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
+  <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -26875,7 +26875,7 @@
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
+		      <property name="active">True</property>
 		      <property name="inconsistent">False</property>
 		      <property name="draw_indicator">True</property>
 		      <signal name="toggled" handler="on_radio_cp_toggled" last_modification_time="Thu, 19 Feb 2009 15:47:11 GMT"/>
@@ -27248,7 +27248,7 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkImage" id="image_contact_circuit">
+			<widget class="GtkImage" id="image_contact_modular">
 			  <property name="visible">True</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -27313,16 +27313,16 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkButton" id="button_zoom_contact_circuit">
+			<widget class="GtkButton" id="button_zoom_contact_modular">
 			  <property name="visible">True</property>
 			  <property name="tooltip" translatable="yes">Expand image and show description</property>
 			  <property name="can_focus">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
-			  <signal name="clicked" handler="on_button_contact_circuit_zoom_clicked" last_modification_time="Tue, 24 Feb 2009 16:11:56 GMT"/>
+			  <signal name="clicked" handler="on_button_contact_modular_zoom_clicked" last_modification_time="Thu, 26 Feb 2009 15:40:59 GMT"/>
 
 			  <child>
-			    <widget class="GtkImage" id="image_zoom_contact_circuit">
+			    <widget class="GtkImage" id="image_zoom_contact_modular">
 			      <property name="visible">True</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0.5</property>
@@ -27422,7 +27422,7 @@
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
+			  <property name="active">True</property>
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
 			  <property name="group">radio_device_other</property>
@@ -27464,11 +27464,11 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkRadioButton" id="radio_contact_circuit">
+			<widget class="GtkRadioButton" id="radio_contact_modular">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes">Contact platform
-(circuit board)</property>
+(modular circuit board)</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>

Added: trunk/images/infrared.png
==============================================================================
Binary file. No diff available.

Added: trunk/images/mini/infrared.png
==============================================================================
Binary file. No diff available.

Added: trunk/images/mini/modular_platform_with_chronopic.jpg
==============================================================================
Binary file. No diff available.

Added: trunk/images/mini/plataforma_contactos.jpg
==============================================================================
Binary file. No diff available.

Added: trunk/images/modular_platform_with_chronopic.jpg
==============================================================================
Binary file. No diff available.

Added: trunk/images/plataforma_contactos.jpg
==============================================================================
Binary file. No diff available.

Modified: trunk/src/constants.cs
==============================================================================
--- trunk/src/constants.cs	(original)
+++ trunk/src/constants.cs	Thu Feb 26 15:49:11 2009
@@ -203,6 +203,9 @@
 	public static string FileNameChronopic1 = "chronopic1.jpg";
 	public static string FileNameChronopic2 = "chronopic2.jpg";
 	public static string FileNameChronopic3 = "chronopic3.jpg";
+	public static string FileNameContactPlatformSteel = "plataforma_contactos.jpg";
+	public static string FileNameContactPlatformModular = "modular_platform_with_chronopic.jpg";
+	public static string FileNameInfrared = "infrared.png";
 	
 	//30 colors defined
 	public static string [] Colors = {

Modified: trunk/src/gui/evaluator.cs
==============================================================================
--- trunk/src/gui/evaluator.cs	(original)
+++ trunk/src/gui/evaluator.cs	Thu Feb 26 15:49:11 2009
@@ -59,18 +59,18 @@
 	
 	//devices tab
 	[Widget] Gtk.RadioButton radio_contact_steel;
-	[Widget] Gtk.RadioButton radio_contact_circuit;
+	[Widget] Gtk.RadioButton radio_contact_modular;
 	[Widget] Gtk.RadioButton radio_infrared;
 	[Widget] Gtk.RadioButton radio_device_other;
 	[Widget] Gtk.Entry entry_device_other;
 	[Widget] Gtk.Image image_contact_steel;
-	[Widget] Gtk.Image image_contact_circuit;
+	[Widget] Gtk.Image image_contact_modular;
 	[Widget] Gtk.Image image_infrared;
 	[Widget] Gtk.Image image_zoom_contact_steel;
-	[Widget] Gtk.Image image_zoom_contact_circuit;
+	[Widget] Gtk.Image image_zoom_contact_modular;
 	[Widget] Gtk.Image image_zoom_infrared;
 	[Widget] Gtk.Button button_zoom_contact_steel;
-	[Widget] Gtk.Button button_zoom_contact_circuit;
+	[Widget] Gtk.Button button_zoom_contact_modular;
 	[Widget] Gtk.Button button_zoom_infrared;
 
 
@@ -134,12 +134,19 @@
 		pixbuf = new Pixbuf (null, Util.GetImagePath(true) + Constants.FileNameChronopic3);
 		image_cp3.Pixbuf = pixbuf;
 					
+		pixbuf = new Pixbuf (null, Util.GetImagePath(true) + Constants.FileNameContactPlatformSteel);
+		image_contact_steel.Pixbuf = pixbuf;
+		pixbuf = new Pixbuf (null, Util.GetImagePath(true) + Constants.FileNameContactPlatformModular);
+		image_contact_modular.Pixbuf = pixbuf;
+		pixbuf = new Pixbuf (null, Util.GetImagePath(true) + Constants.FileNameInfrared);
+		image_infrared.Pixbuf = pixbuf;
+					
 		pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameZoomInIcon);
 		image_zoom_cp1.Pixbuf = pixbuf;
 		image_zoom_cp2.Pixbuf = pixbuf;
 		image_zoom_cp3.Pixbuf = pixbuf;
 		image_zoom_contact_steel.Pixbuf = pixbuf;
-		image_zoom_contact_circuit.Pixbuf = pixbuf;
+		image_zoom_contact_modular.Pixbuf = pixbuf;
 		image_zoom_infrared.Pixbuf = pixbuf;
 		
 		cp_zoom_buttons_unsensitive();
@@ -189,8 +196,6 @@
 	}
 
 	private void on_combo_continents_changed(object o, EventArgs args) {
-		//Console.WriteLine("Changed");
-		
 		if(UtilGtk.ComboGetActive(combo_continents) == Catalog.GetString(Constants.ContinentUndefined)) {
 			countries [0] = Constants.CountryUndefinedID + ":" + Constants.CountryUndefined + ":" + Catalog.GetString(Constants.CountryUndefined);
 			countriesTranslated = new String[1];
@@ -251,7 +256,7 @@
 	
 	private void device_zoom_buttons_unsensitive() {
 		button_zoom_contact_steel.Sensitive = false;
-		button_zoom_contact_circuit.Sensitive = false;
+		button_zoom_contact_modular.Sensitive = false;
 		button_zoom_infrared.Sensitive = false;
 	}
 
@@ -264,8 +269,8 @@
 			entry_device_other.Sensitive = false;
 			if(radio_contact_steel.Active) 
 				button_zoom_contact_steel.Sensitive = true;
-			else if(radio_contact_circuit.Active) 
-				button_zoom_contact_circuit.Sensitive = true;
+			else if(radio_contact_modular.Active) 
+				button_zoom_contact_modular.Sensitive = true;
 			else if(radio_infrared.Active) 
 				button_zoom_infrared.Sensitive = true;
 		}
@@ -288,13 +293,13 @@
 		new DialogImageTest("Chronopic 3", Util.GetImagePath(false) + Constants.FileNameChronopic3);
 	}
 	private void on_button_contact_steel_zoom_clicked(object o, EventArgs args) {
-		//new DialogImageTest("Contact platform (tempered steel)", Util.GetImagePath(false) + Constants.FileNameChronopic1);
+		new DialogImageTest("Contact platform (tempered steel)", Util.GetImagePath(false) + Constants.FileNameContactPlatformSteel);
 	}
-	private void on_button_contact_circuit_zoom_clicked(object o, EventArgs args) {
-		//new DialogImageTest("Contact platform (circuit board)", Util.GetImagePath(false) + Constants.FileNameChronopic1);
+	private void on_button_contact_modular_zoom_clicked(object o, EventArgs args) {
+		new DialogImageTest("Contact platform (modular circuit board)", Util.GetImagePath(false) + Constants.FileNameContactPlatformModular);
 	}
 	private void on_button_infrared_zoom_clicked(object o, EventArgs args) {
-		//new DialogImageTest("Infrared", Util.GetImagePath(false) + Constants.FileNameChronopic1);
+		new DialogImageTest("Infrared", Util.GetImagePath(false) + Constants.FileNameInfrared);
 	}
 
 	void on_button_change_date_clicked (object o, EventArgs args)

Modified: trunk/src/gui/helpPorts.cs
==============================================================================
--- trunk/src/gui/helpPorts.cs	(original)
+++ trunk/src/gui/helpPorts.cs	Thu Feb 26 15:49:11 2009
@@ -88,6 +88,8 @@
 		new DialogMessage(Constants.MessageTypes.HELP,
 				Catalog.GetString("Check Chronopic port") + "\n\n" +
 				"1 " + Catalog.GetString("Click with the right button on <i>MyPC</i> icon at desktop or Start Menu.") + "\n" +
+				"  " + Catalog.GetString("Note <i>MyPC</i> can be called <i>System</i> in Windows Vista.") + "\n" +
+				"  " + Catalog.GetString("Note also, you maybe have a <i>MyPC</i> icon that has no <i>properties</i> because can be a link to the real <i>MyPC</i> icon, if you cannot see <i>Properties</i>, please use another MyPC icon.") + "\n" +
 				"2 " + Catalog.GetString("Select <i>properties</i> (last option).") +  "\n" +
 				"3 " + Catalog.GetString("Go to <i>hardware</i>.") +  "\n" +
 				"4 " + Catalog.GetString("Select <i>administrate dispositives</i>. It's first button.") +  "\n" +

Modified: trunk/src/server.cs
==============================================================================
--- trunk/src/server.cs	(original)
+++ trunk/src/server.cs	Thu Feb 26 15:49:11 2009
@@ -154,7 +154,7 @@
 	{
 		int evalSID = Convert.ToInt32(SqlitePreferences.Select("evaluatorServerID"));
 
-//		try {	
+		try {	
 			ChronojumpServer myServer = new ChronojumpServer();
 			Log.WriteLine(myServer.ConnectDatabase());
 		
@@ -484,12 +484,10 @@
 			myServer.UpdateSession(currentSession.ServerUniqueID, state); 
 
 			Log.WriteLine(myServer.DisConnectDatabase());
-			/*
 		} catch {
 			//other thread updates the gui:
 			serverSessionError = true;
 		}
-		*/
 	}
 	
 	

Modified: trunk/src/stats/graphs/global.cs
==============================================================================
--- trunk/src/stats/graphs/global.cs	(original)
+++ trunk/src/stats/graphs/global.cs	Thu Feb 26 15:49:11 2009
@@ -105,7 +105,8 @@
 			} else {
 				CurrentGraphData.LabelLeft = Catalog.GetString("TF") + "(s)";
 			}
-			CurrentGraphData.LabelRight = "";
+			//CurrentGraphData.LabelRight = "";
+			CurrentGraphData.LabelRight = Catalog.GetString("Index") + "(%)";
 		}
 	}
 

Modified: trunk/src/stats/main.cs
==============================================================================
--- trunk/src/stats/main.cs	(original)
+++ trunk/src/stats/main.cs	Thu Feb 26 15:49:11 2009
@@ -1216,12 +1216,22 @@
 			la.Label = graphData.LabelBottom;
 	
 		LinearAxis ly1 = new LinearAxis();
-		if(graphData.LabelLeft != "")
-			ly1 = createLinearAxis(graphData.LabelLeft, plot.YAxis1, graphData.IsLeftAxisInteger);
+		if(graphData.LabelLeft != "") {
+			try {
+				ly1 = createLinearAxis(graphData.LabelLeft, plot.YAxis1, graphData.IsLeftAxisInteger);
+			} catch {
+				//on stats global inter-session maybe cannot create axis because maybe there's no data in seconds like sj, cmj, abk
+			}
+		}
 		
 		LinearAxis ly2 = new LinearAxis();
-		if(graphData.LabelRight != "")
-			ly2 = createLinearAxis(graphData.LabelRight, plot.YAxis2, graphData.IsRightAxisInteger);
+		if(graphData.LabelRight != "") {
+			try {
+				ly2 = createLinearAxis(graphData.LabelRight, plot.YAxis2, graphData.IsRightAxisInteger);
+			} catch {
+				//on stats global inter-session maybe cannot create axis because maybe there's no data in % like dj indexes, ...
+			}
+		}
 	}
 
 	private LinearAxis createLinearAxis(string label, Axis myAxis, bool isInt) {
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]