Improvements

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 project(QtPMbrowser VERSION 2.4.3 LANGUAGES CXX)
-set(MY_COPYRIGHT "2020 - 2024 Christian R. Halaszovich")
+set(MY_COPYRIGHT "2020 - 2025 Christian R. Halaszovich")
 set(LINUX_RELEASE_DESCRIPTION "<p>This is a bugfix release.</p>")
 
 set(CMAKE_CXX_STANDARD 20)

QtPMbrowser/DlgGraphSettings.cpp

@@ -1,5 +1,5 @@
 /*
-	Copyright 2020 - 2022 Christian R. Halaszovich
+    Copyright 2020 - 2022, 2025 Christian R. Halaszovich
 
 	 This file is part of PMbrowser.
 

QtPMbrowser/DlgGraphSettings.h

@@ -1,5 +1,5 @@
 /*
-    Copyright 2020 -2022 Christian R. Halaszovich
+    Copyright 2020 -2022, 2025 Christian R. Halaszovich
 
      This file is part of PMbrowser.
 

QtPMbrowser/renderarea.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2020 - 2022 Christian R. Halaszovich
+    Copyright 2020 - 2022, 2025 Christian R. Halaszovich
 
      This file is part of PMbrowser.
 

QtPMbrowser/renderarea.h

@@ -1,5 +1,5 @@
 /*
-    Copyright 2020 - 2022 Christian R. Halaszovich
+    Copyright 2020 - 2022, 2025 Christian R. Halaszovich
 
      This file is part of PMbrowser.
 

README.md

@@ -1,5 +1,5 @@
 # PMbrowser
-Copyright 2020 - 2024 Christian R. Halaszovich
+Copyright 2020 - 2025 Christian R. Halaszovich
 
 Created using Qt under GPLv3.
 

doc/usage/displayarea.rst

@@ -16,6 +16,8 @@ autoscale
 
 Select autoscale from the context menue of the **graph area** or use the keyboard shortcut `Ctrl+A`.
 
+.. _graph-panning-lable:
+
 panning
 -------
 

doc/usage/installation.rst

@@ -62,27 +62,16 @@ Now, you can start :program:`PMbrowser` with ``QtPMbrowser &`` from a terminal.
 Starting with Version 2.2.1, you should find :program:`PM browser`
 under *Applications*, too.
 
-.. _appimage:
-
-using the *AppImage* (currently not supported)
-**********************************************
-
-Dowload the AppImage file from https://github.com/ChrisHal/PMbrowser/releases. Make
-the file executable (usually a right-click in you file manager is involved in this).
-Double-clicking the file should start the application.
-
-The *AppImage contains* all necessary Qt libraries, even when your distro does not provide
-them.
-
 
 Installing on macOS
 ===================
 
-Download the DragN'Dropinstaller :file:`PMbrowser-<version>-Darwin.dmg` from
+Download the ZIP-archive :file:`PMbrowser-<version>-Darwin.zip` from
 the GitHub repository release
-page: https://github.com/ChrisHal/PMbrowser/releases .
-After opening the :file:`dmg` image by double-clicking,
-drag the application icon *QtPMbrowser* to your Applications directory.
+page: https://github.com/ChrisHal/PMbrowser/releases and unzip it. Since the
+app is not (yet) notarized (which does cost money) by Apple, you must convince macOS
+to open it. Information on how to do this can be found here:
+https://support.apple.com/en-us/guide/mac-help/mh40616/mac
 
 Building from Source
 ====================

doc/usage/menues.rst

@@ -56,7 +56,8 @@ metadata as table
 +++++++++++++++++
 
 Export :index:`metadata <export; metadata>` as tab-delimited table. The table can be either copied to the clipboard
-or saved to file.
+or saved to a file.
+
 Parameters marked for export (see :ref:`select-params-dlg-label` ) 
 will be included in the export. In addition to these parameters, the first four columns of the table will contain
 the group, series, sweep, and trace counts.
@@ -289,6 +290,8 @@ can be set using the context menu of the **tree-view**. By default, the referenc
 'Setting and Ranges' Dialog
 ***************************
 
-Here you can configure the display area: axis ranges, *autoscale on load*, if grid lines should be displayed, colors
-used for drawing traces and grid
+Here you can configure the display area: axis ranges, *autoscale on load*, if grid lines should be displayed,
+if panning / dragging (see :ref:`graph-panning-lable`)
+should affect all Y scales or only the scale pertaining to the data unit of the currently selected trace,
+colors used for drawing traces and grid
 and the number of overlay traces to be kept in the internal display buffer.

hekatoolslib/PMparameters.cpp

@@ -21,6 +21,7 @@
 #include <sstream>
 #include <iomanip>
 #include <array>
+#include <algorithm>
 #include <cassert>
 #include "hkTree.h"
 #include "PMparameters.h"
@@ -454,27 +455,55 @@ namespace hkLib {
 		return tmp;
 	}
 
-	void PMparameter::formatJSON(const hkTreeNode& node, std::ostream& ss) const
+    constexpr auto format_json_needs_quotes = std::to_array({
+        PMparameter::Set16, // for bitfields
+        PMparameter::DateTime, // weird PowerMod date
+        PMparameter::StringType,
+        PMparameter::String8, // String of length 8
+        PMparameter::String16,
+        PMparameter::String32,
+        PMparameter::String80,
+        PMparameter::String400,
+        PMparameter::Boolean,
+        PMparameter::LongReal2, // array of 2 doubles
+        PMparameter::LongReal4, // array of 4 doubles
+        PMparameter::LongReal8,	// array of 8 double
+        PMparameter::LongReal16,  // 16 double
+        PMparameter::RecordingMode,
+        PMparameter::AmpModeName,
+        PMparameter::UserParamDesc4, // 4x UserParamDesc
+        PMparameter::UserParamDesc2,
+        PMparameter::UserParamDesc8
+    });
+
+
+    void PMparameter::formatJSON(const hkTreeNode& node, std::ostream& ss, bool include_unit) const
 	{
-		ss << '"' << name << "\": \"";
+        const bool do_quotes = include_unit || (std::find(format_json_needs_quotes.begin(),
+                                         format_json_needs_quotes.end(), data_type)!=
+                               format_json_needs_quotes.end());
+        ss << '"' << name << "\": ";
+        if(do_quotes) ss << '"';
 		std::stringstream tmp;
 		formatValueOnly(node, tmp);
 		ss << JSONescapeQuotes(tmp.str());
-		// hack to choose correctly for holding voltage or current
-		if (node.getLevel() == hkTreeNode::LevelTrace && std::strcmp("V|A", unit) == 0)
-		{
-			int recording_mode = node.getChar(TrRecordingMode);
-			if (recording_mode == CClamp) {
-				ss << " A";
-			}
-			else {
-				ss << " V";
-			}
-		}
-		else {
-			if (unit[0]) { ss << ' ' << JSONescapeQuotes(unit); }
-		}
-		ss << '"';
+        if(include_unit) {
+            // hack to choose correctly for holding voltage or current
+            if (node.getLevel() == hkTreeNode::LevelTrace && std::strcmp("V|A", unit) == 0)
+            {
+                int recording_mode = node.getChar(TrRecordingMode);
+                if (recording_mode == CClamp) {
+                    ss << " A";
+                }
+                else {
+                    ss << " V";
+                }
+            }
+            else {
+                if (unit[0]) { ss << ' ' << JSONescapeQuotes(unit); }
+            }
+        }
+        if(do_quotes) ss << '"';
 	}
 
 	void PMparameter::format(const hkTreeNode& node, std::string& s) const

hekatoolslib/PMparameters.h

@@ -51,7 +51,7 @@ namespace hkLib {
 			LongReal2, // array of 2 doubles
 			LongReal4, // array of 4 doubles
 			LongReal8,	// array of 8 double
-			LongReal16,  // 8 double
+            LongReal16,  // 16 double
 			RecordingMode,
 			RelativeTime,
 			AmpModeName,
@@ -67,7 +67,7 @@ namespace hkLib {
 
 		void format(const hkTreeNode& node, std::string& s) const;
 		void format(const hkTreeNode& node, std::ostream& ss) const;
-		void formatJSON(const hkTreeNode& node, std::ostream& ss) const;
+        void formatJSON(const hkTreeNode& node, std::ostream& ss, bool include_unit = false) const;
 		void formatValueOnly(const hkTreeNode& node, std::ostream& ss) const;
 
 		/// <summary>