summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpepperpepperpepper <pepper@scannerjammer.com>2016-03-03 19:39:08 -0800
committerpepperpepperpepper <pepper@scannerjammer.com>2016-03-03 19:39:08 -0800
commit377dd69391459b9b0099b7b2ba2e092887480fb7 (patch)
treef48f5cc0cb65ef1099056f9e0e45b332a36eea86
parent6a87a8cc49105d54e4a40dfab66207e04e046904 (diff)
good
-rwxr-xr-xphotoblaster/modules/pbgenerate/__init__.py11
-rw-r--r--run_module_examples.py2
2 files changed, 7 insertions, 6 deletions
diff --git a/photoblaster/modules/pbgenerate/__init__.py b/photoblaster/modules/pbgenerate/__init__.py
index 2d9531f..d78600d 100755
--- a/photoblaster/modules/pbgenerate/__init__.py
+++ b/photoblaster/modules/pbgenerate/__init__.py
@@ -1,5 +1,5 @@
#!/usr/bin/python2.7
-from photoblaster.config import BIN_CONVERT, OUTPUT_IMAGE_TYPES,\
+from photoblaster.config import BIN_CONVERT, BIN_COMPOSITE, OUTPUT_IMAGE_TYPES,\
DEFAULT_FINALFORMAT
from photoblaster.modules import ModuleBase
from photoblaster._file import File
@@ -24,7 +24,7 @@ class PbGenerate(ModuleBase):
example_params = {
"""Example params. Used with the classmethod Pb.run_example"""
'nearest': 'true',
- 'compose': 'Soft_Light',
+ 'compose': 'ATop',
'coalesce': 'true',
'dispose': 'None',
'gravity': 'Center',
@@ -37,11 +37,13 @@ class PbGenerate(ModuleBase):
'saturation': '100',
'merge_early': 'true',
'format': 'gif',
- 'background': 'http://i.asdf.us/im/bc/new_1430440747.gif',
+ "background": (
+ "http://i.asdf.us/im/bf/PbGradientrgb-7,97,199--rgb-81,46,121-_1444379589_RICHARD_GIOVANNI.png"
+ ),
'subtract': '#EE7AE9',
'transparent': 'true',
'name': 'yo',
- 'url': 'http://asdf.us/im/new.gif',
+ "url": "http://i.asdf.us/im/6b/7Zz8RsgPbGenerate_14-PbGenerate_1456375574.png",
'flop': 'true',
'flip': 'false',
'callback': 'jsonp1430442384162',
@@ -189,7 +191,6 @@ class PbGenerate(ModuleBase):
self.params.hue or 100
)
]
- cmd.append("-coalesce") # why? FIXME
cmd += [self.get_output_file().get_filepath()]
self._call_cmd(cmd)
diff --git a/run_module_examples.py b/run_module_examples.py
index 27fd13c..d6900dc 100644
--- a/run_module_examples.py
+++ b/run_module_examples.py
@@ -4,7 +4,7 @@ from photoblaster.modules import Modules
modules = Modules()
for module_name in modules.list_modules():
- if module_name == "pbconcat":
+ if module_name == "pbgenerate":
print "\n\n\n"
print "running example for %s" % module_name
cls = modules.get_module(module_name)