Changeset 307

Timestamp:

07/23/08 10:44:41 (6 months ago)

Author:

bob

Message:

Fixed the PSD importation

Files:

• trunk/artub/propertiesbar/propertyeditorcontrols.py (modified) (4 diffs)

trunk/artub/propertiesbar/propertyeditorcontrols.py

@@ -460 +460 @@
             
             if filename.endswith('.psd'):
-                from PythonMagick import Image
-                img = Image(str(filename))
+                import PIL.Image
+                img = PIL.Image.open(str(filename))
                 base = str(filename[:-4]) + '.png'
                 import tempfile
-                import os.path
-                import os
                 import exceptions
-                import glob
+                import shutil
                 
                 tempdir = tempfile.gettempdir()
-                infos = img.get_layer_names()
-                infos = infos.split('\n')
-                layers = []
-                for i in infos:
-                    n, x, y = i.split('|')
-                    x = int(x)
-                    y = int(y)
-                    layers.append((n, x, y))
                 tempdir = tempdir + '/psd_outputs'
+                shutil.rmtree(tempdir, ignore_errors=True)
+                
                 try: os.mkdir(tempdir)
-                except exceptions.OSError: 
-                    for i in glob.glob(tempdir + '/*'):
-                        os.remove(i)
-                
-                img.write_files(tempdir + '/' + os.path.basename(base))
+                except: pass
+                                
+                for index, layer in enumerate(img.layers):
+                        img.seek(index)
+                        img.save(join(tempdir, os.path.basename(base) + "_" + layer[0].decode('utf-8') + ".png"))
+                    
                 dlg = ib.ImageDialog(self, tempdir)
                 dlg.Centre() 
 
                 if dlg.ShowModal() == wx.ID_OK:
-                    import shutil
                     filename = wx.GetApp().frame.project.project_path + '/' + os.path.basename(dlg.GetFile())
                     shutil.copyfile(dlg.GetFile(), filename)
@@ -498 +490 @@
                     return
 
-                for i in glob.glob(tempdir + '/*'):
-                    os.remove(i)
-                os.rmdir(tempdir)
+                shutil.rmtree(tempdir, ignore_errors=True)
             
-            filename = filename.replace('\\', '\\\\')
             nom = get_parent_class(self.iec.resource.__class__)
             classe = res.get_class(nom)
             c = classe.add_class(name, ["Animation"], [
-                           "filenames = [u'" + filename + "']\n"])
+                           "filenames = [" + repr(filename) + "]\n"])
             res.ast_has_changed = True
             res.topy()
@@ -512 +501 @@
             wx.GetApp().artub_frame.update_treeitem(res)
             self.iec.editorCtrl.SetValue(nom + '.' + name)
-            import os
-            if os.name != "posix":
+            if os.name != "posix": # Hack
                 self.iec.editorCtrl.PopDown()
             self.iec.propEditor.inspectorPost(False)
@@ -588 +576 @@
         self.cal.resource = self.resource
         
-        if value == "NoneType": value = "None"
         self.editorCtrl.SetValue(value)
         self.editorCtrl.SetPopupContent(self.win)