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

Added sorting to var viewer

This commit is contained in:
Mark Long 2016-10-12 18:07:34 -05:00
parent c5d1c575e1
commit 8f8fbba6fd
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/applesoftfile/applesofttoken.h
View File

@ -16,8 +16,6 @@ public:
static const quint16 IntegerTokenVal = 0x103;
static const quint16 FloatTokenVal = 0x104;
static const quint16 IntVarTokenVal = 0x105;
static const quint16 IntAryVarTokenVal = 0x106;

31
src/ui/viewers/applesoftfiledetailviewer.cpp
View File

@ -11,6 +11,7 @@ ApplesoftFileDetailViewer::ApplesoftFileDetailViewer(QWidget *parent) :
ui(new Ui::ApplesoftFileDetailViewer)
{
ui->setupUi(this);
ui->m_varView->setSortingEnabled(true);
}
ApplesoftFileDetailViewer::~ApplesoftFileDetailViewer()
@ -20,7 +21,8 @@ ApplesoftFileDetailViewer::~ApplesoftFileDetailViewer()
void ApplesoftFileDetailViewer::process()
{
QMap<QString,QStringList> vardata;
QMap<QString,QStringList> vardata;
QMap<QString,quint16> vartypes;
foreach (ApplesoftLine line, m_lines)
{
@ -29,18 +31,22 @@ void ApplesoftFileDetailViewer::process()
{
quint16 tid = token.getTokenId();
if (tid == ApplesoftToken::IntVarTokenVal ||
tid == ApplesoftToken::IntAryVarTokenVal ||
tid == ApplesoftToken::FloatVarTokenVal ||
tid == ApplesoftToken::FloatAryVarTokenVal ||
tid == ApplesoftToken::StringVarTokenVal ||
tid == ApplesoftToken::StringAryVarTokenVal)
tid == ApplesoftToken::IntAryVarTokenVal ||
tid == ApplesoftToken::FloatVarTokenVal ||
tid == ApplesoftToken::FloatAryVarTokenVal ||
tid == ApplesoftToken::StringVarTokenVal ||
tid == ApplesoftToken::StringAryVarTokenVal)
{
QString varname = token.getStringValue();
if (varname.contains("(")) { varname.append(")"); }
vardata[varname].append(QString("%1").arg(linenum));
vartypes[varname] = tid;
}
}
}
QMap<quint16,QString> typemap;
QStringList keys = vardata.keys();
ui->m_varView->setRowCount(keys.count());
qSort(keys);
@ -48,6 +54,19 @@ void ApplesoftFileDetailViewer::process()
foreach (QString key, keys)
{
QString linenums = vardata[key].join(",");
quint16 vtype = vartypes[key];
QString vtname;
switch (vtype) {
case ApplesoftToken::IntVarTokenVal: vtname = "Int"; break;
case ApplesoftToken::FloatVarTokenVal: vtname = "Float"; break;
case ApplesoftToken::StringVarTokenVal: vtname = "String"; break;
case ApplesoftToken::IntAryVarTokenVal: vtname = "Int Array"; break;
case ApplesoftToken::FloatAryVarTokenVal: vtname = "Float Array"; break;
case ApplesoftToken::StringAryVarTokenVal: vtname = "Float String"; break;
default: vtname = "Unknown";
}
ui->m_varView->setItem(idx,0,new QTableWidgetItem(vtname));
ui->m_varView->setItem(idx,1,new QTableWidgetItem(key));
ui->m_varView->setItem(idx,2,new QTableWidgetItem(linenums));
idx++;