digsim-logic-simulator 0.10.0__py3-none-any.whl → 0.12.0__py3-none-any.whl

digsim/app/gui_objects/_buzzer_object.py

@@ -66,12 +66,7 @@ class BuzzerObject(ImageObjectWithActiveRect):
         self.audio_sink = None
         self._app_model.sig_audio_start.connect(self._audio_start)
         self._app_model.sig_audio_notify.connect(self._audio_notify)
-        self.device = None
-        devices = QMediaDevices.audioOutputs()
-        if len(devices) == 0:
-            return
-        self.device = devices[0]
-
+        self.device = QMediaDevices.defaultAudioOutput()
         self.audio_format = QAudioFormat()
         self.audio_format.setSampleRate(self.DATA_SAMPLE_RATE_HZ)
         self.audio_format.setChannelCount(1)

digsim/app/model/_model_settings.py

@@ -27,7 +27,7 @@ class ModelSettings:
 
     def from_dict(self, circuit_dict):
         """Get settings from circuit dict"""
-        for key, data in circuit_dict.get("settings", {}).items():
+        for key, data in circuit_dict.items():
             self._settings[key] = data
 
     def get(self, key):

digsim/synth/_synthesis.py

@@ -4,7 +4,9 @@
 """Helper module for yosys synthesis"""
 
 import json
+import pathlib
 import shutil
+import site
 import sys
 
 import pexpect
@@ -43,10 +45,30 @@ class Synthesis:
             out_lines.append(line)
         return out_lines
 
+    @staticmethod
+    def _find_win_yowasp_yosys_binary():
+        try:
+            # Use getusersitepackages if this is present, as it ensures that the
+            # value is initialised properly.
+            user_site = site.getusersitepackages()
+        except AttributeError:
+            user_site = site.USER_SITE
+        scripts_path = pathlib.Path(user_site).parent / "Scripts"
+        yowasp_yosys_path = scripts_path / "yowasp-yosys.exe"
+        if yowasp_yosys_path.is_file():
+            return str(yowasp_yosys_path)
+        return None
+
     @classmethod
     def _pexpect_spawn_yosys(cls):
+        # Find linux binary
         yosys_exe = shutil.which("yosys") or shutil.which("yowasp-yosys")
 
+        # No binary found
+        if yosys_exe is None:
+            # Try to find windows binary
+            yosys_exe = cls._find_win_yowasp_yosys_binary()
+
         if yosys_exe is None:
             raise SynthesisException("Yosys executable not found")
 

