Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
LEVER
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenSource
LEVER
Commits
fe1b744f
Commit
fe1b744f
authored
Jul 13, 2016
by
Mark Winter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for multi-tree selection problem if a cell had just been selected.
parent
111ebb48
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
3 deletions
+21
-3
src/MATLAB/+Editor/ContextAddToExtendedFamily.m
src/MATLAB/+Editor/ContextAddToExtendedFamily.m
+6
-2
src/MATLAB/+UI/AddCellSelection.m
src/MATLAB/+UI/AddCellSelection.m
+10
-0
src/MATLAB/+UI/FigureCellDown.m
src/MATLAB/+UI/FigureCellDown.m
+4
-0
src/MATLAB/+UI/InitializeFigures.m
src/MATLAB/+UI/InitializeFigures.m
+1
-1
No files found.
src/MATLAB/+Editor/ContextAddToExtendedFamily.m
View file @
fe1b744f
...
...
@@ -35,7 +35,8 @@ function ContextAddToExtendedFamily(hullIDs)
if
~
isempty
(
CellFamilies
(
familyID
)
.
extFamily
)
xfam
=
CellFamilies
(
familyID
)
.
extFamily
;
if
length
(
xfam
)
>
1
warn
=
sprintf
(
'Track %d is already in an extended family'
,
trackID
);
rootTrackID
=
CellFamilies
(
familyID
)
.
rootTrackID
;
warn
=
sprintf
(
'Track %d is already in an extended family'
,
rootTrackID
);
warndlg
(
warn
);
return
;
end
...
...
@@ -48,6 +49,10 @@ function ContextAddToExtendedFamily(hullIDs)
newTrackIDLocal
=
answer
{
1
};
newTrackID
=
UI
.
LocalToTrack
(
revLocalLabels
,
newTrackIDLocal
);
newFamilyID
=
CellTracks
(
newTrackID
)
.
familyID
;
bInExtFamily
=
ismember
(
trackIDs
,
CellFamilies
(
newFamilyID
)
.
tracks
);
trackIDs
=
trackIDs
(
~
bInExtFamily
);
if
(
isnan
(
newTrackID
)
||
newTrackID
>
length
(
CellTracks
)
)
warn
=
sprintf
(
'Track %s does not exist.'
,
newTrackIDLocal
);
...
...
@@ -67,7 +72,6 @@ function ContextAddToExtendedFamily(hullIDs)
return
;
end
newFamilyID
=
CellTracks
(
newTrackID
)
.
familyID
;
newExtFamily
=
union
(
CellFamilies
(
newFamilyID
)
.
extFamily
,
[
familyIDs
newFamilyID
]);
[
CellFamilies
(
newExtFamily
)
.
extFamily
]
=
deal
(
newExtFamily
);
...
...
src/MATLAB/+UI/AddCellSelection.m
0 → 100644
View file @
fe1b744f
function AddCellSelection(hullID)
global Figures
bAlreadySelected = (Figures.cells.selectedHulls == hullID);
if ( any(bAlreadySelected) )
return;
end
Figures.cells.selectedHulls = [Figures.cells.selectedHulls hullID];
end
src/MATLAB/+UI/FigureCellDown.m
View file @
fe1b744f
...
...
@@ -54,6 +54,10 @@ function FigureCellDown(src,evnt, labelID)
else
Editor
.
AddHull
(
2
);
end
elseif
(
strcmp
(
selectionType
,
'alt'
))
if
(
Figures
.
cells
.
downHullID
>
0
)
UI
.
AddCellSelection
(
Figures
.
cells
.
downHullID
);
end
end
end
...
...
src/MATLAB/+UI/InitializeFigures.m
View file @
fe1b744f
...
...
@@ -50,7 +50,7 @@ Figures.tree.handle = figure();
Figures
.
cells
.
selectedHulls
=
[];
Figures
.
controlDown
=
false
;
%control key is currently down? for selecting cells and fine adjustment
Figures
.
downHullID
=
-
1
;
Figures
.
cells
.
downHullID
=
-
1
;
Figures
.
downClickPoint
=
[
0
0
];
whitebg
(
Figures
.
cells
.
handle
,
'k'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment