common code for Win and Linux, merged py2 changes

5 files changed, 376 insertions, 237 deletions

diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 8973501d..6cb25e80 100644
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -12,11 +12,10 @@
 #        AUTHOR: Fahim Khan, fahim.elex@gmail.com
 #      MODIFIED: Rahul Paknikar, rahulp@iitb.ac.in
 #  ORGANIZATION: eSim team at FOSSEE, IIT Bombay.
-#       CREATED: Tuesday 24 Feb 2015 
-#      REVISION: Wednesday 18 Dec 2019
+#       CREATED: Tuesday 24 February 2015 
+#      REVISION: Friday 14 February 2020
 # =========================================================================
 
-
 import pathmagic  # noqa
 from PyQt4 import QtGui, QtCore
 from configuration.Appconfig import Appconfig
@@ -32,11 +31,12 @@ import time
 from PyQt4.Qt import QSize
 import sys
 import os
+import shutil
 
 
 # Its our main window of application.
 class Application(QtGui.QMainWindow):
-    """This class initializes all objects used in this file(Application.py)."""
+    """This class initializes all objects used in this file."""
     global project_name
 
     def __init__(self, *args):
@@ -45,6 +45,9 @@ class Application(QtGui.QMainWindow):
         # Calling __init__ of super class
         QtGui.QMainWindow.__init__(self, *args)
 
+        #Flag for mode of operation. Default is set to offline mode.
+        self.online_flag = False
+                
         # Creating require Object
         self.obj_workspace = Workspace.Workspace()
         self.obj_Mainview = MainView()
@@ -62,57 +65,64 @@ class Application(QtGui.QMainWindow):
         self.setWindowTitle(self.obj_appconfig._APPLICATION)
         self.showMaximized()
         self.setWindowIcon(QtGui.QIcon('../../images/logo.png'))
-        # self.show()
+
         self.systemTrayIcon = QtGui.QSystemTrayIcon(self)
         self.systemTrayIcon.setIcon(QtGui.QIcon('../../images/logo.png'))
         self.systemTrayIcon.setVisible(True)
 
-    # This function initializes Tool Bars
     def initToolBar(self):
         """
-        In this function we are setting icons, short-cuts,and
-        defining functonality for:
-
-            - Top-tool-bar (New project, Open project, Close project,\
-                Help option )
-            - Left-tool-bar (Open Schematic, Convert KiCad to NgSpice,\
-                Simuation, Model Editor, Subcircuit, NGHDL, Modelica\
-                Converter, OM Optimisation )
+        This function initializes Tool Bars.
+        It setups the icons, short-cuts and defining functonality for:
+
+            - Top-tool-bar (New project, Open project, Close project, \
+                Mode switch, Help option)
+            - Left-tool-bar (Open Schematic, Convert KiCad to NgSpice, \
+                Simuation, Model Editor, Subcircuit, NGHDL, Modelica \
+                Converter, OM Optimisation)
         """
         # Top Tool bar
         self.newproj = QtGui.QAction(
             QtGui.QIcon('../../images/newProject.png'),
-            '<b>New Project</b>',
-            self)
+            '<b>New Project</b>', self
+        )
         self.newproj.setShortcut('Ctrl+N')
         self.newproj.triggered.connect(self.new_project)
-        # self.newproj.connect(self.newproj, QtCore.SIGNAL('triggered()'),
-        #                      self, QtCore.SLOT(self.new_project()))
 
         self.openproj = QtGui.QAction(
             QtGui.QIcon('../../images/openProject.png'),
-            '<b>Open Project</b>',
-            self)
+            '<b>Open Project</b>', self
+        )
         self.openproj.setShortcut('Ctrl+O')
         self.openproj.triggered.connect(self.open_project)
 
         self.closeproj = QtGui.QAction(
             QtGui.QIcon('../../images/closeProject.png'),
-            '<b>Close Project</b>',
-            self)
+            '<b>Close Project</b>', self
+        )
         self.closeproj.setShortcut('Ctrl+X')
         self.closeproj.triggered.connect(self.close_project)
 
+        self.switchmode = QtGui.QAction(
+            QtGui.QIcon('../../images/disable.png'),
+            '<b>Mode switching has been disabled. Relaunch ' +
+            'eSim to fix any config issues</b>', self
+        )
+        self.validate_mode()
+        self.switchmode.setShortcut('Ctrl+G')
+        self.switchmode.triggered.connect(self.change_mode)
+
         self.helpfile = QtGui.QAction(
-            QtGui.QIcon('../../images/helpProject.png'), '<b>Help</b>', self)
+            QtGui.QIcon('../../images/helpProject.png'), '<b>Help</b>', self
+        )
         self.helpfile.setShortcut('Ctrl+H')
         self.helpfile.triggered.connect(self.help_project)
 
         self.topToolbar = self.addToolBar('Top Tool Bar')
         self.topToolbar.addAction(self.newproj)
         self.topToolbar.addAction(self.openproj)
-
         self.topToolbar.addAction(self.closeproj)
+        self.topToolbar.addAction(self.switchmode)
         self.topToolbar.addAction(self.helpfile)
 
         # This part is setting fossee logo to the right
@@ -125,9 +135,8 @@ class Application(QtGui.QMainWindow):
         self.logo = QtGui.QLabel()
         self.logopic = QtGui.QPixmap(
             os.path.join(
-                os.path.abspath('../..'),
-                'images',
-                'fosseeLogo.png'))
+                os.path.abspath('../..'), 'images', 'fosseeLogo.png'
+            ))
         self.logopic = self.logopic.scaled(
             QSize(150, 150), QtCore.Qt.KeepAspectRatio)
         self.logo.setPixmap(self.logopic)
@@ -137,50 +146,48 @@ class Application(QtGui.QMainWindow):
         # Left Tool bar Action Widget
         self.kicad = QtGui.QAction(
             QtGui.QIcon('../../images/kicad.png'),
-            '<b>Open Schematic</b>',
-            self)
+            '<b>Open Schematic</b>', self
+        )
         self.kicad.triggered.connect(self.obj_kicad.openSchematic)
 
         self.conversion = QtGui.QAction(
             QtGui.QIcon('../../images/ki-ng.png'),
-            '<b>Convert Kicad to Ngspice</b>',
-            self)
+            '<b>Convert Kicad to Ngspice</b>', self
+        )
         self.conversion.triggered.connect(self.obj_kicad.openKicadToNgspice)
 
         self.ngspice = QtGui.QAction(
-            QtGui.QIcon('../../images/ngspice.png'),
-            '<b>Simulation</b>',
-            self)
+            QtGui.QIcon('../../images/ngspice.png'), '<b>Simulation</b>', self
+        )
         self.ngspice.triggered.connect(self.open_ngspice)
 
         self.model = QtGui.QAction(
             QtGui.QIcon('../../images/model.png'),
-            '<b>Model Editor</b>',
-            self)
+            '<b>Model Editor</b>', self
+        )
         self.model.triggered.connect(self.open_modelEditor)
 
         self.subcircuit = QtGui.QAction(
             QtGui.QIcon('../../images/subckt.png'),
-            '<b>Subcircuit</b>',
-            self)
+            '<b>Subcircuit</b>', self
+        )
         self.subcircuit.triggered.connect(self.open_subcircuit)
 
         self.nghdl = QtGui.QAction(
-            QtGui.QIcon('../../images/nghdl.png'),
-            '<b>Nghdl</b>',
-            self)
+            QtGui.QIcon('../../images/nghdl.png'), '<b>Nghdl</b>', self
+        )
         self.nghdl.triggered.connect(self.open_nghdl)
 
         self.omedit = QtGui.QAction(
             QtGui.QIcon('../../images/omedit.png'),
-            '<b>Modelica Converter</b>',
-            self)
+            '<b>Modelica Converter</b>', self
+        )
         self.omedit.triggered.connect(self.open_OMedit)
 
         self.omoptim = QtGui.QAction(
             QtGui.QIcon('../../images/omoptim.png'),
-            '<b>OM Optimisation</b>',
-            self)
+            '<b>OM Optimisation</b>', self
+        )
         self.omoptim.triggered.connect(self.open_OMoptim)
 
         # Adding Action Widget to tool bar
@@ -197,30 +204,30 @@ class Application(QtGui.QMainWindow):
         self.lefttoolbar.setOrientation(QtCore.Qt.Vertical)
         self.lefttoolbar.setIconSize(QSize(40, 40))
 
-    # This function closes the ongoing program(process).
     def closeEvent(self, event):
         '''
-        When exit button is pressed a Message box pops out with
+        This function closes the ongoing program (process).
+        When exit button is pressed a Message box pops out with \
         exit message and buttons 'Yes', 'No'.
 
             1. If 'Yes' is pressed:
-                - it checks that program(process) in procThread_list\
-                    (list made in Appconfig.py):
+                - check that program (process) in procThread_list \
+                  (a list made in Appconfig.py):
 
-                    - if available it terminates that program
-                    - if the program(process) is not available,\
-                        it checks for it
-                      in process_obj (list made in Appconfig.py) if found it
-                      closes the program.
+                    - if available it terminates that program.
+                    - if the program (process) is not available, \
+                      then check it in process_obj (a list made in \
+                      Appconfig.py) and if found, it closes the program.
 
             2. If 'No' is pressed:
                 - the program just continues as it was doing earlier.
         '''
-        exit_msg = "Are you sure you want to exit the program?" \
-            " All unsaved data will be lost."
+        exit_msg = "Are you sure you want to exit the program?"
+        exit_msg += " All unsaved data will be lost."
         reply = QtGui.QMessageBox.question(
             self, 'Message', exit_msg, QtGui.QMessageBox.Yes,
-            QtGui.QMessageBox.No)
+            QtGui.QMessageBox.No
+        )
 
         if reply == QtGui.QMessageBox.Yes:
             for proc in self.obj_appconfig.procThread_list:
@@ -236,8 +243,9 @@ class Application(QtGui.QMainWindow):
                         pass
             except BaseException:
                 pass
-            # Just checking if open project and New project window is open. If
-            # yes just close it when application is closed
+
+            # Check if "Open project" and "New project" window is open.
+            # If yes, just close it when application is closed.
             try:
                 self.project.close()
             except BaseException:
@@ -248,15 +256,48 @@ class Application(QtGui.QMainWindow):
         elif reply == QtGui.QMessageBox.No:
             event.ignore()
 
-    # This function closes the saved project.
+    def new_project(self):
+        """This function call New Project Info class."""
+        text, ok = QtGui.QInputDialog.getText(
+            self, 'New Project Info', 'Enter Project Name:'
+        )
+        if ok:
+            self.projname = (str(text))
+            self.project = NewProjectInfo()
+            directory, filelist = self.project.createProject(self.projname)
+            self.obj_Mainview.obj_projectExplorer.addTreeNode(
+                directory, filelist)
+        else:
+            print("No new project created")
+            self.obj_appconfig.print_info('No new project created')
+            try:
+                self.obj_appconfig.print_info(
+                    'Current project is : ' +
+                    self.obj_appconfig.current_project["ProjectName"]
+                )
+            except BaseException:
+                pass
+
+    def open_project(self):
+        """This project call Open Project Info class."""
+        print("Function : Open Project")
+        self.project = OpenProjectInfo()
+        try:
+            directory, filelist = self.project.body()
+            self.obj_Mainview.obj_projectExplorer.addTreeNode(
+                directory, filelist)
+        except BaseException:
+            pass
+
     def close_project(self):
         """
-        This function first checks whether project(file) is present in list.
+        This function closes the saved project.
+        It first checks whether project (file) is present in list.
 
             - If present:
                 - it first kills that process-id.
                 - closes that file.
-                - Shows message "Current project <path of file> is closed"
+                - Shows message "Current project <path_to_file> is closed"
 
             - If not present: pass
         """
