Skip to content

Commit

Permalink
Warnings update, status bar logic update
Browse files Browse the repository at this point in the history
  • Loading branch information
peytoncchen committed Sep 5, 2020
1 parent 071e9cb commit 001db02
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions datamodeler.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,9 @@ def s5add(self):
self.statusBar.setStyleSheet("background-color: none;")
self.minimize()
if self.runcounter > 2000:
self.statusBar.showMessage('Are you trying to crash the program??? Error - Too many runs')
self.statusBar.showMessage('Are you trying to crash the program??? Error - Too many runs',5000)
self.statusBar.setStyleSheet("background-color: pink;")
self.timer.start(5000)
return
if str(self.numRuns.text()):
try:
Expand Down Expand Up @@ -401,7 +402,7 @@ def genGrid(self):

if not verify[0]:
self.statusBar.showMessage(verify[1])
self.statusBar.setStyleSheet("background-color: pink;") #Light yellow warning
self.statusBar.setStyleSheet("background-color: pink;")
return #will not fit to grid unless #of measurements is multiple of combos
else:
dic = combotofitgrid(combos, self.inputs.s2Inputs, self.inputs.s1Inputs)
Expand Down
2 changes: 1 addition & 1 deletion modules/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def s1verify(s1list):
return False, 'Invalid input - must have at least 2 treatments'

if nameM == '' or namedVar == '':
return False, 'Invalid input - name measurements and name of dependent variable cannot be blank'
return False, 'Invalid input - names of variables cannot be blank'

return True, ''

Expand Down

0 comments on commit 001db02

Please sign in to comment.