PIDScope v26.08.0

PIDscope.m

@@ -140,8 +140,14 @@
 screensz = get(0,'ScreenSize');
 % Octave Qt bug: setting figure units to 'normalized' permanently breaks uipanel
 % Calculate pixel position manually instead
-set(PSfig, 'Position', round([0 0 screensz(3) screensz(4)]));
-try set(PSfig, 'WindowState', 'maximized'); catch, end
+if ispc
+    % Position sets the client area only - on Windows the title bar ends up
+    % above the screen top; OuterPosition includes the frame
+    drawnow;
+    set(PSfig, 'OuterPosition', round([0 0 screensz(3) screensz(4)]));
+else
+    set(PSfig, 'Position', round([0 0 screensz(3) screensz(4)]));
+end
 set(PSfig, 'NumberTitle', 'off');
 set(PSfig, 'Name', ['PIDscope (' PsVersion ') - Log Viewer']);
 drawnow; pause(0.2);
@@ -264,7 +270,7 @@
 set(guiHandles.clr, 'ForegroundColor', cautionCol);
 
 guiHandles.startEndButton = uicontrol(PSfig,'style','checkbox', 'string','Trim ','fontsize',fontsz,'TooltipString', [TooltipString_selectButton], 'units','normalized','Position',[posInfo.startEndButton],...
-    'callback','if exist(''filenameA'',''var'') && ~isempty(filenameA) && get(guiHandles.startEndButton, ''Value''), try, [x y] = ginput(1); epoch1_A(get(guiHandles.FileNum, ''Value'')) = round(x(1)*10)/10; PSplotLogViewer; [x y] = ginput(1); epoch2_A(get(guiHandles.FileNum, ''Value'')) = round(x(1)*10)/10; PSplotLogViewer; catch, end, end');
+    'callback','PStrimSelect;');
 
 guiHandles.plotR =uicontrol(PSfig,'Style','checkbox','String','R','fontsize',fontsz,'TooltipString', ['Plot Roll '],...
     'units','normalized','BackgroundColor',bgcolor,'ForegroundColor',th.axisRoll,'Position',[posInfo.plotR_LV], 'callback','if exist(''fnameMaster'',''var'') && ~isempty(fnameMaster), PSplotLogViewer; end');

README.md

