From bc12a8d14fd559918c1ed97ed8f2cc5c8c9043c7 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Tue, 22 Sep 2015 14:29:39 +0200
Subject: [PATCH] debug, combo improvments

---
 GOLib.csproj                        |   4 +-
 src/GraphicObjects/Combobox.cs      | 157 ++++++++++++++++------------
 src/GraphicObjects/GraphicObject.cs |   4 +-
 src/GraphicObjects/ListBox.cs       |  21 ++--
 src/Interface.cs                    |  13 +++
 5 files changed, 119 insertions(+), 80 deletions(-)

diff --git a/GOLib.csproj b/GOLib.csproj
index 1c5d4263..97ec362e 100644
--- a/GOLib.csproj
+++ b/GOLib.csproj
@@ -24,6 +24,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ReleaseVersion>0.2</ReleaseVersion>
+    <SynchReleaseVersion>false</SynchReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
     <DebugSymbols>true</DebugSymbols>
@@ -34,17 +35,18 @@
     <BaseAddress>4194304</BaseAddress>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>__linux__</DefineConstants>
     <Optimize>True</Optimize>
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <DebugType>None</DebugType>
     <BaseAddress>4194304</BaseAddress>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DefineConstants>__linux__</DefineConstants>
     <OutputPath>bin\Release</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>TRACE;DEBUG;__linux__;DEBUG_LOAD_TIME</DefineConstants>
   </PropertyGroup>
   <!--  <PropertyGroup Condition=" '$(Platform)' == 'Linux_x86' ">
     <DefineConstants>__linux__</DefineConstants>
diff --git a/src/GraphicObjects/Combobox.cs b/src/GraphicObjects/Combobox.cs
index 5cbc875e..c9781f71 100644
--- a/src/GraphicObjects/Combobox.cs
+++ b/src/GraphicObjects/Combobox.cs
@@ -37,6 +37,8 @@ namespace go
 		string _itemTemplate;
 		string _overlayTemplate;
 
+		public event EventHandler Pop;
+		public event EventHandler Unpop;
 		public event EventHandler<SelectionChangeEventArgs> SelectedItemChanged;
 
 		#region implemented abstract members of TemplatedControl
@@ -87,20 +89,44 @@ namespace go
 		[XmlAttributeAttribute][DefaultValue(-1)]
 		public int SelectedIndex{
 			get { return _selectedIndex; }
-			set { _selectedIndex = value; }
+			set { 
+				//store value event if data is null, because in xml parsing selindex is always
+				//before data, so it's impossible without that trick to set a default index in goml
+				_selectedIndex = value;	
+	
+				if (data == null)					
+					return;
+	
+				if (_selectedIndex > data.Count - 1 || _selectedIndex < 0)
+					throw new Exception ("Combobox SelectedIndex out of range");
+
+
+				_selectedItem = data [_selectedIndex];
+				NotifyValueChanged ("SelectedIndex", SelectedIndex);
+				SelectedItemChanged.Raise (this, new SelectionChangeEventArgs(_selectedItem));
+
+				if (SelectedItem == null)
+					Text = "";
+				else
+					Text = _selectedItem.ToString ();
+			}
 		}
 		public object SelectedItem{
-			set { 				
+			set {
+				if (_selectedItem == value)
+					return;
+
 				_selectedItem = value;
+				_selectedIndex = data.IndexOf (_selectedItem);
+				NotifyValueChanged ("SelectedIndex", _selectedIndex);
+				SelectedItemChanged.Raise (this, new SelectionChangeEventArgs(_selectedItem));
 
-//				NotifyValueChanged ("SelectedItem", _selectedItem);
-//
 				if (SelectedItem == null)
 					Text = "";
 				else
 					Text = _selectedItem.ToString ();
 			}
-				
+
 			get { return _selectedItem; }
 		}
 		[XmlAttributeAttribute][DefaultValue(null)]
@@ -121,7 +147,7 @@ namespace go
 				if (data == null)
 					return;
 
-				#if DEBUG
+				#if DEBUG_LOAD_TIME
 				Stopwatch loadingTime = new Stopwatch ();
 				loadingTime.Start ();
 				#endif
@@ -141,7 +167,13 @@ namespace go
 
 				ms.Dispose ();
 
-				#if DEBUG
+				if (SelectedIndex < 0)
+					return;
+
+				//force raise of changes
+				SelectedIndex = SelectedIndex;
+
+				#if DEBUG_LOAD_TIME
 				loadingTime.Stop ();
 				Debug.WriteLine("Listbox Loading: {0} ticks \t, {1} ms",
 					loadingTime.ElapsedTicks,
@@ -149,27 +181,14 @@ namespace go
 				#endif
 			}
 		}
