swingme-svn Mailing List for Swing ME (Page 18)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2494
          http://sourceforge.net/p/swingme/code/2494
Author:   yuranet
Date:     2021-07-01 10:04:33 +0000 (Thu, 01 Jul 2021)
Log Message:
-----------
draw/get/set rgb array works

Modified Paths:
--------------
    iOSME/src/javax/microedition/lcdui/Canvas.java
    iOSME/src/javax/microedition/lcdui/Graphics.java
    iOSME/src/javax/microedition/lcdui/Image.java
    iOSME/src/net/yura/ios/CanvasView.java

Modified: iOSME/src/javax/microedition/lcdui/Canvas.java
===================================================================

--- iOSME/src/javax/microedition/lcdui/Canvas.java	2021-07-01 01:08:28 UTC (rev 2493)
+++ iOSME/src/javax/microedition/lcdui/Canvas.java	2021-07-01 10:04:33 UTC (rev 2494)
@@ -126,7 +126,7 @@
     public void repaint(int x, int y, int w, int h) {
         CGRect rect = new CGRect(new CGPoint(x, y), new CGSize(w, h));
         // we can only ever call setNeedsDisplay from main thread or it does nothing
-        if (NSThread.isMainThread_static()) {
+        if (NSThread.isMainThread_static() && !painting) {
             canvasView.setNeedsDisplayInRect(rect);
         }
         else {
@@ -142,7 +142,7 @@
     public void repaint() {
         // we can only ever call setNeedsDisplay from main thread or it does nothing
         if (canvasView != null) {
-            if (NSThread.isMainThread_static()) {
+            if (NSThread.isMainThread_static() && !painting) {
                 canvasView.setNeedsDisplay();
             }
             else {
@@ -172,8 +172,15 @@
 
     protected abstract void paint(Graphics g);
 
+    private boolean painting;
     public final void doPaint(Graphics g) {
-        paint(g);
+        try {
+            painting = true;
+            paint(g);
+        }
+        finally {
+            painting = false;
+        }
     }
 
     public boolean hasPointerEvents() {

Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java	2021-07-01 01:08:28 UTC (rev 2493)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java	2021-07-01 10:04:33 UTC (rev 2494)
@@ -381,12 +381,14 @@
 
         CGRect imageRect = getDestRect(ax, ay, image.getWidth(), image.getHeight());
 
+        // we get the image first, this may close a current bitmap context
+        UIImage uiImageToDraw = image.getUIImage();
 
         CGContextRef current = UIKit.UIGraphicsGetCurrentContext();
         boolean same = current.getPeer().equals(context.getPeer());
 
         if (!same) UIKit.UIGraphicsPushContext(context);
-        image.getUIImage().drawInRect(imageRect);
+        uiImageToDraw.drawInRect(imageRect);
         if (!same) UIKit.UIGraphicsPopContext();
 
     }
@@ -516,21 +518,9 @@
             throw new ArrayIndexOutOfBoundsException();
         }
 
-        // FIXME MIDP allows almost any value of scanlength, drawBitmap is more
-        // strict with the stride
-        if (scanlength == 0) {
-            scanlength = width;
-        }
-
-
-        VoidPtr data = CoreGraphics.CGBitmapContextGetData(context);
-
-        //data.getIntPtr().
-
-        //int a = paint.getAlpha();
-        //paint.setAlpha(0xFF); // do not use alpha when drawing images
-        //canvas.drawBitmap(rgbData, offset, scanlength, tx+x, ty+y, width, height, processAlpha, paint);
-        //paint.setAlpha(a);
-        throw new UnsupportedOperationException();
+        // TODO could this be better so we dont need to create the image here?
+        Image img = Image.createImage(width, height);
+        img.setRGB(rgbData, offset, scanlength, width, height, processAlpha);
+        drawImage(img, x, y, 0); // we call a public method, so dont translate x and y
     }
 }

Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java	2021-07-01 01:08:28 UTC (rev 2493)
+++ iOSME/src/javax/microedition/lcdui/Image.java	2021-07-01 10:04:33 UTC (rev 2494)
@@ -33,6 +33,19 @@
     private UIImage uiImage;
     private CGContextRef context;
 
+    private Image(UIImage img) {
+        if (img == null) {
+            throw new NullPointerException();
+        }
+        this.uiImage = img;
+    }
+    private Image(CGContextRef context) {
+        if (context == null) {
+            throw new NullPointerException();
+        }
+        this.context = context;
+    }
+
     public static Image createImage(String resource) throws IOException {
 
         // try load any image that may be in a group
@@ -115,70 +128,10 @@
         // TODO only do this if image is immutable
         UIImage newImg = image.getUIImage(x, y, width, height, transform);
         return new Image(newImg);
+    }
 
-/*
-        Image res;
-        switch (transform) {
-            case Sprite.TRANS_NONE:
-                UIImage bmp;
-
-                UIKit.UIGraphicsBeginImageContextWithOptions(CoreGraphics.CGSizeMake(width, height), false, 1.0);
-                bmp = UIKit.UIGraphicsGetImageFromCurrentImageContext();
-
-                res = new Image(bmp);
-
-                break;
-            case Sprite.TRANS_ROT90:
-            case Sprite.TRANS_ROT270:
-            case Sprite.TRANS_MIRROR_ROT90:
-            case Sprite.TRANS_MIRROR_ROT270: {
-                //res = Image.createImage(height, width, image.uiImage.getConfig());
-                throw new UnsupportedOperationException();
-                //break;
-            }
-            default: {
-                throw new UnsupportedOperationException();
-                //res = Image.createImage(width, height, image.uiImage.getConfig());
-            }
-        }
-
-        if (transform!=Sprite.TRANS_NONE) {
-            Graphics g = res.getGraphics();
-            g.drawRegion(image, x, y, width, height, transform, 0, 0, 0);
-        }
-
-        return res;
-*/
-    }
-/*
-    private static Image createImage(int width, int height, Config config) {
-        Bitmap uiImage;
-        OutOfMemoryError error=null;
-        try {
-            uiImage = Bitmap.createBitmap(width, height, config);
-            // for some reason this sometimes just returns null instead of throwing a error
-            if (uiImage==null) {
-                throw new OutOfMemoryError("Bitmap.createBitmap returned null");
-            }
-        }
-        catch (OutOfMemoryError e) {
-            cleanMem();
-            error = e;
-            uiImage = Bitmap.createBitmap(width, height, config);
-        }
-        if (uiImage==null) {
-            throw new OutOfMemoryError("Bitmap.createBitmap returned null for w="+width+" h="+height+" config="+config+" error="+error );
-        }
-        return new Image(uiImage);
-    }
-*/
     public static Image createImage(int width, int height) {
 
-
-
-        //CoreGraphics.CGBitmapContextCreate(data, width, height, 8, );
-
-
         UIKit.UIGraphicsBeginImageContext(new CGSize(width, height));
         CGContextRef context = UIKit.UIGraphicsGetCurrentContext();
 
@@ -191,34 +144,82 @@
     }
 
     public static final Image createRGBImage(int[] rgb, int width, int height, boolean processAlpha) {
-        /*
-        Bitmap.Config config = (processAlpha) ? Bitmap.Config.ARGB_4444 : Bitmap.Config.RGB_565;
-        Bitmap uiImage;
-        try {
-            uiImage = Bitmap.createBitmap(rgb, width, height, config);
-        } catch (OutOfMemoryError e) {
-            cleanMem();
-            uiImage = Bitmap.createBitmap(rgb, width, height, config);
+        // TODO not optimum as we first create white image
+        Image img = createImage(width, height);
+        img.setRGB(rgb, 0, width, width, height, processAlpha);
+        return img;
+    }
+
+    public void setRGB(int[] rgbData, int offset, int srcScanLength, int width, int height, boolean processAlpha) {
+        Graphics g = getGraphics();
+        int distScanLength = getIntsPerRow();
+
+        IntPtr intPtr = CoreGraphics.CGBitmapContextGetData(g.getContext()).getIntPtr();
+        for (int y = 0; y < height; y++) {
+            if (processAlpha) {
+                intPtr.copyFrom(rgbData, offset+ y * srcScanLength, y * distScanLength, width);
+            }
+            else {
+                // TODO this could be better
+                for (int x = 0; x < width; x++) {
+                    intPtr.setValue(y * distScanLength + x, rgbData[offset + y * srcScanLength + x] | 0xFF000000);
+                }
+            }
         }
+    }
 
-        return new Image(uiImage);
-        */
+    @Override
+    public String toString() {
+        return "Image{" + uiImage + " " + context + "}";
+    }
+
+    public boolean isMutable() {
+        // TODO
         throw new UnsupportedOperationException();
     }
 
-    private Image(UIImage img) {
-        if (img == null) {
-            throw new NullPointerException();
+    public int getWidth() {
+        if (uiImage == null) {
+            return (int) CoreGraphics.CGBitmapContextGetWidth(context);
         }
-        this.uiImage = img;
+        return (int) uiImage.size().width();
     }
-    private Image(CGContextRef context) {
-        if (context == null) {
-            throw new NullPointerException();
+
+    public int getHeight() {
+        if (uiImage == null) {
+            return (int) CoreGraphics.CGBitmapContextGetHeight(context);
         }
-        this.context = context;
+        return (int) uiImage.size().height();
     }
 
+    private int getIntsPerRow() {
+        long bytesPerRow = CoreGraphics.CGBitmapContextGetBytesPerRow(context);
+        if (bytesPerRow % 4 != 0) {
+            throw new IllegalStateException("odd number of bytes per row " + bytesPerRow);
+        }
+        return (int) bytesPerRow/ 4;
+    }
+
+    public Graphics getGraphics() {
+        //if (!uiImage.isMutable()) {
+        //    throw new IllegalStateException("Image is immutable");
+        //}
+
+        if (context != null) {
+            return new Graphics(context);
+        }
+
+        UIKit.UIGraphicsBeginImageContext(new CGSize(getWidth(), getHeight()));
+        context = UIKit.UIGraphicsGetCurrentContext();
+
+        Graphics displayGraphics = new Graphics(context);
+        displayGraphics.drawImage(this, 0,0, 0);
+        displayGraphics.setColor(0xFF000000);
+
+        uiImage = null;
+        return displayGraphics;
+    }
+
     public UIImage getUIImage() {
         if (uiImage == null) {
 
@@ -228,6 +229,8 @@
 
             uiImage = UIKit.UIGraphicsGetImageFromCurrentImageContext();
             if (uiImage == null) {
+                System.out.println("WARN UIKit not returning image, context matches: " + same);
+
                 CGImageRef cgImageRef = CoreGraphics.CGBitmapContextCreateImage(context);
 
                 if (cgImageRef == null) {
@@ -257,44 +260,10 @@
         return transformed;
     }
 
-    public int getWidth() {
-        if (uiImage == null) {
-            return (int) CoreGraphics.CGBitmapContextGetWidth(context);
-        }
-        return (int) uiImage.size().width();
-    }
+    public void getRGB(int[] rgb, int offset, int distScanLength, int x, int y, int width, int height) {
 
-    public int getHeight() {
-        if (uiImage == null) {
-            return (int) CoreGraphics.CGBitmapContextGetHeight(context);
-        }
-        return (int) uiImage.size().height();
-    }
-
-    public Graphics getGraphics() {
-        //if (!uiImage.isMutable()) {
-        //    throw new IllegalStateException("Image is immutable");
-        //}
-
-        if (context != null) {
-            return new Graphics(context);
-        }
-
-        UIKit.UIGraphicsBeginImageContext(new CGSize(getWidth(), getHeight()));
-        context = UIKit.UIGraphicsGetCurrentContext();
-
-        Graphics displayGraphics = new Graphics(context);
-        displayGraphics.drawImage(this, 0,0, 0);
-        displayGraphics.setColor(0xFF000000);
-
-        uiImage = null;
-        return displayGraphics;
-    }
-
-    public void getRGB(int[] rgb, int offset, int scanlength, int x, int y, int width, int height) {
-        // TODO this does not seem to work, gives random crap back
-
         /*
+        // this does not seem to work, gives random crap back
         UIImage part = getUIImage(x,y,width,height,Sprite.TRANS_NONE);
         CGDataProviderRef cgDataProviderRef = CoreGraphics.CGImageGetDataProvider(part.CGImage());
         CFDataRef pixelData = CoreGraphics.CGDataProviderCopyData(cgDataProviderRef);
@@ -304,43 +273,27 @@
         for (int pos = 0; pos < height; pos++) {
             ints.copyTo(pos * width, rgb, offset + (pos * scanlength), width);
         }
-        // TODO release stuff
         */
 
-        //int imgWidth = getWidth();
         Graphics g = getGraphics();
 
-        CoreGraphics.CGBitmapContextGetBitsPerComponent(context); // 8
-        CoreGraphics.CGBitmapContextGetBitsPerPixel(context); // 32
-        int srcScanLenght = (int)CoreGraphics.CGBitmapContextGetBytesPerRow(context) / 4; // 832
+        //CoreGraphics.CGBitmapContextGetBitsPerComponent(context); // 8
+        //CoreGraphics.CGBitmapContextGetBitsPerPixel(context); // 32
+        int srcScanLenght = getIntsPerRow();
 
-        VoidPtr ptr = CoreGraphics.CGBitmapContextGetData(g.getContext());
-        IntPtr intPtr = ptr.getIntPtr();
+        IntPtr intPtr = CoreGraphics.CGBitmapContextGetData(g.getContext()).getIntPtr();
         for (int c = 0; c < height; c++) {
-            intPtr.copyTo((y+c) * srcScanLenght + x, rgb, offset + c * scanlength, width);
+            intPtr.copyTo((y+c) * srcScanLenght + x, rgb, offset + c * distScanLength, width);
         }
-
     }
 
-    public boolean isMutable() {
-        //return uiImage.isMutable();
-        throw new UnsupportedOperationException();
-    }
-
     public void setRGB(int x, int y, int color) {
-        // TODO not sure this works
-        int width = getWidth();
         Graphics g = getGraphics();
-        VoidPtr ptr = CoreGraphics.CGBitmapContextGetData(g.getContext());
-        IntPtr intPtr = ptr.getIntPtr();
-        intPtr.setValue(y * width + x, color);
+        int srcScanLenght = getIntsPerRow();
+        IntPtr intPtr = CoreGraphics.CGBitmapContextGetData(g.getContext()).getIntPtr();
+        intPtr.setValue(y * srcScanLenght + x, color);
     }
 
-    @Override
-    public String toString() {
-        return "Image{" + uiImage + " " + context + "}";
-    }
-
     public static void filter(Image source, Image bm, ColorMatrix cm) {
 /*
         android.graphics.Paint paint = new android.graphics.Paint();
@@ -347,15 +300,7 @@
         paint.setColorFilter(new android.graphics.ColorMatrixColorFilter(cm));
         new Canvas(bm.uiImage).drawBitmap(source.uiImage, 0, 0, paint);
 */
+        // TODO
         throw new UnsupportedOperationException();
     }
-
-    private static void cleanMem() {
-        System.gc();
-        try {
-            Thread.sleep(200);
-        }
-        catch (InterruptedException e) {
-        }
-    }
 }

Modified: iOSME/src/net/yura/ios/CanvasView.java
===================================================================
--- iOSME/src/net/yura/ios/CanvasView.java	2021-07-01 01:08:28 UTC (rev 2493)
+++ iOSME/src/net/yura/ios/CanvasView.java	2021-07-01 10:04:33 UTC (rev 2494)
@@ -45,14 +45,12 @@
 
     @Override
     public void drawRect(CGRect rect) {
-        //UIColor.blackColor().set();
-        //UIBezierPath.bezierPathWithRect(this.bounds()).fill();
 
-        //if (canvas == null) {
+        if (canvas == null) {
             UIColor.orangeColor().set();
             CGPoint cgPoint = new CGPoint(100, 100);
             UIBezierPath.bezierPathWithArcCenterRadiusStartAngleEndAngleClockwise(cgPoint, 10, 0, 2 * Math.PI, true).fill();
-        //}
+        }
 
         CGRect bounds = bounds();
         CGSize size = bounds.size();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2008	Jan	Feb	Mar	Apr	May	Jun	Jul (54)	Aug (33)	Sep (27)	Oct (10)	Nov	Dec
2009	Jan (7)	Feb (5)	Mar (7)	Apr (1)	May (1)	Jun (1)	Jul (25)	Aug (41)	Sep (89)	Oct (99)	Nov (161)	Dec (85)
2010	Jan (10)	Feb (35)	Mar (44)	Apr (115)	May (98)	Jun (87)	Jul (23)	Aug (27)	Sep (63)	Oct (57)	Nov (97)	Dec (62)
2011	Jan (67)	Feb (83)	Mar (43)	Apr (14)	May (43)	Jun (52)	Jul (55)	Aug (97)	Sep (65)	Oct (36)	Nov (67)	Dec (46)
2012	Jan (29)	Feb (24)	Mar (10)	Apr (2)	May (10)	Jun (34)	Jul (31)	Aug (9)	Sep (10)	Oct (10)	Nov (6)	Dec (7)
2013	Jan (1)	Feb (1)	Mar (5)	Apr (2)	May (17)	Jun (10)	Jul (8)	Aug (17)	Sep	Oct (3)	Nov (4)	Dec (1)
2014	Jan (2)	Feb (8)	Mar (2)	Apr	May	Jun	Jul (5)	Aug (2)	Sep (1)	Oct (1)	Nov (5)	Dec (8)
2015	Jan (1)	Feb	Mar (4)	Apr	May (2)	Jun (1)	Jul (1)	Aug	Sep (1)	Oct	Nov (1)	Dec
2016	Jan	Feb (1)	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov (1)	Dec (2)
2018	Jan	Feb (2)	Mar	Apr (1)	May	Jun	Jul	Aug (3)	Sep	Oct	Nov	Dec (4)
2019	Jan (2)	Feb	Mar (4)	Apr (4)	May (2)	Jun (1)	Jul	Aug	Sep (3)	Oct	Nov	Dec (4)
2020	Jan	Feb	Mar	Apr (3)	May (1)	Jun (6)	Jul	Aug (1)	Sep	Oct	Nov (1)	Dec
2021	Jan	Feb (7)	Mar (29)	Apr (8)	May (7)	Jun (45)	Jul (66)	Aug	Sep	Oct (2)	Nov (37)	Dec (34)
2022	Jan (15)	Feb (1)	Mar	Apr	May	Jun (10)	Jul	Aug	Sep	Oct (5)	Nov (1)	Dec (7)
2023	Jan (23)	Feb (18)	Mar (18)	Apr (6)	May (10)	Jun (7)	Jul (1)	Aug	Sep	Oct	Nov (1)	Dec
2024	Jan (11)	Feb (3)	Mar	Apr (6)	May (3)	Jun	Jul	Aug (2)	Sep (16)	Oct (6)	Nov (7)	Dec (6)
2025	Jan (8)	Feb (3)	Mar (7)	Apr (5)	May (21)	Jun (10)	Jul (16)	Aug (5)	Sep (19)	Oct (11)	Nov	Dec

swingme-svn Mailing List for Swing ME (Page 18)

Java UI Framework for Desktop/iOS/Android

swingme-svn — subversion diffs