@@ -274,60 +315,155 @@ class Application(QtGui.QMainWindow):
             self.obj_Mainview.obj_dockarea.closeDock()
             self.obj_appconfig.current_project['ProjectName'] = None
             self.systemTrayIcon.showMessage(
-                'Close',
-                'Current project ' +
-                os.path.basename(current_project) +
-                ' is Closed.')
-
-    # This function call New Project Info class.
-    def new_project(self):
-        text, ok = QtGui.QInputDialog.getText(
-            self, 'New Project Info', 'Enter Project Name:')
-        if ok:
-            self.projname = (str(text))
-            self.project = NewProjectInfo()
-            directory, filelist = self.project.createProject(self.projname)
+                'Close', 'Current project ' +
+                os.path.basename(current_project) + ' is Closed.'
+            )
 
-            self.obj_Mainview.obj_projectExplorer.addTreeNode(
-                directory, filelist)
+    def validate_mode(self):
+        """
+        This function is used for checking fp-lib-tables file.
+        If not than copy from supportFiles folder.
+        First it will check path for kicad folder is present or not. if present
+            1) it will check fp-lib-table file is present or not.
+                - If not present
+                    - Than copy form SourceFile folder
+            2) it will check for both file,
+               i.e online and offline file is present or not.
+                - If both are present
+                    -Than remove offline.
+            3) it will check wich file is present
+                - If fp-lib-table-offline is present
+                    - Than online mode will set and used
+                - If fp-lib-table-online is present
+                    - Than offline mode wiil set and used
+                - If both file are not present
+                    -Than copy fp-lib-table from source file
+        Otherwise the disable icon is set and feature is disabled.
+        """
 
+        if self.obj_appconfig.kicad_path is not None:
+            # -----------------------------------------------------
+            # fp-lib-table is not there than copy from supportFiles/
+            if not os.path.exists(
+                self.obj_appconfig.kicad_path + "/fp-lib-table"):
+                shutil.copy('../supportFiles/fp-lib-table' ,
+                    self.obj_appconfig.kicad_path + "/")
+            # -----------------------------------------------------
+            """checking online and offline both file's are avaliable.
+            if yes than remove offline file."""
+            if os.path.exists(self.obj_appconfig.kicad_path +
+                     "/fp-lib-table-offline") and os.path.exists(
+                self.obj_appconfig.kicad_path +
+                    "/fp-lib-table-online"):
+                     os.remove(self.obj_appconfig.kicad_path +
+                        "/fp-lib-table-offline")
+            # -----------------------------------------------------
+            # This ladder is used for checking which file is present.
+            if os.path.exists(self.obj_appconfig.kicad_path +
+                     "/fp-lib-table-offline"):
+                self.switchmode = QtGui.QAction(
+                    QtGui.QIcon('../../images/online.png'),
+                    '<b>Go Offline</b>',self)
+                self.online_flag = True
+
+            elif os.path.exists(self.obj_appconfig.kicad_path +
+                    "/fp-lib-table-online"):
+                self.switchmode = QtGui.QAction(
+                    QtGui.QIcon('../../images/offline.png'),
+                    '<b>Go Online</b>',self)
+                self.online_flag = False
+            else:
+                # if online and offline is not avaliable
+                shutil.copy('../supportFiles/fp-lib-table-online' ,
+                        self.obj_appconfig.kicad_path + "/")
+                if os.path.exists(self.obj_appconfig.kicad_path +
+                        "/fp-lib-table-online"):
+                    self.switchmode = QtGui.QAction(
+                        QtGui.QIcon('../../images/offline.png'),
+                        '<b>Go Online</b>',self)
+                    self.online_flag = False
+            #----------------------------------------------------
         else:
-            print("No new project created")
-            self.obj_appconfig.print_info('No new project created')
-            try:
-                self.obj_appconfig.print_info(
-                    'Current project is : ' +
-                    self.obj_appconfig.current_project["ProjectName"])
-            except BaseException:
-                pass
+            # if path is not found
+            self.switchmode = QtGui.QAction(QtGui.QIcon(
+                '../../images/disable.png'),
+                '<b>Mode switching has been disabled. Relaunch ' +
+                'eSim to fix any config issues</b>', self)
 
