Skip to content
This repository has been archived by the owner on Oct 16, 2020. It is now read-only.

Commit

Permalink
Rows can be used as StackPanel.Orientation=horizontal
Browse files Browse the repository at this point in the history
  • Loading branch information
@PeterForstmeier
PeterForstmeier committed Feb 28, 2011
1 parent 6c4afa9 commit 42bf8d4
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 27 deletions.
15 changes: 7 additions & 8 deletions src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
View file
Expand Up @@ -327,12 +327,6 @@
<Compile Include="Project\Exporter\ExportColumns\ExportText.cs" />
<Compile Include="Project\Exporter\ExportColumns\IExportColumnBuilder .cs" />
<Compile Include="Project\ReportViewer\PageNavigationEventArgs.cs" />
<Compile Include="Project\ReportViewer\ReportViewer.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Project\ReportViewer\ReportViewer.Designer.cs">
<DependentUpon>Project\ReportViewer.cs</DependentUpon>
</Compile>
<Compile Include="Project\Exporter\ExportColumns\ExportGraphic.cs" />
<Compile Include="Project\Exporter\Decorators\TextStyleDecorator.cs" />
<Compile Include="Project\Exporter\Decorators\GraphicStyleDecorator.cs" />
Expand All @@ -344,6 +338,12 @@
<Compile Include="Project\Exporter\ExportRenderer\BaseExportRenderer.cs" />
<Compile Include="Project\Exporter\ExportRenderer\PreviewRenderer.cs" />
<Compile Include="Project\Exporter\ExportRenderer\PrintRenderer.cs" />
<Compile Include="Project\ReportViewer\ReportViewer.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Project\ReportViewer\ReportViewer.designer.cs">
<DependentUpon>ReportViewer.cs</DependentUpon>
</Compile>
<Compile Include="Project\Xml\BaseItemLoader.cs" />
<Compile Include="Project\Xml\MycroParser.cs" />
<Compile Include="Project\Xml\MycroWriter.cs" />
Expand All @@ -354,8 +354,7 @@
<DependentUpon>ParameterDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Project\ReportViewer\ReportViewer.resx">
<DependentUpon>ReportViewer.Designer.cs</DependentUpon>
<Generator>ResXFileCodeGenerator</Generator>
<DependentUpon>ReportViewer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Project\Resources\CoreResource.resx" />
<None Include="Project\Expressions\SimpleExpressionEvaluator\Parser\SimpleExpressionLanguage.tpg" />
Expand Down
3 changes: 2 additions & 1 deletion src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs
View file
Expand Up @@ -106,7 +106,8 @@ private static Rectangle FindSurroundingRectangle (Graphics graphics,IEnumerable
canGrowShrinkCollection.First().Size.Width,
canGrowShrinkCollection.First().Size.Height);

