Skip to content

1625 line stipple#1688

Merged
doutriaux1 merged 9 commits intomasterfrom
1625_line_stipple
Nov 19, 2015
Merged

1625 line stipple#1688
doutriaux1 merged 9 commits intomasterfrom
1625_line_stipple

Conversation

@sankhesh
Copy link
Contributor

Fixes #1625

@sankhesh
Copy link
Contributor Author

@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

@doutriaux1 @aashish24

@sankhesh
Copy link
Contributor Author

🔔 Ping!

@aashish24
Copy link
Contributor

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

@doutriaux1
Copy link
Contributor

@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
Conflicts:
	Packages/vcs/Lib/vcsvtk/isolinepipeline.py
Conflicts:
	Packages/vcs/Lib/vcsvtk/isolinepipeline.py
@sankhesh
Copy link
Contributor Author

@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

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

@sankhesh
Copy link
Contributor Author

Re-triggered builds with new baselines.

@doutriaux1
Copy link
Contributor

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

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

@aashish24
Copy link
Contributor

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

@doutriaux1
Copy link
Contributor

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

@aashish24
Copy link
Contributor

@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

@sankhesh can you increase the threshold?

@chaosphere2112
Copy link
Contributor

@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

Done.

@aashish24
Copy link
Contributor

thanks @sankhesh

doutriaux1 added a commit that referenced this pull request Nov 19, 2015
@doutriaux1 doutriaux1 merged commit 2450a2d into master Nov 19, 2015
@doutriaux1 doutriaux1 deleted the 1625_line_stipple branch November 19, 2015 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants