X-Git-Url: https://harishankar.org/repos/?p=getaclue.git;a=blobdiff_plain;f=crosswordpuzzle.py;h=d02890b0ff1100cb360bbed54431afa1f2a3e6fd;hp=57878b808c6a90ba6f71b0467efae690d7e8a63e;hb=f07b2f0668053c6bf2c786376f3602509e2efe0a;hpb=5f68ccac12372c5271c21e9045558d2d03e92a41
diff --git a/crosswordpuzzle.py b/crosswordpuzzle.py
index 57878b8..d02890b 100644
--- a/crosswordpuzzle.py
+++ b/crosswordpuzzle.py
@@ -136,8 +136,7 @@ class CrosswordPuzzle:
def export_image (self, pngfile, htmlfile=None, puztitle="Crossword Puzzle",
solution=True):
# don't export if grid is not frozen
- if self.frozen_grid is False:
- raise FrozenGridException
+ self.assert_frozen_grid ()
# create cairo image surface and context
px = 30
@@ -199,8 +198,9 @@ class CrosswordPuzzle:
html_contents.append ("
Across clues
")
html_contents.append ("")
for word, clue in clues_across:
+ # clue should be: - clue text (chars)
clue_str = str (self.data[word[1]][word[2]].numbered) + " - " \
- + clue
+ + clue + " (" + str (word[3]) + ")"
html_contents.append (clue_str)
html_contents.append ("
")
html_contents.append ("
")
@@ -209,7 +209,7 @@ class CrosswordPuzzle:
html_contents.append ("")
for word, clue in clues_down:
clue_str = str (self.data[word[1]][word[2]].numbered) + " - " \
- + clue
+ + clue + " (" + str (word[3]) + ")"
html_contents.append (clue_str)
html_contents.append ("
")
html_contents.append ("
")
@@ -225,8 +225,7 @@ class CrosswordPuzzle:
# get the AcrossLite(TM) data for exporting
def export_acrosslite (self, title, author, copyright):
# don't export if grid is not frozen
- if self.frozen_grid is False:
- raise FrozenGridException
+ self.assert_frozen_grid ()
across_data = []
across_data.append ("\r\n")
@@ -372,9 +371,8 @@ class CrosswordPuzzle:
# setting a down word
def set_word_down (self, row, col, word):
- # if the grid is frozen the abort
- if self.frozen_grid is True:
- raise FrozenGridException
+ # if the grid is frozen then abort
+ self.assert_unfrozen_grid ()
# if the word length greater than totalrows - startrow
if len(word) > self.rows - row:
@@ -391,6 +389,11 @@ class CrosswordPuzzle:
if i > 0 and i < len(word) - 1:
if self.data[row+i][col-1].occupied_down is True:
raise IntersectWordException (word, len(word))
+ # if the previous column is the end of an across word
+ if (self.data[row+i][col-1].occupied_across is True and
+ self.data[row+i][col].occupied_across is False):
+ raise IntersectWordException (word, len(word))
+
# on the next column except last column
if col < len(word) - 1:
# except the first and last row check if there is any
@@ -422,9 +425,8 @@ class CrosswordPuzzle:
# setting an across word
def set_word_across (self, row, col, word):
- # if the grid is frozen the abort
- if self.frozen_grid is True:
- raise FrozenGridException
+ # if the grid is frozen then abort
+ self.assert_unfrozen_grid ()
# is the word length greater than totalcols - startcol?
if len(word) > self.cols - col:
@@ -441,6 +443,11 @@ class CrosswordPuzzle:
if i > 0 and i < len(word) - 1:
if self.data[row-1][col+i].occupied_across is True:
raise IntersectWordException (word, len(word))
+ # if the previous row is the end of a down word
+ if (self.data[row-1][col+i].occupied_down is True and
+ self.data[row][col+i].occupied_down is False):
+ raise IntersectWordException (word, len(word))
+
# on a next row
if (row < (self.rows - 1)):
# except the first and last letter check if there is
@@ -500,6 +507,16 @@ class CrosswordPuzzle:
self.frozen_grid = False
+ # raise an exception if the grid is frozen
+ def assert_unfrozen_grid (self):
+ if self.frozen_grid is True:
+ raise FrozenGridException
+
+ # raise an exception if the grid is NOT frozen
+ def assert_frozen_grid (self):
+ if self.frozen_grid is False:
+ raise FrozenGridException
+
# reset the entire grid
def reset_grid (self):
# run through the grid
@@ -509,3 +526,37 @@ class CrosswordPuzzle:
self.data[row][col].reset ()
self.frozen_grid = False
+
+ # remove an across word at position
+ def remove_word_across (self, row, col):
+ # if grid is frozen don't allow removal of word
+ assert_unfrozen_grid ()
+
+ word, brow, bcol, l = self.get_word_across (row, col)
+
+ # traverse from the beginning to end of the word and erase it
+ c = bcol
+ while True:
+ if self.data[brow][c].occupied_across is True:
+ self.data[brow][c].clear_across_data ()
+ else:
+ break
+ c += 1
+
+ # remove a down word at position
+ def remove_word_down (self, row, col):
+ # if grid is frozen don't allow removal of word
+ self.assert_unfrozen_grid ()
+
+ word, brow, bcol, l = self.get_word_down (row, col)
+ # traverse from the beginn to end of the word and erase it
+ r = brow
+ while True:
+ if self.data[r][bcol].occupied_down is True:
+ self.data[r][bcol].clear_down_data ()
+ else:
+ break
+ r += 1
+
+
+