Changeset 241

Timestamp:

03/22/04 07:15:14 (5 years ago)

Author:

arjanmol

Message:

*** empty log message ***

Files:

• trunk/gaphor/TODO (modified) (1 diff)
• trunk/gaphor/doc/aspects-en.txt (added)
• trunk/gaphor/gaphor/UML/diagram.py (modified) (1 diff)
• trunk/gaphor/gaphor/UML/elementfactory.py (modified) (2 diffs)
• trunk/gaphor/gaphor/UML/properties.py (modified) (2 diffs)
• trunk/gaphor/gaphor/__init__.py (modified) (2 diffs)
• trunk/gaphor/gaphor/diagram/modelelement.py (modified) (1 diff)
• trunk/gaphor/gaphor/diagram/operation.py (modified) (1 diff)
• trunk/gaphor/gaphor/misc/action.py (modified) (2 diffs)
• trunk/gaphor/gaphor/misc/aspects.py (added)
• trunk/gaphor/gaphor/ui/diagramtab.py (modified) (4 diffs)
• trunk/gaphor/gaphor/ui/diagramview.py (modified) (3 diffs)
• trunk/gaphor/gaphor/ui/mainwindow.py (modified) (5 diffs)
• trunk/gaphor/gaphor/ui/menufactory.py (modified) (4 diffs)
• trunk/gaphor/gaphor/ui/namespace.py (modified) (3 diffs)
• trunk/gaphor/setup.py (modified) (3 diffs)
• trunk/gaphor/src (added)
• trunk/gaphor/src/gtkhwrapbox.c (added)
• trunk/gaphor/src/gtkhwrapbox.h (added)
• trunk/gaphor/src/gtkvwrapbox.c (added)
• trunk/gaphor/src/gtkvwrapbox.h (added)
• trunk/gaphor/src/gtkwrapbox.c (added)
• trunk/gaphor/src/gtkwrapbox.h (added)
• trunk/gaphor/src/wrapbox.defs (added)
• trunk/gaphor/src/wrapbox.override (added)
• trunk/gaphor/src/wrapboxmodule.c (added)
• trunk/gaphor/tests/menu.py (modified) (1 diff)

trunk/gaphor/TODO

@@ -7 +7 @@
-  the canvas item once a reference is destroyed.
-  
+- Define a proper scheme for flushing models. Currently a lot of elements
+  have references around. This has to do with how PyGtk references python
+  and C objects. We should do something like: clean all diagram items,
+  then clean the rest of the elements in the ElementFactory.
+
-- Class: Association end properties are shown in the tree view
-- Undo/redo functionality doesn;t work as espected
-
+#
-- Convert Data model to use the parsed attributes + operations.
-- Attributes are not added to classes that are loaded.
-
+#
-
-- Make sure than, when a model is loaded and saved again, both save files do

trunk/gaphor/gaphor/UML/diagram.py

@@ -87 +87 @@
-        self.canvas.clear_undo()
-        self.canvas.clear_redo()
+        def dispose(item):
+            try:
+                for i in item.groupable_iter():
+                    dispose(i)
+            except AttributeError:
+                pass
+            try:
+                item.unlink()
+            except:
+                pass
+            # Clear all references on a C-level
+            item.dispose()
+
+        #for i in self.canvas.root.children:
+        #    dispose(i)
+
-        Namespace.unlink(self)
-        for i in self.canvas.root.children:
-            i.unlink()

trunk/gaphor/gaphor/UML/elementfactory.py

