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 1271 colormap on object #1523

Merged
merged 10 commits into from
Sep 15, 2015
Merged

Conversation

doutriaux1
Copy link
Contributor

goes with: CDAT/uvcdat-testdata#62

@sankhesh @aashish24 please review

gm is stored at init time (should we do the same for template?)
pipeline now have a getcolormap() func that look for the colormap to use in this order:

* graphic method has the colormap attribute
* canvas has the colormap attribute set
* otherwise use vcs.colormap

fix #1271
forgot one class where init needed to be updated
vector pipeline was still expecting gm as argument to plot function
@aashish24
Copy link
Contributor

I am going this branch.

@doutriaux1
Copy link
Contributor Author

@aashish24 review?

@@ -865,7 +865,7 @@ def __init__(self, gui=0, mode=1, pause_time=0,
self._canvas_id = vcs.next_canvas_id
self.ParameterChanged = SIGNAL('ParameterChanged')
vcs.next_canvas_id += 1
self.colormap = "default"
self.colormap = None
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not leave it to "default"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Because there are three spots where cmap can be set, so I need to know if user did set it or not.

@doutriaux1
Copy link
Contributor Author

I think I sent a request to rerun tests on this let's wait.


# For now, we'll just throw everything at plot. This might need to be
# broken up into set_data, set_template, etc methods...
def plot(self, data1, data2, template, graphics_method, grid, transform):
raise NotImplementedError("Missing override.")

def getcolormap(self):
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't it be called getColorMap(self) so as to be consistent with rest of the naming convention?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's reasonable will do. Will look at your if/else comments as well.

@aashish24
Copy link
Contributor

@doutriaux1 mostly looks good to me. Just has some minor suggestion. I hope you won't mind addressing these if you think they are reasonable.

@doutriaux1
Copy link
Contributor Author

merge from master failed. DO NOT MERGE YET please. Fixing it.

@aashish24
Copy link
Contributor

@doutriaux1 sounds good to me. If buildbot is happy, lets go ahead and merge it.

fixed typo in comment, mainly trying to retrigger builds
doutriaux1 added a commit that referenced this pull request Sep 15, 2015
@doutriaux1 doutriaux1 merged commit 80be4c7 into master Sep 15, 2015
@doutriaux1 doutriaux1 deleted the issue_1271_colormap_on_object branch September 15, 2015 06:00
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.

None yet

2 participants