Author: RobTerpilowski

.gitignore

@@ -0,0 +1 @@
+/target/

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.zoicapital</groupId>
     <artifactId>StockChartsFx</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>StockChartsFx</name>
@@ -15,8 +15,7 @@
     </properties>
 
     <organization>
-        <!-- Used as the 'Vendor' for JNLP generation -->
-        <name>Your Organisation</name>
+        <name>Zoi Capital, LLC</name>
     </organization>
 
     <build>
@@ -104,5 +103,12 @@
             </plugin>
         </plugins>
     </build>
-
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

src/main/java/com/zoicapital/stockchartsfx/CandleStickChart.java

@@ -1,19 +1,20 @@
 package com.zoicapital.stockchartsfx;
 /*
-Copyright 2014 Zoi Capital, LLC
+ Copyright 2014 Zoi Capital, LLC
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
 
-    http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
  */
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -38,14 +39,15 @@
 import javafx.scene.shape.Path;
 import javafx.util.Duration;
 
-
- /**
- * A candlestick chart is a style of bar-chart used primarily to describe
- * price movements of a security, derivative, or currency over time.
+/**
+ * A candlestick chart is a style of bar-chart used primarily to describe price
+ * movements of a security, derivative, or currency over time.
  *
- * The Data Y value is used for the opening price and then the close, high
- * and low values are stored in the Data's extra value property using a
+ * The Data Y value is used for the opening price and then the close, high and
+ * low values are stored in the Data's extra value property using a
  * CandleStickExtraValues object.
+ * 
+ * 
  */
 public class CandleStickChart extends XYChart<String, Number> {
 
@@ -54,31 +56,48 @@ public class CandleStickChart extends XYChart<String, Number> {
     protected int maxBarsToDisplay;
     protected ObservableList<XYChart.Series<String, Number>> dataSeries;
     protected BarData lastBar;
+    protected NumberAxis yAxis;
+    protected CategoryAxis xAxis;
 
+    
+    
+    /**
+     * 
+     * @param title The chart title
+     * @param bars  The bars data to display in the chart.
+     */
     public CandleStickChart(String title, List<BarData> bars) {
         this(title, bars, Integer.MAX_VALUE);
     }
 
+    
+    /**
+     * 
+     * @param title The chart title
+     * @param bars The bars to display in the chart
+     * @param maxBarsToDisplay The maximum number of bars to display in the chart.
+     */
     public CandleStickChart(String title, List<BarData> bars, int maxBarsToDisplay) {
         this(title, new CategoryAxis(), new NumberAxis(), bars, maxBarsToDisplay);
     }
 
-// -------------- CONSTRUCTORS ----------------------------------------------
     /**
      * Construct a new CandleStickChart with the given axis.
      *
+     * @param title The chart title
      * @param xAxis The x axis to use
      * @param yAxis The y axis to use
-     * @param bars
-     * @param maxBarsToDisplay
+     * @param bars The bars to display on the chart
+     * @param maxBarsToDisplay The maximum number of bars to display on the chart.
      */
-    public CandleStickChart(String title, Axis<String> xAxis, Axis<Number> yAxis, List<BarData> bars, int maxBarsToDisplay) {
+    public CandleStickChart(String title, CategoryAxis xAxis, NumberAxis yAxis, List<BarData> bars, int maxBarsToDisplay) {
         super(xAxis, yAxis);
+        this.xAxis = xAxis;
+        this.yAxis = yAxis;
         this.maxBarsToDisplay = maxBarsToDisplay;
-        //yAxis.setLabel("Yxis");
-        NumberAxis y = (NumberAxis) yAxis;
+
         yAxis.autoRangingProperty().set(true);
-        y.forceZeroInRangeProperty().setValue(Boolean.FALSE);
+        yAxis.forceZeroInRangeProperty().setValue(Boolean.FALSE);
         setTitle(title);
         setAnimated(true);
         getStylesheets().add(getClass().getResource("/styles/CandleStickChartStyles.css").toExternalForm());
@@ -101,15 +120,20 @@ public CandleStickChart(String title, Axis<String> xAxis, Axis<Number> yAxis, Li
         lastBar = sublist.get(sublist.size() - 1);
     }
 
-    protected List<BarData> getSubList(List<BarData> bars, int maxBars) {
-        List<BarData> sublist;
-        if (bars.size() > maxBars) {
-            return bars.subList(bars.size() - 1 - maxBars, bars.size() - 1);
-        } else {
-            return bars;
-        }
+    
+    /**
+     * Defines a formatter to use when formatting the y-axis values.
+     * @param formatter The formatter to use when formatting the y-axis values.
+     */
+    public void setYAxisFormatter(DecimalAxisFormatter formatter) {
+        yAxis.setTickLabelFormatter(formatter);
     }
 
+    
+    /**
+     * Appends a new bar on to the end of the chart.
+     * @param bar The bar to append to the chart
+     */
     public void addBar(BarData bar) {
 
         if (dataSeries.get(0).getData().size() >= maxBarsToDisplay) {
@@ -126,8 +150,16 @@ public void addBar(BarData bar) {
         lastBar = new BarData(bar.getDateTime(), bar.getClose(), bar.getClose(), bar.getClose(), bar.getClose(), 0);
         Data<String, Number> data = new XYChart.Data<>(label, lastBar.getOpen(), lastBar);
         dataSeries.get(0).getData().add(data);
+        
+        
+        
     }
 
+    
+    /**
+     * Update the "Last" price of the most recent bar
+     * @param price The Last price of the most recent bar.
+     */
     public void updateLast(double price) {
         if (lastBar != null) {
             lastBar.update(price);
@@ -141,6 +173,17 @@ public void updateLast(double price) {
         }
     }
 
+    
+    
+    protected List<BarData> getSubList(List<BarData> bars, int maxBars) {
+        List<BarData> sublist;
+        if (bars.size() > maxBars) {
+            return bars.subList(bars.size() - 1 - maxBars, bars.size() - 1);
+        } else {
+            return bars;
+        }
+    }
+
     // -------------- METHODS ------------------------------------------------------------------------------------------
     /**
      * Called to update and layout the content for the plot
@@ -428,5 +471,3 @@ public void update(double open, double close, double high, double low) {
     protected static CandleStickChart chart;
 
 }
-
-

src/main/java/com/zoicapital/stockchartsfx/DecimalAxisFormatter.java

@@ -0,0 +1,47 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.zoicapital.stockchartsfx;
+
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.util.StringConverter;
+
+/**
+ *
+ * @author RobTerpilowski
+ */
+public class DecimalAxisFormatter extends StringConverter<Number>{
+
+    protected DecimalFormat decimalFormat;
+    
+    public DecimalAxisFormatter( String format ) {
+        decimalFormat = new DecimalFormat(format);
+    }
+    
+    public DecimalAxisFormatter( DecimalFormat decimalFormat ) {
+        this.decimalFormat = decimalFormat;
+    }
+    
+    
+    @Override
+    public String toString(Number object) {
+        return decimalFormat.format(object.doubleValue());
+    }
+
+    @Override
+    public Number fromString(String string) {
+        try {
+            return decimalFormat.parse(string);
+        } catch (ParseException ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+    
+    
+    
+}

src/main/java/com/zoicapital/stockchartsfx/MainApp.java

@@ -16,6 +16,7 @@
  */
 
 
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -37,6 +38,8 @@ public void start(Stage stage) throws Exception {
         stage.setTitle("JavaFX and Maven");
         stage.setScene(scene);
         stage.show();
+        
+        candleStickChart.setYAxisFormatter(new DecimalAxisFormatter("#000.00"));
     }
 
 

src/test/java/com/zoicapital/stockchartsfx/DecimalAxisFormatterTest.java

@@ -0,0 +1,62 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.zoicapital.stockchartsfx;
+
+import java.text.DecimalFormat;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author RobTerpilowski
+ */
+public class DecimalAxisFormatterTest {
+    
+    
+    
+    public DecimalAxisFormatterTest() {
+    }
+    
+    @BeforeClass
+    public static void setUpClass() {
+    }
+    
+    @AfterClass
+    public static void tearDownClass() {
+    }
+    
+    @Before
+    public void setUp() {
+    }
+    
+    @After
+    public void tearDown() {
+    }
+    
+    
+    @Test
+    public void testStringConstructor() {
+        String format = "#000.00";
+        DecimalAxisFormatter formatter = new DecimalAxisFormatter(format);
+        
+        assertEquals( "1234.45", formatter.toString(1234.45) );
+        assertEquals( 1234.45, formatter.fromString("1234.45") );
+    }
+
+    @Test
+    public void testFormatterConstructor() {
+        String format = "#000.00";
+        DecimalAxisFormatter formatter = new DecimalAxisFormatter(new DecimalFormat(format));
+        
+        assertEquals( "1234.45", formatter.toString(1234.45) );
+        assertEquals( 1234.45, formatter.fromString("1234.45") );
+    }
+    
+}