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
c3666aea
Commit
c3666aea
authored
7 months ago
by
Mikhail Svechnikov
Browse files
Options
Downloads
Patches
Plain Diff
fix bottom of rough box
parent
b13f6144
No related branches found
No related tags found
1 merge request
!2715
Replace single crossCorrelationLength parameter by CrosscorrelationModel individual for each interface
Pipeline
#155937
passed
7 months ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Img3D/Mesh/Box.cpp
+6
-4
6 additions, 4 deletions
Img3D/Mesh/Box.cpp
Img3D/Model/PlottableBody.cpp
+1
-1
1 addition, 1 deletion
Img3D/Model/PlottableBody.cpp
with
7 additions
and
5 deletions
Img3D/Mesh/Box.cpp
+
6
−
4
View file @
c3666aea
...
...
@@ -47,11 +47,13 @@ Geometry::Mesh Geometry::meshBox()
Geometry
::
Mesh
Geometry
::
meshRoughBox
(
const
double2d_t
*
topR
,
const
double2d_t
*
bottomR
)
{
ASSERT
(
topR
);
ASSERT
(
topR
->
size
());
ASSERT
(
topR
||
bottomR
);
const
double2d_t
*
base
=
topR
?
topR
:
bottomR
;
ASSERT
(
base
->
size
());
const
auto
&
t
=
*
topR
;
const
auto
&
b
=
bottomR
?
*
bottomR
:
double2d_t
(
t
.
size
(),
std
::
vector
<
double
>
(
t
[
0
].
size
()));
const
auto
&
t
=
topR
?
*
topR
:
double2d_t
(
base
->
size
(),
std
::
vector
<
double
>
(
base
[
0
].
size
()));
const
auto
&
b
=
bottomR
?
*
bottomR
:
double2d_t
(
base
->
size
(),
std
::
vector
<
double
>
(
base
[
0
].
size
()));
float
const
D
=
0.5
f
;
...
...
This diff is collapsed.
Click to expand it.
Img3D/Model/PlottableBody.cpp
+
1
−
1
View file @
c3666aea
...
...
@@ -71,7 +71,7 @@ PlottableBody::PlottableBody(GeometricID::Key gky_, const double2d_t* top, const
,
m_color
(
clrObject
)
,
gky
(
gky_
)
{
if
(
top
)
if
(
top
||
bottom
)
m_geo
=
std
::
shared_ptr
<
Geometry
>
(
new
Geometry
(
gky
,
top
,
bottom
));
}
...
...
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