Changeset 3205

Timestamp:

Oct 29, 2010 4:57:54 PM (10 years ago)

Author:

claird

Message:

bug fixes for saving previously unsaved files

Location:

coopr.age/trunk/coopr/age

Files:

• CooprAge.py (modified) (1 diff)
• CooprAgeWingProject.wpr (modified) (12 diffs)

coopr.age/trunk/coopr/age/CooprAge.py

@@ -133 +133 @@
     def saveCooprProblem(self, problemWindow, problem):
         if problem.filename is None:
-            return self.saveAsCooprProblem(problem)
+            return self.saveAsCooprProblem(problemWindow, problem)
 
         filename = problem.filename

coopr.age/trunk/coopr/age/CooprAgeWingProject.wpr

@@ -14 +14 @@
 proj.main-file = loc('CooprAge.py')
 [user attributes]
-debug.breakpoints = {loc('UIProblem.py'): {347: (0,
-        None,
-        1,
-        0)}}
 debug.err-values = {loc('CooprAge.py'): {},
                     loc('age.py'): {}}
@@ -54 +50 @@
                                  'expanded-nodes': [],
                                  'selected-nodes': [(4,)],
-                                 'top-node': (0,)}},
+                                 'top-node': (1,)}},
         'tree-style': 'deep'}}),
                               ('source-assistant',
@@ -101 +97 @@
                       loc('../CooprTrunk/coopr/src/coopr.plugins/coopr/plugins/mip/ASL.py'),
                       'ASL')]},
+        loc('../CooprTrunk/coopr/src/coopr.pyomo/coopr/pyomo/base/PyomoModel.py'): {''\
+        'column-widths': [1.0],
+        'expanded-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('class def',
+                      loc('../CooprTrunk/coopr/src/coopr.pyomo/coopr/pyomo/base/PyomoModel.py'),
+                      'ConcreteModel')]},
         loc('../CooprTrunk/coopr/src/coopr.pyomo/coopr/pyomo/expr/canonical_repn.py'): {''\
         'column-widths': [1.0],
@@ -137 +140 @@
         loc('CooprAgeCore.py'),
         'CooprAgeApplication')]},
-        u'By Module': {'column-widths': [1.0],
-                       'expanded-nodes': [],
-                       'selected-nodes': [],
-                       'top-node': [('generic attribute',
-                                     loc('CooprAge.py'),
-                                     '')]},
-        loc('../CooprTrunk/coopr/src/coopr.pyomo/coopr/pyomo/base/PyomoModel.py'): {''\
-        'column-widths': [1.0],
-        'expanded-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('class def',
-                      loc('../CooprTrunk/coopr/src/coopr.pyomo/coopr/pyomo/base/PyomoModel.py'),
-                      'ConcreteModel')]},
         loc('Editor.py'): {'column-widths': [1.0],
                            'expanded-nodes': [],
@@ -162 +152 @@
         loc('UIProblem.py'),
         'DataPane')]},
+        loc('../../../../../usr/lib/python2.6/copy_reg.py'): {'column-widths': [1.0],
+        'expanded-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('function def',
+                      loc('../../../../../usr/lib/python2.6/copy_reg.py'),
+                      'add_extension')]},
+        u'By Module': {'column-widths': [1.0],
+                       'expanded-nodes': [],
+                       'selected-nodes': [],
+                       'top-node': [('generic attribute',
+                                     loc('CooprAge.py'),
+                                     '')]},
+        loc('../../../../../usr/lib/python2.6/genericpath.py'): {'column-wid'\
+        'ths': [1.0],
+        'expanded-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('function def',
+                      loc('../../../../../usr/lib/python2.6/genericpath.py'),
+                      'commonprefix')]},
         u'All Classes': {'column-widths': [1.0],
                          'expanded-nodes': [],
@@ -167 +176 @@
                          'top-node': [('class def',
                                        loc('CooprAgeCore.py'),
-                                       'CooprAgeApplication')]},
-        loc('../../../../../usr/lib/python2.6/copy_reg.py'): {'column-widths': [1.0],
-        'expanded-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('function def',
-                      loc('../../../../../usr/lib/python2.6/copy_reg.py'),
-                      'add_extension')]},
-        loc('../../../../../usr/lib/python2.6/genericpath.py'): {'column-wid'\
-        'ths': [1.0],
-        'expanded-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('function def',
-                      loc('../../../../../usr/lib/python2.6/genericpath.py'),
-                      'commonprefix')]}},
+                                       'CooprAgeApplication')]}},
                                 'browse_mode': u'Current Module',
                                 'follow-selection': False,
@@ -202 +198 @@
         ('eval',
          'self.inputDocuments')],
-                                'tree-state': {'column-widths': [0.3328100470957614,
-        0.66718995290423866],
-        'expanded-nodes': [(1,),
-                           (1,
-                            6)],
+                                'tree-state': {'column-widths': [0.33384379785604901,
+        0.66615620214395099],
+        'expanded-nodes': [],
         'selected-nodes': [],
         'top-node': (0,)}})],
