Skip to content

Commit

Permalink
acq overlay working
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaredmales
jaredmales committed Oct 24, 2024
1 parent 8568b3d commit 30a00fc
Show file tree
Hide file tree
Showing 4 changed files with 122 additions and 82 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ apps/pi335Ctrl/pi335Ctrl
apps/picamCtrl/picamCtrl
apps/picoMotorCtrl/picoMotorCtrl
apps/psfFit/psfFit
apps/psfFit/psfAcq
apps/psfAcq/psfAcq
apps/pupilAlign/pupilAlign
apps/pupilFit/pupilFit
apps/pvcamCtrl/pvcamCtrl
Expand Down
Binary file removed apps/psfAcq/psfAcq
View file
Binary file not shown.
182 changes: 104 additions & 78 deletions gui/rtimv/plugins/acquistion/acquisition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ int acquisition::attachOverlay( rtimvOverlayAccess &roa, mx::app::appConfigurato
}

config.configUnused( m_cameraName, mx::app::iniFile::makeKey( "acquisition", "camera" ) );
config.configUnused( m_circRad, mx::app::iniFile::makeKey( "acquisition", "radius" ) );
config.configUnused( m_color, mx::app::iniFile::makeKey( "acquisition", "color" ) );
config.configUnused( m_fontSize, mx::app::iniFile::makeKey( "acquisition", "fontSize" ) );

m_enableable = true;
m_enabled = true;
Expand All @@ -36,10 +39,11 @@ int acquisition::attachOverlay( rtimvOverlayAccess &roa, mx::app::appConfigurato
// Register these
( *m_roa.m_dictionary )[m_cameraName + ".fg_frameSize.width"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_cameraName + ".fg_frameSize.height"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_deviceName + ".star_0.x"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_deviceName + ".num_stars.current"].setBlob( nullptr, 0 );
/*( *m_roa.m_dictionary )[m_deviceName + ".star_0.x"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_deviceName + ".star_0.y"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_deviceName + ".star_1.x"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_deviceName + ".star_1.y"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_deviceName + ".star_1.y"].setBlob( nullptr, 0 );*/

//(*m_roa.m_dictionary)[m_deviceName + ""].setBlob(nullptr, 0);
}
Expand Down Expand Up @@ -150,108 +154,120 @@ int acquisition::updateOverlay()

std::string sstr;

size_t nstars = 2;
std::vector<float> xs( nstars, -1 );
std::vector<float> ys( nstars, -1 );

// Get curr size
m_width = getBlobVal<int>( m_cameraName, "fg_frameSize.width", -1 );
m_height = getBlobVal<int>( m_cameraName, "fg_frameSize.height", -1 );

for( size_t n = 0; n < nstars; ++n )
size_t nstars = getBlobVal<int>("num_stars.current", 0);

