diff options
| author | salvadh0r <dhor@toxic.net.pl> | 2014-04-15 19:15:40 +0200 |
|---|---|---|
| committer | salvadh0r <dhor@toxic.net.pl> | 2014-04-15 19:15:40 +0200 |
| commit | 526655840a87c7df1d90fb4bd806327589e46c76 (patch) | |
| tree | 4213a3ed05485be828a29993a572fe9c5156d634 /macrofusion.py | |
| parent | ef6108bb7008b4474707fa0ce7f146fc72688fdc (diff) | |
| download | macrofusion-code-526655840a87c7df1d90fb4bd806327589e46c76.zip macrofusion-code-526655840a87c7df1d90fb4bd806327589e46c76.tar.gz macrofusion-code-526655840a87c7df1d90fb4bd806327589e46c76.tar.bz2 | |
on the road to the 0.7.4
Diffstat (limited to 'macrofusion.py')
| -rwxr-xr-x | macrofusion.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/macrofusion.py b/macrofusion.py index e0ede36..3bfffa1 100755 --- a/macrofusion.py +++ b/macrofusion.py @@ -149,7 +149,7 @@ class Interface: #Dans la foulee on chope la fenetre principale, ca sert a rien c'est pour #montrer qu'on peut le faire c'est tout ^^ self.win=self.gui.get_object("mainwindow") - self.win.set_title('MacroFusion') + self.win.set_title('MacroFusion' + __VERSION__) #On chope le reste, et ca, ca va servir... self.listeimages = self.gui.get_object("listeimages") @@ -418,7 +418,7 @@ class Interface: def preview(self, widget): self.taille=(self.spinbuttonlargeurprev.get_value(), self.spinbuttonhauteurprev.get_value()) - self.name=donnees.previs_dossier + "/" + "preview.jpg" + self.name=donnees.previs_dossier + "/" + "preview.tif" item=0 if len(self.liststoreimport)>0: self.ref=list(zip(*self.liststoreimport))[0] @@ -500,16 +500,16 @@ class Interface: else: self.progressbar.set_fraction(1) self.progressbar.set_text(_("Preview generated")) - self.imagepreview.set_from_file(donnees.previs_dossier + "/" + "preview.jpg") + self.imagepreview.set_from_file(donnees.previs_dossier + "/" + "preview.tif") return False def baswitch(self, widget): - if (not int(self.buttonbeforeafter.get_relief())) and (os.path.exists(donnees.previs_dossier + "/preview_.jpg")): + if (not int(self.buttonbeforeafter.get_relief())) and (os.path.exists(donnees.previs_dossier + "/preview_.tif")): self.buttonbeforeafter.props.relief = Gtk.ReliefStyle.NONE - self.imagepreview.set_from_file(donnees.previs_dossier + "/preview_.jpg") - elif os.path.exists(donnees.previs_dossier + "/preview_.jpg"): + self.imagepreview.set_from_file(donnees.previs_dossier + "/preview_.tif") + elif os.path.exists(donnees.previs_dossier + "/preview_.tif"): self.buttonbeforeafter.props.relief = Gtk.ReliefStyle.NORMAL - self.imagepreview.set_from_file(donnees.previs_dossier + "/preview.jpg") + self.imagepreview.set_from_file(donnees.previs_dossier + "/preview.tif") def fusion(self,widget): FenPar=Fenetre_Parcourir() @@ -764,8 +764,8 @@ class Thread_Preview(threading.Thread): return if not Gui.checkbutton_a5_align.get_active(): images_a_fusionner=images_a_align - if os.path.exists(donnees.previs_dossier + "/preview.jpg"): - shutil.copy(donnees.previs_dossier + "/" + "preview.jpg", donnees.previs_dossier + "/" + "preview_.jpg") + if os.path.exists(donnees.previs_dossier + "/preview.tif"): + shutil.copy(donnees.previs_dossier + "/" + "preview.tif", donnees.previs_dossier + "/" + "preview_.tif") if Gui.checkbutton_a5_align.get_active() and \ (len(images_a_align) != len(session_images_bak) \ or len(self.options_align) != len(session_options_bak) \ @@ -781,7 +781,7 @@ class Thread_Preview(threading.Thread): Gui.statusbar.push(15, _(":: Fusion photos...")) print (self.options) - command=[Gui.enfuser, "-o", donnees.previs_dossier + "/" + "preview.jpg"] + self.options + images_a_fusionner + command=[Gui.enfuser, "-o", donnees.previs_dossier + "/" + "preview.tif"] + self.options + images_a_fusionner preview_process=subprocess.Popen(command, stdout=subprocess.PIPE) preview_process.wait() Gui.statusbar.pop(15) |