Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Zellige-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
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
IdA Public
Zellige-core
Commits
6237687f
Commit
6237687f
authored
4 years ago
by
Céline TREBEAU
Browse files
Options
Downloads
Patches
Plain Diff
Code cleanup
parent
c5f43390
No related branches found
No related tags found
1 merge request
!10
Surface reconstruction Refactoring
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/fr/pasteur/ida/zellige/surfaceConstruction/construction/SurfacesExtraction.java
+7
-37
7 additions, 37 deletions
.../surfaceConstruction/construction/SurfacesExtraction.java
with
7 additions
and
37 deletions
src/main/java/fr/pasteur/ida/zellige/surfaceConstruction/construction/SurfacesExtraction.java
+
7
−
37
View file @
6237687f
...
@@ -40,18 +40,18 @@ public class SurfacesExtraction
...
@@ -40,18 +40,18 @@ public class SurfacesExtraction
/* First step : Pixel selection */
/* First step : Pixel selection */
Pixels
[][]
maximums
=
SurfacePixelSelection
.
run
(
input
,
amplitude
,
threshold
,
sigmas
);
Pixels
[][]
maximums
=
SurfacePixelSelection
.
run
(
input
,
amplitude
,
threshold
,
sigmas
);
int
width
=
(
int
)
input
.
dimension
(
0
);
int
width
=
(
int
)
input
.
dimension
(
0
);
int
heig
t
h
=
(
int
)
input
.
dimension
(
1
);
int
heigh
t
=
(
int
)
input
.
dimension
(
1
);
try
try
{
{
/* First round construction*/
/* First round construction*/
ArrayList
<
Surface
>
surfaces
=
firstRoundConstruction
(
maximums
,
width
,
heig
t
h
);
ArrayList
<
Surface
>
surfaces
=
firstRoundConstruction
(
maximums
,
width
,
heigh
t
);
System
.
out
.
println
(
"first round surfaces = "
+
surfaces
.
size
()
);
System
.
out
.
println
(
"first round surfaces = "
+
surfaces
.
size
()
);
//
//
//
for (Surface surface : surfaces) {
for
(
Surface
surface
:
surfaces
)
{
//
displaySurface(surface);
displaySurface
(
surface
);
//
}
}
// Second round construction
// Second round construction
ArrayList
<
Surface
>
finalSurfaces
=
secondRoundConstruction
(
surfaces
,
width
,
heig
t
h
);
ArrayList
<
Surface
>
finalSurfaces
=
secondRoundConstruction
(
surfaces
,
width
,
heigh
t
);
// if ( !finalSurfaces.isEmpty() )
// if ( !finalSurfaces.isEmpty() )
// {
// {
int
index
=
0
;
int
index
=
0
;
...
@@ -176,6 +176,7 @@ public class SurfacesExtraction
...
@@ -176,6 +176,7 @@ public class SurfacesExtraction
}
}
}
}
}
}
displayMaximums
(
tempCoordinates
);
return
tempCoordinates
;
return
tempCoordinates
;
}
}
...
@@ -252,7 +253,6 @@ public class SurfacesExtraction
...
@@ -252,7 +253,6 @@ public class SurfacesExtraction
{
{
// Merging step.
// Merging step.
ArrayList
<
Surface
>
toRemoved
=
new
ArrayList
<>();
ArrayList
<
Surface
>
toRemoved
=
new
ArrayList
<>();
for
(
int
i
=
surfaces
.
size
()
-
1
;
i
>
0
;
i
--
)
for
(
int
i
=
surfaces
.
size
()
-
1
;
i
>
0
;
i
--
)
{
{
Surface
one
=
surfaces
.
get
(
i
);
Surface
one
=
surfaces
.
get
(
i
);
...
@@ -324,36 +324,6 @@ public class SurfacesExtraction
...
@@ -324,36 +324,6 @@ public class SurfacesExtraction
}
}
// public static int getX()
// {
// return width;
// }
//
// public static void setX( int x )
// {
// width = x;
// }
//
// public static int getY()
// {
// return height;
// }
//
// public static void setY( int y )
// {
// height = y;
// }
//
// public static int getZ()
// {
// return Z;
// }
//
// public static void setZ( int z )
// {
// Z = z;
// }
/**
/**
* Displays the local maximums found using jzy3D package.
* Displays the local maximums found using jzy3D package.
*/
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment