From be20e206432d2fd91b0d20df4f8b611ea238fa7f Mon Sep 17 00:00:00 2001 From: Tanay Mathur Date: Thu, 25 Jun 2015 16:53:08 +0530 Subject: GUI changes for Dock Area, added FOSSEE logo --- images/fosseeLogo.png | Bin 0 -> 21645 bytes .../lm555n/lm555n_Previous_Values.xml | 2 +- src/frontEnd/Application.py | 13 +++++++++-- src/frontEnd/DockArea.py | 24 ++++++++++++--------- src/kicadtoNgspice/KicadtoNgspice.py | 2 +- src/ngspiceSimulation/NgspiceWidget.py | 2 +- 6 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 images/fosseeLogo.png diff --git a/images/fosseeLogo.png b/images/fosseeLogo.png new file mode 100644 index 00000000..3a64d09a Binary files /dev/null and b/images/fosseeLogo.png differ diff --git a/src/SubcircuitLibrary/lm555n/lm555n_Previous_Values.xml b/src/SubcircuitLibrary/lm555n/lm555n_Previous_Values.xml index 7d81146a..09c35028 100644 --- a/src/SubcircuitLibrary/lm555n/lm555n_Previous_Values.xml +++ b/src/SubcircuitLibrary/lm555n/lm555n_Previous_Values.xml @@ -1 +1 @@ -truefalsefalseHzHzFalseVolts or AmperesVolts or AmperesVolts or AmperesSecSecSecd_inverterd_srlatch \ No newline at end of file +d_inverterd_srlatchtruefalsefalseHzHzFalseVolts or AmperesVolts or AmperesVolts or AmperesSecSecSec \ No newline at end of file diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 9fce17b0..a90dd1a7 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -89,7 +89,16 @@ class Application(QtGui.QMainWindow): self.topToolbar.addAction(self.openproj) self.topToolbar.addAction(self.exitproj) self.topToolbar.addAction(self.helpfile) - + + self.spacer = QtGui.QWidget() + self.spacer.setSizePolicy(QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Expanding) + self.topToolbar.addWidget(self.spacer) + self.logo = QtGui.QLabel() + self.logopic = QtGui.QPixmap(os.path.join(os.path.abspath('../..'),'images','fosseeLogo.png')) + self.logopic = self.logopic.scaled(QSize(150,150),QtCore.Qt.KeepAspectRatio) + self.logo.setPixmap(self.logopic) + self.topToolbar.addWidget(self.logo) + #Left Tool bar Action Widget self.kicad = QtGui.QAction(QtGui.QIcon('../../images/kicad.png'),'Open Schematic',self) self.kicad.triggered.connect(self.obj_kicad.openSchematic) @@ -246,8 +255,8 @@ class MainView(QtGui.QWidget): self.obj_appconfig.noteArea['Note'].append(' eSim Started......') self.obj_appconfig.noteArea['Note'].append('Project Selected : None') self.obj_appconfig.noteArea['Note'].append('\n') - #CSS + #CSS self.noteArea.setStyleSheet(" \ QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; } \ ") diff --git a/src/frontEnd/DockArea.py b/src/frontEnd/DockArea.py index e87fea99..fcaf1f0f 100644 --- a/src/frontEnd/DockArea.py +++ b/src/frontEnd/DockArea.py @@ -51,7 +51,7 @@ class DockArea(QtGui.QMainWindow): """ #CSS dock['Tips-'+str(count)].setStyleSheet(" \ - QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \ + .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \ ") """ @@ -86,7 +86,7 @@ class DockArea(QtGui.QMainWindow): """ #CSS dock['Plotting-'+str(count)].setStyleSheet(" \ - QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \ + .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \ ") """ dock['Plotting-'+str(count)].setVisible(True) @@ -119,13 +119,12 @@ class DockArea(QtGui.QMainWindow): dock['NgSpice-'+str(count)].setWidget(self.ngspiceWidget) self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock['NgSpice-'+str(count)]) self.tabifyDockWidget(dock['Welcome'],dock['NgSpice-'+str(count)]) - - """ + #CSS dock['NgSpice-'+str(count)].setStyleSheet(" \ - QWidget { border-radius: 15px; border: 1px solid gray; padding: 0px; width: 200px; height: 150px; } \ + .QWidget { border-radius: 15px; border: 1px solid gray; padding: 0px; width: 200px; height: 150px; } \ ") - """ + dock['NgSpice-'+str(count)].setVisible(True) dock['NgSpice-'+str(count)].setFocus() dock['NgSpice-'+str(count)].raise_() @@ -148,6 +147,11 @@ class DockArea(QtGui.QMainWindow): self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock['Model Editor-'+str(count)]) self.tabifyDockWidget(dock['Welcome'],dock['Model Editor-'+str(count)]) + #CSS + dock['Model Editor-'+str(count)].setStyleSheet(" \ + .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \ + ") + dock['Model Editor-'+str(count)].setVisible(True) dock['Model Editor-'+str(count)].setFocus() dock['Model Editor-'+str(count)].raise_() @@ -169,12 +173,12 @@ class DockArea(QtGui.QMainWindow): dock['Subcircuit-'+str(count)].setWidget(self.subcktWidget) self.addDockWidget(QtCore.Qt.TopDockWidgetArea, dock['Subcircuit-'+str(count)]) self.tabifyDockWidget(dock['Welcome'],dock['Subcircuit-'+str(count)]) - """ + #CSS - dock['Plotting-'+str(count)].setStyleSheet(" \ - QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \ + dock['Subcircuit-'+str(count)].setStyleSheet(" \ + .QWidget { border-radius: 15px; border: 1px solid gray; padding: 5px; width: 200px; height: 150px; } \ ") - """ + dock['Subcircuit-'+str(count)].setVisible(True) dock['Subcircuit-'+str(count)].setFocus() dock['Subcircuit-'+str(count)].raise_() diff --git a/src/kicadtoNgspice/KicadtoNgspice.py b/src/kicadtoNgspice/KicadtoNgspice.py index c9b5ac02..c3e9d637 100644 --- a/src/kicadtoNgspice/KicadtoNgspice.py +++ b/src/kicadtoNgspice/KicadtoNgspice.py @@ -544,7 +544,7 @@ class MainWindow(QtGui.QWidget): try: f = open(self.project+".cir.out") except : - print("Error in opening circuit file.") + print("Error in opening .cir.out file.") else: print self.projName + ".cir.out does not exist. Please create a spice netlist." diff --git a/src/ngspiceSimulation/NgspiceWidget.py b/src/ngspiceSimulation/NgspiceWidget.py index f2ad973f..2dcb4f89 100644 --- a/src/ngspiceSimulation/NgspiceWidget.py +++ b/src/ngspiceSimulation/NgspiceWidget.py @@ -18,7 +18,7 @@ class NgspiceWidget(QtGui.QWidget): if platform.system() == 'Linux': self.command = "cd "+projPath+";ngspice "+command #Creating argument for process - self.args = ['-into', str(self.terminal.winId()),'-hold','-e', self.command] + self.args = ['-geometry','200x200','-into', str(self.terminal.winId()),'-hold','-e', self.command] self.process.start('xterm', self.args) elif platform.system() == 'Windows': -- cgit From 81aa4d2cc82f126320f27c881a87333d69cb608b Mon Sep 17 00:00:00 2001 From: xoher Date: Fri, 26 Jun 2015 15:04:19 +0530 Subject: Fixed combo-box bug in transient group of Analysis tab --- src/kicadtoNgspice/Analysis.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/kicadtoNgspice/Analysis.py b/src/kicadtoNgspice/Analysis.py index 7c237dde..27dc740f 100644 --- a/src/kicadtoNgspice/Analysis.py +++ b/src/kicadtoNgspice/Analysis.py @@ -422,7 +422,10 @@ class Analysis(QtGui.QWidget): self.start_combobox.addItem("ns") self.start_combobox.addItem("ps") self.trgrid.addWidget(self.start_combobox,1,3) - self.tran_parameter[self.parameter_cnt]= "Sec" + try: + self.tran_parameter[self.parameter_cnt]= str(root[2][3].text) + except: + self.tran_parameter[self.parameter_cnt]= "Sec" self.start_combobox.activated[str].connect(self.start_combo_change) self.parameter_cnt= self.parameter_cnt+1 @@ -433,7 +436,10 @@ class Analysis(QtGui.QWidget): self.step_combobox.addItem("ns") self.step_combobox.addItem("ps") self.trgrid.addWidget(self.step_combobox,2,3) - self.tran_parameter[self.parameter_cnt]= "Sec" + try: + self.tran_parameter[self.parameter_cnt]= str(root[2][4].text) + except: + self.tran_parameter[self.parameter_cnt]= "Sec" self.step_combobox.activated[str].connect(self.step_combo_change) self.parameter_cnt= self.parameter_cnt+1 @@ -444,7 +450,10 @@ class Analysis(QtGui.QWidget): self.stop_combobox.addItem("ns") self.stop_combobox.addItem("ps") self.trgrid.addWidget(self.stop_combobox,3,3) - self.tran_parameter[self.parameter_cnt]= "Sec" + try: + self.tran_parameter[self.parameter_cnt]= str(root[2][5].text) + except: + self.tran_parameter[self.parameter_cnt]= "Sec" self.stop_combobox.activated[str].connect(self.stop_combo_change) self.parameter_cnt= self.parameter_cnt+1 -- cgit From cccbbb3827b898b471131d905b197795ba4b5e5b Mon Sep 17 00:00:00 2001 From: fahim Date: Fri, 26 Jun 2015 15:20:04 +0530 Subject: Subject: Added feature for initial voltage condition Description: Added feature for initial voltage condition --- src/kicadtoNgspice/Convert.py | 37 ++++++++++++++++++++++++++++--------- src/kicadtoNgspice/Model.py | 6 ++++-- src/kicadtoNgspice/Processing.py | 19 ++++++++++++++++--- src/projManagement/Kicad.py | 2 +- 4 files changed, 49 insertions(+), 15 deletions(-) diff --git a/src/kicadtoNgspice/Convert.py b/src/kicadtoNgspice/Convert.py index baf842d9..3b87e863 100644 --- a/src/kicadtoNgspice/Convert.py +++ b/src/kicadtoNgspice/Convert.py @@ -227,8 +227,24 @@ class Convert: modelParamValue.append([line[0],addmodelLine,line[4]]) addmodelLine=".model "+line[3]+"_secondary lcouple (num_turns ="+num_turns2+ ")" modelParamValue.append([line[0],addmodelLine,line[4]]) - except: + except Exception as e: print "Caught an exception in transfo model ",line[1] + print "Exception Message : ",str(e) + + elif line[2] == 'ic': + try: + start=line[5] + end=line[6] + for key,value in line[9].iteritems(): + initVal = str(self.obj_track.model_entry_var[value].text()) + if initVal=="":initVal="0" + node = line[1].split()[1] #Extracting node from model line + addmodelLine = ".ic v("+node+")="+initVal + modelParamValue.append([line[0],addmodelLine,line[4]]) + except Exception as e: + print "Caught an exception in initial condition ",line[1] + print "Exception Message : ",str(e) + else: try: @@ -264,21 +280,24 @@ class Convert: addmodelLine += param+"="+paramVal+" " - - - + addmodelLine += ") " modelParamValue.append([line[0],addmodelLine,line[4]]) - except: - print "Caught an exception in gain model ",line[1] + except Exception as e: + print "Caught an exception in model ",line[1] + print "Exception Message : ",str(e) #Adding it to schematic for item in modelParamValue: - schematicInfo.append(item[2]) #Adding Comment - schematicInfo.append(item[1]) #Adding model line - + if ".ic" in item[1]: + schematicInfo.insert(0,item[1]) + schematicInfo.insert(0,item[2]) + else: + schematicInfo.append(item[2]) #Adding Comment + schematicInfo.append(item[1]) #Adding model line + print "MYSCH------->",schematicInfo return schematicInfo def addDeviceLibrary(self,schematicInfo,kicadFile): diff --git a/src/kicadtoNgspice/Model.py b/src/kicadtoNgspice/Model.py index 984c47f0..d1edd5a6 100644 --- a/src/kicadtoNgspice/Model.py +++ b/src/kicadtoNgspice/Model.py @@ -15,7 +15,9 @@ class Model(QtGui.QWidget): def __init__(self,schematicInfo,modelList): + QtGui.QWidget.__init__(self) + #Processing for getting previous values kicadFile = sys.argv[1] (projpath,filename)=os.path.split(kicadFile) project_name=os.path.basename(projpath) @@ -33,7 +35,7 @@ class Model(QtGui.QWidget): print "Empty XML" - QtGui.QWidget.__init__(self) + #Creating track widget object self.obj_trac = TrackWidget.TrackWidget() @@ -124,7 +126,7 @@ class Model(QtGui.QWidget): #This keeps the track of Model Tab Widget self.obj_trac.modelTrack.append([line[0],line[1],line[2],line[3],line[4],line[5],line[6],self.start,self.end,tag_dict]) - + print "The tag dictionary : ",tag_dict diff --git a/src/kicadtoNgspice/Processing.py b/src/kicadtoNgspice/Processing.py index fa75320f..67e7dc9d 100644 --- a/src/kicadtoNgspice/Processing.py +++ b/src/kicadtoNgspice/Processing.py @@ -159,8 +159,10 @@ class PrcocessNetlist: for compline in schematicInfo: words = compline.split() compName = words[0] + print "Compline----------------->",compline + print "compName-------------->",compName # Find the IC from schematic - if compName[0]=='u': + if compName[0]=='u' or compName[0] == 'U': # Find the component from the circuit index=schematicInfo.index(compline) compType=words[len(words)-1]; @@ -174,7 +176,7 @@ class PrcocessNetlist: print "Words",words print "compName",compName #Looking if model file is present - if compType != "port": + if compType != "port" and compType != "ic": xmlfile = compType+".xml" #XML Model File count = 0 #Check if model of same name is present modelPath = [] @@ -281,11 +283,22 @@ class PrcocessNetlist: comment = "* Schematic Name: "+compType+", NgSpice Name: "+modelname #Here instead of adding compType(use for XML), added modelName(Unique Model Name) modelList.append([index,compline,modelname,compName,comment,title,type,paramDict]) - except: + except Exception as e: print "Unable to parse the model, Please check your your XML file" + print "Exception Message : ",str(e) sys.exit(2) + elif compType == "ic": + schematicInfo.insert(index,"* "+compline) + modelname = "ic" + comment = "* "+compline + title = "Initial Condition for "+compName + type = "NA" #Its is not model + text = "Enter initial voltage at node for "+compline + paramDict[title] = text + modelList.append([index,compline,modelname,compName,comment,title,type,paramDict]) else: schematicInfo.insert(index,"* "+compline) + #print "Count",count #print "UnknownModelList",unknownModelList #print "MultipleModelList",multipleModelList diff --git a/src/projManagement/Kicad.py b/src/projManagement/Kicad.py index d7202b4f..fdaa3187 100644 --- a/src/projManagement/Kicad.py +++ b/src/projManagement/Kicad.py @@ -138,7 +138,7 @@ class Kicad: self.project = os.path.join(self.projDir,self.projName) #Creating a command to run - self.cmd = "python ../kicadtoNgspice/KicadtoNgspice.py "+self.project+".cir " + self.cmd = "python ../kicadtoNgspice/KicadtoNgspice.py " +self.project+".cir " self.obj_workThread = Worker.WorkerThread(self.cmd) self.obj_workThread.start() -- cgit From 0d7dcfcf35e731900ffd6aa3f066d5bf8cbe0191 Mon Sep 17 00:00:00 2001 From: xoher Date: Mon, 29 Jun 2015 12:45:28 +0530 Subject: Workspace window appears before the main window with splash screen in the background --- src/frontEnd/Application.py | 58 ++++++++++++++++++++++++++++++++++----------- src/frontEnd/Workspace.py | 42 ++++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 16 deletions(-) diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index a90dd1a7..615c3f5f 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -33,6 +33,7 @@ from PyQt4.Qt import QSize class Application(QtGui.QMainWindow): + global project_name """ Its our main window of application """ @@ -59,7 +60,7 @@ class Application(QtGui.QMainWindow): self.obj_appconfig._app_heigth) self.setWindowTitle(self.obj_appconfig._APPLICATION) self.showMaximized() - self.show() + #self.show() def initToolBar(self): @@ -291,32 +292,61 @@ def main(args): """ print "Starting eSim......" app = QtGui.QApplication(args) - - """ - splash_pix = QtGui.QPixmap('../images/FreeEDAlogo.jpg') + + splash_pix = QtGui.QPixmap('../../images/splash_screen_esim.png') + splash = QtGui.QSplashScreen(splash_pix,QtCore.Qt.WindowStaysOnTopHint) + splash.setMask(splash_pix.mask()) + splash.show() + #QtGui.QApplication.setStyle(QtGui.QStyleFactory.create("Cleanlooks")) + appView = Application() + appView.spl=splash + appView.obj_workspace.returnWhetherClickedOrNot(appView) + appView.hide() + appView.obj_workspace.show() + sys.exit(app.exec_()) + #appView.hide() + ######################################################################################################################################## + + """splash_pix = QtGui.QPixmap('../images/splash_screen_esim.png') splash = QtGui.QSplashScreen(splash_pix,QtCore.Qt.WindowStaysOnTopHint) - progressBar = QtGui.QProgressBar(splash) + progressBar = QtGui.QProgressBar(splash) + progressBar.setGeometry(0,470,1004,20) splash.setMask(splash_pix.mask()) splash.show() for i in range(0, 100): progressBar.setValue(i) - t = time.time() + #cond=threading.Condition() + if i==50: + + appView = Application() + appView.hide() + #appView.obj_workspace.returnWhetherClickedOrNot(appView) + appView.obj_workspace.show() + #appView.obj_workspace.show() + appView.obj_workspace.calledFromApplicationToAssignSysAndApp(sys,app)#`11 ,cond) + #with cond: + #cond.wait() + + t = time.time() while time.time() < t + 0.1: app.processEvents() - time.sleep(2) + #time.sleep(2) - appView = Application() - appView.show() + #appView = Application() + #appView.hide() splash.finish(appView) - sys.exit(app.exec_()) - """ - appView = Application() + #sys.exit(app.exec_()) + #QtGui.QApplication.setStyle(QtGui.QStyleFactory.create("Cleanlooks")) - appView.show() - sys.exit(app.exec_()) + #appView.obj_workspace.returnWhetherClickedOrNot(appView) + #appView.obj_workspace.show() + #appView.hide() + appView.show() + sys.exit(app.exec_())""" +###################################################################################################################################################### diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py index 035a8688..aceac6a5 100644 --- a/src/frontEnd/Workspace.py +++ b/src/frontEnd/Workspace.py @@ -48,7 +48,9 @@ class Workspace(QtGui.QWidget): self.note.append(self.obj_appconfig.workspace_text) self.workspace_label.setText("Workspace:") self.workspace_loc.setText(self.obj_appconfig.home) - + self.imp_var=0 + self.close_var=0 + self.window_open_close=0 #Buttons self.browsebtn = QtGui.QPushButton('Browse') self.browsebtn.clicked.connect(self.browseLocation) @@ -76,8 +78,38 @@ class Workspace(QtGui.QWidget): def defaultWorkspace(self): print "Default location selected" + self.imp_var=1 self.obj_appconfig.print_info('Default workspace selected : ' + self.obj_appconfig.default_workspace["workspace"]) self.close() + var_appView.show() + def calledFromApplicationToAssignSysAndApp(self,sys,app): + global var_sys,var_app + var_sys=sys + var_app=app + + + #var_sys.exit(var_app.exec_()) + """def closeEvent(self, event): + if self.imp_var==0: + self.close_var=1 + self.destroy() + event.accept() + self.window_open_close=1""" + + + def close(self, *args, **kwargs): + self.window_open_close=1 + self.close_var=1 + #with var_cond: + # var_cond.notify() + return QtGui.QWidget.close(self, *args, **kwargs) + + + def returnWhetherClickedOrNot(self,appView): + global var_appView + var_appView=appView + + def createWorkspace(self): print "Create workspace is called" @@ -91,7 +123,13 @@ class Workspace(QtGui.QWidget): else: os.mkdir(self.create_workspace) self.obj_appconfig.default_workspace["workspace"] = self.create_workspace - self.close() + self.imp_var=1 + self.close() + var_appView.show() + """var_appView.obj_Mainview.setVisible(True) + var_appView.obj_appconfig.setVisible(True) + super.topToolbar.setVisible(True) + super.lefttoolbar.setVisible(True)""" def browseLocation(self): print "Browse Location called" -- cgit From 739696c6c2d100b42d147b5451cb67bfc6063923 Mon Sep 17 00:00:00 2001 From: xoher Date: Mon, 29 Jun 2015 12:54:30 +0530 Subject: Code cleanup for Application and Workspace files --- src/frontEnd/Application.py | 1 - src/frontEnd/Workspace.py | 22 +++------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 615c3f5f..62278f9e 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -299,7 +299,6 @@ def main(args): splash.show() #QtGui.QApplication.setStyle(QtGui.QStyleFactory.create("Cleanlooks")) appView = Application() - appView.spl=splash appView.obj_workspace.returnWhetherClickedOrNot(appView) appView.hide() appView.obj_workspace.show() diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py index aceac6a5..f2dbc1b4 100644 --- a/src/frontEnd/Workspace.py +++ b/src/frontEnd/Workspace.py @@ -48,9 +48,7 @@ class Workspace(QtGui.QWidget): self.note.append(self.obj_appconfig.workspace_text) self.workspace_label.setText("Workspace:") self.workspace_loc.setText(self.obj_appconfig.home) - self.imp_var=0 - self.close_var=0 - self.window_open_close=0 + #Buttons self.browsebtn = QtGui.QPushButton('Browse') self.browsebtn.clicked.connect(self.browseLocation) @@ -82,19 +80,8 @@ class Workspace(QtGui.QWidget): self.obj_appconfig.print_info('Default workspace selected : ' + self.obj_appconfig.default_workspace["workspace"]) self.close() var_appView.show() - def calledFromApplicationToAssignSysAndApp(self,sys,app): - global var_sys,var_app - var_sys=sys - var_app=app - + - #var_sys.exit(var_app.exec_()) - """def closeEvent(self, event): - if self.imp_var==0: - self.close_var=1 - self.destroy() - event.accept() - self.window_open_close=1""" def close(self, *args, **kwargs): @@ -126,10 +113,7 @@ class Workspace(QtGui.QWidget): self.imp_var=1 self.close() var_appView.show() - """var_appView.obj_Mainview.setVisible(True) - var_appView.obj_appconfig.setVisible(True) - super.topToolbar.setVisible(True) - super.lefttoolbar.setVisible(True)""" + def browseLocation(self): print "Browse Location called" -- cgit From ebe5526305045c2b33e0810ef76324c6ae3b2ffb Mon Sep 17 00:00:00 2001 From: xoher Date: Mon, 29 Jun 2015 13:56:34 +0530 Subject: Splash screen closes on closing workspace window --- src/frontEnd/Application.py | 1 + src/frontEnd/Workspace.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index 62278f9e..adb81966 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -299,6 +299,7 @@ def main(args): splash.show() #QtGui.QApplication.setStyle(QtGui.QStyleFactory.create("Cleanlooks")) appView = Application() + appView.splash=splash appView.obj_workspace.returnWhetherClickedOrNot(appView) appView.hide() appView.obj_workspace.show() diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py index f2dbc1b4..8f2b6c96 100644 --- a/src/frontEnd/Workspace.py +++ b/src/frontEnd/Workspace.py @@ -80,6 +80,7 @@ class Workspace(QtGui.QWidget): self.obj_appconfig.print_info('Default workspace selected : ' + self.obj_appconfig.default_workspace["workspace"]) self.close() var_appView.show() + var_appView.splash.close() @@ -113,6 +114,7 @@ class Workspace(QtGui.QWidget): self.imp_var=1 self.close() var_appView.show() + var_appView.splash.close() def browseLocation(self): -- cgit From 6d0631e034026b958437456ae461f21ba8429813 Mon Sep 17 00:00:00 2001 From: xoher Date: Mon, 29 Jun 2015 15:14:04 +0530 Subject: Logo bug fixed,and Splash screen waits for one second after workspace window --- src/frontEnd/Application.py | 1 + src/frontEnd/Workspace.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py index adb81966..a139a7bd 100755 --- a/src/frontEnd/Application.py +++ b/src/frontEnd/Application.py @@ -60,6 +60,7 @@ class Application(QtGui.QMainWindow): self.obj_appconfig._app_heigth) self.setWindowTitle(self.obj_appconfig._APPLICATION) self.showMaximized() + self.setWindowIcon(QtGui.QIcon('../../images/logo.png')) #self.show() diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py index 8f2b6c96..cd44dd71 100644 --- a/src/frontEnd/Workspace.py +++ b/src/frontEnd/Workspace.py @@ -17,7 +17,7 @@ #=============================================================================== from PyQt4 import QtCore, QtGui from configuration.Appconfig import Appconfig - +import time import os @@ -80,6 +80,7 @@ class Workspace(QtGui.QWidget): self.obj_appconfig.print_info('Default workspace selected : ' + self.obj_appconfig.default_workspace["workspace"]) self.close() var_appView.show() + time.sleep(1) var_appView.splash.close() @@ -114,6 +115,7 @@ class Workspace(QtGui.QWidget): self.imp_var=1 self.close() var_appView.show() + time.sleep(1) var_appView.splash.close() -- cgit