Changeset 3351

Timestamp:

05/14/08 22:05:25 (2 months ago)

Author:

aaronr

Message:

More cleanup of marking models dirty. As of this checkin there is still an issue in that the result manager is inserting nodes into Simulation_runs, which is not editable by default, on config load. This will have to be addressed.

Location:

trunk/opus_gui

Files:

• config/resultsmanager/opusxmlaction_results.py (modified) (5 diffs)
• config/toolboxbase.py (modified) (2 diffs)
• config/xmlmodelview/opusdatamodel.py (modified) (2 diffs)
• main/opusgui.py (modified) (2 diffs)

trunk/opus_gui/config/resultsmanager/opusxmlaction_results.py

@@ -149 +149 @@
         else:
             print "No valid node was found..."
-
-        self.currentIndex.model().markAsDirty()
         model.emit(SIGNAL("layoutChanged()"))
 
@@ -169 +167 @@
                 self.currentIndex,
                 newNode)
-
-        self.currentIndex.model().markAsDirty()
         model.emit(SIGNAL("layoutChanged()"))
 
@@ -241 +237 @@
         else:
             print "No valid node was found..."
-            
-        self.currentIndex.model().markAsDirty()        
         model.emit(SIGNAL("layoutChanged()"))
 
@@ -335 +329 @@
         self.currentIndex.model().removeRow(self.currentIndex.internalPointer().row(),
                                             self.currentIndex.model().parent(self.currentIndex))
-        self.currentIndex.model().markAsDirty()
         self.currentIndex.model().emit(SIGNAL("layoutChanged()"))
 
@@ -353 +346 @@
         # Now up the tree, only hitting parent nodes and not sibblings
         self.currentIndex.model().stripAttributeUp('inherited',thisNode)
-        self.currentIndex.model().markAsDirty()
         # Finally we refresh the tree to indicate that there has been a change
         self.currentIndex.model().emit(SIGNAL("layoutChanged()"))

trunk/opus_gui/config/toolboxbase.py

@@ -145 +145 @@
                 self.generalManagerTree = OpusXMLTree(self,"general",
                                                       self.parent.generalmanager_page.layout())
-                self.resultsManagerTree = OpusXMLTree(self,"results_manager",
-                                                      self.parent.resultsmanager_page.layout())
                 self.modelManagerTree = OpusXMLTree(self,"model_manager",
                                                     self.parent.modelmanager_page.layout())
@@ -157 +155 @@
                 self.dataManagerDBSTree = OpusXMLTree(self, "data_manager_dbstree",
                                                       self.parent.datamanager_dbsconnections.layout())
+                self.resultsManagerTree = OpusXMLTree(self,"results_manager",
+                                                      self.parent.resultsmanager_page.layout())
             else:
                 print "Error reading the %s configuration file" % (xml_file)

trunk/opus_gui/config/xmlmodelview/opusdatamodel.py

@@ -324 +324 @@
         parentItem.childItems.insert(row,item)
         self.endInsertRows()
-        #print "debug"
         self.markAsDirty()
         return returnval
@@ -449 +448 @@
         if choices is not None:
             newNode.setAttribute(QString('choices'), QString(choices))
-        self.markAsDirty()
         return newNode
 

trunk/opus_gui/main/opusgui.py

@@ -183 +183 @@
         if config:
             self.toolboxStuff.openXMLTree(config)
+            # Add the project file's path to the title bar
+            self.setWindowTitle(self.application_title + " - " + QFileInfo(self.toolboxStuff.runManagerTree.parentTool.xml_file).filePath())
         else:
             import os
@@ -203 +205 @@
             # Open the file and add to the Run tab...
             self.toolboxStuff.openXMLTree(fileName)
+            # Add the project file's path to the title bar
+            self.setWindowTitle(self.application_title + " - " + QFileInfo(self.toolboxStuff.runManagerTree.parentTool.xml_file).filePath())
             self.resultManagerStuff.scan_for_runs()
-
-
-        # Add the project file's path to the title bar
-        self.setWindowTitle(self.application_title + " - " + QFileInfo(self.toolboxStuff.runManagerTree.parentTool.xml_file).filePath())
 
     def saveConfig(self):