Display GroupHeader in Designer. Filter ReportItemCollection by ItemType

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@6388 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj

@@ -90,6 +90,7 @@
     <Compile Include="Project\DesignerBinding\InternalReportLoader.cs" />
     <Compile Include="Project\Designer\DataItemDesigner.cs" />
     <Compile Include="Project\Designer\DesignerHelper.cs" />
+    <Compile Include="Project\Designer\GroupeHeaderDesigner.cs" />
     <Compile Include="Project\Designer\ImageDesigner.cs" />
     <Compile Include="Project\Designer\LineDesigner.cs" />
     <Compile Include="Project\Designer\RowItemDesigner.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DataItemDesigner.cs

@@ -58,6 +58,7 @@ namespace ICSharpCode.Reports.Addin.Designer
 			}
 		}
 		
+		
 		#region Dispose
 		
 		protected override void Dispose(bool disposing)

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/GroupeHeaderDesigner.cs

@@ -0,0 +1,51 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 08.08.2010
+ * Time: 18:33
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+
+namespace ICSharpCode.Reports.Addin.Designer
+{
+	/// <summary>
+	/// Description of GroupeHeaderDesigner.
+	/// </summary>
+	public class GroupHeaderDesigner:DataItemDesigner
+	{
+		
+		private ISelectionService selectionService;
+		
+		public GroupHeaderDesigner()
+		{
+		}
+		
+		public override void Initialize(IComponent component)
+		{
+			base.Initialize(component);
+		}
+		
+		
+		
+		private void OnSelectionChanged(object sender, EventArgs e)
+		{
+			Control.Invalidate( );
+		}
+		
+		
+		private void GetService ()
+		{
+			selectionService = GetService(typeof(ISelectionService)) as ISelectionService;
+			if (selectionService != null)
+			{
+				selectionService.SelectionChanged += OnSelectionChanged;
+			}
+		}
+	
+	}
+}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseDataItem.cs

@@ -35,19 +35,6 @@ namespace ICSharpCode.Reports.Addin
 		}
 		
 		
-		private string CheckForNullValue() 
-		{
-			if (String.IsNullOrEmpty(this.dbValue)) {
-				if (String.IsNullOrEmpty(this.nullValue)) {
-					return GlobalValues.UnboundName;
-					
-				} else
-					return this.nullValue;
-			}
-			return this.dbValue;
-		}
-		
-		
 		
 		[System.ComponentModel.EditorBrowsableAttribute()]
 		protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs

@@ -7,16 +7,44 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
+using System.ComponentModel;
+using System.ComponentModel.Design;
+using System.Drawing;
+using System.Windows.Forms;
+using System.Windows.Forms.Design;
+
+using ICSharpCode.Reports.Core;
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
 
 namespace ICSharpCode.Reports.Addin
 {
 	/// <summary>
 	/// Description of BaseGroupItem.
 	/// </summary>
-	public class BaseGroupeItem:BaseDataItem
+	/// 
+	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupHeaderDesigner))]
+	public class BaseGroupItem:BaseDataItem
 	{
-		public BaseGroupeItem()
+		public BaseGroupItem()
+		{
+		}
+		
+		
+		[System.ComponentModel.EditorBrowsableAttribute()]
+		protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
+		{
+			if (String.IsNullOrEmpty(Text)) {
+				Text = ColumnName;
+			}
+			base.OnPaint(e);
+			this.Draw(e.Graphics);
+		}
+		
+		
+		
+		public override void Draw(Graphics graphics)
 		{
+			base.Draw (graphics);
 		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Toolbox/ToolboxProvider.cs

@@ -75,7 +75,7 @@ namespace ICSharpCode.Reports.Addin
 			
 			
 			//Group
-			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseGroupeItem));
+			tb = new ToolboxItem(typeof(ICSharpCode.Reports.Addin.BaseGroupItem));
 			tb.Bitmap = WinFormsResourceService.GetBitmap("Icons.16x16.SharpQuery.Table");
 //			tb.DisplayName = ResourceService.GetString("SharpReport.Toolbar.DataRow");
 			tb.DisplayName = "GroupHeader";

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@@ -86,7 +86,7 @@
     <Compile Include="Project\BaseClasses\SinglePage.cs" />
     <Compile Include="Project\BaseClasses\SectionBounds.cs" />
     <Compile Include="Project\BaseClasses\SortColumn.cs" />
