Changeset 161

Timestamp:

09/15/04 21:39:06 (4 years ago)

Author:

ug

Message:

Changes to board-snapshot/restore

Location:

06/devel

Files:

• abstractBoardPY.py (modified) (3 diffs)
• board.py (modified) (3 diffs)
• kombilo.py (modified) (11 diffs)
• searchPY.py (modified) (1 diff)

06/devel/abstractBoardPY.py

@@ -26 +26 @@
 from copy import deepcopy
 
-
 class abstractBoard:
     """ This class administrates a go board.
@@ -47 +46 @@
         self.undostack = []
         self.boardsize = boardsize
-
 
     def getStatus(self, x, y):
@@ -62 +60 @@
         ab.undostack = deepcopy(ab.undostack)
         return ab
+
+    def restore(self, data):
+        self.boardsize = ab.boardsize
+        self.status = ab.status
+        self.undostack = ab.undostack
 
     def len_cap_last(self):

06/devel/board.py

@@ -32 +32 @@
 try:
     from abstractBoard import *
+    print 'OK'
 except ImportError:
+    print 'oops' # FIXME
     from abstractBoardPY import *
 
@@ -176 +178 @@
 
 
-    def resize(self, event = None):
+    def resize(self, event = None, force = 0):
         """ This is called when the window containing the board is resized. """
 
-        if not self.resizable: return
+        if not self.resizable and not force: return
 
         self.noChanges = 1
@@ -209 +211 @@
         self.noChanges = 0
 
+
+    def snapshot(self):
+        handle = abstractBoard.snapshot(self)
+        self.snapshots[handle].extend([self.currentColor, deepcopy(self.stones), deepcopy(self.marks), deepcopy(self.labels)])
+        return handle
+
+    def restore(self, handle):
+        abstractBoard.restore(self, handle)
+        self.currentColor = self.snapshots[handle][2]
+        self.stones = self.snapshots[handle][3]
+        self.marks = self.snapshots[handle][4]
+        self.labels = self.snapshots[handle][5]
+        self.resize(None, 1)
 
     def play(self, pos, color=None):

06/devel/kombilo.py

@@ -92 +92 @@
     """
     Board with support for wildcards and selection
-    of search-relevant region. Furthermore, snapshot returns a dictionary which
-    describes the current board position. It can then be restored with restore.
+    of search-relevant region.
     """
     
@@ -115 +114 @@
 
 
-    def resize(self, event = None):
+    def resize(self, event = None, force=0):
         """ Resize the board. Take care of wildcards and selection here. """
         
-        Board.resize(self, event)
+        Board.resize(self, event, force)
         for x,y in self.wildcards.keys():
             x1, x2, y1, y2 = self.getPixelCoord((x,y),1)
@@ -291 +290 @@
 
     def snapshot(self):
-        """ Return a dictionary which contains the data of all the objects
-            currently displayed on the board, which are not stored in the SGF file.
-            This means, at the moment: wildcards, and selection. """
-        
-        data = {}
-        data['wildcards'] = copy(self.wildcards)
-        data['selection'] = self.selection
-        return data
-
-
-    def restore(self, d):
-        """ Restore the data from a 'snapshot' dictionary. """
-        
-        for pos in d['wildcards'].keys():
-            color = d['wildcards'][pos][1]
-            x1, x2, y1, y2 = self.getPixelCoord(pos,1)
-            self.wildcards[pos] = (self.create_oval(x1+4, x2+4, y1-4, y2-4, fill = color,
-                                                    tags=('wildcard','non-bg')), color)
-
-        if d['selection'] != ((0,0), (self.boardsize-1, self.boardsize-1)) and d['selection'][1] != (-1,-1):
-            self.setSelection(d['selection'][0], d['selection'][1])
+        handle = Board.snapshot(self) 
+        self.snapshots[handle].extend([copy(self.wildcards), self.selection])
+        return handle
+
+    def restore(self, handle):
+        self.wildcards = self.snapshots[handle][6]
+        self.selection = self.snapshots[handle][7]
+        Board.restore(self, handle) # This does a self.resize(), which takes care of wildcards and selection in our case
 
 # ---------------------------------------------------------------------------------------
@@ -977 +963 @@
 
         
-    def append(self, s, data = None):
-        
-        if not data: return
-
+    def append(self, s):
         if self.mster.options.maxLengthSearchesStack.get() and\
            len(self.data) >= self.mster.options.maxLengthSearchesStack.get():
@@ -999 +982 @@
         b.unbind('<Shift-1>', b.bounds1)
         
-        for key in data[0].keys():
-            print data[0][key]
-            p = b.getPixelCoord(key)
-            b.status[key] = data[0][key]
-            b.stones[key] = b.create_oval(p, fill=data[0][key], tags='non-bg')
-        for key in data[1].keys():
-            print key,
-            color = data[1][key][1]
-            print color
-            x1, x2, y1, y2 = b.getPixelCoord(key,1)
-            b.wildcards[key] = (b.create_oval(x1, x2, y1, y2, fill = color,
-                                              outline='', tags=('wildcard','non-bg')), color)
-            print b.wildcards[key]
-        if data[2] != ((0,0), (self.mster.boardsize-1, self.mster.boardsize-1)) and data[2][1] != (-1,-1):
-            b.setSelection(data[2][0], data[2][1])
+#         for key in data[0].keys():
+#             print data[0][key]
+#             p = b.getPixelCoord(key)
+#             b.status[key] = data[0][key]
+#             b.stones[key] = b.create_oval(p, fill=data[0][key], tags='non-bg')
+#         for key in data[1].keys():
+#             print key,
+#             color = data[1][key][1]
+#             print color
+#             x1, x2, y1, y2 = b.getPixelCoord(key,1)
+#             b.wildcards[key] = (b.create_oval(x1, x2, y1, y2, fill = color,
+#                                               outline='', tags=('wildcard','non-bg')), color)
+            # print b.wildcards[key]
+#         if data[2] != ((0,0), (self.mster.boardsize-1, self.mster.boardsize-1)) and data[2][1] != (-1,-1):
+#             b.setSelection(data[2][0], data[2][1])
 
         b.tkraise('non-bg')
@@ -1020 +1003 @@
         self.prevSF.reposition()
         self.data.append([s, b, 0])
-        if data: self.select(len(self.data)-1)
+        self.select(len(self.data)-1)
 
         
@@ -1841 +1824 @@
 
         boardData = self.board.snapshot()
-        boardData2 = (None, None, None) # FIXME, was (copy(self.board.status), copy(self.board.wildcards), self.board.selection)
 
         self.progBar.clear()
@@ -1940 +1922 @@
         games = [l.current for l in self.gamelist.DBlist[`self.boardsize`]]
             # This should really be copy (resp. deepcopy),
-            # but that would be too slow
+            # but that would be too slow (FIXME: test this again; also test join/split?!)
             # and it should work this way too.
-        # results = [join(l.results, '|%') for l in self.gamelist.DBlist[`self.boardsize`]]
-        # FIXME results (is now list of Hit's)
-        # cursorSn = [self.cursor, self.cursor.currentGame, self.cursor.currentN.pathToNode()]
-        # see FIXME above (boardData = ...)
-        # self.prevSearches.append([boardData, games, results, copy(self.continuations),
-        #                       self.noMatches, self.noSwitched, self.Bwins, self.Wwins,
-        #                       self.modeVar.get(), self.fixedColorVar.get(), self.fixedAnchorVar.get(),
-        #                       self.moveLimit.get(), self.nextMoveVar.get(), cursorSn], boardData2)
+        results = [l.results for l in self.gamelist.DBlist[`self.boardsize`]]
+            # FIXME not sure whether this works
+
+        cursorSn = [self.cursor, self.cursor.currentGame, self.cursor.currentN.pathToNode()]
+        self.prevSearches.append([boardData, games, results, copy(self.continuations),
+                              self.noMatches, self.noSwitched, self.Bwins, self.Wwins,
+                              self.modeVar.get(), self.fixedColorVar.get(), self.fixedAnchorVar.get(),
+                              self.moveLimit.get(), self.nextMoveVar.get(), cursorSn])
 
         self.configButtons(NORMAL)
@@ -2238 +2220 @@
                 
         try:
-            d, g, r, c, nm, ns, bw, ww, mv, fc, fa, ml, nextM, cu = prev
+            handle, g, r, c, nm, ns, bw, ww, mv, fc, fa, ml, nextM, cu = prev
         except:
             self.reset()
@@ -2256 +2238 @@
         self.Wwins = 0
         
-        if d:
+        if not handle is None:
             if cu:
                 found = 0
@@ -2278 +2260 @@
                     self.cursor.seeCurrent()
                     
-                    self.board.restore(d)
+                    self.board.restore(handle)
             
                     self.sel = self.board.selection      # used in self.showCont()                    
-                    self.capVar.set('Cap - B: ' + str(self.capB) + ', W: ' + str(self.capW))
+                    self.capVar.set('Cap - B: ' + str(self.capB) + ', W: ' + str(self.capW)) # FIXME wo kommen die her? ist das so ok?
                 else:
                     showwarning('Error', 'SGF File not found')

06/devel/searchPY.py

@@ -367 +367 @@
                         elif self.branchpoints:
                             for algo in algolist: algo.endOfVariation_process()
-                            print 'eov process'
+                            # print 'eov process'
                             cursor.currentN, b, whichVar = self.branchpoints.pop()
                             if whichVar+2 < cursor.noChildren():