max_page 관련 버그 수정

Author: DCP-arca

gui.py

@@ -438,7 +438,7 @@ def on_hv_edit_callback(self, is_column, row, str_menu):
                 self.table_widget.set_data(
                     self.dm.cond_data, ENUM_TABLEVIEW_INITMODE.EDIT)
 
-                if edit_type == DataEditType.REMOVE_ROW:
+                if edit_type == DataEditType.REMOVE_ROW or edit_type == DataEditType.REMOVE_COLUMN:
                     self.refresh_tables(row - 1)
                 else:
                     self.refresh_tables(row)

gui_tableview.py

@@ -1,4 +1,5 @@
 import sys
+import math
 from PyQt5.QtWidgets import QApplication, QTableView, QDialog, QMenu, QCheckBox, QDialogButtonBox, QGridLayout, QMessageBox, QAbstractItemView, QHeaderView, QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QLabel, QLineEdit
 from PyQt5.QtCore import QAbstractTableModel, Qt, pyqtSignal
 from PyQt5.QtGui import QIntValidator, QPainter, QColor, QFont
@@ -179,7 +180,7 @@ def get_page(self):
 
     def get_maxpage(self):
         model = self.model()
-        return int(len(model._data) / model._page_size) + 1
+        return math.ceil(len(model._data) / model._page_size)
 
     def next_page(self):
         model = self.model()
@@ -381,15 +382,17 @@ def set_data(self, data, mode):
                     0, ENUM_TABLEVIEW_SORTMODE.ORIGINAL)
                 self.now_sort = []
 
+            # EDITNEEDED : EDIT 모드를 위해 저장함
             before_page = self.get_page()
 
             self.init_page()
 
+            # EDITNEEDED : page init 하면 1페이지로 돌아가기 때문에, 다시 기존에 있었던 page로 이동한다.
             if mode == ENUM_TABLEVIEW_INITMODE.EDIT:
-                max_pag = self.table_view.get_maxpage()
-                if before_page <= max_pag:
-                    self.page_label.setText(str(before_page))
-                    self.goto_page()
+                max_page = self.table_view.get_maxpage()
+                page = before_page if before_page <= max_page else max_page
+                self.page_label.setText(str(page))
+                self.goto_page()
 
     # this function must be called after table_view.set_data