@@ -355 +349 @@
                        'recent-filters': None})],
         'primary_view_state': {'editor_states': {'bookmarks': ([(loc('UIProblem.py'),
-        {'attrib-starts': [('ResultsPane',
-                            136),
-                           ('ResultsPane.renameResults',
-                            201)],
-         'first-line': 195,
+        {'attrib-starts': [('DataPane',
+                            275),
+                           ('DataPane.newDocument',
+                            345)],
+         'first-line': 336,
          'folded-linenos': [],
-         'sel-line': 208,
-         'sel-line-start': 9842,
-         'selection_end': 9898,
-         'selection_start': 9898},
-        1288045768.8943031),
-        (loc('UIProblem.py'),
-         {'attrib-starts': [('DataPane',
-                             275)],
-          'first-line': 266,
-          'folded-linenos': [],
-          'sel-line': 275,
-          'sel-line-start': 12576,
-          'selection_end': 12590,
-          'selection_start': 12582},
-         1288045774.7545581),
-        (loc('UIProblem.py'),
-         {'attrib-starts': [('DataPane',
-                             275),
-                            ('DataPane.newDocument',
-                             345)],
-          'first-line': 336,
-          'folded-linenos': [],
-          'sel-line': 345,
-          'sel-line-start': 16501,
-          'selection_end': 16520,
-          'selection_start': 16509},
-         1288045778.8512559),
+         'sel-line': 345,
+         'sel-line-start': 16501,
+         'selection_end': 16520,
+         'selection_start': 16509},
+        1288045778.8512559),
         (loc('UIProblem.py'),
          {'attrib-starts': [('DataPane',
@@ -580 +552 @@
           'selection_start': 6713},
          1288045967.135396),
-        [loc('CooprAgeCore.py'),
+        (loc('CooprAgeCore.py'),
          {'attrib-starts': [('CooprAgeProblem',
                              53),
-                            ('CooprAgeProblem.newInputDocument',
-                             115)],
-          'first-line': 112,
-          'folded-linenos': [],
-          'sel-line': 117,
-          'sel-line-start': 3873,
-          'selection_end': 3873,
-          'selection_start': 3873},
-         1288045979.6900809]],
+                            ('CooprAgeProblem.NameUnique',
+                             100)],
+          'first-line': 96,
+          'folded-linenos': [],
+          'sel-line': 102,
+          'sel-line-start': 3401,
+          'selection_end': 3441,
+          'selection_start': 3441},
+         1288045979.6900809),
+        (loc('UIProblem.py'),
+         {'attrib-starts': [('DataPane',
+                             275),
+                            ('DataPane.newDocument',
+                             345)],
+          'first-line': 336,
+          'folded-linenos': [],
+          'sel-line': 346,
+          'sel-line-start': 16528,
+          'selection_end': 16528,
+          'selection_start': 16528},
+         1288046038.659672),
+        [loc('CooprAge.py'),
+         {'attrib-starts': [('CooprAgeMainWindow',
+                             9),
+                            ('CooprAgeMainWindow.newCooprProblem',
+                             102)],
+          'first-line': 100,
+          'folded-linenos': [],
+          'sel-line': 104,
+          'sel-line-start': 4744,
+          'selection_end': 4756,
+          'selection_start': 4756},
+         1288382914.3628981]],
         19),
-        'current-loc': loc('CooprAgeCore.py'),
+        'current-loc': loc('CooprAge.py'),
         'editor-states': {loc('CooprAge.py'): {'attrib-starts': [('CooprAgeM'\
         'ainWindow',
         9),
-        ('CooprAgeMainWindow.newCooprProblem',
-         102)],
-        'first-line': 100,
-        'folded-linenos': [],
-        'sel-line': 104,
-        'sel-line-start': 4744,
-        'selection_end': 4756,
-        'selection_start': 4756},
+        ('CooprAgeMainWindow.saveCooprProblem',
+         132)],
+        'first-line': 129,
+        'folded-linenos': [],
+        'sel-line': 137,
+        'sel-line-start': 6289,
+        'selection_end': 6334,
+        'selection_start': 6334},
                           loc('CooprAgeCore.py'): {'attrib-starts': [('Coopr'\
         'AgeProblem',
@@ -635 +631 @@
         'sel-line': 346,
         'sel-line-start': 16528,
-        'selection_end': 16577,
-        'selection_start': 16577},
+        'selection_end': 16528,
+        'selection_start': 16528},
                           loc('../../../../../../../../../../usr/lib/wingide3.2/resources/doc/en/TOC.idx'): {''\
         'displayed-index': 0,
@@ -645 +641 @@
                          'top': (0,
                                  0)}}},
-        'has-focus': True},
-                               'open_files': [u'../../../../../../../../../../usr/lib/wingide3.2/resources/doc/en/TOC.idx',
+        'has-focus': False},
+                               'open_files': [u'CooprAgeCore.py',
         u'Editor.py',
-        u'CooprAge.py',
+        u'../../../../../../../../../../usr/lib/wingide3.2/resources/doc/en/TOC.idx',
         u'UIProblem.py',
-        u'CooprAgeCore.py']},
+        u'CooprAge.py']},
         'split_percents': {0: 0.91145332050048122},
         'splits': 2,
@@ -663 +659 @@
                          1413,
                          719)}]}
-guimgr.recent-documents = [loc('CooprAgeCore.py'),
-                           loc('UIProblem.py'),
-                           loc('CooprAge.py'),
-                           loc('Editor.py')]
+guimgr.recent-documents = [loc('CooprAge.py'),
+                           loc('UIProblem.py')]
 guimgr.visual-state = {loc('../PyomoGUI_Backup/PyomoGUI/UITree.py'): {'attri'\
         'b-starts': [('TreeWindow',