big name refactor

.gitignore

@@ -4,6 +4,8 @@
 
 *.ipynb
 
+.DS_Store
+
 *pyc
 
 build

ast_tool_box/__init__.py

@@ -0,0 +1,16 @@
+__author__ = 'Chick Markley'
+
+__version__ = "0.5.0"
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def logging_basic_config(level):
+    """ Setup basic config logging. Useful for debugging to quickly setup a useful logger"""
+    fmt = '%(filename)20s:%(lineno)-4d : %(levelname)-7s: %(message)s'
+    logging.basicConfig(level=level, format=fmt)
+
+
+

ast_viewer/controllers/code_presenter.py → ast_tool_box/controllers/code_presenter.py

@@ -1,18 +1,21 @@
 from __future__ import print_function
 
 import copy
-from ast_viewer.controllers.tree_transform_controller import TreeTransformController
-import ast_viewer.models.code_models.code_model as code_model
-import ast_viewer.models.transform_models.transform_file as transform_model
-import ast_viewer.controllers.transform_presenter as transform_controllers
 
-from ast_viewer.views.code_views.code_pane import CodePane
+from ast_tool_box.controllers.tree_transform_controller import TreeTransformController
+import ast_tool_box.models.code_models.code_model as code_model
+import ast_tool_box.models.transform_models.transform_file as transform_model
+import ast_tool_box.controllers.transform_presenter as transform_controllers
+
+from ast_tool_box.views.code_views.code_pane import CodePane
 import ast
 
 
 class CodePresenter(object):
     def __init__(self, tree_transform_controller=None):
-        assert isinstance(tree_transform_controller, TreeTransformController)
+        print("tree_transform_controller %s" % tree_transform_controller)
+        print("type is                   %s" % TreeTransformController)
+        assert isinstance(tree_transform_controller, TreeTransformController), "got %s" % tree_transform_controller
 
         self.code_items = []
         self.transform_presenter = None

ast_viewer/controllers/shell.py → ast_tool_box/controllers/shell.py

@@ -15,7 +15,7 @@
 atexit.register(readline.write_history_file, history_file)
 del os, history_file
 
-from ast_viewer.controllers.tree_transform_controller import TreeTransformController
+from ast_tool_box.controllers.tree_transform_controller import TreeTransformController
 
 
 class AstTransformInterpreter(object):

ast_viewer/controllers/transform_presenter.py → ast_tool_box/controllers/transform_presenter.py

@@ -8,11 +8,11 @@
 from operator import methodcaller
 from PySide import QtCore, QtGui
 
-from ast_viewer.models.transform_models.transform_file import TransformFile, TransformPackage
-from ast_viewer.controllers.tree_transform_controller import TreeTransformController
-from ast_viewer.views.transform_views.transform_pane import TransformPane
+from ast_tool_box.models.transform_models.transform_file import TransformFile, TransformPackage
+from ast_tool_box.controllers.tree_transform_controller import TreeTransformController
+from ast_tool_box.views.transform_views.transform_pane import TransformPane
 from ctree.codegen import CodeGenVisitor
-from ast_viewer.util import Util
+from ast_tool_box.util import Util
 
 
 class TransformPresenter(object):

ast_viewer/controllers/tree_transform_controller.py → ast_tool_box/controllers/tree_transform_controller.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 
-from ast_viewer.models.ast_tree_manager import AstTreeManager
-from ast_viewer.models.ast_transformer_manager import AstTransformerManager
+from ast_tool_box.models.ast_tree_manager import AstTreeManager
+from ast_tool_box.models.ast_transformer_manager import AstTransformerManager
 
 
 class TreeTransformController(object):

ast_viewer/ast_tool_box.py → ast_tool_box/main.py

@@ -11,10 +11,14 @@
 
 import ast_tool_box
 
-from ast_viewer.controllers.tree_transform_controller import TreeTransformController
+from ast_tool_box.controllers.tree_transform_controller import TreeTransformController
+from ast_tool_box.controllers.code_presenter import CodePresenter
 
+from ast_tool_box.controllers.transform_presenter import TransformPresenter
 
-logger = logging.getLogger(__name__)
+QtCore.QCoreApplication.setOrganizationName("Aspire Lab")
+QtCore.QCoreApplication.setOrganizationDomain("aspire.eecs.berkeley.edu")
+QtCore.QCoreApplication.setApplicationName("AstToolBox")
 
 DEBUGGING = False
 
