Skip to content
Snippets Groups Projects
Commit f563272e authored by leprob001's avatar leprob001
Browse files

The soundsource combination panel now shows the segment color as background if...

The soundsource combination panel now shows the segment color as background if the "Update track parameter" is enabled in trajectory output.
parent 20df4672
No related branches found
No related tags found
No related merge requests found
Showing with 115 additions and 52 deletions
259 260
\ No newline at end of file \ No newline at end of file
...@@ -5,6 +5,9 @@ function [] = addSoundsourceCombination(~, ~) ...@@ -5,6 +5,9 @@ function [] = addSoundsourceCombination(~, ~)
global artoaWorkspace; global artoaWorkspace;
%% Disable updating of track parameter
artoaWorkspace.trajectoryOutput.updateTrackParameterWindow = false;
%% Insert default content %% Insert default content
artoaWorkspace.trackParameter.soundsourceCombinations(end + 1, :) = artoa.controller.track.parameter.getDefaultCombinationCell(); artoaWorkspace.trackParameter.soundsourceCombinations(end + 1, :) = artoa.controller.track.parameter.getDefaultCombinationCell();
try try
...@@ -14,6 +17,7 @@ end ...@@ -14,6 +17,7 @@ end
%% Update gui %% Update gui
artoa.controller.track.parameter.updateGui(); artoa.controller.track.parameter.updateGui();
artoa.controller.track.trajectoryOutput.updateGui();
end end
...@@ -5,6 +5,9 @@ function [] = addSoundsourceCombinationAbove(~, ~) ...@@ -5,6 +5,9 @@ function [] = addSoundsourceCombinationAbove(~, ~)
global artoaWorkspace; global artoaWorkspace;
%% Disable updating of track parameter
artoaWorkspace.trajectoryOutput.updateTrackParameterWindow = false;
%% Get selection %% Get selection
selectedRow = artoaWorkspace.trackParameter.selectedSoundsourceCombinationRow; selectedRow = artoaWorkspace.trackParameter.selectedSoundsourceCombinationRow;
%% Get current data %% Get current data
...@@ -33,6 +36,7 @@ artoaWorkspace.trackParameter.soundsourceCombinations = combinations; ...@@ -33,6 +36,7 @@ artoaWorkspace.trackParameter.soundsourceCombinations = combinations;
%% Update gui %% Update gui
artoa.controller.track.parameter.updateGui(); artoa.controller.track.parameter.updateGui();
artoa.controller.track.trajectoryOutput.updateGui();
end end
......
function [] = adjustTableColorsToTrajectory(pTrajectory)
%ADJUSTTABLECOLORSTOTRAJECTORY Summary of this function goes here
% Detailed explanation goes here
global artoaGui artoaWorkspace;
if nargin == 0 | ~artoaWorkspace.trajectoryOutput.updateTrackParameterWindow
artoaGui.trackParameter.tableSoundSourceCombinations.BackgroundColor = [1 1 1];
return;
end
%% Get required variables
segmentCount = length(pTrajectory.segmentSize);
%% Get colors
trajectoryColors = fliplr(jet(round(length(pTrajectory.segmentSize) * 1.5)));
colorArray = trajectoryColors(1:segmentCount, :);
%% Update table
artoaGui.trackParameter.tableSoundSourceCombinations.BackgroundColor = colorArray;
end
...@@ -5,6 +5,9 @@ function [] = duplicateSoundsourceCombination(~, ~) ...@@ -5,6 +5,9 @@ function [] = duplicateSoundsourceCombination(~, ~)
global artoaWorkspace artoaGui; global artoaWorkspace artoaGui;
%% Disable updating of track parameter
artoaWorkspace.trajectoryOutput.updateTrackParameterWindow = false;
%% Get column count %% Get column count
columnCount = size(artoaWorkspace.trackParameter.soundsourceCombinations, 2); columnCount = size(artoaWorkspace.trackParameter.soundsourceCombinations, 2);
%% Get selection %% Get selection
...@@ -22,6 +25,7 @@ artoaWorkspace.trackParameter.soundsourceCombinations = combinationTable; ...@@ -22,6 +25,7 @@ artoaWorkspace.trackParameter.soundsourceCombinations = combinationTable;
%% Update gui %% Update gui
artoa.controller.track.parameter.updateGui(); artoa.controller.track.parameter.updateGui();
artoa.controller.track.trajectoryOutput.updateGui();
end end
......
...@@ -5,6 +5,9 @@ function [] = removeSoundsourceCombination(~, ~) ...@@ -5,6 +5,9 @@ function [] = removeSoundsourceCombination(~, ~)
global artoaWorkspace; global artoaWorkspace;
%% Disable updating of track parameter
artoaWorkspace.trajectoryOutput.updateTrackParameterWindow = false;
if ~artoa.data.hasMember(artoaWorkspace, 'trackParameter', 'selectedSoundsourceCombinationRow') if ~artoa.data.hasMember(artoaWorkspace, 'trackParameter', 'selectedSoundsourceCombinationRow')
return; return;
end end
...@@ -17,6 +20,7 @@ artoaWorkspace.trackParameter.soundsourceCombinations(selectedRow, :) = []; ...@@ -17,6 +20,7 @@ artoaWorkspace.trackParameter.soundsourceCombinations(selectedRow, :) = [];
%% Update gui %% Update gui
artoa.controller.track.parameter.updateGui(); artoa.controller.track.parameter.updateGui();
artoa.controller.track.trajectoryOutput.updateGui();
end end
......
...@@ -8,6 +8,9 @@ if strcmp(questdlg('Reset all combinations?', 'Confirmation', 'Yes', 'Cancel', ' ...@@ -8,6 +8,9 @@ if strcmp(questdlg('Reset all combinations?', 'Confirmation', 'Yes', 'Cancel', '
return; return;
end end
%% Disable updating of track parameter
artoaWorkspace.trajectoryOutput.updateTrackParameterWindow = false;
%% Delete from workspace %% Delete from workspace
artoaWorkspace.trackParameter.soundsourceCombinations = ... artoaWorkspace.trackParameter.soundsourceCombinations = ...
artoa.controller.track.parameter.createCombinationsTable( ... artoa.controller.track.parameter.createCombinationsTable( ...
...@@ -16,6 +19,7 @@ artoaWorkspace.trackParameter.soundsourceCombinations = ... ...@@ -16,6 +19,7 @@ artoaWorkspace.trackParameter.soundsourceCombinations = ...
%% Update gui %% Update gui
artoa.controller.track.parameter.updateGui(); artoa.controller.track.parameter.updateGui();
artoa.controller.track.trajectoryOutput.updateGui();
end end
...@@ -35,5 +35,13 @@ for i = 1:length(fieldNames) ...@@ -35,5 +35,13 @@ for i = 1:length(fieldNames)
end end
end end
if ~isnan(artoa.data.getMember(artoaWorkspace, {'trajectoryOutput', 'tableGeneratedTracksSelectedRow'}, NaN))
artoa.controller.track.parameter.adjustTableColorsToTrajectory( ...
artoaWorkspace.trajectoryOutput.trajectories{artoaWorkspace.trajectoryOutput.tableGeneratedTracksSelectedRow} ...
);
else
artoa.controller.track.parameter.adjustTableColorsToTrajectory();
end
end end
...@@ -65,58 +65,8 @@ artoaGui.trajectoryOutput.syncZoomToaWindow.xlistener = addlistener( ... ...@@ -65,58 +65,8 @@ artoaGui.trajectoryOutput.syncZoomToaWindow.xlistener = addlistener( ...
@artoa.controller.track.trajectoryOutput.syncZoomToaWindow ... @artoa.controller.track.trajectoryOutput.syncZoomToaWindow ...
); );
%% Update table of generated tracks
artoa.controller.track.trajectoryOutput.updateTableGeneratedTracks();
%% Update gui %% Update gui
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'updateTrackParameterWindow'}) artoa.controller.track.trajectoryOutput.updateGui();
artoaGui.trajectoryOutput.checkboxUpdateTrackParameterWindow.Value = ...
artoaWorkspace.trajectoryOutput.updateTrackParameterWindow;
else
artoaGui.trajectoryOutput.checkboxUpdateTrackParameterWindow.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'showPositionDates'})
artoaGui.trajectoryOutput.checkboxShowPositionDates.Value = ...
artoaWorkspace.trajectoryOutput.showPositionDates;
else
artoaGui.trajectoryOutput.checkboxShowPositionDates.Value = true;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'enableMercatorProjection'})
artoaGui.trajectoryOutput.checkboxMercator.Value = ...
artoaWorkspace.trajectoryOutput.enableMercatorProjection;
else
artoaGui.trajectoryOutput.checkboxMercator.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'enableTrueDistance'})
artoaGui.trajectoryOutput.checkboxTrueDistance.Value = ...
artoaWorkspace.trajectoryOutput.enableTrueDistance;
else
artoaGui.trajectoryOutput.checkboxTrueDistance.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'syncZoomToaWindow'})
artoaGui.trajectoryOutput.checkboxSynchronizeZoomToaWindow.Value = ...
artoaWorkspace.trajectoryOutput.syncZoomToaWindow;
else
artoaGui.trajectoryOutput.checkboxSynchronizeZoomToaWindow.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'showTopographicalLines'})
artoaGui.trajectoryOutput.checkboxShowTopographicalLines.Value = ...
artoaWorkspace.trajectoryOutput.showTopographicalLines;
else
artoaGui.trajectoryOutput.checkboxShowTopographicalLines.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'topographicalLines'})
artoaGui.trajectoryOutput.tableTopographicalLines.Data = ...
artoaWorkspace.trajectoryOutput.topographicalLines;
else
artoaGui.trajectoryOutput.checkboxShowTopographicalLines.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'showErrorEllipses'})
artoaGui.trajectoryOutput.checkboxShowErrorEllipses.Value = ...
artoaWorkspace.trajectoryOutput.showErrorEllipses;
else
artoaGui.trajectoryOutput.checkboxShowErrorEllipses.Value = false;
end
%% Plot everything available %% Plot everything available
artoa.controller.track.trajectoryOutput.plot(artoaWorkspace.trajectoryOutput.enableMercatorProjection); artoa.controller.track.trajectoryOutput.plot(artoaWorkspace.trajectoryOutput.enableMercatorProjection);
......
function [] = updateGui()
%UPDATEGUI Summary of this function goes here
% Detailed explanation goes here
global artoaWorkspace artoaGui;
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'updateTrackParameterWindow'})
artoaGui.trajectoryOutput.checkboxUpdateTrackParameterWindow.Value = ...
artoaWorkspace.trajectoryOutput.updateTrackParameterWindow;
else
artoaGui.trajectoryOutput.checkboxUpdateTrackParameterWindow.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'showPositionDates'})
artoaGui.trajectoryOutput.checkboxShowPositionDates.Value = ...
artoaWorkspace.trajectoryOutput.showPositionDates;
else
artoaGui.trajectoryOutput.checkboxShowPositionDates.Value = true;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'enableMercatorProjection'})
artoaGui.trajectoryOutput.checkboxMercator.Value = ...
artoaWorkspace.trajectoryOutput.enableMercatorProjection;
else
artoaGui.trajectoryOutput.checkboxMercator.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'enableTrueDistance'})
artoaGui.trajectoryOutput.checkboxTrueDistance.Value = ...
artoaWorkspace.trajectoryOutput.enableTrueDistance;
else
artoaGui.trajectoryOutput.checkboxTrueDistance.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'syncZoomToaWindow'})
artoaGui.trajectoryOutput.checkboxSynchronizeZoomToaWindow.Value = ...
artoaWorkspace.trajectoryOutput.syncZoomToaWindow;
else
artoaGui.trajectoryOutput.checkboxSynchronizeZoomToaWindow.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'showTopographicalLines'})
artoaGui.trajectoryOutput.checkboxShowTopographicalLines.Value = ...
artoaWorkspace.trajectoryOutput.showTopographicalLines;
else
artoaGui.trajectoryOutput.checkboxShowTopographicalLines.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'topographicalLines'})
artoaGui.trajectoryOutput.tableTopographicalLines.Data = ...
artoaWorkspace.trajectoryOutput.topographicalLines;
else
artoaGui.trajectoryOutput.checkboxShowTopographicalLines.Value = false;
end
if artoa.data.hasMember(artoaWorkspace, {'trajectoryOutput', 'showErrorEllipses'})
artoaGui.trajectoryOutput.checkboxShowErrorEllipses.Value = ...
artoaWorkspace.trajectoryOutput.showErrorEllipses;
else
artoaGui.trajectoryOutput.checkboxShowErrorEllipses.Value = false;
end
%% Update table of generated tracks
artoa.controller.track.trajectoryOutput.updateTableGeneratedTracks();
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment