Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 691 interact mac broken #905

Merged
merged 12 commits into from
Nov 20, 2014
Merged

Conversation

doutriaux1
Copy link
Contributor

@dlonie @aashish24 please review and feel free to suggest better/cleaner solutions.
@ThomasMaxwell wouldn't mind you looking this over as well and testing it against DV3D.

@doutriaux1 doutriaux1 added this to the 2.1 milestone Nov 18, 2014
@ThomasMaxwell
Copy link
Contributor

Did a brief interaction/resize test- don't see any problems for the 3D plots.

From: Charles Doutriaux <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Tuesday, November 18, 2014 6:20 PM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Subject: [uvcdat] Issue 691 interact mac broken (#905)

@dloniehttps://github.com/dlonie @aashish24https://github.com/aashish24 please review and feel free to suggest better/cleaner solutions.
@ThomasMaxwellhttps://github.com/ThomasMaxwell wouldn't mind you looking this over as well and testing it against DV3D.


You can merge this Pull Request by running

git pull https://github.com/UV-CDAT/uvcdat issue_691_interact_mac_broken

Or view, comment on, or merge it at:

#905

Commit Summary

  • put changes back in
  • merge master in this
  • added AnyEvent to see what is happening (not much on mac)
  • ok this works, needs clean up
  • ok not quite there... no left click segfaults
  • ok works on Mac
  • Merge branch 'master' into issue_691_interact_mac_broken
  • rendering the clickrenderer seg fault on mac if clicked before and resize, commenting out fixes it
  • works on Linux now

File Changes

Patch Links:


Reply to this email directly or view it on GitHubhttps://github.com//pull/905.


if sys.platform == "darwin":
self.AddObserver( "RenderEvent", parent.renderEvent )
#self.AddObserver( "AnyEvent",parent.stdEvent)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just as a general style note, committed commented out code is rarely necessary. If you've removed something, the old implementation is still stored in git, and if it's new code, why add it if it isn't used? Otherwise it just clutters the codebase and gets in the way of readability.

If there is a reason to leave a commented code path in, a comment explaining why is a good idea.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope. It's just that i'm lazy and didn't want to go through git to uncoment it in case we need further development on this issue 😉

@doutriaux1
Copy link
Contributor Author

@dlonie please make sure I got them all now.

@alliepiper
Copy link
Contributor

Almost -- check the new diff.

@alliepiper
Copy link
Contributor

Looks good to me! Thanks for fixing those up.

There were some conflicts when I went to merge master in. Can you address those before we merge?

@alliepiper
Copy link
Contributor

Wait a sec, I think I had an older version checked out....

@doutriaux1
Copy link
Contributor Author

github says it canmerge w/o conflict

@alliepiper
Copy link
Contributor

Yeah, my local refs were out of date. Rebuilt and running tests, all passing so far 👍

alliepiper pushed a commit that referenced this pull request Nov 20, 2014
@alliepiper alliepiper merged commit d426cf4 into master Nov 20, 2014
@doutriaux1 doutriaux1 deleted the issue_691_interact_mac_broken branch March 9, 2015 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants