Full res out john905 #97

John905 · 2018-05-08T20:59:39Z

Update moves reference to glfx-js and webgl-distort to the html rather than trying to pull in the files directly

jywarren · 2018-05-08T21:46:06Z

Oh, did this not work out? Thanks!

John905 · 2018-05-08T21:58:07Z

I didn't mean to make the pull request for publiclab, I just wanted to update my repository. I still need to test.

jywarren · 2018-05-08T21:59:42Z

oh, ok! but for what it's worth we love seeing progress in PRs and can sometimes help out a bit if you share early. Thanks and good luck!

…

On Tue, May 8, 2018 at 5:58 PM, John905 ***@***.***> wrote: I didn't mean to make the pull request for publiclab, I just wanted to update my repository. I still need to test. — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#97 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ8eGD7dvsRbcC3f2gfFfBWb6xSqVks5twhTwgaJpZM4T3VK8> .

John905 · 2018-05-08T22:10:23Z

Reopened for review

jywarren

Awesome looking, here! Tell me what you think!

jywarren · 2018-05-08T22:14:15Z

src/edit/DistortableImage.Edit.js

 	/* Run on image deseletion. */
-	removeHooks: function() {
+	removeHooks: function ()
+	{


This is looking really nice! Actually we kind of prefer in-line syntax for these -- function() { -- thanks!

I can fix that - I'm still in that habit from what I do with C# - I think VS might have done it for me.

jywarren · 2018-05-08T22:14:26Z

src/edit/DistortableImage.Edit.js

 			q = new L.Point(
-				Math.cos(angle)*p.x - Math.sin(angle)*p.y,
-				Math.sin(angle)*p.x + Math.cos(angle)*p.y
+				Math.cos(angle) * p.x - Math.sin(angle) * p.y,


This might have been VS too.

jywarren · 2018-05-08T22:16:04Z

src/edit/canvas.js

@@ -0,0 +1,186 @@
+var gl;


Oof -- are these required for the testing? I think we could push for webgl-distort to include testing rather than testing an external module. I wrote the upstream so that's on me... what do you think? I do agree it's good that it have tests.

D'oh! I meant to remove these (canvas and texture) - they're left from when I was playing with bringing in the extra files.

aha do we still need to remove these? Could be almost there!

Appears to be functional now

John905 · 2018-05-10T20:57:24Z

I think this is working as required. Had 2 problems at the end - 1) the overlay corners correspond to a "Z" pattern on the image vs a clockwise pattern for warpable.nodes in map.js. 2) Chrome seems to cache scripting(?) even after an iisreset.

jywarren · 2018-05-10T21:06:53Z

Ooh - good call on the ordering. Is there anywhere we could/should update the documentation on that to make it more clear?

Hm, did you end up removing the tests or is something else failing? I can take a look if you like?

This is going to be awesome.

John905 · 2018-05-10T21:11:17Z

I'll take a look at the docs - I'm not sure if there is an inconsistency in here since the warpables came from a .rb that isn't included.
I took out the two glfx scripts that aren't actually needed and put the refs in index.html - should I update the htmls with those references?

jywarren · 2018-05-10T21:25:44Z

I think so!

…

On Thu, May 10, 2018, 5:11 PM John905 ***@***.***> wrote: I'll take a look at the docs - I'm not sure if there is an inconsistency in here since the warpables came from a .rb that isn't included. I took out the two glfx scripts that aren't actually needed and put the refs in index.html - should I update the htmls with those references? — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#97 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ5Hj33vJjYAHq5eZcV8kk-2xUtxzks5txKz1gaJpZM4T3VK8> .

John905 · 2018-05-10T21:53:54Z

Ok, I added in the htmls with the js references. Last time I updated package.json to include glfx-js and webgl-distort as dependencies.

jywarren · 2018-05-10T22:00:19Z

Just noticed canvas.js is still in there! Left a comment inline. 👍 almost there!

John905 · 2018-05-10T22:05:19Z

D'oh! I removed it from my main instead of the current branch - think I have it now.

jywarren · 2018-05-10T22:07:43Z

OK now i think just have to add the library to this list of includes for the tests to pass:

Leaflet.DistortableImage/test/karma.conf.js

Lines 17 to 35 in a98dab0

    
           files: [ 
        
             { pattern: 'examples/*.jpg', included: false, served: true }, 
        
             'node_modules/leaflet/dist/leaflet-src.js', 
        
             'node_modules/leaflet/dist/leaflet.css', 
        
             'node_modules/leaflet-toolbar/dist/leaflet.toolbar.js', 
        
             'node_modules/leaflet-toolbar/dist/leaflet.toolbar.css', 
        
             'node_modules/chai/chai.js', 
        
             'node_modules/sinon/pkg/sinon.js', 
        
             'src/util/*.js', 
        
             'src/edit/EditHandle.js', 
        
             'src/edit/LockHandle.js', 
        
             'src/edit/DistortHandle.js', 
        
             'src/edit/RotateHandle.js', 
        
             'src/DistortableImageOverlay.js', 
        
             'src/edit/DistortableImage.EditToolbar.js',       
        
             'src/edit/DistortableImage.Edit.js', 
        
             'test/SpecHelper.js', 
        
             'test/src/**/*Spec.js' 
        
           ],

jywarren · 2018-06-10T20:19:37Z

Hi, just checking if you've gotten stuck on this at all, or if I could help in any way? Thanks!

John905 · 2018-06-16T22:09:24Z

Sorry, I started a new job and lost track of this - I finished it as far as I can tell, but I don't think I submitted a pull request.

jywarren · 2018-06-17T19:56:51Z

OK - thanks! I opened a clean copy here: #100

Thank you!!!

@John905

* Fix CI * clean copy of #97 full res output * adjustments to changes by @John905 * mostly working * Update DistortableImage.Edit.js * working full-res distortion! * moved file * version bump * README updates * fixes * build * more docs * Minor additional fixes * jpg/png errors

jywarren · 2019-02-08T16:44:40Z

@John905 we finally completed this!!! See #100 for the final solution, building on your code and with help from several other folks! We just released v0.2.0 with this feature.

@John905

* Fix CI * clean copy of #97 full res output * adjustments to changes by @John905 * mostly working * Update DistortableImage.Edit.js * working full-res distortion! * moved file * version bump * README updates * fixes * build * more docs * Minor additional fixes * jpg/png errors

@John905

* Fix CI * clean copy of #97 full res output * adjustments to changes by @John905 * mostly working * Update DistortableImage.Edit.js * working full-res distortion! * moved file * version bump * README updates * fixes * build * more docs * Minor additional fixes * jpg/png errors

John905 added 2 commits April 25, 2018 09:52

Mid-development on exporting image

4c958cf

Updates excluding tie-ins to glfx-js

084ca63

John905 closed this May 8, 2018

John905 reopened this May 8, 2018

jywarren reviewed May 8, 2018

View reviewed changes

John905 added 2 commits May 10, 2018 14:40

Further updates for added image export

ee918bf

Appears to be functional now

Distribution version of previous commit

4067c73

John905 closed this May 10, 2018

John905 reopened this May 10, 2018

Html files that have new js references

8bd9e68

John905 force-pushed the FullResOut-John905 branch from 6b0a57f to 8bd9e68 Compare May 10, 2018 21:34

Added references to new node_modules needed for exporting image

052cb8d

John905 force-pushed the FullResOut-John905 branch from 0c3af62 to 052cb8d Compare May 14, 2018 18:00

jywarren mentioned this pull request Jun 10, 2018

build in full-resolution image export using webgl-distort #83

Closed

jywarren mentioned this pull request Jun 10, 2018

cross-origin error in full res image downloads publiclab/mapknitter#211

Closed

jywarren added a commit to jywarren/Leaflet.DistortableImage that referenced this pull request Jun 17, 2018

clean copy of publiclab#97 full res output

f617a3f

jywarren closed this Jun 17, 2018

jywarren mentioned this pull request Jun 17, 2018

clean copy of #97 full resolution download #100

Merged

jywarren added a commit to jywarren/Leaflet.DistortableImage that referenced this pull request Feb 7, 2019

clean copy of publiclab#97 full res output

a9b4681

Full res out john905 #97

Full res out john905 #97

Uh oh!

Conversation

John905 commented May 8, 2018

Uh oh!

jywarren commented May 8, 2018

Uh oh!

John905 commented May 8, 2018

Uh oh!

jywarren commented May 8, 2018 via email

Uh oh!

John905 commented May 8, 2018

Uh oh!

jywarren left a comment

Choose a reason for hiding this comment

Uh oh!

jywarren May 8, 2018

Choose a reason for hiding this comment

Uh oh!

John905 May 8, 2018

Choose a reason for hiding this comment

Uh oh!

jywarren May 8, 2018

Choose a reason for hiding this comment

Uh oh!

John905 May 8, 2018

Choose a reason for hiding this comment

Uh oh!

jywarren May 8, 2018

Choose a reason for hiding this comment

Uh oh!

John905 May 8, 2018

Choose a reason for hiding this comment

Uh oh!

jywarren May 10, 2018

Choose a reason for hiding this comment

Uh oh!

John905 commented May 10, 2018

Uh oh!

jywarren commented May 10, 2018

Uh oh!

John905 commented May 10, 2018

Uh oh!

jywarren commented May 10, 2018 via email

Uh oh!

John905 commented May 10, 2018

Uh oh!

jywarren commented May 10, 2018

Uh oh!

John905 commented May 10, 2018

Uh oh!

jywarren commented May 10, 2018

Uh oh!

jywarren commented Jun 10, 2018

Uh oh!

John905 commented Jun 16, 2018

Uh oh!

jywarren commented Jun 17, 2018

Uh oh!

jywarren commented Feb 8, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants