diff --git a/PHYMOBAT.py b/PHYMOBAT.py index 992d507f8ccff148758040eef7cecd21a2dfb6df..ca791f8e3a3757b89b5842bd573289de2105e549 100644 --- a/PHYMOBAT.py +++ b/PHYMOBAT.py @@ -934,7 +934,7 @@ class PHYMOBAT(QtWidgets.QMainWindow, Processing): self.add_sample() # Look at if the the images has been already downloaded, download them otherwise - self.i_download() + self.i_download(self.ui.ignore_download.isChecked()) #Â function to launch the image processing self.i_images_processing() diff --git a/Processing.py b/Processing.py index 2291087ae8d0873741ef20747b8005f415d46d83..c996c81b85bd8da822025fa72c40e8c4eb010382 100644 --- a/Processing.py +++ b/Processing.py @@ -216,7 +216,7 @@ class Processing(object): if len(self.out_fieldname_carto) == 4: self.tree_direction = [[0], [0], [1, 2], [1, 3]] - def i_download(self): + def i_download(self, download=True): """ Interface function to download archives on the website Theia Land. This function extract the number of downloadable image with :func:`Archive.Archive.listing`. @@ -231,8 +231,11 @@ class Processing(object): os.makedirs(folder_archive) self.check_download = Archive(self.captor_project, self.classif_year, self.path_area, folder_archive, self.w_proxy) - self.nb_avalaible_images = self.check_download.listing() - self.check_download.download_auto(self.user, self.password) + + if download : + self.nb_avalaible_images = self.check_download.listing() + self.check_download.download_auto(self.user, self.password) + self.check_download.decompress() def i_img_sat(self): diff --git a/ui_PHYMOBATs_tab.py b/ui_PHYMOBATs_tab.py index bc5911b9ae0d5b083206e3b7d6ba770b3e8facf8..c5ae0b97dca3b026ed2614a1f787d3e842aa5843 100644 --- a/ui_PHYMOBATs_tab.py +++ b/ui_PHYMOBATs_tab.py @@ -251,6 +251,14 @@ class Ui_PHYMOBAT(object): self.label_user = QtWidgets.QLabel(self.frame) self.label_user.setObjectName("label_user") self.gridLayout.addWidget(self.label_user, 6, 0, 1, 1) + + self.ignore_download = QtWidgets.QCheckBox(self.frame) + self.ignore_download.setCheckable(True) + self.ignore_download.setChecked(False) + self.ignore_download.setAutoRepeat(False) + self.ignore_download.setObjectName("ignore_download") + self.gridLayout.addWidget(self.ignore_download, 5, 1, 1, 1) + self.lineEdit_user = QtWidgets.QLineEdit(self.frame) self.lineEdit_user.setObjectName("lineEdit_user") self.gridLayout.addWidget(self.lineEdit_user, 6, 1, 1, 1) @@ -343,6 +351,7 @@ class Ui_PHYMOBAT(object): self.retranslateUi(PHYMOBAT) QtCore.QMetaObject.connectSlotsByName(PHYMOBAT) PHYMOBAT.setTabOrder(self.checkBox_multiprocess, self.buttonBox) + PHYMOBAT.setTabOrder(self.ignore_download, self.buttonBox) PHYMOBAT.setTabOrder(self.buttonBox, self.lineEdit_principal_folder) PHYMOBAT.setTabOrder(self.lineEdit_principal_folder, self.pushButton_browser_principal_folder) PHYMOBAT.setTabOrder(self.pushButton_browser_principal_folder, self.lineEdit_year_images) @@ -383,6 +392,7 @@ class Ui_PHYMOBAT(object): def retranslateUi(self, PHYMOBAT): PHYMOBAT.setWindowTitle(_translate("PHYMOBAT", "PHYMOBATs 3.0", None)) self.checkBox_multiprocess.setText(_translate("PHYMOBAT", "Multi-processing", None)) + self.ignore_download.setText(_translate("PHYMOBAT", "Ignore download", None)) self.label_select_sample_nb_poly_3.setText(_translate("PHYMOBAT", "<html><head/><body><p>Nbre de polygones</p></body></html>", None)) self.label_select_sample_class_6.setText(_translate("PHYMOBAT", "Classes", None)) self.label_select_sample_class_7.setText(_translate("PHYMOBAT", "<html><head/><body><p align=\"center\">Ligneux denses</p></body></html>", None))