fix bugs, enhance SQLiteDatabaseCreator

Author: amaork

core/database.py

@@ -5,16 +5,17 @@
 import shutil
 import sqlite3
 import hashlib
-from .datatype import DynamicObject
-from typing import Any, Optional, Union, List, Tuple, Sequence
+from .datatype import DynamicObject, str2float, str2number
+from typing import Any, Optional, Union, List, Tuple, Sequence, Dict
+from ..misc.settings import UiInputSetting, UiIntegerInput, UiDoubleInput
 
 try:
     from pysqlcipher3 import dbapi2 as sqlcipher
 except ImportError:
     import sqlite3 as sqlcipher
 
 __all__ = ['SQLiteDatabase', 'SQLCipherDatabase', 'SQLiteUserPasswordDatabase', 'SQLiteDatabaseError',
-           'SQLiteDatabaseCreator', 'SQLiteGeneralSettingsItem']
+           'SQLiteDatabaseCreator', 'SQLiteGeneralSettingsItem', 'SQLiteUIElementScheme']
 
 
 class SQLiteDatabaseError(Exception):
@@ -575,6 +576,25 @@ def __repr__(self):
         return ", ".join(data)
 
 
+class SQLiteUIElementScheme(DynamicObject):
+    _properties = {'name', 'min', 'max', 'precision'}
+    _check = {
+        'name': lambda x: isinstance(x, str),
+        'min': lambda x: isinstance(x, (int, float)),
+        'nax': lambda x: isinstance(x, (int, float)),
+        'precision': lambda x: isinstance(x, int)
+    }
+
+    def getNumericalInput(self, name: str = '', readonly: bool = False) -> UiInputSetting:
+        name = name or self.name
+        if self.precision:
+            return UiDoubleInput(
+                name=name, minimum=self.min, maximum=self.max, decimals=self.precision, readonly=readonly
+            )
+        else:
+            return UiIntegerInput(name=name, minimum=self.min, maximum=self.max, readonly=readonly)
+
+
 class SQLiteDatabaseCreator(object):
     DESC_ID = -5
     NAME_ID = -4
@@ -634,6 +654,57 @@ def __output_protobuf_items(fp, name: str, items: List[str]):
         fp.write(";\n".join(items))
         fp.write(";\n}\n/*")
 
+    @staticmethod
+    def get_settings_table_ui_scheme(name: str) -> Dict[int, SQLiteUIElementScheme]:
+        try:
+            db = SQLiteDatabase(os.path.join('config', 'gas_sampler.db'))
+        except (OSError, SQLiteDatabaseError) as e:
+            print("Load db scheme error: {}".format(e))
+            return dict()
+
+        scheme = dict()
+        for item in db.getTableData(name):
+            idx, name, data, min_, max_, precision, desc = item
+            precision = str2number(precision)
+            process = str2float if precision else str2number
+            scheme[idx] = SQLiteUIElementScheme(name=name, data=process(data),
+                                                precision=precision, min=process(min_), max=process(max_))
+
+        return scheme
+
+    @staticmethod
+    def get_general_table_ui_scheme(name: str) -> Dict[int, SQLiteUIElementScheme]:
+        try:
+            db = SQLiteDatabase(os.path.join('config', 'gas_sampler.db'))
+        except (OSError, SQLiteDatabaseError) as e:
+            print("Load db scheme error: {}".format(e))
+            return dict()
+
+        names = db.selectRecord(
+            name, condition=SQLiteDatabase.conditionFormat('id', SQLiteDatabaseCreator.NAME_ID)
+        )[0][1: -1]
+
+        lowers = db.selectRecord(
+            name, condition=SQLiteDatabase.conditionFormat('id', SQLiteDatabaseCreator.LOWER_LIMIT_ID)
+        )[0][1: -1]
+
+        uppers = db.selectRecord(
+            name, condition=SQLiteDatabase.conditionFormat('id', SQLiteDatabaseCreator.UPPER_LIMIT_ID)
+        )[0][1: -1]
+
+        precisions = db.selectRecord(
+            name, condition=SQLiteDatabase.conditionFormat('id', SQLiteDatabaseCreator.PRECISION_ID)
+        )[0][1: -1]
+
+        scheme = dict()
+        for idx in range(len(names)):
+            precision = str2number(precisions[idx])
+            process = str2float if precision else str2number
+            scheme[idx] = SQLiteUIElementScheme(name=names[idx], precision=precision,
+                                                min=process(lowers[idx]), max=process(uppers[idx]))
+
+        return scheme
+
     @property
     def database_path(self) -> str:
         return self._db_name