@@ -25,12 +29,6 @@
 """ % {"prog": PROGRAM_NAME, "version": ast_tool_box.__version__}
 
 
-def logging_basic_config(level):
-    """ Setup basic config logging. Useful for debugging to quickly setup a useful logger"""
-    fmt = '%(filename)20s:%(lineno)-4d : %(levelname)-7s: %(message)s'
-    logging.basicConfig(level=level, format=fmt)
-
-
 def check_class(obj, target_class, allow_none=False):
     """ Checks that the  obj is a (sub)type of target_class. 
         Raises a TypeError if this is not the case.
@@ -76,14 +74,7 @@ def class_name(obj):
     return obj.__class__.__name__
 
 
-from ast_viewer.controllers.code_presenter import CodePresenter
-from ast_viewer.controllers.transform_presenter import TransformPresenter
-
-QtCore.QCoreApplication.setOrganizationName("Aspire Lab")
-QtCore.QCoreApplication.setOrganizationDomain("aspire.eecs.berkeley.edu")
-QtCore.QCoreApplication.setApplicationName("AstToolBox")
-
-# The main window inherits from a Qt class, therefore it has many 
+# The main window inherits from a Qt class, therefore it has many
 # ancestors public methods and attributes.
 # pylint: disable=R0901, R0902, R0904, W0201, R0913 
 
