From 8f1a67c6082084a19763ac182c0ff12ec07e2a4f Mon Sep 17 00:00:00 2001 From: Emanuele Date: Wed, 25 Mar 2020 12:30:02 +0100 Subject: [PATCH] fixati bug minori pronto per il test.. ma dopo pranzo --- bananaSPLIT/guimain.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py index eed9cf0..8b14125 100644 --- a/bananaSPLIT/guimain.py +++ b/bananaSPLIT/guimain.py @@ -49,7 +49,7 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow): # connetti bottoni avanti self.ui.btn_avanti.clicked.connect(self.nextTab) self.titolo.titoloui.btn_avanti.clicked.connect(self.nextTab) - self.selezout.selezoutui.btn_avanti.clicked.connect(self.nextTab) + #self.selezout.selezoutui.btn_avanti.clicked.connect(self.nextTab) #connetti bottoni indietro self.titolo.titoloui.btn_indietro.clicked.connect(self.prevTab) @@ -367,7 +367,6 @@ class bananaTitoloAvanzate(PyQt5.QtWidgets.QWidget): #prefisso e suffisso self.conf.setParam(('docStruct','outPrefix'), self.titoloavui.txt_prefisso.text()) self.conf.setParam(('docStruct','outSuffix'), self.titoloavui.txt_suffisso.text()) - print(self.conf) class bananaSelezOut(PyQt5.QtWidgets.QWidget): @@ -378,8 +377,8 @@ class bananaSelezOut(PyQt5.QtWidgets.QWidget): self.conf = confloader self.log = logger if self.conf is not None: - self.selezoutui.btn_split.clicked.connect(self.splitta) self.selezoutui.btn_split.clicked.connect(self.applica) + self.selezoutui.btn_split.clicked.connect(self.splitta) self.fillInterface() pass @@ -418,17 +417,17 @@ class bananaSelezOut(PyQt5.QtWidgets.QWidget): # costruisco il dizionario di configurazione splconf = copy.deepcopy(self.conf.dump()) lang = copy.deepcopy(self.conf.use('languageconf.json').getParam(splconf['docStruct']['language'])) - splconf['language'] = self.conf.use('languageconf.json').getParam(lang) + splconf['docStruct']['language'] = lang #formato nome in uscita nametemp=[] - for i in range(3): + for i in range(1,4): if i == splconf['docStruct']['numberPos'] and splconf['docStruct']['outNumber']: - nametemp.append("docnum") + nametemp.append("{docnum}") if i == splconf['docStruct']['datePos'] and splconf['docStruct']['outDate']: nametemp.append(splconf['docStruct']['dateFormats'][splconf['docStruct']['outDateType']]) if i == splconf['docStruct']['titlePos'] and splconf['docStruct']['outTitle']: - nametemp.append("title") + nametemp.append("{title}") pass if splconf['docStruct']['outPrefix'] != '': nametemp.insert(0, splconf['docStruct']['outPrefix']) #inserisco prefisso e suffisso @@ -442,8 +441,6 @@ class bananaSelezOut(PyQt5.QtWidgets.QWidget): for f in splconf['paths']['fileList']: splconf['name']=f tDict[f] = bananaSPLITTER(fileParams=copy.deepcopy(splconf), logger=self.log) - - pass