VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-04 22:27:53 -04:00
Code Issues Projects Releases Wiki Activity

GLScope: IQ linear and IQ polar displays. Interim state #2: Resized secondary display

Browse Source
This commit is contained in:
f4exb 2015-11-06 05:19:55 +01:00
parent f891580e78
commit b121cefe88
1 changed files with 182 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

252
sdrbase/gui/glscope.cpp
View File

@ -1185,24 +1185,50 @@ void GLScope::applyConfig()
m_bot1ScaleTextureAllocated = true; m_bot1ScaleTextureAllocated = true;
} // X1 scale } // X1 scale
m_glScopeRect2 = QRectF( if (m_mode == ModeIQPolar)
(float) leftMargin / (float)width(), {
(float) (botMargin + topMargin + scopeHeight) / (float)height(), int scopeDim = std::min(scopeWidth, scopeHeight);
(float) scopeWidth / (float)width(),
(float) scopeHeight / (float)height() m_glScopeRect2 = QRectF(
); (float) leftMargin / (float)width(),
m_glLeft2ScaleRect = QRectF( (float) (botMargin + topMargin + scopeDim) / (float)height(),
0, (float) scopeDim / (float)width(),
(float) (topMargin + scopeHeight + botMargin) / (float) height(), (float) scopeDim / (float)height()
(float) (leftMargin-1) / (float) width(), );
(float) scopeHeight / (float) height() m_glLeft2ScaleRect = QRectF(
); 0,
m_glBot2ScaleRect = QRectF( (float) (topMargin + scopeDim + botMargin) / (float) height(),
(float) leftMargin / (float) width(), (float) (leftMargin-1) / (float) width(),
(float) (scopeHeight + topMargin + scopeHeight + botMargin + 1) / (float) height(), (float) scopeDim / (float) height()
(float) scopeWidth / (float) width(), );
(float) (botMargin - 1) / (float) height() m_glBot2ScaleRect = QRectF(
); (float) leftMargin / (float) width(),
(float) (scopeDim + topMargin + scopeDim + botMargin + 1) / (float) height(),
(float) scopeDim / (float) width(),
(float) (botMargin - 1) / (float) height()
);
}
else
{
m_glScopeRect2 = QRectF(
(float) leftMargin / (float)width(),
(float) (botMargin + topMargin + scopeHeight) / (float)height(),
(float) scopeWidth / (float)width(),
(float) scopeHeight / (float)height()
);
m_glLeft2ScaleRect = QRectF(
0,
(float) (topMargin + scopeHeight + botMargin) / (float) height(),
(float) (leftMargin-1) / (float) width(),
(float) scopeHeight / (float) height()
);
m_glBot2ScaleRect = QRectF(
(float) leftMargin / (float) width(),
(float) (scopeHeight + topMargin + scopeHeight + botMargin + 1) / (float) height(),
(float) scopeWidth / (float) width(),
(float) (botMargin - 1) / (float) height()
);
}
{ // Y2 scale { // Y2 scale
m_y2Scale.setSize(scopeHeight); m_y2Scale.setSize(scopeHeight);
@ -1239,12 +1265,24 @@ void GLScope::applyConfig()
m_left2ScaleTextureAllocated = true; m_left2ScaleTextureAllocated = true;
} // Y2 scale } // Y2 scale
{ // X2 scale { // X2 scale
m_x2Scale.setSize(scopeWidth); if (m_mode == ModeIQPolar)
{
int scopeDim = std::min(scopeWidth, scopeHeight);
m_bot2ScalePixmap = QPixmap( m_x2Scale.setSize(scopeDim);
scopeWidth, m_bot2ScalePixmap = QPixmap(
botMargin - 1 scopeDim,
); botMargin - 1
);
}
else
{
m_x2Scale.setSize(scopeWidth);
m_bot2ScalePixmap = QPixmap(
scopeWidth,
botMargin - 1
);
}
const ScaleEngine::TickList* tickList; const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick; const ScaleEngine::Tick* tick;
@ -1273,7 +1311,6 @@ void GLScope::applyConfig()
QGLContext::MipmapBindOption); QGLContext::MipmapBindOption);
m_bot2ScaleTextureAllocated = true; m_bot2ScaleTextureAllocated = true;
} // X2 scale } // X2 scale
} }
else // Horizontal else // Horizontal
{ {
@ -1394,25 +1431,50 @@ void GLScope::applyConfig()
m_bot1ScaleTextureAllocated = true; m_bot1ScaleTextureAllocated = true;
} // X1 scale } // X1 scale
m_glScopeRect2 = QRectF( if (m_mode == ModeIQPolar)
(float)(leftMargin + leftMargin + ((width() - leftMargin - leftMargin - rightMargin) / 2)) / (float)width(), {
(float)topMargin / (float)height(), int scopeDim = std::min(scopeWidth, scopeHeight);
(float)((width() - leftMargin - leftMargin - rightMargin) / 2) / (float)width(),
(float)(height() - topMargin - botMargin) / (float)height()
);
m_glLeft2ScaleRect = QRectF(
(float) (leftMargin + scopeWidth) / (float) width(),
(float) topMargin / (float) height(),
(float) (leftMargin-1) / (float) width(),
(float) scopeHeight / (float) height()
);
m_glBot2ScaleRect = QRectF(
(float) (leftMargin + leftMargin + scopeWidth) / (float) width(),
(float) (scopeHeight + topMargin + 1) / (float) height(),
(float) scopeWidth / (float) width(),
(float) (botMargin - 1) / (float) height()
);
m_glScopeRect2 = QRectF(
(float)(leftMargin + scopeWidth + leftMargin) / (float)width(),
(float)topMargin / (float)height(),
(float) scopeDim / (float)width(),
(float)(height() - topMargin - botMargin) / (float)height()
);
m_glLeft2ScaleRect = QRectF(
(float) (leftMargin + scopeWidth) / (float) width(),
(float) topMargin / (float) height(),
(float) (leftMargin-1) / (float) width(),
(float) scopeHeight / (float) height()
);
m_glBot2ScaleRect = QRectF(
(float) (leftMargin + leftMargin + scopeWidth) / (float) width(),
(float) (scopeHeight + topMargin + 1) / (float) height(),
(float) scopeDim / (float) width(),
(float) (botMargin - 1) / (float) height()
);
}
else
{
m_glScopeRect2 = QRectF(
(float)(leftMargin + leftMargin + ((width() - leftMargin - leftMargin - rightMargin) / 2)) / (float)width(),
(float)topMargin / (float)height(),
(float)((width() - leftMargin - leftMargin - rightMargin) / 2) / (float)width(),
(float)(height() - topMargin - botMargin) / (float)height()
);
m_glLeft2ScaleRect = QRectF(
(float) (leftMargin + scopeWidth) / (float) width(),
(float) topMargin / (float) height(),
(float) (leftMargin-1) / (float) width(),
(float) scopeHeight / (float) height()
);
m_glBot2ScaleRect = QRectF(
(float) (leftMargin + leftMargin + scopeWidth) / (float) width(),
(float) (scopeHeight + topMargin + 1) / (float) height(),
(float) scopeWidth / (float) width(),
(float) (botMargin - 1) / (float) height()
);
}
{ // Y2 scale { // Y2 scale
m_y2Scale.setSize(scopeHeight); m_y2Scale.setSize(scopeHeight);
@ -1449,12 +1511,24 @@ void GLScope::applyConfig()
m_left2ScaleTextureAllocated = true; m_left2ScaleTextureAllocated = true;
} // Y2 scale } // Y2 scale
{ // X2 scale { // X2 scale
m_x2Scale.setSize(scopeWidth); if (m_mode == ModeIQPolar)
{
int scopeDim = std::min(scopeWidth, scopeHeight);
m_bot2ScalePixmap = QPixmap( m_x2Scale.setSize(scopeDim);
scopeWidth, m_bot2ScalePixmap = QPixmap(
botMargin - 1 scopeDim,
); botMargin - 1
);
}
else
{
m_x2Scale.setSize(scopeWidth);
m_bot2ScalePixmap = QPixmap(
scopeWidth,
botMargin - 1
);
}
const ScaleEngine::TickList* tickList; const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick; const ScaleEngine::Tick* tick;
@ -1648,24 +1722,50 @@ void GLScope::applyConfig()
int scopeHeight = height() - topMargin - botMargin; int scopeHeight = height() - topMargin - botMargin;
int scopeWidth = width() - leftMargin - rightMargin; int scopeWidth = width() - leftMargin - rightMargin;
m_glScopeRect2 = QRectF( if (m_mode == ModeIQPolar)
(float) leftMargin / (float) width(), {
(float) topMargin / (float) height(), int scopeDim = std::min(scopeWidth, scopeHeight);
(float) scopeWidth / (float) width(),
(float) scopeHeight / (float) height() m_glScopeRect2 = QRectF(
); (float) leftMargin / (float) width(),
m_glLeft2ScaleRect = QRectF( (float) topMargin / (float) height(),
0, (float) scopeDim / (float) width(),
(float) topMargin / (float) height(), (float) scopeDim / (float) height()
(float) (leftMargin-1) / (float) width(), );
(float) scopeHeight / (float) height() m_glLeft2ScaleRect = QRectF(
); 0,
m_glBot2ScaleRect = QRectF( (float) topMargin / (float) height(),
(float) leftMargin / (float) width(), (float) (leftMargin-1) / (float) width(),
(float) (scopeHeight + topMargin + 1) / (float) height(), (float) scopeDim / (float) height()
(float) scopeWidth / (float) width(), );
(float) (botMargin - 1) / (float) height() m_glBot2ScaleRect = QRectF(
); (float) leftMargin / (float) width(),
(float) (scopeDim + topMargin + 1) / (float) height(),
(float) scopeDim / (float) width(),
(float) (botMargin - 1) / (float) height()
);
}
else
{
m_glScopeRect2 = QRectF(
(float) leftMargin / (float) width(),
(float) topMargin / (float) height(),
(float) scopeWidth / (float) width(),
(float) scopeHeight / (float) height()
);
m_glLeft2ScaleRect = QRectF(
0,
(float) topMargin / (float) height(),
(float) (leftMargin-1) / (float) width(),
(float) scopeHeight / (float) height()
);
m_glBot2ScaleRect = QRectF(
(float) leftMargin / (float) width(),
(float) (scopeHeight + topMargin + 1) / (float) height(),
(float) scopeWidth / (float) width(),
(float) (botMargin - 1) / (float) height()
);
}
{ // Y2 scale { // Y2 scale
m_y2Scale.setSize(scopeHeight); m_y2Scale.setSize(scopeHeight);
@ -1703,12 +1803,24 @@ void GLScope::applyConfig()
m_left2ScaleTextureAllocated = true; m_left2ScaleTextureAllocated = true;
} // Y2 scale } // Y2 scale
{ // X2 scale { // X2 scale
m_x2Scale.setSize(scopeWidth); if (m_mode == ModeIQPolar)
{
int scopeDim = std::min(scopeWidth, scopeHeight);
m_bot2ScalePixmap = QPixmap( m_x2Scale.setSize(scopeDim);
scopeWidth, m_bot2ScalePixmap = QPixmap(
botMargin - 1 scopeDim,
); botMargin - 1
);
}
else
{
m_x2Scale.setSize(scopeWidth);
m_bot2ScalePixmap = QPixmap(
scopeWidth,
botMargin - 1
);
}
const ScaleEngine::TickList* tickList; const ScaleEngine::TickList* tickList;
const ScaleEngine::Tick* tick; const ScaleEngine::Tick* tick;