From 73d4b8a5a3723fd7c6df8fe9dc6e9a66c232465c Mon Sep 17 00:00:00 2001
From: Lewin Probst <info@emirror.de>
Date: Mon, 19 Oct 2020 14:53:02 +0200
Subject: [PATCH] Small bugfixes to dropSelection and the new selection method.
---
VERSION | 2 +-
lib/+artoa/+controller/+edit/+timeOfArrival/dropSelection.m | 6 ++++--
.../+edit/+timeOfArrival/pickRectangleByDateRange.m | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/VERSION b/VERSION
index e0da8ae..3bac779 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-309
\ No newline at end of file
+310
\ No newline at end of file
diff --git a/lib/+artoa/+controller/+edit/+timeOfArrival/dropSelection.m b/lib/+artoa/+controller/+edit/+timeOfArrival/dropSelection.m
index 91c3feb..2248946 100644
--- a/lib/+artoa/+controller/+edit/+timeOfArrival/dropSelection.m
+++ b/lib/+artoa/+controller/+edit/+timeOfArrival/dropSelection.m
@@ -11,8 +11,10 @@ end
result = false;
if artoa.controller.edit.dataPointsSelected(artoaWorkspace.editTimeOfArrival)
- if ~pForce || strcmp(questdlg('Reset current selection?', 'Confirmation', 'Yes', 'Cancel', 'Cancel'), 'Cancel')
- return;
+ if ~pForce
+ if strcmp(questdlg('Reset current selection?', 'Confirmation', 'Yes', 'Cancel', 'Cancel'), 'Cancel')
+ return;
+ end
end
% reset the line and all required fields
[artoaGui.editTimeOfArrival, artoaWorkspace.editTimeOfArrival] = artoa.controller.edit.clearSelection(artoaGui.editTimeOfArrival, artoaWorkspace.editTimeOfArrival);
diff --git a/lib/+artoa/+controller/+edit/+timeOfArrival/pickRectangleByDateRange.m b/lib/+artoa/+controller/+edit/+timeOfArrival/pickRectangleByDateRange.m
index cdf5800..6ef9c15 100644
--- a/lib/+artoa/+controller/+edit/+timeOfArrival/pickRectangleByDateRange.m
+++ b/lib/+artoa/+controller/+edit/+timeOfArrival/pickRectangleByDateRange.m
@@ -42,7 +42,7 @@ values = inputdlg(values);
values = str2double(values);
% validity check
-if any(isnan(values))
+if any(isnan(values)) || isempty(values)
% force drop selection
artoa.controller.edit.timeOfArrival.dropSelection(true);
warndlg('One or more input values could not be converted to double. Please try again', 'Input error!');
--
GitLab