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

Added keyboard shortcuts management #39

Merged
merged 6 commits into from
Nov 1, 2016
Merged

Conversation

favreau
Copy link
Member

@favreau favreau commented Oct 31, 2016

No description provided.

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.

Two commits with the same message? Either separate into clearer smaller commits or make it one with a bullet-list of changes.
Also, the RedHat build fails with a segfault it seems...

private:

virtual void _registerKeyboardShortcuts() final;
Copy link
Contributor

Choose a reason for hiding this comment

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

either virtual or final

Copy link
Member Author

Choose a reason for hiding this comment

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

final :-) Thanks

@@ -542,7 +542,7 @@ VolumeHandlerPtr Scene::getVolumeHandler()
{
boost::filesystem::path fileExtension =
dirIter->path( ).extension( );
if( fileExtension==".raw" )
//if( fileExtension==".raw" )
Copy link
Contributor

Choose a reason for hiding this comment

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

on purpose?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, on purpose, cleaned up.

soma.getMeanRadius() *
_geometryParameters.getRadiusMultiplier() );
soma.getMeanRadius() /* *
_geometryParameters.getRadiusMultiplier()*/ );
Copy link
Contributor

Choose a reason for hiding this comment

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

dito?

@@ -228,6 +229,10 @@ bool NESTLoader::_load( const float timestamp )
BRAYNS_DEBUG << "Loading spikes at timestamp: " << timestamp
<< " (" << start << " ms)" << std::endl;


char filename[1024];
sprintf( filename, "/home/favreau/medias/volumes/spikes/10pct/events/spikes_%05d.events", int(timestamp*10) );
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
Member Author

Choose a reason for hiding this comment

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

Oops, not on purpose. Thanks again.

BRAYNS_INFO << "Closing Deflect stream" << std::endl;
delete _stream.get();
_stream.release();
_stream = nullptr;
Copy link
Contributor

Choose a reason for hiding this comment

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

ouch! _stream.reset() should be enough

Copy link
Member Author

Choose a reason for hiding this comment

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

I should have read 'smart pointers for dummies'. Fixed.


bool success = _stream->send(deflectImage);
// TODO: Big Memory Leak on every send. FIX NEEDED!!!!!
const bool success = _stream->send( deflectImage );
_stream->finishFrame();
Copy link
Contributor

Choose a reason for hiding this comment

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

also evaluate result of finishFrame(). We typically do result = send() && finish();

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@favreau favreau force-pushed the master branch 4 times, most recently from c8d921c to 83fd63f Compare November 1, 2016 10:12
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.

You squash merge?

@favreau favreau merged commit 4079f29 into BlueBrain:master Nov 1, 2016
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.

2 participants