-    <Compile Include="Project\BaseItems\BaseGroupeItem.cs" />
+    <Compile Include="Project\BaseItems\BaseGroupItem.cs" />
     <Compile Include="Project\BaseItems\BaseTextItem.cs" />
     <Compile Include="Project\BaseItems\BaseGraphicItem.cs" />
     <Compile Include="Project\BaseItems\BaseReportItem.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs

@@ -8,8 +8,8 @@
  */
 using System;
 using System.Drawing;
-using ICSharpCode.Reports.Core.Interfaces;
 using ICSharpCode.Reports.Core.Exporter;
+using ICSharpCode.Reports.Core.Interfaces;
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
 
 namespace ICSharpCode.Reports.Core.BaseClasses.Printing
@@ -166,7 +166,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 		}
 		
 		
-		public static  ExporterCollection ConvertPlainCollection (BaseReportItem parent,ReportItemCollection items,Point offset)
+		public static  ExporterCollection ConvertPlainCollection (ReportItemCollection items,Point offset)
 		{
 			if (items == null) {
 				throw new ArgumentNullException("items");
@@ -210,7 +210,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 		}
 		
 		
-		public static ExportContainer ConvertToContainer (BaseReportItem parent,ISimpleContainer item,Point offset) 
+		public static ExportContainer ConvertToContainer (ISimpleContainer item,Point offset) 
 		{
 			if (item == null) {
 				throw new ArgumentNullException("item");

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupItem.cs

@@ -13,9 +13,9 @@ namespace ICSharpCode.Reports.Core
 	/// <summary>
 	/// Description of BaseGroupeItem.
 	/// </summary>
-	public class BaseGroupeItem:BaseDataItem
+	public class BaseGroupItem:BaseDataItem
 	{
-		public BaseGroupeItem():base()
+		public BaseGroupItem():base()
 		{
 		}
 	}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs

@@ -189,7 +189,7 @@ namespace ICSharpCode.Reports.Core{
 				throw new ArgumentNullException("columnName");
 			}
 			
-			 return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
+			 return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true,CultureInfo.InvariantCulture));
 		}
 	}
 	
@@ -209,7 +209,7 @@ namespace ICSharpCode.Reports.Core{
 				throw new ArgumentNullException("columnName");
 			}
 			
-			return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
+			return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true,CultureInfo.InvariantCulture));
 		}
 	
 		
@@ -245,7 +245,7 @@ namespace ICSharpCode.Reports.Core{
 				throw new ArgumentNullException("columnName");
 			}
 			
-			return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
+			return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true,CultureInfo.InvariantCulture));
 		}
 	}
 	
@@ -264,7 +264,7 @@ namespace ICSharpCode.Reports.Core{
 				throw new ArgumentNullException("columnName");
 			}
 			
-			return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
+			return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true,CultureInfo.InvariantCulture));
 		}
 	
 		
@@ -301,7 +301,7 @@ namespace ICSharpCode.Reports.Core{
 				throw new ArgumentNullException("parameterName");
 			}
 			
-			return this.FirstOrDefault(x => 0 == String.Compare(x.ParameterName,parameterName,true));
+			return this.FirstOrDefault(x => 0 == String.Compare(x.ParameterName,parameterName,true,CultureInfo.InvariantCulture));
 		}
 		
 		
@@ -369,7 +369,7 @@ namespace ICSharpCode.Reports.Core{
 				throw new ArgumentNullException("columnName");
 			}
 			
-			return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true));
+			return this.FirstOrDefault(x => 0 == String.Compare(x.ColumnName,columnName,true,CultureInfo.InvariantCulture));
 		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/DataNavigator.cs

@@ -7,6 +7,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace ICSharpCode.Reports.Core
@@ -15,7 +16,6 @@ namespace ICSharpCode.Reports.Core
 	/// Description of DataNavigator.
 	/// </summary>
 	public class DataNavigator :IDataNavigator
