Update Doors_Schedule.py
Browse files- Doors_Schedule.py +16 -6
Doors_Schedule.py
CHANGED
|
@@ -540,7 +540,6 @@ def get_widths_bb_format(cleaned_width, kelma):
|
|
| 540 |
return widths
|
| 541 |
|
| 542 |
|
| 543 |
-
|
| 544 |
def get_width_info_tobeprinted_secondary(new_data, main_info, secondary_info):
|
| 545 |
width_info_tobeprinted = []
|
| 546 |
secondary_info_tobeprinted = []
|
|
@@ -569,8 +568,14 @@ def get_width_info_tobeprinted_secondary(new_data, main_info, secondary_info):
|
|
| 569 |
for coords, label, width, height, acous, color in new_data:
|
| 570 |
w = re.sub(r",", "", width)
|
| 571 |
h = re.sub(r",", "", height)
|
| 572 |
-
|
| 573 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 574 |
width_info_tobeprinted.append(f"{w} mm wide x {h} mm high")
|
| 575 |
secondary_info_tobeprinted.append(acous)
|
| 576 |
|
|
@@ -579,13 +584,18 @@ def get_width_info_tobeprinted_secondary(new_data, main_info, secondary_info):
|
|
| 579 |
for coords, label, width, height, acous, fire, color in new_data:
|
| 580 |
w = re.sub(r",", "", width)
|
| 581 |
h = re.sub(r",", "", height)
|
| 582 |
-
|
| 583 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 584 |
width_info_tobeprinted.append(f"{w} mm wide x {h} mm high")
|
| 585 |
secondary_info_tobeprinted.append((acous, fire))
|
| 586 |
return width_info_tobeprinted, secondary_info_tobeprinted
|
| 587 |
|
| 588 |
-
|
| 589 |
def get_word_locations_plan_secondary(flattened_list, plan_texts, main_info, secondary_info):
|
| 590 |
#hena fe 7alet en keda keda fe secondary information
|
| 591 |
locations = []
|
|
|
|
| 540 |
return widths
|
| 541 |
|
| 542 |
|
|
|
|
| 543 |
def get_width_info_tobeprinted_secondary(new_data, main_info, secondary_info):
|
| 544 |
width_info_tobeprinted = []
|
| 545 |
secondary_info_tobeprinted = []
|
|
|
|
| 568 |
for coords, label, width, height, acous, color in new_data:
|
| 569 |
w = re.sub(r",", "", width)
|
| 570 |
h = re.sub(r",", "", height)
|
| 571 |
+
if float(w).is_integer():
|
| 572 |
+
w = int(float(w))
|
| 573 |
+
else:
|
| 574 |
+
w = w
|
| 575 |
+
if float(h).is_integer():
|
| 576 |
+
h = int(float(h))
|
| 577 |
+
else:
|
| 578 |
+
h = h
|
| 579 |
width_info_tobeprinted.append(f"{w} mm wide x {h} mm high")
|
| 580 |
secondary_info_tobeprinted.append(acous)
|
| 581 |
|
|
|
|
| 584 |
for coords, label, width, height, acous, fire, color in new_data:
|
| 585 |
w = re.sub(r",", "", width)
|
| 586 |
h = re.sub(r",", "", height)
|
| 587 |
+
if float(w).is_integer():
|
| 588 |
+
w = int(float(w))
|
| 589 |
+
else:
|
| 590 |
+
w = w
|
| 591 |
+
if float(h).is_integer():
|
| 592 |
+
h = int(float(h))
|
| 593 |
+
else:
|
| 594 |
+
h = h
|
| 595 |
width_info_tobeprinted.append(f"{w} mm wide x {h} mm high")
|
| 596 |
secondary_info_tobeprinted.append((acous, fire))
|
| 597 |
return width_info_tobeprinted, secondary_info_tobeprinted
|
| 598 |
|
|
|
|
| 599 |
def get_word_locations_plan_secondary(flattened_list, plan_texts, main_info, secondary_info):
|
| 600 |
#hena fe 7alet en keda keda fe secondary information
|
| 601 |
locations = []
|