Merge branch 'dev' into 'main'

Subplots are now supported!

See merge request sta-git/propulsion/stahr/plotting-tool!6

README.md

@@ -129,11 +129,22 @@ Finally hit the "Generate Merged Plot" button and you will be asked to select th
 
 **IMPORTANT: The merge tool, will extract only the "main" plot from each file.** I.e. if you merge a Derivative .fig file (which contains both the original function and it's derivative), **only** the derivative will be added to the new merged figure.
 
+#### Merging with subplots
+
+To merge with subplots please consult this guide:
+
+[![MergeUIGenerate.PNG](https://wiki.intern.spaceteamaachen.de/uploads/images/gallery/2023-04/subplotguide.png)](https://wiki.intern.spaceteamaachen.de/uploads/images/gallery/2023-04/subplotguide.png)
+
+For every supported amount of selected files, there are two sublpot Versions A and B. Simply select the one you wish to use in the drop down menu:
+
+[![MergeUIGenerate.PNG](https://wiki.intern.spaceteamaachen.de/uploads/images/gallery/2023-04/Mo0image.png)](https://wiki.intern.spaceteamaachen.de/uploads/images/gallery/2023-04/Mo0image.png)
+
 ### Developer information
 
 There are numerous functionalities still missing. The following list provides an overview of all important functions, that should be added as soon as possible (more or less). The order of precedence represents the priority.
 
 1. Get the custom x-Axis label to work on the fourier plot
 2. Add try and catch statements around every user input
+3. Add support for merging plots with multiple data entries
 
 You are very welcome to help develop this tool further. If you are planning to do so, please send me a message (Max Heckmann) and I give you a short introduction in the already existing code. This probably saves you some time.

main

@@ -0,0 +1 @@
+Subproject commit 13af94118712a1d98716d5141aa03685604d773f