Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MSD Track Processor
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Bioimage Analysis
MSD Track Processor
Compare revisions
be26cac7fe2f6ffcaf44c055058703e7bc1b7f2b to a09960c5456fc0a14d67a364f1f7bc552d9326b2
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
bia/msd-track-processor
Select target project
No results found
a09960c5456fc0a14d67a364f1f7bc552d9326b2
Select Git revision
Swap
Target
bia/msd-track-processor
Select target project
bia/msd-track-processor
1 result
be26cac7fe2f6ffcaf44c055058703e7bc1b7f2b
Select Git revision
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Update POM, add XLS head generation
· 7f0140f8
Thomas MUSSET
authored
2 years ago
7f0140f8
Merge branch 'add-xls-header' into 'master'
· a09960c5
Stéphane DALLONGEVILLE
authored
2 years ago
Update POM, add XLS head generation See merge request
!3
a09960c5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pom.xml
+3
-24
3 additions, 24 deletions
pom.xml
src/main/java/plugins/fab/trackmanager/processors/TrackProcessorMSD.java
+33
-2
33 additions, 2 deletions
...lugins/fab/trackmanager/processors/TrackProcessorMSD.java
with
36 additions
and
26 deletions
pom.xml
View file @
a09960c5
...
...
@@ -8,18 +8,18 @@
<parent>
<artifactId>
pom-icy
</artifactId>
<groupId>
org.bioimageanalysis.icy
</groupId>
<version>
2.
0
.0
</version>
<version>
2.
1
.0
</version>
</parent>
<!-- Project Information -->
<artifactId>
msd-track-processor
</artifactId>
<version>
1.1.
3
</version>
<version>
1.1.
4-SNAPSHOT
</version>
<packaging>
jar
</packaging>
<name>
MSD Track Processor
</name>
<description>
Track Processor computing the MSD (Mean Square Displacement).
</description>
<url>
http://icy.bioimageanalysis.org/plugin/track-processor-msd/
</url>
<url>
http
s
://icy.bioimageanalysis.org/plugin/track-processor-msd/
</url>
<inceptionYear>
2020
</inceptionYear>
<organization>
...
...
@@ -58,52 +58,31 @@
</properties>
<profiles>
<profile>
<id>
icy-plugin
</id>
<activation>
<activeByDefault>
true
</activeByDefault>
</activation>
</profile>
</profiles>
<!-- List of project's dependencies -->
<dependencies>
<!-- The core of Icy -->
<dependency>
<groupId>
org.bioimageanalysis.icy
</groupId>
<artifactId>
icy-kernel
</artifactId>
<version>
${icy-kernel.version}
</version>
</dependency>
<dependency>
<groupId>
org.bioimageanalysis.icy
</groupId>
<artifactId>
jfreechart
</artifactId>
<version>
${jfreechart.version}
</version>
</dependency>
<dependency>
<groupId>
net.sourceforge.jexcelapi
</groupId>
<artifactId>
jxl
</artifactId>
<version>
${jxl.version}
</version>
</dependency>
<dependency>
<groupId>
org.bioimageanalysis.icy
</groupId>
<artifactId>
spot-detection-utilities
</artifactId>
<version>
${spot-detection-utilities.version}
</version>
</dependency>
<dependency>
<groupId>
org.bioimageanalysis.icy
</groupId>
<artifactId>
distance-profiler
</artifactId>
<version>
${distance-profiler.version}
</version>
</dependency>
<dependency>
<groupId>
org.bioimageanalysis.icy
</groupId>
<artifactId>
track-manager
</artifactId>
<version>
${track-manager.version}
</version>
</dependency>
</dependencies>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/plugins/fab/trackmanager/processors/TrackProcessorMSD.java
View file @
a09960c5
...
...
@@ -238,7 +238,9 @@ public class TrackProcessorMSD extends PluginTrackManagerProcessor implements Ac
if
(
useRealScalesBox
.
isSelected
())
{
int
cnt
=
0
;
int
row
=
0
;
int
row
=
1
;
// Start from 1 because of table head
int
cols
=
0
;
for
(
TrackSegment
ts
:
trackPool
.
getTrackSegmentList
())
{
// Better to allow partially clipped tracks otherwise we cannot get MSD for them (Stephane)
...
...
@@ -249,6 +251,10 @@ public class TrackProcessorMSD extends PluginTrackManagerProcessor implements Ac
if
(
msd
.
length
>
0
)
{
// Get max cols for the table
if
(
msd
.
length
>
cols
)
cols
=
msd
.
length
;
System
.
out
.
println
(
"track "
+
cnt
);
if
(
page
!=
null
)
...
...
@@ -268,11 +274,22 @@ public class TrackProcessorMSD extends PluginTrackManagerProcessor implements Ac
}
}
}
// Write table head
if
(
page
!=
null
)
{
XLSUtil
.
setCellString
(
page
,
0
,
0
,
"frame"
);
if
(
cols
>
0
)
{
for
(
int
c
=
0
;
c
<
cols
;
c
++)
{
XLSUtil
.
setCellString
(
page
,
c
+
1
,
0
,
String
.
valueOf
(
c
));
}
}
}
}
else
{
int
cnt
=
0
;
int
row
=
0
;
int
row
=
1
;
// Start from 1 because of table head
int
cols
=
0
;
for
(
TrackSegment
ts
:
trackPool
.
getTrackSegmentList
())
{
...
...
@@ -284,6 +301,10 @@ public class TrackProcessorMSD extends PluginTrackManagerProcessor implements Ac
if
(
msd
.
length
>
0
)
{
// Get max cols for the table
if
(
msd
.
length
>
cols
)
cols
=
msd
.
length
;
System
.
out
.
println
(
"track "
+
cnt
);
if
(
page
!=
null
)
...
...
@@ -302,6 +323,16 @@ public class TrackProcessorMSD extends PluginTrackManagerProcessor implements Ac
}
}
}
// Write table head
if
(
page
!=
null
)
{
XLSUtil
.
setCellString
(
page
,
0
,
0
,
"frame"
);
if
(
cols
>
0
)
{
for
(
int
c
=
0
;
c
<
cols
;
c
++)
{
XLSUtil
.
setCellString
(
page
,
c
+
1
,
0
,
String
.
valueOf
(
c
));
}
}
}
}
if
(
workbook
!=
null
)
...
...
This diff is collapsed.
Click to expand it.