Refactor(widget, calendar): Improve memory efficiency . #39

Author: khumnath

DayTithiWidget.h

@@ -131,13 +131,20 @@ class DayTithiWidget : public QWidget {
         int dayFontSize = std::max(12, static_cast<int>(minDim * 0.14));
         int tithiFontSize = std::max(8, static_cast<int>(minDim * 0.05));
         int englishDayFontSize = std::max(8, static_cast<int>(minDim * 0.05));
-        int fontId = QFontDatabase::addApplicationFont(":/resources/NotoSansDevanagari-VariableFont_wdth,wght.ttf");
-        QString fontFamily = QFontDatabase::applicationFontFamilies(fontId).at(0);
-        QFont dayFont = dayLabel->font();
-        dayFont.setPointSize(dayFontSize);
-        dayFont.setFamily(fontFamily);
-        dayFont.setBold(false);
-        dayLabel->setFont(dayFont);
+        QString notoFamily = "Noto Sans Devanagari";
+
+        // Register font if it's not available
+        if (!QFontDatabase().families().contains(notoFamily)) {
+            QFontDatabase::addApplicationFont(":/resources/NotoSansDevanagari-VariableFont_wdth,wght.ttf");
+        }
+
+        // Set label font
+        QFont labelFont = dayLabel->font();
+        labelFont.setPointSize(dayFontSize);
+        labelFont.setFamily(notoFamily);
+        labelFont.setBold(false);
+        dayLabel->setFont(labelFont);
+
         QFont tithiFont = tithiLabel->font();
         tithiFont.setPointSize(tithiFontSize);
         tithiFont.setItalic(true);

calendartable.cpp

@@ -10,64 +10,117 @@
 #include "panchanga.h"
 
 void CalendarTableHelper::updateCalendar(QTableWidget* table, Bikram& converter, int year, int month, int& gYear, int& gMonth, int& gDay) {
-    int daysInMonth = converter.daysInMonth(year, month);
-    table->clear();
+    // Delete all existing cell widgets to free memory
+    for (int row = 0; row < table->rowCount(); ++row) {
+        for (int col = 0; col < table->columnCount(); ++col) {
+            QWidget *widget = table->cellWidget(row, col);
+            if (widget) {
+                table->removeCellWidget(row, col);
+                delete widget;
+            }
+            // Also delete the QTableWidgetItem if exists
+            QTableWidgetItem *item = table->item(row, col);
+            if (item) {
+                delete item;
+                table->setItem(row, col, nullptr);
+            }
+        }
+    }
+
+    // Clear the table contents (headers remain, but items cleared)
+    table->clearContents();
+
+    // Reconfigure table
     table->setRowCount(6);
     table->setColumnCount(7);
+
     QStringList headers = {"आइत", "सोम", "मङ्गल", "बुध", "बिही", "शुक्र", "शनि"};
     table->setHorizontalHeaderLabels(headers);
+
     table->horizontalHeader()->setStyleSheet(
-        "QHeaderView::section {background-color: #d3d3d3;color: blue;border: 1px solid gray;}"
+        "QHeaderView::section {background-color: #d3d3d3; color: blue; border: 1px solid gray;}"
     );
+
     table->setStyleSheet(
-        "background-color: white;QTableWidget::item {border: 1px solid gray;}QTableWidget .dayLabel {font-size: 24px;color: black;}QTableWidget .tithiLabel {font-size: 8px;color: blue;}"
+        "background-color: white;"
+        "QTableWidget::item {border: 1px solid gray;}"
+        "QTableWidget .dayLabel {font-size: 24px; color: black;}"
+        "QTableWidget .tithiLabel {font-size: 8px; color: blue;}"
     );
+
+    // First day Gregorian conversion
     converter.toGregorian(year, month, 1, gYear, gMonth, gDay);
     QDate firstDay(gYear, gMonth, gDay);
     int startDay = firstDay.dayOfWeek();
+    int col = (startDay - 6 + 7) % 7; // Saturday is last
+
+    // Today's BS date for comparison
     QDate today = QDate::currentDate();
     converter.fromGregorian(today.year(), today.month(), today.day());
     int todayBsYear = converter.getYear();
     int todayBsMonth = converter.getMonth();
     int todayBsDay = converter.getDay();
-    int saturdayIndex = 6;
-    QIcon purnimaIcon(":/resources/purnima.png");
-    QIcon amavasyaIcon(":/resources/amawasya.png");
+
+    static QIcon purnimaIcon(":/resources/purnima.png");
+    static QIcon amavasyaIcon(":/resources/amawasya.png");
+
     int row = 0;
-    int col = (startDay - saturdayIndex + 6) % 7;
+    int daysInMonth = converter.daysInMonth(year, month);
+
     for (int day = 1; day <= daysInMonth; ++day) {
         int cellGYear, cellGMonth, cellGDay;
         converter.toGregorian(year, month, day, cellGYear, cellGMonth, cellGDay);
+
         double julianDate = gregorianToJulian(cellGYear, cellGMonth, cellGDay);
         Panchang panchang(julianDate);
+
         QString tithiName = QString::fromStdString(tithi[(int)panchang.tithi_index]);
         QString englishDayStr = QString::number(cellGDay);
+
         DayTithiWidget *customWidget = new DayTithiWidget(convertToNepaliNumerals(day), tithiName, englishDayStr);
         customWidget->setProperty("year", cellGYear);
         customWidget->setProperty("month", cellGMonth);
-        customWidget->setProperty("gDay", cellGDay); // Store actual Gregorian day
-        std::tm date_to_pass = {}; // This zero-initializes all members of the struct
+        customWidget->setProperty("gDay", cellGDay);
+
+        std::tm date_to_pass = {};
         date_to_pass.tm_year = cellGYear - 1900;
         date_to_pass.tm_mon = cellGMonth - 1;
         date_to_pass.tm_mday = cellGDay;
+
         TithiResult tithiResult = calculateTithi(date_to_pass);
         QString tooltipText = QString("%1 (%2)")
             .arg(QString::fromStdString(tithiResult.tithiName))
             .arg(QString::fromStdString(tithiResult.paksha));
         customWidget->setToolTip(tooltipText);
-        QTableWidgetItem *item = new QTableWidgetItem();
-        table->setItem(row, col, item);
+
+        table->setItem(row, col, new QTableWidgetItem());
+
         bool isToday = (year == todayBsYear && month == todayBsMonth && day == todayBsDay);
-        bool isSaturday = (col == saturdayIndex);
-        if (isToday) customWidget->setTodayStyle();
-        else if (isSaturday) customWidget->setSaturdayStyle();
-        if (panchang.tithi_index == 14) customWidget->setIcon(purnimaIcon, 0.9);
-        else if (panchang.tithi_index == 29) customWidget->setIcon(amavasyaIcon, 0.9);
-        else customWidget->setIcon(QIcon(), 0.0);
+        bool isSaturday = (col == 6);
+
+        if (isToday) {
+            customWidget->setTodayStyle();
+        } else if (isSaturday) {
+            customWidget->setSaturdayStyle();
+        }
+
+        if (panchang.tithi_index == 14) {
+            customWidget->setIcon(purnimaIcon, 0.9);
+        } else if (panchang.tithi_index == 29) {
+            customWidget->setIcon(amavasyaIcon, 0.9);
+        } else {
+            customWidget->setIcon(QIcon(), 0.0);
+        }
+
         table->setCellWidget(row, col, customWidget);
+
         col++;
-        if (col > 6) { col = 0; row++; }
+        if (col > 6) {
+            col = 0;
+            row++;
+        }
     }
+
     table->resizeRowsToContents();
     table->resizeColumnsToContents();
     CalendarTableHelper::adjustCellSizes(table);
@@ -79,18 +132,27 @@ void CalendarTableHelper::adjustCellSizes(QTableWidget* table) {
     int tableHeight = table->viewport()->height();
     int numColumns = table->columnCount();
     int numRows = table->rowCount();
+
     if (numColumns > 0 && numRows > 0) {
         int columnWidth = tableWidth / numColumns;
         int rowHeight = tableHeight / numRows;
-        for (int i = 0; i < numColumns; ++i) table->setColumnWidth(i, columnWidth);
-        for (int i = 0; i < numRows; ++i) table->setRowHeight(i, rowHeight);
+
+        for (int i = 0; i < numColumns; ++i)
+            table->setColumnWidth(i, columnWidth);
+
+        for (int i = 0; i < numRows; ++i)
+            table->setRowHeight(i, rowHeight);
     }
 }
 
 void CalendarTableHelper::populateBsDays(QComboBox* dayCombo, Bikram& converter, int year, int month) {
     int daysInMonth = converter.daysInMonth(year, month);
     int currentDay = converter.getDay();
+
     dayCombo->clear();
-    for (int day = 1; day <= daysInMonth; ++day) dayCombo->addItem(QString::number(day));
+    for (int day = 1; day <= daysInMonth; ++day) {
+        dayCombo->addItem(QString::number(day));
+    }
+
     dayCombo->setCurrentText(QString::number(currentDay));
 }

calendarwindow.cpp

@@ -31,11 +31,11 @@ CalendarWindow::CalendarWindow(QWidget *parent) :
 
 
     // Apply the custom font
-    int fontId = QFontDatabase::addApplicationFont(":/resources/NotoSansDevanagari-VariableFont_wdth,wght.ttf");
-    QString fontFamily = "Noto Sans Devnagari";
-    if (fontId != -1) {
-        fontFamily = QFontDatabase::applicationFontFamilies(fontId).at(0);
-    }
+        QString fontFamily = "Noto Sans Devanagari";
+        if (!QFontDatabase().families().contains(fontFamily)) {
+            QFontDatabase::addApplicationFont(":/resources/NotoSansDevanagari-VariableFont_wdth,wght.ttf");
+        }
+
         qApp->setFont(fontFamily);