-    # This project call Open Project Info class
-    def open_project(self):
-        print("Function : Open Project")
-        self.project = OpenProjectInfo()
-
-        try:
-            directory, filelist = self.project.body()
-            self.obj_Mainview.obj_projectExplorer.addTreeNode(
-                directory, filelist)
-        except BaseException:
-            pass
+    def change_mode(self):
+        """
+        This function is used for changing mode of operation for KiCad. \
+        There are three modes of operation : 
+            - online 
+            - offline
+            - disable
+        
+        It will check whether kicad config path is present or not.
+            - If path is available and none of the KiCad tools \
+              (associated with eSim) are open, then depending on \
+              online_flag, it will swap appropriate fp-lib-table files.
+            - If any of the KiCad tools (associated with eSim) is open, \
+              then ask user to close all these tools.
+            - And if path is not found, then disable this feature.
+
+        @paramas
+
+        @return
+            None
+        """
+        if self.obj_appconfig.kicad_path is not None:
+            try:
+                if not self.obj_kicad.check_open_schematic():
+                    if self.online_flag:
+                        os.rename(
+                            self.obj_appconfig.kicad_path + "/fp-lib-table",
+                            self.obj_appconfig.kicad_path + "/fp-lib-table-online"
+                        )
+                        os.rename(
+                            self.obj_appconfig.kicad_path + "/fp-lib-table-offline",
+                            self.obj_appconfig.kicad_path + "/fp-lib-table"
+                        )
+                        self.switchmode.setIcon(QtGui.QIcon('../../images/offline.png'))
+                        self.switchmode.setText('<b>Go Online</b>')
+                        self.online_flag = False
+                    else:
+                        os.rename(
+                            self.obj_appconfig.kicad_path + "/fp-lib-table",
+                            self.obj_appconfig.kicad_path + "/fp-lib-table-offline")
+                        os.rename(
+                            self.obj_appconfig.kicad_path + "/fp-lib-table-online",
+                            self.obj_appconfig.kicad_path + "/fp-lib-table")
+                        self.switchmode.setIcon(QtGui.QIcon('../../images/online.png'))
+                        self.switchmode.setText('<b>Go Offline</b>')
+                        self.online_flag = True
+                else:
+                    self.msg = QtGui.QErrorMessage()
+                    self.msg.showMessage('Please save and close all the Kicad'
+                        'Windows first, and then change the online-offline mode')
+                    self.msg.setWindowTitle("Error Message")
+            except:
+                self.validate_mode()
+        else:
+            self.info_msg = QtGui.QMessageBox.critical(self,
+                            'Message',
+                            "Please make sure kicad_folder_file is " +
+                            "present in supportFiles folder.")
 
-    # This page opens usermanual in dockarea.
     def help_project(self):
         """
-        - It prints the message ""Function : Help""
-        - Uses print_info() method of class Appconfig
-          from Configuration/Appconfig.py file.
-        - Call method usermanual() from ./DockArea.py.
+        This function opens usermanual in dockarea.
+            - It prints the message ""Function : Help""
+            - Uses print_info() method of class Appconfig
+              from Configuration/Appconfig.py file.
+            - Call method usermanual() from ./DockArea.py.
         """
         print("Function : Help")
         self.obj_appconfig.print_info('Help is called')
         print("Current Project is : ", self.obj_appconfig.current_project)
         self.obj_Mainview.obj_dockarea.usermanual()
 
-    # This Function execute ngspice on current project.
     def open_ngspice(self):
+        """This Function execute ngspice on current project."""
         self.projDir = self.obj_appconfig.current_project["ProjectName"]
 
         if self.projDir is not None:
@@ -342,37 +478,39 @@ class Application(QtGui.QMainWindow):
                         break
                 except Exception:
                     pass
-                time.sleep(0.2)
+                time.sleep(0.5)
 
                 # Fail Safe ===>
                 count += 1
                 if count >= 100:
                     raise Exception(
-                        "ngspice taking too long, check netlist file")
+                        "Ngspice taking too long for simulation. "
+                        "Check netlist file to change simulation parameters."
+                    )
 
             # Calling Python Plotting
-
             try:
                 self.obj_Mainview.obj_dockarea.plottingEditor()
             except Exception as e:
                 self.msg = QtGui.QErrorMessage(None)
                 self.msg.showMessage(
                     'Error while opening python plotting Editor.'
-                    ' Please look at console for more details')
+                    ' Please look at console for more details.'
+                )
                 print("Exception Message:", str(e))
                 self.obj_appconfig.print_error('Exception Message : ' + str(e))
                 self.msg.setWindowTitle("Error Message")
-
         else:
             self.msg = QtGui.QErrorMessage()
             self.msg.showMessage(
                 'Please select the project first.'
-                ' You can either create new project or open existing project')
+                ' You can either create new project or open existing project'
+            )
             self.msg.setWindowTitle("Error Message")
 
-    # This function opens 'subcircuit' option in left-tool-bar.
     def open_subcircuit(self):
         """
+        This function opens 'subcircuit' option in left-tool-bar.
         When 'subcircuit' icon is clicked wich is present in
         left-tool-bar of main page:
 
@@ -384,36 +522,34 @@ class Application(QtGui.QMainWindow):
         self.obj_appconfig.print_info('Subcircuit editor is called')
         self.obj_Mainview.obj_dockarea.subcircuiteditor()
 
-    # This function calls NGHDl option in left-tool-bar.
     def open_nghdl(self):
         """
-        This function uses validateTool() method from
-        Validation.py:
+        This function calls NGHDL option in left-tool-bar.
+        It uses validateTool() method from Validation.py:
 
             - If 'nghdl' is present in executables list then
-              it adds passes command 'nghdl -e' to WorkerThread class of
+              it passes command 'nghdl -e' to WorkerThread class of
               Worker.py.
-            - If 'nghdl' not present then it shows error message.
+            - If 'nghdl' is not present, then it shows error message.
         """
-        print("Function : Nghdl")
-        self.obj_appconfig.print_info('Nghdl is called')
+        print("Function : NGHDL")
+        self.obj_appconfig.print_info('NGHDL is called')
 
         if self.obj_validation.validateTool('nghdl'):
             self.cmd = 'nghdl -e'
             self.obj_workThread = Worker.WorkerThread(self.cmd)
             self.obj_workThread.start()
-
         else:
             self.msg = QtGui.QErrorMessage(None)
-            self.msg.showMessage('Error while opening nghdl.\
-                Please make sure nghdl is installed')
-            self.obj_appconfig.print_error('Error while opening nghdl.\
-                Please make sure nghdl is installed')
-            self.msg.setWindowTitle('nghdl Error Message')
+            self.msg.showMessage('Error while opening NGHDL. ' +
+                'Please make sure it is installed')
+            self.obj_appconfig.print_error('Error while opening NGHDL. ' +
+                'Please make sure it is installed')
+            self.msg.setWindowTitle('NGHDL Error')
 
-    # This function opens model editor option in left-tool-bar.
     def open_modelEditor(self):
         """
