Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions FastReport.Base/Import/StimulSoft/StimulSoftImport.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public partial class StimulSoftImport : ImportBase
private XmlNode reportNode;
private PageUnits unitType;
private float leftOffset;
private Stack<GroupHeaderBand> groupHeaderStack = new Stack<GroupHeaderBand>();
#endregion // Fields

#region Constructors
Expand Down Expand Up @@ -687,6 +688,8 @@ private void LoadPage(XmlNode node)
page.Columns.Width += UnitsConverter.ConvertFloat(node["ColumnGaps"].InnerText) * UnitsConverter.GetPixelsInUnit(unitType) / Units.Millimeters;

page.Tag = node["Guid"].InnerText;

groupHeaderStack.Clear();

LoadBands(node, page);
LoadChildBands(node, page);
Expand Down Expand Up @@ -999,6 +1002,7 @@ private int GetRowSpan(List<int> arr, int columnCount)

private void LoadChildBands(XmlNode node, ReportPage page)
{
groupHeaderStack.Clear();
foreach (XmlNode item in SortNodeByTop(node))
{
switch (RemovePrefix(item.Attributes["type"].Value))
Expand Down Expand Up @@ -1028,16 +1032,27 @@ private void LoadChildBands(XmlNode node, ReportPage page)
case "GroupHeaderBand":
{
GroupHeaderBand band = ComponentsFactory.CreateGroupHeaderBand(page);
band.Data = GetParentDataBand(ParseRectangleF(item["ClientRectangle"].InnerText), page);
band.Condition = item["Condition"].InnerText;

band.Condition = item["Condition"] != null ? item["Condition"].InnerText : "";
LoadBandBase(band, item);

band.Data = GetParentDataBand(ParseRectangleF(node["ClientRectangle"].InnerText), page)
?? page.AllObjects.OfType<DataBand>().LastOrDefault();

if (groupHeaderStack.Count > 0)
{
GroupHeaderBand outer = groupHeaderStack.Peek();
outer.Data = null;
outer.NestedGroup = band;
}
groupHeaderStack.Push(band);
break;
}
case "GroupFooterBand":
{
BandBase band = ComponentsFactory.CreateGroupFooterBand(GetParentGroupHeaderBand(ParseRectangleF(item["ClientRectangle"].InnerText), page));
LoadBandBase(band, item);
GroupHeaderBand parent = GetParentGroupHeaderBand(ParseRectangleF(item["ClientRectangle"].InnerText), page)
?? (groupHeaderStack.Count > 0 ? groupHeaderStack.Pop() : null);
BandBase band = ComponentsFactory.CreateGroupFooterBand(parent);
this.LoadBandBase(band, item);
break;
}
case "ChildBand":
Expand Down