-
-		void itemClick(object sender, OpenTK.Input.MouseButtonEventArgs e){
-			object datasource = (sender as GraphicObject).DataSource;
-			SelectedItem = datasource;
-			SelectedItemChanged.Raise (sender, new SelectionChangeEventArgs(datasource));
-			IsPopped = false;
-
-			//Debug.WriteLine ((sender as GraphicObject).DataSource);
-		}
-
-		public event EventHandler Pop;
-		public event EventHandler Unpop;
-
 		public GraphicObject Overlay {
 			get { return _overlay; }
 			set { 
 				if (_overlay != null) {
 					_overlay.LayoutChanged -= _overlay_LayoutChanged;
-					_overlay.MouseLeave -= _content_MouseLeave;
+					_overlay.MouseLeave -= _overlay_MouseLeave;
 				}
-				
+
 				_overlay = value; 
 
 				if (_overlay == null)
@@ -177,15 +196,48 @@ namespace go
 
 				_overlay.Focusable = true;
 				_overlay.LayoutChanged += _overlay_LayoutChanged;
-				_overlay.MouseLeave += _content_MouseLeave;
+				_overlay.MouseLeave += _overlay_MouseLeave;
+			}
+		}
+		[XmlAttributeAttribute()][DefaultValue("Combobox")]
+		public string Text {
+			get { return text; } 
+			set {
+				if (text == value)
+					return;
+				text = value; 
+				NotifyValueChanged ("Text", text);
+			}
+		}        
+		[XmlAttributeAttribute()][DefaultValue(false)]
+		public bool IsPopped
+		{
+			get { return _isPopped; }
+			set
+			{
+				_isPopped = value;
+
+				if (_isPopped) {
+					onPop (this, null);
+					NotifyValueChanged ("SvgSub", "expanded");
+					return;
+				}
+
+				onUnpop (this, null);
+				NotifyValueChanged ("SvgSub", "collapsed");
 			}
 		}
 
-		void _content_MouseLeave (object sender, MouseMoveEventArgs e)
+		void itemClick(object sender, OpenTK.Input.MouseButtonEventArgs e){
+			object datasource = (sender as GraphicObject).DataSource;
+			SelectedItem = datasource;
+			IsPopped = false;
+			//Debug.WriteLine ((sender as GraphicObject).DataSource);
+		}
+		void _overlay_MouseLeave (object sender, MouseMoveEventArgs e)
 		{
 			IsPopped = false;
 		}
-
 		void _overlay_LayoutChanged (object sender, LayoutChangeEventArgs e)
 		{
 			ILayoutable tc = Overlay.Parent as ILayoutable;
@@ -210,19 +262,6 @@ namespace go
 					Overlay.Top = 0;
 			}
 		}
-		public override void ClearBinding ()
-		{
-			//ensure popped window is cleared
-			if (Overlay != null) {
-				if (Overlay.Parent != null) {
-					IGOLibHost tc = Overlay.Parent as IGOLibHost;
-					if (tc != null)
-						tc.DeleteWidget (Overlay);
-				}
-			}
-			base.ClearBinding ();
-
-		}
 
 		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true
 		public override bool Focusable
@@ -231,35 +270,6 @@ namespace go
 			set { base.Focusable = value; }
 		}
 
