Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/apollo/gui/ApolloColorIndexedModels.java

    r315 r1102  
    11package org.apollo.gui;
    22
    3 import java.awt.Color;
    4 import java.awt.image.IndexColorModel;
     3import org.expeditee.core.Colour;
    54
    65public class ApolloColorIndexedModels {
    76       
    8         public static final Color KEY_COLOR = new Color(123,58,123,0);
    9         private static final int KEY_INDEX = 0;
     7        public static final Colour KEY_COLOR = Colour.FromRGBA255(123,58,123,0);
     8        //private static final int KEY_INDEX = 0;
    109       
    1110        /** Color index model for the track graphs */
    12         public static final IndexColorModel graphIndexColorModel;
     11        //public static final IndexColorModel graphIndexColorModel;
    1312
     13        public static final Colour WAVEFORM_COLOR = Colour.fromRGB24BitPacked(0x1C5BA3);
     14        public static final Colour WAVEFORM_SELECTION_COLOR = Colour.YELLOW;
    1415       
    15         public static final Color WAVEFORM_COLOR = new Color(0x1C5BA3);
    16         public static final Color WAVEFORM_SELECTION_COLOR = Color.YELLOW;
     16        //private static final int WAVEFORM_INDEX = 1;
     17        //private static final int WAVEFORM_SELECTION_INDEX = 2;
    1718       
    18         private static final int WAVEFORM_INDEX = 1;
    19         private static final int WAVEFORM_SELECTION_INDEX = 2;
     19        //public static final IndexColorModel linkedTrackIndexColorModel;
    2020       
    21        
    22         public static final IndexColorModel linkedTrackIndexColorModel;
    23        
    24         public static final Color TRACK1_COLOR = new Color(0x1C5BA3);
    25         public static final Color TRACK2_COLOR = new Color(0x3280B7);
     21        public static final Colour TRACK1_COLOR = Colour.fromRGB24BitPacked(0x1C5BA3);
     22        public static final Colour TRACK2_COLOR = Colour.fromRGB24BitPacked(0x3280B7);
    2623       
    2724        public static final int TRACK1_INDEX = 1;
    2825        public static final int TRACK2_INDEX = 2;
    2926
    30         static { // Prepare the global color index model for the graphs
     27        /*static { // Prepare the global color index model for the graphs
    3128
    3229                // For waveform graphs:
    … …  
    3532                byte[] blues = new byte[256];
    3633               
    37                 reds[KEY_INDEX] = (byte)KEY_COLOR.getRed();
    38                 greens[KEY_INDEX] = (byte)KEY_COLOR.getGreen();
    39                 blues[KEY_INDEX] = (byte)KEY_COLOR.getBlue();
     34                reds[KEY_INDEX] = (byte)KEY_COLOR.getRed255();
     35                greens[KEY_INDEX] = (byte)KEY_COLOR.getGreen255();
     36                blues[KEY_INDEX] = (byte)KEY_COLOR.getBlue255();
    4037               
    41                 reds[WAVEFORM_INDEX] = (byte)WAVEFORM_COLOR.getRed();
    42                 greens[WAVEFORM_INDEX] = (byte)WAVEFORM_COLOR.getGreen();
    43                 blues[WAVEFORM_INDEX] = (byte)WAVEFORM_COLOR.getBlue();
     38                reds[WAVEFORM_INDEX] = (byte)WAVEFORM_COLOR.getRed255();
     39                greens[WAVEFORM_INDEX] = (byte)WAVEFORM_COLOR.getGreen255();
     40                blues[WAVEFORM_INDEX] = (byte)WAVEFORM_COLOR.getBlue255();
    4441               
    45                 reds[WAVEFORM_SELECTION_INDEX] = (byte)WAVEFORM_SELECTION_COLOR.getRed();
    46                 greens[WAVEFORM_SELECTION_INDEX] = (byte)WAVEFORM_SELECTION_COLOR.getGreen();
    47                 blues[WAVEFORM_SELECTION_INDEX] = (byte)WAVEFORM_SELECTION_COLOR.getBlue();
     42                reds[WAVEFORM_SELECTION_INDEX] = (byte)WAVEFORM_SELECTION_COLOR.getRed255();
     43                greens[WAVEFORM_SELECTION_INDEX] = (byte)WAVEFORM_SELECTION_COLOR.getGreen255();
     44                blues[WAVEFORM_SELECTION_INDEX] = (byte)WAVEFORM_SELECTION_COLOR.getBlue255();
    4845               
    4946                graphIndexColorModel = new IndexColorModel(8, 256, reds, greens, blues, KEY_INDEX);
    … …  
    5552                blues = new byte[256];
    5653               
    57                 reds[KEY_INDEX] = (byte)KEY_COLOR.getRed();
    58                 greens[KEY_INDEX] = (byte)KEY_COLOR.getGreen();
    59                 blues[KEY_INDEX] = (byte)KEY_COLOR.getBlue();
     54                reds[KEY_INDEX] = (byte)KEY_COLOR.getRed255();
     55                greens[KEY_INDEX] = (byte)KEY_COLOR.getGreen255();
     56                blues[KEY_INDEX] = (byte)KEY_COLOR.getBlue255();
    6057               
    61                 reds[TRACK1_INDEX] = (byte)TRACK1_COLOR.getRed();
    62                 greens[TRACK1_INDEX] = (byte)TRACK1_COLOR.getGreen();
    63                 blues[TRACK1_INDEX] = (byte)TRACK1_COLOR.getBlue();
     58                reds[TRACK1_INDEX] = (byte)TRACK1_COLOR.getRed255();
     59                greens[TRACK1_INDEX] = (byte)TRACK1_COLOR.getGreen255();
     60                blues[TRACK1_INDEX] = (byte)TRACK1_COLOR.getBlue255();
    6461               
    65                 reds[TRACK2_INDEX] = (byte)TRACK2_COLOR.getRed();
    66                 greens[TRACK2_INDEX] = (byte)TRACK2_COLOR.getGreen();
    67                 blues[TRACK2_INDEX] = (byte)TRACK2_COLOR.getBlue();
     62                reds[TRACK2_INDEX] = (byte)TRACK2_COLOR.getRed255();
     63                greens[TRACK2_INDEX] = (byte)TRACK2_COLOR.getGreen255();
     64                blues[TRACK2_INDEX] = (byte)TRACK2_COLOR.getBlue255();
    6865               
    6966                linkedTrackIndexColorModel = new IndexColorModel(8, 256, reds, greens, blues, KEY_INDEX);
    7067               
    71         }
    72        
    73        
    74        
    75        
     68        }*/
    7669}
Note: See TracChangeset for help on using the changeset viewer.