Merge pull request #113 from nunobrum/dev

Dev
nunobrum · Aug 20, 2023 · 9e71a48 · 9e71a48
2 parents 8773d6a + 6e4d771
commit 9e71a48
Show file tree

Hide file tree

Showing 15 changed files with 578 additions and 285 deletions.
diff --git a/PyLTSpice/Histogram.py b/PyLTSpice/Histogram.py
@@ -176,7 +176,7 @@ def main():
 
         if options.range is None:
             # Automatic calculation of the range
-            axisXmin = mu - (options.sigma+1)*sd
+            axisXmin = mu - (options.sigma + 1) * sd
             axisXmax = mu + (options.sigma + 1) * sd
 
             if mn < axisXmin:

diff --git a/PyLTSpice/editor/asc_editor.py b/PyLTSpice/editor/asc_editor.py
@@ -24,7 +24,7 @@
 
 _logger = logging.getLogger("PyLTSpice.AscEditor")
 
-TEXT_REGEX = re.compile(r"TEXT (\d+)\s+(\d+)\s+(Left|Right|Top|Bottom)\s\d+\s*(?P<type>[!;])(?P<text>.*)",
+TEXT_REGEX = re.compile(r"TEXT (-?\d+)\s+(-?\d+)\s+(Left|Right|Top|Bottom)\s\d+\s*(?P<type>[!;])(?P<text>.*)",
                         re.IGNORECASE)
 TEXT_REGEX_X = 1
 TEXT_REGEX_Y = 2
@@ -158,7 +158,12 @@ def set_component_value(self, device: str, value: Union[str, int, float]) -> Non
             raise ComponentNotFoundError(f"Component {device} does not have a Value attribute")
 
     def set_element_model(self, element: str, model: str) -> None:
-        self.set_component_value(element, model)
+        comp_info = self.get_component_info(element)
+        line_no = comp_info['line']
+        tokens = self._asc_file_lines[line_no].split(' ')
+        tokens[1] = model
+        self._asc_file_lines[line_no] = ' '.join(tokens)
+        _logger.info(f"Component {element} updated to {model}")
 
     def get_component_value(self, element: str) -> str:
         comp_info = self.get_component_info(element)