Update to Version 19.0.2

sebasj13 · Feb 21, 2022 · 51ae2bc · 51ae2bc
1 parent c7bd1e2
commit 51ae2bc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -21,5 +21,5 @@ keywords:
   - GUI
   - Python
 license: MIT
-version: 19.0.1
+version: 19.0.2
 date-released: '2022-02-20'
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ This GUI can visualize and analyze percentage depth dose (pdd) and dose profiles
      * Error bars (On/Off)
      * Difference plot between two datasets
      * Graph order and colors
-     * Marker size
+     * Marker size and style
      * Line width
      * Zoom-in window
      * Half view of dose profiles

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="topasgraphsim",
-    version="19.0.1",
+    version="19.0.2",
     author="Sebastian Schäfer",
     author_email="sebastian.schaefer@student.uni-halle.de",
     description="GUI to plot the results of a topas simulation",

diff --git a/topasgraphsim/src/classes/dose_figure_handler.py b/topasgraphsim/src/classes/dose_figure_handler.py
@@ -155,8 +155,6 @@ def add_plot_data(self, datanames):
         if self.plots[0].direction == "Z":
             self.half = False
 
-        print(self.normvalue)
-
         for plotdata in self.plots:
             if self.norm == True:
                 if self.normvalue == "max":

diff --git a/topasgraphsim/src/classes/main_viewer.py b/topasgraphsim/src/classes/main_viewer.py
@@ -1132,7 +1132,7 @@ def show_preview(self):
                 (0.023 + normdiff + 0.042 * i) * self.canvas.image.height() * factor,
                 0.988 * self.canvas.image.width(),
                 (0.065 + normdiff + 0.042 * i) * self.canvas.image.height() * factor,
-                fill="",
+                fill="red",
                 outline="",
                 tags="rename",
             )
@@ -1404,10 +1404,13 @@ def handle_configure(self, event=None):
                 normdiff = 0
                 factor = 1
                 if self.norm.get() == False:
-                    normdiff = -0.025
+                    normdiff = 0.025
                 if self.DoseFigureHandler.plots[0].direction == "Z":
                     factor = 6 / 5
 
+                if self.DoseFigureHandler.diffplot == True:
+                    factor *= 0.75
+
                 self.rename_boxes += [
                     self.canvas.create_rectangle(
                         coords[0]
@@ -1427,17 +1430,17 @@ def handle_configure(self, event=None):
                         ),
                         (
                             (canvdims[1] - imdims[1]) // 2
-                            + imdims[1] * (0.01 + i * 0.035 + normdiff)
+                            + imdims[1] * (0.015 + i * 0.04 + normdiff)
                         )
                         * factor,
                         coords[0] + imdims[0] * 0.49,
                         (
                             (canvdims[1] - imdims[1]) // 2
-                            + imdims[1] * (0.06 + i * 0.035 + normdiff)
+                            + imdims[1] * (0.055 + i * 0.04 + normdiff)
                         )
                         * factor,
                         fill="",
-                        outline="",
+                        outline="black",
                         tags="rename",
                     )
                 ]

diff --git a/topasgraphsim/src/classes/update.py b/topasgraphsim/src/classes/update.py
@@ -9,7 +9,7 @@
 class CheckForUpdates:
     def __init__(self):
 
-        currentVersion = "19.0.1"
+        currentVersion = "19.0.2"
         try:
             newestVersion = requests.get(
                 "https://api.github.com/repos/sebasj13/topasgraphsim/releases/latest"

diff --git a/topasgraphsim/src/resources/info.py b/topasgraphsim/src/resources/info.py
@@ -15,7 +15,7 @@ def __init__(self, parent, lang, mode):
             "de": "TopasGraphSim\n\nAutor: Sebastian Schäfer",
             "en": "TopasGraphSim\n\nAuthor: Sebastian Schäfer",
         }
-        version = {"de": "Version: 19.0.1\n ", "en": "Version: 19.0.1\n "}
+        version = {"de": "Version: 19.0.2\n ", "en": "Version: 19.0.2\n "}
 
         if mode == True:
             pic = "light"