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

1625 line stipple #1688

Merged
merged 9 commits into from Nov 19, 2015
Merged

1625 line stipple #1688

merged 9 commits into from Nov 19, 2015

Conversation

@sankhesh
Copy link
Contributor

@sankhesh sankhesh commented Nov 12, 2015

Fixes #1625

@sankhesh
Copy link
Contributor Author

@sankhesh sankhesh commented Nov 16, 2015

@chaosphere2112 This branch is ready to be merged.

I can remove the code duplication in a separate branch once #1678 is merged. Lets not hold this back.

@sankhesh
Copy link
Contributor Author

@sankhesh sankhesh commented Nov 17, 2015

@sankhesh
Copy link
Contributor Author

@sankhesh sankhesh commented Nov 17, 2015

🔔 Ping!

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Nov 17, 2015

@sankhesh this branch needs to be updated as it has merge conflict..

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Nov 17, 2015

@sankhesh I would like to merge this branch AFTER the colormaps one, as I think it will be easier to merge potential breakage that way.

@doutriaux1 doutriaux1 mentioned this pull request Nov 17, 2015
sankhesh added 3 commits Nov 18, 2015
Conflicts:
	Packages/vcs/Lib/vcsvtk/isolinepipeline.py
Conflicts:
	Packages/vcs/Lib/vcsvtk/isolinepipeline.py
@sankhesh
Copy link
Contributor Author

@sankhesh sankhesh commented Nov 18, 2015

@doutriaux1 This branch is ready for merge.

The failures are because I did not merge your colormaps baselines with this branch's baselines. If you like I can do that and re-trigger these builds.

@sankhesh
Copy link
Contributor Author

@sankhesh sankhesh commented Nov 18, 2015

Please make sure to merge #1693 before merging this branch.

@sankhesh sankhesh force-pushed the 1625_line_stipple branch from 8602a82 to 7fc56e3 Nov 18, 2015
@sankhesh
Copy link
Contributor Author

@sankhesh sankhesh commented Nov 18, 2015

Re-triggered builds with new baselines.

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Nov 19, 2015

Rh full issues are xfvb related. I probably need to restart it. Rh mesa passes. Will wait for a Mac and merge in

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Nov 19, 2015

@sankesh will update thrshold on your test failing on Ubuntu 15.10 before merging in if macs come out ok

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Nov 19, 2015

@doutriaux1 so this would be our last PR for now?

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Nov 19, 2015

@aashish24 yes, but stipple test fails. What do you prefer try with a new baseline? Or increase threshold and merge?

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Nov 19, 2015

@doutriaux1 I looked at the differences and to me it seems to be system specific changes and not that the code is buggy. I would suggest increase the threshold and merge.

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Nov 19, 2015

@sankhesh can you increase the threshold?

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Nov 19, 2015

@sankhesh @aashish24 Yeah, I had to up the threshold for my stipple test.

This allows platform specific differences between test and baseline images.

This change fixes issues on machines using XfVb.
@sankhesh
Copy link
Contributor Author

@sankhesh sankhesh commented Nov 19, 2015

Done.

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Nov 19, 2015

thanks @sankhesh

doutriaux1 added a commit that referenced this issue Nov 19, 2015
@doutriaux1 doutriaux1 merged commit 2450a2d into master Nov 19, 2015
2 of 8 checks passed
@doutriaux1 doutriaux1 deleted the 1625_line_stipple branch Nov 19, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants