X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureRenderer.java;h=5a96ff50d7959b3d494fa1a4edd8e267664ae977;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=95d940d1f3fed73c9493da15c9d36b4faf4ccddc;hpb=f5926903305dbc159a498f9c4616d93ffb404292;p=jalview.git diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java old mode 100755 new mode 100644 index 95d940d..5a96ff5 --- a/src/jalview/gui/FeatureRenderer.java +++ b/src/jalview/gui/FeatureRenderer.java @@ -1,24 +1,27 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) + * Copyright (C) 2014 The Jalview Authors * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Jalview is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * + * Jalview is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.awt.*; import java.awt.event.*; @@ -30,6 +33,7 @@ import javax.swing.*; import jalview.datamodel.*; import jalview.schemes.GraduatedColor; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -37,7 +41,7 @@ import jalview.schemes.GraduatedColor; * @author $author$ * @version $Revision$ */ -public class FeatureRenderer +public class FeatureRenderer implements jalview.api.FeatureRenderer { AlignmentPanel ap; @@ -54,11 +58,11 @@ public class FeatureRenderer int charOffset; - Hashtable featureColours = new Hashtable(); + Map featureColours = new ConcurrentHashMap(); // A higher level for grouping features of a // particular type - Hashtable featureGroups = new Hashtable(); + Map featureGroups = new ConcurrentHashMap(); // This is actually an Integer held in the hashtable, // Retrieved using the key feature type @@ -74,25 +78,30 @@ public class FeatureRenderer * Creates a new FeatureRenderer object. * * @param av - * DOCUMENT ME! + * DOCUMENT ME! */ public FeatureRenderer(AlignmentPanel ap) { this.ap = ap; this.av = ap.av; + if (ap != null && ap.seqPanel != null && ap.seqPanel.seqCanvas != null + && ap.seqPanel.seqCanvas.fr != null) + { + transferSettings(ap.seqPanel.seqCanvas.fr); + } } public class FeatureRendererSettings implements Cloneable { String[] renderOrder; - Hashtable featureGroups; + Map featureGroups; - Hashtable featureColours; + Map featureColours; float transparency; - Hashtable featureOrder; + Map featureOrder; public FeatureRendererSettings(String[] renderOrder, Hashtable featureGroups, Hashtable featureColours, @@ -106,13 +115,47 @@ public class FeatureRenderer this.featureOrder = featureOrder; } + /** + * create an independent instance of the feature renderer settings + * + * @param fr + */ public FeatureRendererSettings(FeatureRenderer fr) { - this.renderOrder = fr.renderOrder; - this.featureGroups = fr.featureGroups; - this.featureColours = fr.featureColours; + renderOrder = null; + featureGroups = new ConcurrentHashMap(); + featureColours = new ConcurrentHashMap(); + featureOrder = new ConcurrentHashMap(); + if (fr.renderOrder != null) + { + this.renderOrder = new String[fr.renderOrder.length]; + System.arraycopy(fr.renderOrder, 0, renderOrder, 0, + fr.renderOrder.length); + } + if (fr.featureGroups != null) + { + this.featureGroups = new ConcurrentHashMap(fr.featureGroups); + } + if (fr.featureColours != null) + { + this.featureColours = new ConcurrentHashMap(fr.featureColours); + } + Iterator en = fr.featureColours.keySet().iterator(); + while (en.hasNext()) + { + Object next = en.next(); + Object val = featureColours.get(next); + if (val instanceof GraduatedColor) + { + featureColours + .put(next, new GraduatedColor((GraduatedColor) val)); + } + } this.transparency = fr.transparency; - this.featureOrder = fr.featureOrder; + if (fr.featureOrder != null) + { + this.featureOrder = new ConcurrentHashMap(fr.featureOrder); + } } } @@ -130,13 +173,45 @@ public class FeatureRenderer this.featureOrder = fr.featureOrder; } + /** + * update from another feature renderer + * + * @param fr + * settings to copy + */ public void transferSettings(FeatureRenderer fr) { - this.renderOrder = fr.renderOrder; - this.featureGroups = fr.featureGroups; - this.featureColours = fr.featureColours; - this.transparency = fr.transparency; - this.featureOrder = fr.featureOrder; + FeatureRendererSettings frs = new FeatureRendererSettings(fr); + this.renderOrder = frs.renderOrder; + this.featureGroups = frs.featureGroups; + this.featureColours = frs.featureColours; + this.transparency = frs.transparency; + this.featureOrder = frs.featureOrder; + if (av != null && av != fr.av) + { + // copy over the displayed feature settings + if (fr.av != null) + { + if (fr.av.featuresDisplayed != null) + { + // update display settings + if (av.featuresDisplayed == null) + { + av.featuresDisplayed = new Hashtable(fr.av.featuresDisplayed); + } + else + { + av.featuresDisplayed.clear(); + Enumeration en = fr.av.featuresDisplayed.keys(); + while (en.hasMoreElements()) + { + av.featuresDisplayed.put(en.nextElement(), Boolean.TRUE); + } + + } + } + } + } } BufferedImage offscreenImage; @@ -152,7 +227,8 @@ public class FeatureRenderer * This is used by the Molecule Viewer and Overview to get the accurate * colourof the rendered sequence */ - public int findFeatureColour(int initialCol, SequenceI seq, int column) + public synchronized int findFeatureColour(int initialCol, SequenceI seq, + int column) { if (!av.showSequenceFeatures) { @@ -196,7 +272,8 @@ public class FeatureRenderer } currentColour = null; - + // TODO: non-threadsafe - each rendering thread needs its own instance of + // the feature renderer - or this should be synchronized. offscreenRender = true; if (offscreenImage != null) @@ -226,23 +303,23 @@ public class FeatureRenderer * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! * @param seq - * DOCUMENT ME! + * DOCUMENT ME! * @param sg - * DOCUMENT ME! + * DOCUMENT ME! * @param start - * DOCUMENT ME! + * DOCUMENT ME! * @param end - * DOCUMENT ME! + * DOCUMENT ME! * @param x1 - * DOCUMENT ME! + * DOCUMENT ME! * @param y1 - * DOCUMENT ME! + * DOCUMENT ME! * @param width - * DOCUMENT ME! + * DOCUMENT ME! * @param height - * DOCUMENT ME! + * DOCUMENT ME! */ // String type; // SequenceFeature sf; @@ -349,61 +426,55 @@ public class FeatureRenderer if (sequenceFeatures[sfindex].begin <= start && sequenceFeatures[sfindex].end >= start) { - // this is passed out to the overview and other sequence renderers (e.g. molecule viewer) to get displayed colour for rendered sequence - currentColour = new Integer(getColour(sequenceFeatures[sfindex]).getRGB()); - // used to be retreived from av.featuresDisplayed + // this is passed out to the overview and other sequence renderers + // (e.g. molecule viewer) to get displayed colour for rendered + // sequence + currentColour = new Integer( + getColour(sequenceFeatures[sfindex]).getRGB()); + // used to be retreived from av.featuresDisplayed // currentColour = av.featuresDisplayed - // .get(sequenceFeatures[sfindex].type); - - + // .get(sequenceFeatures[sfindex].type); + } } else if (sequenceFeatures[sfindex].type.equals("disulfide bond")) { - renderFeature( - g, - seq, + renderFeature(g, seq, seq.findIndex(sequenceFeatures[sfindex].begin) - 1, seq.findIndex(sequenceFeatures[sfindex].begin) - 1, getColour(sequenceFeatures[sfindex]) - //new Color(((Integer) av.featuresDisplayed - // .get(sequenceFeatures[sfindex].type)).intValue()) - , - start, end, y1); - renderFeature( - g, - seq, + // new Color(((Integer) av.featuresDisplayed + // .get(sequenceFeatures[sfindex].type)).intValue()) + , start, end, y1); + renderFeature(g, seq, seq.findIndex(sequenceFeatures[sfindex].end) - 1, seq.findIndex(sequenceFeatures[sfindex].end) - 1, getColour(sequenceFeatures[sfindex]) - //new Color(((Integer) av.featuresDisplayed - // .get(sequenceFeatures[sfindex].type)).intValue()) - , - start, end, y1); + // new Color(((Integer) av.featuresDisplayed + // .get(sequenceFeatures[sfindex].type)).intValue()) + , start, end, y1); } - else - if (showFeature(sequenceFeatures[sfindex])) + else if (showFeature(sequenceFeatures[sfindex])) + { + if (av.showSeqFeaturesHeight + && sequenceFeatures[sfindex].score != Float.NaN) { - if (av.showSeqFeaturesHeight - && sequenceFeatures[sfindex].score != Float.NaN) - { - renderScoreFeature(g, seq, seq - .findIndex(sequenceFeatures[sfindex].begin) - 1, - seq.findIndex(sequenceFeatures[sfindex].end) - 1, - getColour(sequenceFeatures[sfindex]), start, end, - y1, normaliseScore(sequenceFeatures[sfindex])); - } - else - { - renderFeature(g, seq, seq - .findIndex(sequenceFeatures[sfindex].begin) - 1, - seq.findIndex(sequenceFeatures[sfindex].end) - 1, - getColour(sequenceFeatures[sfindex]), start, end, - y1); - } + renderScoreFeature(g, seq, + seq.findIndex(sequenceFeatures[sfindex].begin) - 1, + seq.findIndex(sequenceFeatures[sfindex].end) - 1, + getColour(sequenceFeatures[sfindex]), start, end, y1, + normaliseScore(sequenceFeatures[sfindex])); + } + else + { + renderFeature(g, seq, + seq.findIndex(sequenceFeatures[sfindex].begin) - 1, + seq.findIndex(sequenceFeatures[sfindex].end) - 1, + getColour(sequenceFeatures[sfindex]), start, end, y1); } + } } @@ -597,8 +668,7 @@ public class FeatureRenderer * Searches alignment for all features and updates colours * * @param newMadeVisible - * if true newly added feature types will be rendered - * immediatly + * if true newly added feature types will be rendered immediatly */ synchronized void findAllFeatures(boolean newMadeVisible) { @@ -633,9 +703,10 @@ public class FeatureRenderer { minmax = new Hashtable(); } - for (int i = 0; i < av.alignment.getHeight(); i++) + AlignmentI alignment = av.getAlignment(); + for (int i = 0; i < alignment.getHeight(); i++) { - SequenceFeature[] features = av.alignment.getSequenceAt(i) + SequenceFeature[] features = alignment.getSequenceAt(i) .getDatasetSequence().getSequenceFeatures(); if (features == null) @@ -684,17 +755,19 @@ public class FeatureRenderer } if (features[index].score != Float.NaN) { - int nonpos= features[index].getBegin()>=1 ? 0 : 1; + int nonpos = features[index].getBegin() >= 1 ? 0 : 1; float[][] mm = (float[][]) minmax.get(features[index].getType()); if (mm == null) { - mm = new float[][] {null, null }; + mm = new float[][] + { null, null }; minmax.put(features[index].getType(), mm); } - if (mm[nonpos]==null) - { - mm[nonpos] = new float[] { features[index].score, features[index].score }; - + if (mm[nonpos] == null) + { + mm[nonpos] = new float[] + { features[index].score, features[index].score }; + } else { @@ -725,6 +798,7 @@ public class FeatureRenderer * Note. this operates directly on the featureOrder hash for efficiency. TODO: * eliminate the float storage for computing/recalling the persistent ordering * New Cability: updates min/max for colourscheme range if its dynamic + * * @param allFeatures */ private void updateRenderOrder(Vector allFeatures) @@ -732,7 +806,7 @@ public class FeatureRenderer Vector allfeatures = new Vector(allFeatures); String[] oldRender = renderOrder; renderOrder = new String[allfeatures.size()]; - Object mmrange,fc=null; + Object mmrange, fc = null; boolean initOrders = (featureOrder == null); int opos = 0; if (oldRender != null && oldRender.length > 0) @@ -751,21 +825,24 @@ public class FeatureRenderer renderOrder[opos++] = oldRender[j]; // existing features always // appear below new features allfeatures.removeElement(oldRender[j]); - if (minmax!=null) + if (minmax != null) { mmrange = minmax.get(oldRender[j]); - if (mmrange!=null) + if (mmrange != null) { fc = featureColours.get(oldRender[j]); - if (fc!=null && fc instanceof GraduatedColor && ((GraduatedColor)fc).isAutoScale()) + if (fc != null && fc instanceof GraduatedColor + && ((GraduatedColor) fc).isAutoScale()) { - ((GraduatedColor) fc).updateBounds(((float[][])mmrange)[0][0],((float[][])mmrange)[0][1]); + ((GraduatedColor) fc).updateBounds( + ((float[][]) mmrange)[0][0], + ((float[][]) mmrange)[0][1]); } + } } } } } - } } if (allfeatures.size() == 0) { @@ -782,16 +859,18 @@ public class FeatureRenderer while (en.hasMoreElements()) { newf[i] = en.nextElement().toString(); - if (minmax!=null) + if (minmax != null) { // update from new features minmax if necessary mmrange = minmax.get(newf[i]); - if (mmrange!=null) + if (mmrange != null) { fc = featureColours.get(newf[i]); - if (fc!=null && fc instanceof GraduatedColor && ((GraduatedColor)fc).isAutoScale()) + if (fc != null && fc instanceof GraduatedColor + && ((GraduatedColor) fc).isAutoScale()) { - ((GraduatedColor) fc).updateBounds(((float[][])mmrange)[0][0],((float[][])mmrange)[0][1]); + ((GraduatedColor) fc).updateBounds(((float[][]) mmrange)[0][0], + ((float[][]) mmrange)[0][1]); } } } @@ -818,15 +897,18 @@ public class FeatureRenderer sortOrder = null; System.arraycopy(newf, 0, renderOrder, opos, newf.length); } + /** - * get a feature style object for the given type string. - * Creates a java.awt.Color for a featureType with no existing - * colourscheme. - * TODO: replace return type with object implementing standard abstract colour/style interface + * get a feature style object for the given type string. Creates a + * java.awt.Color for a featureType with no existing colourscheme. TODO: + * replace return type with object implementing standard abstract colour/style + * interface + * * @param featureType * @return java.awt.Color or GraduatedColor */ - public Object getFeatureStyle(String featureType) { + public Object getFeatureStyle(String featureType) + { Object fc = featureColours.get(featureType); if (fc == null) { @@ -836,15 +918,17 @@ public class FeatureRenderer } return fc; } + /** * return a nominal colour for this feature + * * @param featureType * @return standard color, or maximum colour for graduated colourscheme */ public Color getColour(String featureType) { Object fc = getFeatureStyle(featureType); - + if (fc instanceof Color) { return (Color) fc; @@ -856,11 +940,12 @@ public class FeatureRenderer return ((GraduatedColor) fc).getMaxColor(); } } - throw new Error("Implementation Error: Unrecognised render object "+fc.getClass()+" for features of type "+featureType); + throw new Error(MessageManager.formatMessage("error.implementation_error_unrecognised_render_object_for_features_type", new String[]{fc.getClass().toString(),featureType})); } /** - * calculate the render colour for a specific feature using current feature settings. + * calculate the render colour for a specific feature using current feature + * settings. * * @param feature * @return render colour for the given feature @@ -879,27 +964,34 @@ public class FeatureRenderer return ((GraduatedColor) fc).findColor(feature); } } - throw new Error("Implementation Error: Unrecognised render object "+fc.getClass()+" for features of type "+feature.getType()); + throw new Error(MessageManager.formatMessage("error.implementation_error_unrecognised_render_object_for_features_type", new String[]{fc.getClass().toString(),feature.getType()})); } + private boolean showFeature(SequenceFeature sequenceFeature) { Object fc = getFeatureStyle(sequenceFeature.type); if (fc instanceof GraduatedColor) { return ((GraduatedColor) fc).isColored(sequenceFeature); - } else { return true; } + } + else + { + return true; + } } - //// ///////////// - //// Feature Editing Dialog - //// Will be refactored in next release. - + // // ///////////// + // // Feature Editing Dialog + // // Will be refactored in next release. + static String lastFeatureAdded; static String lastFeatureGroupAdded; static String lastDescriptionAdded; - Object oldcol,fcol; + + Object oldcol, fcol; + int featureIndex = 0; boolean amendFeatures(final SequenceI[] sequences, @@ -921,42 +1013,46 @@ public class FeatureRenderer final FeatureRenderer me = this; final JLabel colour = new JLabel(); colour.setOpaque(true); - //colour.setBorder(BorderFactory.createEtchedBorder()); + // colour.setBorder(BorderFactory.createEtchedBorder()); colour.setMaximumSize(new Dimension(30, 16)); colour.addMouseListener(new MouseAdapter() { - FeatureColourChooser fcc =null; + FeatureColourChooser fcc = null; + public void mousePressed(MouseEvent evt) { if (fcol instanceof Color) { - Color col = JColorChooser.showDialog(Desktop.desktop, - "Select Feature Colour", ((Color)fcol)); - if (col != null) - { - fcol = col; - updateColourButton(bigPanel,colour,col); + Color col = JColorChooser.showDialog(Desktop.desktop, + MessageManager.getString("label.select_feature_colour"), ((Color) fcol)); + if (col != null) + { + fcol = col; + updateColourButton(bigPanel, colour, col); + } } - } else { - - if (fcc==null) { - final String type = features[featureIndex].getType(); + else + { + + if (fcc == null) + { + final String type = features[featureIndex].getType(); fcc = new FeatureColourChooser(me, type); fcc.setRequestFocusEnabled(true); fcc.requestFocus(); - fcc.addActionListener(new ActionListener() { + fcc.addActionListener(new ActionListener() + { public void actionPerformed(ActionEvent e) { fcol = fcc.getLastColour(); fcc = null; setColour(type, fcol); - updateColourButton(bigPanel,colour,fcol); + updateColourButton(bigPanel, colour, fcol); } - } - ); - + }); + } } } @@ -970,7 +1066,7 @@ public class FeatureRenderer { panel = new JPanel(new GridLayout(4, 1)); tmp = new JPanel(); - tmp.add(new JLabel("Select Feature: ")); + tmp.add(new JLabel(MessageManager.getString("label.select_feature"))); overlaps = new JComboBox(); for (int i = 0; i < features.length; i++) { @@ -1009,7 +1105,7 @@ public class FeatureRenderer .createColourFromName(name.getText()); } oldcol = fcol = col; - updateColourButton(bigPanel, colour,col); + updateColourButton(bigPanel, colour, col); } }); @@ -1020,25 +1116,33 @@ public class FeatureRenderer tmp = new JPanel(); panel.add(tmp); - tmp.add(new JLabel("Name: ", JLabel.RIGHT)); + tmp.add(new JLabel(MessageManager.getString("label.name"), JLabel.RIGHT)); tmp.add(name); tmp = new JPanel(); panel.add(tmp); - tmp.add(new JLabel("Group: ", JLabel.RIGHT)); + tmp.add(new JLabel(MessageManager.getString("label.group") + ":", + JLabel.RIGHT)); tmp.add(source); tmp = new JPanel(); panel.add(tmp); - tmp.add(new JLabel("Colour: ", JLabel.RIGHT)); + tmp.add(new JLabel(MessageManager.getString("label.colour"), + JLabel.RIGHT)); tmp.add(colour); colour.setPreferredSize(new Dimension(150, 15)); - + colour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 9)); + colour.setForeground(Color.black); + colour.setHorizontalAlignment(SwingConstants.CENTER); + colour.setVerticalAlignment(SwingConstants.CENTER); + colour.setHorizontalTextPosition(SwingConstants.CENTER); + colour.setVerticalTextPosition(SwingConstants.CENTER); bigPanel.add(panel, BorderLayout.NORTH); panel = new JPanel(); - panel.add(new JLabel("Description: ", JLabel.RIGHT)); - description.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); + panel.add(new JLabel(MessageManager.getString("label.description"), + JLabel.RIGHT)); + description.setFont(JvSwingUtils.getTextAreaFont()); description.setLineWrap(true); panel.add(new JScrollPane(description)); @@ -1047,9 +1151,11 @@ public class FeatureRenderer bigPanel.add(panel, BorderLayout.SOUTH); panel = new JPanel(); - panel.add(new JLabel(" Start:", JLabel.RIGHT)); + panel.add(new JLabel(MessageManager.getString("label.start"), + JLabel.RIGHT)); panel.add(start); - panel.add(new JLabel(" End:", JLabel.RIGHT)); + panel.add(new JLabel(MessageManager.getString("label.end"), + JLabel.RIGHT)); panel.add(end); bigPanel.add(panel, BorderLayout.CENTER); } @@ -1096,7 +1202,8 @@ public class FeatureRenderer start.setValue(new Integer(features[0].getBegin())); end.setValue(new Integer(features[0].getEnd())); description.setText(features[0].getDescription()); - updateColourButton(bigPanel, colour, (oldcol = fcol = getFeatureStyle(name.getText()))); + updateColourButton(bigPanel, colour, + (oldcol = fcol = getFeatureStyle(name.getText()))); Object[] options; if (!newFeatures) { @@ -1109,12 +1216,12 @@ public class FeatureRenderer { "OK", "Cancel" }; } - String title = newFeatures ? "Create New Sequence Feature(s)" - : "Amend/Delete Features for " + sequences[0].getName(); + String title = newFeatures ? MessageManager.getString("label.create_new_sequence_features") + : MessageManager.formatMessage("label.amend_delete_features", new String[]{sequences[0].getName()}); int reply = JOptionPane.showInternalOptionDialog(Desktop.desktop, bigPanel, title, JOptionPane.YES_NO_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE, null, options, "OK"); + JOptionPane.QUESTION_MESSAGE, null, options, MessageManager.getString("action.ok")); jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile(); @@ -1186,7 +1293,8 @@ public class FeatureRenderer featureGroups.put(lastFeatureGroupAdded, new Boolean(true)); } setColour(lastFeatureAdded, fcol); - av.featuresDisplayed.put(lastFeatureAdded, getColour(lastFeatureAdded)); + av.featuresDisplayed.put(lastFeatureAdded, + getColour(lastFeatureAdded)); findAllFeatures(false); @@ -1207,32 +1315,40 @@ public class FeatureRenderer /** * update the amend feature button dependent on the given style - * @param bigPanel + * + * @param bigPanel * @param col - * @param col2 + * @param col2 */ - protected void updateColourButton(JPanel bigPanel, JLabel colour, Object col2) + protected void updateColourButton(JPanel bigPanel, JLabel colour, + Object col2) { colour.removeAll(); colour.setIcon(null); colour.setToolTipText(null); colour.setText(""); - if (col2 instanceof Color) { - colour.setBackground((Color)col2); - } else { + + if (col2 instanceof Color) + { + colour.setBackground((Color) col2); + } + else + { colour.setBackground(bigPanel.getBackground()); - colour.setForeground(bigPanel.getForeground()); + colour.setForeground(Color.black); FeatureSettings.renderGraduatedColor(colour, (GraduatedColor) col2); - //colour.setForeground(colour.getBackground()); + // colour.setForeground(colour.getBackground()); } } public void setColour(String featureType, Object col) { // overwrite -// Color _col = (col instanceof Color) ? ((Color) col) : (col instanceof GraduatedColor) ? ((GraduatedColor) col).getMaxColor() : null; -// Object c = featureColours.get(featureType); -// if (c == null || c instanceof Color || (c instanceof GraduatedColor && !((GraduatedColor)c).getMaxColor().equals(_col))) + // Color _col = (col instanceof Color) ? ((Color) col) : (col instanceof + // GraduatedColor) ? ((GraduatedColor) col).getMaxColor() : null; + // Object c = featureColours.get(featureType); + // if (c == null || c instanceof Color || (c instanceof GraduatedColor && + // !((GraduatedColor)c).getMaxColor().equals(_col))) { featureColours.put(featureType, col); } @@ -1251,8 +1367,8 @@ public class FeatureRenderer /** * Replace current ordering with new ordering * - * @param data { - * String(Type), Colour(Type), Boolean(Displayed) } + * @param data + * { String(Type), Colour(Type), Boolean(Displayed) } */ public void setFeaturePriority(Object[][] data) { @@ -1261,10 +1377,10 @@ public class FeatureRenderer /** * - * @param data { - * String(Type), Colour(Type), Boolean(Displayed) } + * @param data + * { String(Type), Colour(Type), Boolean(Displayed) } * @param visibleNew - * when true current featureDisplay list will be cleared + * when true current featureDisplay list will be cleared */ public void setFeaturePriority(Object[][] data, boolean visibleNew) { @@ -1294,7 +1410,8 @@ public class FeatureRenderer for (int i = 0; i < data.length; i++) { String type = data[i][0].toString(); - setColour(type, data[i][1]); // todo : typesafety - feature color interface object + setColour(type, data[i][1]); // todo : typesafety - feature color + // interface object if (((Boolean) data[i][2]).booleanValue()) { av.featuresDisplayed.put(type, new Integer(getColour(type) @@ -1307,17 +1424,17 @@ public class FeatureRenderer } - Hashtable featureOrder = null; + Map featureOrder = null; /** * analogous to colour - store a normalized ordering for all feature types in * this rendering context. * * @param type - * Feature type string + * Feature type string * @param position - * normalized priority - 0 means always appears on top, 1 means - * always last. + * normalized priority - 0 means always appears on top, 1 means + * always last. */ public float setOrder(String type, float position) {