Menu
▾
▴
tail-cvs — cvs commits
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(148) |
Jun
(48) |
Jul
(107) |
Aug
(292) |
Sep
(301) |
Oct
(530) |
Nov
(142) |
Dec
(37) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
|
Feb
|
Mar
(4) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Carlos <ma...@us...> - 2007-10-22 22:36:31
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14658/src/test/net/sf/tail/graphics Modified Files: CriteriaDatasetTest.java Log Message: refatoracao do jumpleft e jumpright Index: CriteriaDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CriteriaDatasetTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CriteriaDatasetTest.java 17 Oct 2007 21:37:43 -0000 1.2 --- CriteriaDatasetTest.java 22 Oct 2007 22:36:31 -0000 1.3 *************** *** 100,104 **** public void testMoveRightWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { CriteriaDataset dataset = new CriteriaDataset(reports, series, 4); ! dataset.moveRight(); assertEquals(reports.size(), dataset.getRowCount()); assertEquals(4, dataset.getColumnCount()); --- 100,104 ---- public void testMoveRightWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { CriteriaDataset dataset = new CriteriaDataset(reports, series, 4); ! dataset.moveRight(1); assertEquals(reports.size(), dataset.getRowCount()); assertEquals(4, dataset.getColumnCount()); *************** *** 109,113 **** public void testMoveLeftWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { CriteriaDataset dataset = new CriteriaDataset(reports, series, 4); ! dataset.moveLeft(); assertEquals(reports.size(), dataset.getRowCount()); assertEquals(4, dataset.getColumnCount()); --- 109,113 ---- public void testMoveLeftWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { CriteriaDataset dataset = new CriteriaDataset(reports, series, 4); ! dataset.moveLeft(1); assertEquals(reports.size(), dataset.getRowCount()); assertEquals(4, dataset.getColumnCount()); *************** *** 142,146 **** CriteriaDataset dataset = new CriteriaDataset(reports2, series2, 12); ! dataset.moveRight(); assertEquals(reports2.size(), dataset.getRowCount()); assertEquals(10, dataset.getColumnCount()); --- 142,146 ---- CriteriaDataset dataset = new CriteriaDataset(reports2, series2, 12); ! dataset.moveRight(1); assertEquals(reports2.size(), dataset.getRowCount()); assertEquals(10, dataset.getColumnCount()); *************** *** 175,180 **** CriteriaDataset dataset = new CriteriaDataset(reports2, series2, 12); ! dataset.moveRight(); ! dataset.moveLeft(); assertEquals(reports2.size(), dataset.getRowCount()); assertEquals(10, dataset.getColumnCount()); --- 175,180 ---- CriteriaDataset dataset = new CriteriaDataset(reports2, series2, 12); ! dataset.moveRight(1); ! dataset.moveLeft(1); assertEquals(reports2.size(), dataset.getRowCount()); assertEquals(10, dataset.getColumnCount()); |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-22 22:29:29
|
Update of /cvsroot/tail/TailS/Data/Help In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11568/Data/Help Added Files: Monografia_Tail.html Log Message: --- NEW FILE: Monografia_Tail.html --- <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <style> BODY, P, DIV, H1, H2, H3, H4, H5, H6, ADDRESS, OL, UL, TITLE, TD, OPTION, SELECT { font-family: Verdana; } BODY, P, DIV, ADDRESS, OL, UL, LI, TITLE, TD, OPTION, SELECT { font-size: 10.0pt; margin-top:0pt; margin-bottom:0pt; } BODY, P { margin-left:0pt; margin-right:0pt; [...2981 lines suppressed...] </li> <li> http://xstream.codehaus.org/ </li> <li> http://www.jfree.org/jfreechart/ </li> <li> http://www.junit.org/ </li> <li> http://sourceforge.net/projects/javacsv/ </li> </ul> </div> </div> </div> <br> <br></body> </html> |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-22 22:29:23
|
Update of /cvsroot/tail/TailS/Data/Help/Monografia___Tail_images In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11568/Data/Help/Monografia___Tail_images Added Files: dc5rtcqd_70g595hhfd.jpg dc6sqns7_13czg3qb6b.jpg dc6sqns7_19dnqjvsck.jpg dd33tdz9_8ddfnvf7j.png dc5rtcqd_72cqc7j9d6.jpg dc6sqns7_11gw6fxpch.jpg dc6sqns7_20gtkdg5cq.jpg dfzjdf5_14dtf8h6hq.png dd33tdz9_9gcp9qwfh.jpg dfzjdf5_17r95ckwfr.png dc5rtcqd_71cxtfhscs.jpg dc6sqns7_17hpcqwddz.jpg dd33tdz9_7d225c7gn.png dc6sqns7_14g3tfbff8.png dc6sqns7_10cwj8krcc.png dc6sqns7_18hcrmvtxc.jpg Log Message: --- NEW FILE: dc6sqns7_14g3tfbff8.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc6sqns7_10cwj8krcc.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dfzjdf5_17r95ckwfr.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dd33tdz9_8ddfnvf7j.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dd33tdz9_7d225c7gn.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc6sqns7_11gw6fxpch.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc6sqns7_19dnqjvsck.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dd33tdz9_9gcp9qwfh.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc5rtcqd_71cxtfhscs.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc6sqns7_13czg3qb6b.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dfzjdf5_14dtf8h6hq.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc6sqns7_17hpcqwddz.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc6sqns7_20gtkdg5cq.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc5rtcqd_70g595hhfd.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc6sqns7_18hcrmvtxc.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dc5rtcqd_72cqc7j9d6.jpg --- (This appears to be a binary file; contents omitted.) |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-22 22:29:05
|
Update of /cvsroot/tail/TailS/Data/Help/Monografia___Tail_images In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11470/Data/Help/Monografia___Tail_images Log Message: Directory /cvsroot/tail/TailS/Data/Help/Monografia___Tail_images added to the repository |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-22 22:29:05
|
Update of /cvsroot/tail/TailS/Data/Help In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11470/Data/Help Log Message: Directory /cvsroot/tail/TailS/Data/Help added to the repository |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-22 22:28:06
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/autocomplete In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11099/src/java/net/sf/tails/swing/frame/autocomplete Removed Files: AutoCompleteForm2.java Log Message: --- AutoCompleteForm2.java DELETED --- |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-22 22:28:06
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11099/src/java/net/sf/tails/i18n Added Files: Files.properties Log Message: --- NEW FILE: Files.properties --- HELP_FILE=Data/Help/Monografia_Tail.html |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-22 22:28:06
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/help In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11099/src/java/net/sf/tails/swing/help Added Files: HelpFrame.java Log Message: --- NEW FILE: HelpFrame.java --- /* * helpFrame.java * * Created on 22 de Outubro de 2007, 19:00 */ package net.sf.tails.swing.help; import java.io.File; import java.util.ResourceBundle; /** * * @author Marcio */ public class HelpFrame extends javax.swing.JFrame { private javax.swing.JEditorPane jEditorPane1; private javax.swing.JScrollPane jScrollPane1; /** * */ private static final long serialVersionUID = 4602119139785751108L; public HelpFrame() { ResourceBundle bundle = ResourceBundle.getBundle("net.sf.tails.i18n.Files"); initComponents(); try{ File file = new File(bundle.getString("HELP_FILE")); jEditorPane1.setPage("file:////"+file.getAbsolutePath()); }catch(Exception e){ e.printStackTrace(); } } /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ // <editor-fold defaultstate="collapsed" desc=" Código Gerado "> private void initComponents() { jScrollPane1 = new javax.swing.JScrollPane(); jEditorPane1 = new javax.swing.JEditorPane(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); jScrollPane1.setViewportView(jEditorPane1); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE) ); pack(); }// </editor-fold> /** * @param args the command line arguments */ public static void main(String args[]) { java.awt.EventQueue.invokeLater(new Runnable() { public void run() { new HelpFrame().setVisible(true); } }); } } |
|
From: Márcio V. d. S. <mv...@us...> - 2007-10-22 22:28:02
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/help In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10853/src/java/net/sf/tails/swing/help Log Message: Directory /cvsroot/tail/TailS/src/java/net/sf/tails/swing/help added to the repository |
|
From: Carlos <ma...@us...> - 2007-10-22 22:22:29
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8662/src/java/net/sf/tail/graphics Modified Files: SeriesDataset.java SeriesChart.java Log Message: Update. Index: SeriesChart.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/SeriesChart.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SeriesChart.java 22 Oct 2007 21:45:04 -0000 1.6 --- SeriesChart.java 22 Oct 2007 22:22:32 -0000 1.7 *************** *** 52,56 **** // Setando tamanho do label de cada tick ! categoryAxis.setTickLabelFont(new Font("SansSerif", 0, 10)); if(dateText) { --- 52,56 ---- // Setando tamanho do label de cada tick ! categoryAxis.setTickLabelFont(new Font("SansSerif", 0, 8)); if(dateText) { Index: SeriesDataset.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/SeriesDataset.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** SeriesDataset.java 22 Oct 2007 20:11:53 -0000 1.11 --- SeriesDataset.java 22 Oct 2007 22:22:32 -0000 1.12 *************** *** 131,147 **** return this.data.getValue(row, column); } ! ! public void moveRight() { ! if (lastIndex + 1 < series.getSize()) { ! lastIndex++; ! for (Indicator<? extends Number> indicator : indicators) { ! data.addValue(indicator.getValue(lastIndex), indicator.getName() + ": "+ series.getTick(series.getBegin()).getDateName() + " - " + series.getTick(series.getEnd()).getDateName(), series.getTick(lastIndex).getDate() ! .toString("hh:mm d/M/yyyy")); } if (data.getColumnCount() >= DATASET_SIZE) { ! firstIndex++; ! data.removeColumn(0); } if(trades.size() > 0) --- 131,158 ---- return this.data.getValue(row, column); } ! ! public void moveRight(int size) { if (lastIndex + 1 < series.getSize()) { ! int steps = series.getSize() - lastIndex - 1; ! if (steps > size) ! { ! steps = size; ! } ! ! for (int i = 0; i < steps; i++) ! { ! lastIndex ++; ! for (Indicator<? extends Number> indicator : indicators) { ! data.addValue(indicator.getValue(lastIndex), indicator.getName() + ": "+ series.getTick(series.getBegin()).getDateName() + " - " + series.getTick(series.getEnd()).getDateName(), series.getTick(lastIndex).getDate() ! .toString("hh:mm d/M/yyyy")); ! } } if (data.getColumnCount() >= DATASET_SIZE) { ! firstIndex += steps; ! for (int i = 0; i < steps; i++) ! { ! data.removeColumn(0); ! } } if(trades.size() > 0) *************** *** 150,161 **** } fireDatasetChanged(); - } } ! public void moveLeft() { if (firstIndex > 1) { ! firstIndex--; ! lastIndex--; loadValues(firstIndex, lastIndex); --- 161,176 ---- } fireDatasetChanged(); } } ! public void moveLeft(int size) { if (firstIndex > 1) { ! int steps = firstIndex - 1; ! if (steps > size) ! { ! steps = size; ! } ! firstIndex -= steps; ! lastIndex -= steps; loadValues(firstIndex, lastIndex); |
|
From: Carlos <ma...@us...> - 2007-10-22 22:22:29
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8662/src/test/net/sf/tail/graphics Modified Files: CombinedSeriesAndFlowChartTest.java ChartTest.java SeriesDatasetTest.java Log Message: Update. Index: CombinedSeriesAndFlowChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/CombinedSeriesAndFlowChartTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CombinedSeriesAndFlowChartTest.java 17 Oct 2007 16:41:53 -0000 1.6 --- CombinedSeriesAndFlowChartTest.java 22 Oct 2007 22:22:32 -0000 1.7 *************** *** 116,123 **** if (e.getActionCommand().equals("Move Right")) { flowDataset.moveRight(); ! seriesDataset.moveRight(); } else if (e.getActionCommand().equals("Move Left")) { flowDataset.moveLeft(); ! seriesDataset.moveLeft(); } } --- 116,123 ---- if (e.getActionCommand().equals("Move Right")) { flowDataset.moveRight(); ! seriesDataset.moveRight(1); } else if (e.getActionCommand().equals("Move Left")) { flowDataset.moveLeft(); ! seriesDataset.moveLeft(1); } } Index: ChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartTest.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ChartTest.java 22 Oct 2007 20:11:53 -0000 1.8 --- ChartTest.java 22 Oct 2007 22:22:32 -0000 1.9 *************** *** 135,142 **** if (e.getActionCommand().equals("Move Right")) { ! seriesDataset.moveRight(); } else if (e.getActionCommand().equals("Move Left")) { ! seriesDataset.moveLeft(); } --- 135,142 ---- if (e.getActionCommand().equals("Move Right")) { ! seriesDataset.moveRight(1); } else if (e.getActionCommand().equals("Move Left")) { ! seriesDataset.moveLeft(1); } Index: SeriesDatasetTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/SeriesDatasetTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SeriesDatasetTest.java 17 Oct 2007 16:41:53 -0000 1.7 --- SeriesDatasetTest.java 22 Oct 2007 22:22:32 -0000 1.8 *************** *** 80,84 **** public void testMoveRightWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades); ! dataset.moveRight(); assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); --- 80,84 ---- public void testMoveRightWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades); ! dataset.moveRight(1); assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); *************** *** 89,93 **** public void testMoveLeftWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades); ! dataset.moveLeft(); assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); --- 89,93 ---- public void testMoveLeftWhenIndicatorDontHaveMoreDataUnmappedShouldDoNothing() { SeriesDataset dataset = new SeriesDataset(series, indicators, 0, 3, trades); ! dataset.moveLeft(1); assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize(), dataset.getColumnCount()); *************** *** 102,106 **** indicator2.addValue(30d); ! dataset.moveRight(); assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize() - 1, dataset.getColumnCount()); --- 102,106 ---- indicator2.addValue(30d); ! dataset.moveRight(1); assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize() - 1, dataset.getColumnCount()); *************** *** 115,120 **** indicator2.addValue(30d); ! dataset.moveRight(); ! dataset.moveLeft(); assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize() - 1, dataset.getColumnCount()); --- 115,120 ---- indicator2.addValue(30d); ! dataset.moveRight(1); ! dataset.moveLeft(1); assertEquals(indicators.size() + trades.size(), dataset.getRowCount()); assertEquals(series.getSize() - 1, dataset.getColumnCount()); |
|
From: Carlos <ma...@us...> - 2007-10-22 22:22:27
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8647/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Update. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** Index.java 22 Oct 2007 21:28:17 -0000 1.28 --- Index.java 22 Oct 2007 22:22:27 -0000 1.29 *************** *** 90,93 **** --- 90,95 ---- private javax.swing.JButton moveLeftButton; private javax.swing.JButton moveRightButton; + private javax.swing.JButton jumpLeftButton; + private javax.swing.JButton jumpRightButton; private javax.swing.JButton helpButton; private javax.swing.JScrollPane reportScrollPane; *************** *** 173,177 **** completeGraphButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("GRAPH"))); moveLeftButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("MOVE_LEFT"))); ! moveRightButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("MOVE_RIGHT"))); helpButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("HELP"))); --- 175,181 ---- completeGraphButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("GRAPH"))); moveLeftButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("MOVE_LEFT"))); ! moveRightButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("MOVE_RIGHT"))); ! jumpLeftButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("JUMP_LEFT"))); ! jumpRightButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("JUMP_RIGHT"))); helpButton = new javax.swing.JButton(new ImageIcon(iconBundle.getString("HELP"))); *************** *** 393,396 **** --- 397,418 ---- }); + jumpLeftButton.setToolTipText("Jump Left"); + jumpLeftButton.setMaximumSize(new java.awt.Dimension(25, 25)); + jumpLeftButton.setMinimumSize(new java.awt.Dimension(25, 25)); + jumpLeftButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jumpLeftButtonActionPerformed(evt); + } + }); + + jumpRightButton.setToolTipText("Jump Right"); + jumpRightButton.setMaximumSize(new java.awt.Dimension(25, 25)); + jumpRightButton.setMinimumSize(new java.awt.Dimension(25, 25)); + jumpRightButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + jumpRightButtonActionPerformed(evt); + } + }); + helpButton.setToolTipText("Help"); helpButton.setMaximumSize(new java.awt.Dimension(25, 25)); *************** *** 508,514 **** .addComponent(completeGraphButton) .addGap(2) .addComponent(moveLeftButton) .addGap(2) ! .addComponent(moveRightButton) .addGap(4) .addComponent(separator6) --- 530,540 ---- .addComponent(completeGraphButton) .addGap(2) + .addComponent(jumpLeftButton) + .addGap(2) .addComponent(moveLeftButton) .addGap(2) ! .addComponent(moveRightButton) ! .addGap(2) ! .addComponent(jumpRightButton) .addGap(4) .addComponent(separator6) *************** *** 541,546 **** --- 567,574 ---- .addComponent(separator6) .addComponent(completeGraphButton) + .addComponent(jumpLeftButton) .addComponent(moveLeftButton) .addComponent(moveRightButton) + .addComponent(jumpRightButton) .addComponent(separator7) .addComponent(helpButton) *************** *** 560,570 **** } ! protected void moveLeftButtonActionPerformed(ActionEvent evt) { ! seriesDataset.moveLeft(); seriesChart = new SeriesChart(seriesDataset); seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); if(chartsPane.getComponentCount() > 1) { ! criteriaDataset.moveLeft(); criteriaChart = new CriteriaChart(criteriaDataset); criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); --- 588,622 ---- } ! protected void jumpLeftButtonActionPerformed(ActionEvent evt) { ! seriesDataset.moveLeft(stockAnalysis.getSlicer().getSlice(0).getSize()); ! seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); ! if(chartsPane.getComponentCount() > 1) ! { ! criteriaDataset.moveLeft(); ! criteriaChart = new CriteriaChart(criteriaDataset); ! criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); ! } ! } ! ! protected void moveLeftButtonActionPerformed(ActionEvent evt) { ! seriesDataset.moveLeft(1); ! seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); ! if(chartsPane.getComponentCount() > 1) ! { ! criteriaDataset.moveLeft(); ! criteriaChart = new CriteriaChart(criteriaDataset); ! criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); ! } ! } ! ! protected void jumpRightButtonActionPerformed(ActionEvent evt) { ! seriesDataset.moveRight(stockAnalysis.getSlicer().getSlice(0).getSize()); seriesChart = new SeriesChart(seriesDataset); seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); if(chartsPane.getComponentCount() > 1) { ! criteriaDataset.moveRight(); criteriaChart = new CriteriaChart(criteriaDataset); criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); *************** *** 573,577 **** protected void moveRightButtonActionPerformed(ActionEvent evt) { ! seriesDataset.moveRight(); seriesChart = new SeriesChart(seriesDataset); seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); --- 625,629 ---- protected void moveRightButtonActionPerformed(ActionEvent evt) { ! seriesDataset.moveRight(1); seriesChart = new SeriesChart(seriesDataset); seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); |
|
From: Carlos <ma...@us...> - 2007-10-22 22:22:27
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8647/src/java/net/sf/tails/i18n Modified Files: icons.properties Log Message: Update. Index: icons.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/icons.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** icons.properties 22 Oct 2007 20:17:22 -0000 1.4 --- icons.properties 22 Oct 2007 22:22:27 -0000 1.5 *************** *** 13,15 **** MOVE_LEFT=Data/icons/move_left.gif MOVE_RIGHT=Data/icons/move_right.gif ! MOD=a \ No newline at end of file --- 13,16 ---- MOVE_LEFT=Data/icons/move_left.gif MOVE_RIGHT=Data/icons/move_right.gif ! JUMP_LEFT=Data/icons/open.gif ! JUMP_RIGHT=Data/icons/open.gif \ No newline at end of file |
|
From: Carlos <ma...@us...> - 2007-10-22 21:50:44
|
Update of /cvsroot/tail/TailS/Data/icons In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27210/Data/icons Modified Files: move_left.gif Log Message: Update do icon. Index: move_left.gif =================================================================== RCS file: /cvsroot/tail/TailS/Data/icons/move_left.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsdG535A and /tmp/cvsbmloZT differ |
|
From: Thies <tg...@us...> - 2007-10-22 21:45:02
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25895/src/java/net/sf/tail/graphics Modified Files: CriteriaChart.java SeriesChart.java Log Message: Não desenhando os pontos caso o gráfico seja muito grande Index: SeriesChart.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/SeriesChart.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SeriesChart.java 22 Oct 2007 20:11:53 -0000 1.5 --- SeriesChart.java 22 Oct 2007 21:45:04 -0000 1.6 *************** *** 54,60 **** categoryAxis.setTickLabelFont(new Font("SansSerif", 0, 10)); // gerando setas setSeriesShapes(); ! return jfreechart; } --- 54,61 ---- categoryAxis.setTickLabelFont(new Font("SansSerif", 0, 10)); + if(dateText) { // gerando setas setSeriesShapes(); ! } return jfreechart; } Index: CriteriaChart.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/CriteriaChart.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CriteriaChart.java 22 Oct 2007 20:11:53 -0000 1.2 --- CriteriaChart.java 22 Oct 2007 21:45:04 -0000 1.3 *************** *** 54,60 **** categoryAxis.setTickLabelFont(new Font("SansSerif", 0, 10)); // gerando setas setSeriesShapes(); ! return jfreechart; } --- 54,61 ---- categoryAxis.setTickLabelFont(new Font("SansSerif", 0, 10)); + if(dateText) { // gerando setas setSeriesShapes(); ! } return jfreechart; } |
|
From: Thies <tg...@us...> - 2007-10-22 21:28:14
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19997/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Criada aba info Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** Index.java 22 Oct 2007 20:11:48 -0000 1.27 --- Index.java 22 Oct 2007 21:28:17 -0000 1.28 *************** *** 12,15 **** --- 12,16 ---- package net.sf.tails.swing.frame; + import java.awt.Color; import java.awt.Dimension; import java.awt.event.ActionEvent; *************** *** 29,33 **** --- 30,36 ---- import javax.swing.JPanel; import javax.swing.JProgressBar; + import javax.swing.JScrollPane; import javax.swing.JTabbedPane; + import javax.swing.JTextArea; import javax.swing.ScrollPaneConstants; import javax.swing.SwingConstants; *************** *** 100,105 **** --- 103,111 ---- private CriteriaChart criteriaChart; private CriteriaDataset criteriaDataset; + private JTabbedPane informationTabbedPane; + private JScrollPane infoScrollPane; private JProgressBar reportProgress; + private JTextArea informationTextArea; /** Creates new form OpenStockAnalysis *************** *** 148,151 **** --- 154,160 ---- seriesPanel = new javax.swing.JPanel(); criteriaPanel = new javax.swing.JPanel(); + informationTextArea = new JTextArea(); + informationTabbedPane = new JTabbedPane(); + infoScrollPane = new JScrollPane(); separator3 = new javax.swing.JSeparator(SwingConstants.VERTICAL); *************** *** 197,201 **** reportScrollPane.setWheelScrollingEnabled(true); ! consoleScrollPane.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createEtchedBorder(), "Console")); consoleScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); consoleScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); --- 206,211 ---- reportScrollPane.setWheelScrollingEnabled(true); ! ! consoleScrollPane.setBorder(javax.swing.BorderFactory.createEmptyBorder()); consoleScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); consoleScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); *************** *** 204,209 **** --- 214,235 ---- consoleScrollPane.setWheelScrollingEnabled(true); + + informationTabbedPane.addTab("Console", consoleScrollPane); + informationTextArea.setEditable(false); + informationTextArea.setBackground(new Color(239,239,239)); + if (stockAnalysis != null) { + + informationTextArea.setText(helper.getInfo(stockAnalysis)); + + infoScrollPane.setBorder(javax.swing.BorderFactory.createEmptyBorder()); + infoScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); + infoScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); + infoScrollPane.setViewportBorder(javax.swing.BorderFactory.createEtchedBorder()); + infoScrollPane.setViewportView(informationTextArea); + infoScrollPane.setWheelScrollingEnabled(true); + informationTabbedPane.addTab("Info", infoScrollPane); + reportTable.setAutoCreateRowSorter(true); *************** *** 457,461 **** .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(reportScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 776, Short.MAX_VALUE) ! .addComponent(consoleScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 776, Short.MAX_VALUE) .addComponent(chartsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 776, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() --- 483,487 ---- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(reportScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, 776, Short.MAX_VALUE) ! .addComponent(informationTabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 776, Short.MAX_VALUE) .addComponent(chartsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 776, Short.MAX_VALUE) .addGroup(layout.createSequentialGroup() *************** *** 526,530 **** .addComponent(reportScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(4) ! .addComponent(consoleScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap(10, 10) ) --- 552,556 ---- .addComponent(reportScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) .addGap(4) ! .addComponent(informationTabbedPane, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap(10, 10) ) *************** *** 683,686 **** --- 709,726 ---- public void loadStockAnalysis(StockAnalysis analysis) { + + informationTextArea.setText(helper.getInfo(analysis)); + + infoScrollPane.setBorder(javax.swing.BorderFactory.createEmptyBorder()); + infoScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); + infoScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); + infoScrollPane.setViewportBorder(javax.swing.BorderFactory.createEtchedBorder()); + infoScrollPane.setViewportView(informationTextArea); + infoScrollPane.setWheelScrollingEnabled(true); + informationTabbedPane.addTab("Info", infoScrollPane); + + reportTable.setAutoCreateRowSorter(true); + + reportTable.setVisible(true); reportTable.setAutoCreateRowSorter(true); |
|
From: Thies <tg...@us...> - 2007-10-22 21:28:14
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19997/src/java/net/sf/tails/swing/helper Modified Files: FrameHelper.java Log Message: Criada aba info Index: FrameHelper.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/FrameHelper.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FrameHelper.java 15 Oct 2007 21:04:42 -0000 1.19 --- FrameHelper.java 22 Oct 2007 21:28:17 -0000 1.20 *************** *** 198,200 **** --- 198,208 ---- } + public String getInfo(StockAnalysis stock) + { + return "Number of ticks: " + stock.getSlicer().getSeries().getSize() + "\n" + + "Period between ticks: " + stock.getSlicer().getSeries().getPeriod() + "\n" + + "Number of slices: " + stock.getSlicer().getNumberOfSlices() + "\n" + + "Average ticks per slice: " + stock.getSlicer().getAverageTicksPerSlice(); + } + } |
|
From: Thies <tg...@us...> - 2007-10-22 20:17:20
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/i18n In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22482/src/java/net/sf/tails/i18n Modified Files: icons.properties Log Message: Index: icons.properties =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/i18n/icons.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** icons.properties 22 Oct 2007 19:04:15 -0000 1.3 --- icons.properties 22 Oct 2007 20:17:22 -0000 1.4 *************** *** 12,14 **** SERIES_TAB=Data/icons/template_obj.gif MOVE_LEFT=Data/icons/move_left.gif ! MOVE_RIGHT=Data/icons/move_right.gif \ No newline at end of file --- 12,15 ---- SERIES_TAB=Data/icons/template_obj.gif MOVE_LEFT=Data/icons/move_left.gif ! MOVE_RIGHT=Data/icons/move_right.gif ! MOD=a \ No newline at end of file |
|
From: Carlos <ma...@us...> - 2007-10-22 20:11:58
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20329/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Update denovo... TailS quase 100%... gogogo... Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Index.java 22 Oct 2007 18:10:46 -0000 1.26 --- Index.java 22 Oct 2007 20:11:48 -0000 1.27 *************** *** 27,31 **** --- 27,33 ---- import javax.swing.JFrame; import javax.swing.JOptionPane; + import javax.swing.JPanel; import javax.swing.JProgressBar; + import javax.swing.JTabbedPane; import javax.swing.ScrollPaneConstants; import javax.swing.SwingConstants; *************** *** 50,53 **** --- 52,56 ---- private static final ResourceBundle folderBundle = ResourceBundle.getBundle("net.sf.tails.i18n.Folders"); + final int DEFAULT_CHART_SIZE = 30; private static final long serialVersionUID = 1L; private StockAnalysis stockAnalysis; *************** *** 93,96 **** --- 96,103 ---- private javax.swing.JTextArea consoleArea; private FrameHelper helper; + private SeriesChart seriesChart; + private SeriesDataset seriesDataset; + private CriteriaChart criteriaChart; + private CriteriaDataset criteriaDataset; private JProgressBar reportProgress; *************** *** 205,211 **** reportTable.setEnabled(true); ! SeriesDataset seriesDataset = new SeriesDataset(stockAnalysis.getSlicer().getSeries(), 20); ! SeriesChart seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("")); chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); --- 212,218 ---- reportTable.setEnabled(true); ! seriesDataset = new SeriesDataset(stockAnalysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); ! seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); *************** *** 213,221 **** if (stockAnalysis.getReports().size() > 0) { ! CriteriaDataset criteriaDataset = new CriteriaDataset(stockAnalysis.getReports(), stockAnalysis.getSlicer().getSeries(), 20); ! CriteriaChart criteriaChart = new CriteriaChart(criteriaDataset); ! criteriaPanel = new ChartPanel(criteriaChart.createChart("")); ! chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); } } --- 220,233 ---- if (stockAnalysis.getReports().size() > 0) { ! criteriaDataset = new CriteriaDataset(stockAnalysis.getReports(), stockAnalysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); ! criteriaChart = new CriteriaChart(criteriaDataset); ! criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); ! chartsPane.addTab("Reports Comparision", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); ! } ! else ! { ! exportHTMLButton.setEnabled(false); ! exportXLSButton.setEnabled(false); } } *************** *** 231,234 **** --- 243,252 ---- noChartsLabel.setText("- No Charts Available"); chartsPane.addTab("Charts", new ImageIcon(iconBundle.getString("SERIES_TAB")), noChartsLabel); + + completeGraphButton.setEnabled(false); + moveRightButton.setEnabled(false); + moveLeftButton.setEnabled(false); + exportHTMLButton.setEnabled(false); + exportXLSButton.setEnabled(false); } *************** *** 331,338 **** }); ! completeGraphButton.setToolTipText("Move Left"); ! completeGraphButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! completeGraphButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! completeGraphButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { moveLeftButtonActionPerformed(evt); --- 349,356 ---- }); ! moveLeftButton.setToolTipText("Move Left"); ! moveLeftButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! moveLeftButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! moveLeftButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { moveLeftButtonActionPerformed(evt); *************** *** 340,347 **** }); ! completeGraphButton.setToolTipText("Move Right"); ! completeGraphButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! completeGraphButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! completeGraphButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { moveRightButtonActionPerformed(evt); --- 358,365 ---- }); ! moveRightButton.setToolTipText("Move Right"); ! moveRightButton.setMaximumSize(new java.awt.Dimension(25, 25)); ! moveRightButton.setMinimumSize(new java.awt.Dimension(25, 25)); ! moveRightButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { moveRightButtonActionPerformed(evt); *************** *** 517,527 **** protected void moveLeftButtonActionPerformed(ActionEvent evt) { ! // TODO Auto-generated method stub ! } protected void moveRightButtonActionPerformed(ActionEvent evt) { ! // TODO Auto-generated method stub ! } --- 535,559 ---- protected void moveLeftButtonActionPerformed(ActionEvent evt) { ! seriesDataset.moveLeft(); ! seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); ! if(chartsPane.getComponentCount() > 1) ! { ! criteriaDataset.moveLeft(); ! criteriaChart = new CriteriaChart(criteriaDataset); ! criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); ! } } protected void moveRightButtonActionPerformed(ActionEvent evt) { ! seriesDataset.moveRight(); ! seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); ! if(chartsPane.getComponentCount() > 1) ! { ! criteriaDataset.moveRight(); ! criteriaChart = new CriteriaChart(criteriaDataset); ! criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); ! } } *************** *** 536,540 **** protected void completeGraphButtonActionPerformed(ActionEvent evt) { ! // TODO AQUI } --- 568,592 ---- protected void completeGraphButtonActionPerformed(ActionEvent evt) { ! JTabbedPane charts = new JTabbedPane(); ! JFrame graph = new JFrame("Complete Graphic"); ! JPanel seriesPanel = new JPanel(); ! SeriesDataset completeSeriesDataset = new SeriesDataset(stockAnalysis.getSlicer().getSeries(), stockAnalysis.getSlicer().getSeries().getSize()); ! SeriesChart completeSeriesChart = new SeriesChart(completeSeriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(completeSeriesChart.createChart("", false)); ! charts.addTab(stockAnalysis.getStock().getName(), seriesPanel); ! ! if(chartsPane.getComponentCount() > 1) ! { ! JPanel reportPanel = new JPanel(); ! CriteriaDataset completeCriteriaDataset = new CriteriaDataset(stockAnalysis.getReports(), stockAnalysis.getSlicer().getSeries(), stockAnalysis.getSlicer().getSeries().getSize()); ! CriteriaChart completeCriteriaChart = new CriteriaChart(completeCriteriaDataset); ! reportPanel = new org.jfree.chart.ChartPanel(completeCriteriaChart.createChart("", false)); ! charts.addTab("Reports Comparision", reportPanel); ! } ! ! graph.add(charts); ! graph.setMinimumSize(new Dimension(800, 500)); ! graph.setLocationByPlatform(true); ! graph.setVisible(true); } *************** *** 640,657 **** reportScrollPane.setViewportView(reportTable); ! SeriesDataset seriesDataset = new SeriesDataset(analysis.getSlicer().getSeries(), analysis.getSlicer().getSeries().getSize()); ! SeriesChart seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("")); chartsPane.removeAll(); chartsPane.addTab(analysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); if (analysis.getReports().size() > 0) { ! CriteriaDataset criteriaDataset = new CriteriaDataset(analysis.getReports(), analysis.getSlicer().getSeries(), analysis.getSlicer().getSeries().getSize()); ! CriteriaChart criteriaChart = new CriteriaChart(criteriaDataset); ! criteriaPanel = new ChartPanel(criteriaChart.createChart("")); chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); } --- 692,716 ---- reportScrollPane.setViewportView(reportTable); ! seriesDataset = new SeriesDataset(analysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); ! seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); chartsPane.removeAll(); chartsPane.addTab(analysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); + completeGraphButton.setEnabled(true); + moveRightButton.setEnabled(true); + moveLeftButton.setEnabled(true); + if (analysis.getReports().size() > 0) { ! criteriaDataset = new CriteriaDataset(analysis.getReports(), analysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); ! criteriaChart = new CriteriaChart(criteriaDataset); ! criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); + + exportHTMLButton.setEnabled(true); + exportXLSButton.setEnabled(true); } |
|
From: Carlos <ma...@us...> - 2007-10-22 20:11:56
|
Update of /cvsroot/tail/Tail/src/java/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20349/src/java/net/sf/tail/graphics Modified Files: CriteriaChart.java SeriesDataset.java CriteriaDataset.java SeriesChart.java Log Message: Update denovo... TailS quase 100%... gogogo... Index: CriteriaDataset.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/CriteriaDataset.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CriteriaDataset.java 17 Oct 2007 19:06:39 -0000 1.1 --- CriteriaDataset.java 22 Oct 2007 20:11:53 -0000 1.2 *************** *** 106,110 **** public void moveLeft() { ! if (firstIndex > 0) { firstIndex--; lastIndex--; --- 106,110 ---- public void moveLeft() { ! if (firstIndex > 1) { firstIndex--; lastIndex--; Index: CriteriaChart.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/CriteriaChart.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CriteriaChart.java 17 Oct 2007 19:06:39 -0000 1.1 --- CriteriaChart.java 22 Oct 2007 20:11:53 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; + import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.plot.CategoryPlot; *************** *** 31,35 **** } ! public JFreeChart createChart(String chartName) { JFreeChart jfreechart = ChartFactory.createLineChart(chartName, "Date", "Value", dataSet, PlotOrientation.VERTICAL, true, true, false); --- 32,36 ---- } ! public JFreeChart createChart(String chartName, boolean dateText) { JFreeChart jfreechart = ChartFactory.createLineChart(chartName, "Date", "Value", dataSet, PlotOrientation.VERTICAL, true, true, false); *************** *** 40,45 **** // Setando labels em 90 graus CategoryAxis categoryAxis = plot.getDomainAxis(); ! categoryAxis.setVisible(false); ! // categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.DOWN_90); // Setando tamanho do grafico --- 41,46 ---- // Setando labels em 90 graus CategoryAxis categoryAxis = plot.getDomainAxis(); ! categoryAxis.setVisible(dateText); ! categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.DOWN_90); // Setando tamanho do grafico Index: SeriesChart.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/SeriesChart.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SeriesChart.java 10 Oct 2007 23:10:36 -0000 1.4 --- SeriesChart.java 22 Oct 2007 20:11:53 -0000 1.5 *************** *** 9,12 **** --- 9,13 ---- import org.jfree.chart.JFreeChart; import org.jfree.chart.axis.CategoryAxis; + import org.jfree.chart.axis.CategoryLabelPositions; import org.jfree.chart.axis.NumberAxis; import org.jfree.chart.plot.CategoryPlot; *************** *** 31,35 **** } ! public JFreeChart createChart(String chartName) { JFreeChart jfreechart = ChartFactory.createLineChart(chartName, "Date", "Value", dataSet, PlotOrientation.VERTICAL, true, true, false); --- 32,36 ---- } ! public JFreeChart createChart(String chartName, boolean dateText) { JFreeChart jfreechart = ChartFactory.createLineChart(chartName, "Date", "Value", dataSet, PlotOrientation.VERTICAL, true, true, false); *************** *** 40,45 **** // Setando labels em 90 graus CategoryAxis categoryAxis = plot.getDomainAxis(); ! categoryAxis.setVisible(false); ! // categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.DOWN_90); // Setando tamanho do grafico --- 41,46 ---- // Setando labels em 90 graus CategoryAxis categoryAxis = plot.getDomainAxis(); ! categoryAxis.setVisible(dateText); ! categoryAxis.setCategoryLabelPositions(CategoryLabelPositions.DOWN_90); // Setando tamanho do grafico Index: SeriesDataset.java =================================================================== RCS file: /cvsroot/tail/Tail/src/java/net/sf/tail/graphics/SeriesDataset.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SeriesDataset.java 22 Oct 2007 18:10:50 -0000 1.10 --- SeriesDataset.java 22 Oct 2007 20:11:53 -0000 1.11 *************** *** 2,5 **** --- 2,6 ---- package net.sf.tail.graphics; + import java.util.ArrayList; import java.util.List; *************** *** 42,45 **** --- 43,47 ---- this.series = series; this.DATASET_SIZE = lastIndex - firstIndex + 1; + this.trades = new ArrayList<Trade>(); loadValues(firstIndex, lastIndex); *************** *** 135,139 **** lastIndex++; for (Indicator<? extends Number> indicator : indicators) { ! data.addValue(indicator.getValue(lastIndex), indicator.getName(), series.getTick(lastIndex).getDate() .toString("hh:mm d/M/yyyy")); } --- 137,141 ---- lastIndex++; for (Indicator<? extends Number> indicator : indicators) { ! data.addValue(indicator.getValue(lastIndex), indicator.getName() + ": "+ series.getTick(series.getBegin()).getDateName() + " - " + series.getTick(series.getEnd()).getDateName(), series.getTick(lastIndex).getDate() .toString("hh:mm d/M/yyyy")); } *************** *** 143,147 **** data.removeColumn(0); } ! loadTrade(firstIndex, lastIndex); fireDatasetChanged(); --- 145,152 ---- data.removeColumn(0); } ! if(trades.size() > 0) ! { ! loadTrade(firstIndex, lastIndex); ! } fireDatasetChanged(); *************** *** 150,159 **** public void moveLeft() { ! if (firstIndex > 0) { firstIndex--; lastIndex--; loadValues(firstIndex, lastIndex); ! loadTrade(firstIndex, lastIndex); fireDatasetChanged(); --- 155,167 ---- public void moveLeft() { ! if (firstIndex > 1) { firstIndex--; lastIndex--; loadValues(firstIndex, lastIndex); ! if(trades.size() > 0) ! { ! loadTrade(firstIndex, lastIndex); ! } fireDatasetChanged(); |
|
From: Carlos <ma...@us...> - 2007-10-22 20:11:55
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/graphics In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20349/src/test/net/sf/tail/graphics Modified Files: ChartForReportTest.java ChartTest.java Log Message: Update denovo... TailS quase 100%... gogogo... Index: ChartForReportTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartForReportTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ChartForReportTest.java 17 Oct 2007 16:41:53 -0000 1.6 --- ChartForReportTest.java 22 Oct 2007 20:11:53 -0000 1.7 *************** *** 89,93 **** SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart("Report Chart"); String fileName = "chartTeste00" + i + ".png"; File filePNG = new File("reports/PNGCharts/" + fileName); --- 89,93 ---- SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart("Report Chart", false); String fileName = "chartTeste00" + i + ".png"; File filePNG = new File("reports/PNGCharts/" + fileName); Index: ChartTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/graphics/ChartTest.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ChartTest.java 17 Oct 2007 16:41:52 -0000 1.7 --- ChartTest.java 22 Oct 2007 20:11:53 -0000 1.8 *************** *** 95,99 **** SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart("Test Chart"); return new ChartPanel(jfreechart); --- 95,99 ---- SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart("Test Chart", false); return new ChartPanel(jfreechart); *************** *** 113,117 **** SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart("Test Chart"); return new ChartPanel(jfreechart); --- 113,117 ---- SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart("Test Chart", false); return new ChartPanel(jfreechart); |
|
From: Carlos <ma...@us...> - 2007-10-22 20:11:55
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20349/src/test/net/sf/tail/report/xls Modified Files: WorkbookGeneratorTest.java SliceXlsGeneratorTest.java ReportXlsGeneratorTest.java Log Message: Update denovo... TailS quase 100%... gogogo... Index: WorkbookGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/WorkbookGeneratorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WorkbookGeneratorTest.java 17 Oct 2007 17:37:27 -0000 1.1 --- WorkbookGeneratorTest.java 22 Oct 2007 20:11:53 -0000 1.2 *************** *** 77,81 **** SeriesDataset seriesDataset = new SeriesDataset(series, indicators, series.getBegin(), series.getEnd()); SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart(""); String imagePath = CHAR_DIST + File.separatorChar + decision.getFileName() + ".png"; File file = new File(imagePath); --- 77,81 ---- SeriesDataset seriesDataset = new SeriesDataset(series, indicators, series.getBegin(), series.getEnd()); SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart("", false); String imagePath = CHAR_DIST + File.separatorChar + decision.getFileName() + ".png"; File file = new File(imagePath); Index: SliceXlsGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/SliceXlsGeneratorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SliceXlsGeneratorTest.java 17 Oct 2007 17:37:28 -0000 1.1 --- SliceXlsGeneratorTest.java 22 Oct 2007 20:11:53 -0000 1.2 *************** *** 79,83 **** SeriesDataset seriesDataset = new SeriesDataset(series, indicators, series.getBegin(), series.getEnd()); SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart(""); String imagePath = CHAR_DIST + File.separatorChar + decision.getFileName() + ".png"; File file = new File(imagePath); --- 79,83 ---- SeriesDataset seriesDataset = new SeriesDataset(series, indicators, series.getBegin(), series.getEnd()); SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart("", false); String imagePath = CHAR_DIST + File.separatorChar + decision.getFileName() + ".png"; File file = new File(imagePath); Index: ReportXlsGeneratorTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/report/xls/ReportXlsGeneratorTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ReportXlsGeneratorTest.java 17 Oct 2007 17:37:28 -0000 1.1 --- ReportXlsGeneratorTest.java 22 Oct 2007 20:11:53 -0000 1.2 *************** *** 78,82 **** SeriesDataset seriesDataset = new SeriesDataset(series, indicators, series.getBegin(), series.getEnd()); SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart(""); String imagePath = CHAR_DIST + File.separatorChar + decision.getFileName() + ".png"; File file = new File(imagePath); --- 78,82 ---- SeriesDataset seriesDataset = new SeriesDataset(series, indicators, series.getBegin(), series.getEnd()); SeriesChart seriesChart = new SeriesChart(seriesDataset); ! JFreeChart jfreechart = seriesChart.createChart("", false); String imagePath = CHAR_DIST + File.separatorChar + decision.getFileName() + ".png"; File file = new File(imagePath); |
|
From: Carlos <ma...@us...> - 2007-10-22 20:11:55
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20329/src/java/net/sf/tails/swing Modified Files: Main.java Log Message: Update denovo... TailS quase 100%... gogogo... Index: Main.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/Main.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Main.java 17 Oct 2007 22:39:55 -0000 1.11 --- Main.java 22 Oct 2007 20:11:48 -0000 1.12 *************** *** 24,32 **** */ public static void main(String[] args) { ! try { ! UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); ! } catch (Exception e) { ! e.printStackTrace(); ! } new Index().setVisible(true); } --- 24,35 ---- */ public static void main(String[] args) { ! if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")) ! { ! try { ! UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); ! } catch (Exception e) { ! e.printStackTrace(); ! } ! } new Index().setVisible(true); } |
|
From: Carlos <ma...@us...> - 2007-10-22 20:11:53
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20329/src/java/net/sf/tails/swing/helper Modified Files: CompleteReportGenerator.java Log Message: Update denovo... TailS quase 100%... gogogo... Index: CompleteReportGenerator.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/helper/CompleteReportGenerator.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CompleteReportGenerator.java 17 Oct 2007 21:45:58 -0000 1.6 --- CompleteReportGenerator.java 22 Oct 2007 20:11:48 -0000 1.7 *************** *** 76,83 **** JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0); } ! finally ! { ! System.exit(0); ! } }}).start(); } --- 76,80 ---- JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0); } ! }}).start(); } *************** *** 124,131 **** JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0); } ! finally ! { ! System.exit(0); ! } } }).start(); --- 121,125 ---- JOptionPane.showMessageDialog(null, e.getMessage(), "Error", 0); } ! } }).start(); *************** *** 171,175 **** SeriesDataset seriesData = new SeriesDataset(timeSeries, indicators, decision.getTrades()); SeriesChart seriesChart = new SeriesChart(seriesData); ! JFreeChart jfreechart = seriesChart.createChart(""); File reportPNG = new File(imagePath); ChartUtilities.saveChartAsPNG(reportPNG, jfreechart, 800, 300); --- 165,169 ---- SeriesDataset seriesData = new SeriesDataset(timeSeries, indicators, decision.getTrades()); SeriesChart seriesChart = new SeriesChart(seriesData); ! JFreeChart jfreechart = seriesChart.createChart("", false); File reportPNG = new File(imagePath); ChartUtilities.saveChartAsPNG(reportPNG, jfreechart, 800, 300); |
|
From: Thies <tg...@us...> - 2007-10-22 19:41:37
|
Update of /cvsroot/tail/Tail/src/test/net/sf/tail/series In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6545/src/test/net/sf/tail/series Modified Files: SerializableTimeSeriesTest.java PartialMemorizesSlicerTest.java Log Message: Novos testes e refatoração do MinValueStopper Index: PartialMemorizesSlicerTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/series/PartialMemorizesSlicerTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PartialMemorizesSlicerTest.java 8 Oct 2007 19:15:28 -0000 1.3 --- PartialMemorizesSlicerTest.java 22 Oct 2007 19:41:39 -0000 1.4 *************** *** 296,299 **** --- 296,311 ---- } + + @Test + public void testAverageTicksPerSlice() + { + Period period = new Period().withYears(1); + series = new SampleTimeSeries(date.withDate(2000, 1, 1), date.withDate(2000, 8, 1), date.withDate(2000, 9, 15), + date.withDate(2001, 1, 1), date.withDate(2001, 1, 3), date.withDate(2001, 12, 31), date.withDate(2002, + 1, 1), date.withDate(2002, 1, 2), date.withDate(2002, 1, 3), date.withDate(2002, 5, 5), date + .withDate(2003, 3, 3)); + PartialMemorizedSlicer slicer = new PartialMemorizedSlicer(series, period, 3); + assertEquals(27d/4, slicer.getAverageTicksPerSlice()); + } } Index: SerializableTimeSeriesTest.java =================================================================== RCS file: /cvsroot/tail/Tail/src/test/net/sf/tail/series/SerializableTimeSeriesTest.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerializableTimeSeriesTest.java 17 Oct 2007 16:51:43 -0000 1.1 --- SerializableTimeSeriesTest.java 22 Oct 2007 19:41:39 -0000 1.2 *************** *** 12,15 **** --- 12,16 ---- import net.sf.tail.series.SerializableTimeSeries; + import org.joda.time.Period; import org.junit.Before; import org.junit.Test; *************** *** 49,51 **** --- 50,58 ---- assertEquals(stock.getSeries(), afterSerializedStock.getSeries()); } + @Test + public void testGetPeriod() + { + assertEquals(new Period().withMinutes(15), stock.getPeriod()); + } + } |