core/uimailbox.py

@@ -177,8 +177,11 @@ def send(self, mail: BaseUiMail) -> bool:
         if not isinstance(mail, BaseUiMail):
             return False
 
-        self.hasNewMail.emit(mail)
-        return True
+        try:
+            self.hasNewMail.emit(mail)
+            return True
+        except RuntimeError:
+            return False
 
     @Slot(object)
     def mailProcess(self, mail: BaseUiMail) -> bool:

dashboard/input.py

@@ -316,6 +316,10 @@ def showKeyboard(self):
             self.setText(str(value))
             self.numberChanged.emit(value)
 
+    def setValue(self, value: Union[int, float]):
+        number_decimals = self.property('decimals')
+        self.setText("{0:.{1}f}".format(value, number_decimals) if number_decimals else str(value))
+
     def mousePressEvent(self, ev):
         if ev.button() != Qt.LeftButton:
             return

gui/container.py

@@ -231,6 +231,8 @@ def __init__(self, layout: QLayout, parent: Optional[QWidget] = None):
         self.__initSignalAndSlots()
 
     def __initSignalAndSlots(self):
+        from ..dashboard.input import VirtualNumberInput
+
         for component in self.getAll():
             if isinstance(component, QSpinBox):
                 component.valueChanged.connect(self.slotDataChanged)
@@ -242,6 +244,8 @@ def __initSignalAndSlots(self):
                 component.stateChanged.connect(self.slotDataChanged)
             elif isinstance(component, QRadioButton):
                 component.clicked.connect(self.slotDataChanged)
+            elif isinstance(component, VirtualNumberInput):
+                component.numberChanged.connect(self.slotDataChanged)
             elif isinstance(component, QLineEdit):
                 component.textChanged.connect(self.slotDataChanged)
             elif isinstance(component, QTextEdit):
@@ -295,6 +299,8 @@ def getComponentData(component: QWidget) -> Any:
 
     @staticmethod
     def setComponentData(component: QWidget, data: Any):
+        from ..dashboard.input import VirtualNumberInput
+
         if isinstance(component, QSpinBox):
             component.setValue(str2number(data))
         elif isinstance(component, QDoubleSpinBox):
@@ -315,9 +321,10 @@ def setComponentData(component: QWidget, data: Any):
         elif isinstance(component, QRadioButton):
             component.setCheckable(True)
             component.setChecked(str2number(data))
+        elif isinstance(component, VirtualNumberInput):
+            component.setValue(data)
         elif isinstance(component, QLineEdit):
-            if isinstance(data, str):
-                component.setText(data)
+            component.setText(str(data))
         elif isinstance(component, QTextEdit):
             if isinstance(data, str):
                 component.setText(data)

gui/view.py

@@ -343,7 +343,7 @@ def getItemData(self, row: int, column: int, role: Qt.ItemDataRole = Qt.DisplayR
         else:
             return model.itemData(model.index(row, column, QModelIndex())).get(role)
 
-    def setItemData(self, row: int, column: int, data: List[Any], role: Qt.ItemDataRole = Qt.EditRole):
+    def setItemData(self, row: int, column: int, data: Any, role: Qt.ItemDataRole = Qt.EditRole):
         model = self.model()
         if not isinstance(model, QAbstractItemModel):
             return False

gui/widget.py

@@ -32,14 +32,14 @@
 from PySide.QtGui import *
 from PySide.QtCore import *
 from datetime import datetime
-from threading import Thread
 
 from .container import ComponentManager
 from ..dashboard.input import VirtualNumberInput
 from ..misc.windpi import get_program_scale_factor
 from .misc import SerialPortSelector, NetworkInterfaceSelector
 from ..core.datatype import str2number, str2float, DynamicObject, DynamicObjectDecodeError
-from ..misc.settings import UiInputSetting, UiLogMessage, UiLayout, UiFontInput, UiColorInput
+from ..misc.settings import UiInputSetting, UiLogMessage, UiLayout, UiFontInput, UiColorInput, \
+    UiDoubleInput, UiIntegerInput, UiTextInput, UiFileInput
 
 
 __all__ = ['BasicWidget', 'PaintWidget',
@@ -2287,10 +2287,12 @@ def __initUi(self):
                         # QLine edit special process re check
                         if isinstance(widget, QLineEdit):
                             widget.setSizePolicy(QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed))
-                            widget.textChanged.connect(self.slotSettingChanged)
-                            widget.textChanged.connect(
-                                lambda x: self.settingChangedDetail.emit(widget.property("data"), x)
-                            )
+
+                            if not isinstance(widget, VirtualNumberInput):
+                                widget.textChanged.connect(self.slotSettingChanged)
+                                widget.textChanged.connect(
+                                    lambda x: self.settingChangedDetail.emit(widget.property("data"), x)
+                                )
                     elif isinstance(widget, QLayout):
                         # Add label and layout
                         layout.addWidget(QLabel(self.tr(ui_input.get_name())), row, column)
@@ -2518,14 +2520,15 @@ def createInputWidget(setting, name=None, parent=None):
             if setting.is_int_type():
                 if setting.is_readonly():
                     widget = VirtualNumberInput(parent=parent, initial_value=setting.get_data(),
-                                                min_=setting.get_check()[0], max_=setting.get_check()[1])
+                                                min_=setting.get_check()[UiIntegerInput.CHECK.MIN],
+                                                max_=setting.get_check()[UiIntegerInput.CHECK.MAX])
                     widget.setProperty("format", "int")
                 else:
                     widget = QSpinBox(parent)
-                    widget.setMinimum(setting.get_check()[0])
-                    widget.setMaximum(setting.get_check()[1])
+                    widget.setMinimum(setting.get_check()[UiIntegerInput.CHECK.MIN])
+                    widget.setMaximum(setting.get_check()[UiIntegerInput.CHECK.MAX])
                     widget.setValue(setting.get_data())
-                    widget.setSingleStep(setting.get_check()[2])
+                    widget.setSingleStep(setting.get_check()[UiIntegerInput.CHECK.STEP])
             elif setting.is_bool_type():
                 widget = QCheckBox(parent=parent)
                 widget.setCheckable(True)
@@ -2535,25 +2538,25 @@ def createInputWidget(setting, name=None, parent=None):
                 widget.setText(setting.get_data())
                 widget.setPlaceholderText(setting.get_default())
                 # Set regular expression and max length
-                widget.setProperty("filter", setting.check[0])
-                widget.setValidator(QRegExpValidator(QRegExp(setting.check[0])))
-                widget.setMaxLength(setting.check[1])
+                widget.setProperty("filter", setting.check[UiTextInput.CHECK.REGEXP])
+                widget.setValidator(QRegExpValidator(QRegExp(setting.check[UiTextInput.CHECK.REGEXP])))
+                widget.setMaxLength(setting.check[UiTextInput.CHECK.LENGTH])
             elif setting.is_float_type():
                 if setting.is_readonly():
                     widget = VirtualNumberInput(parent=parent,
                                                 initial_value=setting.get_data(),
-                                                min_=setting.get_check()[0],
-                                                max_=setting.get_check()[1],
-                                                decimals=setting.get_check()[2])
+                                                min_=setting.get_check()[UiDoubleInput.CHECK.MIN],
+                                                max_=setting.get_check()[UiDoubleInput.CHECK.MAX],
+                                                decimals=setting.get_check()[UiDoubleInput.CHECK.DECIMALS])
                     widget.setProperty("format", "float")
                 else:
                     widget = QDoubleSpinBox(parent)
-                    widget.setMinimum(setting.get_check()[0])
-                    widget.setMaximum(setting.get_check()[1])
+                    widget.setMinimum(setting.get_check()[UiDoubleInput.CHECK.MIN])
+                    widget.setMaximum(setting.get_check()[UiDoubleInput.CHECK.MAX])
                     widget.setValue(setting.get_data())
-                    widget.setSingleStep(setting.get_check()[2])
-                    if len(setting.get_check()) > 3:
-                        widget.setDecimals(setting.get_check()[3])
+                    widget.setSingleStep(setting.get_check()[UiDoubleInput.CHECK.STEP])
+                    if len(setting.get_check()) > UiDoubleInput.CHECK.DECIMALS:
+                        widget.setDecimals(setting.get_check()[UiDoubleInput.CHECK.DECIMALS])
             elif setting.is_select_type():
                 widget = QComboBox(parent)
                 widget.addItems(setting.get_check())
