[med-svn] [Git][med-team/edfbrowser][upstream] New upstream version 2.14+dfsg

Sat Nov 15 09:53:53 GMT 2025


Étienne Mollier pushed to branch upstream at Debian Med / edfbrowser


Commits:
fcd8b985 by Étienne Mollier at 2025-11-15T10:37:39+01:00
New upstream version 2.14+dfsg
- - - - -


5 changed files:

- README
- cnvs/ascii_export.cpp
- doc/manual.html
- global.h
- version.txt


Changes:

=====================================
README
=====================================
@@ -43,7 +43,7 @@ Compiling and installing on Fedora
 ====================================
 
 sudo dnf update
-sudo dnf groupinstall "Development Tools" "Development Libraries"
+sudo dnf group install "development-tools"
 sudo dnf install g++ qt5-qtbase qt5-qtbase-devel
 git clone https://gitlab.com/Teuniz/EDFbrowser.git
 cd EDFbrowser


=====================================
cnvs/ascii_export.cpp
=====================================
@@ -134,7 +134,9 @@ void UI_AsciiExportwindow::ExportButtonClicked()
   long long data_record_duration,
             elapsedtime,
             time_tmp,
-            d_tmp;
+            d_tmp,
+            onset_tmp,
+            starttime_subsecond=0LL;
 
   double value_tmp;
 
@@ -353,15 +355,13 @@ void UI_AsciiExportwindow::ExportButtonClicked()
 
   free(scratchpad);
 
-  max_tal_ln = 0;
+  max_tal_ln = 128;
 
   for(r=0; r<nr_annot_chns; r++)
   {
     if(max_tal_ln<edfparamascii[annot_ch[r]].smp_per_record * samplesize)  max_tal_ln = edfparamascii[annot_ch[r]].smp_per_record * samplesize;
   }
 
-  if(max_tal_ln<128)  max_tal_ln = 128;
-
   scratchpad = (char *)calloc(1, max_tal_ln + 3);
   if(scratchpad==NULL)
   {
@@ -655,6 +655,10 @@ void UI_AsciiExportwindow::ExportButtonClicked()
       }
       scratchpad[k] = 0;
       elapsedtime = atoll_x(scratchpad, FP_SCALING);
+      if(i == 0)
+      {
+        starttime_subsecond = elapsedtime % FP_SCALING;
+      }
 
 /* process annotations */
 
@@ -736,6 +740,16 @@ void UI_AsciiExportwindow::ExportButtonClicked()
                          scratchpad[m] = '.';
                        }
                      }
+                     if(starttime_subsecond)
+                     {
+                       onset_tmp = atoll_x(time_in_txt, FP_SCALING) - starttime_subsecond;
+#ifdef Q_OS_WIN32
+                       __mingw_snprintf(time_in_txt, max_tal_ln + 3, "%lli.%09lli", onset_tmp / FP_SCALING, onset_tmp % FP_SCALING);
+#else
+                       snprintf(time_in_txt, max_tal_ln + 3, "%lli.%09lli", onset_tmp / FP_SCALING, onset_tmp % FP_SCALING);
+#endif
+                       remove_trailing_zeros(time_in_txt);
+                     }
                      fprintf(annotationfile, "%s,%s,%s\n", time_in_txt, duration_in_txt, scratchpad);
                    }
                    n = 0;


=====================================
doc/manual.html
=====================================
@@ -21,7 +21,7 @@
     </style>
 </head><body>
 
-<h1>EDFbrowser 2.13 manual</h1>
+<h1>EDFbrowser 2.14 manual</h1>
 
 <p><br></p>
 


=====================================
global.h
=====================================
@@ -67,7 +67,7 @@
 #endif
 
 #define PROGRAM_NAME                "EDFbrowser"
-#define PROGRAM_VERSION                   "2.13"
+#define PROGRAM_VERSION                   "2.14"
 #define PROGRAM_BETA_SUFFIX                   ""
 #define MINIMUM_QT4_VERSION           (0x040807)
 #define MINIMUM_QT5_VERSION           (0x050C06)


=====================================
version.txt
=====================================
@@ -1,4 +1,11 @@
 
+ version 2.14      October 26, 2025
+ --------------
+
+ - Fixed a bug in the EDF to ASCII converter that caused wrong onset times for the annotations
+   in case the starttime of the recording had a decimal fraction for the seconds.
+
+
  version 2.13      July 2, 2025
  --------------
 



View it on GitLab: https://salsa.debian.org/med-team/edfbrowser/-/commit/fcd8b985429ee88ecb546ce782be78c4c9f74e04

-- 
View it on GitLab: https://salsa.debian.org/med-team/edfbrowser/-/commit/fcd8b985429ee88ecb546ce782be78c4c9f74e04
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20251115/76e5391a/attachment-0001.htm>
