Skip to content

Commit 25f52e2

Browse files
authored
Merge pull request #2 from SwolfPy-Project/GUI
GUI
2 parents 8388733 + 9e70ef1 commit 25f52e2

8 files changed

Lines changed: 888 additions & 1342 deletions

File tree

CONTRIBUTING.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ If you are reporting a bug, please include:
2828
Fix Bugs
2929
~~~~~~~~
3030

31-
Look through the Bitbucket issues for bugs. Anything tagged with "bug" and "help
31+
Look through the GitHub issues for bugs. Anything tagged with "bug" and "help
3232
wanted" is open to whoever wants to implement it.
3333

3434
Implement Features
3535
~~~~~~~~~~~~~~~~~~
3636

37-
Look through the Bitbucket issues for features. Anything tagged with "enhancement"
37+
Look through the GitHub issues for features. Anything tagged with "enhancement"
3838
and "help wanted" is open to whoever wants to implement it.
3939

4040
Write Documentation
4141
~~~~~~~~~~~~~~~~~~~
4242

43-
PySWOLF could always use more documentation, whether as part of the
44-
official PySWOLF docs, in docstrings, or even on the web in blog posts,
43+
SwolfPy could always use more documentation, whether as part of the
44+
official SwolfPy docs, in docstrings, or even on the web in blog posts,
4545
articles, and such.
4646

4747
Submit Feedback

HISTORY.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
History
33
=======
44

5+
0.2.3 (2021-XX-XX)
6+
------------------
7+
8+
* Improve data validation in GUI
9+
* Improve warning/Pop-ups
10+
11+
512
0.2.2 (2021-10-02)
613
------------------
714

swolfpy/Parameters.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,11 @@ def check_sum(self):
151151
if list_item[1] < 0 or list_item[1] > 1:
152152
raise ValueError("Parameters should be in range(0,1), check: {}".format(list_item[2]))
153153
if not approx_eq(sum_, 1):
154+
msg = "Sum of the parameters in group is not 1: \n"
154155
for i in item:
155156
print("{}: {}".format(i[2], i[1]))
156-
raise ValueError("Sum of the parameters is not 1")
157+
msg += "{}: {}\n".format(i[2], i[1])
158+
raise ValueError(msg)
157159
sum_ = 0
158160
flag = 0
159161
break

swolfpy/UI/PySWOLF.ui

Lines changed: 40 additions & 395 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)