// --- ---------- -----------------------------------------------------------\r
// JPM 12/07/2017 Created this file\r
// JPM 09/14/2018 Added a status bar, better status report and set information values in a tab\r
-// JPM 10/05/2018 Added a sorting filter \r
+// JPM April/2019 Added a sorting filter, tableview unique rows creation\r
//\r
\r
// STILL TO DO:\r
// Better presentation\r
// To set the information display at the right\r
+// To understand/fix the problem with the sorting filter\r
// Display arrays information\r
// Display structures information\r
//\r
\r
+//#define AW_SORTINGFILTER // Authorise the sorting filtes\r
//#define AW_DEBUGNUMVARIABLE 4415 // Set the global variable number to debug\r
#ifndef AW_DEBUGNUMVARIABLE\r
#define AW_STARTNUMVARIABLE 0 // Must be kept to 0 in case of no debug is required\r
if (NbWatch = DBGManager_GetNbGlobalVariables())\r
{\r
PtrWatchInfo = (WatchInfo *)calloc(NbWatch, sizeof(WatchInfo));\r
-\r
+#ifndef AW_LAYOUTTEXTS\r
+#ifdef AW_SORTINGFILTER\r
+ TableView->setSortingEnabled(false);\r
+#endif\r
+ model->setRowCount(0);\r
+#endif\r
for (uint32_t i = AW_STARTNUMVARIABLE; i < NbWatch; i++)\r
{\r
PtrWatchInfo[i].PtrVariableName = DBGManager_GetGlobalVariableName(i + 1);\r
}\r
#else\r
PtrWatchInfo[i].PtrVariableBaseTypeName = DBGManager_GetGlobalVariableTypeName(i + 1);\r
+ model->insertRow(i);\r
#endif\r
}\r
}\r
}\r
-#ifndef AW_LAYOUTTEXTS\r
- TableView->setSortingEnabled(false);\r
- model->setRowCount(0);\r
-#endif\r
+\r
if (NbWatch)\r
{\r
for (uint32_t i = AW_STARTNUMVARIABLE; i < NbWatch; i++)\r
sprintf(string, "%i : %s | %s | 0x%06X | %s", (i + 1), PtrWatchInfo[i].PtrVariableBaseTypeName, PtrWatchInfo[i].PtrVariableName, (unsigned int)PtrWatchInfo[i].addr, PtrValue ? PtrValue : (char *)"<font color='#ff0000'>N/A</font>");\r
WatchAll += QString(string);\r
#else\r
- model->insertRow(i);\r
model->setItem(i, 0, new QStandardItem(QString("%1").arg(PtrWatchInfo[i].PtrVariableName)));\r
model->setItem(i, 1, new QStandardItem(QString("%1").arg(PtrValue)));\r
model->setItem(i, 2, new QStandardItem(QString("%1").arg(PtrWatchInfo[i].PtrVariableBaseTypeName)));\r
text->clear();\r
text->setText(WatchAll);\r
#else\r
+#ifdef AW_SORTINGFILTER\r
TableView->setSortingEnabled(true);\r
+#endif\r
#endif\r
sprintf(msg, "Ready");\r
}\r