Merge pull request #74 from FastReports/sync_branch_636893680915912359

* sync 3/28/2019
FastReports · Mar 28, 2019 · da11368 · da11368
2 parents 9d8f7c2 + d243baa
commit da11368
Show file tree

Hide file tree

Showing 54 changed files with 965 additions and 227 deletions.
diff --git a/FastReport.Base/BandColumns.cs b/FastReport.Base/BandColumns.cs
@@ -23,7 +23,7 @@ public enum ColumnLayout
   /// <summary>
   /// This class holds the band columns settings. It is used in the <see cref="DataBand.Columns"/> property.
   /// </summary>
-  [TypeConverterAttribute("FastReport.TypeConverters.FRExpandableObjectConverter, FastReport")]
+  [TypeConverter(typeof(FastReport.TypeConverters.FRExpandableObjectConverter))]
   public class BandColumns
   {
     private int count;
@@ -54,7 +54,7 @@ public int Count
     /// The column width, in pixels.
     /// </summary>
     [DefaultValue(0f)]
-    [TypeConverterAttribute("FastReport.TypeConverters.UnitsConverter, FastReport")]
+    [TypeConverter("FastReport.TypeConverters.UnitsConverter, FastReport")]
     public float Width
     {
       get { return width; }

diff --git a/FastReport.Base/Barcode/Barcode2DBase.cs b/FastReport.Base/Barcode/Barcode2DBase.cs
@@ -40,7 +40,7 @@ internal virtual void Draw2DBarcode(IGraphicsRenderer g, float kx, float ky)
     {
     }
 
-    internal override void DrawBarcode(IGraphicsRenderer g, RectangleF displayRect)
+    public override void DrawBarcode(IGraphicsRenderer g, RectangleF displayRect)
     {
       float width = angle == 90 || angle == 270 ? displayRect.Height : displayRect.Width;
       float height = angle == 90 || angle == 270 ? displayRect.Width : displayRect.Height;

diff --git a/FastReport.Base/Barcode/BarcodeAztec.cs b/FastReport.Base/Barcode/BarcodeAztec.cs
@@ -51,16 +51,17 @@ internal override SizeF CalcBounds()
         internal override void Draw2DBarcode(IGraphicsRenderer g, float kx, float ky)
         {
             Brush light = Brushes.White;
-            Brush dark = new SolidBrush(Color);
+            Brush dark = new SolidBrush(Color);     
 
             for (int y = 0; y < matrix.Height; y++)
             {
                 for (int x = 0; x < matrix.Width; x++)
                 {
                     bool b = matrix.getRow(y, null)[x];
 
-                    Brush brush = b == true ? dark : light;
-                    g.FillRectangle(brush, x * PIXEL_SIZE * kx, y * PIXEL_SIZE * ky,
+                    Brush brush = /*b == true ?*/ dark /*: light*/;
+                    if (b == true)
+                        g.FillRectangle(brush, x * PIXEL_SIZE * kx, y * PIXEL_SIZE * ky,
                                                PIXEL_SIZE * kx,     PIXEL_SIZE * ky);
                 }
             }

diff --git a/FastReport.Base/Barcode/BarcodeBase.cs b/FastReport.Base/Barcode/BarcodeBase.cs
@@ -8,7 +8,7 @@ namespace FastReport.Barcode
     /// <summary>
     /// The base class for all barcodes.
     /// </summary>
-    [TypeConverter("FastReport.TypeConverters.BarcodeConverter, FastReport")]
+    [TypeConverter(typeof(FastReport.TypeConverters.BarcodeConverter))]
     public abstract class BarcodeBase
     {
         #region Fields
@@ -86,7 +86,7 @@ internal virtual string StripControlCodes(string data)
             return data;
         }
 
-        internal virtual void DrawBarcode(IGraphicsRenderer g, RectangleF displayRect)
+        public virtual void DrawBarcode(IGraphicsRenderer g, RectangleF displayRect)
         {
         }
         #endregion

diff --git a/FastReport.Base/Barcode/BarcodeDatamatrix.cs b/FastReport.Base/Barcode/BarcodeDatamatrix.cs
@@ -977,7 +977,7 @@ internal override void Draw2DBarcode(IGraphicsRenderer g, float kx, float ky)
       Brush light = Brushes.White;
       Brush dark = new SolidBrush(Color);
       int stride = (width + 7) / 8;
-      
+
       for (int k = 0; k < height; ++k)
       {
         int p = k * stride;
@@ -986,8 +986,9 @@ internal override void Draw2DBarcode(IGraphicsRenderer g, float kx, float ky)
           int b = image[p + (j / 8)] & 0xff;
           b <<= j % 8;
 
-          Brush brush = (b & 0x80) == 0 ? light : dark;
-          g.FillRectangle(brush, j * PixelSize * kx, k * PixelSize * ky,
+          Brush brush = /*(b & 0x80) == 0 ? light :*/ dark;
+          if ((b & 0x80) != 0)
+            g.FillRectangle(brush, j * PixelSize * kx, k * PixelSize * ky,
             PixelSize * kx, PixelSize * ky);
         }
       }

diff --git a/FastReport.Base/Barcode/BarcodeObject.cs b/FastReport.Base/Barcode/BarcodeObject.cs
@@ -338,7 +338,11 @@ private void DrawBarcode(FRPaintEventArgs e)
             }
         }
 
-        private void UpdateAutoSize()
+        #endregion
+
+        #region Public Methods
+
+        public void UpdateAutoSize()
         {
             SetBarcodeProperties();
             SizeF size = Barcode.CalcBounds();
@@ -360,9 +364,7 @@ private void UpdateAutoSize()
                 }
             }
         }
-        #endregion
 
-        #region Public Methods
         /// <inheritdoc/>
         public override void Assign(Base source)
         {

diff --git a/FastReport.Base/Barcode/BarcodePDF417.cs b/FastReport.Base/Barcode/BarcodePDF417.cs
@@ -1517,15 +1517,17 @@ internal override void Draw2DBarcode(IGraphicsRenderer g, float kx, float ky)
       Brush light = Brushes.White;
       Brush dark = new SolidBrush(Color);
       int stride = (bitColumns + 7) / 8;
+
       for (int k = 0; k < codeRows; ++k)
       {
         int p = k * stride;
         for (int j = 0; j < bitColumns; ++j)
         {
           int b = outBits[p + (j / 8)] & 0xff;
           b <<= j % 8;
-          Brush brush = (b & 0x80) == 0 ? light : dark;
-          g.FillRectangle(brush, j * PixelSize.Width * kx, k * PixelSize.Height * ky,
+          Brush brush = /*(b & 0x80) == 0 ? light :*/ dark;
+          if ((b & 0x80) != 0)
+            g.FillRectangle(brush, j * PixelSize.Width * kx, k * PixelSize.Height * ky,
             PixelSize.Width * kx, PixelSize.Height * ky);
         }
       }

diff --git a/FastReport.Base/Barcode/BarcodeQR.cs b/FastReport.Base/Barcode/BarcodeQR.cs
@@ -195,15 +195,14 @@ internal override void Draw2DBarcode(IGraphicsRenderer g, float kx, float ky)
       Brush light = Brushes.White;
       Brush dark = new SolidBrush(Color);
       GraphicsPath path = new GraphicsPath();
-      g.FillRectangle(light, 0, 0, matrix.Width * PixelSize * kx, matrix.Height * PixelSize * kx);
 
       for (int y = 0; y < matrix.Height; y++)
       {
         for (int x = 0; x < matrix.Width; x++)
         {
           if (matrix.get_Renamed(x, y) == 0)
           {
-            path.AddRectangle(new RectangleF(
+            g.PathAddRectangle(path, new RectangleF(
             x * PixelSize * kx,
             y * PixelSize * ky,
             PixelSize * kx,

diff --git a/FastReport.Base/Barcode/LinearBarcodeBase.cs b/FastReport.Base/Barcode/LinearBarcodeBase.cs
@@ -438,7 +438,7 @@ internal override SizeF CalcBounds()
             return new SizeF(drawArea.Width * 1.25f, 0);
         }
 
-        internal override void DrawBarcode(IGraphicsRenderer g, RectangleF displayRect)
+        public override void DrawBarcode(IGraphicsRenderer g, RectangleF displayRect)
         {
             float originalWidth = CalcBounds().Width / 1.25f;
             float width = angle == 90 || angle == 270 ? displayRect.Height : displayRect.Width;

diff --git a/FastReport.Base/Border.cs b/FastReport.Base/Border.cs
@@ -83,7 +83,7 @@ public enum BorderLines
   /// <summary>
   /// Represents a single border line.
   /// </summary>
-  [TypeConverterAttribute("FastReport.TypeConverters.FRExpandableObjectConverter, FastReport")]
+  [TypeConverter(typeof(FastReport.TypeConverters.FRExpandableObjectConverter))]
   public class BorderLine
   {
     #region Fields
@@ -259,8 +259,8 @@ internal BorderLine()
     /// To turn on and off the lines, use the <see cref="Lines"/> property. To set the same color, style or width
     /// for each line, use <see cref="Color"/>, <see cref="Style"/>, <see cref="Width"/> properties of the <b>Border</b>.
     /// </remarks>
-    [TypeConverterAttribute("FastReport.TypeConverters.FRExpandableObjectConverter, FastReport")]
-    [EditorAttribute("FastReport.TypeEditors.BorderEditor, FastReport", typeof(UITypeEditor))]
+    [TypeConverter(typeof(FastReport.TypeConverters.FRExpandableObjectConverter))]
+    [Editor("FastReport.TypeEditors.BorderEditor, FastReport", typeof(UITypeEditor))]
   public class Border
   {
     #region Fields

diff --git a/FastReport.Base/BreakableComponent.cs b/FastReport.Base/BreakableComponent.cs
@@ -33,8 +33,8 @@ public bool CanBreak
     /// text that not fit in this object.
     /// </summary>
     [Category("Behavior")]
-    [TypeConverterAttribute("FastReport.TypeConverters.ComponentRefConverter, FastReport")]
-    [EditorAttribute("FastReport.TypeEditors.BandComponentRefEditor, FastReport", typeof(UITypeEditor))]
+    [TypeConverter(typeof(FastReport.TypeConverters.ComponentRefConverter))]
+    [Editor("FastReport.TypeEditors.BandComponentRefEditor, FastReport", typeof(UITypeEditor))]
     public BreakableComponent BreakTo
     {
       get { return breakTo; }

diff --git a/FastReport.Base/CapSettings.cs b/FastReport.Base/CapSettings.cs
@@ -40,7 +40,7 @@ public enum CapStyle
   /// <summary>
   /// Specifies a start and end line caps.
   /// </summary>
-  [TypeConverterAttribute("FastReport.TypeConverters.FRExpandableObjectConverter, FastReport")]
+  [TypeConverter(typeof(FastReport.TypeConverters.FRExpandableObjectConverter))]
   public class CapSettings
   {
     private float width;

diff --git a/FastReport.Base/CellularTextObject.cs b/FastReport.Base/CellularTextObject.cs
@@ -36,7 +36,7 @@ public partial class CellularTextObject : TextObject
         /// automatically based on its font.
         /// </remarks>
         [Category("Appearance")]
-        [TypeConverterAttribute("FastReport.TypeConverters.UnitsConverter, FastReport")]
+        [TypeConverter("FastReport.TypeConverters.UnitsConverter, FastReport")]
         public float CellWidth
         {
             get { return cellWidth; }
@@ -51,7 +51,7 @@ public float CellWidth
         /// automatically based on its font.
         /// </remarks>
         [Category("Appearance")]
-        [TypeConverterAttribute("FastReport.TypeConverters.UnitsConverter, FastReport")]
+        [TypeConverter("FastReport.TypeConverters.UnitsConverter, FastReport")]
         public float CellHeight
         {
             get { return cellHeight; }
@@ -62,7 +62,7 @@ public float CellHeight
         /// Gets or sets the horizontal spacing between cells, in pixels.
         /// </summary>
         [Category("Appearance")]
-        [TypeConverterAttribute("FastReport.TypeConverters.UnitsConverter, FastReport")]
+        [TypeConverter("FastReport.TypeConverters.UnitsConverter, FastReport")]
         public float HorzSpacing
         {
             get { return horzSpacing; }
@@ -73,7 +73,7 @@ public float HorzSpacing
         /// Gets or sets the vertical spacing between cells, in pixels.
         /// </summary>
         [Category("Appearance")]
-        [TypeConverterAttribute("FastReport.TypeConverters.UnitsConverter, FastReport")]
+        [TypeConverter("FastReport.TypeConverters.UnitsConverter, FastReport")]
         public float VertSpacing
         {
             get { return vertSpacing; }
@@ -264,7 +264,7 @@ public override void Draw(FRPaintEventArgs e)
             }
         }
 
-        internal TableObject GetTable()
+        public TableObject GetTable()
         {
             return GetTable(false);
         }

diff --git a/FastReport.Base/Data/Column.cs b/FastReport.Base/Data/Column.cs
@@ -128,7 +128,7 @@ public PropertyDescriptor PropDescriptor
     /// <summary>
     /// Gets or sets the type of data supplied by this column.
     /// </summary>
-    [TypeConverter("FastReport.TypeConverters.DataTypeConverter, FastReport")]
+    [TypeConverter(typeof(FastReport.TypeConverters.DataTypeConverter))]
     [Category("Data")]
     [Editor("FastReport.TypeEditors.DataTypeEditor, FastReport", typeof(UITypeEditor))]
     public Type DataType

diff --git a/FastReport.Base/Data/CommandParameter.cs b/FastReport.Base/Data/CommandParameter.cs
@@ -25,7 +25,7 @@ private enum ParamValue { Uninitialized }
     /// <summary>
     /// Gets or sets the parameter's data type.
     /// </summary>
-    [TypeConverter("FastReport.TypeConverters.ParameterDataTypeConverter, FastReport")]
+    [TypeConverter(typeof(FastReport.TypeConverters.ParameterDataTypeConverter))]
     [Category("Data")]
     [Editor("FastReport.TypeEditors.ParameterDataTypeEditor, FastReport", typeof(UITypeEditor))]
     public int DataType

diff --git a/FastReport.Base/Data/CubeSourceBase.cs b/FastReport.Base/Data/CubeSourceBase.cs
@@ -9,8 +9,8 @@ namespace FastReport.Data
   /// <summary>
   /// Base class for all CubeSources such as <see cref="SliceCubeSource"/>.
   /// </summary>
-  [TypeConverter("FastReport.TypeConverters.CubeSourceConverter, FastReport")]
-  [EditorAttribute("FastReport.TypeEditors.CubeSourceEditor, FastReport", typeof(UITypeEditor))]
+  [TypeConverter(typeof(FastReport.TypeConverters.CubeSourceConverter))]
+  [Editor("FastReport.TypeEditors.CubeSourceEditor, FastReport", typeof(UITypeEditor))]
   public abstract class CubeSourceBase : DataComponentBase
   {
     #region Fields

diff --git a/FastReport.Base/Data/DataSourceBase.cs b/FastReport.Base/Data/DataSourceBase.cs
@@ -11,8 +11,8 @@ namespace FastReport.Data
   /// <summary>
   /// Base class for all datasources such as <see cref="TableDataSource"/>.
   /// </summary>
-  [TypeConverter("FastReport.TypeConverters.DataSourceConverter, FastReport")]
-  [EditorAttribute("FastReport.TypeEditors.DataSourceEditor, FastReport", typeof(UITypeEditor))]
+  [TypeConverter(typeof(FastReport.TypeConverters.DataSourceConverter))]
+  [Editor("FastReport.TypeEditors.DataSourceEditor, FastReport", typeof(UITypeEditor))]
   public abstract class DataSourceBase : Column
   {
     #region Fields

diff --git a/FastReport.Base/Data/Parameter.cs b/FastReport.Base/Data/Parameter.cs
@@ -53,7 +53,7 @@ public class Parameter : Base, IParent
     /// <summary>
     /// Gets or sets the type of parameter.
     /// </summary>
-    [TypeConverter("FastReport.TypeConverters.DataTypeConverter, FastReport")]
+    [TypeConverter(typeof(FastReport.TypeConverters.DataTypeConverter))]
     [Category("Data")]
     [Editor("FastReport.TypeEditors.DataTypeEditor, FastReport", typeof(UITypeEditor))]
     public Type DataType

diff --git a/FastReport.Base/Data/Relation.cs b/FastReport.Base/Data/Relation.cs
@@ -29,7 +29,7 @@ namespace FastReport.Data
   /// </code>
   /// </example>
   /// </remarks>
-  [TypeConverter("FastReport.TypeConverters.RelationConverter, FastReport")]
+  [TypeConverter(typeof(FastReport.TypeConverters.RelationConverter))]
   public partial class Relation : DataComponentBase
   {
     #region Fields

diff --git a/FastReport.Base/DataBand.cs b/FastReport.Base/DataBand.cs
@@ -271,7 +271,7 @@ public string ParentIdColumn
     /// </remarks>
     [DefaultValue(37.8f)]
     [Category("Hierarchy")]
-    [TypeConverterAttribute("FastReport.TypeConverters.UnitsConverter, FastReport")]
+    [TypeConverter("FastReport.TypeConverters.UnitsConverter, FastReport")]
     public float Indent
     {
       get { return indent; }

diff --git a/FastReport.Base/Export/ExportBase.cs b/FastReport.Base/Export/ExportBase.cs
@@ -449,8 +449,8 @@ internal void ExportPageNew(int pageNo)
             try
             {
                 page = ppage.StartGetPage(pageNo);
-        page.Width = ppage.PageSize.Width;
-        page.Height = ppage.PageSize.Height;
+                page.Width = ppage.PageSize.Width;
+                page.Height = ppage.PageSize.Height;
                 ExportPageBegin(page);
                 float topShift = 0;
                 foreach (Base obj in ppage.GetPageItems(page, false))

diff --git a/FastReport.Base/Export/ExportUtils.cs b/FastReport.Base/Export/ExportUtils.cs
@@ -53,7 +53,7 @@ public static float GetPageHeight(ReportPage page)
                 return page.PaperHeight;
         }
 
-        internal static string FloatToString(double value)
+        public static string FloatToString(double value)
         {
             NumberFormatInfo provider = new NumberFormatInfo();
             provider.NumberGroupSeparator = String.Empty;