Added a run options to the "no gui" generate options.

The user can select between run to completion and prompt for exit.

Also fixed the props dialog is changed function to have better hashes.
Now we hash a tuple of all "relevant" items which is "order aware".
Since xoring the individual hashes proved faulty when 2 params alternated hiding.
(cherry picked from commit fd37328c778ea8014e9ea9d932e61e5d229dd012)

diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml
index 1798a69f88a834c9dccd6ad7e878198b2d147372..4d0dd28999f4bfbbc8c6c541cc8b6ffbb695553a 100644 (file)
--- a/grc/blocks/options.xml
+++ b/grc/blocks/options.xml
@@ -77,20 +77,37 @@ else: self.stop(); self.wait()</callback>
                <type>string</type>
                <hide>#if $generate_options() == 'hb' then 'none' else 'all'#</hide>
        </param>
+       <param>
+               <name>Run Options</name>
+               <key>run_options</key>
+               <value>prompt</value>
+               <type>enum</type>
+               <hide>#if $generate_options() == 'no_gui' then 'none' else 'all'#</hide>
+               <option>
+                       <name>Run to Completion</name>
+                       <key>run</key>
+               </option>
+               <option>
+                       <name>Prompt for Exit</name>
+                       <key>prompt</key>
+               </option>
+       </param>
        <param>
                <name>Run</name>
                <key>run</key>
                <value>True</value>
                <type>bool</type>
-               <hide>#if $generate_options() == 'wx_gui'
-       #if str($run) == 'True'
-part#slurp
+               <hide>
+#if $generate_options() == 'wx_gui'
+       #if $run()
+               part
        #else
-none#slurp
+               none
        #end if
 #else
-all#slurp
-#end if</hide>
+       all
+#end if
+               </hide>
                <option>
                        <name>Autostart</name>
                        <key>True</key>

diff --git a/grc/gui/PropsDialog.py b/grc/gui/PropsDialog.py
index a7822b22843f0484b3f6a496cb26491e7a180ed7..cc84fd0888007f14d768b13d71ba7792fcc58818 100644 (file)
--- a/grc/gui/PropsDialog.py
+++ b/grc/gui/PropsDialog.py
@@ -93,15 +93,14 @@ class PropsDialog(gtk.Dialog):
                Ex: Added, removed, type change, hide change...
                To the props dialog, the hide setting of 'none' and 'part' are identical.
                Therfore, the props dialog only cares if the hide setting is/not 'all'.
-               Make a hash that uniquely represents the params state.
+               Make a hash that uniquely represents the params' state.
                @return true if changed
                """
                old_hash = self._hash
-               self._hash = 0
-               for param in self._block.get_params():
-                       self._hash ^= hash(param)
-                       self._hash ^= hash(param.get_type())
-                       self._hash ^= hash(param.get_hide() == 'all')
+               #create a tuple of things from each param that affects the params box
+               self._hash = hash(tuple([(
+                       hash(param), param.get_type(), param.get_hide() == 'all',
+               ) for param in self._block.get_params()]))
                return self._hash != old_hash
 
        def _handle_changed(self, *args):

diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index dce4037d58a4a9cde77cf99ca7bd10120f81b279..31d99a61c2dde5096e55b120c4f63c720956578a 100644 (file)
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -233,9 +233,14 @@ if __name__ == '__main__':
        #if $generate_options == 'wx_gui'
        tb.Run($flow_graph.get_option('run'))
        #elif $generate_options == 'no_gui'
+               #set $run_options = $flow_graph.get_option('run_options')
+               #if $run_options == 'prompt'
        tb.start()
        raw_input('Press Enter to quit: ')
        tb.stop()
+               #elif $run_options == 'run'
+       tb.run()
+               #end if
        #end if
 #end if