From 1369113a1b40b04ff019c4c96703ead5418fe8e7 Mon Sep 17 00:00:00 2001
From: garak <garakmon@gmail.com>
Date: Thu, 13 Jun 2019 20:49:28 -0400
Subject: [PATCH] add encounter rate slider to wild mon tables

---
 src/core/wildmoninfo.cpp |  6 +++++-
 src/editor.cpp           | 41 +++++++++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/core/wildmoninfo.cpp b/src/core/wildmoninfo.cpp
index abd81db6..8fb87b55 100644
--- a/src/core/wildmoninfo.cpp
+++ b/src/core/wildmoninfo.cpp
@@ -21,7 +21,10 @@ void clearTabWidget(QLayout *tab) {
 
 void clearTable(QTableWidget *table) {
     //
-    if (table) table->clear();
+    if (table) {
+        table->clear();
+        table->horizontalHeader()->hide();
+    }
 }
 
 void createSpeciesTableRow(Project *project, QTableWidget *table, WildPokemon mon, int index) {
@@ -94,6 +97,7 @@ void populateWildMonTabWidget(QTabWidget *tabWidget, QVector<QString> fields) {
         table->setEditTriggers(QAbstractItemView::NoEditTriggers);
         table->setFocusPolicy(Qt::NoFocus);
         table->setSelectionMode(QAbstractItemView::NoSelection);
+        table->clearFocus();
         tabWidget->addTab(table, field);
     }
 }
diff --git a/src/editor.cpp b/src/editor.cpp
index 888429c6..40549b89 100644
--- a/src/editor.cpp
+++ b/src/editor.cpp
@@ -155,32 +155,22 @@ void Editor::setEditingWildMons() {
 }
 
 void Editor::displayWildMonTables() {
-    // clear tables
-    //int tabIndex = 0;
-    //for (; tabIndex < project->wildMonFields.size(); tabIndex++) {
-    //    QTableWidget *speciesTable = static_cast<QTableWidget *>(ui->tabWidget_WildMons->widget(tabIndex));
-    //    clearTable(speciesTable);
-    //}
-
-    if (!project->wildMonData.contains(map->constantName)) return;
-
     WildPokemonHeader header = project->wildMonData.value(map->constantName);
 
     int tabIndex = 0;
     for (QString field : project->wildMonFields) {
         QTableWidget *speciesTable = static_cast<QTableWidget *>(ui->tabWidget_WildMons->widget(tabIndex++));
         clearTable(speciesTable);
-        //speciesTable->setFocusPolicy(Qt::NoFocus);
-        if (!project->wildMonData.contains(map->constantName)) continue;
+        //speciesTable->horizontalHeader()->hide();
 
-        if (header.wildMons[field].active) {//else, 
+        if (project->wildMonData.contains(map->constantName) && header.wildMons[field].active) {
             int i = 1;
 
             speciesTable->setRowCount(header.wildMons[field].wildPokemon.size());
-            speciesTable->setColumnCount(5);// + 1 for last column stretch?
+            speciesTable->setColumnCount(6);// TODO: stretch last column?
 
             QStringList landMonTableHeaders;
-            landMonTableHeaders << "Index" << "Species" << "Min Level" << "Max Level" << "Catch Percentage";
+            landMonTableHeaders << "Index" << "Species" << "Min Level" << "Max Level" << "Catch Percentage" << "Encounter Rate";
             speciesTable->setHorizontalHeaderLabels(landMonTableHeaders);
             speciesTable->horizontalHeader()->show();
             speciesTable->verticalHeader()->hide();
@@ -189,12 +179,33 @@ void Editor::displayWildMonTables() {
 
             speciesTable->setShowGrid(false);
 
+            // set encounter rate slider
+            // don't forget to add number label next to it
+            QFrame *encounterFrame = new QFrame;
+            QHBoxLayout *encounterLayout = new QHBoxLayout;
+
+            QSlider *encounterRate = new QSlider(Qt::Horizontal);
+            encounterRate->setMinimum(1);
+            encounterRate->setMaximum(100);
+
+            QLabel *encounterLabel = new QLabel;
+            connect(encounterRate, &QSlider::valueChanged, [=](int value){
+                encounterLabel->setText(QString::number(value));
+            });
+            encounterRate->setValue(header.wildMons[field].encounterRate);
+
+            encounterLayout->addWidget(encounterLabel);
+            encounterLayout->addWidget(encounterRate);
+
+            encounterFrame->setLayout(encounterLayout);
+
+            speciesTable->setCellWidget(0, 5, encounterFrame);
+
             for (WildPokemon mon : header.wildMons[field].wildPokemon) {
                 createSpeciesTableRow(project, speciesTable, mon, i);
                 i++;
             }
         } else {
-            speciesTable->horizontalHeader()->hide();
             // create button to add this field to this map
         }
     }