+        This function opens model editor option in left-tool-bar.
         When model editor icon is clicked which is present in
         left-tool-bar of main page:
 
@@ -425,19 +561,22 @@ class Application(QtGui.QMainWindow):
         self.obj_appconfig.print_info('Model editor is called')
         self.obj_Mainview.obj_dockarea.modelEditor()
 
-    # This function call ngspice to OM edit converter
-    # and then launch OM edit.
     def open_OMedit(self):
-        self.obj_appconfig.print_info('OM edit is called')
+        """
+        This function calls ngspice to OMEdit converter and then launch OMEdit.
+        """
+        self.obj_appconfig.print_info('OMEdit is called')
         self.projDir = self.obj_appconfig.current_project["ProjectName"]
 
         if self.projDir is not None:
             if self.obj_validation.validateCirOut(self.projDir):
                 self.projName = os.path.basename(self.projDir)
                 self.ngspiceNetlist = os.path.join(
-                    self.projDir, self.projName + ".cir.out")
+                    self.projDir, self.projName + ".cir.out"
+                )
                 self.modelicaNetlist = os.path.join(
-                    self.projDir, self.projName + ".mo")
+                    self.projDir, self.projName + ".mo"
+                )
 
                 """
                 try:
@@ -487,31 +626,29 @@ class Application(QtGui.QMainWindow):
             else:
                 self.msg = QtGui.QErrorMessage()
                 self.msg.showMessage(
-                    'Current project does not contain any ngspice file.\
-                        Please create ngspice file with extension .cir.out')
+                    'Current project does not contain any Ngspice file. ' +
+                    'Please create Ngspice file with extension .cir.out'
+                )
                 self.msg.setWindowTitle("Missing Ngspice netlist")
         else:
             self.msg = QtGui.QErrorMessage()
             self.msg.showMessage(
-                'Please select the project first.\
-                    You can either create new project\
-                        or open existing project')
+                'Please select the project first. ' +
+                'You can either create a new project or open existing project'
+            )
             self.msg.setWindowTitle("Error Message")
 
-    # sdf
     def open_OMoptim(self):
         """
-        This function uses validateTool() method from
-        Validation.py:
+        This function uses validateTool() method from Validation.py:
 
             - If 'OMOptim' is present in executables list then
-              it adds passes command 'OMOptim' to WorkerThread class of
-              Worker.py.
-            - If 'OMOptim' not present then it shows error message with
+              it passes command 'OMOptim' to WorkerThread class of Worker.py
+            - If 'OMOptim' is not present, then it shows error message with
               link to download it on Linux and Windows.
         """
-        print("Function : OM Optim")
-        self.obj_appconfig.print_info('OM Optim is called')
+        print("Function : OMOptim")
+        self.obj_appconfig.print_info('OMOptim is called')
         # Check if OMOptim is installed
         if self.obj_validation.validateTool("OMOptim"):
             # Creating a command to run
@@ -531,7 +668,7 @@ class Application(QtGui.QMainWindow):
                 "To install it on Windows : Go to <a href="
                 "https://www.openmodelica.org/download/download-windows"
                 ">OpenModelica Windows</a> and install latest version.<br/>"
-                )
+            )
             self.msg.setTextFormat(QtCore.Qt.RichText)
             self.msg.setText(self.msgContent)
             self.msg.setWindowTitle("Error Message")
@@ -545,14 +682,11 @@ class MainView(QtGui.QWidget):
     This class defines whole view and style of main page:
 
         - Position of tool bars:
-
-         - Top tool bar.
-         - Left tool bar.
-
+            - Top tool bar.
+            - Left tool bar.
         - Project explorer Area.
         - Dock area.
         - Console area.
-
     """
 
     def __init__(self, *args):
@@ -606,7 +740,7 @@ class MainView(QtGui.QWidget):
         self.setLayout(self.mainLayout)
 
 
-# It is main function of the module.It starts the application
+# It is main function of the module and starts the application
 def main(args):
     """
     The splash screen opened at the starting of screen is performed
@@ -628,8 +762,6 @@ def main(args):
 
 
 # Call main function
-
-
 if __name__ == '__main__':
     # Create and display the splash screen
     main(sys.argv)
diff --git a/src/frontEnd/DockArea.py b/src/frontEnd/DockArea.py
index db706fa7..9824a307 100644
--- a/src/frontEnd/DockArea.py
+++ b/src/frontEnd/DockArea.py
@@ -14,6 +14,7 @@ dockList = ['Welcome']
 count = 1
 dock = {}
 
+
 class DockArea(QtGui.QMainWindow):
     """
     This class contains function for designing UI of all the editors
@@ -22,8 +23,8 @@ class DockArea(QtGui.QMainWindow):
         - Test Editor.
         - Model Editor.
         - Python Plotting.
