introduces charttools with new crosshair tool

portfolio-performance · Jul 29, 2023 · d00ef3b · d00ef3b
1 parent 7a18f0c
commit d00ef3b
Show file tree

Hide file tree

Showing 25 changed files with 574 additions and 251 deletions.
diff --git a/name.abuchen.portfolio.ui/icons/crosshair_off.png b/name.abuchen.portfolio.ui/icons/crosshair_off.png
diff --git a/name.abuchen.portfolio.ui/icons/crosshair_off@2x.png b/name.abuchen.portfolio.ui/icons/crosshair_off@2x.png
diff --git a/name.abuchen.portfolio.ui/icons/crosshair_on.png b/name.abuchen.portfolio.ui/icons/crosshair_on.png
diff --git a/name.abuchen.portfolio.ui/icons/crosshair_on@2x.png b/name.abuchen.portfolio.ui/icons/crosshair_on@2x.png
diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Images.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Images.java
@@ -56,6 +56,8 @@ public enum Images
     CLOUD("cloud.png"), //$NON-NLS-1$
     MEASUREMENT_ON("measurement_on.png"), //$NON-NLS-1$
     MEASUREMENT_OFF("measurement_off.png"), //$NON-NLS-1$
+    CROSSHAIR_ON("crosshair_on.png"), //$NON-NLS-1$
+    CROSSHAIR_OFF("crosshair_off.png"), //$NON-NLS-1$
 
     // views
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/Messages.java
@@ -591,6 +591,7 @@ public class Messages extends NLS
     public static String LabelConvertBuySellIntoDeliveryTransactions;
     public static String LabelCopyToClipboard;
     public static String LabelCountry;
+    public static String BtnLabelCrosshair;
     public static String LabelCurrencies;
     public static String LabelCurrencyConverter;
     public static String LabelCurrentDate;
@@ -786,7 +787,7 @@ public class Messages extends NLS
     public static String LabelKeyIndicators;
     public static String LabelMaxDrawdown;
     public static String LabelMaxDrawdownDuration;
-    public static String LabelMeasureDistance;
+    public static String BtnLabelMeasureDistance;
     public static String LabelMetricCheckInterval;
     public static String LabelMetric;
     public static String LabelMetricDays;

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages.properties
@@ -1192,6 +1192,8 @@ LabelCopyToClipboard = Copy to Clipboard
 
 LabelCountry = Country
 
+BtnLabelCrosshair=Crosshair
+
 LabelCurrencies = Currencies
 
 LabelCurrencyConverter = Currency Converter
@@ -1380,7 +1382,7 @@ LabelMaxDrawdown = Maximum Drawdown
 
 LabelMaxDrawdownDuration = Max Drawdown Duration
 
-LabelMeasureDistance = Measure distance
+BtnLabelMeasureDistance = Measure distance
 
 LabelMetric = Metric
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_cs.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_cs.properties
@@ -1186,6 +1186,8 @@ LabelCopyToClipboard = Zkop\u00EDrovat do schr\u00E1nky
 
 LabelCountry = Zem\u011B
 
+BtnLabelCrosshair = Crosshair
+
 LabelCurrencies = M\u011Bny
 
 LabelCurrencyConverter = P\u0159evodn\u00EDk m\u011Bn
@@ -1374,7 +1376,7 @@ LabelMaxDrawdown = Maxim\u00E1ln\u00ED \u010Derp\u00E1n\u00ED
 
 LabelMaxDrawdownDuration = Maxim\u00E1ln\u00ED doba \u010Derp\u00E1n\u00ED
 
-LabelMeasureDistance = M\u011B\u0159en\u00ED vzd\u00E1lenosti
+BtnLabelMeasureDistance = M\u011B\u0159en\u00ED vzd\u00E1lenosti
 
 LabelMetric = Metrika
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_da.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_da.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = Kopier til udklipsholder
 
 LabelCountry = Land
 
+BtnLabelCrosshair = Tr\u00E5dkors
+
 LabelCurrencies = Valutaer
 
 LabelCurrencyConverter = Valuta
@@ -1373,7 +1375,7 @@ LabelMaxDrawdown = Maksimale Tilbagefald
 
 LabelMaxDrawdownDuration = Maksimale Tilbagefald Varighed
 
-LabelMeasureDistance = M\u00E5ling af afstand
+BtnLabelMeasureDistance = M\u00E5ling af afstand
 
 LabelMetric = Metrisk
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_de.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_de.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = In Zwischenablage kopieren
 
 LabelCountry = Land
 
