mirror/DeepCreamPy
1
0
Fork 0
mirror of https://github.com/Deepshift/DeepCreamPy.git synced 2024-11-30 19:00:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change progress text

Browse Source
This commit is contained in:
deeppomf 2019-10-31 23:11:00 -04:00
parent 80a2cb8880
commit d8e113b89c
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
decensor.py
View File

@ -65,14 +65,14 @@ class Decensor(QtCore.QThread):
self.terminate() self.terminate()
def find_mask(self, colored): def find_mask(self, colored):
self.signals.update_progress_LABEL.emit("find_mask()", "finding mask...") # self.signals.update_progress_LABEL.emit("find_mask()", "finding mask...")
mask = np.ones(colored.shape, np.uint8) mask = np.ones(colored.shape, np.uint8)
i, j = np.where(np.all(colored[0] == self.mask_color, axis=-1)) i, j = np.where(np.all(colored[0] == self.mask_color, axis=-1))
mask[0, i, j] = 0 mask[0, i, j] = 0
return mask return mask
def load_model(self): def load_model(self):
self.signals.update_progress_LABEL.emit("load_model()", "loading model...") self.signals.update_progress_LABEL.emit("load_model()", "Loading neural network. This may take a while.")
self.model = InpaintNN(bar_model_name = "./models/bar/Train_775000.meta", self.model = InpaintNN(bar_model_name = "./models/bar/Train_775000.meta",
bar_checkpoint_name = "./models/bar/", bar_checkpoint_name = "./models/bar/",
mosaic_model_name = "./models/mosaic/Train_290000.meta", mosaic_model_name = "./models/mosaic/Train_290000.meta",
@ -90,18 +90,18 @@ class Decensor(QtCore.QThread):
output_dir = self.decensor_output_path output_dir = self.decensor_output_path
# Change False to True before release --> file.check_file(input_dir, output_dir, True) # Change False to True before release --> file.check_file(input_dir, output_dir, True)
self.signals.update_progress_LABEL.emit("file.check_file()", "checking image files and directory...") self.signals.update_progress_LABEL.emit("file.check_file()", "Checking image files and directory...")
file_names, self.files_removed = file.check_file(input_dir, output_dir, False) file_names, self.files_removed = file.check_file(input_dir, output_dir, False)
self.signals.total_ProgressBar_update_MAX_VALUE.emit("set total progress bar MaxValue : "+str(len(file_names)),len(file_names)) self.signals.total_ProgressBar_update_MAX_VALUE.emit("set total progress bar MaxValue : "+str(len(file_names)),len(file_names))
#convert all images into np arrays and put them in a list #convert all images into np arrays and put them in a list
for n, file_name in enumerate(file_names, start = 1): for n, file_name in enumerate(file_names, start = 1):
self.signals.total_ProgressBar_update_VALUE.emit("decensoring {} / {}".format(n, len(file_names)), n) self.signals.total_ProgressBar_update_VALUE.emit("Decensoring {} / {}".format(n, len(file_names)), n)
# signal progress bar value == masks decensored on image , # signal progress bar value == masks decensored on image ,
# e.g) sample image : 17 # e.g) sample image : 17
self.signals.signal_ProgressBar_update_VALUE.emit("reset value", 0) # set to 0 for every image at start self.signals.signal_ProgressBar_update_VALUE.emit("reset value", 0) # set to 0 for every image at start
self.signals.update_progress_LABEL.emit("for-loop, \"for file_name in file_names:\"","decensoring : "+str(file_name)) self.signals.update_progress_LABEL.emit("for-loop, \"for file_name in file_names:\"","Decensoring : "+str(file_name))
color_file_path = os.path.join(input_color_dir, file_name) color_file_path = os.path.join(input_color_dir, file_name)
color_basename, color_ext = os.path.splitext(file_name) color_basename, color_ext = os.path.splitext(file_name)
@ -146,6 +146,8 @@ class Decensor(QtCore.QThread):
self.custom_print("\nDecensoring complete!") self.custom_print("\nDecensoring complete!")
#unload model to prevent memory issues #unload model to prevent memory issues
self.signals.update_progress_LABEL.emit("finished", "Decensoring complete! Close this window and reopen DCP to start a new session.")
tf.reset_default_graph() tf.reset_default_graph()
def decensor_image_variations(self, ori, colored, file_name=None): def decensor_image_variations(self, ori, colored, file_name=None):
@ -203,11 +205,11 @@ class Decensor(QtCore.QThread):
self.custom_print("No green regions detected! Make sure you're using exactly the right color.") self.custom_print("No green regions detected! Make sure you're using exactly the right color.")
return return
self.signals.signal_ProgressBar_update_MAX_VALUE.emit("found {} masked regions".format(len(regions)), len(regions)) self.signals.signal_ProgressBar_update_MAX_VALUE.emit("Found {} masked regions".format(len(regions)), len(regions))
output_img_array = ori_array[0].copy() output_img_array = ori_array[0].copy()
for region_counter, region in enumerate(regions, 1): for region_counter, region in enumerate(regions, 1):
self.signals.update_progress_LABEL.emit("for-loop, \"for region_counter, region in enumerate(regions, 1):\"","decensoring censor {}/{}".format(region_counter,len(regions))) self.signals.update_progress_LABEL.emit("\"Decensoring regions in image\"","Decensoring censor {}/{}".format(region_counter,len(regions)))
bounding_box = expand_bounding(ori, region, expand_factor=1.5) bounding_box = expand_bounding(ori, region, expand_factor=1.5)
crop_img = ori.crop(bounding_box) crop_img = ori.crop(bounding_box)
# crop_img.show() # crop_img.show()
@ -299,7 +301,7 @@ class Decensor(QtCore.QThread):
output_img = Image.fromarray(output_img_array.astype('uint8')) output_img = Image.fromarray(output_img_array.astype('uint8'))
output_img = self.apply_variant(output_img, variant_number) output_img = self.apply_variant(output_img, variant_number)
self.signals.update_progress_LABEL.emit("finished", "decensoring finished, saving as file...") self.signals.update_progress_LABEL.emit("current image finished", "Decensoring of current image finished. Saving image...")
if file_name != None: if file_name != None:
#save the decensored image #save the decensored image
@ -315,14 +317,15 @@ class Decensor(QtCore.QThread):
return output_img return output_img
def custom_print(self, text): def custom_print(self, text):
if self.ui_mode:
from PySide2.QtGui import QTextCursor
self.text_cursor.insertText(text)
self.text_cursor.insertText("\n")
self.text_edit.moveCursor(QTextCursor.End)
else:
print(text) print(text)
# if self.ui_mode:
# from PySide2.QtGui import QTextCursor
# self.text_cursor.insertText(text)
# self.text_cursor.insertText("\n")
# self.text_edit.moveCursor(QTextCursor.End)
# else:
# print(text)
# if __name__ == '__main__': # if __name__ == '__main__':
# decensor = Decensor() # decensor = Decensor()

8
main.py
View File

@ -27,7 +27,7 @@ class MainWindow(QWidget):
#Tutorial #Tutorial
self.tutorialLabel = QLabel() self.tutorialLabel = QLabel()
self.tutorialLabel.setText("Welcome to DeepCreamPy!\n\nIf you're new to DCP, please read the README.\nThis program does nothing without the proper setup of your images.\n\nReport them to me on Github or Twitter @deeppomf.") self.tutorialLabel.setText("Welcome to DeepCreamPy!\n\nIf you're new to DCP, please read the README.\nThis program does nothing without the proper setup of your images.\n\nReport any bugs you encounter to me on Github or Twitter @deeppomf.")
self.tutorialLabel.setAlignment(Qt.AlignCenter) self.tutorialLabel.setAlignment(Qt.AlignCenter)
self.tutorialLabel.setFont(QFont('Sans Serif', 13)) self.tutorialLabel.setFont(QFont('Sans Serif', 13))
@ -85,7 +85,7 @@ class MainWindow(QWidget):
#window size settings #window size settings
self.resize(500, 500) self.resize(500, 500)
self.center() self.center()
self.setWindowTitle('DeepCreamPy v2.2.0-alpha') self.setWindowTitle('DeepCreamPy v2.2.0-beta')
self.show() self.show()
def decensorClicked(self): def decensorClicked(self):
@ -117,10 +117,12 @@ class MainWindow(QWidget):
self.decensorButton.setEnabled(True) self.decensorButton.setEnabled(True)
# self.hide() self.hide()
self.progress = ProgressWindow(self, decensor = decensor) self.progress = ProgressWindow(self, decensor = decensor)
# decensor.decensor_all_images_in_folder() # decensor.decensor_all_images_in_folder()
# self.progress.hide()
# self.show()
# def showAbout(self): # def showAbout(self):
# QMessageBox.about(self, 'About', "DeepCreamPy v2.2.0 \n Developed by deeppomf") # QMessageBox.about(self, 'About', "DeepCreamPy v2.2.0 \n Developed by deeppomf")