Changeset 701 for trunk/ab5.0/ablib/src/Classes

Timestamp:

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

Author:

イグトランス (egtra)

Message:

BrushとStringFormatを追加
(#241)

Location:

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

Files:

• Brush.ab (added)
• Font.ab (modified) (2 diffs)
• Graphics.ab (modified) (16 diffs)
• Image.ab (modified) (1 diff)
• Pen.ab (modified) (2 diffs)
• StringFormat.ab (added)
• misc.ab (modified) (1 diff)

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