VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-19 15:07:52 -04:00
Code Issues Projects Releases Wiki Activity

New scope: refactor display arrangement methods: unique displays

Browse Source
This commit is contained in:
f4exb 2017-02-15 00:20:53 +01:00
parent f719ced17f
commit 912259a0ad
2 changed files with 212 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

780
sdrbase/gui/glscopeng.cpp
View File

@ -360,7 +360,7 @@ void GLScopeNG::paintGL()
}; };
QVector4D color(1.0f, 1.0f, 1.0f, 0.5f); QVector4D color(1.0f, 1.0f, 1.0f, 0.5f);
m_glShaderSimple.drawContour(m_glScopeMatrix1, color, q3, 4); m_glShaderSimple.drawContour(m_glScopeMatrix2, color, q3, 4);
} }
// paint grid // paint grid
@ -394,12 +394,12 @@ void GLScopeNG::paintGL()
float blue = 1.0f; float blue = 1.0f;
QVector4D color(1.0f, 1.0f, blue, (float) m_displayGridIntensity / 100.0f); QVector4D color(1.0f, 1.0f, blue, (float) m_displayGridIntensity / 100.0f);
m_glShaderSimple.drawSegments(m_glScopeMatrix1, color, q3, 2*effectiveTicks); m_glShaderSimple.drawSegments(m_glScopeMatrix2, color, q3, 2*effectiveTicks);
} }
// X1 (time) // X2 (time)
{ {
tickList = &m_x1Scale.getTickList(); tickList = &m_x2Scale.getTickList();
GLfloat q3[4*tickList->count()]; GLfloat q3[4*tickList->count()];
int effectiveTicks = 0; int effectiveTicks = 0;
@ -407,7 +407,7 @@ void GLScopeNG::paintGL()
tick = &(*tickList)[i]; tick = &(*tickList)[i];
if(tick->major) { if(tick->major) {
if(tick->textSize > 0) { if(tick->textSize > 0) {
float x = tick->pos / m_x1Scale.getSize(); float x = tick->pos / m_x2Scale.getSize();
q3[4*effectiveTicks] = x; q3[4*effectiveTicks] = x;
q3[4*effectiveTicks+1] = 0; q3[4*effectiveTicks+1] = 0;
q3[4*effectiveTicks+2] = x; q3[4*effectiveTicks+2] = x;
@ -418,7 +418,7 @@ void GLScopeNG::paintGL()
} }
QVector4D color(1.0f, 1.0f, 1.0f, (float) m_displayGridIntensity / 100.0f); QVector4D color(1.0f, 1.0f, 1.0f, (float) m_displayGridIntensity / 100.0f);
m_glShaderSimple.drawSegments(m_glScopeMatrix1, color, q3, 2*effectiveTicks); m_glShaderSimple.drawSegments(m_glScopeMatrix2, color, q3, 2*effectiveTicks);
} }
// paint left #2 scale // paint left #2 scale
@ -435,10 +435,10 @@ void GLScopeNG::paintGL()
1, 0, 1, 0,
0, 0 0, 0
}; };
m_glShaderLeft2Scale.drawSurface(m_glLeft1ScaleMatrix, tex1, vtx1, 4); m_glShaderLeft2Scale.drawSurface(m_glLeft2ScaleMatrix, tex1, vtx1, 4);
} }
// paint bottom #1 scale // paint bottom #2 scale
{ {
GLfloat vtx1[] = { GLfloat vtx1[] = {
0, 1, 0, 1,
@ -452,7 +452,7 @@ void GLScopeNG::paintGL()
1, 0, 1, 0,
0, 0 0, 0
}; };
m_glShaderBottom1Scale.drawSurface(m_glBot1ScaleMatrix, tex1, vtx1, 4); m_glShaderBottom2Scale.drawSurface(m_glBot2ScaleMatrix, tex1, vtx1, 4);
} }
// paint traces #1..n // paint traces #1..n
@ -469,11 +469,11 @@ void GLScopeNG::paintGL()
if(end - start < 2) if(end - start < 2)
start--; start--;
float rectX = m_glScopeRect1.x(); float rectX = m_glScopeRect2.x();
float rectY = m_glScopeRect1.y() + m_glScopeRect1.height() / 2.0f; float rectY = m_glScopeRect2.y() + m_glScopeRect2.height() / 2.0f;
float rectW = m_glScopeRect1.width() * (float)m_timeBase / (float)(m_traceSize - 1); float rectW = m_glScopeRect2.width() * (float)m_timeBase / (float)(m_traceSize - 1);
//float rectH = -(m_glScopeRect1.height() / 2.0f) * traceData.m_amp; //float rectH = -(m_glScopeRect1.height() / 2.0f) * traceData.m_amp;
float rectH = -m_glScopeRect1.height() / 2.0f; float rectH = -m_glScopeRect2.height() / 2.0f;
//QVector4D color(1.0f, 1.0f, 0.25f, m_displayTraceIntensity / 100.0f); //QVector4D color(1.0f, 1.0f, 0.25f, m_displayTraceIntensity / 100.0f);
QVector4D color(traceData.m_traceColorR, traceData.m_traceColorG, traceData.m_traceColorB, m_displayTraceIntensity / 100.0f); QVector4D color(traceData.m_traceColorR, traceData.m_traceColorG, traceData.m_traceColorB, m_displayTraceIntensity / 100.0f);
@ -491,10 +491,10 @@ void GLScopeNG::paintGL()
1, traceData.m_triggerDisplayLevel 1, traceData.m_triggerDisplayLevel
}; };
float rectX = m_glScopeRect1.x(); float rectX = m_glScopeRect2.x();
float rectY = m_glScopeRect1.y() + m_glScopeRect1.height() / 2.0f; float rectY = m_glScopeRect2.y() + m_glScopeRect2.height() / 2.0f;
float rectW = m_glScopeRect1.width(); float rectW = m_glScopeRect2.width();
float rectH = -m_glScopeRect1.height() / 2.0f; float rectH = -m_glScopeRect2.height() / 2.0f;
QVector4D color( QVector4D color(
m_focusedTriggerData.m_triggerColorR, m_focusedTriggerData.m_triggerColorR,
@ -580,6 +580,8 @@ void GLScopeNG::applyConfig()
float t_start = (((m_timeOfsProMill / 1000.0f) * (float) m_traceSize) / m_sampleRate) - ((float) m_triggerPre / m_sampleRate); float t_start = (((m_timeOfsProMill / 1000.0f) * (float) m_traceSize) / m_sampleRate) - ((float) m_triggerPre / m_sampleRate);
float t_len = ((float) m_traceSize / m_sampleRate) / (float) m_timeBase; float t_len = ((float) m_traceSize / m_sampleRate) / (float) m_timeBase;
// scales
m_x1Scale.setRange(Unit::Time, t_start, t_start + t_len); // time scale m_x1Scale.setRange(Unit::Time, t_start, t_start + t_len); // time scale
m_x2Scale.setRange(Unit::Time, t_start, t_start + t_len); // time scale m_x2Scale.setRange(Unit::Time, t_start, t_start + t_len); // time scale
@ -597,584 +599,224 @@ void GLScopeNG::applyConfig()
setYScale(m_y2Scale, 0); // Default to the X trace (trace #0) - If there is only one trace it should not get there (Y displays disabled in the UI) setYScale(m_y2Scale, 0); // Default to the X trace (trace #0) - If there is only one trace it should not get there (Y displays disabled in the UI)
} }
if ((m_displayMode == DisplayX) || (m_displayMode == DisplayY)) // unique display // display arrangements
if ((m_displayMode == DisplayX) || (m_displayMode == DisplayY)) // unique displays
{ {
int scopeHeight = height() - m_topMargin - m_botMargin; setUniqueDisplays();
int scopeWidth = width() - m_leftMargin - m_rightMargin; }
else if (m_displayMode == DisplayXYV) // both displays vertically arranged
m_glScopeRect1 = QRectF(
(float) m_leftMargin / (float) width(),
(float) m_topMargin / (float) height(),
(float) scopeWidth / (float) width(),
(float) scopeHeight / (float) height()
);
m_glScopeMatrix1.setToIdentity();
m_glScopeMatrix1.translate (
-1.0f + ((float) 2*m_leftMargin / (float) width()),
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glScopeMatrix1.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*scopeHeight / (float) height()
);
m_glBot1ScaleMatrix.setToIdentity();
m_glBot1ScaleMatrix.translate (
-1.0f + ((float) 2*m_leftMargin / (float) width()),
1.0f - ((float) 2*(scopeHeight + m_topMargin + 1) / (float) height())
);
m_glBot1ScaleMatrix.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*(m_botMargin - 1) / (float) height()
);
m_glLeft1ScaleMatrix.setToIdentity();
m_glLeft1ScaleMatrix.translate (
-1.0f,
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glLeft1ScaleMatrix.scale (
(float) 2*(m_leftMargin-1) / (float) width(),
(float) -2*scopeHeight / (float) height()
);
{ // X1 scale
m_x1Scale.setSize(scopeWidth);
m_bot1ScalePixmap = QPixmap(
scopeWidth,
m_botMargin - 1
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_bot1ScalePixmap.fill(Qt::black);
QPainter painter(&m_bot1ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_x1Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(tick->textPos, fm.height() - 1), tick->text);
}
}
}
m_glShaderBottom1Scale.initTexture(m_bot1ScalePixmap.toImage());
} // X1 scale
if (m_displayMode == DisplayX) // use Y1 scale
{
m_y1Scale.setSize(scopeHeight);
m_left1ScalePixmap = QPixmap(
m_leftMargin - 1,
scopeHeight
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_left1ScalePixmap.fill(Qt::black);
QPainter painter(&m_left1ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_y1Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(m_leftMargin - M - tick->textSize, m_topMargin + scopeHeight - tick->textPos - fm.ascent()/2), tick->text);
}
}
}
m_glShaderLeft1Scale.initTexture(m_left1ScalePixmap.toImage());
}
else if (m_displayMode == DisplayY) // use Y2 scale
{
m_y2Scale.setSize(scopeHeight);
m_left2ScalePixmap = QPixmap(
m_leftMargin - 1,
scopeHeight
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_left2ScalePixmap.fill(Qt::black);
QPainter painter(&m_left2ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_y2Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(m_leftMargin - M - tick->textSize, m_topMargin + scopeHeight - tick->textPos - fm.ascent()/2), tick->text);
}
}
}
m_glShaderLeft2Scale.initTexture(m_left2ScalePixmap.toImage());
} // Y scales
} // single display
else // dual display (X+Y or polar)
{ {
// left (first) display
if ((m_displayMode == DisplayXYH) || (m_displayMode == DisplayPol)) // horizontal split of first display
{
int scopeHeight = height() - m_topMargin - m_botMargin;
int scopeWidth = (width() - m_rightMargin)/2 - m_leftMargin;
m_glScopeRect1 = QRectF( }
(float) m_leftMargin / (float) width(), else if (m_displayMode == DisplayXYH) // both displays horizontally arranged
(float) m_topMargin / (float) height(), {
(float) scopeWidth / (float) width(),
(float) scopeHeight / (float) height()
);
m_glScopeMatrix1.setToIdentity();
m_glScopeMatrix1.translate (
-1.0f + ((float) 2*m_leftMargin / (float) width()),
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glScopeMatrix1.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*scopeHeight / (float) height()
);
m_glBot1ScaleMatrix.setToIdentity(); }
m_glBot1ScaleMatrix.translate ( else if (m_displayMode == DisplayPol) // horizontal arrangement: XY stacked on left and polar on right
-1.0f + ((float) 2*m_leftMargin / (float) width()), {
1.0f - ((float) 2*(scopeHeight + m_topMargin + 1) / (float) height())
);
m_glBot1ScaleMatrix.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*(m_botMargin - 1) / (float) height()
);
m_glLeft1ScaleMatrix.setToIdentity(); }
m_glLeft1ScaleMatrix.translate ( }
-1.0f,
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glLeft1ScaleMatrix.scale (
(float) 2*(m_leftMargin-1) / (float) width(),
(float) -2*scopeHeight / (float) height()
);
{ // Y1 scale void GLScopeNG::setUniqueDisplays()
m_y1Scale.setSize(scopeHeight); {
QFontMetrics fm(font());
int M = fm.width("-");
int scopeHeight = height() - m_topMargin - m_botMargin;
int scopeWidth = width() - m_leftMargin - m_rightMargin;
m_left1ScalePixmap = QPixmap( // X display
m_leftMargin - 1,
scopeHeight
);
const ScaleEngine::TickList* tickList; m_glScopeRect1 = QRectF(
const ScaleEngine::Tick* tick; (float) m_leftMargin / (float) width(),
(float) m_topMargin / (float) height(),
(float) scopeWidth / (float) width(),
(float) scopeHeight / (float) height()
);
m_glScopeMatrix1.setToIdentity();
m_glScopeMatrix1.translate (
-1.0f + ((float) 2*m_leftMargin / (float) width()),
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glScopeMatrix1.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*scopeHeight / (float) height()
);
m_left1ScalePixmap.fill(Qt::black); m_glBot1ScaleMatrix.setToIdentity();
QPainter painter(&m_left1ScalePixmap); m_glBot1ScaleMatrix.translate (
painter.setPen(QColor(0xf0, 0xf0, 0xff)); -1.0f + ((float) 2*m_leftMargin / (float) width()),
painter.setFont(font()); 1.0f - ((float) 2*(scopeHeight + m_topMargin + 1) / (float) height())
tickList = &m_y1Scale.getTickList(); );
m_glBot1ScaleMatrix.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*(m_botMargin - 1) / (float) height()
);
for(int i = 0; i < tickList->count(); i++) { m_glLeft1ScaleMatrix.setToIdentity();
tick = &(*tickList)[i]; m_glLeft1ScaleMatrix.translate (
if(tick->major) { -1.0f,
if(tick->textSize > 0) { 1.0f - ((float) 2*m_topMargin / (float) height())
painter.drawText(QPointF(m_leftMargin - M - tick->textSize, m_topMargin + scopeHeight - tick->textPos - fm.ascent()/2), tick->text); );
} m_glLeft1ScaleMatrix.scale (
} (float) 2*(m_leftMargin-1) / (float) width(),
(float) -2*scopeHeight / (float) height()
);
// Y displays
m_glScopeRect2 = QRectF(
(float) m_leftMargin / (float) width(),
(float) m_topMargin / (float) height(),
(float) scopeWidth / (float) width(),
(float) scopeHeight / (float) height()
);
m_glScopeMatrix2.setToIdentity();
m_glScopeMatrix2.translate (
-1.0f + ((float) 2*m_leftMargin / (float) width()),
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glScopeMatrix2.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*scopeHeight / (float) height()
);
m_glBot2ScaleMatrix.setToIdentity();
m_glBot2ScaleMatrix.translate (
-1.0f + ((float) 2*m_leftMargin / (float) width()),
1.0f - ((float) 2*(scopeHeight + m_topMargin + 1) / (float) height())
);
m_glBot2ScaleMatrix.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*(m_botMargin - 1) / (float) height()
);
m_glLeft2ScaleMatrix.setToIdentity();
m_glLeft2ScaleMatrix.translate (
-1.0f,
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glLeft2ScaleMatrix.scale (
(float) 2*(m_leftMargin-1) / (float) width(),
(float) -2*scopeHeight / (float) height()
);
{ // X horizontal scale (X1)
m_x1Scale.setSize(scopeWidth);
m_bot1ScalePixmap = QPixmap(
scopeWidth,
m_botMargin - 1
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_bot1ScalePixmap.fill(Qt::black);
QPainter painter(&m_bot1ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_x1Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(tick->textPos, fm.height() - 1), tick->text);
} }
m_glShaderLeft1Scale.initTexture(m_left1ScalePixmap.toImage());
} // Y1 scale
{ // X1 scale
m_x1Scale.setSize(scopeWidth);
m_bot1ScalePixmap = QPixmap(
scopeWidth,
m_botMargin - 1
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_bot1ScalePixmap.fill(Qt::black);
QPainter painter(&m_bot1ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_x1Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(tick->textPos, fm.height() - 1), tick->text);
}
}
}
m_glShaderBottom1Scale.initTexture(m_bot1ScalePixmap.toImage());
} // X1 scale
}
else // vertical split of first display
{
int scopeHeight = (height() - m_topMargin) / 2 - m_botMargin;
int scopeWidth = width() - m_leftMargin - m_rightMargin;
m_glScopeRect1 = QRectF(
(float) m_leftMargin / (float) width(),
(float) m_topMargin / (float) height(),
(float) scopeWidth / (float) width(),
(float) scopeHeight / (float) height()
);
m_glScopeMatrix1.setToIdentity();
m_glScopeMatrix1.translate (
-1.0f + ((float) 2*m_leftMargin / (float) width()),
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glScopeMatrix1.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*scopeHeight / (float) height()
);
m_glBot1ScaleMatrix.setToIdentity();
m_glBot1ScaleMatrix.translate (
-1.0f + ((float) 2*m_leftMargin / (float) width()),
1.0f - ((float) 2*(scopeHeight + m_topMargin + 1) / (float) height())
);
m_glBot1ScaleMatrix.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*(m_botMargin - 1) / (float) height()
);
m_glLeft1ScaleMatrix.setToIdentity();
m_glLeft1ScaleMatrix.translate (
-1.0f,
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glLeft1ScaleMatrix.scale (
(float) 2*(m_leftMargin-1) / (float) width(),
(float) -2*scopeHeight / (float) height()
);
{ // Y1 scale
m_y1Scale.setSize(scopeHeight);
m_left1ScalePixmap = QPixmap(
m_leftMargin - 1,
scopeHeight
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_left1ScalePixmap.fill(Qt::black);
QPainter painter(&m_left1ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_y1Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(m_leftMargin - M - tick->textSize, m_topMargin + scopeHeight - tick->textPos - fm.ascent()/2), tick->text);
}
}
}
m_glShaderLeft1Scale.initTexture(m_left1ScalePixmap.toImage());
} // Y1 scale
{ // X1 scale
m_x1Scale.setSize(scopeWidth);
m_bot1ScalePixmap = QPixmap(
scopeWidth,
m_botMargin - 1
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_bot1ScalePixmap.fill(Qt::black);
QPainter painter(&m_bot1ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_x1Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(tick->textPos, fm.height() - 1), tick->text);
}
}
}
m_glShaderBottom1Scale.initTexture(m_bot1ScalePixmap.toImage());
} // X1 scale
} // hotizontal or vertical split of first display
// right (second) display
if (m_displayMode == DisplayPol) // in Polar mode second display is square and split is horizontal
{
int scopeHeight = height() - m_topMargin - m_botMargin;
int scopeWidth = (width() - m_rightMargin)/2 - m_leftMargin;
int scopeDim = std::min(scopeWidth, scopeHeight);
m_glScopeRect2 = QRectF(
(float)(m_leftMargin + scopeWidth + m_leftMargin) / (float)width(),
(float)m_topMargin / (float)height(),
(float) scopeDim / (float)width(),
(float)(height() - m_topMargin - m_botMargin) / (float)height()
);
m_glScopeMatrix2.setToIdentity();
m_glScopeMatrix2.translate (
-1.0f + ((float) 2*(m_leftMargin + scopeWidth + m_leftMargin) / (float) width()),
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glScopeMatrix2.scale (
(float) 2*scopeDim / (float) width(),
(float) -2*(height() - m_topMargin - m_botMargin) / (float) height()
);
m_glLeft2ScaleMatrix.setToIdentity();
m_glLeft2ScaleMatrix.translate (
-1.0f + (float) 2*(m_leftMargin + scopeWidth) / (float) width(),
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glLeft2ScaleMatrix.scale (
(float) 2*(m_leftMargin-1) / (float) width(),
(float) -2*scopeHeight / (float) height()
);
m_glBot2ScaleMatrix.setToIdentity();
m_glBot2ScaleMatrix.translate (
-1.0f + ((float) 2*(m_leftMargin + m_leftMargin + scopeWidth) / (float) width()),
1.0f - ((float) 2*(scopeHeight + m_topMargin + 1) / (float) height())
);
m_glBot2ScaleMatrix.scale (
(float) 2*scopeDim / (float) width(),
(float) -2*(m_botMargin - 1) / (float) height()
);
}
else // both displays are similar and share space equally
{
if (m_displayMode == DisplayXYH) // horizontal split of second display
{
int scopeHeight = height() - m_topMargin - m_botMargin;
int scopeWidth = (width() - m_rightMargin)/2 - m_leftMargin;
m_glScopeRect2 = QRectF(
(float)(m_leftMargin + m_leftMargin + ((width() - m_leftMargin - m_leftMargin - m_rightMargin) / 2)) / (float)width(),
(float)m_topMargin / (float)height(),
(float)((width() - m_leftMargin - m_leftMargin - m_rightMargin) / 2) / (float)width(),
(float)(height() - m_topMargin - m_botMargin) / (float)height()
);
m_glScopeMatrix2.setToIdentity();
m_glScopeMatrix2.translate (
-1.0f + ((float) 2*(m_leftMargin + m_leftMargin + ((width() - m_leftMargin - m_leftMargin - m_rightMargin) / 2)) / (float) width()),
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glScopeMatrix2.scale (
(float) 2*((width() - m_leftMargin - m_leftMargin - m_rightMargin) / 2) / (float) width(),
(float) -2*(height() - m_topMargin - m_botMargin) / (float) height()
);
m_glLeft2ScaleMatrix.setToIdentity();
m_glLeft2ScaleMatrix.translate (
-1.0f + (float) 2*(m_leftMargin + scopeWidth) / (float) width(),
1.0f - ((float) 2*m_topMargin / (float) height())
);
m_glLeft2ScaleMatrix.scale (
(float) 2*(m_leftMargin-1) / (float) width(),
(float) -2*scopeHeight / (float) height()
);
m_glBot2ScaleMatrix.setToIdentity();
m_glBot2ScaleMatrix.translate (
-1.0f + ((float) 2*(m_leftMargin + m_leftMargin + scopeWidth) / (float) width()),
1.0f - ((float) 2*(scopeHeight + m_topMargin + 1) / (float) height())
);
m_glBot2ScaleMatrix.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*(m_botMargin - 1) / (float) height()
);
{ // Y2 scale
m_y2Scale.setSize(scopeHeight);
m_left2ScalePixmap = QPixmap(
m_leftMargin - 1,
scopeHeight
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_left2ScalePixmap.fill(Qt::black);
QPainter painter(&m_left2ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_y2Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(m_leftMargin - M - tick->textSize, m_topMargin + scopeHeight - tick->textPos - fm.ascent()/2), tick->text);
}
}
}
m_glShaderLeft2Scale.initTexture(m_left2ScalePixmap.toImage());
} // Y2 scale
{ // X2 scale
m_x2Scale.setSize(scopeWidth);
m_bot2ScalePixmap = QPixmap(
scopeWidth,
m_botMargin - 1
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_bot2ScalePixmap.fill(Qt::black);
QPainter painter(&m_bot2ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_x2Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(tick->textPos, fm.height() - 1), tick->text);
}
}
}
m_glShaderBottom2Scale.initTexture(m_bot2ScalePixmap.toImage());
} // X2 scale
} }
else // vertical split of second display }
{
int scopeHeight = (height() - m_topMargin) / 2 - m_botMargin;
int scopeWidth = width() - m_leftMargin - m_rightMargin;
m_glScopeRect2 = QRectF( m_glShaderBottom1Scale.initTexture(m_bot1ScalePixmap.toImage());
(float) m_leftMargin / (float)width(), } // X horizontal scale
(float) (m_botMargin + m_topMargin + scopeHeight) / (float)height(),
(float) scopeWidth / (float)width(),
(float) scopeHeight / (float)height()
);
m_glScopeMatrix2.setToIdentity();
m_glScopeMatrix2.translate (
-1.0f + ((float) 2*m_leftMargin / (float) width()),
1.0f - ((float) 2*(m_botMargin + m_topMargin + scopeHeight) / (float) height())
);
m_glScopeMatrix2.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*scopeHeight / (float) height()
);
m_glLeft2ScaleMatrix.setToIdentity(); { // Y horizontal scale (X2)
m_glLeft2ScaleMatrix.translate ( m_x2Scale.setSize(scopeWidth);
-1.0f,
1.0f - ((float) 2*(m_topMargin + scopeHeight + m_botMargin) / (float) height())
);
m_glLeft2ScaleMatrix.scale (
(float) 2*(m_leftMargin-1) / (float) width(),
(float) -2*scopeHeight / (float) height()
);
m_glBot2ScaleMatrix.setToIdentity(); m_bot2ScalePixmap = QPixmap(
m_glBot2ScaleMatrix.translate ( scopeWidth,
-1.0f + ((float) 2*m_leftMargin / (float) width()), m_botMargin - 1
1.0f - ((float) 2*(scopeHeight + m_topMargin + scopeHeight + m_botMargin + 1) / (float) height()) );
);
m_glBot2ScaleMatrix.scale (
(float) 2*scopeWidth / (float) width(),
(float) -2*(m_botMargin - 1) / (float) height()
);
{ // Y2 scale const ScaleEngine::TickList* tickList;
m_y2Scale.setSize(scopeHeight); const ScaleEngine::Tick* tick;
m_left2ScalePixmap = QPixmap( m_bot2ScalePixmap.fill(Qt::black);
m_leftMargin - 1, QPainter painter(&m_bot2ScalePixmap);
scopeHeight painter.setPen(QColor(0xf0, 0xf0, 0xff));
); painter.setFont(font());
tickList = &m_x2Scale.getTickList();
const ScaleEngine::TickList* tickList; for(int i = 0; i < tickList->count(); i++) {
const ScaleEngine::Tick* tick; tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(tick->textPos, fm.height() - 1), tick->text);
}
}
}
m_left2ScalePixmap.fill(Qt::black); m_glShaderBottom2Scale.initTexture(m_bot2ScalePixmap.toImage());
QPainter painter(&m_left2ScalePixmap); } // Y horizontal scale
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_y2Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) { { // X vertical scale (Y1)
tick = &(*tickList)[i]; m_y1Scale.setSize(scopeHeight);
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(m_leftMargin - M - tick->textSize, m_topMargin + scopeHeight - tick->textPos - fm.ascent()/2), tick->text);
}
}
}
m_glShaderLeft2Scale.initTexture(m_left2ScalePixmap.toImage()); m_left1ScalePixmap = QPixmap(
m_leftMargin - 1,
scopeHeight
);
} // Y2 scale const ScaleEngine::TickList* tickList;
{ // X2 scale const ScaleEngine::Tick* tick;
m_x2Scale.setSize(scopeWidth);
m_bot2ScalePixmap = QPixmap(
scopeWidth,
m_botMargin - 1
);
const ScaleEngine::TickList* tickList; m_left1ScalePixmap.fill(Qt::black);
const ScaleEngine::Tick* tick; QPainter painter(&m_left1ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_y1Scale.getTickList();
m_bot2ScalePixmap.fill(Qt::black); for(int i = 0; i < tickList->count(); i++) {
QPainter painter(&m_bot2ScalePixmap); tick = &(*tickList)[i];
painter.setPen(QColor(0xf0, 0xf0, 0xff)); if(tick->major) {
painter.setFont(font()); if(tick->textSize > 0) {
tickList = &m_x2Scale.getTickList(); painter.drawText(QPointF(m_leftMargin - M - tick->textSize, m_topMargin + scopeHeight - tick->textPos - fm.ascent()/2), tick->text);
}
}
}
for(int i = 0; i < tickList->count(); i++) { m_glShaderLeft1Scale.initTexture(m_left1ScalePixmap.toImage());
tick = &(*tickList)[i]; } // X vertical scale
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(tick->textPos, fm.height() - 1), tick->text);
}
}
}
m_glShaderBottom2Scale.initTexture(m_bot2ScalePixmap.toImage()); { // Y vertical scale (Y2)
} // X2 scale m_y2Scale.setSize(scopeHeight);
} // vertical or horizontal split of second display
} // second display square (polar mode) or half space m_left2ScalePixmap = QPixmap(
} // single or dual display m_leftMargin - 1,
scopeHeight
);
const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick;
m_left2ScalePixmap.fill(Qt::black);
QPainter painter(&m_left2ScalePixmap);
painter.setPen(QColor(0xf0, 0xf0, 0xff));
painter.setFont(font());
tickList = &m_y2Scale.getTickList();
for(int i = 0; i < tickList->count(); i++) {
tick = &(*tickList)[i];
if(tick->major) {
if(tick->textSize > 0) {
painter.drawText(QPointF(m_leftMargin - M - tick->textSize, m_topMargin + scopeHeight - tick->textPos - fm.ascent()/2), tick->text);
}
}
}
m_glShaderLeft2Scale.initTexture(m_left2ScalePixmap.toImage());
} // Y vertical scale
} }
void GLScopeNG::setYScale(ScaleEngine& scale, uint32_t highlightedTraceIndex) void GLScopeNG::setYScale(ScaleEngine& scale, uint32_t highlightedTraceIndex)

1
sdrbase/gui/glscopeng.h
View File

@ -139,6 +139,7 @@ private:
void applyConfig(); void applyConfig();
void setYScale(ScaleEngine& scale, uint32_t highlightedTraceIndex); void setYScale(ScaleEngine& scale, uint32_t highlightedTraceIndex);
void setUniqueDisplays();
protected slots: protected slots:
void cleanup(); void cleanup();