get rid of some of the initializeUI functions

spelunky-fyi · May 2, 2024 · 4826b44 · 4826b44
1 parent 840f44b
commit 4826b44
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 84 deletions.
diff --git a/include/Views/ViewJournalPage.h b/include/Views/ViewJournalPage.h
@@ -27,7 +27,5 @@ namespace S2Plugin
       private:
         uintptr_t mPageAddress;
         TreeViewMemoryFields* mMainTreeView;
-
-        void initializeUI();
     };
 } // namespace S2Plugin
diff --git a/include/Views/ViewLevelGen.h b/include/Views/ViewLevelGen.h
@@ -36,7 +36,5 @@ namespace S2Plugin
 
         // TAB LEVEL
         std::unordered_map<std::string, WidgetSpelunkyRooms*> mRoomsWidgets; // field_name -> widget*
-
-        void initializeUI();
     };
 } // namespace S2Plugin
diff --git a/include/Views/ViewLogger.h b/include/Views/ViewLogger.h
@@ -48,7 +48,6 @@ namespace S2Plugin
         QTableView* mSamplesTableView;
         ItemModelLoggerSamples* mSamplesTableModel;
 
-        void initializeUI();
         void startLogging();
     };
 } // namespace S2Plugin
diff --git a/include/Views/ViewStdMap.h b/include/Views/ViewStdMap.h
@@ -33,7 +33,5 @@ namespace S2Plugin
         uint8_t mMapValueAlignment;
 
         TreeViewMemoryFields* mMainTreeView;
-
-        void initializeRefreshLayout();
     };
 } // namespace S2Plugin
diff --git a/include/Views/ViewStdVector.h b/include/Views/ViewStdVector.h
@@ -29,7 +29,5 @@ namespace S2Plugin
         size_t mVectorTypeSize;
 
         TreeViewMemoryFields* mMainTreeView;
-
-        void initializeRefreshLayout();
     };
 } // namespace S2Plugin
diff --git a/include/Views/ViewThreads.h b/include/Views/ViewThreads.h
@@ -22,7 +22,5 @@ namespace S2Plugin
 
       private:
         QTableWidget* mMainTable;
-
-        void initializeUI();
     };
 } // namespace S2Plugin
diff --git a/src/Views/ViewEntity.cpp b/src/Views/ViewEntity.cpp
@@ -22,19 +22,20 @@
 #include <string>
 #include <vector>
 
+enum TABS
+{
+    FIELDS = 0,
+    MEMORY = 1,
+    LEVEL = 2,
+    CPP = 3,
+};
+
 S2Plugin::ViewEntity::ViewEntity(size_t entityOffset, QWidget* parent) : QWidget(parent), mEntityPtr(entityOffset)
 {
-    initializeUI();
     setWindowIcon(getCavemanIcon());
-
     setWindowTitle(QString::asprintf("Entity %s 0x%016llX", Entity{mEntityPtr}.entityTypeName().c_str(), entityOffset));
-    mMainTreeView->setVisible(true);
 
-    mMainTreeView->setColumnWidth(gsColField, 175);
-    mMainTreeView->setColumnWidth(gsColValueHex, 125);
-    mMainTreeView->setColumnWidth(gsColMemoryAddress, 125);
-    mMainTreeView->setColumnWidth(gsColMemoryAddressDelta, 75);
-    mMainTreeView->setColumnWidth(gsColType, 100);
+    initializeUI();
     updateMemoryViewOffsetAndSize();
 
     mSpelunkyLevel->paintFloor(QColor(160, 160, 160));
@@ -49,14 +50,6 @@ S2Plugin::ViewEntity::ViewEntity(size_t entityOffset, QWidget* parent) : QWidget
         mInterpretAsComboBox->setCurrentText(QString::fromStdString(entityClassName));
 }
 
