Changeset 9513

Timestamp:

09/06/08 21:50:35

Author:

jblum

Message:

import and @package cleanup, bug fix with hier lib dir

Files:

• gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ActionHandler.py (modified) (11 diffs)
• gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/MainWindow.py (modified) (1 diff)
• gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Colors.py (modified) (1 diff)
• gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Constants.py.in (modified) (1 diff)
• gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Generator.py (modified) (2 diffs)
• gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/converter.py (modified) (1 diff)

gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/ActionHandler.py

@@ -171 +171 @@
-                """
-                #print state
-############################################
+
-                # Initalize/Quit
-############################################
+
-                if state == Actions.APPLICATION_INITIALIZE:
-                        for action in Actions.ACTIONS_LIST: action.set_sensitive(False) #set all actions disabled
@@ -196 +196 @@
-                                gtk.main_quit()
-                                exit(0)
-############################################
+
-                # Selections
-############################################
+
-                elif state == Actions.ELEMENT_SELECT:
-                        self.get_flow_graph().update()
@@ -204 +204 @@
-                        self.get_flow_graph().unselect()
-                        self.get_flow_graph().update()
-############################################
+
-                # Enable/Disable
-############################################
+
-                elif state == Actions.BLOCK_ENABLE:
-                        if self.get_flow_graph().enable_selected(True):
@@ -217 +217 @@
-                                self.get_page().get_state_cache().save_new_state(self.get_flow_graph().export_data())
-                                self.get_page().set_saved(False)
-############################################
+
-                # Cut/Copy/Paste
-############################################
+
-                elif state == Actions.BLOCK_CUT:
-                        self.handle_states(BLOCK_COPY)
@@ -231 +231 @@
-                                self.get_page().get_state_cache().save_new_state(self.get_flow_graph().export_data())
-                                self.get_page().set_saved(False)
-############################################
+
-                # Move/Rotate/Delete/Create
-############################################
+
-                elif state == Actions.BLOCK_MOVE:
-                        self.get_page().get_state_cache().save_new_state(self.get_flow_graph().export_data())
@@ -278 +278 @@
-                                self.get_page().get_state_cache().save_new_state(self.get_flow_graph().export_data())
-                                self.get_page().set_saved(False)
-############################################
+
-                # Window stuff
-############################################
+
-                elif state == Actions.PREFS_WINDOW_DISPLAY:
-                        PreferencesDialog()
@@ -288 +288 @@
-                elif state == Actions.HOTKEYS_WINDOW_DISPLAY:
-                        HotKeysDialog()
-############################################
+
-                # Param Modifications
-############################################
+
-                elif state == Actions.BLOCK_PARAM_MODIFY:
-                        if self.get_flow_graph().param_modify_selected():
@@ -296 +296 @@
-                                self.get_page().get_state_cache().save_new_state(self.get_flow_graph().export_data())
-                                self.get_page().set_saved(False)
-############################################
+
-                # Undo/Redo
-############################################
+
-                elif state == Actions.FLOW_GRAPH_UNDO:
-                        n = self.get_page().get_state_cache().get_prev_state()
@@ -313 +313 @@
-                                self.get_flow_graph().update()
-                                self.get_page().set_saved(False)
-############################################
+
-                # New/Open/Save/Close
-############################################
+
-                elif state == Actions.FLOW_GRAPH_NEW:
-                        self.main_window.new_page()
@@ -347 +347 @@
-                                pixbuf.get_from_drawable(pixmap, pixmap.get_colormap(), 0, 0, 0, 0, width, height)
-                                pixbuf.save(file_path, IMAGE_FILE_EXTENSION[1:])
-############################################
+
-                # Gen/Exec/Stop
-############################################
+
-                elif state == Actions.FLOW_GRAPH_GEN:
-                        if not self.get_page().get_pid():
@@ -373 +373 @@
-                        pass
-                else: print '!!! State "%s" not handled !!!'%state
-############################################
+
-                # Global Actions for all States
-############################################
+
-                #update general buttons
-                Actions.get_action_from_name(Actions.ELEMENT_DELETE).set_sensitive(bool(self.get_flow_graph().get_selected_elements()))

gnuradio/branches/developers/jblum/grc_reorganize/grc/src/gui/MainWindow.py

@@ -17 +17 @@
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-"""
-##@package grc.gui.MainWindow
-#The main window, containing all windows, tool bars, and menu bars.
-
-from Constants import \

gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/gui/Colors.py

@@ -17 +17 @@
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-"""
-##@package grc.gui.elements.Colors
-#Global Colors for the gui
-
-import pygtk

gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Constants.py.in

@@ -17 +17 @@
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-"""
-##@package grc_gnuradio.Constants
-#Global constants for grc gnuradio package
-#@author Josh Blum
-
-import os

gnuradio/branches/developers/jblum/grc_reorganize/grc/src/platforms/python/Generator.py

@@ -22 +22 @@
-from Cheetah.Template import Template
-from utils import expr_utils
-
+
+
+
+
-from utils import convert_hier
-
@@ -38 +41 @@
-                if self._generate_options == 'hb':
-                        self._mode = HIER_BLOCK_FILE_MODE
-PATH
+DIR
-                else:
-                        self._mode = TOP_BLOCK_FILE_MODE

gnuradio/branches/developers/jblum/grc_reorganize/grc/src/utils/converter.py

@@ -17 +17 @@
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-"""
-##@package grc.converter
-#convert old flow graph file format to new format
-
-from .. platforms.base.Constants import FLOW_GRAPH_DTD