Changeset 701 for trunk

Timestamp:

Apr 2, 2009, 5:27:22 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

BrushとStringFormatを追加
(#241)

Location:

trunk/ab5.0/ablib

Files:

• TestCase/UI_Sample/step32_AnalogWatch_Gdiplus.ab (modified) (5 diffs)
• src/Classes/System/Drawing/Brush.ab (added)
• src/Classes/System/Drawing/Font.ab (modified) (2 diffs)
• src/Classes/System/Drawing/Graphics.ab (modified) (16 diffs)
• src/Classes/System/Drawing/Image.ab (modified) (1 diff)
• src/Classes/System/Drawing/Pen.ab (modified) (2 diffs)
• src/Classes/System/Drawing/StringFormat.ab (added)
• src/Classes/System/Drawing/misc.ab (modified) (1 diff)
• src/GdiPlusFlat.ab (modified) (3 diffs)

trunk/ab5.0/ablib/TestCase/UI_Sample/step32_AnalogWatch_Gdiplus.ab

@@ -13 +13 @@
 #require <Classes/System/Drawing/FontFamily.ab>
 #require <Classes/System/Drawing/Pen.ab>
+#require <Classes/System/Drawing/Brush.ab>
+#require <Classes/System/Drawing/StringFormat.ab>
+#require <Classes/System/Drawing/Image.ab>
 #require <Classes/System/Drawing/Drawing2D/misc.ab>
 #require <Classes/System/Drawing/Drawing2D/Matrix.ab>
@@ -36 +39 @@
 Imports ActiveBasic.Math
 Imports System
+Imports System.Drawing
+Imports System.Drawing.Drawing2D
 
 #resource "UI_Sample.rc"
@@ -76 +81 @@
 
     Sub OnDestroy(sender As Object, e As EventArgs)
-'       GdiplusShutdown(gdipToken)
+        GdiplusShutdown(gdipToken)
     End Sub
 
@@ -96 +101 @@
 
     Sub OnPaint_(sender As Object, e As PaintDCArgs)
-        Imports System.Drawing
-
         Dim pos As PointF
 
@@ -136 +139 @@
         g.DrawLine(pen, CenterPos, pos)
         pen.Dispose()
+
+        Dim pt1 = [0, 0] As Point
+        Dim pt2 As Point
+        pt2.X = rc.right
+        pt2.Y = rc.bottom
+        Dim br = New LinearGradientBrush(pt1, pt2, &haa00ff40 As Color, &h66ffcc00 As Color) 'New SolidBrush(&h8080ff00)
+        br.GammaCorrection = True
+        Dim f = New Font("Verdana", 20.0)
+        Dim s = "Step32. Analog whach" As String
+        g.RotateTransform(25)
+        g.DrawString(s, f, br, 10.0, 10.0)
+        f.Dispose()
+        br.Dispose()
+
         g.Dispose()
     End Sub

trunk/ab5.0/ablib/src/Classes/System/Drawing/Font.ab

@@ -283 +283 @@
         nativeFont = 0
         Dim family = Nothing As FontFamily
-        Dim nativeFamily = family.NativeFamily
+        Dim nativeFamily As *GpFontFamily
 
         Try
             family = New FontFamily(familyName, fontCollection)
+            nativeFamily = family.NativeFamily
         Catch e As Exception
             nativeFamily = FontFamily.GenericSansSerif().NativeFamily
@@ -292 +293 @@
 
         Try
-            SetStatus(GdipCreateFont(nativeFamily, emSize, style, unit, nativeFont))
+            SetStatus(GdipCreateFont(nativeFamily, emSize, style, unit As Long, nativeFont))
         Catch e As Exception
             nativeFamily = FontFamily.GenericSansSerif().NativeFamily

trunk/ab5.0/ablib/src/Classes/System/Drawing/Graphics.ab

@@ -4 +4 @@
 Namespace Drawing
 
-Class Brush
-Public
-    nativeBrush As *GpBrush
-End Class
-Class StringFormat
-Public
-    nativeFormat As *GpStringFormat 
-End Class
-Class Image
-Public
-    nativeImage As *GpImage
-End Class
 Class ImageAttributes
 Public
@@ -29 +17 @@
 Class GraphicsPath
 Public
+    Sub GraphicsPath(native As *GpPath)
+        nativePath = native
+    End Sub
+    Function NativePath() As *GpPath
+    End Function
     nativePath As *GpPath
 End Class
@@ -508 +501 @@
 
     Sub FillRectangle(brush As Brush, x As Single, y As Single, width As Single, height As Single)
-        SetStatus(GdipFillRectangle(nativeGraphics, brush.nativeBrush, x, y, width, height))
+        SetStatus(GdipFillRectangle(nativeGraphics, brush.NativeBrush, x, y, width, height))
     End Sub
 
     Sub FillRectangles(brush As Brush, rects As *RectangleF, count As Long)
-        SetStatus(GdipFillRectangles(nativeGraphics,brush.nativeBrush,rects, count))
+        SetStatus(GdipFillRectangles(nativeGraphics,brush.NativeBrush,rects, count))
     End Sub
 
@@ -520 +513 @@
 
     Sub FillRectangle(brush As Brush, x As Long, y As Long, width As Long, height As Long)
-        SetStatus(GdipFillRectangleI(nativeGraphics, brush.nativeBrush, x, y, width, height))
+        SetStatus(GdipFillRectangleI(nativeGraphics, brush.NativeBrush, x, y, width, height))
     End Sub
 
     Sub FillRectangles(brush As Brush, rects As *Rectangle, count As Long)
-        SetStatus(GdipFillRectanglesI(nativeGraphics, brush.nativeBrush, rects, count))
+        SetStatus(GdipFillRectanglesI(nativeGraphics, brush.NativeBrush, rects, count))
     End Sub
 
@@ -532 +525 @@
 
     Sub FillPolygon(brush As Brush, points As *PointF, count As Long, fillMode As Drawing2D.FillMode)
-        SetStatus(GdipFillPolygon(nativeGraphics, brush.nativeBrush, points, count, fillMode))
+        SetStatus(GdipFillPolygon(nativeGraphics, brush.NativeBrush, points, count, fillMode))
     End Sub
 
@@ -540 +533 @@
 
     Sub FillPolygon(brush As Brush, points As *Point, count As Long, fillMode As Drawing2D.FillMode)
-        SetStatus(GdipFillPolygonI(nativeGraphics, brush.nativeBrush, points, count, fillMode))
+        SetStatus(GdipFillPolygonI(nativeGraphics, brush.NativeBrush, points, count, fillMode))
     End Sub
 
@@ -548 +541 @@
 
     Sub FillEllipse(brush As Brush, x As Single, y As Single, width As Single, height As Single)
-        SetStatus(GdipFillEllipse(nativeGraphics, brush.nativeBrush, x, y, width, height))
+        SetStatus(GdipFillEllipse(nativeGraphics, brush.NativeBrush, x, y, width, height))
     End Sub
 
@@ -556 +549 @@
 
     Sub FillEllipse(brush As Brush, x As Long, y As Long, width As Long, height As Long)
-        SetStatus(GdipFillEllipseI(nativeGraphics, brush.nativeBrush, x, y, width, height))
+        SetStatus(GdipFillEllipseI(nativeGraphics, brush.NativeBrush, x, y, width, height))
     End Sub
 
@@ -564 +557 @@
 
     Sub FillPie(brush As Brush, x As Single, y As Single, width As Single, height As Single, startAngle As Single, sweepAngle As Single)
-        SetStatus(GdipFillPie(nativeGraphics, brush.nativeBrush, x, y, width, height, startAngle, sweepAngle))
+        SetStatus(GdipFillPie(nativeGraphics, brush.NativeBrush, x, y, width, height, startAngle, sweepAngle))
     End Sub
 
@@ -572 +565 @@
 
     Sub FillPie(brush As Brush, x As Long, y As Long, width As Long, height As Long, startAngle As Single, sweepAngle As Single)
-        SetStatus(GdipFillPieI(nativeGraphics, brush.nativeBrush, x, y, width, height, startAngle, sweepAngle))
+        SetStatus(GdipFillPieI(nativeGraphics, brush.NativeBrush, x, y, width, height, startAngle, sweepAngle))
     End Sub
 
@@ -579 +572 @@
             Throw New ArgumentNullException("brush or path or both")
         End If
-        SetStatus(GdipFillPath(nativeGraphics, brush.nativeBrush, path.nativePath))
+        SetStatus(GdipFillPath(nativeGraphics, brush.NativeBrush, path.nativePath))
     End Sub
 
     Sub FillClosedCurve(brush As Brush, points As *PointF, count As Long)
-        SetStatus(GdipFillClosedCurve(nativeGraphics, brush.nativeBrush, points, count))
+        SetStatus(GdipFillClosedCurve(nativeGraphics, brush.NativeBrush, points, count))
     End Sub
 
     Sub FillClosedCurve(brush As Brush, points As *PointF, count As Long, fillMode As Drawing2D.FillMode)
-        SetStatus(GdipFillClosedCurve2(nativeGraphics, brush.nativeBrush, points, count, 0.5, fillMode))
+        SetStatus(GdipFillClosedCurve2(nativeGraphics, brush.NativeBrush, points, count, 0.5, fillMode))
     End Sub
 
     Sub FillClosedCurve(brush As Brush, points As *PointF, count As Long, fillMode As Drawing2D.FillMode, tension As Single)
-        SetStatus(GdipFillClosedCurve2(nativeGraphics, brush.nativeBrush, points, count, tension, fillMode))
+        SetStatus(GdipFillClosedCurve2(nativeGraphics, brush.NativeBrush, points, count, tension, fillMode))
     End Sub
 
     Sub FillClosedCurve(brush As Brush, points As *Point, count As Long)
-        SetStatus(GdipFillClosedCurveI(nativeGraphics, brush.nativeBrush, points, count))
+        SetStatus(GdipFillClosedCurveI(nativeGraphics, brush.NativeBrush, points, count))
     End Sub
 
     Sub FillClosedCurve(brush As Brush, points As *Point, count As Long, fillMode As Drawing2D.FillMode)
-        SetStatus(GdipFillClosedCurve2I(nativeGraphics, brush.nativeBrush, points, count, 0.5, fillMode))
+        SetStatus(GdipFillClosedCurve2I(nativeGraphics, brush.NativeBrush, points, count, 0.5, fillMode))
     End Sub
 
     Sub FillClosedCurve(brush As Brush, points As *Point, count As Long, fillMode As Drawing2D.FillMode, tension As Single)
-        SetStatus(GdipFillClosedCurve2I(nativeGraphics, brush.nativeBrush, points, count, tension, fillMode))
+        SetStatus(GdipFillClosedCurve2I(nativeGraphics, brush.NativeBrush, points, count, tension, fillMode))
     End Sub
 
     Sub FillRegion(brush As Brush, region As Region)
-        SetStatus(GdipFillRegion(nativeGraphics, brush.nativeBrush, region.nativeRegion))
+        SetStatus(GdipFillRegion(nativeGraphics, brush.NativeBrush, region.nativeRegion))
     End Sub
 
@@ -629 +622 @@
     Sub DrawString(str As PCWSTR, length As Long, font As Font, brush As Brush, ByRef layoutRect As RectangleF, stringFormat = Nothing As StringFormat)
         Dim nativeFont = getNativeFont(font)
-        Dim nativeFormat = getNativeStringFormat(stringFormat)
+        Dim nativeFormat = GetNativeStringFormat(stringFormat)
         Dim nativeBrush = getNativeBrush(brush)
         SetStatus(GdipDrawString(nativeGraphics, str, length, nativeFont, layoutRect, nativeFormat, nativeBrush))
@@ -739 +732 @@
     Function measureString(str As PCWSTR, length As Long, font As Font, ByRef layoutRect As RectangleF, stringFormat As StringFormat, codepointsFitted As *Long, linesFilled As *Long) As SizeF
         Dim nativeFont = getNativeFont(font)
-        Dim nativeFormat = getNativeStringFormat(stringFormat)
+        Dim nativeFormat = GetNativeStringFormat(stringFormat)
         Dim boundingBox As RectangleF
         SetStatus(GdipMeasureString(nativeGraphics, str, length, nativeFont, layoutRect, nativeFormat, boundingBox, codepointsFitted, linesFilled))
@@ -759 +752 @@
         End If
         Dim count As Long
-        SetStatus(GdipGetStringFormatMeasurableCharacterRangeCount(stringFormat.nativeFormat, count))
+        SetStatus(GdipGetStringFormatMeasurableCharacterRangeCount(stringFormat.NativeFormat, count))
         Dim nativeRegions As **GpRegion 'ここで = GC_mallocとすると、エラーになる。
         nativeRegions = GC_malloc(count * SizeOf(*GpRegion))
@@ -771 +764 @@
         Next
         Dim nativeFont = getNativeFont(font)
-        SetStatus(GdipMeasureCharacterRanges(nativeGraphics, str, length, nativeFont, layoutRect, stringFormat.nativeFormat, count, nativeRegions))
+        SetStatus(GdipMeasureCharacterRanges(nativeGraphics, str, length, nativeFont, layoutRect, stringFormat.NativeFormat, count, nativeRegions))
     End Function
 
@@ -1224 +1217 @@
     End Function
 
-    Static Function getNativeStringFormat(sf As StringFormat) As *GpStringFormat
-        If ActiveBasic.IsNothing(sf) Then
-            getNativeStringFormat = 0
-        Else
-            getNativeStringFormat = sf.nativeFormat
-        End If
-    End Function
-
     Static Function getNativeBrush(br As Brush) As *GpBrush
         If ActiveBasic.IsNothing(br) Then
             getNativeBrush = 0
         Else
-            getNativeBrush = br.nativeBrush
+            getNativeBrush = br.NativeBrush
         End If
     End Function

trunk/ab5.0/ablib/src/Classes/System/Drawing/Image.ab

@@ -6 +6 @@
 Class Image
 Public
+    Sub Image(native As *GpImage)
+        nativeImage = native
+    End Sub
+
     Function NativeImage() As *GpImage
         Return nativeImage
     End Function
-Private
+'Private
     nativeImage As *GpImage
 End Class

trunk/ab5.0/ablib/src/Classes/System/Drawing/Pen.ab

@@ -27 +27 @@
             Throw New ArgumentNullException("brush")
         End If
-        SetStatus(GdipCreatePen2(brush.nativeBrush, width, 0 /*GraphicsUnit.World As GpUnit*/, nativePen))
+        SetStatus(GdipCreatePen2(brush.NativeBrush, width, 0 /*GraphicsUnit.World As GpUnit*/, nativePen))
     End Sub
 
@@ -268 +268 @@
             getNativeBrush = 0
         Else
-            getNativeBrush = br.nativeBrush
+            getNativeBrush = br.NativeBrush
         End If
     End Function

trunk/ab5.0/ablib/src/Classes/System/Drawing/misc.ab

@@ -27 +27 @@
 
 Enum GraphicsUnit
-    World       ' 0
-    Display     ' 1
-    Pixel       ' 2
-    Point       ' 3
-    Inch        ' 4
-    Document    ' 5
-    Millimeter  ' 6
+    World = 0
+    Display = 1
+    Pixel = 2
+    Point = 3
+    Inch = 4
+    Document = 5
+    Millimeter = 6
 End Enum
 

trunk/ab5.0/ablib/src/GdiPlusFlat.ab

@@ -152 +152 @@
 Declare Function GdipCloneBrush Lib "gdiplus.dll" (ByVal brush As *GpBrush, ByRef cloneBrush As *GpBrush) As GpStatus
 Declare Function GdipDeleteBrush Lib "gdiplus.dll" (ByVal brush As *GpBrush) As GpStatus
-Declare Function GdipGetBrushType Lib "gdiplus.dll" (ByVal brush As *GpBrush, ByRef brushType As *GpBrushType) As GpStatus
+Declare Function GdipGetBrushType Lib "gdiplus.dll" (ByVal brush As *GpBrush, ByRef brushType As GpBrushType) As GpStatus
 
 ' HatchBrush APIs
@@ -188 +188 @@
 Declare Function GdipCreateLineBrushFromRectI Lib "gdiplus.dll" (ByRef rect As GpRect, ByVal color1 As ARGB, ByVal color2 As ARGB, ByVal mode As Long /*LinearGradientMode*/, ByVal wrapMode As GpWrapMode, ByRef lineGradient As *GpLineGradient) As GpStatus
 Declare Function GdipCreateLineBrushFromRectWithAngle Lib "gdiplus.dll" (ByRef rect As GpRectF, ByVal color1 As ARGB, ByVal color2 As ARGB, ByVal angle As Single, ByVal isAngleScalable As BOOL, ByVal wrapMode As GpWrapMode, ByRef lineGradient As *GpLineGradient) As GpStatus
-Declare Function GdipCreateLineBrushFromRectWithAngleI Lib "gdiplus.dll" (ByRef rect As GpRect, ByVal color1 As ARGB, ByVal color2 As ARGB, ByVal angle As Single, ByVal isAngleScalable As BOOL, ByRef lineGradient As *GpLineGradient) As GpStatus
+Declare Function GdipCreateLineBrushFromRectWithAngleI Lib "gdiplus.dll" (ByRef rect As GpRect, ByVal color1 As ARGB, ByVal color2 As ARGB, ByVal angle As Single, ByVal isAngleScalable As BOOL, ByVal wrapMode As GpWrapMode, ByRef lineGradient As *GpLineGradient) As GpStatus
 Declare Function GdipSetLineColors Lib "gdiplus.dll" (ByVal brush As *GpLineGradient, ByVal color1 As ARGB, ByVal color2 As ARGB) As GpStatus
 Declare Function GdipGetLineColors Lib "gdiplus.dll" (ByVal brush As *GpLineGradient, ByVal colors As *ARGB) As GpStatus
@@ -223 +223 @@
 Declare Function GdipGetPathGradientPath Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByVal path As *GpPath) As GpStatus
 Declare Function GdipSetPathGradientPath Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByVal path As *GpPath) As GpStatus
-Declare Function GdipGetPathGradientCenterPoint Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByVal points As *GpPointF) As GpStatus
-Declare Function GdipGetPathGradientCenterPointI Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByVal points As *GpPoint) As GpStatus
-Declare Function GdipSetPathGradientCenterPoint Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByVal points As *GpPointF) As GpStatus
-Declare Function GdipSetPathGradientCenterPointI Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByVal points As *GpPoint) As GpStatus
+Declare Function GdipGetPathGradientCenterPoint Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByRef points As GpPointF) As GpStatus
+Declare Function GdipGetPathGradientCenterPointI Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByRef points As GpPoint) As GpStatus
+Declare Function GdipSetPathGradientCenterPoint Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByRef points As GpPointF) As GpStatus
+Declare Function GdipSetPathGradientCenterPointI Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByRef points As GpPoint) As GpStatus
 Declare Function GdipGetPathGradientRect Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByRef rect As GpRectF) As GpStatus
 Declare Function GdipGetPathGradientRectI Lib "gdiplus.dll" (ByVal brush As *GpPathGradient, ByRef rect As GpRect) As GpStatus