Added cax correction

Author: sebasj13

CITATION.cff

@@ -19,5 +19,5 @@ keywords:
   - GUI
   - Python
 license: MIT
-version: 23.0.2
-date-released: '2023-03-21'
+version: 23.1.0
+date-released: '2023-03-25'

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="topasgraphsim",
-    version="23.0.2",
+    version="23.1.0",
     author="Sebastian Schäfer",
     author_email="sebastian.schaefer@student.uni-halle.de",
     description="GUI to analyze the results of a Monte-Carlo radiation simulation",

topasgraphsim/src/classes/options.py

@@ -59,8 +59,7 @@ def __init__(self, parent, index, lang):
         self.dataframe2.pack_propagate(False)
         self.dataframe2.columnconfigure(0, weight=1, minsize=144)
         self.dataframe2.columnconfigure(1, weight=1)
-        self.dataframe2.rowconfigure(1, weight=1)
-        self.dataframe2.rowconfigure(5, weight=1)
+
 
         self.graphlist = ScrollFrame(self.dataframe1)
         path = os.path.join(os.path.dirname(os.path.abspath(__file__)),"..","resources", "images")
@@ -76,26 +75,31 @@ def __init__(self, parent, index, lang):
         self.graphlist.grid(column=0, row=0, rowspan=5, sticky="nsew", padx=5, pady=5)
 
         self.load_topas_button = ctk.CTkButton(self.dataframe2, text = Text().loadsim[self.lang], command = self.load_topas, width=20)
-        self.load_topas_button.grid(row=0, column=0, sticky="nsew", pady=5, padx=5)
+        self.load_topas_button.grid(row=0, column=0, sticky="nsew", pady=(5,2), padx=5)
 
         self.load_mcc_button = ctk.CTkButton(self.dataframe2, text = Text().loadmeasurement[self.lang], command = self.load_measurement, width=20)
-        self.load_mcc_button.grid(row=0, column=1, sticky="nsew", padx=5, pady=5)
+        self.load_mcc_button.grid(row=0, column=1, sticky="nsew", padx=5, pady=(5,2))
 
         self.normalize=ctk.BooleanVar(value=self.p.get_attribute("normalize"))
         normtypedict = {"maximum":Text().maximum[self.lang], "plateau":Text().plateau[self.lang], "centeraxis":Text().centeraxis[self.lang]}
         self.normalization = ctk.StringVar(value=normtypedict[self.p.get_attribute("normtype")])
         self.normalize_button = ctk.CTkCheckBox(self.dataframe2, text=Text().normalize[self.lang], variable=self.normalize, command=self.change_normalization, font=("Bahnschrift", 12, "bold"))
         self.normalize_options = ctk.CTkOptionMenu(self.dataframe2, values=[Text().maximum[self.lang], Text().plateau[self.lang], Text().centeraxis[self.lang]], variable=self.normalization, command=self.change_normalization)
-        self.normalize_button.grid(row=2, column=0, sticky="nsew", pady=5, padx=5)
-        self.normalize_options.grid(row=2, column=1, sticky="ew", pady=5, padx=5)
+        self.normalize_button.grid(row=2, column=0, sticky="nsew", pady=2, padx=5)
+        self.normalize_options.grid(row=2, column=1, sticky="ew", pady=2, padx=5)
+
+        self.caxcorrection = ctk.BooleanVar(value=self.p.get_attribute("caxcorrection"))
+
+        self.cax_button = ctk.CTkCheckBox(self.dataframe2, text=Text().caxcorrection[self.lang], variable=self.caxcorrection, onvalue=True, offvalue=False, command = self.toggle_cax_correction, font=("Bahnschrift",12, "bold"))
+        self.cax_button.grid(column=0, columnspan=2, row=3, padx=5, pady=2, sticky = "w")
 
         self.showgrid = ctk.BooleanVar(value=self.p.get_attribute("grid"))
 
         self.gridoptions = ctk.StringVar(value=Text().gridoptions1[self.lang])
         self.showgrid_button = ctk.CTkCheckBox(self.dataframe2, text=Text().showgrid[self.lang], variable=self.showgrid, onvalue=True, offvalue=False, command = self.toggle_grid_options, font=("Bahnschrift",12, "bold"))
         self.showgrid_options = ctk.CTkOptionMenu(self.dataframe2, variable=self.gridoptions, values=[Text().gridoptions1[self.lang], Text().gridoptions2[self.lang]], command = lambda x: self.toggle_grid_options())    
