From 6642f7812d5f323a263a7563a085d8b455835373 Mon Sep 17 00:00:00 2001 From: Jean-Paul Mari Date: Sun, 18 Nov 2018 16:35:17 -0500 Subject: [PATCH 1/1] Debugger source code clean-up --- docs/vj_HistoryNotes.txt | 1 + src/debugger/CartFilesListWin.cpp | 35 +++++++++++++------------------ src/debugger/CartFilesListWin.h | 4 +++- src/debugger/localbrowser.cpp | 5 +++-- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/docs/vj_HistoryNotes.txt b/docs/vj_HistoryNotes.txt index a1dba82..9c767be 100644 --- a/docs/vj_HistoryNotes.txt +++ b/docs/vj_HistoryNotes.txt @@ -79,6 +79,7 @@ Git commit: TBD 42) Added timer initialisation for the SDL setup 43) Added a cartdridge view menu -- Added a window to display my own directory and his files list +44) Debugger sources code clean-up Release 3 (13th November 2017) ------------------------------ diff --git a/src/debugger/CartFilesListWin.cpp b/src/debugger/CartFilesListWin.cpp index 26ae7ae..b20ee15 100644 --- a/src/debugger/CartFilesListWin.cpp +++ b/src/debugger/CartFilesListWin.cpp @@ -7,7 +7,7 @@ // // Who When What // --- ---------- ----------------------------------------------------------- -// JPM 10/26/2018 Created this file +// JPM Oct./2018 Created this file, and changed position of the status bar // // TO DO: @@ -26,12 +26,14 @@ CartFilesListWindow::CartFilesListWindow(QWidget * parent/*= 0*/) : QWidget(parent, Qt::Dialog), TableView(new QTableView), model(new QStandardItemModel), +TVlayout(new QVBoxLayout), +Mlayout(new QVBoxLayout), layout(new QVBoxLayout), treeView(new QTreeView), standardModel(new QStandardItemModel), rootNode(new QStandardItem), CartDirectory(NULL), -statusbar(new QStatusBar), +TVstatusbar(new QStatusBar), fileItems(NULL), nbItem(0), CartUsedBytes(0), @@ -63,17 +65,19 @@ CartDirType(CFL_NOTYPE) TableView->setFont(fixedFont); TableView->verticalHeader()->setDefaultSectionSize(TableView->verticalHeader()->minimumSectionSize()); TableView->verticalHeader()->setDefaultAlignment(Qt::AlignRight); - layout->addWidget(TableView); + TVlayout->addWidget(TableView); + TVlayout->addWidget(TVstatusbar); // Setup root rootNode = standardModel->invisibleRootItem(); //register the model treeView->setModel(standardModel); treeView->expandAll(); - layout->addWidget(treeView); + Mlayout->addWidget(treeView); - // Status bar - layout->addWidget(statusbar); + // Set layouts + layout->addLayout(TVlayout); + layout->addLayout(Mlayout); setLayout(layout); } @@ -140,18 +144,18 @@ void CartFilesListWindow::RefreshContents(void) { if ((Error & CFL_WARNING)) { - statusbar->setStyleSheet("background-color: lightyellow; font: bold"); + TVstatusbar->setStyleSheet("background-color: lightyellow; font: bold"); } else { - statusbar->setStyleSheet("background-color: tomato; font: bold"); + TVstatusbar->setStyleSheet("background-color: tomato; font: bold"); } } else { - statusbar->setStyleSheet("background-color: lightgreen; font: bold"); + TVstatusbar->setStyleSheet("background-color: lightgreen; font: bold"); } - statusbar->showMessage(QString(msg)); + TVstatusbar->showMessage(QString(msg)); } else { @@ -234,12 +238,7 @@ void *CartFilesListWindow::CreateInfos(void) // Display row content model->insertRow(i); model->setItem(i, 0, new QStandardItem(QString("%1").arg(Ptr[i].PtrFilename))); - if (!Ptr[i].SizeFile) - { - //model->setItem(i, 1, new QStandardItem(QString("%1").arg(""))); - //model->setItem(i, 2, new QStandardItem(QString("%1").arg(""))); - } - else + if (Ptr[i].SizeFile) { model->setItem(i, 1, new QStandardItem(QString("0x%1").arg(Ptr[i].PtrDataFile, 6, 16, QChar('0')))); model->setItem(i, 2, new QStandardItem(QString("0x%1").arg(Ptr[i].SizeFile, 6, 16, QChar('0')))); @@ -267,10 +266,6 @@ void CartFilesListWindow::UpdateInfos(void) { model->setItem(i, 3, new QStandardItem(QString("0x%1").arg(CartDirectory[i].CurrentSeek, 6, 16, QChar('0')))); } - else - { - //model->setItem(i, 3, new QStandardItem(QString("%1").arg(""))); - } // Get stream buffer address and check validity (must be included in the ram zone) Offset = DBGManager_GetAdrFromSymbolName((char *)"OSJAG_PtrBuffer") + (i * sizeof(long)); diff --git a/src/debugger/CartFilesListWin.h b/src/debugger/CartFilesListWin.h index e504d17..bc601bf 100644 --- a/src/debugger/CartFilesListWin.h +++ b/src/debugger/CartFilesListWin.h @@ -78,11 +78,13 @@ class CartFilesListWindow: public QWidget private: size_t nbItem, CartDirType, CartNbrFiles, CartUsedBytes; QVBoxLayout *layout; + QVBoxLayout *TVlayout; + QVBoxLayout *Mlayout; QTreeView *treeView; QStandardItemModel *standardModel; QStandardItem *rootNode; CARTDIRINFO *CartDirectory; - QStatusBar *statusbar; + QStatusBar *TVstatusbar; Sfileitem *fileItems; QStandardItemModel *model; QTableView *TableView; diff --git a/src/debugger/localbrowser.cpp b/src/debugger/localbrowser.cpp index 9c59b43..b00bd70 100644 --- a/src/debugger/localbrowser.cpp +++ b/src/debugger/localbrowser.cpp @@ -8,14 +8,15 @@ // Who When What // --- ---------- ----------------------------------------------------------- // JPM 11/03/2017 Created this file -// JPM 09/08/2018 Added a status bar and better status report -// JPM 09/08/2018 Set information values in a tab +// JPM Sept./2018 Added a status bar and better status report, and set information values in a tab // // STILL TO DO: // Feature to list the pointer(s) in the code using the allocation // To set the information display at the right // To support the array +// To support the static variables +// To add a filter // -- 2.20.1