summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xphotoblaster/modules/pbgrid/__init__.py15
-rw-r--r--photoblaster/param/int_.py2
-rwxr-xr-xshare/frontend/im/api.html2
-rw-r--r--share/frontend/im/css/style.css4
-rwxr-xr-xshare/frontend/im/index.html12
-rw-r--r--share/frontend/imconcat/index.html9
-rw-r--r--share/frontend/imthresh/index.html28
7 files changed, 36 insertions, 36 deletions
diff --git a/photoblaster/modules/pbgrid/__init__.py b/photoblaster/modules/pbgrid/__init__.py
index d2d7613..a9ab094 100755
--- a/photoblaster/modules/pbgrid/__init__.py
+++ b/photoblaster/modules/pbgrid/__init__.py
@@ -3,6 +3,7 @@ from photoblaster.config import DEFAULT_FINALFORMAT, DEFAULT_HEIGHT,\
THREEDROTATE, GRID, BIN_CONVERT, BIN_COMPOSITE
from photoblaster.modules import ModuleBase
from photoblaster._file import File
+import sys
_DEFAULT_LINE_COLOR = "silver"
@@ -89,14 +90,14 @@ class PbGrid(ModuleBase):
)
self._db_url_param = str(
- filter(
+ list(filter(
lambda n: n, [
self.params.imageinstead,
self.params.planebgimage,
self.params.bgimage,
"NULL"
]
- )[0]
+ ))[0]
)
def _init_canvas(self):
@@ -149,13 +150,15 @@ class PbGrid(ModuleBase):
#3rd step--run 3Drotate
cmd = [THREEDROTATE]
if self.params.swing:
- cmd += ["pan={}".format(self.params.swing)]
+ print(self.params.swing)
+ sys.exit()
+ cmd += ["pan={}".format(self.params.get("swing", 0))]
if self.params.tilt:
- cmd += ["tilt={}".format(self.params.tilt)]
+ cmd += ["tilt={}".format(self.params.get("tilt", 0))]
if self.params.roll:
- cmd += ["roll={}".format(self.params.roll)]
+ cmd += ["roll={}".format(self.params.get("roll", 0))]
if self.params.zoom:
- cmd += ["zoom={}".format(self.params.zoom)]
+ cmd += ["zoom={}".format(self.params.get("zoom", 0))]
if cmd == [THREEDROTATE]: # if nothing has been added
return
if self.params.planebgcolor and not self.params.planebgimage:
diff --git a/photoblaster/param/int_.py b/photoblaster/param/int_.py
index 6e6d066..eb42e7f 100644
--- a/photoblaster/param/int_.py
+++ b/photoblaster/param/int_.py
@@ -13,7 +13,7 @@ class Int(Param):
if value:
self.value = int(value)
else:
- self.value = ""
+ self.value = 0
except Exception as e:
self.err_warn("Not an int: %s" % str(value))
self.err_warn(str(e))
diff --git a/share/frontend/im/api.html b/share/frontend/im/api.html
index 2ea9d75..1bb461f 100755
--- a/share/frontend/im/api.html
+++ b/share/frontend/im/api.html
@@ -28,7 +28,7 @@ body {
<script type="text/javascript">
$(function(){
// var url = "http://www.maskworld.com/pix/masks/025-party-face-gesicht-fasching-karneval-carnival-halloween-latex-film-movie-larp-theatre-theater-horror-rubber-gummi-mask-masks-maske-masken.jpg";
- var url = "http://thecoolgadgets.com/wp-content/uploads/2010/03/hamburger_usb_flash_drive.jpg";
+ var url = "https://thecoolgadgets.com/wp-content/uploads/2010/03/hamburger_usb_flash_drive.jpg";
var name = "test";
function success (data) {
var s = "";
diff --git a/share/frontend/im/css/style.css b/share/frontend/im/css/style.css
index 3f0e597..dcb88fb 100644
--- a/share/frontend/im/css/style.css
+++ b/share/frontend/im/css/style.css
@@ -114,8 +114,8 @@ input[type=text]
height:38px;
display: inline-block;
position: absolute;
- background-image: url(http://i.asdf.us/im/7e/user_convo_1353562627_1355449919.png);
- //background-image: url( http://i.asdf.us/im/7b/user_convo_1353562627.png);
+ background-image: url(https://i.asdf.us/im/7e/user_convo_1353562627_1355449919.png);
+ //background-image: url( https://i.asdf.us/im/7b/user_convo_1353562627.png);
background-repeat:no-repeat;
background-position: 3px 10px;
cursor: pointer;
diff --git a/share/frontend/im/index.html b/share/frontend/im/index.html
index 9bb71eb..673346f 100755
--- a/share/frontend/im/index.html
+++ b/share/frontend/im/index.html
@@ -5,8 +5,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta property="og:title" content="PHOTOBLASTER"/>
<meta property="og:type" content="website"/>
-<meta property="og:url" content="http://asdf.us/im/"/>
-<meta property="og:image" content="http://asdf.us/im/6e/sparklebling1_1310021111_1310071704.gif" />
+<meta property="og:url" content="https://asdf.us/im/"/>
+<meta property="og:image" content="https://asdf.us/im/6e/sparklebling1_1310021111_1310071704.gif" />
<meta property="og:site_name" content="asdf.us"/>
<meta property="og:description" content="Paste a link into the first box, then use the other settings to colorize, distort, add transparency and a background."/>
<meta property="fb:admins" content="100001923956223,1709246"/>
@@ -18,7 +18,7 @@
</head>
<body>
<div id="controls">
-<form id="imform" action="javascript:return false">
+<form id="imform">
<label id="img-url-label">IMAGE URL</label>
<input type="text" id="img-url" /><div id="bgswitcheroo"></div>
<!--<br/>-->
@@ -224,7 +224,7 @@
<p>
See what people are making &rarr; <a href="/im/gallery/">Image Gallery</a><br/>
<span class="shim"></span>
- The best ones go here &rarr; <a href="http://photoblaster.tumblr.com/">Photoblaster Tumblr</a>
+ The best ones go here &rarr; <a href="https://photoblaster.tumblr.com/">Photoblaster Tumblr</a>
<span class="shim"></span>
View a random selection &rarr; <a href="/im/gallery/?random=1">Random Gallery</a><br/>
<span id="userlink">
@@ -244,13 +244,13 @@
<!--
<div id="likebutton">
-<div id="fb-root" style="background-color: transparent;"></div><script src="http://connect.facebook.net/en_US/all.js#appId=236917449658413&amp;xfbml=1"></script><fb:like href="http://asdf.us/im/" send="false" width="347" show_faces="true" colorscheme="light" font="" style="background-color: transparent;"></fb:like>
+<div id="fb-root" style="background-color: transparent;"></div><script src="https://connect.facebook.net/en_US/all.js#appId=236917449658413&amp;xfbml=1"></script><fb:like href="https://asdf.us/im/" send="false" width="347" show_faces="true" colorscheme="light" font="" style="background-color: transparent;"></fb:like>
</div>
-->
<script type="text/javascript" src="/js/jquery.js"></script>
<script type="text/javascript" src="js/main.js"></script>
-<script type="text/javascript" src="http://asdf.us/js/pbembed.js"></script>
+<script type="text/javascript" src="https://asdf.us/js/pbembed.js"></script>
<!--for the colors iframe-->
<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="/im/colors/js/jquery.remember-state.js"></script>
diff --git a/share/frontend/imconcat/index.html b/share/frontend/imconcat/index.html
index 909d2e0..f3966b7 100644
--- a/share/frontend/imconcat/index.html
+++ b/share/frontend/imconcat/index.html
@@ -3,12 +3,9 @@
<head>
<meta charset="utf-8" />
<title>Photoblaster Concatenate</title>
-<!-- <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">-->
- <link rel="stylesheet" href="css/bootstrap.css">
-<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>-->
-<script src="/js/jquery-1.11.0.min.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<!-- <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script> -->
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<style type="text/css">
body{
line-height: 2em;
diff --git a/share/frontend/imthresh/index.html b/share/frontend/imthresh/index.html
index 135899f..748ed95 100644
--- a/share/frontend/imthresh/index.html
+++ b/share/frontend/imthresh/index.html
@@ -3,9 +3,9 @@
<head>
<meta charset="utf-8" />
<title>Photoblaster Threshold</title>
- <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
- <script src="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
+ <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<style type="text/css">
body{
line-height: 2em;
@@ -80,8 +80,8 @@
height:38px;
display: inline-block;
position: absolute;
- background-image: url(http://i.asdf.us/im/7e/user_convo_1353562627_1355449919.png);
- //background-image: url( http://i.asdf.us/im/7b/user_convo_1353562627.png);
+ background-image: url(https://i.asdf.us/im/7e/user_convo_1353562627_1355449919.png);
+ //background-image: url( https://i.asdf.us/im/7b/user_convo_1353562627.png);
background-repeat:no-repeat;
background-position: 3px 10px;
cursor: pointer;
@@ -94,16 +94,16 @@
<body>
<div id="links">
<span class="pb_links">links:</span>
- <a class="pb_links" href="http://asdf.us/im/gallery">gallery</a>
- <a class="pb_links" href="http://asdf.us/im">pb</a>
- <a class="pb_links" href="http://asdf.us/imgradient">imgradient</a>
- <a class="pb_links" href="http://asdf.us/imgrid">imgrid</a>
- <a class="pb_links" href="http://asdf.us/impattern">impattern</a>
- <a class="pb_links" href="http://asdf.us/imlandscape">imlandscape</a>
- <a class="pb_links" href="http://asdf.us/imbreak">imbreak</a>
- <a class="pb_links" href="http://asdf.us/shader">shader</a>
- <a class="pb_links" href="http://asdf.us/ascii">ascii</a>
- <a class="pb_links" href="http://asdf.us/imconcat">concat</a>
+ <a class="pb_links" href="https://asdf.us/im/gallery">gallery</a>
+ <a class="pb_links" href="https://asdf.us/im">pb</a>
+ <a class="pb_links" href="https://asdf.us/imgradient">imgradient</a>
+ <a class="pb_links" href="https://asdf.us/imgrid">imgrid</a>
+ <a class="pb_links" href="https://asdf.us/impattern">impattern</a>
+ <a class="pb_links" href="https://asdf.us/imlandscape">imlandscape</a>
+ <a class="pb_links" href="https://asdf.us/imbreak">imbreak</a>
+ <a class="pb_links" href="https://asdf.us/shader">shader</a>
+ <a class="pb_links" href="https://asdf.us/ascii">ascii</a>
+ <a class="pb_links" href="https://asdf.us/imconcat">concat</a>
</div>
<h1 id="logos">
<a href="">
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 08:31:06 +0000