-        - NgSpice Editor.
-        - Kicad to NgSpice Editor.
+        - Ngspice Editor.
+        - Kicad to Ngspice Editor.
         - Subcircuit Editor.
         - Modelica editor.
     """
@@ -53,8 +54,9 @@ class DockArea(QtGui.QMainWindow):
         self.show()
 
     def createTestEditor(self):
-        """This function create widget for Library Editor."""
+        """This function create widget for Library Editor"""
         global count
+                
         self.testWidget = QtGui.QWidget()
         self.testArea = QtGui.QTextEdit()
         self.testLayout = QtGui.QVBoxLayout()
@@ -74,16 +76,18 @@ class DockArea(QtGui.QMainWindow):
 
         dock['Tips-' + str(count)].raise_()
 
-        # temp = self.obj_appconfig.current_project['ProjectName']
-        # self.obj_appconfig.dock_dict[temp].append(
-        #     dock['Tips-' + str(count)])
+        temp = self.obj_appconfig.current_project['ProjectName']
+        if temp:
+            self.obj_appconfig.dock_dict[temp].append(
+                dock['Tips-' + str(count)]
+            )
         count = count + 1
 
     def plottingEditor(self):
-        """This function create widget for interactive PythonPlotting"""
+        """This function create widget for interactive PythonPlotting."""
         self.projDir = self.obj_appconfig.current_project["ProjectName"]
         self.projName = os.path.basename(self.projDir)
-        # self.project = os.path.join(self.projDir,self.projName)
+        # self.project = os.path.join(self.projDir, self.projName)
 
         global count
         self.plottingWidget = QtGui.QWidget()
@@ -104,13 +108,15 @@ class DockArea(QtGui.QMainWindow):
         dock['Plotting-' + str(count)].setFocus()
         dock['Plotting-' + str(count)].raise_()
 
-        # temp = self.obj_appconfig.current_project['ProjectName']
-        # self.obj_appconfig.dock_dict[temp].append(
-        #     dock['Plotting-' + str(count)])
+        temp = self.obj_appconfig.current_project['ProjectName']
+        if temp:
+            self.obj_appconfig.dock_dict[temp].append(
+                dock['Plotting-' + str(count)]
+            )
         count = count + 1
 
     def ngspiceEditor(self, projDir):
-        """Sdf."""
+        """ This function creates widget for Ngspice window."""
         self.projDir = projDir
         self.projName = os.path.basename(self.projDir)
         self.ngspiceNetlist = os.path.join(
@@ -121,9 +127,8 @@ class DockArea(QtGui.QMainWindow):
 
         self.ngspiceLayout = QtGui.QVBoxLayout()
         self.ngspiceLayout.addWidget(
-            NgspiceWidget(
-                self.ngspiceNetlist,
-                self.projDir))
+            NgspiceWidget(self.ngspiceNetlist, self.projDir)
+        )
 
         # Adding to main Layout
         self.ngspiceWidget.setLayout(self.ngspiceLayout)
@@ -143,9 +148,12 @@ class DockArea(QtGui.QMainWindow):
         dock['NgSpice-' + str(count)].setVisible(True)
         dock['NgSpice-' + str(count)].setFocus()
         dock['NgSpice-' + str(count)].raise_()
-        # temp = self.obj_appconfig.current_project['ProjectName']
-        # self.obj_appconfig.dock_dict[temp].append(
-        #     dock['NgSpice-' + str(count)])
+        
+        temp = self.obj_appconfig.current_project['ProjectName']
+        if temp:
+            self.obj_appconfig.dock_dict[temp].append(
+                dock['NgSpice-' + str(count)]
+            )
         count = count + 1
 
     def modelEditor(self):
@@ -178,15 +186,11 @@ class DockArea(QtGui.QMainWindow):
         dock['Model Editor-' + str(count)].setFocus()
         dock['Model Editor-' + str(count)].raise_()
 
-        # temp = self.obj_appconfig.current_project['ProjectName']
-        # self.obj_appconfig.dock_dict[temp].append(
-        #     dock['Model Editor-' + str(count)])
         count = count + 1
 
     def kicadToNgspiceEditor(self, clarg1, clarg2=None):
         """
-        This function is creating Editor UI for-
-        Kicad to Ngspice conversion.
+        This function is creating Editor UI for Kicad to Ngspice conversion.
         """
         global count
         self.kicadToNgspiceWidget = QtGui.QWidget()
@@ -212,10 +216,13 @@ class DockArea(QtGui.QMainWindow):
         dock['kicadToNgspice-' + str(count)].setVisible(True)
         dock['kicadToNgspice-' + str(count)].setFocus()
         dock['kicadToNgspice-' + str(count)].raise_()
+        dock['kicadToNgspice-' + str(count)].activateWindow()
 
-        # temp = self.obj_appconfig.current_project['ProjectName']
-        # self.obj_appconfig.dock_dict[temp].append(
-        #     dock['kicadToNgspice-' + str(count)])
+        temp = self.obj_appconfig.current_project['ProjectName']
+        if temp:
+            self.obj_appconfig.dock_dict[temp].append(
+                dock['kicadToNgspice-' + str(count)]
+            )
         count = count + 1
 
     def subcircuiteditor(self):
@@ -244,12 +251,10 @@ class DockArea(QtGui.QMainWindow):
         dock['Subcircuit-' + str(count)].setFocus()
         dock['Subcircuit-' + str(count)].raise_()
 
-        # temp = self.obj_appconfig.current_project['ProjectName']
-        # self.obj_appconfig.dock_dict[temp].append(
-        #     dock['Subcircuit-' + str(count)])
         count = count + 1
 
     def usermanual(self):
+        """This function creates a widget for user manual."""
         global count
         self.usermanualWidget = QtGui.QWidget()
         self.usermanualLayout = QtGui.QVBoxLayout()
@@ -277,7 +282,7 @@ class DockArea(QtGui.QMainWindow):
         count = count + 1
 
     def modelicaEditor(self, projDir):
-        """Dfg."""
+        """This function sets up the UI for ngspice to modelica conversion."""
         global count
         self.modelicaWidget = QtGui.QWidget()
         self.modelicaLayout = QtGui.QVBoxLayout()
@@ -300,9 +305,11 @@ class DockArea(QtGui.QMainWindow):
         .QWidget { border-radius: 15px; border: 1px solid gray;\
             padding: 5px; width: 200px; height: 150px;  } \
         ")
-        # temp = self.obj_appconfig.current_project['ProjectName']
-        # self.obj_appconfig.dock_dict[temp].append(
-        #     dock['Modelica-' + str(count)])
+        temp = self.obj_appconfig.current_project['ProjectName']
+        if temp:
+            self.obj_appconfig.dock_dict[temp].append(
+                dock['Modelica-' + str(count)]
+            )
 
         count = count + 1
 
diff --git a/src/frontEnd/ProjectExplorer.py b/src/frontEnd/ProjectExplorer.py
index 09e756af..1557d450 100644
--- a/src/frontEnd/ProjectExplorer.py
+++ b/src/frontEnd/ProjectExplorer.py
@@ -35,6 +35,8 @@ class ProjectExplorer(QtGui.QWidget):
 
         # CSS
         self.treewidget.setStyleSheet(" \
+            QTreeView { border-radius: 15px; border: 1px \
+            solid gray; padding: 5px; width: 200px; height: 150px;  }\
             QTreeView::branch:has-siblings:!adjoins-item { \
             border-image: url(../../images/vline.png) 0;} \
             QTreeView::branch:has-siblings:adjoins-item { \
@@ -61,7 +63,8 @@ class ProjectExplorer(QtGui.QWidget):
                 )
                 for files in children:
                     QtGui.QTreeWidgetItem(
-                        parentnode, [files, os.path.join(parents, files)])
+                        parentnode, [files, os.path.join(parents, files)]
+                    )
         self.window.addWidget(self.treewidget)
 
         self.treewidget.doubleClicked.connect(self.openProject)
@@ -74,7 +77,8 @@ class ProjectExplorer(QtGui.QWidget):
         os.path.join(parents)
         pathlist = parents.split(os.sep)
         parentnode = QtGui.QTreeWidgetItem(
-            self.treewidget, [pathlist[-1], parents])
+            self.treewidget, [pathlist[-1], parents]
+        )
         for files in children:
             QtGui.QTreeWidgetItem(
                 parentnode, [files, os.path.join(parents, files)]
@@ -90,7 +94,6 @@ class ProjectExplorer(QtGui.QWidget):
         ) = []
 
     def openMenu(self, position):
-
         indexes = self.treewidget.selectedIndexes()
         if len(indexes) > 0:
             level = 0
@@ -117,9 +120,8 @@ class ProjectExplorer(QtGui.QWidget):
         self.indexItem = self.treewidget.currentIndex()
         filename = str(self.indexItem.data())
         self.filePath = str(
-            self.indexItem.sibling(
-                self.indexItem.row(),
-                1).data())
+            self.indexItem.sibling(self.indexItem.row(), 1).data()
+        )
         self.obj_appconfig.print_info(
             'The current project is ' + self.filePath)
 
@@ -132,16 +134,15 @@ class ProjectExplorer(QtGui.QWidget):
         self.save = QtGui.QPushButton('Save and Exit')
         self.save.setDisabled(True)
         self.windowgrid = QtGui.QGridLayout()
-        # if (os.path.isfile(str(self.filePath))) == True:
+
         if (os.path.isfile(str(self.filePath))):
             self.fopen = open(str(self.filePath), 'r')
             lines = self.fopen.read()
             self.text.setText(lines)
 
             QtCore.QObject.connect(
-                self.text,
-                QtCore.SIGNAL("textChanged()"),
-                self.enable_save)
+                self.text, QtCore.SIGNAL("textChanged()"), self.enable_save
+            )
 
             vbox_main = QtGui.QVBoxLayout(self.textwindow)
             vbox_main.addWidget(self.text)
@@ -167,29 +168,30 @@ class ProjectExplorer(QtGui.QWidget):
                         self.obj_appconfig.current_project['ProjectName']]
                 ) = []
 
-    # This function is enabling save button option.
     def enable_save(self):
+        """This function enables save button option."""
         self.save.setEnabled(True)
 
-    # This function is saving data before it closes the given file.
     def save_data(self):
         """
-        This function first opens file in write-mode, when write
-        operation is performed it closes that file and then it closes window.
+        This function saves data before it closes the given file.
+        It first opens file in write-mode, write operation is performed, \
+        closes that file and then it closes window.
         """
         self.fopen = open(self.filePath, 'w')
         self.fopen.write(self.text.toPlainText())
         self.fopen.close()
         self.textwindow.close()
 
-    # This function removes the project in explorer area by right
-    # clicking on project and selecting remove option.
     def removeProject(self):
+        """
+        This function removes the project in explorer area by right \
+        clicking on project and selecting remove option.
+        """
         self.indexItem = self.treewidget.currentIndex()
         self.filePath = str(
-            self.indexItem.sibling(
-                self.indexItem.row(),
-                1).data())
+            self.indexItem.sibling(self.indexItem.row(), 1).data()
+        )
         self.int = self.indexItem.row()
         self.treewidget.takeTopLevelItem(self.int)
 
@@ -200,14 +202,15 @@ class ProjectExplorer(QtGui.QWidget):
         json.dump(self.obj_appconfig.project_explorer,
                   open(self.obj_appconfig.dictPath, 'w'))
 
-    # This function refresh the project in explorer area by right
-    # clicking on project and selecting refresh option.
     def refreshProject(self):
+        """
+        This function refresh the project in explorer area by right \
+        clicking on project and selecting refresh option.
+        """
         self.indexItem = self.treewidget.currentIndex()
         self.filePath = str(
-            self.indexItem.sibling(
-                self.indexItem.row(),
-                1).data())
+            self.indexItem.sibling(self.indexItem.row(), 1).data()
+        )
         filelistnew = os.listdir(os.path.join(self.filePath))
         parentnode = self.treewidget.currentItem()
         count = parentnode.childCount()
@@ -216,9 +219,8 @@ class ProjectExplorer(QtGui.QWidget):
                 items.removeChild(items.child(0))
         for files in filelistnew:
             QtGui.QTreeWidgetItem(
-                parentnode, [
-                    files, os.path.join(
-                        self.filePath, files)])
+                parentnode, [files, os.path.join(self.filePath, files)]
+            )
 
         self.obj_appconfig.project_explorer[self.filePath] = filelistnew
         json.dump(self.obj_appconfig.project_explorer,
@@ -226,23 +228,22 @@ class ProjectExplorer(QtGui.QWidget):
 
     def renameProject(self):
         """
