Menu
▾
▴
[Tail-cvs] TailS/src/java/net/sf/tails/swing/frame Index.java, 1.35
|
From: Carlos <ma...@us...> - 2007-10-24 20:56:48
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11828/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Update de zoom in e zoom out. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** Index.java 24 Oct 2007 19:22:52 -0000 1.34 --- Index.java 24 Oct 2007 20:56:49 -0000 1.35 *************** *** 42,45 **** --- 42,46 ---- import net.sf.tail.graphics.CriteriaChart; import net.sf.tail.graphics.CriteriaDataset; + import net.sf.tail.graphics.FasterDataset; import net.sf.tail.graphics.SeriesChart; import net.sf.tail.graphics.SeriesDataset; *************** *** 109,112 **** --- 110,114 ---- private SeriesChart seriesChart; private SeriesDataset seriesDataset; + private FasterDataset fasterSeriesDataset; private CriteriaChart criteriaChart; private CriteriaDataset criteriaDataset; *************** *** 245,252 **** 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); --- 247,253 ---- reportTable.setEnabled(true); ! fasterSeriesDataset = new FasterDataset(stockAnalysis.getSlicer().getSeries()); ! seriesChart = new SeriesChart(fasterSeriesDataset); ! seriesPanel = new ChartPanel(seriesChart.createChart("", false)); chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); *************** *** 312,317 **** newStockAnalysisButton.setToolTipText("New Stock Analysis..."); - newStockAnalysisButton.setMaximumSize(new java.awt.Dimension(25, 25)); - newStockAnalysisButton.setMinimumSize(new java.awt.Dimension(25, 25)); newStockAnalysisButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { --- 313,316 ---- *************** *** 321,326 **** newReportButton.setToolTipText("New Report..."); - newReportButton.setMaximumSize(new java.awt.Dimension(25, 25)); - newReportButton.setMinimumSize(new java.awt.Dimension(25, 25)); newReportButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { --- 320,323 ---- *************** *** 330,335 **** openStockAnalysisButton.setToolTipText("Open..."); - openStockAnalysisButton.setMaximumSize(new java.awt.Dimension(25, 25)); - openStockAnalysisButton.setMinimumSize(new java.awt.Dimension(25, 25)); openStockAnalysisButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { --- 327,330 ---- *************** *** 339,344 **** saveStockAnalysisButton.setToolTipText("Save"); - saveStockAnalysisButton.setMaximumSize(new java.awt.Dimension(25, 25)); - saveStockAnalysisButton.setMinimumSize(new java.awt.Dimension(25, 25)); saveStockAnalysisButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { --- 334,337 ---- *************** *** 348,353 **** saveAsStockAnalysisButton.setToolTipText("Save as..."); - saveAsStockAnalysisButton.setMaximumSize(new java.awt.Dimension(25, 25)); - saveAsStockAnalysisButton.setMinimumSize(new java.awt.Dimension(25, 25)); saveAsStockAnalysisButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { --- 341,344 ---- *************** *** 357,362 **** exportHTMLButton.setToolTipText("Export to HTML..."); - exportHTMLButton.setMaximumSize(new java.awt.Dimension(25, 25)); - exportHTMLButton.setMinimumSize(new java.awt.Dimension(25, 25)); exportHTMLButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { --- 348,351 ---- *************** *** 366,371 **** exportXLSButton.setToolTipText("Export to XLS..."); - exportXLSButton.setMaximumSize(new java.awt.Dimension(25, 25)); - exportXLSButton.setMinimumSize(new java.awt.Dimension(25, 25)); exportXLSButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { --- 355,358 ---- *************** *** 375,380 **** cleanConsoleButton.setToolTipText("Clean Console"); - cleanConsoleButton.setMaximumSize(new java.awt.Dimension(25, 25)); - cleanConsoleButton.setMinimumSize(new java.awt.Dimension(25, 25)); cleanConsoleButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { --- 362,365 ---- *************** *** 384,389 **** completeGraphButton.setToolTipText("Generate Detailed Graphics"); - 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) { --- 369,372 ---- *************** *** 393,398 **** 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) { --- 376,379 ---- *************** *** 402,407 **** 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) { --- 383,386 ---- *************** *** 411,416 **** 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) { --- 390,393 ---- *************** *** 420,425 **** 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) { --- 397,400 ---- *************** *** 429,434 **** 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) { --- 404,407 ---- *************** *** 438,443 **** 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) { --- 411,414 ---- *************** *** 447,452 **** helpButton.setToolTipText("Help"); - helpButton.setMaximumSize(new java.awt.Dimension(25, 25)); - helpButton.setMinimumSize(new java.awt.Dimension(25, 25)); helpButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { --- 418,421 ---- *************** *** 626,632 **** protected void zoomOutButtonActionPerformed(ActionEvent evt) { ! //TODO zoomInButton.setEnabled(true); zoomOutButton.setEnabled(false); } --- 595,616 ---- protected void zoomOutButtonActionPerformed(ActionEvent evt) { ! fasterSeriesDataset = new FasterDataset(stockAnalysis.getSlicer().getSeries()); ! seriesChart = new SeriesChart(fasterSeriesDataset); ! seriesPanel = new ChartPanel(seriesChart.createChart("", false)); ! ! chartsPane.removeAll(); ! chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); ! ! if (stockAnalysis.getReports().size() > 0) ! { ! //TODO ! } ! zoomInButton.setEnabled(true); zoomOutButton.setEnabled(false); + moveRightButton.setEnabled(false); + moveLeftButton.setEnabled(false); + jumpRightButton.setEnabled(false); + jumpLeftButton.setEnabled(false); } *************** *** 635,638 **** --- 619,626 ---- seriesChart = new SeriesChart(seriesDataset); seriesPanel = new ChartPanel(seriesChart.createChart("", true)); + + chartsPane.removeAll(); + chartsPane.addTab(stockAnalysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); + if (stockAnalysis.getReports().size() > 0) { *************** *** 641,646 **** --- 629,639 ---- criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); } + zoomInButton.setEnabled(false); zoomOutButton.setEnabled(true); + moveRightButton.setEnabled(true); + moveLeftButton.setEnabled(true); + jumpRightButton.setEnabled(true); + jumpLeftButton.setEnabled(true); } *************** *** 775,780 **** complete.generateHTMLFile(stockAnalysis.getReports().get(reportTable.getSelectedRow()), stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod(), directoryPath, directoryName); } catch (IOException e) { ! // TODO Auto-generated catch block ! e.printStackTrace(); } } --- 768,772 ---- complete.generateHTMLFile(stockAnalysis.getReports().get(reportTable.getSelectedRow()), stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod(), directoryPath, directoryName); } catch (IOException e) { ! JOptionPane.showMessageDialog(null, messageBundle.getString("REPORT_HTML_ERROR"), "Error", 2); } } *************** *** 819,822 **** --- 811,837 ---- } + public void loadReport(StockAnalysis analysis) { + + reportTable.setModel(helper.getTableModel(analysis)); + + if (zoomInButton.isEnabled()) + { + + } + else + { + criteriaDataset = new CriteriaDataset(analysis.getReports(), analysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); + criteriaChart = new CriteriaChart(criteriaDataset); + criteriaPanel = new ChartPanel(criteriaChart.createChart("", true)); + } + chartsPane.removeAll(); + chartsPane.addTab(analysis.getStock().getName(), new ImageIcon(iconBundle.getString("SERIES_TAB")), seriesPanel); + + chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); + + exportHTMLButton.setEnabled(true); + exportXLSButton.setEnabled(true); + } + public void loadStockAnalysis(StockAnalysis analysis) { *************** *** 842,848 **** reportScrollPane.setViewportView(reportTable); ! seriesDataset = new SeriesDataset(analysis.getSlicer().getSeries(), DEFAULT_CHART_SIZE); ! seriesChart = new SeriesChart(seriesDataset); ! seriesPanel = new ChartPanel(seriesChart.createChart("", true)); chartsPane.removeAll(); --- 857,863 ---- reportScrollPane.setViewportView(reportTable); ! fasterSeriesDataset = new FasterDataset(analysis.getSlicer().getSeries()); ! seriesChart = new SeriesChart(fasterSeriesDataset); ! seriesPanel = new ChartPanel(seriesChart.createChart("", false)); chartsPane.removeAll(); *************** *** 861,874 **** 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); --- 876,881 ---- if (analysis.getReports().size() > 0) { ! //TODO ! chartsPane.addTab("Reports", new ImageIcon(iconBundle.getString("REPORTS_TAB")), criteriaPanel); |
