diff options
| author | Rahul P | 2022-02-10 02:49:18 +0530 |
|---|---|---|
| committer | GitHub | 2022-02-10 02:49:18 +0530 |
| commit | a76d4c8ca1366b777dd8dff9802d793672abee38 (patch) | |
| tree | d1663906e4521ec4851ca6917ce6fb757bb3722a | |
| parent | b503d8722966f37c28b7753a2519eb2e9af4ad67 (diff) | |
| parent | df1d5af98c42f65d23dfd4867aaf2659e2c85045 (diff) | |
| download | eSim-a76d4c8ca1366b777dd8dff9802d793672abee38.tar.gz eSim-a76d4c8ca1366b777dd8dff9802d793672abee38.tar.bz2 eSim-a76d4c8ca1366b777dd8dff9802d793672abee38.zip | |
Merge pull request #187 from rahulp13/master
Cleaned up merge conflict messages
| -rwxr-xr-x | src/frontEnd/Application.py | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index d22f7ccc..cc69c2af 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -18,7 +18,6 @@ # ========================================================================= import os -import traceback # noqa:F401 import traceback if os.name == 'nt': # noqa @@ -557,23 +556,6 @@ class Application(QtWidgets.QMainWindow): if self.projDir is not None: - self.obj_Mainview.obj_dockarea.ngspiceEditor(self.projDir) - if self.obj_Mainview.obj_dockarea.ngspiceEditor( - self.projDir) is False: - print( - "No netlist (*.cir.out) file" - "Check netlist file to change simulation parameters." - ) - - self.msg = QtWidgets.QErrorMessage() - self.msg.setModal(True) - self.msg.setWindowTitle("Warning Message") - self.msg.showMessage( - 'No netlist (*.cir.out) file' - ) - self.msg.exec_() - return -======= # Edited by Sumanto Kar 25/08/2021 if self.obj_Mainview.obj_dockarea.ngspiceEditor( self.projDir) is False: @@ -581,7 +563,6 @@ class Application(QtWidgets.QMainWindow): "No netlist file (*.cir.out)" "Check netlist file to change simulation parameters." ) ->>>>>>> master self.msg = QtWidgets.QErrorMessage() self.msg.setModal(True) |