From 272ff562c4552855fa8c746f38f8164a5a9f8558 Mon Sep 17 00:00:00 2001
From: "Anders H. Rebner" <anderhre@stud.ntnu.no>
Date: Fri, 10 Apr 2020 17:17:09 +0200
Subject: [PATCH] #40 Visning av SOI'er i db oppdateres ved lagring av ny SOI
---
soitool/main_window.py | 4 ++--
soitool/soi_model_view.py | 15 +++++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/soitool/main_window.py b/soitool/main_window.py
index 90f870c..6d1d729 100644
--- a/soitool/main_window.py
+++ b/soitool/main_window.py
@@ -22,7 +22,7 @@ from soitool.codebook_widget import CodebookWidget
from soitool.codebook_model_view import CodeBookTableModel
from soitool.database import Database, DBPATH
from soitool.help_actions import ShortcutsHelpDialog, BasicUsageHelpDialog
-from soitool.soi_db_widget import soi_db_widget
+from soitool.soi_db_widget import SOIDbWidget
from soitool.soi_model_view import SOITableModel
from soitool.serialize_export_import_soi import (
export_soi,
@@ -289,7 +289,7 @@ class MainWindow(QMainWindow):
if isinstance(tab_widget, SOIWorkspaceWidget):
# Update tab showing SOI's in db if it is open
for i in range(self.tabs.count()):
- if self.tabs.tabText(i) == "SOI'er i db":
+ if self.tabs.tabText(i) == "SOI'er i DB":
view = self.tabs.widget(i).view
view.setModel(None)
self.database.insert_soi(tab_widget.soi)
diff --git a/soitool/soi_model_view.py b/soitool/soi_model_view.py
index 63fe642..3ca3d38 100644
--- a/soitool/soi_model_view.py
+++ b/soitool/soi_model_view.py
@@ -94,6 +94,21 @@ class SOITableView(QTableView):
self.tab_widget.addTab(tab, soi.title)
self.tab_widget.setCurrentWidget(tab)
+ def setModel(self, model):
+ """Set model, resize and hide 'SOI'-column.
+
+ Parameters
+ ----------
+ model : SOITableModel or None
+ Model containing data to display.
+ """
+ super().setModel(model)
+ if model is not None:
+ self.hideColumn(1)
+ self.resizeColumnsToContents()
+ width = self.columnWidth(0) + self.columnWidth(2) + 2 # +2 offset
+ self.setFixedWidth(width)
+
class SOITableModel(QSqlTableModel):
"""Uneditable QSqlTableModel of database-table 'SOI'."""
--
GitLab