Browse Source

Fix qut routine

pull/292/head
Eugenio Parodi 1 year ago
parent
commit
f9b322cefc
  1. 1
      .gitignore
  2. 4
      .vscode/launch.json
  3. 2
      TermTk/TTkCore/timer_unix.py
  4. 1
      TermTk/TTkCore/ttk.py
  5. 10
      TermTk/TTkWidgets/TTkModelView/tablemodellist.py
  6. 4
      TermTk/TTkWidgets/TTkModelView/treewidget.py
  7. 1
      TermTk/TTkWidgets/TTkTerminal/terminalhelper.py
  8. 4
      TermTk/TTkWidgets/combobox.py
  9. 4
      TermTk/TTkWidgets/image.py

1
.gitignore vendored

@ -20,6 +20,7 @@ sandbox
!tests/sandbox !tests/sandbox
node_modules node_modules
Varie Varie
stacktrace.txt
# VizTracker default file # VizTracker default file
result.json result.json

4
.vscode/launch.json vendored

@ -16,10 +16,10 @@
"name": "Python: Test Player", "name": "Python: Test Player",
"type": "debugpy", "type": "debugpy",
"request": "launch", "request": "launch",
"program": "${file}", "program": "tests/pytest/test_001_demo.py",
"console": "integratedTerminal", "console": "integratedTerminal",
"justMyCode": true, "justMyCode": true,
"args": ["-p", "tmp/test.input.bin"] "args": ["-p", "tmp/test.input.001.bin"]
},{ },{
"name": "Python: TTk Designer", "name": "Python: TTk Designer",
"type": "debugpy", "type": "debugpy",

2
TermTk/TTkCore/timer_unix.py

@ -41,6 +41,8 @@ class TTkTimer(threading.Thread):
TTkHelper.quitEvent.connect(self.quit) TTkHelper.quitEvent.connect(self.quit)
def quit(self): def quit(self):
TTkHelper.quitEvent.disconnect(self.quit)
self.timeout.clear()
self._quit.set() self._quit.set()
self._timer.set() self._timer.set()
self._start.set() self._start.set()

1
TermTk/TTkCore/ttk.py

@ -185,6 +185,7 @@ class TTk(TTkContainer):
self._mainLoop() self._mainLoop()
finally: finally:
if platform.system() != 'Emscripten': if platform.system() != 'Emscripten':
TTkHelper.quitEvent.emit()
if self._timer: if self._timer:
self._timer.timeout.disconnect(self._time_event) self._timer.timeout.disconnect(self._time_event)
self._paintEvent.set() self._paintEvent.set()

10
TermTk/TTkWidgets/TTkModelView/tablemodellist.py

@ -55,9 +55,9 @@ class TTkTableModelList(TTkAbstractTableModel):
__slots__ = ('_data','_dataOriginal', '_hheader', '_vheader') __slots__ = ('_data','_dataOriginal', '_hheader', '_vheader')
def __init__(self, *, def __init__(self, *,
data:list[list[object]]=[], data:list[list[object]]=None,
header:list[str]=[], header:list[str]=None,
indexes:list[str]=[]) -> None: indexes:list[str]=None) -> None:
''' '''
:param data: the 2D List model for the view to present. :param data: the 2D List model for the view to present.
:type data: list[list] :type data: list[list]
@ -69,8 +69,8 @@ class TTkTableModelList(TTkAbstractTableModel):
:type indexes: list[str], optional :type indexes: list[str], optional
''' '''
self._data = self._dataOriginal = data if data else [['']] self._data = self._dataOriginal = data if data else [['']]
self._hheader = header self._hheader = header if header else []
self._vheader = indexes self._vheader = indexes if indexes else []
super().__init__() super().__init__()
def modelList(self) -> list[list]: def modelList(self) -> list[list]:

4
TermTk/TTkWidgets/TTkModelView/treewidget.py

@ -161,7 +161,7 @@ class TTkTreeWidget(TTkAbstractScrollView):
firstLine: bool firstLine: bool
def __init__(self, *, def __init__(self, *,
header=[], header=None,
sortingEnabled=True, sortingEnabled=True,
**kwargs) -> None: **kwargs) -> None:
''' '''
@ -181,7 +181,7 @@ class TTkTreeWidget(TTkAbstractScrollView):
self._selected = None self._selected = None
self._selectedId = None self._selectedId = None
self._separatorSelected = None self._separatorSelected = None
self._header = header self._header = header if header else []
self._columnsPos = [] self._columnsPos = []
self._cache = [] self._cache = []
self._sortingEnabled=sortingEnabled self._sortingEnabled=sortingEnabled

1
TermTk/TTkWidgets/TTkTerminal/terminalhelper.py

@ -176,6 +176,7 @@ class TTkTerminalHelper():
@pyTTkSlot() @pyTTkSlot()
def _quit(self): def _quit(self):
TTkHelper.quitEvent.disconnect(self._quit)
if pid := self._pid: if pid := self._pid:
try: try:
os.kill(pid,0) os.kill(pid,0)

4
TermTk/TTkWidgets/combobox.py

@ -67,7 +67,7 @@ class TTkComboBox(TTkContainer):
#signals #signals
'currentIndexChanged', 'currentTextChanged', 'editTextChanged') 'currentIndexChanged', 'currentTextChanged', 'editTextChanged')
def __init__(self, *, def __init__(self, *,
list:list = [], list:list = None,
index:int = -1, index:int = -1,
insertPolicy:TTkK.InsertPolicy = TTkK.InsertAtBottom, insertPolicy:TTkK.InsertPolicy = TTkK.InsertAtBottom,
textAlign:TTkK.Alignment = TTkK.CENTER_ALIGN, textAlign:TTkK.Alignment = TTkK.CENTER_ALIGN,
@ -94,7 +94,7 @@ class TTkComboBox(TTkContainer):
super().__init__(**kwargs) super().__init__(**kwargs)
# self.checked = pyTTkSignal() # self.checked = pyTTkSignal()
self._lineEdit = TTkLineEdit(parent=self) self._lineEdit = TTkLineEdit(parent=self)
self._list = list self._list = list if list else []
self._insertPolicy = insertPolicy self._insertPolicy = insertPolicy
self._lineEdit.returnPressed.connect(self._lineEditChanged) self._lineEdit.returnPressed.connect(self._lineEditChanged)
self._textAlign = textAlign self._textAlign = textAlign

4
TermTk/TTkWidgets/image.py

@ -66,11 +66,11 @@ class TTkImage(TTkWidget):
__slots__ = ('_data', '_rasterType', '_canvasImage') __slots__ = ('_data', '_rasterType', '_canvasImage')
def __init__(self, *, def __init__(self, *,
data=[], data=None,
rasteriser=HALFBLOCK, rasteriser=HALFBLOCK,
**kwargs) -> None: **kwargs) -> None:
TTkWidget.__init__(self, **kwargs) TTkWidget.__init__(self, **kwargs)
self._data = data self._data = data if data else []
self._rasterType = rasteriser self._rasterType = rasteriser
self._canvasImage = TTkCanvas() self._canvasImage = TTkCanvas()
if self._data: if self._data:

Loading…
Cancel
Save