-        self.showgrid_button.grid(column=0, row=3, padx=5, pady=2, sticky = "w")
-        self.showgrid_options.grid(column=1, row=3, padx=5, pady=2, sticky = "w")   
+        self.showgrid_button.grid(column=0, row=4, padx=5, pady=2, sticky = "w")
+        self.showgrid_options.grid(column=1, row=4, padx=5, pady=2, sticky = "w")   
 
         self.showlegend = ctk.BooleanVar(value = self.p.get_attribute("legend"))
         self.legendoptions = ctk.StringVar(value=Text().legendoptions1[self.lang]) ##
@@ -110,13 +114,13 @@ def __init__(self, parent, index, lang):
                                                             Text().legendoptions5[self.lang]],
                                                     command = lambda x: self.toggle_legend_options())
 
-        self.showlegend_button.grid(column=0, row=4, padx=5, pady=2, sticky="w")
-        self.showlegend_options.grid(column=1, row=4, padx=5, pady=2, sticky="w")
+        self.showlegend_button.grid(column=0, row=5, padx=5, pady=2, sticky="w")
+        self.showlegend_options.grid(column=1, row=5, padx=5, pady=2, sticky="w")
 
         self.change_name_button = ctk.CTkButton(self.dataframe2, text=Text().edittabname[self.lang], command = self.change_name, width=20)
         self.close_tab_button = ctk.CTkButton(self.dataframe2, text=Text().closetab1[self.lang], command = lambda: self.parent.master.master.remove_tab(self.parent.master.master.tabnames.index(self.parent.name)), width=20, fg_color="red")
-        self.close_tab_button.grid(row=6, column=1, sticky="nsew", pady=5, padx=5)
-        self.change_name_button.grid(row=6, column=0, sticky="nsew", pady=5, padx=5)
+        self.close_tab_button.grid(row=6, column=1, sticky="new", pady=(5,2), padx=5)
+        self.change_name_button.grid(row=6, column=0, sticky="new", pady=(5,2), padx=5)
 
 
         #######################################################################################################################
@@ -432,7 +436,12 @@ def remove_plot(self):
         if len(self.parent.plots) == 0:
             self.disable_all_buttons()
         self.parent.update()
-        
+
+    def toggle_cax_correction(self, event=None):
+        self.parent.saved = False
+        for plot in self.parent.plots:
+            plot.caxcorrection = self.caxcorrection.get()
+        self.parent.update()
 
     def change_normalization(self, event=None):
         self.parent.saved = False

topasgraphsim/src/classes/settings.py

@@ -97,6 +97,7 @@ def __init__(self, parent, name, index, lang):
         self.axshift = ctk.StringVar(value= "0")
         self.dosescale = ctk.StringVar(value="1")
         self.flip = ctk.BooleanVar(value=False)
+        self.caxcorrection = ctk.BooleanVar(value=self.p.get_attribute("caxcorrection"))
 
         self.linethicknesslabel = ctk.CTkLabel(self.plotframe, text=Text().linethickness[self.lang], font=("Bahnschrift",16))
         self.linethicknesslabel.grid(column=0, row=1, padx=5, pady=5, sticky="w")
@@ -121,6 +122,7 @@ def __init__(self, parent, name, index, lang):
         self.axshift = ctk.StringVar(value=self.p.get_attribute("axshift"))       
         self.axshiftentry = ctk.CTkEntry(self.plotframe, textvariable=self.axshift, width=130)
         self.flipbutton = ctk.CTkCheckBox(self.plotframe, variable=self.flip, text=Text().flip[self.lang], font=("Bahnschrift",16))
+        self.caxbutton = ctk.CTkCheckBox(self.plotframe, variable=self.caxcorrection, text=Text().cax[self.lang], font=("Bahnschrift",16))
 
         self.dosescalelabel.grid(column=0, row=3, padx=5, pady=5, sticky="w")
         self.dosescaleentry.grid(column=1, row=3, padx=5, pady=5, sticky="nsew")