-		[XmlAttributeAttribute()][DefaultValue("Combobox")]
-		public string Text {
-			get { return text; } 
-			set {
-				if (text == value)
-					return;
-				text = value; 
-				NotifyValueChanged ("Text", text);
-			}
-		}        
-
-		[XmlAttributeAttribute()][DefaultValue(false)]
-        public bool IsPopped
-        {
-			get { return _isPopped; }
-            set
-            {
-				_isPopped = value;
-
-				if (_isPopped) {
-					onPop (this, null);
-					NotifyValueChanged ("SvgSub", "expanded");
-					return;
-				}
-
-				onUnpop (this, null);
-				NotifyValueChanged ("SvgSub", "collapsed");
-            }
-        }
 			
 		public virtual void onPop(object sender, EventArgs e)
 		{
@@ -289,5 +299,18 @@ namespace go
 			base.onMouseClick (sender, e);
 		}
 
+		public override void ClearBinding ()
+		{
+			//ensure popped window is cleared
+			if (Overlay != null) {
+				if (Overlay.Parent != null) {
+					IGOLibHost tc = Overlay.Parent as IGOLibHost;
+					if (tc != null)
+						tc.DeleteWidget (Overlay);
+				}
+			}
+			base.ClearBinding ();
+
+		}
 	}
 }
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 807ad95b..443fa653 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -801,7 +801,9 @@ namespace go
 							MemberName = attName
 						});
 					}
-				} else if (mi.MemberType == MemberTypes.Property) {
+					continue;
+				}
+				if (mi.MemberType == MemberTypes.Property) {
 					PropertyInfo pi = mi as PropertyInfo;
 
 					if (pi.GetSetMethod () == null)
diff --git a/src/GraphicObjects/ListBox.cs b/src/GraphicObjects/ListBox.cs
index 9b5ea73f..9435ffbe 100644
--- a/src/GraphicObjects/ListBox.cs
+++ b/src/GraphicObjects/ListBox.cs
@@ -27,7 +27,6 @@ using System.IO;
 using System.Diagnostics;
 using System.Xml;
 
-
 namespace go
 {
 	[DefaultTemplate("#go.Templates.Listbox.goml")]
@@ -85,10 +84,10 @@ namespace go
 				if (data == null)
 					return;
 
-//				#if DEBUG
-//				Stopwatch loadingTime = new Stopwatch ();
-//				loadingTime.Start ();
-//				#endif
+				#if DEBUG_LOAD_TIME
+				Stopwatch loadingTime = new Stopwatch ();
+				loadingTime.Start ();
+				#endif
 
 				MemoryStream ms = new MemoryStream ();
 				using (Stream stream = Interface.GetStreamFromPath (ItemTemplate))					
@@ -105,12 +104,12 @@ namespace go
 
 				ms.Dispose ();
 
-//				#if DEBUG
-//				loadingTime.Stop ();
-//				Debug.WriteLine("Listbox {2} Loading: {0} ticks \t, {1} ms",
-//					loadingTime.ElapsedTicks,
-//					loadingTime.ElapsedMilliseconds, this.ToString());
-//				#endif
+				#if DEBUG_LOAD_TIME
+				loadingTime.Stop ();
+				Debug.WriteLine("Listbox {2} Loading: {0} ticks \t, {1} ms",
+					loadingTime.ElapsedTicks,
+					loadingTime.ElapsedMilliseconds, this.ToString());
+				#endif
 			}
 		}
 
diff --git a/src/Interface.cs b/src/Interface.cs
index 551cd1d3..f988a17a 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -146,6 +146,11 @@ namespace go
 		}
 		public static GraphicObject Load(Stream stream, Type type, object hostClass = null, bool resolve = true)
 		{
+			#if DEBUG_LOAD_TIME
+			Stopwatch loadingTime = new Stopwatch ();
+			loadingTime.Start ();
+			#endif
+
 			GraphicObject result;
 
 
@@ -168,6 +173,14 @@ namespace go
 			if (resolve)
 				resolveGOML (hostClass);
 
+			#if DEBUG_LOAD_TIME
+			loadingTime.Stop ();
+			Debug.WriteLine("GOML Loading ({2}): {0} ticks \t, {1} ms",
+			loadingTime.ElapsedTicks,
+			loadingTime.ElapsedMilliseconds,
+			CurrentGOMLPath);
+			#endif
+
 			return result;
 		}
 
-- 
2.47.3