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

Fixed transfer function according to new Lexis event #115

Merged
merged 2 commits into from
Feb 7, 2017

Conversation

favreau
Copy link
Member

@favreau favreau commented Feb 6, 2017

No description provided.

std::bind( &ZeroEQPlugin::_colormapUpdated, this ));
_remoteColormap.registerSerializeCallback(
std::bind( &ZeroEQPlugin::_requestColormap, this ));
_httpServer->handlePUT( _remoteMaterialLUT );
Copy link
Contributor

Choose a reason for hiding this comment

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

rename to _remoteColorMaps?

Copy link
Contributor

Choose a reason for hiding this comment

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

no support for GET?

Copy link
Member Author

Choose a reason for hiding this comment

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

_remoteMaterialLUT is more consistent with other class member names I think. And no GET for now since the renderer is not the 'owner' of the colormap.

Copy link
Contributor

Choose a reason for hiding this comment

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

Then you should not create a default color map. You'll always have to receive one from the outside then to be consistent.

Copy link
Contributor

Choose a reason for hiding this comment

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

materialLUT was the old name. The consistency so far was to name the variables close to the class name.

Copy link
Member Author

Choose a reason for hiding this comment

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

As discussed, kept only the PUT command, and removed the default values.


Vector2f colormapRange = DEFAULT_TRANSFER_FUNCTION_RANGE;
const auto& range = _remoteMaterialLUT.getRange();
if( range[0] != range[1] )
Copy link
Contributor

Choose a reason for hiding this comment

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

why is this necessary?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's not, it's a temporary hack. I removed it.

/**
* @brief This method is called when the colormap is requested by a ZeroEQ event
* @return True if the method was successful, false otherwise
* @brief This method is called when the material lookup table is updated by
Copy link
Contributor

Choose a reason for hiding this comment

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

colorMaps. No more material lookup table

*/
bool _requestColormap();
void _materialLUTUpdated();
Copy link
Contributor

Choose a reason for hiding this comment

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

dito

Copy link
Contributor

@tribal-tec tribal-tec left a comment

Choose a reason for hiding this comment

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

My bad. We should rename the file in lexis to materialLUT.fbs as well

@favreau favreau merged commit ba5299e into BlueBrain:master Feb 7, 2017
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