@@ -129,6 +131,7 @@ def __init__(self, parent, name, index, lang):
         self.axshiftlabel.grid(column=0, row=5, padx=5, pady=5, sticky="w")
         self.axshiftentry.grid(column=1, row=5, padx=5, pady=5, sticky="nsew")
         self.flipbutton.grid(column=0, row=6, columnspan=2, padx=5, pady=5, sticky="nsew")
+        self.caxbutton.grid(column=0, row=7, columnspan=2, padx=5, pady=5, sticky="nsew")
 
 
         ############################
@@ -197,6 +200,7 @@ def save(self):
         try: self.p.set_attribute("axshift", float(self.axshift.get()))
         except ValueError: pass
         self.p.set_attribute("flip", self.flip.get())
+        self.p.set_attribute("caxcorrection", self.caxcorrection.get())
 
         self.p.set_attribute("gammatype", self.gammatype.get())
         self.p.set_attribute("dd", self.percent.get())
@@ -224,6 +228,7 @@ def reset(self):
         self.doseshift.set(self.p.get_attribute("doseoffset"))
         self.axshift.set(self.p.get_attribute("axshift"))
         self.flip.set(self.p.get_attribute("flip"))
+        self.caxcorrection.set(self.p.get_attribute("caxcorrection"))
 
         self.gammatype.set(self.p.get_attribute("gammatype"))
         self.percent.set(self.p.get_attribute("dd"))

topasgraphsim/src/classes/tab.py

@@ -43,7 +43,7 @@ def __init__(self, parent, name, index, lang):
         self.navbar.grid(row=1, column=0, sticky="nsew")
 
     def config(self, event=None): 
-        self.figure.subplots_adjust(left=0.08, right=0.92, top=0.92, bottom=0.1, wspace=0.2, hspace=0.2)
+        self.figure.subplots_adjust(left=0.09, right=0.92, top=0.92, bottom=0.1, wspace=0.2, hspace=0.2)
 
     def update(self):
         self.ax.clear()

topasgraphsim/src/classes/tgs_graph.py

@@ -13,6 +13,7 @@ def __init__(self, Options, ImportedData):
         self.p = ProfileHandler()
 
         self.normalize = self.p.get_attribute("normalize")
+        self.caxcorrection = self.p.get_attribute("caxcorrection")
         self.normalization = self.p.get_attribute("normtype")
         self.points = self.p.get_attribute("show_points")
         self.error = self.p.get_attribute("show_error")
@@ -76,6 +77,10 @@ def data(self):
     def plot(self, ax):
 
         axis, dose, error = self.data()
+        if self.caxcorrection:
+            if self.direction != "Z":
+                axis = np.add(axis, self.dataObject.params()[1])
+        
         if self.error:
             ax.errorbar(axis, dose, label="_", yerr=error, fmt="none", ecolor="red", elinewidth=0.625, capsize=1.25, capthick=0.25)
             ax.plot(axis, dose, label=self.label, lw=self.linethickness, color=self.linecolor, linestyle = self.linestyle)

topasgraphsim/src/classes/update.py

@@ -9,7 +9,7 @@
 class CheckForUpdates:
     def __init__(self):
 
-        currentVersion = "23.0.2"
+        currentVersion = "23.1.0"
         try:
             newestVersion = requests.get(
                 "https://api.github.com/repos/sebasj13/topasgraphsim/releases/latest"

topasgraphsim/src/resources/profile.json

@@ -10,6 +10,7 @@
     "grid": true,
     "legend": true,
     "normalize": true,
+    "caxcorrection": true,
     "normtype": "maximum",
     "show_points": false,
     "show_error": true,

topasgraphsim/topasgraphsim.py

@@ -25,7 +25,7 @@ def __init__(self):
         super().__init__()
 
         self.appname = "TopasGraphSim"
-        self.version = "23.0.2"
+        self.version = "23.1.0"
         self.author = "Sebastian Schäfer"
         self.affiliation = "UK Halle\nMLU Halle-Wittenberg\nUK Hamburg-Eppendorf"
         self.title(f"{self.appname} - v.{self.version}")