# SVN changeset patch # User ralonso # Date 2010-05-24 15:45:26.525791 # Revision 72 *** Index: bk_manager/trunk/functions/functions.py =================================================================== diff --git a/bk_manager/trunk/functions/functions.py b/bk_manager/trunk/functions/functions.py --- a/bk_manager/trunk/functions/functions.py (revision 71) +++ b/bk_manager/trunk/functions/functions.py (revision 72) @@ -207,7 +207,7 @@ for k in range(0, len(var_lines2) / 5): var_lines=["\n"] var_lines.append(" "+self.var_Elabel+" "+i2s(var_n)+"/"+i2s(self.var_Discs)+"\n") - var_lines.append("Year Doy Folder Set Time range\n") + var_lines.append("Year Doy Folder"+" "*6+"Set"+" "*9+"Time range\n") var_lines.extend(var_lines2[(5*k):(5*(k+1))]) var_lines.append("\n") var_labels.append(var_lines) Index: bk_manager/trunk/functions/functions2.py =================================================================== diff --git a/bk_manager/trunk/functions/functions2.py b/bk_manager/trunk/functions/functions2.py --- a/bk_manager/trunk/functions/functions2.py (revision 71) +++ b/bk_manager/trunk/functions/functions2.py (revision 72) @@ -15,11 +15,12 @@ """ #var_cmd="wodim --devices | grep /dev/ | awk -F\' '{print $2}'" #Funciona en consola pero no en python ¿? var_cmd="wodim --devices | grep /dev/ | awk '{print $2}' | awk -F= '{print $2}'" + var_output = commands.getstatusoutput(var_cmd) if var_output[0] != 0: - self.txtInfo.append("No se pudo encontrar los dispositivos de grabacion, output_error:" + str(var_output)) + self.txtInfo.append("No recording devices") else: - self.txtInfo.append("dispositivos encontrados") +# self.txtInfo.append("dispositivos encontrados") var_devices = var_output[1].split('\n') var_tmp=[] @@ -87,6 +88,11 @@ self.lstDcapacity.setCurrentIndex(4) self.txtDcapacity.setValue(100.0) self.txtDcapacity.setReadOnly(False) + self.txtDeviceA.setText("/dev/scd0") + self.txtDeviceB.setText("/dev/scd1") + self.txtDeviceC.setText("/dev/scd2") + self.txtDeviceD.setText("/dev/scd3") + #----------------------------------------------------- crea parameters.conf --------------------------------------------------------------- Index: bk_manager/trunk/ui/MainWindow.py =================================================================== diff --git a/bk_manager/trunk/ui/MainWindow.py b/bk_manager/trunk/ui/MainWindow.py --- a/bk_manager/trunk/ui/MainWindow.py (revision 71) +++ b/bk_manager/trunk/ui/MainWindow.py (revision 72) @@ -54,9 +54,10 @@ if os.path.isfile("parameters.conf"): self.txtInfo.append("Parameters were loaded from configuration file") functions2.get_parameters_conf(self) - self.txtInfo.append("El proyecto es de "+str(self.var_Discs)+" discos") + self.txtInfo.append("Total number of discs for recording: "+str(self.var_Discs * self.var_Copys)) + else: - self.txtInfo.append("Elija los parametros de configuracion") +# self.txtInfo.append("Elija los parametros de configuracion") functions2.set_parameters_test(self) #Establece ciertos parametros, para pruebas functions2.set_vars(self) #Carga las variables de la clase con los parametros seleccionados @@ -76,6 +77,10 @@ self.connect(self.var_process, QtCore.SIGNAL('readyReadStandardError()'), self.readError) self.connect(self.var_process, QtCore.SIGNAL('finished(int,QProcess::ExitStatus)'), self.finished) + self.var_process_check = QtCore.QProcess() + self.connect(self.var_process_check, QtCore.SIGNAL('readyReadStandardOutput()'), self.readOuput_check) + self.connect(self.var_process_check, QtCore.SIGNAL('readyReadStandardError()'), self.readError_check) + self.connect(self.var_process_check, QtCore.SIGNAL('finished(int,QProcess::ExitStatus)'), self.finished_check) def write(self, txt): self.txtInfo.append(str(txt)) @@ -114,6 +119,18 @@ self.burning() +#----------------------------------------------------- Funciones del proceso de verificacion --------------------------------------------------------------- + + def readOuput_check(self): + self.txtInfo.insertPlainText("stdout check: " + QtCore.QString(self.var_process_check.readAllStandardOutput())) + + def readError_check(self): + self.txtInfo.setText("stderr check: " + QtCore.QString(self.var_process_check.readAllStandardError())) + + def finished_check(self): + self.txtInfo.append("proceso terminado finished() check"+QtCore.QString(self.var_process_check.exitCode())+"\n") + + #----------------------------------------------------- Obtencion de la ruta de los datos --------------------------------------------------------------- @pyqtSignature("")