Apple-2-SW
/
AppleSAWS
mirror of https://github.com/markdavidlong/AppleSAWS.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed display problem with per-pixel color display

This commit is contained in:
Mark Long 2016-10-30 17:18:18 -05:00
parent f5be4abd7c
commit 9e7b408263
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ui/widgets/HiresScreenWidget.cpp
View File

@ -175,12 +175,13 @@ void HiresScreenWidget::drawPixmap()
drawMonoLine(pmpainter, yoff*2, bits);
if (!m_showScanLines) drawMonoLine(pmpainter, yoff*2+1, bits);
}
else
else if (m_viewMode == NTSCColor)
{
drawNtscLine(pmpainter, yoff*2, bits);
if (!m_showScanLines) drawNtscLine(pmpainter, yoff*2+1, bits);
}
chunkCount++;
if (chunkCount == 3) {
chunkCount = 0;
@ -215,6 +216,9 @@ void HiresScreenWidget::drawPixmap()
doubleScan = 1;
}
qDebug() << (byte & 0x01) << (byte & 0x02) << (byte & 0x04) << (byte & 0x08)
<< (byte & 0x10) << (byte & 0x20) << (byte & 0x40) << "HI: " << (byte & 0x80);
pmpainter.setPen(xoff & 0x01?oddColor:evenColor);
pmpainter.setBrush(xoff & 0x01?oddColor:evenColor);
@ -238,7 +242,6 @@ void HiresScreenWidget::drawPixmap()
pmpainter.setPen(xoff & 0x01?oddColor:evenColor);
pmpainter.setBrush(xoff & 0x01?oddColor:evenColor);
if (byte & 0x10) { pmpainter.drawRect((cOffset+xoff*2)+8,yoff,1,doubleScan); }
pmpainter.setPen(xoff & 0x01?evenColor:oddColor);
@ -249,8 +252,7 @@ void HiresScreenWidget::drawPixmap()
pmpainter.setPen(xoff & 0x01?oddColor:evenColor);
pmpainter.setBrush(xoff & 0x01?oddColor:evenColor);
if (byte & 0x40) { pmpainter.drawRect((cOffset+xoff*2)+12,yoff,cOffset?0:1,doubleScan); }
if (byte & 0x40) { pmpainter.drawRect((cOffset+xoff*2)+12,yoff,1,doubleScan); }
@ -321,6 +323,25 @@ void HiresScreenWidget::drawMonoLine(QPainter &painter, int lineNum, QBitArray d
}
}
void HiresScreenWidget::drawPerPositionColorLine(QPainter &painter, int lineNum, QBitArray data) {
painter.setPen(Qt::black);
painter.drawLine(0,lineNum,data.count(),lineNum);
QList<QColor> colorlist;
colorlist << QColor(orangeColor) << QColor(purpleColor) << QColor(blueColor) << QColor(greenColor);
for (int idx = 0; idx < data.count(); idx++)
{
painter.setPen(colorlist[idx % 4]);
painter.setBrush(colorlist[idx % 4]);
if (data.at(idx))
{
painter.drawPoint(idx,lineNum);
}
}
}
QColor HiresScreenWidget::getColorFromBits(QBitArray bits, quint8 phase)
{
quint8 bitval = (bits[0] * 0x08) +

3
src/ui/widgets/HiresScreenWidget.h
View File

@ -123,11 +123,12 @@ protected slots:
void handleShowScanLinesAction(bool toggled);
private:
void makeOffsetTable();
// void makeOffsetTable();
void makeAddressTables();
QColor getColorFromBits(QBitArray bits, quint8 phase);
void drawNtscLine(QPainter &painter,int linenum, QBitArray data);
void drawMonoLine(QPainter &painter, int lineNum, QBitArray data);
void drawPerPositionColorLine(QPainter &painter, int lineNum, QBitArray data);
void drawPixmap();