foreach (BaseReportItem elemToLayout in canGrowShrinkCollection) {
foreach (BaseTextItem elemToLayout in canGrowShrinkCollection) {
Console.WriteLine("ELEMTEXT {0}",elemToLayout.Text);
Size textSize = MeasurementService.MeasureReportItem (graphics,elemToLayout);
elemToLayout.Size = new Size(elemToLayout.Size.Width,textSize.Height);
rec = Rectangle.Union(rec,new Rectangle(elemToLayout.Location,elemToLayout.Size));
Expand Down
41 changes: 30 additions & 11 deletions src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs
View file
Expand Up @@ -92,28 +92,49 @@ protected ExporterCollection ConvertSection (BaseSection section,int dataRow)

PrintHelper.AdjustParent((BaseSection)section,section.Items);

ExporterCollection list = new ExporterCollection();
var list = new ExporterCollection();

if (section.Items.Count > 0) {

Point offset = new Point(section.Location.X,section.SectionOffset);

section.Items.SortByLocation();

var offset = new Point(section.Location.X,section.SectionOffset);
IExpressionEvaluatorFacade f = EvaluationHelper.CreateEvaluator(this.SinglePage,this.SinglePage.IDataNavigator);

Rectangle desiredRectangle = LayoutHelper.FixSectionLayout(this.Graphics,section);

Setlayout( desiredRectangle, section);

foreach (BaseReportItem item in section.Items) {

ISimpleContainer container = item as ISimpleContainer;
ISimpleContainer simpleContainer = item as ISimpleContainer;

if (container != null) {

ExportContainer exportContainer = StandardPrinter.ConvertToContainer(container,offset);

ExporterCollection clist = StandardPrinter.ConvertPlainCollection(container.Items,exportContainer.StyleDecorator.Location);
if (simpleContainer != null)
{
foreach (BaseTextItem v in simpleContainer.Items)
{
string ss = f.Evaluate(v.Text);
v.Text = ss;
}
Size s = simpleContainer.Size;
var l = (ILayouter)ServiceContainer.GetService(typeof(ILayouter));
LayoutHelper.SetLayoutForRow(Graphics,l, simpleContainer);

ExportContainer exportContainer = StandardPrinter.ConvertToContainer(simpleContainer,offset);
s = simpleContainer.Size;

ExporterCollection clist = StandardPrinter.ConvertPlainCollection(simpleContainer.Items,exportContainer.StyleDecorator.Location);
exportContainer.Items.AddRange(clist);
list.Add(exportContainer);

offset = new Point(offset.X,offset.Y + simpleContainer.Size.Height + 4* GlobalValues.GapBetweenContainer);

foreach (ExportText VARIABLE in clist)
{
Console.WriteLine("{0} - {1}",VARIABLE.Text,VARIABLE.StyleDecorator.Location);
}
Console.WriteLine(".......");

} else {
list = StandardPrinter.ConvertPlainCollection(section.Items,offset);
}
Expand Down Expand Up @@ -273,8 +294,6 @@ protected void FirePageCreated(ExporterPage page)

protected Graphics Graphics {get; private set;}

//public ILayouter Layouter {get; private set;}

public IReportModel ReportModel {get;set;}

protected ExporterPage SinglePage {get;set;}
Expand Down
8 changes: 4 additions & 4 deletions .../Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs
View file
Expand Up @@ -82,9 +82,9 @@ private ExporterCollection ConvertDataRow (ISimpleContainer simpleContainer)
IDataNavigator childNavigator = base.DataNavigator.GetChildNavigator;

base.Evaluator.SinglePage.IDataNavigator = childNavigator;
Console.WriteLine("Header start {0}",base.CurrentPosition);
//Console.WriteLine("Header start {0}",base.CurrentPosition);
base.CurrentPosition = ConvertGroupHeader(exporterCollection,section,base.CurrentPosition);
Console.WriteLine("Header end {0}",base.CurrentPosition);
//Console.WriteLine("Header end {0}",base.CurrentPosition);
section.Size = base.RestoreSectionSize;
section.Items[0].Size = groupSize;
section.Items[1].Size = childSize;
Expand All @@ -95,7 +95,7 @@ private ExporterCollection ConvertDataRow (ISimpleContainer simpleContainer)
//Convert children
if (childNavigator != null) {
StandardPrinter.AdjustBackColor(simpleContainer,GlobalValues.DefaultBackColor);
Console.WriteLine("child start {0}",base.CurrentPosition);
//Console.WriteLine("child start {0}",base.CurrentPosition);
do
{
section.Size = base.RestoreSectionSize;
Expand All @@ -109,7 +109,7 @@ private ExporterCollection ConvertDataRow (ISimpleContainer simpleContainer)
CheckForPageBreak(section,exporterCollection);
}
while ( childNavigator.MoveNext());
Console.WriteLine("child end {0}",base.CurrentPosition);
//Console.WriteLine("child end {0}",base.CurrentPosition);
// GroupFooter
base.ConvertGroupFooter(section,exporterCollection);

Expand Down
3 changes: 3 additions & 0 deletions src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs
View file
Expand Up @@ -7,6 +7,7 @@
using ICSharpCode.Reports.Core.Events;
using ICSharpCode.Reports.Core.Globals;
using ICSharpCode.Reports.Core.Interfaces;
using ICSharpCode.Reports.Expressions.ReportingLanguage;

namespace ICSharpCode.Reports.Core.Exporter
{
Expand Down Expand Up @@ -77,6 +78,7 @@ protected override void BuildReportHeader ()
protected override void BuildPageHeader ()
{
base.ReportModel.PageHeader.SectionOffset = base.AdjustPageHeader();

ExporterCollection convertedList = base.ConvertSection (base.ReportModel.PageHeader,this.dataNavigator.CurrentRow);
base.SectionBounds.MeasurePageHeader(base.ReportModel.PageHeader);
base.SinglePage.Items.AddRange(convertedList);
Expand Down Expand Up @@ -186,6 +188,7 @@ private void WritePages ()
{
this.dataNavigator = this.dataManager.GetNavigator;
this.BuildNewPage();
this.SinglePage.IDataNavigator = this.dataNavigator;
this.dataNavigator.MoveNext();
BaseSection section = base.ReportModel.DetailSection;

Expand Down
2 changes: 2 additions & 0 deletions src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/EvaluationHelper.cs
View file
Expand Up @@ -31,9 +31,11 @@ public static IExpressionEvaluatorFacade CreateEvaluator (ISinglePage singlePag

throw new ArgumentNullException("singlePage");
}
/*
if (dataNavigator == null) {
throw new ArgumentNullException("dataNavigator");
}
* */
singlePage.IDataNavigator = dataNavigator;
IExpressionEvaluatorFacade evaluatorFacade = new ExpressionEvaluatorFacade(singlePage);
return evaluatorFacade;
Expand Down
6 changes: 3 additions & 3 deletions src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs
View file
Expand Up @@ -224,7 +224,7 @@ private void PushPrinting (object sender,SectionRenderEventArgs e)

private void GroupHeaderRendering (object sender, GroupHeaderEventArgs ghea)
{
Console.WriteLine("ReportViewer - GroupHeaderRendering :");
// Console.WriteLine("ReportViewer - GroupHeaderRendering :");
// BaseGroupedRow v = ghea.GroupHeader;
// v.BackColor = System.Drawing.Color.Red;
}
Expand All @@ -233,7 +233,7 @@ private void GroupHeaderRendering (object sender, GroupHeaderEventArgs ghea)
private void GroupFooterRendering ( object sender, GroupFooterEventArgs gfea)
{
// Console.WriteLine();
Console.WriteLine("ReportViewer - GroupFooterRendering :");
// Console.WriteLine("ReportViewer - GroupFooterRendering :");
// var v = gfea.GroupFooter;
// v.BackColor = System.Drawing.Color.Red;
// BaseTextItem i = (BaseTextItem)v.Items[0];
Expand All @@ -243,7 +243,7 @@ private void GroupFooterRendering ( object sender, GroupFooterEventArgs gfea)

private void RowRendering (object sender,RowRenderEventArgs rrea)
{
Console.WriteLine("ReportViewer - RowRendering :");
//Console.WriteLine("ReportViewer - RowRendering :");
}

#endregion
Expand Down

0 comments on commit 42bf8d4

Please sign in to comment.