Include ngc db
This commit is contained in:
+21
-6
@@ -182,8 +182,8 @@ void ImageWidgetGL::setWCS(std::shared_ptr<WCSDataT> wcs)
|
||||
m_wcs = wcs;
|
||||
m_grid.clear();
|
||||
|
||||
if(m_drawGrid)
|
||||
m_grid = m_wcs->prepareGrid(m_imgWidth, m_imgHeight);
|
||||
if(m_drawGrid && m_wcs)
|
||||
m_grid = m_wcs->prepareGrid(m_imgWidth, m_imgHeight, m_database);
|
||||
}
|
||||
|
||||
void ImageWidgetGL::zoom(int zoom, const QPointF &mousePos)
|
||||
@@ -502,8 +502,8 @@ void swPaint(std::shared_ptr<RawImage> &rawImage, float dx, float dy, float scal
|
||||
|
||||
void ImageWidgetGL::drawGrid(bool enable)
|
||||
{
|
||||
if(m_grid.empty)
|
||||
m_grid = m_wcs->prepareGrid(m_imgWidth, m_imgHeight);
|
||||
if(m_grid.empty && m_wcs)
|
||||
m_grid = m_wcs->prepareGrid(m_imgWidth, m_imgHeight, m_database);
|
||||
|
||||
if(enable != m_drawGrid)
|
||||
{
|
||||
@@ -644,13 +644,28 @@ void ImageWidgetGL::paintGL()
|
||||
painter.setClipRect(0, 0, m_imgWidth, m_imgHeight);
|
||||
painter.drawPath(m_grid.grid);
|
||||
painter.setPen(Qt::yellow);
|
||||
painter.setFont(QFont({"Arial", "Sans"}, 12 / m_scale));
|
||||
QFont font({"Arial", "serif-sans"});
|
||||
font.setPointSizeF(12 / m_scale);
|
||||
painter.setFont(font);
|
||||
for(auto &text : m_grid.text)
|
||||
painter.drawText(QRectF(text.first, QSizeF(4000, 4000)), text.second);
|
||||
|
||||
painter.setPen(QPen(Qt::green, 1.0 / m_scale));
|
||||
QFontMetricsF fontMetric = QFontMetricsF(font);
|
||||
for(auto &object : m_grid.objects)
|
||||
{
|
||||
QRectF rect = fontMetric.boundingRect(object.name);
|
||||
rect.moveCenter(object.pixel);
|
||||
painter.setTransform(tran);
|
||||
painter.drawText(rect, Qt::TextDontClip, object.name);
|
||||
|
||||
painter.translate(object.pixel);
|
||||
painter.rotate(object.pos_ang);
|
||||
painter.drawEllipse(QPointF(0, 0), object.maj_ax, object.maj_ax);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void ImageWidgetGL::resizeGL(int w, int h)
|
||||
|
||||
Reference in New Issue
Block a user