Revision: 5624
http://sourceforge.net/p/jump-pilot/code/5624
Author: ma15569
Date: 2017-12-11 21:54:43 +0000 (Mon, 11 Dec 2017)
Log Message:
-----------
Reactivated JColorChooser according to Jukka's request
Modified Paths:
--------------
plug-ins/Color_chooser/trunk/src/language/featurecolor.properties
plug-ins/Color_chooser/trunk/src/language/featurecolor_de.properties
plug-ins/Color_chooser/trunk/src/language/featurecolor_en.properties
plug-ins/Color_chooser/trunk/src/language/featurecolor_es.properties
plug-ins/Color_chooser/trunk/src/language/featurecolor_fi.properties
plug-ins/Color_chooser/trunk/src/language/featurecolor_fr.properties
plug-ins/Color_chooser/trunk/src/language/featurecolor_it.properties
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/FeatureColorChooserPlugIn.java
Removed Paths:
-------------
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/pick-color-cursor.gif
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/pick-color.png
Modified: plug-ins/Color_chooser/trunk/src/language/featurecolor.properties
===================================================================
--- plug-ins/Color_chooser/trunk/src/language/featurecolor.properties
2017-12-11 16:49:39 UTC (rev 5623)
+++ plug-ins/Color_chooser/trunk/src/language/featurecolor.properties
2017-12-11 21:54:43 UTC (rev 5624)
@@ -8,4 +8,7 @@
pick-color-tools=Colour Tools
set-color-Tool=Set Colour
selected-items-layers-must-be-editable=Selected items must be editable
-recent-color=recent colors
\ No newline at end of file
+recent-color=recent colors
+other-color=Other color
+use-layer-style-color=Use layer style color
+
\ No newline at end of file
Modified: plug-ins/Color_chooser/trunk/src/language/featurecolor_de.properties
===================================================================
--- plug-ins/Color_chooser/trunk/src/language/featurecolor_de.properties
2017-12-11 16:49:39 UTC (rev 5623)
+++ plug-ins/Color_chooser/trunk/src/language/featurecolor_de.properties
2017-12-11 21:54:43 UTC (rev 5624)
@@ -8,4 +8,6 @@
pick-color-tools=\#T\:Colour Tools
set-color-Tool=\#T\:Set Colour
selected-items-layers-must-be-editable=Ausgew\u00E4hlte Objekte m\u00FCssen
bearbeitet werden
-recent-colors=\#T\recent colors
\ No newline at end of file
+recent-colors=\#T\recent colors
+use-layer-style-color=\#T\Use layer style color
+other-color=\#T\Other color
\ No newline at end of file
Modified: plug-ins/Color_chooser/trunk/src/language/featurecolor_en.properties
===================================================================
--- plug-ins/Color_chooser/trunk/src/language/featurecolor_en.properties
2017-12-11 16:49:39 UTC (rev 5623)
+++ plug-ins/Color_chooser/trunk/src/language/featurecolor_en.properties
2017-12-11 21:54:43 UTC (rev 5624)
@@ -9,3 +9,5 @@
set-color-Tool=Set Color
selected-items-layers-must-be-editable=Selected items must be editable
recent-color=recent colors
+other-color=Other color
+use-layer-style-color=Use layer style color
Modified: plug-ins/Color_chooser/trunk/src/language/featurecolor_es.properties
===================================================================
--- plug-ins/Color_chooser/trunk/src/language/featurecolor_es.properties
2017-12-11 16:49:39 UTC (rev 5623)
+++ plug-ins/Color_chooser/trunk/src/language/featurecolor_es.properties
2017-12-11 21:54:43 UTC (rev 5624)
@@ -8,4 +8,6 @@
pick-color-tools=Herraminetas colores
set-color-Tool=Aplicar color
selected-items-layers-must-be-editable=Los elementos seleccionados deben ser
editables
-recent-colors=Colores recientes
\ No newline at end of file
+recent-colors=Colores recientes
+other-color=Otros colores
+use-layer-style-color=Usar el color del estilo de la capa
\ No newline at end of file
Modified: plug-ins/Color_chooser/trunk/src/language/featurecolor_fi.properties
===================================================================
--- plug-ins/Color_chooser/trunk/src/language/featurecolor_fi.properties
2017-12-11 16:49:39 UTC (rev 5623)
+++ plug-ins/Color_chooser/trunk/src/language/featurecolor_fi.properties
2017-12-11 21:54:43 UTC (rev 5624)
@@ -8,4 +8,6 @@
pick-color-tools=V\u00E4ritysty\u00F6kalut
set-color-Tool=V\u00E4rity\u00F6kalu
selected-items-layers-must-be-editable=Valittujen kohteiden t\u00E4ytyy olla
muokattavissa
-recent-color=Viimeisimm\u00e4t v\u00e4rit
\ No newline at end of file
+recent-color=Viimeisimm\u00e4t v\u00e4rit
+other-color=Muu v\u00E4ri
+use-layer-style-color=\#T\Use layer style color
\ No newline at end of file
Modified: plug-ins/Color_chooser/trunk/src/language/featurecolor_fr.properties
===================================================================
--- plug-ins/Color_chooser/trunk/src/language/featurecolor_fr.properties
2017-12-11 16:49:39 UTC (rev 5623)
+++ plug-ins/Color_chooser/trunk/src/language/featurecolor_fr.properties
2017-12-11 21:54:43 UTC (rev 5624)
@@ -8,4 +8,7 @@
pick-color-tools=Outils couleur
set-color-Tool=Couleur
selected-items-layers-must-be-editable=Les \u00E9l\u00E9ments
s\u00E9lectionn\u00E9s doivent \u00EAtre modifiables
-recent-color=Couleurs r\u00E9centes
\ No newline at end of file
+recent-color=Couleurs r\u00E9centes
+custom=Par d\u00E9faut
+use-layer-style-color=\#T\Use layer style color
+other-color=\#T\Other color
\ No newline at end of file
Modified: plug-ins/Color_chooser/trunk/src/language/featurecolor_it.properties
===================================================================
--- plug-ins/Color_chooser/trunk/src/language/featurecolor_it.properties
2017-12-11 16:49:39 UTC (rev 5623)
+++ plug-ins/Color_chooser/trunk/src/language/featurecolor_it.properties
2017-12-11 21:54:43 UTC (rev 5624)
@@ -8,4 +8,6 @@
pick-color-tools=Strumenti colore
set-color-Tool=Imposta colore
selected-items-layers-must-be-editable=Gli elementi selezionati devono essere
modificabili
-recent-color=Colori recenti
\ No newline at end of file
+recent-color=Colori recenti
+other-color=Altro colore
+use-layer-style-color=Usa colore dallo stile livello
\ No newline at end of file
Modified:
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/FeatureColorChooserPlugIn.java
===================================================================
---
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/FeatureColorChooserPlugIn.java
2017-12-11 16:49:39 UTC (rev 5623)
+++
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/FeatureColorChooserPlugIn.java
2017-12-11 21:54:43 UTC (rev 5624)
@@ -14,6 +14,7 @@
import javax.swing.Icon;
import javax.swing.ImageIcon;
+import javax.swing.JColorChooser;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
@@ -40,6 +41,7 @@
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
import com.vividsolutions.jump.workbench.ui.LayerViewPanel;
+import com.vividsolutions.jump.workbench.ui.images.IconLoader;
import com.vividsolutions.jump.workbench.ui.renderer.style.BasicStyle;
import com.vividsolutions.jump.workbench.ui.task.TaskMonitorManager;
@@ -131,7 +133,7 @@
final JPopupMenu popup = new JPopupMenu();
popup.setLayout(new GridLayout(0, 1));
- mi = new JMenuItem(I18NPlug.getI18N("color-by-attribute"),
+ mi = new JMenuItem(I18NPlug.getI18N("use-layer-style-color"),
new ColorIcon(null));
final JMenu recent = new JMenu(I18NPlug.getI18N("recent-color") +
"...");
@@ -156,11 +158,12 @@
String hex = ColorUtils.colorRGBToHex(color);
String acad = ColorUtils.getColorFromRegistry(hex);
String msg = "Index color: " + acad;
- JMenuItem mis = new JMenuItem(msg,
- new FeatureColorChooserPlugIn.ColorIcon(color));
+
String text = "Hex: " + hex + " RGB: " + color.getRed()
+ "," + color.getGreen() + "," + color.getBlue();
- mis.setToolTipText(text);
+ JMenuItem mis = new JMenuItem(text,
+ new FeatureColorChooserPlugIn.ColorIcon(color));
+ mis.setToolTipText(msg);
mis.addActionListener(new
FeatureColorChooserPlugIn.ColorPickerActionListener(
color));
recent.add(mis);
@@ -175,6 +178,43 @@
popup.add(cm);
+ mi = new JMenuItem(I18NPlug.getI18N("other-color"), getColorIcon_2());
+ mi.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent paramAnonymousActionEvent)
{
+ new JColorChooser();
+ Color color = JColorChooser.showDialog(context
+ .getWorkbenchContext().getWorkbench().getFrame(),
+ I18NPlug.getI18N("choose-color"), new Color(0, 0, 0));
+ if (color != null) {
+ colorSetbutton.setColor(color);
+ setFeatureColor(color);
+ FeatureColorChooserPlugIn.this.colorSetbutton
+ .setColor(color);
+ FeatureColorChooserPlugIn.this.setFeatureColor(color);
+ String hex = ColorUtils.colorRGBToHex(color);
+ String acad = ColorUtils.getColorFromRegistry(hex);
+
+ String msg = "Index color: " + acad;
+
+ String text = "Hex: " + hex + " RGB: " + color.getRed()
+ + "," + color.getGreen() + "," + color.getBlue();
+ JMenuItem mis = new JMenuItem(text,
+ new FeatureColorChooserPlugIn.ColorIcon(color));
+ mis.setToolTipText(msg);
+ mis.addActionListener(new
FeatureColorChooserPlugIn.ColorPickerActionListener(
+ color));
+ recent.add(mis);
+ FeatureColorChooserPlugIn.this.colorPickerPopup.insert(
+ recent,
+ FeatureColorChooserPlugIn.this.customIndex++);
+ popup.revalidate();
+ popup.repaint();
+ }
+ }
+ });
+ popup.add(mi);
+
// popup.addSeparator();
mi = new JMenuItem(I18NPlug.getI18N("picker-color"),
getPickColorIcon());
PickColorPlugIn pick = new PickColorPlugIn();
@@ -213,6 +253,11 @@
return GUIUtil.toSmallIcon(icon);
}
+ public Icon getColorIcon_2() {
+ ImageIcon icon = IconLoader.icon("color_wheel.png");
+ return GUIUtil.toSmallIcon(icon);
+ }
+
public Icon getPickColorIcon() {
ImageIcon icon2 = new ImageIcon(getClass().getResource("pipette.png"));
return GUIUtil.toSmallIcon(icon2);
@@ -242,34 +287,32 @@
FeatureCollectionWrapper fcw = layer.getFeatureCollectionWrapper();
FeatureSchema schema = fcw.getFeatureSchema();
- if (schema.hasAttribute(R_G_B))
- continue;
- schema.addAttribute(R_G_B, AttributeType.STRING);
+ if (!schema.hasAttribute(R_G_B)) {
+ schema.addAttribute(R_G_B, AttributeType.STRING);
- for (Iterator<Feature> j = fcw.iterator(); j.hasNext();) {
- Feature feature = j.next();
- Object[] attributes = new Object[schema.getAttributeCount()];
+ for (Iterator<Feature> j = fcw.iterator(); j.hasNext();) {
+ Feature feature = j.next();
+ Object[] attributes = new
Object[schema.getAttributeCount()];
- for (int k = 0; k < attributes.length - 1; k++) {
- attributes[k] = feature.getAttribute(k);
+ for (int k = 0; k < attributes.length - 1; k++) {
+ attributes[k] = feature.getAttribute(k);
+ }
+ feature.setAttributes(attributes);
}
- feature.setAttributes(attributes);
}
+ if (!schema.hasAttribute(COLOR)) {
+ schema.addAttribute(COLOR, AttributeType.STRING); // .INTEGER);
+ for (Iterator<Feature> j = fcw.iterator(); j.hasNext();) {
+ Feature feature = j.next();
+ Object[] attributes = new
Object[schema.getAttributeCount()];
- if (schema.hasAttribute(COLOR))
- continue;
- schema.addAttribute(COLOR, AttributeType.STRING); // .INTEGER);
- for (Iterator<Feature> j = fcw.iterator(); j.hasNext();) {
- Feature feature = j.next();
- Object[] attributes = new Object[schema.getAttributeCount()];
-
- for (int k = 0; k < attributes.length - 1; k++) {
- attributes[k] = feature.getAttribute(k);
+ for (int k = 0; k < attributes.length - 1; k++) {
+ attributes[k] = feature.getAttribute(k);
+ }
+ feature.setAttributes(attributes);
}
- feature.setAttributes(attributes);
}
}
-
Collection<Feature> features = layerViewPanel.getSelectionManager()
.getFeaturesWithSelectedItems();
setRGB(layers, features, ColorUtils.colorRGBToHex(color));
Deleted:
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/pick-color-cursor.gif
===================================================================
(Binary files differ)
Deleted:
plug-ins/Color_chooser/trunk/src/org/openjump/core/ui/plugin/colorchooser/pick-color.png
===================================================================
(Binary files differ)
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