if(m_nStars != nstars)
{
std::string star = "star_" + std::to_string( n );
xs[n] = getBlobVal<float>( star + ".x", -1 );
ys[n] = getBlobVal<float>( star + ".y", -1 );
m_nStars = nstars;
for( size_t n = 0; n < m_nStars; ++n )
{
std::string star = ".star_" + std::to_string( n );

( *m_roa.m_dictionary )[m_deviceName + star + ".x"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_deviceName + star + ".y"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_deviceName + star + ".peak"].setBlob( nullptr, 0 );
( *m_roa.m_dictionary )[m_deviceName + star + ".fwhm"].setBlob( nullptr, 0 );
}

std::lock_guard<std::mutex> guard( m_starCircleMutex );

if( m_starCircles.size() != nstars || m_starLabels.size() != nstars )
//deallocate circles
for( size_t s = 0; s < m_starCircles.size(); ++s )
{
for( size_t s = 0; s < m_starCircles.size(); ++s )
if( m_starCircles[s] != nullptr )
{
if( m_starCircles[s] != nullptr )
{
m_starCircles[s]->deleteLater();
}
m_starCircles[s]->deleteLater();
}
}

for( size_t s = 0; s < m_starLabels.size(); ++s )
//deallocate labels
for( size_t s = 0; s < m_starLabels.size(); ++s )
{
if( m_starLabels[s] != nullptr )
{
if( m_starLabels[s] != nullptr )
{
m_starLabels[s]->deleteLater();
}
m_starLabels[s]->deleteLater();
}

m_starCircles.resize( nstars, nullptr );
m_starLabels.resize( nstars, nullptr );
}

if( xs[n] >= 0 && ys[n] >= 0 )
m_starCircles.resize( m_nStars, nullptr );
m_starLabels.resize( m_nStars, nullptr );

for( size_t n = 0; n < m_nStars; ++n )
{
if( m_starCircles[n] == nullptr )
{
m_starCircles[n] = new StretchCircle( xs[n] - 5, ys[n] - 5, 10, 10 );
m_starCircles[n]->setPenColor( "cyan" );
m_starCircles[n]->setPenWidth( 0 );
m_starCircles[n]->setVisible( false );
m_starCircles[n]->setStretchable( false );
m_starCircles[n]->setRemovable( false );

connect( m_starCircles[n],
SIGNAL( remove( StretchCircle * ) ),
this,
SLOT( stretchCircleRemove( StretchCircle * ) ) );
emit newStretchCircle( m_starCircles[n] );
}
//create circle
m_starCircles[n] = new StretchCircle;
m_starCircles[n]->setPenColor( m_color.c_str() );
m_starCircles[n]->setPenWidth( 0 );
m_starCircles[n]->setVisible( false );
m_starCircles[n]->setStretchable( false );
m_starCircles[n]->setRemovable( false );
connect( m_starCircles[n],
SIGNAL( remove( StretchCircle * ) ),
this,
SLOT( stretchCircleRemove( StretchCircle * ) ) );
emit newStretchCircle( m_starCircles[n] );

//create label
m_starLabels[n] = new QTextEdit( m_roa.m_graphicsView );
QFont qf;
qf = m_starLabels[n]->currentFont();
qf.setPixelSize( m_fontSize );
m_starLabels[n]->setCurrentFont( qf );
m_starLabels[n]->setVisible( false );
m_starLabels[n]->setTextColor( m_color.c_str() );
m_roa.m_graphicsView->textEditSetup(m_starLabels[n]);
}
}

if( m_starLabels[n] == nullptr )
{
m_starLabels[n] = new QTextEdit( m_roa.m_graphicsView );

QFont qf;
qf = m_starLabels[n]->currentFont();
qf.setPixelSize( 24 );
m_starLabels[n]->setCurrentFont( qf );
m_starLabels[n]->setVisible( false );
m_starLabels[n]->setTextColor( "cyan" );
m_starLabels[n]->setWordWrapMode( QTextOption::NoWrap );

m_starLabels[n]->setFrameStyle( QFrame::Plain | QFrame::NoFrame );
m_starLabels[n]->viewport()->setAutoFillBackground( false );
m_starLabels[n]->setVisible( true );
m_starLabels[n]->setEnabled( false );
m_starLabels[n]->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
m_starLabels[n]->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
m_starLabels[n]->setAttribute( Qt::WA_TransparentForMouseEvents );
}
std::vector<float> xs( m_nStars, -1 );
std::vector<float> ys( m_nStars, -1 );

