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/DlgPreferences.cpp

@@ -36,6 +36,7 @@ DlgPreferences::DlgPreferences(QWidget *parent)
 	else ui->radioButtonCustomExt->setChecked(true);
 	ui->lineEditVmon->setText(settings.value("Vmon", "Vmon").toString());
 	ui->lineEditImon->setText(settings.value("Imon", "Imon").toString());
+	ui->checkBoxSysLocale->setChecked(!settings.value("use_C_locale", false).toBool());
 
 	settings.endGroup();
 }
@@ -56,6 +57,7 @@ void DlgPreferences::accept()
 	settings.setValue("selectionButton", selection);
 	settings.setValue("Vmon", ui->lineEditVmon->text());
 	settings.setValue("Imon", ui->lineEditImon->text());
+	settings.setValue("use_C_locale", !ui->checkBoxSysLocale->isChecked());
 	settings.endGroup();
 	switch (selection) {
 	case 0:

QtPMbrowser/DlgPreferences.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>453</width>
-    <height>321</height>
+    <height>360</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,29 +17,6 @@
    <locale language="English" country="UnitedStates"/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0" colspan="3">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="1">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
@@ -128,6 +105,36 @@
      </layout>
     </widget>
    </item>
+   <item row="2" column="0" colspan="3">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Orientation::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Orientation::Vertical</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QCheckBox" name="checkBoxSysLocale">
+     <property name="text">
+      <string>Use System Locale (takes effect only after re-start!)</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

QtPMbrowser/main.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2020 - 2022 Christian R. Halaszovich
+    Copyright 2020 - 2025 Christian R. Halaszovich
 
      This file is part of PMbrowser.
 
@@ -17,9 +17,11 @@
     along with PMbrowser.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+#include <locale>
 #include "pmbrowserwindow.h"
 #include <QApplication>
 #include <QSettings>
+#include <QDebug>
 
 int main(int argc, char *argv[])
 {
@@ -30,6 +32,17 @@ int main(int argc, char *argv[])
     QCoreApplication::setApplicationName("PM browser");
     QSettings::setDefaultFormat(QSettings::IniFormat);
     QApplication::setWindowIcon(QIcon(QString(":/myappico.ico"))); // sets icon in OS X dock
+
+    {
+        QSettings settings;
+        const bool use_C_locale = settings.value("Preferences/use_C_locale", false).toBool();
+        if (use_C_locale) {
+            QLocale::setDefault(QLocale::c());
+        }
+        QLocale loc;
+        std::locale::global(std::locale(loc.name().toUtf8()));
+        qDebug() << std::locale().name();
+    }
     PMbrowserWindow w;
     w.show();
     if (argc > 1) {

QtPMbrowser/pmbrowserwindow.cpp

@@ -1,5 +1,5 @@
 /*
-    Copyright 2020 - 2024 Christian R. Halaszovich
+    Copyright 2020 - 2025 Christian R. Halaszovich
 
      This file is part of PMbrowser.
 
@@ -111,7 +111,7 @@ void PMbrowserWindow::populateTreeView()
     tree->expandAll();
 }
 
-void PMbrowserWindow::traceSelected(QTreeWidgetItem* item, hkTreeNode* trace)
+void PMbrowserWindow::traceSelected(const QTreeWidgetItem* item, const hkTreeNode* trace)
 {
     (void)item;
     int indextrace = trace->extractInt32(TrTraceID);
@@ -129,7 +129,7 @@ void PMbrowserWindow::traceSelected(QTreeWidgetItem* item, hkTreeNode* trace)
 
     // keep the following, since here we format it more nicely, with correct name and units
     // this is beyond what PMparmaters can do right now.
-    QString info = QString("%1=%2 %3").arg(prefix).arg(holding).arg(QLatin1StringView(yunit));
+    QString info = QString("%1=%L2 %3").arg(prefix).arg(holding).arg(QLatin1StringView(yunit));
     std::string str;
     formatParamListPrint(*trace, parametersTrace, str);
     info.append("\n");
@@ -138,7 +138,7 @@ void PMbrowserWindow::traceSelected(QTreeWidgetItem* item, hkTreeNode* trace)
     ui->renderArea->renderTrace(trace, this->infile);
 }
 
-void PMbrowserWindow::collectChildTraces(QTreeWidgetItem* item, int level, std::vector<hkTreeNode*>& trace_list)
+void PMbrowserWindow::collectChildTraces(const QTreeWidgetItem* item, int level, std::vector<hkTreeNode*>& trace_list)
 {
     if (!item->isHidden()) {
         if (level < hkTreeNode::LevelTrace) {
@@ -180,7 +180,7 @@ void PMbrowserWindow::animateTraceList(const QString& info_text, const std::vect
     progress.setValue(num_traces);
 }
 
-static hkLib::hkTreeNode* item2node(QTreeWidgetItem* item)
+static const hkLib::hkTreeNode* item2node(const QTreeWidgetItem* item)
 {
     return item->data(0, Qt::UserRole).value<hkTreeNode*>();
 }
@@ -228,7 +228,7 @@ hkLib::hkTreeView PMbrowserWindow::getVisibleNodes()
     return tree;
 }
 
-void PMbrowserWindow::sweepSelected(QTreeWidgetItem* item, hkTreeNode* sweep) {
+void PMbrowserWindow::sweepSelected(const QTreeWidgetItem* item, const hkTreeNode* sweep) {
     (void)item;
     QString txt = MakeSweepLabel(*sweep) + '\n';
     std::string str;
@@ -239,7 +239,7 @@ void PMbrowserWindow::sweepSelected(QTreeWidgetItem* item, hkTreeNode* sweep) {
     ui->textEdit->append(txt);
 }
 
-void PMbrowserWindow::seriesSelected(QTreeWidgetItem* item, hkTreeNode* series)
+void PMbrowserWindow::seriesSelected(const QTreeWidgetItem* item, const hkTreeNode* series)
 {
     (void)item;
     QString label = qs_from_sv(series->getString(SeLabel));
@@ -252,7 +252,7 @@ void PMbrowserWindow::seriesSelected(QTreeWidgetItem* item, hkTreeNode* series)
     ui->textEdit->append(txt);
 }
 
-void PMbrowserWindow::groupSelected(QTreeWidgetItem* item, hkTreeNode* group)
+void PMbrowserWindow::groupSelected(const QTreeWidgetItem* item, const hkTreeNode* group)
 {
     (void)item;
     QString label = qs_from_sv(group->getString(GrLabel));
@@ -803,7 +803,8 @@ void PMbrowserWindow::on_actionExport_Metadata_as_Table_triggered()
         try {
             hkLib::locale_manager lm;
             if (dlg.useSystemLocale()) {
-                lm.setLocale(""); // set default locale
+                // for macOS, we need to jump to some hoops
+                lm.setLocale(QLocale::system().name().toUtf8());
             }
             else {
                 lm.setLocale("C");
@@ -1009,12 +1010,12 @@ void PMbrowserWindow::on_actionSelect_Parameters_triggered()
     }
 }
 
-void ::PMbrowserWindow::printAllParameters(QTreeWidgetItem* item)
+void ::PMbrowserWindow::printAllParameters(const QTreeWidgetItem* item)
 {
     printAllParameters(item->data(0, Qt::UserRole).value<hkTreeNode*>());
 }
 
-void ::PMbrowserWindow::printAllParameters(hkTreeNode* n)
+void ::PMbrowserWindow::printAllParameters(const hkTreeNode* n)
 {
     std::string s;
     QString lb;

QtPMbrowser/pmbrowserwindow.h

@@ -78,15 +78,15 @@ public slots:
     void loadFile() {loadFile(currentFile);};
     void closeFile();
     void populateTreeView();
-    void groupSelected(QTreeWidgetItem* item, hkLib::hkTreeNode* node);
-    void seriesSelected(QTreeWidgetItem* item, hkLib::hkTreeNode* node);
-    void sweepSelected(QTreeWidgetItem* item, hkLib::hkTreeNode* node);
-    void traceSelected(QTreeWidgetItem* item, hkLib::hkTreeNode* trace);
-    void collectChildTraces(QTreeWidgetItem* item, int level, std::vector<hkLib::hkTreeNode*>& trace_list);
+    void groupSelected(const QTreeWidgetItem* item, const hkLib::hkTreeNode* node);
+    void seriesSelected(const QTreeWidgetItem* item, const hkLib::hkTreeNode* node);
+    void sweepSelected(const QTreeWidgetItem* item, const hkLib::hkTreeNode* node);
+    void traceSelected(const QTreeWidgetItem* item, const hkLib::hkTreeNode* trace);
+    void collectChildTraces(const QTreeWidgetItem* item, int level, std::vector<hkLib::hkTreeNode*>& trace_list);
     void animateTraceList(const QString& info_text, const std::vector<hkLib::hkTreeNode*>& trace_list);
     hkLib::hkTreeView getVisibleNodes();
-    void printAllParameters(QTreeWidgetItem* item);
-    void printAllParameters(hkLib::hkTreeNode* node);
+    void printAllParameters(const QTreeWidgetItem* item);
+    void printAllParameters(const hkLib::hkTreeNode* node);
     void printAmplifierState(const hkLib::hkTreeNode* series);
     void drawStimulus(const hkLib::hkTreeNode* sweep);
     void useStimAsX(const hkLib::hkTreeNode* sweep);

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.
 
@@ -683,7 +683,7 @@ void RenderArea::zoomIn(double x_center, double y_center, double factor)
     update();
 }
 
-void RenderArea::renderTrace(hkLib::hkTreeNode* TrRecord, std::istream& infile)
+void RenderArea::renderTrace(const hkLib::hkTreeNode* TrRecord, std::istream& infile)
 {
     using namespace hkLib;
     DisplayTrace newYtrace{};

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.
 
@@ -48,7 +48,7 @@ class RenderArea : public QWidget
     explicit RenderArea(QWidget *parent = nullptr);
     ~RenderArea();
     bool noData() { return !yTrace.isValid(); };
-    void renderTrace(hkLib::hkTreeNode* trace, std::istream& infile);
+    void renderTrace(const hkLib::hkTreeNode* trace, std::istream& infile);
     void addTrace(DisplayTrace&& dt);
 
     /// <summary>

README.md

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

demo/calc_mean.py

@@ -5,7 +5,7 @@
 
 def getMeta(npy_filename):
     json_filename=os.path.splitext(npy_filename)[0]+".json"
-    with open(json_filename, "r", encoding='latin1') as f:
+    with open(json_filename, "r", encoding='utf8') as f:
         meta=json.load(f)
     return meta
 

demo/calc_means.py

@@ -0,0 +1,68 @@
+# This Python file uses the following encoding: utf-8
+import os.path
+import sys
+import json
+import glob
+import numpy as np
+
+def getMeta(npy_filename):
+    json_filename=os.path.splitext(npy_filename)[0]+".json"
+    with open(json_filename, "r", encoding='utf8') as f:
+        meta=json.load(f)
+    return meta
+
+def getNpyBasename(npy_filename):
+    return os.path.basename(os.path.splitext(npy_filename)[0])
+
+class TraceKey:
+    """Key useable for sorting tracenames."""
+    def __init__(self,npy_filename):
+        c=getNpyBasename(npy_filename).split('_')
+        self.prefix=c[0]
+        self.group=int(c[1])
+        self.series=int(c[2])
+        self.sweep=int(c[3])
+        self.trace=c[4]
+
+    def __lt__(self, other):
+        if(self.prefix<other.prefix):
+            return True
+        if(self.prefix>other.prefix):
+            return False
+        if(self.group<other.group):
+            return True
+        if(self.group>other.group):
+            return False
+        if(self.series<other.series):
+            return True
+        if(self.series>other.series):
+            return False
+        if(self.sweep<other.sweep):
+            return True
+        if(self.sweep>other.sweep):
+            return False
+        if(self.trace<other.trace):
+            return True
+        return False
+
+if __name__ == '__main__':
+    if(len(sys.argv)<4):
+        print("""
+usage: calc_mean <1st point> <last point> <file1>.npy [additional files ...]
+example: calc_mean 0 100 PM_1_1_1_Imon.npy
+        """,file=sys.stderr)
+        sys.exit(-1)
+    p1=int(sys.argv[1])
+    p2=int(sys.argv[2])
+    filelist=[]
+    for index in range(3,len(sys.argv)):
+        filelist+=glob.glob(sys.argv[index])
+    if(len(filelist)==0):
+        print("no matching files found",file=sys.stderr)
+        sys.exit(-1)
+    filelist.sort(key=TraceKey)
+    for npy_filename in filelist:
+        basename=os.path.basename(os.path.splitext(npy_filename)[0])
+        meta=getMeta(npy_filename)
+        y_w=np.load(npy_filename)
+        print(basename, meta['params']['sweep']['Rel. Sweep Time'], np.mean(y_w[p1:p2]), sep='\t')

demo/multiplot_traces.py

@@ -6,7 +6,7 @@
 
 def getMeta(npy_filename):
     json_filename=os.path.splitext(npy_filename)[0]+".json"
-    with open(json_filename, "r", encoding='latin1') as f:
+    with open(json_filename, "r", encoding='utf8') as f:
         meta=json.load(f)
     return meta