@@ -3 +3 @@
-"""
-
-from diagram import Diagram
-import gaphor
-import gaphor.misc.uniqueid as uniqueid
-#import weakref
-from element import Element
+from diagram import Diagram
-#from gaphor.misc.weakmethod import WeakMethod
-
@@ -79 +79 @@
-        """Flush all elements (remove them from the factory)."""
-        self.notify(None, 'flush')
+        # First flush all diagrams:
+        for value in self.select(lambda e: isinstance(e, Diagram)):
+            value.unlink()
+
-        for key, value in self._elements.items():
-            #print 'ElementFactory: unlinking', value
-            #print 'references:', gc.get_referrers(value)
-            value.unlink()
+
-        assert len(self._elements) == 0, 'Still items in the factory: %s' % str(self._elements.values())
+
-        import gc
-        for i in range(4): gc.collect()

trunk/gaphor/gaphor/UML/properties.py

@@ -80 +80 @@
-            obj.notify(self.name, pspec=self)
-        except Exception, e:
-
+, e
-
-        # we need to check if a deriviate is part of the current object:
@@ -98 +98 @@
-                        d.notify(obj)
-                    except Exception, e:
-
+, e
-
-

trunk/gaphor/gaphor/__init__.py

@@ -77 +77 @@
-
-    example: Get the element factory:
-elemfact
+factory
-
-    Also builtin resources are 'Name', 'Version' and 'DataDir'. In case main()
@@ -108 +108 @@
-__builtin__.__dict__['log'] = misc.logger.Logger()
-
+try: 
+    # Keep track of all model elements that are created
+    from misc.aspects import ReferenceAspect, weave_method
+    import UML.elementfactory
+    import UML.diagram
+    refs = []
+    weave_method(UML.elementfactory.ElementFactory.create, ReferenceAspect, refs)
+    weave_method(UML.diagram.Diagram.create, ReferenceAspect, refs)
+except ImportError:
+    pass
+

trunk/gaphor/gaphor/diagram/modelelement.py

@@ -61 +61 @@
-
-    def on_glue(self, handle, wx, wy):
+        #import sys
+        #print self, handle, '=>', sys.getrefcount(self), sys.getrefcount(handle)
-        return self._on_glue(handle, wx, wy, diacanvas.CanvasElement)
-

trunk/gaphor/gaphor/diagram/operation.py

@@ -22 +22 @@
-    def on_subject_notify__name(self, subject, pspec):
-        self._expression.set_text(self.subject.render())
-#
+
-
-    on_subject_notify__visibility = on_subject_notify__name

trunk/gaphor/gaphor/misc/action.py

@@ -149 +149 @@
-    def execute(self, action_id):
-        global _dependent_actions
-
+#
-        action = self.get_action(action_id)
-        action.execute()
@@ -155 +155 @@
-        for d in _dependent_actions.get(action_id) or ():
-            dep_action = self.get_action(d)
-
+#
-            dep_action.update()
-

trunk/gaphor/gaphor/ui/diagramtab.py

@@ -12 +12 @@
-        self.owning_window = owning_window
-
-    #def set_owning_window(self, owning_window):
-        #self.owning_window = owning_window
-
-    def get_diagram(self):
-        return self.diagram
-
-    def get_view(self):
-        #self._check_state(AbstractWindow.STATE_ACTIVE)
-        return self.view
-
@@ -84 +80 @@
-        #toolbar.show()
-        #vbox.show_all()
-
+#
-        #self._construct_window(name='diagram',
-        #                       title=title,
@@ -98 +94 @@
-        self.owning_window.remove_tab(self)
-        self.set_diagram(None)
+        # We need this to get the view deleted properly:
+        del self.view.diagram
-        del self.view
-        del self.diagram
-
-    def __on_view_event_after(self, view, event):
-        #self._check_state(AbstractWindow.STATE_ACTIVE)
-        # handle mouse button 3 (popup menu):
-        if event.type == gtk.gdk.BUTTON_PRESS:
@@ -114 +111 @@
-                self.owning_window._construct_popup_menu(menu_def=item.get_popup_menu(),
-                                           event=event)
-                #self.stop_emission('event-after')
-            return True
-        return False

trunk/gaphor/gaphor/ui/diagramview.py

@@ -6 +6 @@
-from diacanvas import CanvasView
-import gaphor
+from gaphor.diagram import get_diagram_item
-
-class DiagramView(CanvasView):
@@ -47 +48 @@
-   
-    def on_drag_data_received(self, context, x, y, data, info, time):
-p
+#
-        if data and data.format == 8 and info == DiagramView.TARGET_ELEMENT_ID:
-
-
+
-            elemfact = gaphor.resource('ElementFactory')
-            element = elemfact.lookup(data.data)
@@ -70 +70 @@
-
-    def do_drag_drop(self, context, x, y, time):
-
+#
-        return 1
-

trunk/gaphor/gaphor/ui/mainwindow.py

@@ -52 +52 @@
-                'separator',
-                'FileSave',
-,
-
-            
+)
+
+wrapbox =  (
-                'separator',
-                'InsertClass',
@@ -112 +112 @@
-        scrolled_window = gtk.ScrolledWindow()
-        scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-
+#
-        scrolled_window.add(view)
-        
@@ -121 +121 @@
-
-        #scrolled_window.show_all()
+        #ns_paned = gtk.VPaned()
+        #ns_paned.pack1(scrolled_window)#, expand=True)
+        vbox = gtk.VBox()
+        vbox.pack_start(scrolled_window, expand=True)
-
-        paned = gtk.HPaned()
-
-
+
+
+
-        notebook = gtk.Notebook()
-        #notebook.popup_enable()
@@ -144 +149 @@
-                               contents=paned)
-                               #contents=scrolled_window)
+        wrapbox = self.menu_factory.create_wrapbox(self.wrapbox)
+        #wrapbox.set_aspect_ratio(1/256)
+        vbox.pack_start(wrapbox, expand=False)
+        wrapbox.show()
+        #vbox.set_resize_mode(gtk.RESIZE_QUEUE)
+        #wrapbox.set_resize_mode(gtk.RESIZE_QUEUE)
+        #scrolled_window = gtk.ScrolledWindow()
+        #scrolled_window.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        #scrolled_window.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+        #scrolled_window.add_with_viewport(wrapbox)
+        #scrolled_window.show()
+        #ns_paned.pack2(scrolled_window)#, expand=False)
+        #wrapbox.queue_resize()
+        #wrapbox.set_size_request(0,0)
+
+        #def print_me(wrapbox, rect, mutex):
+        #    print wrapbox, rect, mutex
+        #    if not mutex:
+        #        mutex.append(1)
+        #        wrapbox.queue_resize()
+        #        mutex.remove(1)
+
+        #paned.connect('motion-notify-event', print_me)
+        #wrapbox.connect('size-allocate', print_me, [])
-
-    def add_transient_window(self, window):
@@ -175 +204 @@
-        return page_num
-
-        current = self.notebook.get_current_page()
-        content = self.notebook.get_nth_page(current)
-        return self.notebook_map[content]
-
-    def get_current_tab(self):
-        current = self.notebook.get_current_page()

trunk/gaphor/gaphor/ui/menufactory.py

@@ -9 +9 @@
-import gtk
-from gaphor.misc.action import ActionError, Action, CheckAction, RadioAction
+import gaphor.misc.wrapbox
-
-#from logilab.aspects.weaver import weaver
@@ -46 +47 @@
-        except ActionError:
-            return None
+
+    def get_icon_and_label(self, action, icon_size=gtk.ICON_SIZE_LARGE_TOOLBAR):
+        if action.stock_id:
+            # Fetch stock icon, and probably a text and tooltip:
+            stock_info = gtk.stock_lookup(action.stock_id)
+            #print stock_info # (id, label, mod, key, translationdomain)
+            try:
+                label = stock_info[1].replace('_', '')
+            except TypeError:
+                label = action.label.replace('_', '')
+            icon = gtk.Image()
+            icon.set_from_stock(action.stock_id, icon_size)
+        else:
+            label = action.label.replace('_', '')
+            icon = None
+        return icon, label
-
-    def on_item_activate(self, menu_item, action_id):
@@ -225 +242 @@
-                                    user_data=None)
-            else:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                if isinstance(action, RadioAction):
-                    try:
@@ -279 +284 @@
-        return toolbar
-
+    def create_wrapbox(self, menu_def):
+        """Create a Wrapbox. items in menu_def should not be nested as
+        they are when creating a normal menu.
+        """
+        wrapbox = gaphor.misc.wrapbox.HWrapBox()
+        groups = { }
+        for id in menu_def:
+            action = self.get_action(id)
+            if not action:
+                if id == 'separator':
+                    sep = gtk.HSeparator()
+                    wrapbox.add(sep)
+                    sep.show()
+                    continue
+                label = id
+                icon = None
+                item = gtk.Button()
+            else:
+                icon, label = self.get_icon_and_label(action)
+                if isinstance(action, RadioAction):
+                    try:
+                        group = groups[action.group]
+                    except KeyError:
+                        group = None
+                    item = gtk.RadioButton(group)
+                    item.set_mode(False)
+                    item.connect('toggled', self.on_radio_item_activate, action.id)
+                    self.connect_item_to_action('notify::active', action, item,
+                                                self.on_radio_menu_item_notify_active)
+                    self.in_activation = True
+                    if not group:
+                        groups[action.group] = item
+                    #else:
+                    #    item.set_group(group)
+                    item.set_active(action.active)
+                    self.in_activation = False
+                elif isinstance(action, CheckAction):
+                    item = gtk.CheckButton()
+                    item.set_mode(False)
+                    item.connect('toggled', self.on_check_item_activate, action.id)
+                    self.connect_item_to_action('notify::active', action, item,
+                                                self.on_menu_item_notify_action)
+                    self.in_activation = True
+                    item.set_active(action.active)
+                    self.in_activation = False
+                else:
+                    #if action.stock_id:
+                        #item = gtk.Button(action.stock_id)
+                        #item.set_property('use-stock', True)
+                    #else:
+                    item = gtk.Button()
+                if action.stock_id:
+                    #item.set_property('stock-id', action.stock_id)
+                    item.add(icon)
+                    icon.show()
+                    pass
+                else:
+                    item.set_label(label)
+                item.set_property('visible', action.visible)
+                item.set_property('sensitive', action.sensitive)
+                self.connect_item_to_action('notify::visible', action, item,
+                                            self.on_menu_item_notify_action)
+                self.connect_item_to_action('notify::sensitive', action, item,
+                                            self.on_menu_item_notify_action)
+                wrapbox.pack(item, False, False, False, False)
+                item.show()
+        return wrapbox
+

trunk/gaphor/gaphor/ui/namespace.py

@@ -10 +10 @@
-
-import gaphor.UML as UML
+
+# The following items will not be shown in the treeview, although they
+# are UML.Namespace elements.
+_default_exclude_list = ( UML.Parameter, UML.Association )
-
-class NamespaceModel(gtk.GenericTreeModel):
@@ -34 +38 @@
-        self.root = (None, [])
-
+        self.exclude = _default_exclude_list
-
-    def new_node_from_element(self, element, parent):
-        """Create a new node for an element. Owned members are also created."""
+        if isinstance(element, self.exclude):
+            return
-        node = (element, [])
-        parent[1].append(node)
@@ -155 +162 @@
-        node_members = map(lambda e: e[0], node[1])
-        # The elements that are now children of the element
-
+
+
-        if len(node_members) < len(owned_members):
-            # element added

trunk/gaphor/setup.py

@@ -298 +298 @@
-
-
+from dsextras import TemplateExtension, BuildExt, GLOBAL_INC
+
+pygtkincludedir = getoutput('pkg-config --variable pygtkincludedir pygtk-2.0')
+codegendir = getoutput('pkg-config --variable codegendir pygtk-2.0')
+defsdir = getoutput('pkg-config --variable defsdir pygtk-2.0')
+
+sys.path.append(codegendir)
+
+GLOBAL_INC.append(pygtkincludedir)
+GLOBAL_INC.append('.')
+GTKDEFS = [os.path.join(defsdir, 'gtk-types.defs')]
+
+ext_modules = []
+gtkwrapbox = TemplateExtension(name='wrapbox',
+                               pkc_name='gtk+-2.0',
+                               pkc_version='2.0.0',
+                               output='gaphor.misc.wrapbox',
+                               defs='src/wrapbox.defs',
+                               sources=['src/gtkwrapbox.c',
+                                        'src/gtkhwrapbox.c',
+                                        'src/wrapbox.c',
+                                        'src/wrapboxmodule.c'],
+                               register=GTKDEFS,
+                               override='src/wrapbox.override')
+
+if gtkwrapbox.can_build():
+    ext_modules.append(gtkwrapbox)
+else:
+    pass
+
-setup(name='gaphor',
-      version=VERSION,
@@ -315 +345 @@
-                'gaphor.misc'
-      ],
+      ext_modules=ext_modules,
-      # data files are relative to <prefix>/share/gaphor (see setup.cfg)
-      data_files=[('', ['data/gaphor-main-ui.xml',
@@ -329 +360 @@
-                #'install_schemas': install_schemas,
-                'build': build,
+                'build_ext': BuildExt,
-                'build_mo': build_mo,
-                'build_pot': build_pot,

trunk/gaphor/tests/menu.py

@@ -214 +214 @@
-vbox.pack_start(event_box, expand=gtk.TRUE)
-
+wrap_box = menu_factory.create_wrapbox(('FileNew', 'FileCheck', 'separator', 'Green', 'Yellow', 'Blue'))
+vbox.pack_start(wrap_box, expand=gtk.TRUE)
+wrap_box.show()
+
-vbox.pack_end(statusbar, expand=gtk.FALSE)
-vbox.show()