Skip to content

Commit

Permalink
Preparation for public release
Browse files Browse the repository at this point in the history
Added license properly
Added authors list
Bumped version to v2.1.2
  • Loading branch information
trappitsch committed May 27, 2020
1 parent a86d6cd commit 0ca4ad6
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 11 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Reto Trappitsch, https://trappitsch.github.io
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,11 @@ If you are interested: The file with the configurations shown in the image above
If you find bugs in the software or would like to have an additional feature, please use github's Issue capability to create an appropriate request. Please also browse the issues to first see if the bug / feature request you want to report is already listed. Feel free to join the discussion in this case!

If you furthermore have ideas on how to implement / fix the bug already, please feel free to discuss it throuh in the Issues tab and create a pull request. Please follow [best practices](https://chris.beams.io/posts/git-commit/) in your commit messages.


## License

RIMSSchemeDrawer is Copyright (C) 2020 Reto Trappitsch
It is licensed under the GPL (version 2 or greater).

RIMSSchemeDrawer makes use of [PyQt5](https://riverbankcomputing.com/) and the fman build system [fbs](https://build-system.fman.io/).
2 changes: 1 addition & 1 deletion src/build/settings/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"app_name": "RIMSSchemeDrawer",
"author": "Reto Trappitsch",
"main_module": "src/main/python/main.py",
"version": "2.1.1"
"version": "2.1.2"
}
33 changes: 25 additions & 8 deletions src/main/python/main.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
"""
Copyright (C) 2020 Reto Trappitsch
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
"""

from fbs_runtime.application_context.PyQt5 import ApplicationContext

from PyQt5.QtWidgets import QWidget, QMainWindow, QPushButton, QRadioButton, QCheckBox, QButtonGroup, \
Expand All @@ -14,22 +32,21 @@

class SchemeDrawer(QMainWindow):
"""
RIMS scheme drawer, the PyQt5 version based on fbs
RIMSSchemeDrawer
Developer: Reto Trappitsch, trappitsch1@llnl.gov
Version: 2.1.1
Date: May 5, 2020
Developer: Reto Trappitsch
Version: 2.1.2
Date: May 27, 2020
"""

def __init__(self):
# run in debug mode?
self.rundebug = False

# program info
self.version = '2.1.1'
self.version = '2.1.2'
self.version_date = '2020-05-05'
self.author = 'Reto Trappitsch'
self.author_email = 'trappitsch1@llnl.gov'

# initialize the thing
super().__init__()
Expand Down Expand Up @@ -737,8 +754,8 @@ def about(self):
'<br>Version: ' + self.version + \
'<br>Date: ' + self.version_date + \
'<p>Author: ' + self.author + \
'<br>E-mail: ' + self.author_email + \
'<p>Please contact the author for bug reports, etc.' \
'<p>Please see the github repository for bug reports, feature requests, and for contacting the ' \
'author.' \
'<p>Many tooltips are implemented that can help you with the software. Hover over entries ' \
'with the mouse and check those tooltips out.'
QMessageBox.about(self, 'About', about_msg)
Expand Down
19 changes: 17 additions & 2 deletions src/main/python/plotter.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,23 @@
from fbs_runtime.application_context.PyQt5 import ApplicationContext
"""
Copyright (C) 2020 Reto Trappitsch
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
"""

from PyQt5.QtWidgets import QWidget, QMainWindow, QVBoxLayout, QFileDialog, QSizePolicy

import functools
import numpy as np
from os.path import expanduser

Expand Down

0 comments on commit 0ca4ad6

Please sign in to comment.