{digsim_logic_simulator-0.10.0.dist-info → digsim_logic_simulator-0.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: digsim-logic-simulator
-Version: 0.10.0
+Version: 0.12.0
 Summary: Interactive Digital Logic Simulator
 Author-email: Fredrik Andersson <freand@gmail.com>
 Maintainer-email: Fredrik Andersson <freand@gmail.com>

{digsim_logic_simulator-0.10.0.dist-info → digsim_logic_simulator-0.12.0.dist-info}/RECORD

@@ -9,7 +9,7 @@ digsim/app/gui/_utils.py,sha256=SSbe4B-trgZpaerPZilAaZYeqMOlFZMuufTth8KyOAg,660
 digsim/app/gui/_warning_dialog.py,sha256=N9G2wyQTyiqMnTtbExMzHgdbCBA0epfhNWY4GVF6xH8,1496
 digsim/app/gui_objects/__init__.py,sha256=DV7hnqz4Xcwk_-BiKrPxB31c7k-R4Oemmo_KOUjoQrQ,264
 digsim/app/gui_objects/_bus_bit_object.py,sha256=Q8oW-bAGLRAvR2-8PxyHL4M68FLKFgNpDiL4E7BPUOQ,3059
-digsim/app/gui_objects/_buzzer_object.py,sha256=p_7O361t98K6BIUxK6gHdfcSn2wUVXTRfnf7oQXSIK4,3352
+digsim/app/gui_objects/_buzzer_object.py,sha256=wD0nJ-0f6lj9jREPM0rH2HyncpIXJrr9oHgq33oHyO8,3252
 digsim/app/gui_objects/_component_context_menu.py,sha256=57M23M8Xb4t8eN8l9GQQ4AUBYZlEBjE0_a4d71yCDos,2821
 digsim/app/gui_objects/_component_object.py,sha256=zktprBWHR81LS2UPrQTyebzXIDQV_xIFavGQe0nCtDg,13144
 digsim/app/gui_objects/_component_port_item.py,sha256=Rxl952_3BCqM2H7TJDfbSTlalfFicDStrjqMUKEtdns,2089
@@ -53,7 +53,7 @@ digsim/app/model/_model.py,sha256=JE9-iJMxzgcY0r-4s708gDtA-aadw_hFSuERjKNZlfE,64
 digsim/app/model/_model_components.py,sha256=Q2iztl7MlWv_7vaa7me-dp-gOx6-7Tg3LZmTUQNBPrw,6371
 digsim/app/model/_model_new_wire.py,sha256=5HnF5-gtKtB1Tp6ZIF7QuNo5zEHmsUpnBEmj6ZllLiA,1810
 digsim/app/model/_model_objects.py,sha256=lqOjNIygIHT6Dq_PPa-D0B5elC49dB0KshF0ATzJZ0s,5217
-digsim/app/model/_model_settings.py,sha256=FewI3hm1iwbjPwdN3IeixuINPtamDORrTh1ANGRNwX8,1035
+digsim/app/model/_model_settings.py,sha256=BOwlwGT4h2R9tx7R5E1L4W0vli4GWh4RM77QBoqeKdw,1015
 digsim/app/model/_model_shortcuts.py,sha256=xrUgs2Y18mSVun3sxzVscYTZ6n5DJTTZOnFhs4Jt_0M,2439
 digsim/app/settings/__init__.py,sha256=0tkoBSYeJFFiUI8c_FqvqqyM4-_SU9Xq7mXCwiew5Oo,308
 digsim/app/settings/_component_settings.py,sha256=88D9OuEcFIlaqZozomWHSYrl7opz4jZW2e8xGuUyTpg,16287
@@ -95,11 +95,11 @@ digsim/storage_model/_app.py,sha256=Aer9s_mUBKSydsyeWYvVPHX2XF5ZGPuXq8z4PoXu8lA,
 digsim/storage_model/_circuit.py,sha256=NnaHLwqb9gAhqAxeZ1RkHHvoS_YJwixlz0xs-zmIrQU,3596
 digsim/synth/__init__.py,sha256=jhBHLOHf-vNa94Zg5q5dGcf0fgQTModfjUKtmUSffiw,180
 digsim/synth/__main__.py,sha256=wZWAzWsisoxA7hfqkKtu3H066uWyFajgPro2MEGlKbs,2173
-digsim/synth/_synthesis.py,sha256=ug9vSeTyZrvRCboNLL7dDIFVpGqH_ibr5fhOZJHpqUs,4271
+digsim/synth/_synthesis.py,sha256=n49Yc2Wzb49mZQt_WSpoJy2eUfSBnzv1hTxcOP60L74,5034
 digsim/utils/__init__.py,sha256=MT9TNcpa7fNAqtBsmCcceKMrUSU_v9xeJ6Nox_TL7Lo,191
 digsim/utils/_yosys_netlist.py,sha256=Lcuo9seKcDu4O-NdBpJUpExvTT7Rx1STCBtF0xT8Nkc,3843
-digsim_logic_simulator-0.10.0.dist-info/licenses/LICENSE.md,sha256=FrvohZfyfpH4xrvKdXiQ5hD7dUB7w4DcsRA3p-pOmLw,1693
-digsim_logic_simulator-0.10.0.dist-info/METADATA,sha256=Sjx2LJyb7CSKNkJVmT17qGyOmKOCtaFmeyKBdi6ip9U,4558
-digsim_logic_simulator-0.10.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-digsim_logic_simulator-0.10.0.dist-info/top_level.txt,sha256=qpCMzQKADZHVqZIoQgFrv3qJ3u7PPU73gTCXQglqLa8,7
-digsim_logic_simulator-0.10.0.dist-info/RECORD,,
+digsim_logic_simulator-0.12.0.dist-info/licenses/LICENSE.md,sha256=FrvohZfyfpH4xrvKdXiQ5hD7dUB7w4DcsRA3p-pOmLw,1693
+digsim_logic_simulator-0.12.0.dist-info/METADATA,sha256=JHxzVc7fjDmDB6q2d1oHCjiJLhTN3yih1G8c5ZxIw_I,4558
+digsim_logic_simulator-0.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+digsim_logic_simulator-0.12.0.dist-info/top_level.txt,sha256=qpCMzQKADZHVqZIoQgFrv3qJ3u7PPU73gTCXQglqLa8,7
+digsim_logic_simulator-0.12.0.dist-info/RECORD,,