Menu
▾
▴
[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame Index.java, 1.34
|
From: Carlos <ma...@us...> - 2007-10-24 19:22:51
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4390/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Adicionada uma Thread no complete graph, adicionado novos botoes de zoom in e zoom out e está sendo feita a lógica doa gráficos para estes botoes. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Index.java 24 Oct 2007 17:53:03 -0000 1.33 --- Index.java 24 Oct 2007 19:22:52 -0000 1.34 *************** *** 25,28 **** --- 25,29 ---- import java.util.ResourceBundle; + import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JFileChooser; *************** *** 95,98 **** --- 96,101 ---- private TailButton jumpLeftButton; private TailButton jumpRightButton; + private TailButton zoomInButton; + private TailButton zoomOutButton; private TailButton helpButton; private javax.swing.JScrollPane reportScrollPane; *************** *** 177,180 **** --- 180,185 ---- jumpLeftButton = new TailButton(new ImageIcon(iconBundle.getString("JUMP_LEFT"))); jumpRightButton = new TailButton(new ImageIcon(iconBundle.getString("JUMP_RIGHT"))); + zoomInButton = new TailButton(new ImageIcon(iconBundle.getString("ZOOM_IN"))); + zoomOutButton = new TailButton(new ImageIcon(iconBundle.getString("ZOOM_OUT"))); helpButton = new TailButton(new ImageIcon(iconBundle.getString("HELP"))); *************** *** 223,234 **** 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); --- 228,238 ---- if (stockAnalysis != null) ! { informationTextArea.setText(helper.getInfo(stockAnalysis)); ! infoScrollPane.setBorder(BorderFactory.createEmptyBorder()); infoScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); infoScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); ! infoScrollPane.setViewportBorder(BorderFactory.createEtchedBorder()); infoScrollPane.setViewportView(informationTextArea); infoScrollPane.setWheelScrollingEnabled(true); *************** *** 238,247 **** reportTable.setModel(helper.getTableModel(stockAnalysis)); ! reportTable.setGridColor(new java.awt.Color(255, 255, 255)); 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); --- 242,252 ---- reportTable.setModel(helper.getTableModel(stockAnalysis)); ! reportTable.setGridColor(new Color(255, 255, 255)); reportTable.setEnabled(true); + //TODO seriesDataset = new SeriesDataset(stockAnalysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new ChartPanel(seriesChart.createChart("", true)); chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); *************** *** 249,252 **** --- 254,258 ---- if (stockAnalysis.getReports().size() > 0) { + //TODO criteriaDataset = new CriteriaDataset(stockAnalysis.getReports(), stockAnalysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); criteriaChart = new CriteriaChart(criteriaDataset); *************** *** 278,286 **** --- 284,297 ---- jumpRightButton.setEnabled(false); jumpLeftButton.setEnabled(false); + zoomInButton.setEnabled(false); exportHTMLButton.setEnabled(false); exportXLSButton.setEnabled(false); newReportButton.setEnabled(false); + saveStockAnalysisButton.setEnabled(false); + saveAsStockAnalysisButton.setEnabled(false); } + zoomOutButton.setEnabled(false); + separator3.setMinimumSize(new Dimension(1, 25)); separator4.setMinimumSize(new Dimension(1, 25)); *************** *** 417,420 **** --- 428,449 ---- }); + zoomInButton.setToolTipText("Zoom In"); + zoomInButton.setMaximumSize(new java.awt.Dimension(25, 25)); + zoomInButton.setMinimumSize(new java.awt.Dimension(25, 25)); + zoomInButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + zoomInButtonActionPerformed(evt); + } + }); + + zoomOutButton.setToolTipText("Zoom Out"); + zoomOutButton.setMaximumSize(new java.awt.Dimension(25, 25)); + zoomOutButton.setMinimumSize(new java.awt.Dimension(25, 25)); + zoomOutButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + zoomOutButtonActionPerformed(evt); + } + }); + helpButton.setToolTipText("Help"); helpButton.setMaximumSize(new java.awt.Dimension(25, 25)); *************** *** 539,542 **** --- 568,575 ---- .addGap(2) .addComponent(jumpRightButton) + .addGap(2) + .addComponent(zoomInButton) + .addGap(2) + .addComponent(zoomOutButton) .addGap(4) .addComponent(separator6) *************** *** 573,576 **** --- 606,611 ---- .addComponent(moveRightButton) .addComponent(jumpRightButton) + .addComponent(zoomInButton) + .addComponent(zoomOutButton) .addComponent(separator7) .addComponent(helpButton) *************** *** 590,593 **** --- 625,648 ---- } + protected void zoomOutButtonActionPerformed(ActionEvent evt) { + //TODO + zoomInButton.setEnabled(true); + zoomOutButton.setEnabled(false); + } + + protected void zoomInButtonActionPerformed(ActionEvent evt) { + seriesDataset = new SeriesDataset(stockAnalysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); + seriesChart = new SeriesChart(seriesDataset); + seriesPanel = new ChartPanel(seriesChart.createChart("", true)); + 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)); + } + zoomInButton.setEnabled(false); + zoomOutButton.setEnabled(true); + } + protected void jumpLeftButtonActionPerformed(ActionEvent evt) { seriesDataset.moveLeft(stockAnalysis.getSlicer().getSlice(0).getSize()); *************** *** 648,673 **** 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); ! } --- 703,730 ---- protected void completeGraphButtonActionPerformed(ActionEvent evt) { ! new Thread(new Runnable() { ! public void run() { ! JFrame graph = new JFrame("Complete Graphic"); ! JTabbedPane charts = new JTabbedPane(); ! JPanel seriesPanel = new JPanel(); ! SeriesDataset completeSeriesDataset = new SeriesDataset(stockAnalysis.getSlicer().getSeries(), stockAnalysis.getSlicer().getSeries().getSize()); ! SeriesChart completeSeriesChart = new SeriesChart(completeSeriesDataset); ! seriesPanel = new 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 ChartPanel(completeCriteriaChart.createChart("", false)); ! charts.addTab("Reports Comparision", reportPanel); ! } ! ! graph.add(charts); ! graph.setMinimumSize(new Dimension(800, 500)); ! graph.setLocationByPlatform(true); ! graph.setVisible(true); ! }}).start(); } *************** *** 732,736 **** else { ! new NewReportFrame(this, stockAnalysis).setVisible(true); } } --- 789,793 ---- else { ! new NewReportFrame(this, stockAnalysis).setVisible(true); } } *************** *** 766,773 **** 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); --- 823,830 ---- informationTextArea.setText(helper.getInfo(analysis)); ! infoScrollPane.setBorder(BorderFactory.createEmptyBorder()); ! infoScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); infoScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); ! infoScrollPane.setViewportBorder(BorderFactory.createEtchedBorder()); infoScrollPane.setViewportView(informationTextArea); infoScrollPane.setWheelScrollingEnabled(true); *************** *** 776,780 **** reportTable.setAutoCreateRowSorter(true); - reportTable.setVisible(true); reportTable.setAutoCreateRowSorter(true); --- 833,836 ---- *************** *** 788,792 **** seriesDataset = new SeriesDataset(analysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new org.jfree.chart.ChartPanel(seriesChart.createChart("", true)); chartsPane.removeAll(); --- 844,848 ---- seriesDataset = new SeriesDataset(analysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new ChartPanel(seriesChart.createChart("", true)); chartsPane.removeAll(); *************** *** 799,809 **** jumpLeftButton.setEnabled(true); newReportButton.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); --- 855,874 ---- jumpLeftButton.setEnabled(true); newReportButton.setEnabled(true); + zoomInButton.setEnabled(true); + saveStockAnalysisButton.setEnabled(true); + saveAsStockAnalysisButton.setEnabled(true); if (analysis.getReports().size() > 0) { ! if (zoomInButton.isEnabled()) ! { ! //TODO ! } ! else ! { ! 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); |
