Changeset 5809

Timestamp:

Aug 18, 2015, 3:53:05 PM (9 years ago)

Author:

mmh

Message:

support better tagging of uq objects

File:

• branches/uq/gui/scripts/analyzer.tcl (modified) (2 diffs)

branches/uq/gui/scripts/analyzer.tcl

@@ -830 +830 @@
             set haveresults 0
             foreach item [_reorder [$xmlobj children output]] {
-                switch -glob -- $item {
-                    log* {
-                        _autoLabel $xmlobj output.$item "Output Log" counters
-                    }
-                    number* {
-                        _autoLabel $xmlobj output.$item "Number" counters
-                    }
-                    integer* {
-                        _autoLabel $xmlobj output.$item "Integer" counters
-                    }
-                    mesh* {
-                        _autoLabel $xmlobj output.$item "Mesh" counters
-                    }
-                    string* {
-                        _autoLabel $xmlobj output.$item "String" counters
-                    }
-                    histogram* - curve* - field* {
-                        _autoLabel $xmlobj output.$item "Plot" counters
-                    }
-                    drawing* {
-                        _autoLabel $xmlobj output.$item "Drawing" counters
-                    }
-                    structure* {
-                        _autoLabel $xmlobj output.$item "Structure" counters
-                    }
-                    table* {
-                        _autoLabel $xmlobj output.$item "Energy Levels" counters
-                    }
-                    sequence* {
-                        _autoLabel $xmlobj output.$item "Sequence" counters
+                if {[$xmlobj get output.$item.about.uqtype] == ""} {
+                    switch -glob -- $item {
+                        log* {
+                            _autoLabel $xmlobj output.$item "Output Log" counters
+                        }
+                        number* {
+                            _autoLabel $xmlobj output.$item "Number" counters
+                        }
+                        integer* {
+                            _autoLabel $xmlobj output.$item "Integer" counters
+                        }
+                        mesh* {
+                            _autoLabel $xmlobj output.$item "Mesh" counters
+                        }
+                        string* {
+                            _autoLabel $xmlobj output.$item "String" counters
+                        }
+                        histogram* - curve* - field* {
+                            _autoLabel $xmlobj output.$item "Plot" counters
+                        }
+                        drawing* {
+                            _autoLabel $xmlobj output.$item "Drawing" counters
+                        }
+                        structure* {
+                            _autoLabel $xmlobj output.$item "Structure" counters
+                        }
+                        table* {
+                            _autoLabel $xmlobj output.$item "Energy Levels" counters
+                        }
+                        sequence* {
+                            _autoLabel $xmlobj output.$item "Sequence" counters
+                        }
                     }
                 }
@@ -890 +892 @@
                     }
                     if {"" != $label && !$hidden} {
-                        puts "label=$label"
-                        set uq_part ""
-                        # for now, UQ parts are tagged like this.
-                        if {[string match "*:UQ:?" $label]} {
-                            set uqnum [string index $label end]
-                            set len [string length $label]
-                            set label [string replace $label [expr $len-5] end]
-                            switch $uqnum {
-                                1 {
-                                    set uq_part PDF
-                                }
-                                2 {
-                                    set uq_part Sensitivity
-                                }
-                                3 {
-                                    set uq_part "All Runs"
-                                }
-                                4 {
-                                    set uq_part "Sequence"
-                                }
-                                5 {
-                                    set uq_part "Response"
-                                }
-                                6 {
-                                    set uq_part "Probability"
-                                }
-                            }
-                        }
+                        set uq_part [$xmlobj get output.$item.about.uqtype]
 
                         puts "label=$label uq_part=$uq_part"