UI: Further work to move trade history to cached map

OmniLayer · May 19, 2015 · 033b6ce · 033b6ce
1 parent 644fe91
commit 033b6ce
Show file tree

Hide file tree

Showing 6 changed files with 219 additions and 67 deletions.
diff --git a/src/mastercore.cpp b/src/mastercore.cpp
@@ -3246,7 +3246,7 @@ int CMPSTOList::deleteAboveBlock(int blockNum)
 }
 
 // MPTradeList here
-bool CMPTradeList::getMatchingTrades(const uint256 txid, unsigned int propertyId, Array *tradeArray, uint64_t *totalSold, uint64_t *totalBought)
+bool CMPTradeList::getMatchingTrades(const uint256 txid, unsigned int propertyId, Array *tradeArray, int64_t *totalSold, int64_t *totalBought)
 {
   if (!pdb) return false;
   leveldb::Slice skey, svalue;

diff --git a/src/mastercore.h b/src/mastercore.h
@@ -338,7 +338,7 @@ class CMPTradeList : public CDBBase
     bool exists(const uint256 &txid);
     void printStats();
     void printAll();
-    bool getMatchingTrades(const uint256 txid, unsigned int propertyId, Array *tradeArray, uint64_t *totalSold, uint64_t *totalBought);
+    bool getMatchingTrades(const uint256 txid, unsigned int propertyId, Array *tradeArray, int64_t *totalSold, int64_t *totalBought);
     int getMPTradeCountTotal();
 };
 

diff --git a/src/mastercore_rpc.cpp b/src/mastercore_rpc.cpp
@@ -1948,12 +1948,12 @@ Value gettrade_MP(const Array& params, bool fHelp)
     }
 
     // get the amount for sale in this sell offer to see if filled
-    uint64_t amountForSale = mp_obj.getAmount();
+    int64_t amountForSale = mp_obj.getAmount();
 
     // create array of matches
     Array tradeArray;
-    uint64_t totalBought = 0;
-    uint64_t totalSold = 0;
+    int64_t totalBought = 0;
+    int64_t totalSold = 0;
     t_tradelistdb->getMatchingTrades(hash, propertyId, &tradeArray, &totalSold, &totalBought);
 
     // get action byte

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -552,7 +552,7 @@ void TableViewLastColumnResizingFixer::on_geometriesChanged()
         bool omniTradeHistoryLayout = false;
         if (abstractModel->columnCount() > 3) { // ensure the columns are there before we try to reference them
             if (abstractModel->headerData(2, Qt::Horizontal).toString()=="Reserved") { omniLayout = true; omniBalanceLayout = true; }
-            if (abstractModel->headerData(2, Qt::Horizontal).toString()=="Date") { omniLayout = true; omniTradeHistoryLayout = true; }
+            if (abstractModel->headerData(3, Qt::Horizontal).toString()=="Date") { omniLayout = true; omniTradeHistoryLayout = true; }
         }
         if (omniLayout) { // this is an Omni balance or trade layout, override column resize
             if (omniBalanceLayout) resizeColumn(omniBalanceOverrideColumnIndex, getAvailableWidthForColumn(omniBalanceOverrideColumnIndex));
@@ -577,7 +577,7 @@ TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* t
     lastColumnIndex = columnCount - 1;
     secondToLastColumnIndex = columnCount - 2;
     omniBalanceOverrideColumnIndex = 1; // we can safely hardcode this for now
-    omniTradeHistoryOverrideColumnIndex = 4; // as above
+    omniTradeHistoryOverrideColumnIndex = 5; // as above
     tableView->horizontalHeader()->setMinimumSectionSize(allColumnsMinimumWidth);
     setViewHeaderResizeMode(secondToLastColumnIndex, QHeaderView::Interactive);
     setViewHeaderResizeMode(lastColumnIndex, QHeaderView::Interactive);