-//	public class DataNavigator :IDataNavigator,IEnumerable
 	{
 		private IDataViewStrategy store;
 		
@@ -33,23 +33,21 @@ namespace ICSharpCode.Reports.Core
 		
 		#endregion
 		
-		private bool IsDataItem (BaseReportItem itm)
+		
+		private static Collection<BaseDataItem> ExtraxtDataItems (ReportItemCollection items)
 		{
-			var d = itm as BaseDataItem;
+			Collection<BaseDataItem> inheritedReportItems = new Collection<BaseDataItem>(items.OfType<BaseDataItem>().ToList());
-			return d != null;
+			return inheritedReportItems;
 		}
 		
-		
 		#region IDataNavigator implementation
 		
 		public void Fill (ReportItemCollection collection) {
 
-			foreach (BaseReportItem item in collection) {
+			Collection<BaseDataItem> filteredCollection  = ExtraxtDataItems(collection);
 			
-				if (IsDataItem (item)) {
+			foreach (BaseReportItem item in filteredCollection) {
-					this.store.Fill(item);
+				this.store.Fill(item);
-				}
-				
 			}
 		}
 		
@@ -107,33 +105,6 @@ namespace ICSharpCode.Reports.Core
 		#endregion
 		
 		
-		#region IEnumarable
-		/*
-		public IEnumerator RangeEnumerator(int start, int end)
-        {
-			if (start > end) {
-				throw new ArgumentException("start-end");
-			}
-			for (int i = start; i <= end; i++)
-            {
-            	IDataViewStrategy d = this.store as IDataViewStrategy;
-            	d.CurrentPosition = i;
-            	yield return this.Current;
-            }
-        }
-
-		
-		IEnumerator IEnumerable.GetEnumerator()
-		{
-			for (int i =0;i < this.Count;i++){
-				this.store.MoveNext();
-				yield return this.Current;
-			}
-		}
-		*/
-		#endregion
-		
-		
 		#region GroupedList
 		
 		public bool HasChildren
@@ -170,17 +141,16 @@ namespace ICSharpCode.Reports.Core
 			return ce.MoveNext();
 		}
 		
+		
 		public void FillChild (ReportItemCollection collection)
 		{
 			TableStrategy tableStrategy = store as TableStrategy;
+			var filteredCollection = ExtraxtDataItems(collection);
 			
-			foreach (BaseReportItem item in collection) {
+			foreach (BaseDataItem item in filteredCollection) {
-				if (IsDataItem(item)) {
+				CurrentItemsCollection currentItemsCollection = tableStrategy.FillDataRow(ce.Current.ListIndex);
-					BaseDataItem di = item as BaseDataItem;
+				CurrentItem s = currentItemsCollection.FirstOrDefault(x => x.ColumnName == ((BaseDataItem)item).ColumnName);
-					CurrentItemsCollection currentItemsCollection = tableStrategy.FillDataRow(ce.Current.ListIndex);
+				item.DBValue = s.Value.ToString();
-					CurrentItem s = currentItemsCollection.FirstOrDefault(x => x.ColumnName == ((BaseDataItem)item).ColumnName);
-					di.DBValue = s.Value.ToString();
-				}
 			}
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs

@@ -113,11 +113,11 @@ namespace ICSharpCode.Reports.Core.Exporter
 					
 					if (container != null) {
 
-						ExportContainer exportContainer = StandardPrinter.ConvertToContainer(section,container,offset);
+						ExportContainer exportContainer = StandardPrinter.ConvertToContainer(container,offset);
 			          
 			          StandardPrinter.AdjustBackColor (container);
 						
-						ExporterCollection clist = StandardPrinter.ConvertPlainCollection(item,container.Items,offset);
+						ExporterCollection clist = StandardPrinter.ConvertPlainCollection(container.Items,offset);
 						
 						exportContainer.Items.AddRange(clist);
 						list.Add(exportContainer);
@@ -131,7 +131,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 							section.Size = new Size(section.Size.Width,desiredRectangle.Size.Height);
 						}
 						
-						list = StandardPrinter.ConvertPlainCollection(section,section.Items,offset);
+						list = StandardPrinter.ConvertPlainCollection(section.Items,offset);
 					}
 				}
 			}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs

