Just removing cateory, and put added attributes inside the algorithm …

…framework
grape-editor · Nov 30, 2011 · 640dcfa · 640dcfa
1 parent c373629
commit 640dcfa
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 15 deletions.
diff --git a/algorithms/astar.py b/algorithms/astar.py
@@ -5,7 +5,6 @@ class Astar(Algorithm):
     def __init__(self, graph):
         Algorithm.__init__(self, graph)
 
-        self.category = "Examples"
         self.first = self.find(int(self.input_box("", "Origem")))
         self.goal = self.find(int(self.input_box("", "Destino")))
 

diff --git a/algorithms/breadth_first_search.py b/algorithms/breadth_first_search.py
@@ -4,8 +4,6 @@ class BreadthFirstSearch(Algorithm):
     def __init__(self, graph):
         Algorithm.__init__(self, graph)
 
-        self.category = "Examples"
-
     def run(self):
 
         first = self.vertex_list[0]

diff --git a/algorithms/cicle.py b/algorithms/cicle.py
@@ -4,13 +4,11 @@
 class Cicle(Algorithm):
     def __init__(self, graph):
         Algorithm.__init__(self, graph)
-
-        self.category = "Examples"
 
     def run(self):
 
         dest = [0,2,7,16,5,0]
-        
+
         for i in range(len(dest)):
             v = self.find(dest[i])
             for e in v.edge_list:

diff --git a/algorithms/dijkstra.py b/algorithms/dijkstra.py
@@ -4,7 +4,6 @@ class Dijkstra(Algorithm):
     def __init__(self, graph):
         Algorithm.__init__(self, graph)
 
-        self.category = "Examples"
         self.first = int(self.input_box("", "Origem"))
         self.goal = int(self.input_box("", "Destino"))
 

diff --git a/samples/cool.cgf b/samples/cool.cgf
@@ -1 +1 @@
-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
+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
diff --git a/src/gui/vertex.py b/src/gui/vertex.py
@@ -289,14 +289,10 @@ def edit_properties(self, cell, path, new_text, column):
         return
 
     def add_properties(self):
-        t_identifier = "identifier"
+	t_identifier = "identifier"
-        t_value = "value"
+	t_value = "value"
         self.liststore_properties.append([t_identifier, t_value])
-
         setattr(self.vertex, "user_" + t_identifier, t_value)
-
-#        self.add_state()
-#        self.area.queue_draw()
 
     def remove_properties(self):
         selection = self.treeview_properties.get_selection()

diff --git a/src/lib/algorithm.py b/src/lib/algorithm.py
@@ -173,4 +173,12 @@ def input_box(self, markup="", prompt="", secondary_markup=""):
 	    dialog.destroy()
 	    return text
 
-
+    def set_attribute(self, what, identifier, value):
+        setattr(what, "user_" + str(identifier), str(value))
+
+    def get_attribute(self, what, identifier):
+        return getattr(what, "user_" + str(identifier))
+
+    def remove_attribute(self, what, identifier):
+        delattr(what, "user_" + str(identifier))
+
diff --git a/src/lib/networkx.tar.bz2 b/src/lib/networkx.tar.bz2