diff options
| -rw-r--r-- | photoblaster/modules/pbconcat/__init__.py | 4 | ||||
| -rw-r--r-- | share/frontend/imconcat/index.html | 24 |
2 files changed, 20 insertions, 8 deletions
diff --git a/photoblaster/modules/pbconcat/__init__.py b/photoblaster/modules/pbconcat/__init__.py index 68ebc6d..33d1cb5 100644 --- a/photoblaster/modules/pbconcat/__init__.py +++ b/photoblaster/modules/pbconcat/__init__.py @@ -224,8 +224,12 @@ class PbConcat(ModuleBase): ) def create(self): + import sys + sys.stderr.write("in create function\n") self._match_dimensions() + sys.stderr.write("done matching dimensions\n") self._make_frames_count_equal() + sys.stderr.write("done making frames equal\n") self._merge_frames() self._finalize_image() diff --git a/share/frontend/imconcat/index.html b/share/frontend/imconcat/index.html index e244c9e..b7b7c72 100644 --- a/share/frontend/imconcat/index.html +++ b/share/frontend/imconcat/index.html @@ -63,7 +63,7 @@ width: 100%; border: 1px solid gray; } - #final_image > img{ + #final_image > a > img{ width: 100%; } #send_to_input{ @@ -106,16 +106,16 @@ </div> <div class="modal-body"> <div id="final_image" class="dontshowme modal-info"> - <img src="img/logo-complete.png" / > + <a target="_blank"> <img src="img/logo-complete.png" / ></a> </div> <div id="error_message" class="row col-md-10 dontshowme modal-info"> </div> <div id="final_width" class="row col-md-10 dontshowme modal-info"> - width: <span class="final_value">58</span>px + width: <span class="final_value"></span> </div> <div id="final_height" class="row col-md-10 dontshowme modal-info"> - height: <span class="final_value">58</span>px + height: <span class="final_value"></span> </div> <div id="final_size" class="row col-md-10 dontshowme modal-info"> size: <span class="final_value">58</span> @@ -185,11 +185,11 @@ "onSubmitValid": function (values) { $.ajax({ url: '/im/api/pbconcat', - type: 'post', + type: 'post', dataType: 'json', data: $('form').serialize(), - success: function(data) { - showSuccess(data) + success: function(data) { + showSuccess(data) }, error: function(data){ showFailure(data) @@ -199,6 +199,14 @@ }); function showSuccess(data){ console.log("in show success function") + $('.success').removeClass('dontshowme') + $('#final_image').find('img').attr("src", data.url) + $('#final_image').find('a').attr("href", data.url) + $('#final_width > .final_value').html(data.width) + $('#final_height > .final_value').html(data.height) + $('#final_size > .final_value').html(data.size.toString() + " bytes") + $('#final_url > .final_value').val(data.url) + $('#final_width, #final_height, #final_size, #final_url, #final_image').removeClass('dontshowme') $('.modal').modal(); } function showFailure(data){ @@ -211,7 +219,7 @@ msg = "Problem with the request. Please check your input parameters." break; default: - msg = "Problem with request." + msg = "Request was unable to reach the server. Try Again?" } console.log(msg) reportError(msg) |