Spaces:
Running
Running
vincentlui
commited on
Commit
•
0e339f1
1
Parent(s):
420d369
update
Browse files- app.py +1 -1
- dds_util.py +5 -1
- hand_record.py +3 -2
- pbn_util.py +2 -1
app.py
CHANGED
@@ -66,8 +66,8 @@ def save_file(df, cache_dir, files, board_no):
|
|
66 |
if cache_dir is None:
|
67 |
d = mkdtemp()
|
68 |
|
69 |
-
pbn_str = create_single_pbn_string(df, board_no=board_no)
|
70 |
try:
|
|
|
71 |
validate_pbn(pbn_str)
|
72 |
except Exception as e:
|
73 |
print(e)
|
|
|
66 |
if cache_dir is None:
|
67 |
d = mkdtemp()
|
68 |
|
|
|
69 |
try:
|
70 |
+
pbn_str = create_single_pbn_string(df, board_no=board_no)
|
71 |
validate_pbn(pbn_str)
|
72 |
except Exception as e:
|
73 |
print(e)
|
dds_util.py
CHANGED
@@ -110,7 +110,11 @@ End
|
|
110 |
DD_DIRECTIONS = ['N', 'S', 'E', 'W']
|
111 |
DD_SUITS = ['NT', 'S', 'H', 'D', 'C']
|
112 |
def get_result_table(pbn_deal_string):
|
113 |
-
|
|
|
|
|
|
|
|
|
114 |
s = '[OptimumResultTable "Declarer;Denomination\\2R;Result\\2R"]\n'
|
115 |
for i, char in enumerate(dd_tricks_string):
|
116 |
direction = DD_DIRECTIONS[i//5]
|
|
|
110 |
DD_DIRECTIONS = ['N', 'S', 'E', 'W']
|
111 |
DD_SUITS = ['NT', 'S', 'H', 'D', 'C']
|
112 |
def get_result_table(pbn_deal_string):
|
113 |
+
try:
|
114 |
+
dd_tricks_string = get_dd_tricks(pbn_deal_string)
|
115 |
+
except Exception as e:
|
116 |
+
print(e)
|
117 |
+
raise ValueError(e)
|
118 |
s = '[OptimumResultTable "Declarer;Denomination\\2R;Result\\2R"]\n'
|
119 |
for i, char in enumerate(dd_tricks_string):
|
120 |
direction = DD_DIRECTIONS[i//5]
|
hand_record.py
CHANGED
@@ -13,6 +13,7 @@ SUIT_SYMBOLS = ['♠','♥','♦','♣']
|
|
13 |
suit_symbols = ['♠','♥','♦','♣']
|
14 |
|
15 |
class PDF(FPDF):
|
|
|
16 |
def __init__(self, event, site, *args, **kwargs):
|
17 |
super().__init__(*args, **kwargs)
|
18 |
self.event = event
|
@@ -101,7 +102,7 @@ class PDF(FPDF):
|
|
101 |
row = table.row()
|
102 |
row.cell('', colspan=1, rowspan=1)
|
103 |
print_suit_values(self, row, suit, values1)
|
104 |
-
row.cell('',colspan=
|
105 |
|
106 |
print_suit_values(self, row, suit, values2)
|
107 |
|
@@ -168,4 +169,4 @@ def print_suit_values(pdf, row, suit, values):
|
|
168 |
pdf.set_text_color(255,0,0)
|
169 |
row.cell(suit, colspan=1)
|
170 |
pdf.set_text_color(0,0,0)
|
171 |
-
row.cell(values, colspan=
|
|
|
13 |
suit_symbols = ['♠','♥','♦','♣']
|
14 |
|
15 |
class PDF(FPDF):
|
16 |
+
value_column_span = 7
|
17 |
def __init__(self, event, site, *args, **kwargs):
|
18 |
super().__init__(*args, **kwargs)
|
19 |
self.event = event
|
|
|
102 |
row = table.row()
|
103 |
row.cell('', colspan=1, rowspan=1)
|
104 |
print_suit_values(self, row, suit, values1)
|
105 |
+
# row.cell('',colspan=1)
|
106 |
|
107 |
print_suit_values(self, row, suit, values2)
|
108 |
|
|
|
169 |
pdf.set_text_color(255,0,0)
|
170 |
row.cell(suit, colspan=1)
|
171 |
pdf.set_text_color(0,0,0)
|
172 |
+
row.cell(values, colspan=PDF.value_column_span)
|
pbn_util.py
CHANGED
@@ -174,7 +174,8 @@ def merge_pbn(pbn_paths):
|
|
174 |
with open(fd, 'w') as f:
|
175 |
for i, (k,v) in enumerate(ordered_board_dict.items()):
|
176 |
if i != 0:
|
177 |
-
|
|
|
178 |
f.write(v)
|
179 |
return fn
|
180 |
|
|
|
174 |
with open(fd, 'w') as f:
|
175 |
for i, (k,v) in enumerate(ordered_board_dict.items()):
|
176 |
if i != 0:
|
177 |
+
if v[-1] != "\n":
|
178 |
+
f.write('\n')
|
179 |
f.write(v)
|
180 |
return fn
|
181 |
|