← Back to branch summary

~314r/joliebulle/joliebulle-2.8

« back to all changes in this revision

Viewing changes to main.py

  • Committer: 314r
  • Date: 2012-02-16 20:27:07 UTC
  • Revision ID: contact.314r@gmail.com-20120216202707-fwgozwpv4d6j8szt
tableau ajustement paliers ok ?

Show diffs side-by-side

added added

removed removed

Lines of Context:
main.py
550
550
        self.doubleSpinBoxRatio.valueChanged.connect(self.switchToBrewday)
551
551
        self.pushButtonAdjustStep.clicked.connect(self.stepAdjustBrewday)
552
552
        self.tableWidgetStepsBrewday.itemSelectionChanged.connect(self.tableWidgetStepsBrewday_currentRowChanged)
 
553
        self.dlgStepBrewday.stepAdjustBrewdayClosed.connect(self.stepAdjustBrewday_closed)
553
554
 
554
555
 
555
556
 
1046
1047
    def stepAdjustBrewday(self) :
1047
1048
        self.dlgStepBrewday.setModal(True)
1048
1049
        self.dlgStepBrewday.show()
1049
 
        self.dlgStepBrewday.setFields(self.brewdayCurrentStepTargetTemp, self.brewdayCurrentStepRatio, self.brewdayCurrentStepInfuseAmount, self.brewdayCurrentStepWaterTemp, self.grainWeight, self.stepsListVol, self.brewdayCurrentRow, self.brewdayListTemp)
 
1050
        self.dlgStepBrewday.setFields(self.brewdayCurrentStepTargetTemp, self.brewdayCurrentStepRatio, self.brewdayCurrentStepInfuseAmount, self.brewdayCurrentStepWaterTemp, self.grainWeight, self.stepsListVol, self.brewdayCurrentRow, self.brewdayListTemp, self.strikeTargetTemp)
1050
1051
        
1051
1052
    
1052
1053
        
2291
2292
            i = i+1 
2292
2293
            step = listSteps[i]
2293
2294
            stepName = step['name']
2294
 
            stepVol =  float(step['stepVol'])
 
2295
#            stepVol =  float(step['stepVol'])
2295
2296
            stepTemp = float(step['stepTemp'])
2296
2297
            
2297
2298
            
2306
2307
            self.brewCalc.calcInfusionStep(i, self.grainWeight, listVol, stepTemp, mashTemp, 90 )
2307
2308
 
2308
2309
            listVol.append(self.brewCalc.infuseVol)
 
2310
            
2309
2311
            self.tableWidgetStepsBrewday.setItem(i,0,QtGui.QTableWidgetItem(stepName))
2310
2312
            self.tableWidgetStepsBrewday.setItem(i,1,QtGui.QTableWidgetItem("%.1f" %(self.brewCalc.infuseVol)))
2311
2313
            self.tableWidgetStepsBrewday.setItem(i,2,QtGui.QTableWidgetItem(str(90)))
2337
2339
            self.brewdayCurrentStepTargetTemp = strikeTargetTemp
2338
2340
        else :
2339
2341
            self.brewdayCurrentStepTargetTemp = self.brewdayListTemp[i-1]
 
2342
            
 
2343
    def stepAdjustBrewday_closed (self, targetRatio, infuseAmount, waterTemp,listVol, currentRow, listTemp) :
 
2344
        print(targetRatio, infuseAmount, waterTemp,listVol, currentRow, listTemp)
 
2345
        #on insère les nouvelles données dans la table
 
2346
        self.tableWidgetStepsBrewday.setItem(currentRow,1,QtGui.QTableWidgetItem(str(infuseAmount)))
 
2347
        self.tableWidgetStepsBrewday.setItem(currentRow,2,QtGui.QTableWidgetItem("%.1f" %(waterTemp)))
 
2348
        self.tableWidgetStepsBrewday.setItem(currentRow,3,QtGui.QTableWidgetItem("%.1f" %(targetRatio)))
 
2349
        #il faut tout recalculer après la ligne modifiée
 
2350
        listSteps = self.currentMash['mashSteps']
 
2351
        
 
2352
        i = currentRow
 
2353
 
 
2354
        while i < len(listSteps) - 1 :
 
2355
            i = i+1
 
2356
            step = listSteps[i]
 
2357
            stepTemp = float(step['stepTemp'])
 
2358
            if i == 1 :
 
2359
                strikeStep = listSteps[0]
 
2360
                strikeTargetTemp = strikeStep['stepTemp']
 
2361
                mashTemp = strikeTargetTemp
 
2362
            else :
 
2363
                mashTemp = self.brewdayListTemp[i-2]
 
2364
            self.brewCalc.calcInfusionStep(i-1, self.grainWeight, listVol, stepTemp, mashTemp, 90 )
 
2365
            listVol.append(self.brewCalc.infuseVol)
 
2366
            self.tableWidgetStepsBrewday.setItem(i,1,QtGui.QTableWidgetItem("%.1f" %(self.brewCalc.infuseVol)))
 
2367
            self.tableWidgetStepsBrewday.setItem(i,3,QtGui.QTableWidgetItem("%.1f" %(self.brewCalc.newRatio)))
 
2368
            
 
2369
            
 
2370
 
 
2371
            
 
2372
#            print('température du moût', mashTemp)
 
2373
            
 
2374
            
 
2375
 
2340
2376
                   
2341
2377
        
2342
2378
    def printRecipe (self) :