@@ -46,6 +46,17 @@ That said - if you find PIDscope useful and want to buy me a coffee (not a beer,
 <a href="https://www.buymeacoffee.com/dzikus" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
 ---
 
+## Installing
+
+AppImage (Linux), Windows and macOS builds are on the [releases page](https://github.com/dzikus/PIDscope/releases).
+
+Arch Linux users can install from the AUR thanks to [FPVogel](https://github.com/FPVogel):
+
+- [pidscope-bin](https://aur.archlinux.org/packages/pidscope-bin) - the released AppImage
+- [pidscope-git](https://aur.archlinux.org/packages/pidscope-git) - built from the latest git source
+
+---
+
 ## License
 
 PIDscope is licensed under the [GNU General Public License v3.0](LICENSE).

VERSION

@@ -1 +1 @@
-26.05.0
+26.08.0

packaging/windows/Dockerfile

@@ -4,7 +4,7 @@
 
 FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
-ARG OCTAVE_VERSION=11.1.0
+ARG OCTAVE_VERSION=11.3.0
 
 RUN apt-get update && apt-get install -y \
     p7zip-full zip wget git curl make \

packaging/windows/build-windows.sh

@@ -7,7 +7,7 @@ set -euo pipefail
 
 SRC_DIR="${1:-/src}"
 DIST_DIR="${2:-/dist}"
-OCTAVE_VERSION="${OCTAVE_VERSION:-11.1.0}"
+OCTAVE_VERSION="${OCTAVE_VERSION:-11.3.0}"
 # Version: env > VERSION file > git tag > fallback
 if [ -n "${PIDSCOPE_VERSION:-}" ]; then
     VERSION="${PIDSCOPE_VERSION}"

src/core/PSgetcsv.m

@@ -1,8 +1,9 @@
-function [filename csvFnames] = PSgetcsv(filename, firmware_flag, outdir)
-%% [filename csvFnames] = PSgetcsv(filename, firmware_flag, outdir)
+function [filename csvFnames] = PSgetcsv(filename, firmware_flag, outdir, sel)
+%% [filename csvFnames] = PSgetcsv(filename, firmware_flag, outdir, sel)
 % Converts bbl files to csv using blackbox_decode
 % filename: full path to BBL/BFL/TXT/BTFL/JSON/BIN file
 % outdir: directory for CSV output (default: same as input file)
+% sel: session numbers to keep from a multi-log file; omit to ask the user
 
 % ----------------------------------------------------------------------------------
 % "THE BEER-WARE LICENSE" (Revision 42):
@@ -21,6 +22,8 @@
 if nargin < 3 || isempty(outdir)
     outdir = fdir;
 end
+if nargin < 4, sel = []; end
+askUser = isempty(sel);
 
 if strcmpi(fext, '.bin')
     csvFnames = {filename};
@@ -36,10 +39,10 @@
     decoder_path = getappdata(0, 'PSdecoderPath');
     decoder_inav = getappdata(0, 'PSdecoderPathINAV');
 
-    if firmware_flag == 3 && ~isempty(decoder_inav)
-        % INAV decoder has no --output-dir; copy input to workdir first
+    if firmware_flag == 3 && ~isempty(decoder_inav) && exist(decoder_inav, 'file') == 2
+        % INAV decoder has no --output-dir; run it on a copy inside outdir
         tmpSrc = fullfile(outdir, [fname fext]);
-        copyfile(filename, tmpSrc);
+        if ~strcmp(tmpSrc, filename), copyfile(filename, tmpSrc); end
         cmd = ['"' decoder_inav '" "' tmpSrc '" 2>&1'];
     else
         cmd = ['"' decoder_path '" --output-dir "' outdir '" "' filename '" 2>&1'];
@@ -52,9 +55,15 @@
     end
 
     fbase = fullfile(outdir, fname);
-    files = dir([fbase '*.csv']);
 
-    % filter out files with .bbl or .bfl in name
+    % junk the decoder drops next to the csv output
+    for pat = {'*.event', '*.gps.gpx', '*.gps.csv'}
+        junk = dir([fbase pat{1}]);
+        for k = 1:size(junk,1), delete(fullfile(outdir, junk(k).name)); end
+    end
+
+    % side outputs keep the source extension in the name
+    files = dir([fbase '*.csv']);
     valid = true(size(files,1), 1);
     for k = 1:size(files,1)
         if contains(files(k).name, '.bbl', 'IgnoreCase', true) || contains(files(k).name, '.bfl', 'IgnoreCase', true)
@@ -64,50 +73,60 @@
     files = files(valid, :);
 
     if isempty(files)
-        set(gcf, 'pointer', 'arrow');
         csvFnames = {};
         return;
     end
 
-    % clean up junk files in outdir
-    fevt = dir([fbase '*.event']);
-    for k = 1:size(fevt,1), delete(fullfile(outdir, fevt(k).name)); end
-    fevt = dir([fbase '*.gps.gpx']);
-    for k = 1:size(fevt,1), delete(fullfile(outdir, fevt(k).name)); end
-    fevt = dir([fbase '*.gps.csv']);
-    for k = 1:size(fevt,1), delete(fullfile(outdir, fevt(k).name)); end
-
-    % refresh file list after cleanup
-    files = dir([fbase '*.csv']);
-
     if size(files,1) > 1
-        % remove empty subfiles (<1KB)
-        valid = true(size(files,1), 1);
+        % the decoder prints one duration per log, in the order it wrote them,
+        % so pair them up before anything is dropped from the list
+        a = strfind(result, 'duration');
+        labels = cell(size(files,1), 1);
         for k = 1:size(files,1)
-            if files(k).bytes < 1000
-                delete(fullfile(outdir, files(k).name));
-                valid(k) = false;
+            if k <= length(a)
+                labels{k} = result(a(k):min(a(k)+filename_nchars, length(result)));
+            else
+                labels{k} = files(k).name;
             end
         end
-        files = files(valid, :);
 
-        a = strfind(result, 'duration');
-        logDurStr = '';
-        for d = 1:length(a)
-            logDurStr{d} = [int2str(d) ') ' result(a(d):a(d)+filename_nchars)];
+        % logs under 1KB hold no flight data - drop them and their labels together
+        small = [files.bytes] < 1000;
+        for k = find(small), delete(fullfile(outdir, files(k).name)); end
+        files = files(~small, :);
+        labels = labels(~small);
+
+        if isempty(files)
+            if askUser
+                a = errordlg(['no valid data in ' mainFname]); pause(3); close(a);
+            else
+                warning('PSgetcsv: no valid data in %s', mainFname);
+            end
+            csvFnames = {};
+            return;
         end
+    end
 
-        if size(files,1) > 0
-            x = size(files,1);
-            if x > 1
-                [fnums, tf] = listdlg('ListString', logDurStr, 'ListSize', [250, round(size(logDurStr,2)*20)], 'Name', 'Select file(s): ');
-                for k = 1:x
-                    if ~ismember(k, fnums), delete(fullfile(outdir, files(k).name)); end
-                end
+    if size(files,1) > 1
+        if askUser
+            for k = 1:size(files,1)
+                labels{k} = [int2str(k) ') ' labels{k}];
+            end
+            % the dialog opens behind the import waitbar on Windows and looks like a hang
+            wb = findall(0, 'Type', 'figure', 'Tag', 'waitbar');
+            set(wb, 'Visible', 'off');
+            [fnums, tf] = listdlg('ListString', labels, 'ListSize', [250, round(numel(labels)*20)], 'Name', 'Select file(s): ');
+            set(wb, 'Visible', 'on');
+            if ~tf || isempty(fnums)
+                for k = 1:size(files,1), delete(fullfile(outdir, files(k).name)); end
+                csvFnames = {};
+                return;
             end
         else
-            validData = 0;
-            a = errordlg(['no valid data in ' mainFname]); pause(3); close(a);
+            fnums = sel(sel >= 1 & sel <= size(files,1));
+        end
+        for k = 1:size(files,1)
+            if ~ismember(k, fnums), delete(fullfile(outdir, files(k).name)); end
         end
     end
 end

src/plot/PSplotLogViewer.m

@@ -414,10 +414,10 @@
     % i/o keyboard trim: 'i' sets in-point, 'o' sets out-point
     set(PSfig, 'KeyPressFcn', [ ...
         'if exist(''filenameA'',''var'') && ~isempty(filenameA), ' ...
-        'kk=get(gcbo,''CurrentCharacter''); fIdx=get(guiHandles.FileNum,''Value''); ' ...
+        'kk=get(gcbo,''CurrentCharacter''); fIdx=get(guiHandles.FileNum,''Value''); setappdata(0,''PSbusy'',1); ' ...
         'if kk==''i'', try, [xt,~]=ginput(1); epoch1_A(fIdx)=round(xt*10)/10; PSplotLogViewer; catch, end; ' ...
         'elseif kk==''o'', try, [xt,~]=ginput(1); epoch2_A(fIdx)=round(xt*10)/10; PSplotLogViewer; catch, end; ' ...
-        'end, end']);
+        'end, setappdata(0,''PSbusy'',0); end']);
 
     PSdatatipSetup(PSfig);
     try PSresizeCP(PSfig, []); catch, end

src/plot/PSplotSpec.m

@@ -115,7 +115,9 @@
     if updateSpec==0 
         clear s dat ampmat amp2d freq a RC smat amp2d freq2d Throt
         p=0;
-         hw = waitbar(0,['please wait... ' ]); 
+        % waitbar pumps the event queue, so hold off dashboard clicks until done
+        setappdata(0, 'PSbusy', 1);
+         hw = waitbar(0,['please wait... ' ]);
 
         tmpPSDVal = get(guiHandlesSpec.checkboxPSD, 'Value');
         for k=1:length(vars)
@@ -148,6 +150,7 @@
             end
         end
         close(hw)
+        setappdata(0, 'PSbusy', 0);
     end
 else
     warndlg({'Dropdowns set to ''NONE''.'; 'Please select a preset or specific variables to analyze.'});

src/plot/PSplotSpec2D.m

@@ -50,6 +50,8 @@
 
 %%% compute delay/overlay data (deferred from UI open to Run click)
 if ~exist('delayDataReady','var') || ~delayDataReady
+    % waitbar pumps the event queue, so hold off dashboard clicks until done
+    setappdata(0, 'PSbusy', 1);
     hw_delay = waitbar(0, 'computing delays...');
     FilterDelayDterm={};
     SPGyroDelay=[];
@@ -157,6 +159,7 @@
     end
     delayDataReady = true;
     try close(hw_delay); catch, end
+    setappdata(0, 'PSbusy', 0);
 end
 
 tmpSpecVal = get(guiHandlesSpec2.SpecList, 'Value');
@@ -177,6 +180,7 @@
 freq2d2 = {};
 amp2d2 = {};
 p=0;
+setappdata(0, 'PSbusy', 1);
 hw_fft = waitbar(0, 'computing FFT...');
 for k = 1 : length(tmpSpecVal)
     s = char(datSelectionString(tmpSpecVal(k)));
@@ -233,6 +237,7 @@
     end
 end
 try close(hw_fft); catch, end
+setappdata(0, 'PSbusy', 0);
 prevPsdKey_ = struct('specVal', tmpSpecVal, 'fileVal', tmpFileVal, 'psdVal', tmpPSDVal, 'axes', axesOptionsSpec);
 end
 

src/ui/PSdispSetupInfoUIcontrol.m

@@ -8,6 +8,8 @@
 % ----------------------------------------------------------------------------------
 
 
+if getappdata(0, 'PSbusy'), return; end  % skip re-entrant call mid-capture (#21)
+
 if exist('fnameMaster','var') && ~isempty(fnameMaster)
 
 if exist('PSdisp','var') && ishandle(PSdisp)

src/ui/PSerrUIcontrol.m

@@ -8,6 +8,8 @@
 % ----------------------------------------------------------------------------------
 
 
+if getappdata(0, 'PSbusy'), return; end  % skip re-entrant call mid-capture (#21)
+
 if exist('fnameMaster','var') && ~isempty(fnameMaster)
 
 if exist('PSerrfig','var') && ishandle(PSerrfig)

src/ui/PSfreqTimeUIcontrol.m

@@ -6,9 +6,11 @@
 % can do whatever you want with this stuff. If we meet some day, and you think
 % this stuff is worth it, you can buy me a beer in return. -Brian White
 % ----------------------------------------------------------------------------------
-
+
+if getappdata(0, 'PSbusy'), return; end  % skip re-entrant call from a running job
+
 if exist('fnameMaster','var') && ~isempty(fnameMaster)
-   
+
 %%% tooltips
 TooltipString_specRun=['Run current spectral configuration'];
 TooltipString_cmap=['Choose from a selection of colormaps'];
@@ -228,10 +230,11 @@ try set(guiHandlesSpec3.subsampleFactor_select, 'Value', defaults.Values(find(st
 try set(guiHandlesSpec3.ColormapSelect, 'Value', defaults.Values(find(strcmp(defaults.Parameters, 'FreqxTime-Colormap')))), catch, set(guiHandlesSpec3.ColormapSelect, 'Value', 3), end
 
 
+PSstyleControls(PSspecfig3);
+
 else
      warndlg('Please select file(s)');
 end
-PSstyleControls(PSspecfig3);
 
 % functions
 function selection2(src,event)

src/ui/PSspec2DUIcontrol.m

@@ -7,6 +7,8 @@
 % this stuff is worth it, you can buy me a beer in return. -Brian White
 % ----------------------------------------------------------------------------------
 
+if getappdata(0, 'PSbusy'), return; end  % skip re-entrant call mid-capture (#21)
+
 if exist('fnameMaster','var') && ~isempty(fnameMaster)
 
 %%% tooltips

src/ui/PSspecUIcontrol.m

@@ -6,7 +6,9 @@
 % can do whatever you want with this stuff. If we meet some day, and you think
 % this stuff is worth it, you can buy me a beer in return. -Brian White
 % ----------------------------------------------------------------------------------
-
+
+if getappdata(0, 'PSbusy'), return; end  % skip re-entrant call from a running job
+
 if exist('fnameMaster','var') && ~isempty(fnameMaster)
 
 %%% tooltips
@@ -328,10 +330,11 @@
 try set(guiHandlesSpec.smoothFactor_select, 'Value', defaults.Values(find(strcmp(defaults.Parameters, 'FreqXthr-Smoothing')))), catch, set(guiHandlesSpec.smoothFactor_select, 'Value', 3); end
 
 
+PSstyleControls(PSspecfig);
+
 else
      warndlg('Please select file(s)');
 end
-PSstyleControls(PSspecfig);
 
 % functions
 function selection2(src,event)

src/ui/PSstatsUIcontrol.m

@@ -7,6 +7,8 @@
 % this stuff is worth it, you can buy me a beer in return. -Brian White
 % ----------------------------------------------------------------------------------
 
+if getappdata(0, 'PSbusy'), return; end  % skip re-entrant call mid-capture (#21)
+
 if exist('fnameMaster','var') && ~isempty(fnameMaster)
 
 if exist('PSstatsfig','var') && ishandle(PSstatsfig)