Changeset 3321

Timestamp:

05/11/08 12:09:09 (2 months ago)

Author:

travis

Message:

(travis) adding indicator group + adding new indicator group

Location:

trunk

Files:

• eugene/configs/eugene_gridcell.xml (modified) (2 diffs)
• opus_gui/config/resultsmanager/opusxmlaction_results.py (modified) (3 diffs)
• opus_gui/config/xmlmodelview/opusdatamodel.py (modified) (1 diff)

trunk/eugene/configs/eugene_gridcell.xml

@@ -300 +300 @@
         </population_density>
       </model.gridcell>
-      <eugene.frank.indicators type="indicator_library">
-        <global_population_density type="indicator">
-          <package type="string">urbansim</package>
-          <valid_datasets type="string">alldata</valid_datasets>
-          <documentation_link type="string" />
-          <expression type="string">alldata.aggregate_all(urbansim.gridcell.population_density, function=sum)</expression>
-        </global_population_density>
-      </eugene.frank.indicators>
       <my_indicators append_to="True" type="indicator_library">
         <residential_units type="indicator">
@@ -317 +309 @@
       </my_indicators>
     </Indicator_libraries>
+    <Indicator_groups setexpanded="True" type="group"/>
     <Simulation_runs setexpanded="True" type="all_source_data" />
     <Results setexpanded="True" type="selectable_list" />

trunk/opus_gui/config/resultsmanager/opusxmlaction_results.py

@@ -42 +42 @@
         QObject.connect(self.actAddNewIndicator, SIGNAL("triggered()"), self.addNewIndicator)
 
+        #create new result template...
+        self.actAddNewIndicatorGroup = QAction(self.acceptIcon, 
+                                          "Add new indicator group...",
+                                          self.xmlTreeObject.parent)
+        QObject.connect(self.actAddNewIndicatorGroup, SIGNAL("triggered()"), self.addNewIndicatorGroup)          
+
         #generate results will enter a dialogue to pair indicators with 
         #result templates and datasets and then run them to produce results
@@ -146 +152 @@
         model.emit(SIGNAL("layoutChanged()"))
 
+
+    def addNewIndicatorGroup(self):
+        print "addNewIndicatorGroup pressed with column = %s and item = %s" % \
+              (self.currentColumn, self.currentIndex.internalPointer().node().toElement().tagName())
+              
+        model = self.currentIndex.model()
+        document = model.domDocument
+        name = 'untitled indicator group'
+
+        newNode = model.create_node(document = document, 
+                                    name = name, 
+                                    type = 'indicator_group', 
+                                    value = '')
+
+        model.insertRow(0,
+                self.currentIndex,
+                newNode)
+
+        self.currentIndex.model().markAsDirty()
+        model.emit(SIGNAL("layoutChanged()"))
+
+            
     def generateResults(self):
         print "generateResults pressed with column = %s and item = %s" % \
@@ -263 +291 @@
                 elif domElement.attribute(QString("type")) == QString("source_data"):
                     self.menu.addAction(self.actGenerateResults)
+                elif domElement.tagName() == QString("Indicator_groups"):
+                    self.menu.addAction(self.actAddNewIndicatorGroup)
                 elif domElement.attribute(QString("type")) == QString("indicator"):
                     self.menu.addAction(self.actViewDocumentation)

trunk/opus_gui/config/xmlmodelview/opusdatamodel.py

@@ -133 +133 @@
                    "script_batch":self.pythonBatchIcon,
                    "indicator_library":self.folderIcon,
+                   "indicator_group":self.folderIcon,
                    "group":self.folderIcon,
                    "indicator":self.tableIcon,