Changeset 1545

Timestamp:

11/19/20 13:41:28 (3 years ago)

Author:

bnemhaus

Message:

Expeditee now respects the users antialiasing setting. The previous system

1. Attempted to respect antialiasing by checking the setting and enabling it if the setting was true
2. In the process of painting the frame some special items (link marks etc) want to use antialiasing reguardless of setting. This was achieved by turning antialiasing on, doing the thing and then turning it off. This unfortunately meant that, in the scenario that the users antialiasing setting is on, it gets turned off after drawing one of these special items and doesn't get turn on again until all items have been drawn.

The new system still always turns antialiasing on for these special items, but instead of turning it off after, it returns it to the setting it was previously on. This is achieved with two new functions: setTransientAntialiasingOn() and setTransientAntialiasingOff().

On a related note, there was also an issue with some polygons being drawn with a thickness of 0.0f, which was causing them to antialias badly. They now have a thickness of 1.0f.

Location:

trunk/src/org/expeditee

Files:

• gio/GraphicsManager.java (modified) (1 diff)
• gio/javafx/JavaFXGraphicsManager.java (modified) (1 diff)
• gio/swing/SwingGraphicsManager.java (modified) (3 diffs)
• items/Dot.java (modified) (2 diffs)
• items/Item.java (modified) (5 diffs)
• items/Line.java (modified) (1 diff)

trunk/src/org/expeditee/gio/GraphicsManager.java

@@ -156 +156 @@
         public abstract void setAntialiasing(boolean on);
         
+        public abstract void setTransientAntialiasingOn();
+        public abstract void setTransientAntialiasingOff();
+        
         /** Sets the default font for the current rendering surface. */
         public abstract void setFont(Font font);

trunk/src/org/expeditee/gio/javafx/JavaFXGraphicsManager.java

@@ -314 +314 @@
                 // TODO: Implement. cts16
         }
+        
+        public void setTransientAntialiasingOn() {
+                // TODO: Implement. Bryce 
+        }
+        
+        public void setTransientAntialiasingOff() {
+                // TODO: Implement. Bryce
+        }
 
         @Override

trunk/src/org/expeditee/gio/swing/SwingGraphicsManager.java

@@ -185 +185 @@
                 _surfaceStack.getCurrentSurface().setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
         }
-
+        
+        private boolean frameUsingAntialiasing = false;
+        
         @Override
         public void setAntialiasing(boolean on) {
@@ -197 +199 @@
 
                 if (on) {
-                        if (hasAntialiasing) {
-                                //return;
-                        }
                         surface.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-                        hasAntialiasing = true;
+                        frameUsingAntialiasing = true;
                 } else {
-                        if (hasAntialiasing) {
-                                //return;
-                        }
                         surface.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+                        frameUsingAntialiasing = false;
                 }
         }
         
-        private static boolean hasAntialiasing = false;
+        @Override
+        public void setTransientAntialiasingOn() {
+                if (!frameUsingAntialiasing) {
+                        Graphics2D surface = _surfaceStack.getCurrentSurface();
+                        surface.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                }
+        }
+        
+        @Override
+        public void setTransientAntialiasingOff() {
+                if (!frameUsingAntialiasing) {
+                        Graphics2D surface = _surfaceStack.getCurrentSurface();
+                        surface.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+                }
+        }
 
         @Override
@@ -591 +602 @@
         public void refreshRootSurface() {
                 Graphics2D rootSurface = (Graphics2D) _jFrame.getContentPane().getGraphics();
-                setAntialiasing(rootSurface, true);
+                rootSurface.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
                 final java.awt.Font rootSurfaceFont = rootSurface.getFont().deriveFont(40f);
                 rootSurface.setFont(rootSurfaceFont);

trunk/src/org/expeditee/items/Dot.java

@@ -27 +27 @@
 import org.expeditee.core.Fill;
 import org.expeditee.core.Point;
+import org.expeditee.core.Stroke;
 import org.expeditee.core.bounds.AxisAlignedBoxBounds;
 import org.expeditee.core.bounds.Bounds;
@@ -234 +235 @@
                         } else if (_highlightMode == HighlightMode.Connected) {
                                 g.drawRectangle(bounds.getTopLeft(), bounds.getSize(), 0.0f, null, highlightColor, HIGHLIGHT_STROKE, null);
-                                System.err.println("Dot::paint:Painting Dot with colour: " + highlightColor);
                         } else if (_highlightMode == HighlightMode.Normal) {
                                 g.drawOval(bounds.getCentre(), bounds.getSize(), 0.0f, fill, highlightColor, DOT_STROKE);
                         }
-                        // System.out.println(_mode.toString());
                 }
 

trunk/src/org/expeditee/items/Item.java

@@ -105 +105 @@
         public static final Float DEFAULT_THICKNESS = 2f;
 
-        public static final Float MINIMUM_THICKNESS = 0f;
+        public static final Float MINIMUM_THICKNESS = 1f;
 
         public static final Float MINIMUM_PAINT_THICKNESS = 1f;
@@ -3170 +3170 @@
 
                         // Small circles look rubbish without AA. cts16
-                        g.setAntialiasing(true);
+                        g.setTransientAntialiasingOn();
                         
                         if (hasLink && getLinkMark()) {
@@ -3190 +3190 @@
                         }
                         
-                        g.setAntialiasing(false);
+                        g.setTransientAntialiasingOff();
                 }
         }
@@ -3208 +3208 @@
                 
                 GraphicsManager g = EcosystemManager.getGraphicsManager();
-                g.setAntialiasing(true);
+                g.setTransientAntialiasingOn();
                 Font font = new Font();
                 g.drawString("\uD83D\uDD11", new Point(x,y), font, fontColour);
-                g.setAntialiasing(false);
+                g.setTransientAntialiasingOff();
         }
         
@@ -3218 +3218 @@
                 if (encryptionLabel != null && encryptionLabel.length() > 0) {
                         GraphicsManager g = EcosystemManager.getGraphicsManager();
-                        g.setAntialiasing(true);
+                        g.setTransientAntialiasingOn();
                         Font font = new Font();
                         g.drawString("\uD83D\uDD12", new Point(x,y), font, Colour.BLACK);
-                        g.setAntialiasing(false);
+                        g.setTransientAntialiasingOff();
                 }
         }

trunk/src/org/expeditee/items/Line.java

@@ -535 +535 @@
                 GraphicsManager g = EcosystemManager.getGraphicsManager();
                 
-                g.setAntialiasing(true);
+                g.setTransientAntialiasingOn();
                 g.drawPolygon(arrow.close(), null, null, 0.0f, arrowFill, arrowColour, arrowStroke);
-                g.setAntialiasing(false); 
+                g.setTransientAntialiasingOff();
         }