test

Author: StephenNneji

rascal2/config.py

@@ -173,6 +173,7 @@ def __new__(cls):
             cls._instance.ready_event = mp.Event()
             cls._instance.close_event = mp.Event()
             cls._instance.engine_output = None
+            cls._instance.matlab_dir = ""
             cls._instance.__engine = None
             cls._instance.async_start()
 
@@ -230,7 +231,7 @@ def get_matlab_path(self):
                 lines = path_file.readlines()
                 if len(lines) == 4:
                     arch = {"x86_64": "maci64", "arm64": "maca64"}
-                    if platform.system() == "Darwin" and arch.get(platform.mac_ver()[-1]) != lines[0]:
+                    if platform.system() == "Darwin" and arch.get(platform.mac_ver()[-1]) != lines[0].strip():
                         # installed intel Matlab on ARM or vice versa
                         raise MatlabHelper.ConfigError("The installed MATLAB is incompatible, "
                                                        f"ensure the {platform.mac_ver()[-1]} version of "
@@ -247,4 +248,5 @@ def get_matlab_path(self):
             self.engine_output.append(ex)
             LOGGER.error(f"Attempt to read MATLAB _arch file failed {MATLAB_ARCH_FILE}.\n {ex}.")
 
-        return str(install_dir)
+        self.matlab_dir = str(install_dir)
+        return self.matlab_dir

rascal2/dialogs/settings_dialog.py

@@ -136,7 +136,7 @@ def __init__(self):
         label_layout.addWidget(QtWidgets.QLabel("Current Matlab Directory:"))
         label_layout.addStretch(1)
         self.matlab_path = QtWidgets.QLineEdit(self)
-        self.matlab_path.setText(MatlabHelper().get_matlab_path())
+        self.matlab_path.setText(MatlabHelper().matlab_dir)
         self.matlab_path.setReadOnly(True)
         self.matlab_path.setPlaceholderText("Select MATLAB directory")
         self.matlab_path.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)