@@ -2625,14 +2628,14 @@ def createInputWidget(setting, name=None, parent=None):
                                                           "Enable", None,
                                                           QApplication.UnicodeUTF8), parent=parent)
                 enable.setProperty("data", JsonSettingWidget.get_file_input_enable_key(name))
-                enable.setVisible(setting.get_check()[-1] == str(True))
+                enable.setVisible(setting.get_check()[UiFileInput.CHECK_SELECTABLE] == str(True))
 
                 button = QPushButton(QApplication.translate("JsonSettingWidget",
                                                             "Please Select File",
                                                             None, QApplication.UnicodeUTF8), parent=parent)
                 button.setProperty("clicked", "file")
                 button.setProperty("title", setting.get_name())
-                button.setProperty("private", setting.get_check()[:-1])
+                button.setProperty("private", setting.get_check()[:UiFileInput.CHECK_SELECTABLE])
 
                 layout = QHBoxLayout()
                 layout.addWidget(enable)

misc/settings.py

@@ -4,6 +4,7 @@
 import json
 import codecs
 import logging
+import collections
 from string import Template
 from typing import Tuple, Optional, Any, Sequence, Union, List, TypeVar, NamedTuple
 
@@ -66,10 +67,15 @@ def store(cls, settings: DynamicObject, path: Optional[str] = None):
             return False
 
         path = path if path else cls._default_path
-        if not os.path.isdir(os.path.dirname(path)) and len(os.path.dirname(path)):
-            os.makedirs(os.path.dirname(path))
-        with codecs.open(path, "w", "utf-8") as fp:
-            json.dump(settings.dict, fp, indent=4, ensure_ascii=False)
+
+        try:
+            if not os.path.isdir(os.path.dirname(path)) and len(os.path.dirname(path)):
+                os.makedirs(os.path.dirname(path))
+            with codecs.open(path, "w", "utf-8") as fp:
+                json.dump(settings.dict, fp, indent=4, ensure_ascii=False)
+        except OSError as e:
+            print("store settings to {}, failed: {}".format(path, e))
+            return False
 
         return True
 
@@ -246,6 +252,8 @@ def getDemoSettings(d2: bool = False) -> DynamicObject:
 
 
 class UiFileInput(UiInputSetting):
+    CHECK_SELECTABLE = -1
+
     def __init__(self, name: str, fmt: Tuple[str, ...], default: str = "", selectable: bool = False):
         fmt = list(fmt)
         fmt.append(str(selectable))
@@ -294,6 +302,8 @@ def get_stylesheet(font_setting: str) -> str:
 
 
 class UiTextInput(UiInputSetting):
+    CHECK = collections.namedtuple('UiTextInputCheck', ['REGEXP', 'LENGTH'])(*range(2))
+
     def __init__(self, name: str, length: int, default: str = "", re_: str = "[\s\S]*", readonly: bool = False):
         super(UiTextInput, self).__init__(name=name, data=default, default=default,
                                           check=(re_, length), readonly=readonly, type="TEXT")
@@ -406,13 +416,17 @@ def get_bg_color_stylesheet(color_setting: str, border: bool = False) -> str:
 
 
 class UiDoubleInput(UiInputSetting):
+    CHECK = collections.namedtuple('UiDoubleInputCheck', ['MIN', 'MAX', 'STEP', 'DECIMALS'])(*range(4))
+
     def __init__(self, name: str, minimum: float, maximum: float,
                  default: float = 0.0, step: float = 1.0, decimals: int = 1, readonly: bool = False):
         super(UiDoubleInput, self).__init__(name=name, data=default, default=default,
                                             check=(minimum, maximum, step, decimals), readonly=readonly, type="FLOAT")
 
 
 class UiIntegerInput(UiInputSetting):
+    CHECK = collections.namedtuple('UiIntegerInputCheck', ['MIN', 'MAX', 'STEP'])(*range(3))
+
     def __init__(self, name: str, minimum: int, maximum: int, default: int = 0, step: int = 1, readonly: bool = False):
         super(UiIntegerInput, self).__init__(name=name, data=default, default=default,
                                              check=(minimum, maximum, step), readonly=readonly, type="INT")