float xc = xs[n] - 0.5 * ( 10.0 );
float yc = ( m_height - ys[n] ) - 0.5 * ( 10.0 );
for( size_t n = 0; n < m_nStars; ++n )
{
std::string star = "star_" + std::to_string( n );

m_starCircles[n]->setRect( xc, yc, 10, 10 );
xs[n] = getBlobVal<float>( star + ".x", -1 );
ys[n] = getBlobVal<float>( star + ".y", -1 );

m_starCircles[n]->setVisible( true );
//Now for each valid star position, set up the overlay
if( xs[n] >= 0 && ys[n] >= 0)
{
std::lock_guard<std::mutex> guard( m_starCircleMutex );

StretchCircle *sc = m_starCircles[n]; //Just for convenience
QTextEdit * te = m_starLabels[n];

//Move the circle
float xc = xs[n] - 0.5 * ( m_circRad );
float yc = ( m_height - ys[n] ) - 0.5 * ( m_circRad );

sc->setRect( xc, yc, m_circRad, m_circRad );
sc->setVisible( true );

//Format the number
char tmp[32];
snprintf( tmp, sizeof( tmp ), "%ld", n );
m_starLabels[n]->setText( tmp );

StretchCircle *sc = m_starCircles[n];
te->setText( tmp );

//float posx = sc->rect().x() + sc->pos().x() + sc->rect().width() * 0.5 - sc->radius() * 0.707;
//float posy = sc->rect().y() + sc->pos().y() + sc->rect().height() * 0.5 - sc->radius() * 0.707;
//Set size based on the font size
QFontMetrics fm(te->currentFont());
QSize textSize = fm.size(0, tmp);
te->resize( textSize.width()+5,textSize.height()+5 );

// Take scene coordinates to viewport coordinates.
//Place the number
//Take scene coordinates to viewport coordinates.
QRectF sbr = sc->sceneBoundingRect();
QPoint qr = m_roa.m_graphicsView->mapFromScene(
QPointF( sbr.x() + sc->rect().width() * 0.5 - sc->radius() ,
sbr.y() + sc->rect().height() * 0.5 - sc->radius()) );
m_starLabels[n]->resize( 150, 100 );
m_starLabels[n]->move( qr.x(), qr.y() );
float qpf_x = sbr.x() + sc->rect().width() * 0.5 - sc->radius();
float qpf_y = sbr.y() + sc->rect().height() * 0.5 - sc->radius();
QPoint qr = m_roa.m_graphicsView->mapFromScene(QPointF( qpf_x , qpf_y ));

m_starLabels[n]->setVisible( true );
te->move( qr.x(), qr.y() );

te->setVisible( true );
}
}

Expand Down Expand Up @@ -279,16 +295,26 @@ bool acquisition::overlayEnabled()
void acquisition::enableOverlay()
{
if( m_enableable == false )
{
return;
}

m_enabled = true;
}

void acquisition::disableOverlay()
{
for( size_t n = 0; n < m_roa.m_graphicsView->statusTextNo(); ++n )
for( size_t n = 0; n < m_nStars; ++n )
{
m_roa.m_graphicsView->statusTextText( n, "" );
if(m_starCircles[n] != nullptr)
{
m_starCircles[n]->setVisible(false);
}
if(m_starLabels[n] != nullptr)
{
m_starLabels[n]->setVisible(false);
}

}

m_enabled = false;
Expand Down
20 changes: 17 additions & 3 deletions gui/rtimv/plugins/acquistion/acquisition.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,32 @@ class acquisition : public rtimvOverlayInterface
Q_INTERFACES(rtimvOverlayInterface)

protected:

/** \name Configurable Parameters
* @{
*/
std::string m_deviceName; ///< INDI device name of the acquisition program

std::string m_cameraName; ///< INDI device name of the associated camera

int m_circRad {10}; ///< Radius of the circle to draw around the star

std::string m_color {"cyan"}; ///< Color name or RGB spec for the overlay

int m_fontSize {18}; ///< The font size for the overlay

///@}

rtimvOverlayAccess m_roa;

bool m_enabled{false};

bool m_enableable{false};

std::string m_deviceName;

std::string m_cameraName;

QGraphicsScene *m_qgs{nullptr};

size_t m_nStars {0};
std::vector<StretchCircle *> m_starCircles;
std::vector<QTextEdit *> m_starLabels;

Expand Down

0 comments on commit 30a00fc

Please sign in to comment.