@@ -120,6 +111,8 @@ def __init__(self, file_name=None, mode='exec', packages=None, width=None, heigh
             raise ValueError("Mode must be one of: {}".format(valid_modes))
         self._mode = 'exec'
 
+        self.auto_expand_ast = True
+
         self.start_packages = packages if packages else []
         self.start_packages += [
             'ctree.transformations',
@@ -262,19 +255,19 @@ def main():
 
     ast_tool_box.logging_basic_config(args.log_level.upper())
 
-    logger.info('Started {}'.format(ast_tool_box.PROGRAM_NAME))
+    logger.info('Started {}'.format(PROGRAM_NAME))
 
-    exit_code = ast_tool_box.view(
+    exit_code = view(
         file_name=args.file_name,
         packages=args.packages,
         width=1400, height=900
     )
 
-    logging.info('Done {}'.format(ast_tool_box.PROGRAM_NAME))
+    logging.info('Done {}'.format(PROGRAM_NAME))
     sys.exit(exit_code)
 
 
 # pylint: enable=R0901, R0902, R0904, W0201
 
 if __name__ == '__main__':
-    sys.exit(view(source_code="print a + 5 + 6  / 3.7", mode='eval', width=800, height=600))
+    main()

ast_viewer/models/ast_transformer_manager.py → ast_tool_box/models/ast_transformer_manager.py

@@ -5,7 +5,7 @@
 import sys
 import ast
 import copy
-from ast_viewer.util import Util
+from ast_tool_box.util import Util
 from ctree.codegen import CodeGenVisitor
 
 

ast_viewer/models/code_models/code_model.py → ast_tool_box/models/code_models/code_model.py

@@ -4,7 +4,7 @@
 
 import ast
 import os
-import ast_viewer.models.transform_models.transform_file as transform_model
+import ast_tool_box.models.transform_models.transform_file as transform_model
 
 
 class CodeItem(object):

ast_viewer/models/transform_models/transform_file.py → ast_tool_box/models/transform_models/transform_file.py

@@ -9,7 +9,7 @@
 from operator import methodcaller
 from ctree.codegen import CodeGenVisitor
 from pprint import pprint
-from ast_viewer.util import Util
+from ast_tool_box.util import Util
 from collections import namedtuple
 import codegen
 

ast_viewer/models/transform_models/transform_model.py → ast_tool_box/models/transform_models/transform_model.py

@@ -4,7 +4,7 @@
 
 import sys
 import ast
-from ast_viewer.util import Util
+from ast_tool_box.util import Util
 from ctree.codegen import CodeGenVisitor
 
 

ast_viewer/views/code_views/ast_tree_widget.py → ast_tool_box/views/code_views/ast_tree_widget.py

@@ -2,8 +2,8 @@
 
 import types
 import ast
-from ast_viewer.views.editor_widget import EditorPane
-from ast_viewer.views.search_widget import SearchLineEdit
+from ast_tool_box.views.editor_widget import EditorPane
+from ast_tool_box.views.search_widget import SearchLineEdit
 
 from PySide import QtGui, QtCore
 

ast_viewer/views/code_views/code_pane.py → ast_tool_box/views/code_views/code_pane.py

@@ -1,22 +1,22 @@
 __author__ = 'Chick Markley'
 
 from PySide import QtGui, QtCore
-from ast_viewer.models.code_models.code_model import AstTreeItem, CodeItem, FileItem, GeneratedCodeItem
-from ast_viewer.views.code_views.ast_tree_widget import AstTreePane, AstTreeWidget
-from ast_viewer.views.editor_widget import EditorPane
-import ast_viewer.ast_tool_box
+from ast_tool_box.models.code_models.code_model import AstTreeItem, CodeItem, FileItem, GeneratedCodeItem
+from ast_tool_box.views.code_views.ast_tree_widget import AstTreePane, AstTreeWidget
+from ast_tool_box.views.editor_widget import EditorPane
 
 
 class CodePane(QtGui.QGroupBox):
     """
     A pane that can show one or more code_items
     A code item can be source_text ast
     """
-    def __init__(self, code_presenter=None, panel_count=2):
+    def __init__(self, code_presenter=None, panel_count=2, default_pane_size=800):
         super(CodePane, self).__init__("Code && Trees")
         self.code_presenter = code_presenter
         self.panel_count = panel_count
         self.all_expanded = True
+        self.default_pane_size =default_pane_size
 
         layout = QtGui.QVBoxLayout()
 
@@ -163,7 +163,7 @@ def set_panel_sizes(self, emphasize_index=None):
         # )
         total = sum(sizes)
         if total == 0:
-            total = ast_viewer.ast_tool_box.AstToolBox.default_left_frame_size
+            total = self.default_pane_size
         new_sizes = map(lambda x: 0, sizes)
         panel_count = self.panel_count
         if panel_count > len(sizes):

ast_viewer/views/editor_widget.py → ast_tool_box/views/editor_widget.py

@@ -1,7 +1,7 @@
 __author__ = 'Chick Markley'
 
 from PySide import QtGui, QtCore
-from ast_viewer.views.highlighter import Highlighter
+from ast_tool_box.views.highlighter import Highlighter
 
 
 class EditorPane(QtGui.QPlainTextEdit):

ast_viewer/views/transform_views/transform_pane.py → ast_tool_box/views/transform_views/transform_pane.py

@@ -3,9 +3,9 @@
 from PySide import QtGui, QtCore
 import inspect
 import os
-from ast_viewer.views.editor_widget import EditorPanel
-from ast_viewer.views.transform_views.transform_tree_widget import TransformTreeWidget, TransformTreeWidgetItem
-from ast_viewer.models.transform_models.transform_file import TransformFile, TransformThing, TransformPackage
+from ast_tool_box.views.editor_widget import EditorPanel
+from ast_tool_box.views.transform_views.transform_tree_widget import TransformTreeWidget, TransformTreeWidgetItem
+from ast_tool_box.models.transform_models.transform_file import TransformFile, TransformThing, TransformPackage
 
 class TransformPane(QtGui.QGroupBox):
     """

ast_viewer/views/transform_views/transform_tree_widget.py → ast_tool_box/views/transform_views/transform_tree_widget.py

@@ -2,10 +2,10 @@
 
 import types
 import ast
-from ast_viewer.views.editor_widget import EditorPane
-from ast_viewer.views.search_widget import SearchLineEdit
+from ast_tool_box.views.editor_widget import EditorPane
+from ast_tool_box.views.search_widget import SearchLineEdit
 
-from ast_viewer.models.transform_models.transform_file import AstTransformItem, CodeGeneratorItem
+from ast_tool_box.models.transform_models.transform_file import AstTransformItem, CodeGeneratorItem
 
 from PySide import QtGui, QtCore
 
@@ -68,7 +68,12 @@ def clicked(self, item):
     @QtCore.Slot(TransformTreeWidgetItem)
     def double_clicked(self, info):
         print("doubleclick on %s" % info)
-        if isinstance(self.currentItem(), AstTransformItem) or isinstance(self.currentItem(), CodeGeneratorItem):
+        print("doubleclick on %s" % self.currentItem())
+        print("comparing to %s" % AstTransformItem)
+        print("comparing to %s" % AstTransformItem)
+
+        if isinstance(self.currentItem().source, AstTransformItem) or\
+                isinstance(self.currentItem().source, CodeGeneratorItem):
             self.transform_presenter.apply_current_transform()
         else:
             self.transform_pane.show_error("Only works for Ast Transforms and Code Generators")