-enum TABS
-{
-    FIELDS = 0,
-    MEMORY = 1,
-    LEVEL = 2,
-    CPP = 3,
-};
-
 void S2Plugin::ViewEntity::initializeUI()
 {
     auto mainLayout = new QVBoxLayout(this);
@@ -120,6 +113,11 @@ void S2Plugin::ViewEntity::initializeUI()
     // TAB FIELDS
     mMainTreeView = new TreeViewMemoryFields(this);
     mMainTreeView->setColumnWidth(gsColValue, 250);
+    mMainTreeView->setColumnWidth(gsColField, 175);
+    mMainTreeView->setColumnWidth(gsColValueHex, 125);
+    mMainTreeView->setColumnWidth(gsColMemoryAddress, 125);
+    mMainTreeView->setColumnWidth(gsColMemoryAddressDelta, 75);
+    mMainTreeView->setColumnWidth(gsColType, 100);
     mMainTreeView->setVisible(false);
     mMainTreeView->activeColumns.disable(gsColComparisonValue).disable(gsColComparisonValueHex);
     mMainTreeView->updateTableHeader();

diff --git a/src/Views/ViewJournalPage.cpp b/src/Views/ViewJournalPage.cpp
@@ -12,19 +12,9 @@
 
 S2Plugin::ViewJournalPage::ViewJournalPage(uintptr_t address, QWidget* parent) : QWidget(parent), mPageAddress(address)
 {
-    initializeUI();
     setWindowIcon(getCavemanIcon());
     setWindowTitle("JournalPage");
 
-    mMainTreeView->setColumnWidth(gsColField, 125);
-    mMainTreeView->setColumnWidth(gsColValueHex, 125);
-    mMainTreeView->setColumnWidth(gsColMemoryAddress, 125);
-    mMainTreeView->setColumnWidth(gsColMemoryAddressDelta, 75);
-    mMainTreeView->setColumnWidth(gsColType, 100);
-}
-
-void S2Plugin::ViewJournalPage::initializeUI()
-{
     auto mainLayout = new QVBoxLayout(this);
     auto refreshLayout = new QHBoxLayout();
     mainLayout->addLayout(refreshLayout);
@@ -67,6 +57,11 @@ void S2Plugin::ViewJournalPage::initializeUI()
     mainLayout->addWidget(mMainTreeView);
 
     mMainTreeView->setColumnWidth(gsColValue, 250);
+    mMainTreeView->setColumnWidth(gsColField, 125);
+    mMainTreeView->setColumnWidth(gsColValueHex, 125);
+    mMainTreeView->setColumnWidth(gsColMemoryAddress, 125);
+    mMainTreeView->setColumnWidth(gsColMemoryAddressDelta, 75);
+    mMainTreeView->setColumnWidth(gsColType, 100);
     mMainTreeView->updateTableHeader();
 
     mainLayout->setMargin(5);

diff --git a/src/Views/ViewLevelGen.cpp b/src/Views/ViewLevelGen.cpp
@@ -15,19 +15,9 @@
 
 S2Plugin::ViewLevelGen::ViewLevelGen(uintptr_t address, QWidget* parent) : QWidget(parent), mLevelGenPtr(address)
 {
-    initializeUI();
     setWindowIcon(getCavemanIcon());
     setWindowTitle("LevelGen");
-    mMainTreeView->updateTree(0, 0, true);
-    mMainTreeView->setColumnWidth(gsColField, 125);
-    mMainTreeView->setColumnWidth(gsColValueHex, 125);
-    mMainTreeView->setColumnWidth(gsColMemoryAddress, 125);
-    mMainTreeView->setColumnWidth(gsColMemoryAddressDelta, 75);
-    mMainTreeView->setColumnWidth(gsColType, 100);
-}
 
-void S2Plugin::ViewLevelGen::initializeUI()
-{
     auto mainLayout = new QVBoxLayout(this);
     auto refreshLayout = new QHBoxLayout();
     mainLayout->addLayout(refreshLayout);
@@ -65,6 +55,11 @@ void S2Plugin::ViewLevelGen::initializeUI()
         tabData->layout()->addWidget(mMainTreeView);
 
         mMainTreeView->setColumnWidth(gsColValue, 250);
+        mMainTreeView->setColumnWidth(gsColField, 125);
+        mMainTreeView->setColumnWidth(gsColValueHex, 125);
+        mMainTreeView->setColumnWidth(gsColMemoryAddress, 125);
+        mMainTreeView->setColumnWidth(gsColMemoryAddressDelta, 75);
+        mMainTreeView->setColumnWidth(gsColType, 100);
         mMainTreeView->activeColumns.disable(gsColComparisonValue).disable(gsColComparisonValueHex);
         mMainTreeView->updateTableHeader();
         QObject::connect(mMainTreeView, &TreeViewMemoryFields::levelGenRoomsPointerClicked, this, &ViewLevelGen::levelGenRoomsPointerClicked);
@@ -97,6 +92,7 @@ void S2Plugin::ViewLevelGen::initializeUI()
     mainLayout->setMargin(5);
     mMainTreeView->setVisible(true);
     autoRefresh->toggleAutoRefresh(true);
+    mMainTreeView->updateTree(0, 0, true); // just initial refresh so we don't the all fields marked as just changed (red)
 }
 
 void S2Plugin::ViewLevelGen::refreshLevelGen()

diff --git a/src/Views/ViewLogger.cpp b/src/Views/ViewLogger.cpp
@@ -17,23 +17,9 @@ S2Plugin::ViewLogger::ViewLogger(QWidget* parent) : QWidget(parent)
 {
     mLogger = new Logger(this);
 
-    initializeUI();
     setWindowIcon(getCavemanIcon());
     setWindowTitle("Logger");
-}
-
-QSize S2Plugin::ViewLogger::sizeHint() const
-{
-    return QSize(650, 450);
-}
-
-QSize S2Plugin::ViewLogger::minimumSizeHint() const
-{
-    return QSize(150, 150);
-}
 
-void S2Plugin::ViewLogger::initializeUI()
-{
     auto mainLayout = new QVBoxLayout(this);
     mainLayout->setMargin(5);
 
@@ -123,6 +109,16 @@ void S2Plugin::ViewLogger::initializeUI()
     mainLayout->addWidget(mSamplingWidget);
 }
 
+QSize S2Plugin::ViewLogger::sizeHint() const
+{
+    return QSize(650, 450);
+}
+
+QSize S2Plugin::ViewLogger::minimumSizeHint() const
+{
+    return QSize(150, 150);
+}
+
 void S2Plugin::ViewLogger::startLogging()
 {
     if (mLogger->fieldCount() > 0)

diff --git a/src/Views/ViewStdMap.cpp b/src/Views/ViewStdMap.cpp
@@ -21,22 +21,15 @@ S2Plugin::ViewStdMap::ViewStdMap(const std::string& keytypeName, const std::stri
     mMapKeyAlignment = config->getAlingment(keytypeName);
     mMapValueAlignment = config->getAlingment(valuetypeName);
 
-    initializeRefreshLayout();
     setWindowIcon(getCavemanIcon());
 
     if (mMapValueTypeSize == 0)
         setWindowTitle(QString("std::set<%1>").arg(QString::fromStdString(keytypeName)));
     else
         setWindowTitle(QString("std::map<%1, %2>").arg(QString::fromStdString(keytypeName), QString::fromStdString(valuetypeName)));
 
-    refreshMapContents();
-}
-
-void S2Plugin::ViewStdMap::initializeRefreshLayout()
-{
     auto mainLayout = new QVBoxLayout(this);
-
-    auto refreshLayout = new QHBoxLayout(this);
+    auto refreshLayout = new QHBoxLayout();
     mainLayout->addLayout(refreshLayout);
 
     auto refreshMapButton = new QPushButton("Refresh map", this);
@@ -54,6 +47,7 @@ void S2Plugin::ViewStdMap::initializeRefreshLayout()
     mainLayout->addWidget(mMainTreeView);
     mainLayout->setMargin(5);
     autoRefresh->toggleAutoRefresh(true);
+    refreshMapContents();
 }
 
 void S2Plugin::ViewStdMap::refreshMapContents()

diff --git a/src/Views/ViewStdVector.cpp b/src/Views/ViewStdVector.cpp
@@ -14,17 +14,10 @@ S2Plugin::ViewStdVector::ViewStdVector(const std::string& vectorType, uintptr_t
 {
     mVectorTypeSize = Configuration::get()->getTypeSize(mVectorType);
 
-    initializeRefreshLayout();
     setWindowIcon(getCavemanIcon());
     setWindowTitle(QString("std::vector<%1>").arg(QString::fromStdString(vectorType)));
 
-    refreshVectorContents();
-}
-
-void S2Plugin::ViewStdVector::initializeRefreshLayout()
-{
     auto mainLayout = new QVBoxLayout(this);
-
     auto refreshLayout = new QHBoxLayout();
     mainLayout->addLayout(refreshLayout);
 
@@ -42,6 +35,7 @@ void S2Plugin::ViewStdVector::initializeRefreshLayout()
     mainLayout->addWidget(mMainTreeView);
     mainLayout->setMargin(5);
     autoRefresh->toggleAutoRefresh(true);
+    refreshVectorContents();
 }
 
 void S2Plugin::ViewStdVector::refreshVectorContents()

diff --git a/src/Views/ViewThreads.cpp b/src/Views/ViewThreads.cpp
@@ -22,17 +22,11 @@ static const uint32_t gsRoleMemoryAddress = Qt::UserRole + 1;
 
 S2Plugin::ViewThreads::ViewThreads(QWidget* parent) : QWidget(parent)
 {
-    initializeUI();
     setWindowIcon(getCavemanIcon());
     setWindowTitle("Threads");
-    refreshThreads();
-}
 
-void S2Plugin::ViewThreads::initializeUI()
-{
     auto mainLayout = new QVBoxLayout(this);
-
-    auto horLayout = new QHBoxLayout(this);
+    auto horLayout = new QHBoxLayout();
     auto refreshButton = new QPushButton("Refresh", this);
     horLayout->addWidget(refreshButton);
     QObject::connect(refreshButton, &QPushButton::clicked, this, &ViewThreads::refreshThreads);
@@ -55,6 +49,7 @@ void S2Plugin::ViewThreads::initializeUI()
     QObject::connect(mMainTable, &QTableWidget::cellClicked, this, &ViewThreads::cellClicked);
 
     mainLayout->addWidget(mMainTable);
+    refreshThreads();
 }
 
 void S2Plugin::ViewThreads::refreshThreads()

diff --git a/src/Views/ViewVirtualTable.cpp b/src/Views/ViewVirtualTable.cpp
@@ -26,9 +26,9 @@ S2Plugin::ViewVirtualTable::ViewVirtualTable(QWidget* parent) : QWidget(parent)
     mGatherSortFilterProxy = new SortFilterProxyModelGatherVirtualData(this);
     mGatherSortFilterProxy->sort(gsColGatherID);
 
-    initializeUI();
     setWindowIcon(getCavemanIcon());
     setWindowTitle("Virtual Table");
+    initializeUI();
 }
 
 enum TABS