Changeset 1102 for trunk/src/org/apollo/gui/TimeAxisPanel.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/apollo/gui/TimeAxisPanel.java (modified) (5 diffs)

trunk/src/org/apollo/gui/TimeAxisPanel.java

@@ -12 +12 @@
 
 import org.apollo.util.AudioMath;
+import org.expeditee.gio.swing.SwingConversions;
 
 /**
@@ -30 +31 @@
         private TimeAxis timeAxis = new TimeAxis();
         
-        public TimeAxisPanel(SampledTrackGraphView graph) {
+        public TimeAxisPanel(SampledTrackGraphView graph)
+        {
                 assert (graph != null);
                 
@@ -37 +39 @@
                 
                 // Auto-adjust scale when component resizes.
-                this.addComponentListener(new ComponentListener() {
-
-                        public void componentHidden(ComponentEvent e) {
+                this.addComponentListener(new ComponentListener()
+                {
+                        public void componentHidden(ComponentEvent e)
+                        {
                         }
 
-                        public void componentMoved(ComponentEvent e) {
+                        public void componentMoved(ComponentEvent e)
+                        {
                         }
 
-                        public void componentResized(ComponentEvent e) {
+                        public void componentResized(ComponentEvent e)
+                        {
                                 updateAxis();
                         }
 
-                        public void componentShown(ComponentEvent e) {
+                        public void componentShown(ComponentEvent e)
+                        {
                         }
-                
                 });
                 
@@ -58 +63 @@
         
 
-        public void timelineChanged(Event e) {
+        public void timelineChanged(Event e)
+        {
                  updateAxis();
         }
         
 
-        private void updateAxis() {
-                
+        private void updateAxis()
+        {
                 // Is track model even set yet?
-                if (observedSubject.getSampledTrackModel() == null ||
-                                getWidth() == 0) return;
+                if (observedSubject.getSampledTrackModel() == null || getWidth() == 0) return;
                 
                 AudioFormat format = observedSubject.getSampledTrackModel().getFormat();
                 
-                long startTimeMS = AudioMath.framesToMilliseconds(
-                                observedSubject.getTimeScaleStart(), format);
+                long startTimeMS = AudioMath.framesToMilliseconds(observedSubject.getTimeScaleStart(), format);
                 
-                long timeLengthMS = AudioMath.framesToMilliseconds(
-                                observedSubject.getTimeScaleLength(), format);
+                long timeLengthMS = AudioMath.framesToMilliseconds(observedSubject.getTimeScaleLength(), format);
                 
-                long totalTrackMSLength = AudioMath.framesToMilliseconds(
-                                observedSubject.getSampledTrackModel().getFrameCount(), format);
+                long totalTrackMSLength = AudioMath.framesToMilliseconds(observedSubject.getSampledTrackModel().getFrameCount(), format);
                 
                 timeAxis.setAxis(
@@ -92 +94 @@
         
         @Override
-        public void paint(Graphics g) {
-                timeAxis.paint(g, 0, 0, getHeight(), getBackground());
+        public void paint(Graphics g)
+        {
+                timeAxis.paint(0, 0, getHeight(), SwingConversions.fromSwingColor(getBackground()));
         }