@@ -82,12 +82,10 @@ namespace ICSharpCode.Reports.Core.Exporter
 
 			if (exportLineBuilder != null) {
 
-				ExportContainer lineItem = StandardPrinter.ConvertToContainer(row.Parent,row,offset);
+				ExportContainer lineItem = StandardPrinter.ConvertToContainer(row,offset);
-				
-				BaseReportItem baseReportItem = row as BaseReportItem;
 				
 				StandardPrinter.AdjustBackColor(row);
-				ExporterCollection list = StandardPrinter.ConvertPlainCollection(row as BaseReportItem,row.Items,offset);
+				ExporterCollection list = StandardPrinter.ConvertPlainCollection(row.Items,offset);
 					
 				lineItem.Items.AddRange(list);
 				
@@ -170,7 +168,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		
 	
-		protected Point BaseConvert(ExporterCollection myList,ISimpleContainer container,int leftPos,Point curPos)
+		protected static Point BaseConvert(ExporterCollection myList,ISimpleContainer container,int leftPos,Point curPos)
 		{
 			ExporterCollection ml = BaseConverter.ConvertItems (container, curPos);		
 			myList.AddRange(ml);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs

@@ -8,7 +8,9 @@
  */
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Drawing;
+using System.Linq;
 
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Interfaces;
@@ -49,7 +51,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (PrintHelper.IsTextOnlyRow(simpleContainer)) {
 				ExporterCollection myList = new ExporterCollection();
 
-				base.BaseConvert (myList,simpleContainer,parent.Location.X,
+				BaseConverter.BaseConvert (myList,simpleContainer,parent.Location.X,
 				                  new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y));
 				
 				return myList;
@@ -74,24 +76,26 @@ namespace ICSharpCode.Reports.Core.Exporter
 				
 				Color color = ((BaseReportItem)simpleContainer).BackColor;
 				
-				// GroupeHeader
+				// Grouping Header
 				
 				if (base.DataNavigator.HasChildren)
 				{
 					TestDecorateElement(simpleContainer);
 				}
 			
+//				Collection<BaseGroupItem> inheritedReportItems = new Collection<BaseGroupItem>(simpleContainer.Items.OfType<BaseGroupItem>().ToList());
+				
 				base.FillRow(simpleContainer);
 				
 				PrepareContainerForConverting(simpleContainer);
 
 				base.FireSectionRendering(section);
 				StandardPrinter.EvaluateRow(base.Evaluator,mylist);
-				currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
+				currentPosition = BaseConverter.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
 				
-				AfterConverting (mylist,section);
+				AfterConverting (section);
 				
-			// Grouping items ----------------------
+			// Grouping Items ----------------------
 			
 				if (base.DataNavigator.HasChildren) {
 					
@@ -107,9 +111,9 @@ namespace ICSharpCode.Reports.Core.Exporter
 						
 						StandardPrinter.EvaluateRow(base.Evaluator,mylist);
 						
-						currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
+						currentPosition = BaseConverter.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
 
-						AfterConverting (mylist,section);
+						AfterConverting (section);
 					}
 					while ( base.DataNavigator.ChildMoveNext());
 				}
@@ -139,7 +143,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 	
 		
 		
-		private void AfterConverting (ExporterCollection mylist,BaseSection section)
+		private void AfterConverting (BaseSection section)
 		{
 			section.Items[0].Size = base.RestoreSize;
 			section.SectionOffset += section.Size.Height + 3 * GlobalValues.GapBetweenContainer;
@@ -154,7 +158,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			return retval;
 		}
 		
-		private void ShouldDrawBorder (BaseSection section,ExporterCollection list)
+		private static void ShouldDrawBorder (BaseSection section,ExporterCollection list)
 		{
 			if (section.DrawBorder == true) {
 				BaseRectangleItem br = BasePager.CreateDebugItem (section);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/TableConverter.cs

@@ -72,7 +72,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				
 					if (PrintHelper.IsTextOnlyRow(simpleContainer) ) {
 						headerContainer = simpleContainer;
-						currentPosition = base.BaseConvert(mylist,headerContainer,defaultLeftPos,currentPosition);
+						currentPosition = BaseConverter.BaseConvert(mylist,headerContainer,defaultLeftPos,currentPosition);
 					}
 					
 					else 
@@ -94,12 +94,12 @@ namespace ICSharpCode.Reports.Core.Exporter
 								base.FirePageFull(mylist);
 								mylist.Clear();
 
-								currentPosition = base.BaseConvert(mylist,headerContainer,
+								currentPosition = BaseConverter.BaseConvert(mylist,headerContainer,
 								                                     defaultLeftPos,
 								                                     base.SectionBounds.ReportHeaderRectangle.Location);
 							}
 							
-							currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
+							currentPosition = BaseConverter.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
 							
 							simpleContainer.Size = base.RestoreSize;
 						}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/old_GroupedRowConverter.cs

@@ -49,7 +49,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (PrintHelper.IsTextOnlyRow(simpleContainer)) {
 				ExporterCollection myList = new ExporterCollection();
 
-				base.BaseConvert (myList,simpleContainer,parent.Location.X,
+				BaseConverter.BaseConvert (myList,simpleContainer,parent.Location.X,
 				                  new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y));
 				
 				
@@ -83,7 +83,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				
 				base.FireSectionRendering(section);
 				
-				currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
+				currentPosition = BaseConverter.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
 				
 				StandardPrinter.EvaluateRow(base.Evaluator,mylist);