Menu
▾
▴
tail-cvs
|
From: Carlos <ma...@us...> - 2007-10-15 20:10:23
|
Update of /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15311/src/java/net/sf/tails/swing/frame Modified Files: Index.java Log Message: Atualização de tela... Criado console e progressbar e ajustes de detalhes na table do stock analysis. Index: Index.java =================================================================== RCS file: /cvsroot/tail/TailS/src/java/net/sf/tails/swing/frame/Index.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Index.java 11 Oct 2007 00:17:50 -0000 1.19 --- Index.java 15 Oct 2007 20:09:36 -0000 1.20 *************** *** 24,27 **** --- 24,30 ---- import javax.swing.JFrame; import javax.swing.JOptionPane; + import javax.swing.JProgressBar; + import javax.swing.ScrollPaneConstants; + import javax.swing.table.DefaultTableModel; import net.sf.tail.analysis.StockAnalysis; *************** *** 60,64 **** --- 63,71 ---- private javax.swing.JFileChooser xlsFileChooser; private javax.swing.JFileChooser htmlFileChooser; + private javax.swing.JScrollPane consoleScrollPane; + private javax.swing.JTextArea consoleArea; private FrameHelper helper; + + private JProgressBar reportProgress; /** Creates new form OpenStockAnalysis *************** *** 101,104 **** --- 108,114 ---- separator2 = new javax.swing.JSeparator(); exitMenuItem = new javax.swing.JMenuItem(); + consoleScrollPane = new javax.swing.JScrollPane(); + consoleArea = new javax.swing.JTextArea(); + reportProgress = new javax.swing.JProgressBar(); addReportButton = new javax.swing.JButton(); *************** *** 113,116 **** --- 123,137 ---- htmlFileChooser = new javax.swing.JFileChooser(); + consoleArea.setVisible(true); + consoleArea.setEditable(false); + consoleArea.setAutoscrolls(true); + consoleArea.setLineWrap(true); + + reportProgress.setMaximum(100); + reportProgress.setMinimum(0); + reportProgress.setToolTipText("Loading"); + reportProgress.setVisible(false); + reportProgress.setStringPainted(true); + directoryFileChooser.setFileSelectionMode(javax.swing.JFileChooser.FILES_ONLY); directoryFileChooser.setCurrentDirectory(new File("Data/StockAnalysis")); *************** *** 128,133 **** reportScrollPane.setAutoscrolls(true); reportScrollPane.setHorizontalScrollBar(null); ! if (stockAnalysis != null) { stockNameLabel.setText(stockNameLabel.getText() + stockAnalysis.getStock().getName()); --- 149,162 ---- reportScrollPane.setAutoscrolls(true); reportScrollPane.setHorizontalScrollBar(null); + reportScrollPane.setWheelScrollingEnabled(true); + + consoleScrollPane.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + consoleScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); + consoleScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); + consoleScrollPane.setViewportBorder(javax.swing.BorderFactory.createEtchedBorder()); + consoleScrollPane.setViewportView(consoleArea); + consoleScrollPane.setWheelScrollingEnabled(true); ! if (stockAnalysis != null) { stockNameLabel.setText(stockNameLabel.getText() + stockAnalysis.getStock().getName()); *************** *** 138,148 **** reportTable.setModel(helper.getTableModel(stockAnalysis)); reportTable.setGridColor(new java.awt.Color(255, 255, 255)); ! ! reportScrollPane.setViewportView(reportTable); } else { ! reportTable.setVisible(false); } addReportButton.setFont(new java.awt.Font("Dialog", 0, 12)); --- 167,189 ---- reportTable.setModel(helper.getTableModel(stockAnalysis)); reportTable.setGridColor(new java.awt.Color(255, 255, 255)); ! reportTable.setEnabled(true); } else { ! stockNameLabel.setText(stockNameLabel.getText() + "No Stock"); ! seriesIntervalLabel.setText(seriesIntervalLabel.getText() + " -"); ! reportTable.setAutoCreateRowSorter(false); ! ! reportTable.setModel(new DefaultTableModel(new Object[]{"-"}, 6)); ! reportTable.setGridColor(new java.awt.Color(255, 255, 255)); ! reportTable.setEnabled(true); } + + + reportScrollPane.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + reportScrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); + reportScrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); + reportScrollPane.setViewportView(reportTable); + reportScrollPane.setViewportBorder(javax.swing.BorderFactory.createEtchedBorder()); addReportButton.setFont(new java.awt.Font("Dialog", 0, 12)); *************** *** 254,257 **** --- 295,299 ---- .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(stockNameLabel) .addGroup(layout.createSequentialGroup() *************** *** 260,264 **** .addComponent(htmlButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) ! .addComponent(xlsButton)) .addComponent(seriesIntervalLabel)) .addContainerGap()) --- 302,308 ---- .addComponent(htmlButton) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) ! .addComponent(xlsButton) ! .addGap(200) ! .addComponent(reportProgress)) .addComponent(seriesIntervalLabel)) .addContainerGap()) *************** *** 277,282 **** .addComponent(addReportButton, javax.swing.GroupLayout.PREFERRED_SIZE, 17, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) ! .addComponent(reportScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 339, javax.swing.GroupLayout.PREFERRED_SIZE) ! .addContainerGap(163, Short.MAX_VALUE)) ); pack(); --- 321,330 ---- .addComponent(addReportButton, javax.swing.GroupLayout.PREFERRED_SIZE, 17, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) ! .addComponent(reportScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE) ! .addGap(20) ! .addComponent(consoleScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 130, javax.swing.GroupLayout.PREFERRED_SIZE) ! .addContainerGap(163, Short.MAX_VALUE) ! .addComponent(reportProgress)) ! ); pack(); *************** *** 301,305 **** fileName += ".xls"; } ! CompleteReportGenerator complete = new CompleteReportGenerator(); complete.generateXLSFile(stockAnalysis.getReports().get(reportTable.getSelectedRow()), stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod(), filePath, fileName); --- 349,353 ---- fileName += ".xls"; } ! CompleteReportGenerator complete = new CompleteReportGenerator(this); complete.generateXLSFile(stockAnalysis.getReports().get(reportTable.getSelectedRow()), stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod(), filePath, fileName); *************** *** 324,328 **** directoryPath = directoryPath.substring(0, directoryPath.length() - (1 + directoryName.length())); ! CompleteReportGenerator complete = new CompleteReportGenerator(); try { complete.generateHTMLFile(stockAnalysis.getReports().get(reportTable.getSelectedRow()), stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod(), directoryPath, directoryName); --- 372,376 ---- directoryPath = directoryPath.substring(0, directoryPath.length() - (1 + directoryName.length())); ! CompleteReportGenerator complete = new CompleteReportGenerator(this); try { complete.generateHTMLFile(stockAnalysis.getReports().get(reportTable.getSelectedRow()), stockAnalysis.getAdditionalCriteria(), stockAnalysis.getSlicer().getPeriod(), directoryPath, directoryName); *************** *** 380,384 **** reportTable.setModel(helper.getTableModel(analysis)); reportTable.setGridColor(new java.awt.Color(255, 255, 255)); ! reportScrollPane.setViewportView(reportTable); --- 428,433 ---- reportTable.setModel(helper.getTableModel(analysis)); reportTable.setGridColor(new java.awt.Color(255, 255, 255)); ! reportTable.setEnabled(true); ! reportScrollPane.setViewportView(reportTable); *************** *** 442,446 **** private void stockAnalysisMenuItemActionPerformed(java.awt.event.ActionEvent evt) { new NewStockAnalysis(this).setVisible(true); ! } } --- 491,514 ---- private void stockAnalysisMenuItemActionPerformed(java.awt.event.ActionEvent evt) { new NewStockAnalysis(this).setVisible(true); ! } ! ! public void appendConsoleArea(String message) ! { ! consoleArea.setText(consoleArea.getText() + message + "\n"); ! consoleArea.setCaretPosition(consoleArea.getText().length()); ! } ! ! public void updateReportProgress(int value) { ! if (value == 100) ! { ! reportProgress.setVisible(false); ! reportProgress.setValue(value); ! } ! else ! { ! reportProgress.setVisible(true); ! reportProgress.setValue(value); ! } ! } } |
Thanks for helping keep SourceForge clean.
X