From 6f778aadd7226667b12108c94be099c62ebbb032 Mon Sep 17 00:00:00 2001 From: "@CarlWachter" Date: Sun, 22 Jan 2023 16:12:00 +0100 Subject: [PATCH 1/2] Added mergeTool --- mergeTool.mlapp | Bin 0 -> 29717 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 mergeTool.mlapp diff --git a/mergeTool.mlapp b/mergeTool.mlapp new file mode 100644 index 0000000000000000000000000000000000000000..39e20c76f694d6dfa90d5b170415ad68772a0978 GIT binary patch literal 29717 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 NiH~m0?)tA^{|EY3@F@TQ literal 0 HcmV?d00001 From 586629943e3217e5606922dd154ca83d4faea05d Mon Sep 17 00:00:00 2001 From: Carl Wachter Date: Sun, 22 Jan 2023 15:32:29 +0000 Subject: [PATCH 2/2] Added merge tool section to README --- README.md | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b391b76..2e43767 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ Currently, the plotting tool covers the following functionalities: - Generate a normal plot - Generate a plot of the data processed by a move-mean filter (20th order) - Generate a spectrogram of the fourier analysis +- Merge the generated .fig files into singular files ### Accessing the tool @@ -110,12 +111,24 @@ The plots are always saved as png and fig files. If you need a different y-scale One last disclaimer: If there is a mistake in the data set, if you use a comma instead of a period, if you write words in fields which expect a number and in many other cases, the software will crash. This software isn't made to be used without a brain. +### Merge Tool + +To access the merge tool, follow the instructions for the plotting tool, but select the file **"mergeTool.mlapp"** instead. + +The merge tool functions very similarly to the main Plotting tool. In the top of the UI there is a "Select File" and "Path" Text field. Use either of these to specify the first file and then press "Add". Repeat this process for every file you wish to use. + + +Now you can use the "X-Axis Label" and "Y-Axis Label" text fields to change the Labels as needed. In the Rows below you should now see all the .fig files you selected with a "Name in Legend" text field, which allows you to change how the extracted data will be labled in the legend. + +Finally hit the "Generate Merged Plot" button and you will be asked to select the location, where the "merged.fig" and "merged.png" files will be placed. You can continue to use the tool and add more .fig files after the generation. + +**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. + ### 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. Merge plots (more than one data set in a single plot) – Maybe another tool for that? -2. Get the custom x-Axis label to work on the fourier plot -3. Add try and catch statements around every user input +1. Get the custom x-Axis label to work on the fourier plot +2. Add try and catch statements around every user input 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. \ No newline at end of file