From 36e49c810641af3766c1df95791b864907ceef45 Mon Sep 17 00:00:00 2001
From: jmpla <jean-marie.place@univ-lille.fr>
Date: Thu, 18 May 2023 07:34:36 +0200
Subject: [PATCH] wip

---
 app/but/prepajury_xl_format.py | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/but/prepajury_xl_format.py b/app/but/prepajury_xl_format.py
index 0bb6e8f06..8b77f9917 100644
--- a/app/but/prepajury_xl_format.py
+++ b/app/but/prepajury_xl_format.py
@@ -115,7 +115,7 @@ class SCO_VALIGN(Enum):
 free = 0
 
 
-class Composante:
+class Composante(abc.ABC):
     def __init__(self, base=None, width: int = 1):
         global free
         if base is None:
@@ -136,6 +136,9 @@ class Composante:
     def write(self, index, signature=0) -> int:
         return self.clear(signature) + (index << self.base)
 
+    def make_zero_based_constant(self, enums: list[Enum] = None):
+        return 0
+
     @abc.abstractmethod
     def build(self, value: int):
         pass
@@ -188,7 +191,8 @@ class Composante_Colors(Composante):
 
 class Composante_borderThickness(Composante):
     def __init__(self):
-        super().__init__(width=2)
+        assert (1 << 3) > SCO_BORDERTHICKNESS.__len__()
+        super().__init__(width=3)
 
     def set(self, data: SCO_BORDERTHICKNESS, signature=0) -> int:
         return self.write(data.value, signature)
@@ -410,11 +414,13 @@ class Composante_group(Composante):
             self.cache[value] = self.build(signature)
         return self.cache[value]
 
-    def make_zero_based(self, values: list[Enum]):
+    def make_zero_based_constant(self, enums: list[Enum] = None) -> int:
+        if enums is None:
+            return 0
         signature = 0
-        for value, composante in zip(values, self.composantes):
-            breakpoint()
-            pass
+        for enum, composante in zip(enums, self.composantes):
+            signature += composante.write(enum.value)
+        return signature >> self.base
 
 
 class Composante_fill(Composante_group):
@@ -546,6 +552,9 @@ class FMT(Enum):
     def get_style(self, signature: int):
         return self.composante.lookup_or_cache(signature)
 
+    def make_zero_based_constant(self, enums: list[Enum]) -> int:
+        return self.composante.make_zero_based_constant(enums=enums)
+
     @classmethod
     def compose(cls, composition: list, signature: int = 0) -> int:
         for field, value in composition:
@@ -585,3 +594,10 @@ class FMT(Enum):
     BORDERS = Composante_borders(BORDER_LEFT, BORDER_RIGHT, BORDER_TOP, BORDER_BOTTOM)
     ALIGNMENT = Composante_alignment(ALIGNMENT_HALIGN, ALIGNMENT_VALIGN)
     ALL = Composante_all(FONT, FILL, BORDERS, ALIGNMENT, NUMBER_FORMAT)
+
+
+breakpoint()
+THIN_BLACK: int = FMT.BORDER_LEFT.composante.make_zero_based_constant(
+    enums=[SCO_BORDERTHICKNESS.BORDER_THIN, SCO_COLORS.BLACK]
+)
+pass