mirror of https://gitlab.com/pamhyr/pamhyr2
Study: Add default description example.
parent
48c98cddba
commit
da18a8b712
|
|
@ -112,6 +112,8 @@ class Study(SQLModel):
|
||||||
else:
|
else:
|
||||||
self._init_db_file(self.filename, is_new=True)
|
self._init_db_file(self.filename, is_new=True)
|
||||||
|
|
||||||
|
self.commit()
|
||||||
|
|
||||||
# Save
|
# Save
|
||||||
self.last_save_date = datetime.now()
|
self.last_save_date = datetime.now()
|
||||||
self._save(progress=progress)
|
self._save(progress=progress)
|
||||||
|
|
@ -235,7 +237,7 @@ class Study(SQLModel):
|
||||||
if version[0] == self._version:
|
if version[0] == self._version:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
logger.info("Update database")
|
logger.debug("Update database")
|
||||||
|
|
||||||
if self._update_submodel(version[0]):
|
if self._update_submodel(version[0]):
|
||||||
self.execute(
|
self.execute(
|
||||||
|
|
|
||||||
|
|
@ -666,21 +666,21 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
|
||||||
self._study.filename = file_name
|
self._study.filename = file_name
|
||||||
|
|
||||||
try:
|
try:
|
||||||
sql_request_count = self._study.sql_save_request_count()
|
# sql_request_count = self._study.sql_save_request_count()
|
||||||
progress = QProgressDialog(
|
# progress = QProgressDialog(
|
||||||
"Backup...", None,
|
# "Backup...", None,
|
||||||
0, sql_request_count,
|
# 0, sql_request_count,
|
||||||
parent=self
|
# parent=self
|
||||||
)
|
# )
|
||||||
progress.setWindowModality(Qt.WindowModal)
|
# progress.setWindowModality(Qt.WindowModal)
|
||||||
progress.setValue(0)
|
# progress.setValue(0)
|
||||||
|
|
||||||
status = f"Backup ({file_name})..."
|
status = f"Backup ({file_name})..."
|
||||||
logger.info(status)
|
logger.info(status)
|
||||||
self.statusbar.showMessage(status, 3000)
|
self.statusbar.showMessage(status, 3000)
|
||||||
|
|
||||||
self._study.save(
|
self._study.save(
|
||||||
progress=lambda: progress.setValue(progress.value() + 1)
|
# progress=lambda: progress.setValue(progress.value() + 1)
|
||||||
)
|
)
|
||||||
|
|
||||||
status += " Done"
|
status += " Done"
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,9 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from datetime import datetime
|
||||||
|
from tools import get_user_name
|
||||||
|
|
||||||
from Modules import Modules
|
from Modules import Modules
|
||||||
from Model.Study import Study
|
from Model.Study import Study
|
||||||
from View.Tools.PamhyrWindow import PamhyrDialog
|
from View.Tools.PamhyrWindow import PamhyrDialog
|
||||||
|
|
@ -61,6 +64,13 @@ class NewStudyWindow(PamhyrDialog):
|
||||||
)
|
)
|
||||||
|
|
||||||
if self._study is not None:
|
if self._study is not None:
|
||||||
|
self.set_study_values()
|
||||||
|
else:
|
||||||
|
self.set_default_values()
|
||||||
|
|
||||||
|
self.connection()
|
||||||
|
|
||||||
|
def set_study_values(self):
|
||||||
self.set_line_edit_text("lineEdit_name", self._study.name)
|
self.set_line_edit_text("lineEdit_name", self._study.name)
|
||||||
self.set_plaintext_edit_text(
|
self.set_plaintext_edit_text(
|
||||||
"plainTextEdit_description", self._study.description
|
"plainTextEdit_description", self._study.description
|
||||||
|
|
@ -82,7 +92,40 @@ class NewStudyWindow(PamhyrDialog):
|
||||||
self.find(QLabel, "label_date").setEnabled(True)
|
self.find(QLabel, "label_date").setEnabled(True)
|
||||||
self.find(QDateTimeEdit, "dateTimeEdit_date").setEnabled(True)
|
self.find(QDateTimeEdit, "dateTimeEdit_date").setEnabled(True)
|
||||||
|
|
||||||
self.connection()
|
def set_default_values(self):
|
||||||
|
self.set_line_edit_text("lineEdit_name", "MyNewStudy")
|
||||||
|
|
||||||
|
description = f"""# MyNewStudy
|
||||||
|
|
||||||
|
This is my new study description
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## General information
|
||||||
|
|
||||||
|
...
|
||||||
|
|
||||||
|
## TODO
|
||||||
|
|
||||||
|
- [X] Network
|
||||||
|
- [ ] Geometry
|
||||||
|
- [ ] ...
|
||||||
|
|
||||||
|
## Change log
|
||||||
|
|
||||||
|
{datetime.now().strftime('%Y-%m-%d')}: Add a default bief
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Copyright
|
||||||
|
|
||||||
|
(c) {get_user_name()} - {datetime.now().year}
|
||||||
|
|
||||||
|
All right reserved.
|
||||||
|
"""
|
||||||
|
|
||||||
|
self.set_plaintext_edit_text("plainTextEdit_description", description)
|
||||||
|
self.set_text_edit_text("textBrowser_description", description)
|
||||||
|
|
||||||
def connection(self):
|
def connection(self):
|
||||||
time = self.find(QRadioButton, "radioButton_time")
|
time = self.find(QRadioButton, "radioButton_time")
|
||||||
|
|
@ -115,7 +158,6 @@ class NewStudyWindow(PamhyrDialog):
|
||||||
def accept(self):
|
def accept(self):
|
||||||
name = self.get_line_edit_text("lineEdit_name")
|
name = self.get_line_edit_text("lineEdit_name")
|
||||||
description = self.get_plaintext_edit_text("plainTextEdit_description")
|
description = self.get_plaintext_edit_text("plainTextEdit_description")
|
||||||
logger.info(description)
|
|
||||||
|
|
||||||
if self._study is None:
|
if self._study is None:
|
||||||
study = Study.new(name, description)
|
study = Study.new(name, description)
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,16 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>560</width>
|
<width>896</width>
|
||||||
<height>350</height>
|
<height>504</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Dialog</string>
|
<string>Dialog</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="locale">
|
||||||
|
<locale language="English" country="Europe"/>
|
||||||
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="label">
|
<widget class="QLabel" name="label">
|
||||||
|
|
@ -34,7 +37,7 @@
|
||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QLineEdit" name="lineEdit_name">
|
<widget class="QLineEdit" name="lineEdit_name">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>MyNewStudy</string>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|
@ -50,11 +53,14 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>1</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab">
|
<widget class="QWidget" name="tab">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Markdown</string>
|
<string>Edition</string>
|
||||||
|
</attribute>
|
||||||
|
<attribute name="toolTip">
|
||||||
|
<string><html><head/><body><p>Markdown is a plain text format (<a href="https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet"><span style=" text-decoration: underline; color:#0000ff;">cheatsheet</span></a>).</p><p><span style=" font-weight:600;">Title:</span></p><p># Title</p><p>## Subtitle</p><p>### Subsubtitle</p><p><span style=" font-weight:600;">Emphasis:</span></p><p>**<span style=" font-weight:600;">bold</span>**</p><p><span style=" font-style:italic;">_italic_</span></p><p><span style=" font-weight:600;">Lists:</span></p><p>- First</p><p>- Second</p><p>1. First</p><p>2. Second</p><p><span style=" font-weight:600;">Quote:</span></p><p>&gt; This is a quote</p><p><span style=" font-weight:600;">Code:</span></p><p>```python</p><p>print(&quot;hello&quot;)</p><p>```</p><p><span style=" font-weight:600;">Inline HTML:</span></p><p>&lt;font color=&quot;red&quot;&gt;<span style=" color:#ff0000;">foo bar</span>&lt;/font&gt;</p></body></html></string>
|
||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
import pwd
|
||||||
import time
|
import time
|
||||||
import logging
|
import logging
|
||||||
import traceback
|
import traceback
|
||||||
|
|
@ -270,6 +271,12 @@ def timestamp_to_old_pamhyr_date(time: int):
|
||||||
|
|
||||||
return s
|
return s
|
||||||
|
|
||||||
|
def get_user_name():
|
||||||
|
if posix:
|
||||||
|
return pwd.getpwuid(os.getuid()).pw_gecos
|
||||||
|
else:
|
||||||
|
return "Me"
|
||||||
|
|
||||||
|
|
||||||
#######################
|
#######################
|
||||||
# COMMAND LINE PARSER #
|
# COMMAND LINE PARSER #
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue