Added absolute delta to available line series

portfolio-performance · May 29, 2014 · 9880c0f · 9880c0f
1 parent 99ed5dd
commit 9880c0f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 1 deletion.
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
@@ -218,6 +218,7 @@ public class Messages extends NLS
     public static String JurisdictionFilesDownloadExplanation;
     public static String JurisdictionFilesDownloadMessage;
     public static String JurisdictionFilesDownloadTitle;
+    public static String LabelAbsoluteDelta;
     public static String LabelAccounts;
     public static String LabelAccumulatedTaxes;
     public static String LabelAggregationDaily;

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
@@ -425,6 +425,8 @@ JurisdictionFilesDownloadMessage = Your current Java installation does not suppo
 
 JurisdictionFilesDownloadTitle = AES 256 not supported
 
+LabelAbsoluteDelta = Delta (Total Sum - Invested Capital)
+
 LabelAccounts = Accounts
 
 LabelAccumulatedTaxes = Taxes (accumulated)

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
@@ -423,6 +423,8 @@ JurisdictionFilesDownloadMessage = Die aktuelle Java Installation unterst\u00FCt
 
 JurisdictionFilesDownloadTitle = AES 256 nicht unterst\u00FCtzt
 
+LabelAbsoluteDelta = Delta (Gesamtsumme - investiertes Kapital)
+
 LabelAccounts = Konten
 
 LabelAccumulatedTaxes = Steuern (akkumuliiert)

diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/ChartConfigurator.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/ChartConfigurator.java
@@ -61,7 +61,7 @@
 {
     /* package */static enum ClientDataSeries
     {
-        TOTALS, INVESTED_CAPITAL, TRANSFERALS, TAXES;
+        TOTALS, INVESTED_CAPITAL, TRANSFERALS, TAXES, ABSOLUTE_DELTA;
     }
 
     /* package */static final class DataSeries
@@ -359,6 +359,10 @@ private void buildAvailableDataSeries()
                 series.setShowArea(true);
                 availableSeries.add(series);
 
+                series = new DataSeries(Client.class, ClientDataSeries.ABSOLUTE_DELTA, Messages.LabelAbsoluteDelta,
+                                Display.getDefault().getSystemColor(SWT.COLOR_GRAY));
+                availableSeries.add(series);
+
                 series = new DataSeries(Client.class, ClientDataSeries.TAXES, Messages.LabelAccumulatedTaxes, Display
                                 .getDefault().getSystemColor(SWT.COLOR_RED));
                 availableSeries.add(series);

diff --git a/...buchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/StatementOfAssetsHistoryView.java b/...buchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/StatementOfAssetsHistoryView.java
@@ -197,6 +197,12 @@ private void addClient(DataSeries item, List<Exception> warnings)
                                 item.getLabel());
                 item.configure(ivSeries);
                 break;
+            case ABSOLUTE_DELTA:
+                ILineSeries dSeries = chart.addDateSeries(clientIndex.getDates(), //
+                                toDouble(clientIndex.calculateAbsoluteDelta(), Values.Amount.divider()), //
+                                item.getLabel());
+                item.configure(dSeries);
+                break;
             case TAXES:
                 ILineSeries txSeries = chart.addDateSeries(clientIndex.getDates(), //
                                 accumulateAndToDouble(clientIndex.getTaxes(), Values.Amount.divider()), //

diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/snapshot/PerformanceIndex.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/snapshot/PerformanceIndex.java
@@ -140,6 +140,16 @@ public long[] calculateInvestedCapital()
         return investedCapital;
     }
 
+    public long[] calculateAbsoluteDelta()
+    {
+        long[] answer = calculateInvestedCapital();
+
+        for (int ii = 0; ii < answer.length; ii++)
+            answer[ii] = totals[ii] - answer[ii];
+
+        return answer;
+    }
+
     public DateTime getFirstDataPoint()
     {
         for (int ii = 0; ii < totals.length; ii++)