-        This function renames the project present in project explorer area
-        it validates first:
+        This function renames the project present in project explorer area.
+        It validates first:
 
             - If project names is not empty.
             - Project name does not contain spaces between them.
             - Project name is different between what it was earlier.
             - Project name should not exist.
 
-        And after project name is changed it recreates
-        the project explorer tree.
+        After project name is changed, it recreates the project explorer tree.
         """
         self.indexItem = self.treewidget.currentIndex()
         self.baseFileName = str(self.indexItem.data())
         newBaseFileName, ok = QtGui.QInputDialog.getText(
-            self, 'Rename Project', 'Project Name:', QtGui.QLineEdit.Normal,
-            self.baseFileName
-            )
+            self, 'Rename Project', 'Project Name:',
+            QtGui.QLineEdit.Normal, self.baseFileName
+        )
         if ok and newBaseFileName:
             print(newBaseFileName)
             print("=================")
@@ -284,8 +285,8 @@ class ProjectExplorer(QtGui.QWidget):
                     # rename project folder
                     updatedProjectPath = newBaseFileName.join(
                         projectPath.rsplit(self.baseFileName, 1))
-                    print("Renaming " + projectPath + " to "
-                          + updatedProjectPath)
+                    print("Renaming " + projectPath + " to " +
+                          updatedProjectPath)
                     os.rename(projectPath, updatedProjectPath)
 
                     # rename files matching project name
@@ -297,8 +298,8 @@ class ProjectExplorer(QtGui.QWidget):
                                 self.baseFileName, newBaseFileName, 1)
                             newFilePath = os.path.join(
                                 updatedProjectPath, projectFile)
-                            print("Renaming " + oldFilePath + " to"
-                                  + newFilePath)
+                            print("Renaming " + oldFilePath + " to" +
+                                  newFilePath)
                             os.rename(oldFilePath, newFilePath)
                             updatedProjectFiles.append(projectFile)
 
@@ -323,10 +324,10 @@ class ProjectExplorer(QtGui.QWidget):
                     print("==========================")
                     msg = QtGui.QErrorMessage(self)
                     msg.showMessage(
-                        'The project "'
-                        + newBaseFileName
-                        + '" already exist.Please select the different name or'
-                        + ' delete existing project')
+                        'The project "' + newBaseFileName +
+                        '" already exist. Please select a different name or' +
+                        ' delete existing project'
+                    )
                     msg.setWindowTitle("Error Message")
 
                 elif reply == "CHECKNAME":
@@ -334,6 +335,7 @@ class ProjectExplorer(QtGui.QWidget):
                     print("===========================")
                     msg = QtGui.QErrorMessage(self)
                     msg.showMessage(
-                        'The project name should not'
-                        + 'contain space between them')
+                        'The project name should not ' +
+                        'contain space between them'
+                    )
                     msg.setWindowTitle("Error Message")
diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py
index 55a8c95e..29be09fc 100644
--- a/src/frontEnd/Workspace.py
+++ b/src/frontEnd/Workspace.py
@@ -1,5 +1,4 @@
 # =========================================================================
-#
 #          FILE: Workspace.py
 #
 #         USAGE: ---
@@ -11,27 +10,26 @@
 #          BUGS: ---
 #         NOTES: ---
 #        AUTHOR: Fahim Khan, fahim.elex@gmail.com
+#      MODIFIED: Rahul Paknikar, rahulp@iitb.ac.in
 #  ORGANIZATION: eSim team at FOSSEE, IIT Bombay.
 #       CREATED: Wednesday 05 February 2015
-#      REVISION:  ---
+#      REVISION: Friday 14 February 2020
 # =========================================================================
+
 from PyQt4 import QtCore, QtGui
 from configuration.Appconfig import Appconfig
 import time
 import os
 
 
-# This class creates Workspace GUI.
 class Workspace(QtGui.QWidget):
     """
     This class creates UI for WorkSpace selection window.
 
-        This window contains text area to select location of your choice
-        or browse location for workspace area.
-
-        By default workspace is set in ~/eSim-Workspace.
-
-         This workspace area contains all the projects made by user.
+        - This window contains text area to select location of your choice \
+          or browse location for workspace area.
+        - By default workspace is set in ~/eSim-Workspace.
+        - This workspace area contains all the projects made by user.
 
     """
 
@@ -43,7 +41,6 @@ class Workspace(QtGui.QWidget):
         self.initWorkspace()
 
     def initWorkspace(self):
-        # print "Calling workspace"
 
         self.mainwindow = QtGui.QVBoxLayout()
         self.split = QtGui.QSplitter()
diff --git a/src/frontEnd/pathmagic.py b/src/frontEnd/pathmagic.py
index 49c4932d..5f0d712c 100644
--- a/src/frontEnd/pathmagic.py
+++ b/src/frontEnd/pathmagic.py
@@ -1,5 +1,6 @@
 import os
 import sys
+
 # Setting PYTHONPATH
 cwd = os.getcwd()
 (setPath, fronEnd) = os.path.split(cwd)