small fixes, more reverse select, new cs select tool

Author: mopy

co_lib/co_base/co_cmn.py

@@ -188,6 +188,14 @@ def block_signals(obj: QObject):
     finally:
         obj.blockSignals(False)
 
+@contextmanager
+def block_var(obj: bool):
+    obj = True
+    try:
+        yield
+    finally:
+        obj = False
+
 
 def complement_color(rgb: str) -> str:
     s1 = rgb.replace('#', '0x')

co_lib/co_base/co_completer.py

@@ -7,11 +7,11 @@
 import FreeCAD as App
 import Sketcher
 from PySide2.QtCore import Qt, QRect, QModelIndex, Slot, Signal
-from PySide2.QtGui import QKeyEvent, QStandardItemModel, QStandardItem, QFocusEvent, QMouseEvent
+from PySide2.QtGui import QKeyEvent, QStandardItemModel, QStandardItem, QFocusEvent, QMouseEvent, QFont
 from PySide2.QtWidgets import QLineEdit, QCompleter, QWidget, QVBoxLayout, QApplication, QAbstractItemView, QTableWidget
 
 from co_lib.co_base.co_cmn import DIM_CS, ConType
-from co_lib.co_base.co_config import CfgTransient
+from co_lib.co_base.co_config import CfgTransient, CfgFonts
 from co_lib.co_base.co_flag import Cs
 from co_lib.co_base.co_logger import xp_worker, xp, flow, _cp
 
@@ -486,6 +486,9 @@ class TableLineEdit(LineEdit):
 
     def __init__(self, item, comp_root: Node, driving: bool, parent):
         super().__init__(item, comp_root, parent)
+        cfg_f = CfgFonts()
+        f: QFont = cfg_f.font_get(cfg_f.FONT_TABLE)
+        self.setFont(f)
         self.item = item
         if Cs.V in item.sub_type:
             if item.expression:

co_lib/co_base/co_config.py

@@ -203,7 +203,7 @@ def __init__(self):
     def get(self, key):
         if key in CfgTransient.__NAMES:
             if key in self.data.keys():
-                val = self.convert_out(key, self.data[key])
+                val = self._convert_out(key, self.data[key])
                 return val
             else:
                 return self.default(key)
@@ -213,7 +213,7 @@ def get(self, key):
     @flow
     def set(self, key, val):
         if key in CfgTransient.__NAMES:
-            val = self.convert_in(val)
+            val = self._convert_in(val)
             self.data = {**self.data, **{key: val}}
             self.save()
             # self.data[key] = val
@@ -233,14 +233,14 @@ def save(self):
         self.save_delegate(self.data)
 
     @flow
-    def convert_in(self, val: Any) -> Any:
+    def _convert_in(self, val: Any) -> Any:
         if isinstance(val, QByteArray):
             qb64 = val.toBase64()
             return bytes(qb64).decode('UTF-8')
         return val
 
     @flow
-    def convert_out(self, key, val):
+    def _convert_out(self, key, val):
         if key == CfgTransient.GEOMETRY:
             enc = val.encode('UTF-8')
             return QByteArray.fromBase64(enc)
@@ -258,6 +258,8 @@ def default(self, val):
             return 0.1
         elif val == CfgTransient.SHOW_ONLY_VALID:
             return True
+        elif val == CfgTransient.CO_EXT_MATCH:
+            return False
         elif val == CfgTransient.GEOMETRY:
             return None
         elif val == CfgTransient.TRIGGER_CHARS:
@@ -272,7 +274,8 @@ def default(self, val):
     PA_TOLERANCE: str = 'pa_tolerance'
     SHOW_ONLY_VALID: str = 'only_valid'
     TRIGGER_CHARS: str = 'trigger_chars'
-    __NAMES: Set[str] = {CO_TOLERANCE, EQ_TOLERANCE, HV_TOLERANCE, PA_TOLERANCE, SHOW_ONLY_VALID, GEOMETRY, TRIGGER_CHARS}
+    CO_EXT_MATCH: str = 'co_ext_match'
+    __NAMES: Set[str] = {CO_TOLERANCE, EQ_TOLERANCE, HV_TOLERANCE, PA_TOLERANCE, SHOW_ONLY_VALID, GEOMETRY, TRIGGER_CHARS, CO_EXT_MATCH}
 
 
 @cfg_decorator

co_lib/co_base/co_logger.py

@@ -347,7 +347,7 @@ def ind_dec(ident, dec):
 
 
 # '': use without kwargs
-_xp_topic('', 'obs_sel')
+_xp_topic('', 'equal')
 # _xp_topic('', 'flow', 'constraint')
 # _xp_topic('')
 

co_lib/co_tabs/co_co_gui.py

@@ -26,6 +26,7 @@
 from .co_co import CoPoints, CoPoint, GeoId, GeoIdDist
 from .. import co_impl, co_gui
 from ..co_base.co_cmn import GeoPt, fmt_vec, pt_typ_str, wait_cursor, TableLabel, ColorTableItem, ObjType, block_signals
+from ..co_base.co_config import CfgTransient
 from ..co_base.co_logger import flow, xp, _co, _ev, xps, Profile
 from ..co_base.co_lookup import Lookup
 from ..co_base.co_observer import observer_block, observer_event_provider_get
@@ -40,6 +41,7 @@ def __init__(self, base):
         self.impl: co_impl.CoEd = self.base.base
         self.co: CoPoints = self.impl.co_points
         self.tab_co = QWidget(None)
+        self.cfg = CfgTransient()
         xp('co.created.connect', **_ev)
         self.co.created.connect(self.on_co_create)
         xp('co.creation_done.connect', **_ev)
@@ -146,6 +148,7 @@ def task_up(self, co):
 
     @flow(short=True)
     def on_result_up(self, result, id_lst: List[GeoId]):
+        self.co_btn_create.setDisabled(True)
         self.co_tbl_wid.setUpdatesEnabled(False)
         self.co_tbl_wid.setRowCount(0)
         __sorting_enabled = self.co_tbl_wid.isSortingEnabled()
@@ -186,18 +189,19 @@ def on_result_up(self, result, id_lst: List[GeoId]):
         self.co_tbl_wid.setUpdatesEnabled(True)
 
     def check(self, pt: CoPoint, id_lst: List[GeoId]):
-        xp('pt id', repr(pt.geo_id), 'id lst', repr(id_lst))
-        # xp('dst lst', pt.pt_distance_lst)
         if id_lst is None:
             return True
+        xp('pt id', repr(pt.geo_id), 'id lst', repr(id_lst))
+        xp('dst lst', [x.geo_id for x in pt.pt_distance_lst])
+        lst = [x.geo_id in id_lst for x in pt.pt_distance_lst]
         if pt.geo_id in id_lst:
             return True
+        if self.cfg.get(CfgTransient.CO_EXT_MATCH) and any(lst):
+            return True
         return False
 
     def split(self, pt: CoPoint):
-        res_n = list()
-        res_c = list()
-        res_e = list()
+        res_n, res_c, res_e = list(), list(), list()
         for x in pt.pt_distance_lst:
             x: GeoIdDist
             t = Lookup.translate_geo_idx(x.geo_id.idx)
@@ -257,7 +261,6 @@ def select(self, obj, pnt):
                 if not from_gui:
                     xp('ignore if not from gui', **_co)
                     return
-                # sk: Sketcher.Sketch = sel_ex.Object
                 self.update_table(id_lst=res)
 
     @flow

co_lib/co_tabs/co_cs.py

@@ -80,6 +80,7 @@ def __init__(self, base):
         self.evo = observer_event_provider_get()
         self.evo.in_edit.connect(self.on_in_edit)
         self.__constraints: List[Constraint] = list()
+        self.tol = str(pathlib.Path(CfgBase.BASE_DIR, self.ico['krankenwagen']))
 
     @property
     def constraints(self):
@@ -146,6 +147,7 @@ def on_in_edit(self, obj):
         'Icon48': 'co_lib/Icon/Sketcher_ToggleConstraint.svg',
         'Icon49': 'co_lib/Icon/Sketcher_Toggle_Constraint_Driven.svg',
         'Icon50': 'co_lib/Icon/Sketcher_Toggle_Constraint_Driving.svg',
+        'krankenwagen': 'co_lib/Icon/krankenwagen.svg',
     }
 
     @flow