Skip to content

Commit 40085ee

Browse files
charlotrudelcharlotrudel
committed
fix chips in sidebar
1 parent 8c34cf1 commit 40085ee

File tree

2 files changed

+15
-19
lines changed

2 files changed

+15
-19
lines changed

‎menus.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,7 @@ def decodeFunc(self,inVar, funcName):
760760
s += " ) "
761761
elif funcName == "Demux":
762762
s ="("
763-
out = inVar[0]["numO"]
763+
out = inVar[0]['numO']
764764
v2, v1, v0 = (out & 1)^1, ((out & 2) >> 1)^1, ((out & 4) >> 2)^1
765765
s += v0*" !" + inVar[0]['val'] + " & " + v1*"!" + inVar[1]['val'] + " & " + v2*"!" + inVar[2]['val'] + \
766766
" & " + inVar[3]["einv"] + " & " + inVar[4]["einv"] + " & " + inVar[5]["enb"]
@@ -787,11 +787,11 @@ def decodeFunc(self,inVar, funcName):
787787
sT =f"T{self.varTempNum} = "
788788
sT += "((" + inVar[0]['J'] + f" & !T{self.varTempNum}_precedant) | (!{K} & T{self.varTempNum}_precedant)) & {set} & {rst} & CLK | {iset} "
789789
sT += " ); "
790-
s = inVar[0]["numO"]*" !" + f"T{self.varTempNum} "
790+
s = inVar[0]['numO']*" !" + f"T{self.varTempNum} "
791791
self.varTempNum +=1
792792
self.varScript += [sT]
793793
elif funcName == "BinaryCounter":
794-
if inVar[0]["numO"] == 0:
794+
if inVar[0]['numO'] == 0:
795795
self.numTemp = []
796796
CE = inVar[6]["CE"]
797797
iU = inVar[8]["iU"]
@@ -819,7 +819,7 @@ def decodeFunc(self,inVar, funcName):
819819
self.numTemp += [self.varTempNum]
820820
self.varTempNum +=1
821821
self.varScript += [sT]
822-
s = f"T{self.numTemp[inVar[0]["numO"]]} "
822+
s = f"T{self.numTemp[inVar[0]['numO']]} "
823823

824824
return s
825825

@@ -994,8 +994,8 @@ def checkCloseCircuit(self, ioOut, params={}):
994994

995995

996996
if self.is_linked_to(self.pwrP, inFunc):
997-
inFuncConst += [{constKey:pos, "num":n, "numO":no}]
998-
else: inFuncConst += [{constKey:neg, "num":n, "numO":no}]
997+
inFuncConst += [{constKey:pos, "num":n, 'numO':no}]
998+
else: inFuncConst += [{constKey:neg, "num":n, 'numO':no}]
999999
findIn = True
10001000
print("connecté à pwr")
10011001
if not findIn:
@@ -1045,8 +1045,8 @@ def checkCloseCircuit(self, ioOut, params={}):
10451045
if c == inFunc:
10461046
constKey = "iU"
10471047

1048-
#inFuncConst += [{constKey:self.mcu_pin[f"I{id[4:]}"], "num":n, "numO":no}] # [self.mcu_pin[f"I{id[4:]}"]] # ici ajouter n
1049-
inFuncConst += [{constKey:f"I{n+1}", "num":n, "numO":no}] # [self.mcu_pin[f"I{id[4:]}"]] # ici ajouter n
1048+
#inFuncConst += [{constKey:self.mcu_pin[f"I{id[4:]}"], "num":n, 'numO':no}] # [self.mcu_pin[f"I{id[4:]}"]] # ici ajouter n
1049+
inFuncConst += [{constKey:f"I{n+1}", "num":n, 'numO':no}] # [self.mcu_pin[f"I{id[4:]}"]] # ici ajouter n
10501050
findIn = True
10511051
print("connecté à une ENTRÉE EXTERNE")
10521052
break
@@ -1097,8 +1097,8 @@ def checkCloseCircuit(self, ioOut, params={}):
10971097
if c == inFunc:
10981098
constKey = "iU"
10991099

1100-
#inFuncConst += [{constKey:self.mcu_pin[f"I{id[4:]}"], "num":n, "numO":no}]
1101-
inFuncConst += [{constKey:f"I{n+1}", "num":n, "numO":no}]
1100+
#inFuncConst += [{constKey:self.mcu_pin[f"I{id[4:]}"], "num":n, 'numO':no}]
1101+
inFuncConst += [{constKey:f"I{n+1}", "num":n, 'numO':no}]
11021102
findIn = True
11031103
print("connecté à une ENTRÉE EXTERNE par cable") # ici ajouter n {'val':self.mcu_pin[f"I{id[4:]}"], "num":n}
11041104
break
@@ -1145,7 +1145,7 @@ def checkCloseCircuit(self, ioOut, params={}):
11451145
if c == pt:
11461146
outPrev = "!" + outPrev
11471147
isPinOut = True
1148-
inFuncConst += [{constKey:outPrev, "num":n, "numO":no}] # [self.mcu_pin[f"O{id[4:]}"]]
1148+
inFuncConst += [{constKey:outPrev, "num":n, 'numO':no}] # [self.mcu_pin[f"O{id[4:]}"]]
11491149
findNext = True
11501150
if not isPinOut:
11511151
findNext, s = self.checkCloseCircuit(outZone,params)
@@ -1168,7 +1168,7 @@ def checkCloseCircuit(self, ioOut, params={}):
11681168
if c == pt:
11691169
s = "!" + s
11701170

1171-
inFuncConst += [{constKey:s, "num":n, "numO":no}]
1171+
inFuncConst += [{constKey:s, "num":n, 'numO':no}]
11721172
self.chip_out_script += [(s,outZone)]
11731173
else:
11741174
# il faut voir si une sortie io n'existe pas sinon var temp
@@ -1198,7 +1198,7 @@ def checkCloseCircuit(self, ioOut, params={}):
11981198
if c == pt:
11991199
outPrev = "!" + outPrev
12001200

1201-
inFuncConst += [{constKey:outPrev, "num":n, "numO":no}]
1201+
inFuncConst += [{constKey:outPrev, "num":n, 'numO':no}]
12021202
if not isPinOut:
12031203
for coc in self.chip_out_script:
12041204
if coc[1] == outZone:
@@ -1222,7 +1222,7 @@ def checkCloseCircuit(self, ioOut, params={}):
12221222
if c == pt:
12231223
exp = "!" + exp
12241224

1225-
inFuncConst += [{constKey:exp, "num":n, "numO":no}]
1225+
inFuncConst += [{constKey:exp, "num":n, 'numO':no}]
12261226
break
12271227
findNext = True
12281228
break

‎sidebar.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
from dataCDLT import FREE, USED
1919
from object_model.circuit_object_model import Chip, get_all_available_chips, get_chip_modification_times
2020

21-
if (os.name in ("posix", "darwin")) and "linux" not in platform.platform().lower():
22-
from tkinter import messagebox, font
23-
from tkmacosx import Button # type: ignore
24-
else:
25-
from tkinter import Button, messagebox, font
21+
from tkinter import Button, messagebox, font
2622

2723

2824
@dataclass

0 commit comments

Comments
 (0)