Refactored chip DB set/get parameter methods

Author: bbogush

qt/chip_db.cpp

@@ -350,3 +350,50 @@ void ChipDb::reset()
     chipInfoVector.clear();
     readFromCvs();
 }
+
+ChipInfo *ChipDb::getChipInfo(int chipIndex)
+{
+    return chipIndex >= 0 && chipIndex < chipInfoVector.size() ?
+        &chipInfoVector[chipIndex] : nullptr;
+}
+
+QString ChipDb::getChipName(int chipIndex)
+{
+    ChipInfo *ci = getChipInfo(chipIndex);
+
+    return ci ? ci->name : QString();
+}
+
+int ChipDb::setChipName(int chipIndex, const QString &name)
+{
+    ChipInfo *ci = getChipInfo(chipIndex);
+
+    if (!ci)
+        return -1;
+
+    ci->name = name;
+
+    return 0;
+}
+
+uint32_t ChipDb::getChipParam(int chipIndex, int paramIndex)
+{
+    ChipInfo *ci = getChipInfo(chipIndex);
+
+    if (!ci || paramIndex < 0 || paramIndex > CHIP_PARAM_NUM)
+        return 0;
+
+    return ci->params[paramIndex];
+}
+
+int ChipDb::setChipParam(int chipIndex, int paramIndex, uint32_t paramValue)
+{
+    ChipInfo *ci = getChipInfo(chipIndex);
+
+    if (!ci || paramIndex < 0 || paramIndex > CHIP_PARAM_NUM)
+        return -1;
+
+    ci->params[paramIndex] = paramValue;
+
+    return 0;
+}

qt/chip_db.h

@@ -74,6 +74,7 @@ class ChipDb : public QObject
     void readFromCvs();
     int readCommentsFromCsv(QFile &dbFile, QString &comments);
     void writeToCvs();
+    ChipInfo *getChipInfo(int chipIndex);
 
 public:
     explicit ChipDb(QObject *parent = nullptr);
@@ -98,7 +99,10 @@ class ChipDb : public QObject
     int getHexStringFromOptParam(const uint32_t &param, QString &value);
     bool isParamValid(uint32_t param, uint32_t min, uint32_t max);
     bool isOptParamValid(uint32_t param, uint32_t min, uint32_t max);
-    ChipInfo *operator[](int index) { return &chipInfoVector[index]; }
+    QString getChipName(int chipIndex);
+    int setChipName(int chipIndex, const QString &name);
+    uint32_t getChipParam(int chipIndex, int paramIndex);
+    int setChipParam(int chipIndex, int paramIndex, uint32_t paramValue);
 };
 
 

qt/chip_db_table_model.cpp

@@ -32,12 +32,12 @@ QVariant ChipDbTableModel::data(const QModelIndex &index, int role) const
     switch (column)
     {
     case CHIP_PARAM_NAME:
-        return (*chipDb)[index.row()]->name;
+        return chipDb->getChipName(index.row());
     case CHIP_PARAM_PAGE_SIZE:
     case CHIP_PARAM_BLOCK_SIZE:
     case CHIP_PARAM_TOTAL_SIZE:
     case CHIP_PARAM_SPARE_SIZE:
-        chipDb->getHexStringFromParam((*chipDb)[index.row()]->params[column],
+        chipDb->getHexStringFromParam(chipDb->getChipParam(index.row(), column),
             paramStr);
         return paramStr;
     case CHIP_PARAM_T_CS:
@@ -57,21 +57,21 @@ QVariant ChipDbTableModel::data(const QModelIndex &index, int role) const
     case CHIP_PARAM_ROW_CYCLES:
     case CHIP_PARAM_COL_CYCLES:
     case CHIP_PARAM_BB_MARK_OFF:
-        return (*chipDb)[index.row()]->params[column];
+        return chipDb->getChipParam(index.row(), column);
     case CHIP_PARAM_READ1_CMD:
     case CHIP_PARAM_READ_ID_CMD:
     case CHIP_PARAM_RESET_CMD:
     case CHIP_PARAM_WRITE1_CMD:
     case CHIP_PARAM_ERASE1_CMD:
     case CHIP_PARAM_STATUS_CMD:
-        chipDb->getHexStringFromParam((*chipDb)[index.row()]->params[column],
+        chipDb->getHexStringFromParam(chipDb->getChipParam(index.row(), column),
             paramStr);
         return paramStr;
     case CHIP_PARAM_READ2_CMD:
     case CHIP_PARAM_WRITE2_CMD:
     case CHIP_PARAM_ERASE2_CMD:
-        chipDb->getHexStringFromOptParam((*chipDb)[index.row()]->params[column],
-            paramStr);
+        chipDb->getHexStringFromOptParam(chipDb->getChipParam(index.row(),
+            column), paramStr);
         return paramStr;
     }
 
@@ -209,15 +209,15 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
     switch (index.column())
     {
     case CHIP_PARAM_NAME:
-        (*chipDb)[index.row()]->name = value.toString();
+        chipDb->setChipName(index.row(), value.toString());
         return true;
     case CHIP_PARAM_PAGE_SIZE:
     case CHIP_PARAM_BLOCK_SIZE:
     case CHIP_PARAM_TOTAL_SIZE:
     case CHIP_PARAM_SPARE_SIZE:
         if (chipDb->getParamFromHexString(value.toString(), paramVal))
             return false;
-        (*chipDb)[index.row()]->params[index.column()] = paramVal;
+        chipDb->setChipParam(index.row(), index.column(), paramVal);
         return true;
     case CHIP_PARAM_T_CS:
     case CHIP_PARAM_T_CLS:
@@ -236,7 +236,7 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
     case CHIP_PARAM_BB_MARK_OFF:
         if (chipDb->getParamFromString(value.toString(), paramVal))
             return false;
-        (*chipDb)[index.row()]->params[index.column()] = paramVal;
+        chipDb->setChipParam(index.row(), index.column(), paramVal);
         return true;
     case CHIP_PARAM_ROW_CYCLES:
     case CHIP_PARAM_COL_CYCLES:
@@ -247,7 +247,7 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
         {
             return false;
         }
-        (*chipDb)[index.row()]->params[index.column()] = paramVal;
+        chipDb->setChipParam(index.row(), index.column(), paramVal);
         return true;
     case CHIP_PARAM_READ1_CMD:
     case CHIP_PARAM_READ_ID_CMD:
@@ -259,7 +259,7 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
             return false;
         if (!chipDb->isParamValid(paramVal, 0x00, 0xFF))
             return false;
-        (*chipDb)[index.row()]->params[index.column()] = paramVal;
+        chipDb->setChipParam(index.row(), index.column(), paramVal);
         return true;
     case CHIP_PARAM_READ2_CMD:
     case CHIP_PARAM_WRITE2_CMD:
@@ -268,7 +268,7 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
             return false;
         if (!chipDb->isOptParamValid(paramVal, 0x00, 0xFF))
             return false;
-        (*chipDb)[index.row()]->params[index.column()] = paramVal;
+        chipDb->setChipParam(index.row(), index.column(), paramVal);
         return true;
     }