diff --git a/src/edu/oregonstate/cartography/flox/gui/MainWindow.form b/src/edu/oregonstate/cartography/flox/gui/MainWindow.form index 64009e27..78ade912 100644 --- a/src/edu/oregonstate/cartography/flox/gui/MainWindow.form +++ b/src/edu/oregonstate/cartography/flox/gui/MainWindow.form @@ -1202,6 +1202,9 @@ + + + @@ -1283,14 +1286,6 @@ - - - - - - - - diff --git a/src/edu/oregonstate/cartography/flox/gui/MainWindow.java b/src/edu/oregonstate/cartography/flox/gui/MainWindow.java index 499c6682..4a8eaea7 100644 --- a/src/edu/oregonstate/cartography/flox/gui/MainWindow.java +++ b/src/edu/oregonstate/cartography/flox/gui/MainWindow.java @@ -731,7 +731,6 @@ private void initComponents() { exportImageMenuItem = new javax.swing.JMenuItem(); javax.swing.JPopupMenu.Separator jSeparator4 = new javax.swing.JPopupMenu.Separator(); exportFlowsCSVMenuItem = new javax.swing.JMenuItem(); - jMenuItem1 = new javax.swing.JMenuItem(); editMenu = new javax.swing.JMenu(); undoMenuItem = new javax.swing.JMenuItem(); redoMenuItem = new javax.swing.JMenuItem(); @@ -2766,6 +2765,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { getContentPane().add(rightPanel, java.awt.BorderLayout.EAST); fileMenu.setText("File"); + fileMenu.addMenuListener(new javax.swing.event.MenuListener() { + public void menuCanceled(javax.swing.event.MenuEvent evt) { + } + public void menuDeselected(javax.swing.event.MenuEvent evt) { + } + public void menuSelected(javax.swing.event.MenuEvent evt) { + fileMenuMenuSelected(evt); + } + }); openSettingsMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_O, java.awt.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())); openSettingsMenuItem.setText("Open Project…"); @@ -2828,14 +2836,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { }); fileMenu.add(exportFlowsCSVMenuItem); - jMenuItem1.setText("Test"); - jMenuItem1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jMenuItem1ActionPerformed(evt); - } - }); - fileMenu.add(jMenuItem1); - menuBar.add(fileMenu); editMenu.setText("Edit"); @@ -5167,31 +5167,6 @@ private void parallelFlowsOverlapSliderStateChanged(javax.swing.event.ChangeEven } }//GEN-LAST:event_parallelFlowsOverlapSliderStateChanged - private void jMenuItem1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem1ActionPerformed - - for (int i = 0; i < 10; i++) { - try { - String pointsFilePath = "/Users/jennyb/Desktop/" + i + "nodes.csv"; - String flowsFilePath = "/Users/jennyb/Desktop/" + i + "flows.csv"; - ArrayList flows = FlowImporter.readFlows(pointsFilePath, flowsFilePath); - String name = FileUtils.getFileNameWithoutExtension(flowsFilePath); - setFlows(flows, name); - - Thread.sleep(20 * 1000); - - String outFilePath = "/Users/jennyb/Desktop/" + i + "out.csv"; - - CSVFlowExporter.export(outFilePath, model.flowIterator()); - - } catch (IOException ex) { - Logger.getLogger(MainWindow.class.getName()).log(Level.SEVERE, null, ex); - } catch (InterruptedException ex) { - Logger.getLogger(MainWindow.class.getName()).log(Level.SEVERE, null, ex); - } - } - - }//GEN-LAST:event_jMenuItem1ActionPerformed - private void parallelFlowsOptionsButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_parallelFlowsOptionsButtonActionPerformed JOptionPane.showOptionDialog(null, parallelFlowsOptionsPanel, "Parallel Flows", JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null, null, null); @@ -5213,6 +5188,14 @@ private void parallelFlowsCheckBoxActionPerformed(java.awt.event.ActionEvent evt layout("Parallel Opposing Flows"); }//GEN-LAST:event_parallelFlowsCheckBoxActionPerformed + private void fileMenuMenuSelected(javax.swing.event.MenuEvent evt) {//GEN-FIRST:event_fileMenuMenuSelected + boolean hasData = model.getNbrFlows() > 0 || model.getNbrNodes() > 0 + || model.getNbrLayers() > 0; + exportSVGMenuItem.setEnabled(hasData); + exportImageMenuItem.setEnabled(hasData); + exportFlowsCSVMenuItem.setEnabled(hasData); + }//GEN-LAST:event_fileMenuMenuSelected + /** * Returns a string that can be used for a file name when exporting to a * file. @@ -5354,7 +5337,6 @@ public void layout(String undoString) { private javax.swing.JLabel jLabel35; private javax.swing.JLabel jLabel37; private javax.swing.JLabel jLabel38; - private javax.swing.JMenuItem jMenuItem1; private javax.swing.JPopupMenu.Separator jSeparator15; private javax.swing.JPopupMenu.Separator jSeparator18; private javax.swing.JPopupMenu.Separator jSeparator22;