Skip to content

Commit

Permalink
Added manual size entry to Memory widget.
Browse files Browse the repository at this point in the history
  • Loading branch information
mliberty1 committed Jul 20, 2023
1 parent fdcfc52 commit 4d9bed5
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ This file contains the list of changes made to pyjoulescope_ui.
Also fixed a few other combobox widths.
* Added more detail to Help -> About.
* Fixed waveform add relative signal x-axis marker.
* Added manual size entry to Memory widget.


## 1.0.25
Expand Down
29 changes: 28 additions & 1 deletion joulescope_ui/widgets/memory/memory_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,26 @@ def mouseReleaseEvent(self, event):
self.abort()


class MemSizeWidget(QtWidgets.QLineEdit):

value = QtCore.Signal(float)

def __init__(self, parent=None):
super().__init__(parent=parent)
self._validator = QtGui.QDoubleValidator(self)
self._validator.setRange(_SZ_MIN / _GB_FACTOR, 1, 3)
self.setValidator(self._validator)
self.editingFinished.connect(self._on_finished)

def max_set(self, value):
value = float(value)
self._validator.setTop(value)

def _on_finished(self):
value = float(self.text()) * _GB_FACTOR
self.value.emit(value)


@register
@styled_widget(N_('Memory'))
class MemoryWidget(QtWidgets.QWidget):
Expand Down Expand Up @@ -183,9 +203,11 @@ def __init__(self, parent=None):
self._layout.addWidget(self._grid_widget)

vm = psutil.virtual_memory()
self._mem_size_widget = MemSizeWidget(self._grid_widget)
self._mem_size_widget.value.connect(self._on_mem_size_text)
self._widgets = {
'size_label': QtWidgets.QLabel(N_('Memory buffer size'), self._grid_widget),
'size_value': QtWidgets.QLabel(f'0', self._grid_widget),
'size_value': self._mem_size_widget,
'size_units': QtWidgets.QLabel('GB', self._grid_widget),
'total_label': QtWidgets.QLabel(N_('Total RAM size'), self._grid_widget),
'total_value': QtWidgets.QLabel(_format(vm.total), self._grid_widget),
Expand Down Expand Up @@ -232,6 +254,7 @@ def _update(self, size=None):
self._widgets['used_value'].setText(s)

available = vm.total - (self._base + size + used)
self._mem_size_widget.max_set(available / _GB_FACTOR)
s = _format(available)
self._widgets['available_value'].setText(s)
self._memset.update(self._base, available, used)
Expand Down Expand Up @@ -288,6 +311,10 @@ def _on_size(self, value):
self._memset.update_size(value)
self._update(value)

def _on_mem_size_text(self, size):
self.size = size
self._on_size(size)

def _on_duration(self, value):
dt = 0.0 if value is None else float(value)
time_str, units_str = elapsed_time_formatter(dt, fmt='standard', precision=3)
Expand Down

0 comments on commit 4d9bed5

Please sign in to comment.