Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
Monitor
Incidents
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
9ef19041
Commit
9ef19041
authored
7 months ago
by
Mikhail Svechnikov
Browse files
Options
Downloads
Patches
Plain Diff
move out num points to sceneGeometry
parent
a2760048
No related branches found
Branches containing commit
No related tags found
1 merge request
!2700
Visualize rough interfaces in Img3D
Pipeline
#153728
passed
7 months ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/View/Realspace/RealspaceBuilder.cpp
+1
-1
1 addition, 1 deletion
GUI/View/Realspace/RealspaceBuilder.cpp
Img3D/Type/SceneGeometry.h
+1
-0
1 addition, 0 deletions
Img3D/Type/SceneGeometry.h
with
2 additions
and
1 deletion
GUI/View/Realspace/RealspaceBuilder.cpp
+
1
−
1
View file @
9ef19041
...
@@ -105,7 +105,7 @@ std::unique_ptr<const double2d_t> layerRoughnessMap(const LayerItem& layerItem,
...
@@ -105,7 +105,7 @@ std::unique_ptr<const double2d_t> layerRoughnessMap(const LayerItem& layerItem,
if
(
const
auto
*
br
=
dynamic_cast
<
const
BasicRoughnessItem
*>
(
layerItem
.
certainRoughness
()))
{
if
(
const
auto
*
br
=
dynamic_cast
<
const
BasicRoughnessItem
*>
(
layerItem
.
certainRoughness
()))
{
auto
roughness
=
LayerRoughness
(
br
->
sigma
().
dVal
(),
br
->
hurst
().
dVal
(),
auto
roughness
=
LayerRoughness
(
br
->
sigma
().
dVal
(),
br
->
hurst
().
dVal
(),
br
->
lateralCorrelationLength
().
dVal
());
br
->
lateralCorrelationLength
().
dVal
());
int
n
=
256
;
int
n
=
sceneGeometry
.
roughnessResolution
;
double
L
=
2
*
sceneGeometry
.
layerSize
;
double
L
=
2
*
sceneGeometry
.
layerSize
;
auto
rmap
=
RoughnessMap
(
n
,
n
,
L
,
L
,
&
roughness
,
seed
);
// seed < 0 ==> random every time
auto
rmap
=
RoughnessMap
(
n
,
n
,
L
,
L
,
&
roughness
,
seed
);
// seed < 0 ==> random every time
result
.
reset
(
new
double2d_t
(
rmap
.
generateMap
()));
result
.
reset
(
new
double2d_t
(
rmap
.
generateMap
()));
...
...
This diff is collapsed.
Click to expand it.
Img3D/Type/SceneGeometry.h
+
1
−
0
View file @
9ef19041
...
@@ -21,6 +21,7 @@ struct SceneGeometry {
...
@@ -21,6 +21,7 @@ struct SceneGeometry {
double
layerBorderWidth
=
5
.
0
;
double
layerBorderWidth
=
5
.
0
;
double
topOrBottomLayerThickness
=
25
.
0
;
double
topOrBottomLayerThickness
=
25
.
0
;
double
layerMinimumThickness
=
2
.
0
;
double
layerMinimumThickness
=
2
.
0
;
unsigned
roughnessResolution
=
256
;
unsigned
maxNumberOfParticlesToShow
=
20000
;
unsigned
maxNumberOfParticlesToShow
=
20000
;
};
};
...
...
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