Skip to content
Snippets Groups Projects
Commit 261386bc authored by Felix de las Pozas's avatar Felix de las Pozas
Browse files

Minor cleaups. Updated to VGLab instead of GMRV in about dialog.

parent 8a2e8743
No related branches found
No related tags found
No related merge requests found
...@@ -227,8 +227,6 @@ void MainWindow::openBlueConfigThroughDialog( void ) ...@@ -227,8 +227,6 @@ void MainWindow::openBlueConfigThroughDialog( void )
std::string fileName = path.toStdString( ); std::string fileName = path.toStdString( );
openBlueConfig( fileName, targetLabel ); openBlueConfig( fileName, targetLabel );
} }
} }
#endif #endif
} }
...@@ -262,7 +260,6 @@ void MainWindow::openSWCFileThroughDialog( void ) ...@@ -262,7 +260,6 @@ void MainWindow::openSWCFileThroughDialog( void )
std::string fileName = path.toStdString( ); std::string fileName = path.toStdString( );
openSWCFile( fileName ); openSWCFile( fileName );
} }
} }
void MainWindow::showAbout( void ) void MainWindow::showAbout( void )
...@@ -317,21 +314,20 @@ void MainWindow::showAbout( void ) ...@@ -317,21 +314,20 @@ void MainWindow::showAbout( void )
#endif #endif
tr ( "</ul>" ) + tr ( "</ul>" ) +
tr( "<br>GMRV - Universidad Rey Juan Carlos<br>" tr( "<br>GMRV - Universidad Rey Juan Carlos<br>"
"<a href=www.gmrv.es>www.gmrv.es</a><br>" "<a href=www.vg-lab.es>www.vg-lab.es</a><br>"
"<a href='mailto:gmrv@gmrv.es'>gmrv@gmrv.es</a><br><br>" "<a href='mailto:dev@vg-lab.es'>dev@vg-lab.es</a><br><br>"
"<br>(C) 2015. Universidad Rey Juan Carlos<br><br>" "<br>(C) 2015-2022. Universidad Rey Juan Carlos<br><br>"
"<img src=':/icons/rsc/gmrv_grande.png' >&nbsp;&nbsp;&nbsp;&nbsp;" "<img src=':/icons/rsc/logoVGLab.png' >&nbsp;&nbsp;&nbsp;&nbsp;"
"<img src=':/icons/rsc/logoURJC.png' ><br><br> " "<img src=':/icons/rsc/logoURJC.png' ><br><br> "
"</p>" "</p>"
"") "")
); );
} }
void MainWindow::openRecorder( void ) void MainWindow::openRecorder()
{ {
// The button stops the recorder if found. // The button stops the recorder if found.
if( _recorder != nullptr ) if( _recorder )
{ {
_ui->actionRecorder->setDisabled( true ); _ui->actionRecorder->setDisabled( true );
_recorder->stop(); _recorder->stop();
...@@ -354,12 +350,12 @@ void MainWindow::openRecorder( void ) ...@@ -354,12 +350,12 @@ void MainWindow::openRecorder( void )
params.showSourceParameters = false; params.showSourceParameters = false;
} }
auto dialog = new RecorderDialog( nullptr , params , true ); RecorderDialog dialog( nullptr , params , true );
dialog->setWindowIcon( QIcon( ":/icons/rsc/neurotessmesh.png" )); dialog.setWindowIcon( QIcon( ":/icons/rsc/neurotessmesh.png" ));
dialog->setFixedSize( 800 , 600 ); dialog.setFixedSize( 800 , 600 );
if ( dialog->exec( ) == QDialog::Accepted) if ( dialog.exec( ) == QDialog::Accepted)
{ {
_recorder = dialog->getRecorder( ); _recorder = dialog.getRecorder( );
connect( _recorder , SIGNAL( finished( )) , connect( _recorder , SIGNAL( finished( )) ,
_recorder , SLOT( deleteLater( ))); _recorder , SLOT( deleteLater( )));
connect( _recorder , SIGNAL( finished( )) , connect( _recorder , SIGNAL( finished( )) ,
...@@ -369,7 +365,6 @@ void MainWindow::openRecorder( void ) ...@@ -369,7 +365,6 @@ void MainWindow::openRecorder( void )
{ {
_ui->actionRecorder->setChecked( false ); _ui->actionRecorder->setChecked( false );
} }
dialog->deleteLater( );
} }
void MainWindow::updateExtractMeshDock( void ) void MainWindow::updateExtractMeshDock( void )
...@@ -409,7 +404,6 @@ void MainWindow::onListClicked( QListWidgetItem* item ) ...@@ -409,7 +404,6 @@ void MainWindow::onListClicked( QListWidgetItem* item )
void MainWindow::onActionGenerate( int /*value_*/ ) void MainWindow::onActionGenerate( int /*value_*/ )
{ {
float alphaRadius = ( float )_radiusSlider->value( ) / 100.0f; float alphaRadius = ( float )_radiusSlider->value( ) / 100.0f;
std::vector< float > alphaNeurites; std::vector< float > alphaNeurites;
...@@ -428,7 +422,7 @@ void MainWindow::finishRecording( ) ...@@ -428,7 +422,7 @@ void MainWindow::finishRecording( )
void MainWindow::_generateNeuritesLayout( void ) void MainWindow::_generateNeuritesLayout( void )
{ {
unsigned int numDendrites = _openGLWidget->numNeuritesToEdit( ); const unsigned int numDendrites = _openGLWidget->numNeuritesToEdit( );
_neuriteSliders.clear( ); _neuriteSliders.clear( );
...@@ -598,11 +592,8 @@ void MainWindow::_initConfigurationDock( void ) ...@@ -598,11 +592,8 @@ void MainWindow::_initConfigurationDock( void )
new QLabel( QString( "Distance threshold" ))); new QLabel( QString( "Distance threshold" )));
vbox->addWidget( _distanceSlider ); vbox->addWidget( _distanceSlider );
// Radio Buttons Group // Radio Buttons Group
auto tessMethodGroup = new QGroupBox( QString( "Tessellation criteria" ));
QGroupBox* tessMethodGroup =
new QGroupBox( QString( "Tessellation criteria" ));
_configDockLayout->addWidget( tessMethodGroup ); _configDockLayout->addWidget( tessMethodGroup );
vbox = new QVBoxLayout; vbox = new QVBoxLayout;
tessMethodGroup->setLayout( vbox ); tessMethodGroup->setLayout( vbox );
...@@ -622,7 +613,6 @@ void MainWindow::_initConfigurationDock( void ) ...@@ -622,7 +613,6 @@ void MainWindow::_initConfigurationDock( void )
_ui->actionConfiguration, SLOT( setChecked( bool ))); _ui->actionConfiguration, SLOT( setChecked( bool )));
connect( _ui->actionConfiguration, SIGNAL( triggered( )), connect( _ui->actionConfiguration, SIGNAL( triggered( )),
this, SLOT( updateConfigurationDock( ))); this, SLOT( updateConfigurationDock( )));
} }
void MainWindow::_initRenderOptionsDock( void ) void MainWindow::_initRenderOptionsDock( void )
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
const float OpenGLWidget::_colorFactor = 1 / 255.0f; const float OpenGLWidget::_colorFactor = 1 / 255.0f;
OpenGLWidget::OpenGLWidget( QWidget* parent_, OpenGLWidget::OpenGLWidget( QWidget* parent_,
Qt::WindowFlags windowsFlags_ ) Qt::WindowFlags windowsFlags_ )
: QOpenGLWidget( parent_, windowsFlags_ ) : QOpenGLWidget( parent_, windowsFlags_ )
...@@ -61,11 +60,11 @@ OpenGLWidget::OpenGLWidget( QWidget* parent_, ...@@ -61,11 +60,11 @@ OpenGLWidget::OpenGLWidget( QWidget* parent_,
_lastSavedFileName = QDir::currentPath( ); _lastSavedFileName = QDir::currentPath( );
} }
OpenGLWidget::~OpenGLWidget( void ) OpenGLWidget::~OpenGLWidget( void )
{ {
delete _camera; delete _camera;
delete _scene; delete _scene;
delete _cameraTimer;
} }
bool OpenGLWidget::loadData( bool OpenGLWidget::loadData(
...@@ -138,11 +137,15 @@ void OpenGLWidget::setZeqSession( const std::string& ...@@ -138,11 +137,15 @@ void OpenGLWidget::setZeqSession( const std::string&
if ( !session_.empty( )) if ( !session_.empty( ))
{ {
if ( _camera ) if ( _camera )
{
delete _camera; delete _camera;
}
_camera = new reto::OrbitalCameraController( nullptr, session_ ); _camera = new reto::OrbitalCameraController( nullptr, session_ );
if ( _subscriberThread ) if ( _subscriberThread )
{ {
_subscriberThread->~thread();
delete _subscriberThread; delete _subscriberThread;
delete _subscriber; delete _subscriber;
} }
...@@ -273,30 +276,24 @@ void OpenGLWidget::extractEditNeuronMesh( void ) ...@@ -273,30 +276,24 @@ void OpenGLWidget::extractEditNeuronMesh( void )
{ {
if( _scene->isEditNeuronMeshExtraction( )) if( _scene->isEditNeuronMeshExtraction( ))
{ {
QString path; QString path;
QString filter( tr( "OBJ (*.obj);; All files (*)" )); const QString filter( tr( "OBJ (*.obj);; All files (*)" ));
QFileDialog* fd = new QFileDialog( this, QFileDialog fd(this, QString( "Save mesh to OBJ file" ),
QString( "Save mesh to OBJ file" ), _lastSavedFileName, filter );
_lastSavedFileName,
filter ); fd.setOption( QFileDialog::DontUseNativeDialog, true );
fd.setDefaultSuffix( "obj") ;
fd->setOption( QFileDialog::DontUseNativeDialog, true ); fd.setFileMode( QFileDialog/*::FileMode*/::AnyFile );
fd->setDefaultSuffix( "obj") ; fd.setAcceptMode( QFileDialog/*::AcceptMode*/::AcceptSave );
fd->setFileMode( QFileDialog/*::FileMode*/::AnyFile ); if ( fd.exec( ))
fd->setAcceptMode( QFileDialog/*::AcceptMode*/::AcceptSave ); path = fd.selectedFiles( )[0];
if ( fd->exec( ))
path = fd->selectedFiles( )[0]; if ( !path.isEmpty() )
if ( path != QString( "" ))
{ {
std::cout << "file " << path.toStdString( ) << std::endl;
_lastSavedFileName = QFileInfo( path ).path( ); _lastSavedFileName = QFileInfo( path ).path( );
this->makeCurrent( ); this->makeCurrent( );
_scene->extractEditNeuronMesh( path.toStdString( )); _scene->extractEditNeuronMesh( path.toStdString( ));
glUseProgram( 0 ); glUseProgram( 0 );
} }
} }
} }
...@@ -393,21 +390,19 @@ void OpenGLWidget::paintGL( void ) ...@@ -393,21 +390,19 @@ void OpenGLWidget::paintGL( void )
#define FRAMES_PAINTED_TO_MEASURE_FPS 10 #define FRAMES_PAINTED_TO_MEASURE_FPS 10
if ( _frameCount % FRAMES_PAINTED_TO_MEASURE_FPS == 0 ) if ( _frameCount % FRAMES_PAINTED_TO_MEASURE_FPS == 0 )
{ {
std::chrono::time_point< std::chrono::system_clock > now = std::chrono::time_point< std::chrono::system_clock > now =
std::chrono::system_clock::now( ); std::chrono::system_clock::now( );
auto duration = const auto duration =
std::chrono::duration_cast<std::chrono::milliseconds>( now - _then ); std::chrono::duration_cast<std::chrono::milliseconds>( now - _then );
_then = now; _then = now;
MainWindow* mainWindow = dynamic_cast< MainWindow* >( parent( )); MainWindow* mainWindow = dynamic_cast< MainWindow* >( parent( ));
if ( mainWindow ) if ( mainWindow )
{ {
const unsigned int ellapsedMiliseconds = duration.count( );
unsigned int ellapsedMiliseconds = duration.count( ); const unsigned int fps = roundf( 1000.0f *
unsigned int fps = roundf( 1000.0f *
float( FRAMES_PAINTED_TO_MEASURE_FPS ) / float( FRAMES_PAINTED_TO_MEASURE_FPS ) /
float( ellapsedMiliseconds )); float( ellapsedMiliseconds ));
...@@ -422,12 +417,10 @@ void OpenGLWidget::paintGL( void ) ...@@ -422,12 +417,10 @@ void OpenGLWidget::paintGL( void )
else else
_fpsLabel.setVisible( false ); _fpsLabel.setVisible( false );
} }
} }
if ( _idleUpdate ) if ( _idleUpdate )
{ {
// std::cout << _frameCount << std::endl;
update( ); update( );
} }
else else
...@@ -502,7 +495,6 @@ void OpenGLWidget::mouseMoveEvent( QMouseEvent* event_ ) ...@@ -502,7 +495,6 @@ void OpenGLWidget::mouseMoveEvent( QMouseEvent* event_ )
this->update( ); this->update( );
} }
void OpenGLWidget::wheelEvent( QWheelEvent* event_ ) void OpenGLWidget::wheelEvent( QWheelEvent* event_ )
{ {
...@@ -517,8 +509,6 @@ void OpenGLWidget::wheelEvent( QWheelEvent* event_ ) ...@@ -517,8 +509,6 @@ void OpenGLWidget::wheelEvent( QWheelEvent* event_ )
} }
void OpenGLWidget::keyPressEvent( QKeyEvent* event_ ) void OpenGLWidget::keyPressEvent( QKeyEvent* event_ )
{ {
makeCurrent( ); makeCurrent( );
......
<RCC> <RCC>
<qresource prefix="icons"> <qresource prefix="icons">
<file>rsc/gmrv_grande.png</file>
<file>rsc/logoURJC.png</file> <file>rsc/logoURJC.png</file>
<file>rsc/logoVGLab.png</file>
<file>neurotessmesh.ico</file> <file>neurotessmesh.ico</file>
<file>rsc/wireframe.png</file> <file>rsc/wireframe.png</file>
<file>rsc/open_swc.png</file> <file>rsc/open_swc.png</file>
......
neurotessmesh/rsc/gmrv_grande.png

3.29 KiB

neurotessmesh/rsc/logoVGLab.png

1.85 KiB

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment