pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Samples are running again

pull/14/head
peterforstmeier 15 years ago
parent
765270af19
commit
f08cb9ad1e
6 changed files with 26 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      samples/SharpDevelopReports/src/ReportSamples.sln
  2. 2
      samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
  3. 10
      samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj
  4. 10
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs
  5. 5
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs
  6. 8
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs

12
samples/SharpDevelopReports/src/ReportSamples.sln
Unescape View File

@ -1,9 +1,11 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # Visual Studio 2010
# SharpDevelop 4.0.0.5930 # SharpDevelop 4.1.0.7014
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpReportSamples", "SharpReportSamples\SharpReportSamples.csproj", "{BB5D34DA-3561-48B1-894A-46765C2A18C1}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpReportSamples", "SharpReportSamples\SharpReportSamples.csproj", "{BB5D34DA-3561-48B1-894A-46765C2A18C1}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core", "..\..\..\src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj", "{4B2239FF-8FD6-431D-9D22-1B8049BA6917}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -20,6 +22,14 @@ Global
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Debug|x86.ActiveCfg = Debug|x86 {BB5D34DA-3561-48B1-894A-46765C2A18C1}.Debug|x86.ActiveCfg = Debug|x86
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.Build.0 = Release|x86 {BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.Build.0 = Release|x86
{BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.ActiveCfg = Release|x86 {BB5D34DA-3561-48B1-894A-46765C2A18C1}.Release|x86.ActiveCfg = Release|x86
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|x86.Build.0 = Debug|Any CPU
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Debug|x86.ActiveCfg = Debug|Any CPU
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.Build.0 = Release|Any CPU
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|x86.Build.0 = Release|Any CPU
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2
samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
Unescape View File

@ -291,7 +291,7 @@ namespace SharpReportSamples
ReportModel model = ReportEngine.LoadReportModel(fileName); ReportModel model = ReportEngine.LoadReportModel(fileName);
IDataManager dataManager = DataManager.CreateInstance(eLog.EventLog,model.ReportSettings); IDataManager dataManager = DataManager.CreateInstance(eLog.EventLog,model.ReportSettings);
this.previewControl1.SectionRendering += PushPrinting; // this.previewControl1.SectionRendering += PushPrinting;
this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e) this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)

10
samples/SharpDevelopReports/src/SharpReportSamples/SharpReportSamples.csproj
Unescape View File

@ -32,8 +32,8 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup> <ItemGroup>
<Reference Include="ICSharpCode.Reports.Core"> <Reference Include="Irony">
<HintPath>..\..\..\..\AddIns\AddIns\Misc\SharpDevelopReports\ICSharpCode.Reports.Core.dll</HintPath> <HintPath>..\..\..\..\src\AddIns\Misc\Reports\Irony\obj\Debug\Irony.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core"> <Reference Include="System.Core">
@ -71,4 +71,10 @@
<ItemGroup> <ItemGroup>
<Folder Include="Resources" /> <Folder Include="Resources" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\src\AddIns\Misc\Reports\ICSharpCode.Reports.Core\ICSharpCode.Reports.Core.csproj">
<Project>{4B2239FF-8FD6-431D-9D22-1B8049BA6917}</Project>
<Name>ICSharpCode.Reports.Core</Name>
</ProjectReference>
</ItemGroup>
</Project> </Project>

10
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs
Unescape View File

@ -78,7 +78,7 @@ namespace ICSharpCode.Reports.Core.Exporter
if (row == null) { if (row == null) {
throw new ArgumentException("row"); throw new ArgumentException("row");
} }
Console.WriteLine("\tFireRowRendering"); // Console.WriteLine("\tFireRowRendering");
RowRenderEventArgs rrea = new RowRenderEventArgs(row,currentNavigator.Current); RowRenderEventArgs rrea = new RowRenderEventArgs(row,currentNavigator.Current);
EventHelper.Raise<RowRenderEventArgs>(RowRendering,this,rrea); EventHelper.Raise<RowRenderEventArgs>(RowRendering,this,rrea);
} }
@ -86,7 +86,7 @@ namespace ICSharpCode.Reports.Core.Exporter
protected void FireGroupHeaderRendering (GroupHeader groupHeader) protected void FireGroupHeaderRendering (GroupHeader groupHeader)
{ {
Console.WriteLine("\tFireGroupHeaderRendering"); // Console.WriteLine("\tFireGroupHeaderRendering");
GroupHeaderEventArgs ghea = new GroupHeaderEventArgs(groupHeader); GroupHeaderEventArgs ghea = new GroupHeaderEventArgs(groupHeader);
EventHelper.Raise<GroupHeaderEventArgs>(GroupHeaderRendering,this,ghea); EventHelper.Raise<GroupHeaderEventArgs>(GroupHeaderRendering,this,ghea);
} }
@ -94,7 +94,7 @@ namespace ICSharpCode.Reports.Core.Exporter
protected void FireGroupFooterRendering (GroupFooter groupFooter) protected void FireGroupFooterRendering (GroupFooter groupFooter)
{ {
Console.WriteLine("\tFireGroupFooterRendering"); // Console.WriteLine("\tFireGroupFooterRendering");
GroupFooterEventArgs gfea = new GroupFooterEventArgs(groupFooter); GroupFooterEventArgs gfea = new GroupFooterEventArgs(groupFooter);
EventHelper.Raise<GroupFooterEventArgs>(GroupFooterRendering,this,gfea); EventHelper.Raise<GroupFooterEventArgs>(GroupFooterRendering,this,gfea);
} }
@ -240,7 +240,6 @@ namespace ICSharpCode.Reports.Core.Exporter
protected void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer) protected void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer)
{ {
Console.WriteLine("\tPrepareContainerForConverting");
FireSectionRendering(section); FireSectionRendering(section);
LayoutRow(simpleContainer); LayoutRow(simpleContainer);
} }
@ -248,7 +247,6 @@ namespace ICSharpCode.Reports.Core.Exporter
protected Point ConvertStandardRow(ExporterCollection mylist, ISimpleContainer simpleContainer) protected Point ConvertStandardRow(ExporterCollection mylist, ISimpleContainer simpleContainer)
{ {
Console.WriteLine("\tConvertStandardRow");
var rowSize = simpleContainer.Size; var rowSize = simpleContainer.Size;
Point curPos = ConvertContainer(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition); Point curPos = ConvertContainer(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition);
@ -274,8 +272,6 @@ namespace ICSharpCode.Reports.Core.Exporter
protected static void FillRow (ISimpleContainer row,IDataNavigator currentNavigator) protected static void FillRow (ISimpleContainer row,IDataNavigator currentNavigator)
{ {
Console.WriteLine("\tFillRow");
//DataNavigator.Fill(row.Items);
currentNavigator.Fill(row.Items); currentNavigator.Fill(row.Items);
} }

5
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs
Unescape View File

@ -96,7 +96,6 @@ namespace ICSharpCode.Reports.Core.Exporter
StandardPrinter.AdjustBackColor(simpleContainer,GlobalValues.DefaultBackColor); StandardPrinter.AdjustBackColor(simpleContainer,GlobalValues.DefaultBackColor);
do do
{ {
Console.WriteLine("");
section.Size = base.RestoreSectionSize; section.Size = base.RestoreSectionSize;
section.Items[0].Size = groupSize; section.Items[0].Size = groupSize;
section.Items[1].Size = childSize; section.Items[1].Size = childSize;
@ -121,16 +120,14 @@ namespace ICSharpCode.Reports.Core.Exporter
else else
{ {
// No Grouping at all, the first item in section.items is the DetailRow // No Grouping at all, the first item in section.items is the DetailRow
Console.WriteLine("");
Size containerSize = section.Items[0].Size; Size containerSize = section.Items[0].Size;
FillRow(simpleContainer,base.DataNavigator); FillRow(simpleContainer,base.DataNavigator);
base.PrepareContainerForConverting(section,simpleContainer); base.PrepareContainerForConverting(section,simpleContainer);
FireRowRendering(simpleContainer,base.DataNavigator); FireRowRendering(simpleContainer,base.DataNavigator);
base.CurrentPosition = ConvertStandardRow (exporterCollection,simpleContainer); base.CurrentPosition = ConvertStandardRow (exporterCollection,simpleContainer);
// base.FireRowRendering(simpleContainer,base.DataNavigator);
section.Size = base.RestoreSectionSize; section.Size = base.RestoreSectionSize;
section.Items[0].Size = containerSize; section.Items[0].Size = containerSize;
Console.WriteLine("");
} }
CheckForPageBreak (section,exporterCollection); CheckForPageBreak (section,exporterCollection);
ShouldDrawBorder (section,exporterCollection); ShouldDrawBorder (section,exporterCollection);

8
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs
Unescape View File

@ -38,7 +38,7 @@ namespace ICSharpCode.Reports.Core.Exporter
ExporterCollection mylist = base.Convert(parent,item); ExporterCollection mylist = base.Convert(parent,item);
this.table = (BaseTableItem)item ; this.table = (BaseTableItem)item ;
this.table.Parent = parent; this.table.Parent = parent;
this.table.DataNavigator = base.DataNavigator; // this.table.DataNavigator = base.DataNavigator;
return ConvertInternal(mylist); return ConvertInternal(mylist);
} }
@ -142,10 +142,9 @@ eportViewer - RowRendering :
simpleContainer = table.Items[1] as ISimpleContainer; simpleContainer = table.Items[1] as ISimpleContainer;
base.SaveSectionSize(section.Size); base.SaveSectionSize(section.Size);
containerSize = simpleContainer.Size; containerSize = simpleContainer.Size;
Console.WriteLine("datasection - NO grouping");
do { do {
Console.WriteLine("");
PrintHelper.AdjustSectionLocation(section); PrintHelper.AdjustSectionLocation(section);
CheckForPageBreak(section,simpleContainer,headerRow,exporterCollection); CheckForPageBreak(section,simpleContainer,headerRow,exporterCollection);
@ -156,11 +155,8 @@ eportViewer - RowRendering :
base.CurrentPosition = ConvertStandardRow (exporterCollection,simpleContainer); base.CurrentPosition = ConvertStandardRow (exporterCollection,simpleContainer);
simpleContainer.Size = containerSize; simpleContainer.Size = containerSize;
section.Size = base.RestoreSectionSize; section.Size = base.RestoreSectionSize;
Console.WriteLine("");
} }
while (base.DataNavigator.MoveNext()); while (base.DataNavigator.MoveNext());
Console.WriteLine("");
Console.WriteLine("END of datasection - NO grouping");
base.DataNavigator.Reset(); base.DataNavigator.Reset();
base.DataNavigator.MoveNext(); base.DataNavigator.MoveNext();
SectionBounds.ReportFooterRectangle = new Rectangle(SectionBounds.ReportFooterRectangle.Left, SectionBounds.ReportFooterRectangle = new Rectangle(SectionBounds.ReportFooterRectangle.Left,

Write Preview
Loading…
Cancel
Save