Changeset 1102 for trunk/src/org/expeditee/items/widgets/MemoryMonitor.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/items/widgets/MemoryMonitor.java (modified) (5 diffs)

trunk/src/org/expeditee/items/widgets/MemoryMonitor.java

@@ -19 +19 @@
 package org.expeditee.items.widgets;
 
-import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics;
@@ -27 +26 @@
 import javax.swing.SwingUtilities;
 
+import org.expeditee.core.Colour;
+import org.expeditee.gio.swing.SwingConversions;
+import org.expeditee.gio.swing.SwingMiscManager;
 import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.Text;
@@ -36 +38 @@
  *
  */
-public class MemoryMonitor extends InteractiveWidget {
+public class MemoryMonitor extends SwingWidget {
         
         private long totalMemoryInBytes;
@@ -63 +65 @@
         
         @Override
-        public void paint(Graphics g) {
-                
+        public void paintSwingWidget(Graphics2D g)
+        {
                 int height = getHeight();
                 int width = getWidth();
@@ -70 +72 @@
                 int memHeight = (int)(height * currentMemoryUsage);
                 
-                Color memColor;
+                Colour memColor;
                 if (currentMemoryUsage > 0.8f) {
-                        memColor = Color.RED;
+                        memColor = Colour.RED;
                 } else if (currentMemoryUsage > 0.5f) {
-                        memColor = Color.ORANGE;
+                        memColor = Colour.ORANGE;
                 } else  {
-                        memColor = Color.GREEN;
+                        memColor = Colour.GREEN;
                 }
                 
-                g.setColor(memColor);
+                g.setColor(SwingConversions.toSwingColor(memColor));
                 g.fillRect(getX(), getY() + height - memHeight, width, memHeight);
                 
-                g.setColor(Color.WHITE);
+                g.setColor(SwingConversions.toSwingColor(Colour.WHITE));
                 g.fillRect(getX(), getY(), width, height - memHeight);
                 
                 int percent = (int)(currentMemoryUsage * 100.0f);
                 
-                g.setColor(Color.BLACK);
+                g.setColor(SwingConversions.toSwingColor(Colour.BLACK));
                 g.setFont(USAGE_FONT);
                 g.drawString(percent + "%", getX() + 12, getY() + (height / 2) + 8);
-                
-                paintLink((Graphics2D)g);
         }