+BtnLabelCrosshair = Fadenkreuz
+
 LabelCurrencies = W\u00E4hrungen
 
 LabelCurrencyConverter = W\u00E4hrungsrechner
@@ -1373,7 +1375,7 @@ LabelMaxDrawdown = Maximaler Drawdown
 
 LabelMaxDrawdownDuration = Maximale Drawdown Duration
 
-LabelMeasureDistance = Abstand messen
+BtnLabelMeasureDistance = Abstand messen
 
 LabelMetric = Metrik
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_es.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_es.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = Copiar al portapapeles
 
 LabelCountry = Pa\u00EDs
 
+BtnLabelCrosshair = Crosshair
+
 LabelCurrencies = Monedas
 
 LabelCurrencyConverter = Conversor de Moneda
@@ -1373,7 +1375,7 @@ LabelMaxDrawdown = Drawdown m\u00E1ximo
 
 LabelMaxDrawdownDuration = M\u00E1xima duraci\u00F3n de Drawdown
 
-LabelMeasureDistance = Modo de Medici\u00F3n
+BtnLabelMeasureDistance = Modo de Medici\u00F3n
 
 LabelMetric = M\u00E9trico
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_fr.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_fr.properties
@@ -1186,6 +1186,8 @@ LabelCopyToClipboard = Copier dans le presse-papier
 
 LabelCountry = Pays
 
+BtnLabelCrosshair = R\u00E9ticule
+
 LabelCurrencies = Devises
 
 LabelCurrencyConverter = Convertisseur de devise
@@ -1368,7 +1370,7 @@ LabelMaxDrawdown = Maximum Drawdown
 
 LabelMaxDrawdownDuration = Dur\u00E9e Max. Drawdown
 
-LabelMeasureDistance = Mesurer la distance
+BtnLabelMeasureDistance = Mesurer la distance
 
 LabelMetric = M\u00E9trique
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_it.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_it.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = Copia negli appunti
 
 LabelCountry = Nazione
 
+BtnLabelCrosshair = Mirino
+
 LabelCurrencies = Valute
 
 LabelCurrencyConverter = Convertitore valuta
@@ -1373,7 +1375,7 @@ LabelMaxDrawdown = Massimo Drawdown
 
 LabelMaxDrawdownDuration = Durata Max Drawdown
 
-LabelMeasureDistance = Misura distanza
+BtnLabelMeasureDistance = Misura distanza
 
 LabelMetric = Metrico
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_nl.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_nl.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = Kopi\u00EBren naar klembord
 
 LabelCountry = Land
 
+BtnLabelCrosshair = Dradenkruis
+
 LabelCurrencies = Valuta
 
 LabelCurrencyConverter = Valuta Converter
@@ -1373,7 +1375,7 @@ LabelMaxDrawdown = Maximale daling
 
 LabelMaxDrawdownDuration = Max. duur van de daling
 
-LabelMeasureDistance = Afstand meten
+BtnLabelMeasureDistance = Afstand meten
 
 LabelMetric = Metriek
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pl.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pl.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = Skopiuj do schowka
 
 LabelCountry = Kraj
 
+BtnLabelCrosshair = Celownik
+
 LabelCurrencies = Waluty
 
 LabelCurrencyConverter = Przelicznik walut
@@ -1373,7 +1375,7 @@ LabelMaxDrawdown = Maksymalna wyp\u0142ata
 
 LabelMaxDrawdownDuration = Maksymalny czas wyp\u0142aty
 
-LabelMeasureDistance = Zmierz odleg\u0142o\u015B\u0107
+BtnLabelMeasureDistance = Zmierz odleg\u0142o\u015B\u0107
 
 LabelMetric = Metryczny
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_pt.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = Copiar para a \u00E1rea de transfer\u00EAncia
 
 LabelCountry = Pa\u00EDs
 
+BtnLabelCrosshair = Mira
+
 LabelCurrencies = Moedas
 
 LabelCurrencyConverter = Conversor de Moedas
@@ -1373,7 +1375,7 @@ LabelMaxDrawdown = Drawdown m\u00E1ximo
 
 LabelMaxDrawdownDuration = Dura\u00E7\u00E3o m\u00E1xima do drawdown
 
-LabelMeasureDistance = Medir dist\u00E2ncia
+BtnLabelMeasureDistance = Medir dist\u00E2ncia
 
 LabelMetric = M\u00E9trica
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_ru.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_ru.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = \u041A\u043E\u043F\u0438\u0440\u043E\u0432\u0430\u0442\u0
 
 LabelCountry = \u0421\u0442\u0440\u0430\u043D\u0430
 
+BtnLabelCrosshair = \u041F\u0435\u0440\u0435\u043A\u0440\u0435\u0441\u0442\u0438\u0435
+
 LabelCurrencies = \u0412\u0430\u043B\u044E\u0442\u044B
 
 LabelCurrencyConverter = \u041A\u043E\u043D\u0432\u0435\u0440\u0442\u0435\u0440 \u0432\u0430\u043B\u044E\u0442
@@ -1371,7 +1373,7 @@ LabelMaxDrawdown = \u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\
 
 LabelMaxDrawdownDuration = \u041C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0430\u044F \u0434\u043B\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u044C \u043F\u0440\u043E\u0441\u0430\u0434\u043A\u0438
 
-LabelMeasureDistance = \u0418\u0437\u043C\u0435\u0440\u044C\u0442\u0435 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435
+BtnLabelMeasureDistance = \u0418\u0437\u043C\u0435\u0440\u044C\u0442\u0435 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\u0435
 
 LabelMetric = \u041C\u0435\u0442\u0440\u0438\u043A\u0430
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_sk.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_sk.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = Kop\u00EDrovanie do schr\u00E1nky
 
 LabelCountry = Krajina
 
+BtnLabelCrosshair = Kri\u017Eovatka
+
 LabelCurrencies = Meny
 
 LabelCurrencyConverter = Konverzn\u00E1 kalkula\u010Dka
@@ -1373,7 +1375,7 @@ LabelMaxDrawdown = Maxim\u00E1lne \u010Derpanie
 
 LabelMaxDrawdownDuration = Maxim\u00E1lna d\u013A\u017Eka \u010Derpania
 
-LabelMeasureDistance = Meranie vzdialenosti
+BtnLabelMeasureDistance = Meranie vzdialenosti
 
 LabelMetric = Metrick\u00E9
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh.properties b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/messages_zh.properties
@@ -1185,6 +1185,8 @@ LabelCopyToClipboard = \u590D\u5236\u81F3\u526A\u8D34\u677F
 
 LabelCountry = \u56FD\u5BB6\u6216\u5730\u533A
 
+BtnLabelCrosshair = \u5341\u5B57\u51C6\u7EBF
+
 LabelCurrencies = \u8D27\u5E01
 
 LabelCurrencyConverter = \u6C47\u7387\u8F6C\u6362\u5668
@@ -1373,7 +1375,7 @@ LabelMaxDrawdown = \u6700\u5927\u56DE\u64A4
 
 LabelMaxDrawdownDuration = \u6700\u957F\u56DE\u64A4\u671F
 
-LabelMeasureDistance = \u6D4B\u91CF\u8DDD\u79BB
+BtnLabelMeasureDistance = \u6D4B\u91CF\u8DDD\u79BB
 
 LabelMetric = \u5EA6\u91CF
 

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/theme/ChartCSSHandler.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/theme/ChartCSSHandler.java
@@ -82,7 +82,7 @@ else if (MEASUREMENT_COLOR.equalsIgnoreCase(property)
                         && chart instanceof TimelineChart timelineChart)
         {
             Color newColor = (Color) engine.convert(value, Color.class, control.getDisplay());
-            timelineChart.getMeasurementTool().setColor(newColor);
+            timelineChart.getChartToolsManager().setColor(newColor);
         }
     }
 
@@ -116,7 +116,7 @@ else if (BACKGROUND_COLOR.equalsIgnoreCase(property))
         else if (MEASUREMENT_COLOR.equalsIgnoreCase(property) && chart instanceof TimelineChart timelineChart)
         {
             ICSSValueConverter cssValueConverter = engine.getCSSValueConverter(String.class);
-            return cssValueConverter.convert(timelineChart.getMeasurementTool().getColor(), engine, null);
+            return cssValueConverter.convert(timelineChart.getChartToolsManager().getColor(), engine, null);
         }
 
         return null;

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/util/chart/ChartContextMenu.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/util/chart/ChartContextMenu.java
@@ -48,7 +48,7 @@ private void configMenuAboutToShow(IMenuManager manager)
     {
         if (chart instanceof TimelineChart timelineChart)
         {
-            timelineChart.getMeasurementTool().addContextMenu(manager);
+            timelineChart.getChartToolsManager().addContextMenu(manager);
             manager.add(new Separator());
         }