Changeset 69:ac96d7c2c7c4

Timestamp:

12/11/10 22:32:04 (5 years ago)

Author:

is_rusinov

Branch:

default

Message:

+ clean_field and random_fill (fix #13); correct critical mistake with changing of dicts while state_list changes

File:

• Interface.py (modified) (11 diffs)

Interface.py

@@ -1 +1 @@
 import math
+import random
 import tkColorChooser
 from Tkinter import *
@@ -145 +146 @@
                                 try:
                                         index = (automata.symbols[automata.field[row][col]] + num_states + order) % num_states
-                                        if self.char != None and self.keys.has_key(self.char):
+                                        if self.char != None and self.char in self.keys:
                                                 index = self.keys[self.char]
                                         automata.field[row][col] = automata.states[index].symbol
@@ -158 +159 @@
                 if self.col1 >= 0 and self.row1 >= 0:
                         self.new_state([(self.row1, self.col1)])
-                
+        
         def motion1(self, event):# drawer
                 col = (event.x - self.offset_x * (self.cell_size + self.line_width)) / (self.cell_size + self.line_width)
@@ -224 +225 @@
                         index = selected
                         state = automata.states[index]
-                        print state
                         del automata.states[index]
                         automata.states.insert(0, state)
                         self.selected_state = 0
+                        self.refresh_dicts()
                         self.refresh_list()
         
@@ -235 +236 @@
                         index = selected
                         state = automata.states[index]
-                        print state
                         del automata.states[index]
                         automata.states.append(state)
                         self.selected_state = len(automata.states) - 1
+                        self.refresh_dicts()
                         self.refresh_list()
         
@@ -247 +248 @@
                         if index > 0:
                                 state = automata.states[index]
-                                print state
                                 del automata.states[index]
                                 automata.states.insert(index - 1, state)
                                 self.selected_state = index - 1
+                                self.refresh_dicts()
                                 self.refresh_list()
         
@@ -259 +260 @@
                         if index < state_list.size() - 1:
                                 state = automata.states[index]
-                                print state
                                 del automata.states[index]
                                 automata.states.insert(index + 1, state)
                                 self.selected_state = index + 1
+                                self.refresh_dicts()
                                 self.refresh_list()
         
         def delete_state(self):# delete choosen state
                 selected = self.selected_state
-                if selected != None:
+                if selected != None and len(automata.states) != 1:
                         index = selected
-                        print automata.states[index]
-                        del automata.symbols[automata.states[index].symbol]
-                        for key in self.keys.keys():
-                                if self.keys[key] == index:
-                                        del self.keys[key]
-                        del automata.st_sym[automata.states[index].symbol]
+                        symbol = automata.states[index].symbol
                         del automata.states[index]
+                        self.refresh_dicts()
                         if index in automata.states:
                                 self.selected_state = index
-                        elif len(automata.states):
+                        else:
                                 self.selected_state = len(automata.states) - 1
-                        else:
-                                self.selected_state = None
                         self.refresh_list()
                         self.select_item(self.selected_state)
+                        self.draw_changed_state(symbol, automata.states[0].symbol)
+                else:
+                        error.config(text="Operation is refused")
+                        error.after(2000, self.clear_error)
         
         def add(self):# add new state
@@ -296 +295 @@
                 if self.keys.has_key(key):
                         error.config(text="State with such key has already existed")
+                        error.after(2000, self.clear_error)
                         state_key.focus()
                 elif len(key) != 1:
                         error.config(text="Bad key for state")
+                        error.after(2000, self.clear_error)
                         state_key.focus()
                 elif automata.symbols.has_key(symbol):
                         error.config(text="State with such symbol has already existed")
+                        error.after(2000, self.clear_error)
                         state_symbol.focus()
                 elif len(symbol) != 1:
                         error.config(text="Bad symbol for state")
+                        error.after(2000, self.clear_error)
                         state_symbol.focus()
                 else:
-                        state = State(name, symbol, color, nums)
+                        state = State(name, symbol, color, key, nums)
                         automata.states.append(state)
                         automata.symbols[symbol] = len(automata.states) - 1
@@ -331 +334 @@
                         if self.keys.has_key(key) and self.keys[key] != index:
                                 error.config(text="State with such key has already existed")
+                                error.after(2000, self.clear_error)
                                 state_key.focus()
                         elif len(key) != 1:
                                 error.config(text="Bad key for state")
+                                error.after(2000, self.clear_error)
                                 state_key.focus()
                         elif automata.symbols.has_key(symbol)  and automata.symbols[symbol] != index:
                                 error.config(text="State with such symbol has already existed")
+                                error.after(2000, self.clear_error)
                                 state_symbol.focus()
                         elif len(symbol) != 1:
                                 error.config(text="Bad symbol for state")
+                                error.after(2000, self.clear_error)
                                 state_symbol.focus()
                         else:
-                                state = State(name, symbol, color, nums)
-                                del automata.symbols[automata.states[index].symbol]
-                                automata.symbols[symbol] = index
-                                del automata.st_sym[automata.states[index].symbol]
-                                automata.st_sym[symbol] = state
-                                self.keys[key] = index
-                                error.config(text="")
+                                state = State(name, symbol, color, key, nums)
+                                self.draw_changed_state(automata.states[index].symbol, symbol)
                                 automata.states[index] = state
+                                self.refresh_dicts()
                                 self.refresh_list()
+        
+        def draw_changed_state(self, symbol_old, symbol_new):
+                cells = []
+                for row in range(automata.height):
+                        for col in range(automata.width):
+                                if automata.field[row][col] == symbol_old:
+                                        automata.field[row][col] = symbol_new
+                                        cells.append((row, col))
+                
+                self.draw_cell(cells)
         
         def show_size_window(self):
@@ -398 +411 @@
                 if len(selected):
                         self.select_item(self.selected_state)
+        
         def choose_color(self, event):
                 state_color.config(bg=tkColorChooser.askcolor()[1])
+        
+        def clear_error(self):
+                error.config(text="")
+        
+        def clean_field(self):
+                symbol = automata.states[0].symbol
+                cells = []
+                for row in range(automata.height):
+                        for col in range(automata.width):
+                                if automata.field[row][col] != symbol:
+                                        automata.field[row][col] = symbol
+                                        cells.append((row, col))
+                self.draw_cell(cells)
+        
+        def fill_randomly(self):
+                cells = []
+                for row in range(automata.height):
+                        for col in range(automata.width):
+                                automata.field[row][col] = automata.states[random.randint(0, len(automata.states) - 1)].symbol
+                                cells.append((row, col))
+                self.draw_cell(cells)
+        
+        def refresh_dicts(self):
+                automata.symbols = {}
+                automata.st_sym = {}
+                self.keys = {}
+                for index, state in enumerate(automata.states):
+                        automata.symbols[state.symbol] = index
+                        automata.st_sym[state.symbol] = state
+                        self.keys[state.key] = index
+        
 
 
@@ -600 +645 @@
 menu_action.add_command(label="Zoom Out", command=handlers.zoom_out)
 menu_action.add_separator()
-menu_action.add_command(label="Clean field")
-menu_action.add_command(label="Fill randomly")
+menu_action.add_command(label="Clean field", command=handlers.clean_field)
+menu_action.add_command(label="Fill randomly", command=handlers.fill_randomly)
 menu_action.add_separator()
 menu_action.add_command(label="Change size",command=handlers.show_size_window)