From 8bfa98f8650558a35ee1ba242d4a24e5958c15c6 Mon Sep 17 00:00:00 2001 From: Fabien Bodard Date: Thu, 23 Jan 2014 10:32:48 +0000 Subject: [PATCH] [GB.REPORT] * BUG: The ReportBrush.Color function really return a ReportBrush class. git-svn-id: svn://localhost/gambas/trunk@6099 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- comp/src/gb.report/.project | 2 +- comp/src/gb.report/.src/ReportBrush.class | 1 + comp/src/gb.report/.src/Tests/Old/Report12.class | 3 +++ comp/src/gb.report/.src/Tests/Old/Report12.report | 1 + comp/src/gb.report/.src/Tests/OutputReport2.class | 2 +- comp/src/gb.report/.src/Tests/OutputReport2.report | 1 - 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/comp/src/gb.report/.project b/comp/src/gb.report/.project index dda6c445f..c08b18b59 100644 --- a/comp/src/gb.report/.project +++ b/comp/src/gb.report/.project @@ -1,7 +1,7 @@ # Gambas Project File 3.0 # Compiled with Gambas 3.5.90 Title=Report designer -Startup=Report9 +Startup=Report12 Icon=printer1.png Version=3.5.90 VersionFile=1 diff --git a/comp/src/gb.report/.src/ReportBrush.class b/comp/src/gb.report/.src/ReportBrush.class index 44dc7ea7a..38f19006b 100644 --- a/comp/src/gb.report/.src/ReportBrush.class +++ b/comp/src/gb.report/.src/ReportBrush.class @@ -181,6 +181,7 @@ Static Public Function Color(iColor As Integer) As ReportBrush hBrush._Color[0] = iColor hBrush._Type = 0 + Return hBrush End diff --git a/comp/src/gb.report/.src/Tests/Old/Report12.class b/comp/src/gb.report/.src/Tests/Old/Report12.class index 03247ed8a..f816f33e4 100644 --- a/comp/src/gb.report/.src/Tests/Old/Report12.class +++ b/comp/src/gb.report/.src/Tests/Old/Report12.class @@ -3,6 +3,9 @@ Public Sub _New() ReportHBox1.DataCount = 100 + ReportLabel1.BackGround = ReportBrush.Color(Color.Red) + ReportLabel1.Brush = ReportBrush.Color(Color.Yellow) + End diff --git a/comp/src/gb.report/.src/Tests/Old/Report12.report b/comp/src/gb.report/.src/Tests/Old/Report12.report index 7830390fb..5f402eed8 100644 --- a/comp/src/gb.report/.src/Tests/Old/Report12.report +++ b/comp/src/gb.report/.src/Tests/Old/Report12.report @@ -2,6 +2,7 @@ { Report Report #MoveScaled(0,0,64,64) + Spacing = "1mm" Index = 0 Text = ("") { ReportHBox1 ReportHBox diff --git a/comp/src/gb.report/.src/Tests/OutputReport2.class b/comp/src/gb.report/.src/Tests/OutputReport2.class index 8f15b6fd3..4142a133e 100644 --- a/comp/src/gb.report/.src/Tests/OutputReport2.class +++ b/comp/src/gb.report/.src/Tests/OutputReport2.class @@ -26,7 +26,7 @@ Public Sub _new() 'set the number of anchor rods to display in print out tables 'nanchorrows = Module1.RoundUpInt(FMain.cAnchorRods.Count / 2) - ReportHBox7.DataCount = 6 'nanchorrows + ReportHBox7.DataCount = 13 'nanchorrows 'set the number of report panels - one for each load combination result ReportPanel1.DataCount = 6 'FMain.AnalysisResults.Count diff --git a/comp/src/gb.report/.src/Tests/OutputReport2.report b/comp/src/gb.report/.src/Tests/OutputReport2.report index 43c526f19..f12422c81 100644 --- a/comp/src/gb.report/.src/Tests/OutputReport2.report +++ b/comp/src/gb.report/.src/Tests/OutputReport2.report @@ -6,7 +6,6 @@ Padding = ReportPadding["Top:20mm;Bottom:10mm;Left:20mm;Right:20mm"] Ignore = True AutoResize = True - Orientation = Printer.Landscape Index = 0 Text = ("") { ReportHBox1 ReportHBox