Changeset 52:6630f82e4675

Timestamp:

12/06/10 16:02:42 (5 years ago)

Author:

is_rusinov

Branch:

default

Parents:

50:9cbbff6dbbaf (diff), 51:f411a1e0a5cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automated merge with òÀËssh://kodomo.fbb.msu.ru/cca

Files:

• Interface.py (modified) (12 diffs)
• Interface.py (modified) (2 diffs)

Interface.py

@@ -14 +14 @@
                 self.offset_y = offset_y
                 self.after_id = 0
-                self.mouse_x = 0
-                self.mouse_y = 0
+                self.mouse_col=0
+                self.mouse_row=0
+                self.mouse_offset_x = 0
+                self.mouse_offset_y = 0
                 self.mouse_zoom = 0
                 self.zoom_divisor = 10
@@ -116 +118 @@
                 index = (automata.symbols[automata.field[row][column]] + 1) % len(automata.states)
                 automata.field[row][column] = automata.states[index].symbol
-                self.draw()
+                self.draw_cell(tuple([column, row]))
         
         def motion1(self, event):# drawer
@@ -123 +125 @@
                 index = (automata.symbols[automata.field[row][column]] + 1) % len(automata.states)
                 automata.field[row][column] = automata.states[index].symbol
-                self.draw()
+                self.draw_cell(tuple([column, row]))
         
         def press3(self, event):# drawer
@@ -130 +132 @@
                 index = (automata.symbols[automata.field[row][column]] + len(automata.states) - 1) % len(automata.states)
                 automata.field[row][column] = automata.states[index].symbol
-                self.draw()
+                self.draw_cell(tuple([column, row]))
         
         def motion3(self, event):# drawer
@@ -137 +139 @@
                 index = (automata.symbols[automata.field[row][column]] + len(automata.states) - 1) % len(automata.states)
                 automata.field[row][column] = automata.states[index].symbol
-                self.draw()
+                self.draw_cell(tuple([column, row]))
         
         def press1_key(self, event):# drawer
@@ -144 +146 @@
                         row = (event.y - self.offset_y * (self.cell_size + self.line_width)) / (self.cell_size + self.line_width)
                         automata.field[row][column] = automata.states[keys[event.char]].symbol
-                        self.draw()
+                        self.draw_cell(tuple([column, row]))
         
         def motion1_key(self, event):# drawer
@@ -151 +153 @@
                         row = (event.y - self.offset_y * (self.cell_size + self.line_width)) / (self.cell_size + self.line_width)
                         automata.field[row][column] = automata.states[keys[event.char]].symbol
-                        self.draw()
+                        self.draw_cell(tuple([column, row]))
         
         def press1_ctrl(self, event):# change_offset (B1+ctrl)
-                self.mouse_x = event.x
-                self.mouse_y = event.y
+                self.mouse_offset_x = event.x
+                self.mouse_offset_y = event.y
         
         def motion1_ctrl(self, event):# change_offset (B1+ctrl)
-                self.offset_x = (event.x - self.mouse_x) / (self.cell_size + self.line_width)
-                self.offset_y = (event.y - self.mouse_y) / (self.cell_size + self.line_width)
-                self.mouse_x = event.x
-                self.mouse_y = event.y
+                self.offset_x = (event.x - self.mouse_offset_x) / (self.cell_size + self.line_width)
+                self.offset_y = (event.y - self.mouse_offset_y) / (self.cell_size + self.line_width)
+                self.mouse_offset_x = event.x
+                self.mouse_offset_y = event.y
                 self.draw()
         
@@ -181 +183 @@
         
         def to_top(self):# replace choosen state to top
-                index = automata.symbols.get(state_list.get("active").split()[1])
+                index = automata.symbols.get(state_list.get("active").split()[0])
                 state = automata.states[index]
                 del automata.states[index]
@@ -187 +189 @@
         
         def to_bottom(self):# replace choosen state to botton
-                index = automata.symbols.get(state_list.get("active").split()[1])
+                index = automata.symbols.get(state_list.get("active").split()[0])
                 state = automata.states[index]
                 del automata.states[index]
@@ -193 +195 @@
         
         def upwards(self):
-                index = automata.symbols.get(state_list.get("active").split()[1])
+                index = automata.symbols.get(state_list.get("active").split()[0])
                 state = automata.states[index]
                 del automata.states[index]
@@ -199 +201 @@
         
         def downwards(self):
-                index = automata.symbols.get(state_list.get("active").split()[1])
+                index = automata.symbols.get(state_list.get("active").split()[0])
                 state = automata.states[index]
                 del automata.states[index]
@@ -205 +207 @@
         
         def delete_state(self):# delete choosen state
-                index = automata.symbols.get(state_list.get("active").split()[1])
+                index = automata.symbols.get(state_list.get("active").split()[0])
                 del automata.states[index]
         
         def add(self):# add new state
-                pass
                 name = state_name.get()
                 symbol = state_symbol.get()

Interface.py

@@ -87 +87 @@
                         self.draw()
         
-        def draw_step(self):
-                for row, col in automata.next_step():
+        def draw_cell(self, cells):
+                for row, col in cells:
                         index = automata.symbols[automata.field[row][col]]
                         color = automata.states[index].color
@@ -110 +110 @@
                                                                 left + col * shift + self.cell_size,
                                                                 top + row * shift + self.cell_size,
-                                                                fill=color, outline="")
+                                                                fill=color, outline="", tag="cell")
                                 self.cells[row].append(cell)