Changeset 2397

Timestamp:

Feb 24, 2010 12:17:16 AM (11 years ago)

Author:

wehart

Message:

Initial rework of GUI. I have the options table working, and
I'm close to getting a Pyomo thread of execution working...

Location:

coopr.gui.pyomo/trunk/coopr/gui/pyomo

Files:

• GUI.py (modified) (9 diffs)
• Options.py (added)

coopr.gui.pyomo/trunk/coopr/gui/pyomo/GUI.py

@@ -2 +2 @@
 from java.awt import GridBagLayout, GridBagConstraints, FlowLayout
 from pawt import GridBag
-#RIGHT = swing.JLabel.RIGHT
 APPROVE_OPTION = swing.JFileChooser.APPROVE_OPTION
 import java.io
 import pickle
 import os
+from Options import OptionsTable
+import coopr.pyomo.scripting
+from threading import Thread
+
 
 class Container(dict):
@@ -78 +81 @@
 
 
+class RunPyomo(Thread):
+
+    def __init__(self, options, args, parser):
+        self.options=options
+        self.args=args
+        self.parser=parser
+
+    def run(self):
+        self.ostream = StringIO.StringIO()
+        pyutilib.misc.redirect(self.ostream)
+        coopr.pyomo.scripting.pyomo.run_pyomo(options, args, parser)
+        pyutilib.misc.reset_redirect()
+
 
 class GUI:
@@ -100 +116 @@
         self.chooser = swing.JFileChooser()
         self.chooser.currentDirectory = java.io.File(os.getcwd())
+
         # Finish up and set the size
         self.frame.pack()
@@ -108 +125 @@
         self.tab_id += 1
         tab = Container()
-        self.tab_info[self.tab_id] = tab
+        self.tab_info[self.tab_id-1] = tab
         #
         # Setting up the panel for the tab
@@ -139 +156 @@
         ##bag.addRow(tab.input)
         ##tab.input.append("COMMAND %d" % self.tab_id)
+
+        #
+        # create panel for the options in the command line
+        #
+        options_panel = swing.JPanel(FlowLayout(alignment=FlowLayout.LEFT))
+        tab.parser = coopr.pyomo.scripting.pyomo.create_parser()
+        tab.parse_options = tab.parser.parse_args(args=['pyomo'])[0]
+        tab.options_pane, tab.options_table = self.create_options_table(tab.parser, tab.parse_options)
+        options_panel.add(tab.options_pane)
+        bag.addRow(options_panel)
         #
         # create panel for buttons that manage command execution/output
@@ -155 +182 @@
         bag.addRow(pane, weighty=1.0)
         tab.output.append("DRAFT GUI for PYOMO COMMAND DRIVER\n\n")
+
+    def create_options_table(self, parser, parse_options):
+        options_table = OptionsTable()
+        options_table.initialize(parser, parse_options)
+        scrollPane = swing.JScrollPane()
+        scrollPane.setPreferredSize(java.awt.Dimension(600,200))
+        scrollPane.getViewport().setView(options_table)
+        return scrollPane, options_table
 
     def create_menubar(self):
@@ -182 +217 @@
         file = swing.JMenu("Help")
         file.add(swing.JMenuItem("Console", actionPerformed = self._helpConsole))
-        file.add(swing.JMenuItem("COIN-OR wiki", actionPerformed = self._helpCoinWiki))
-        file.add(swing.JMenuItem("Coopr wiki", actionPerformed = self._helpCooprWiki))
+        #file.add(swing.JMenuItem("COIN-OR wiki", actionPerformed = self._helpCoinWiki))
+        #file.add(swing.JMenuItem("Coopr wiki", actionPerformed = self._helpCooprWiki))
         file.add(swing.JMenuItem("About", actionPerformed = self._helpAbout))
         menubar.add(file)
@@ -244 +279 @@
 
     def _buttonExecute(self, event=None):
-        pass
+        if not self.tab_info[self.tabbed.getSelectedIndex()].thread is None:
+            return
+        tab = self.tab_info[self.tabbed.getSelectedIndex()]
+        options = tab.options_table.get_options()
+        #
+        thread = RunPyomo(options, ['pyomo', tab.text1.text, tab.text2.text], tab.parser)
+        tab.thread = thread
+        thread.start()
 
     def _buttonClearOutput(self, event=None):
-        pass
+        self.tab_info[self.tabbed.getSelectedIndex()].output.text = ""
 
     def _select_file(self):
@@ -258 +300 @@
     def _buttonInput1(self, event=None):
         file, absfile = self._select_file()
-        self.tab_info[1].text1.text = absfile
+        self.tab_info[self.tabbed.getSelectedIndex()].text1.text = absfile
 
     def _buttonInput2(self, event=None):
         file, absfile = self._select_file()
-        self.tab_info[1].text2.text = absfile
-
+        self.tab_info[self.tabbed.getSelectedIndex()].text2.text = absfile