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
c6c7dfc0
Commit
c6c7dfc0
authored
3 years ago
by
Matthias Puchner
Browse files
Options
Downloads
Patches
Plain Diff
simplify RealSpace (3D) view - simplified "locked view" handling
parent
d4209803
No related branches found
No related tags found
1 merge request
!433
simplify RealSpace (3D) view part 2 (preparation for using 3D view for layer oriented editor)
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/View/Realspace/RealSpaceCanvas.cpp
+3
-10
3 additions, 10 deletions
GUI/View/Realspace/RealSpaceCanvas.cpp
GUI/View/Realspace/RealSpaceCanvas.h
+0
-3
0 additions, 3 deletions
GUI/View/Realspace/RealSpaceCanvas.h
with
3 additions
and
13 deletions
GUI/View/Realspace/RealSpaceCanvas.cpp
+
3
−
10
View file @
c6c7dfc0
...
@@ -31,7 +31,6 @@ RealSpaceCanvas::RealSpaceCanvas(SampleModel* sampleModel, QWidget* parent)
...
@@ -31,7 +31,6 @@ RealSpaceCanvas::RealSpaceCanvas(SampleModel* sampleModel, QWidget* parent)
:
QWidget
(
parent
)
:
QWidget
(
parent
)
,
m_sampleModel
(
sampleModel
)
,
m_sampleModel
(
sampleModel
)
,
m_view
(
new
GUI
::
RealSpace
::
Widget3D
)
,
m_view
(
new
GUI
::
RealSpace
::
Widget3D
)
,
m_view_locked
(
false
)
,
m_cautionSign
(
new
CautionSign
(
this
))
,
m_cautionSign
(
new
CautionSign
(
this
))
,
m_currentItem
(
nullptr
)
,
m_currentItem
(
nullptr
)
{
{
...
@@ -46,6 +45,7 @@ void RealSpaceCanvas::setCurrentItem(SessionItem* item)
...
@@ -46,6 +45,7 @@ void RealSpaceCanvas::setCurrentItem(SessionItem* item)
{
{
m_currentItem
=
item
;
m_currentItem
=
item
;
updateScene
();
updateScene
();
defaultView
();
// Enforces default view and also sets the zoomLevel to default i.e. 0
}
}
void
RealSpaceCanvas
::
changeLayerSize
(
double
layerSizeChangeScale
)
void
RealSpaceCanvas
::
changeLayerSize
(
double
layerSizeChangeScale
)
...
@@ -126,15 +126,8 @@ void RealSpaceCanvas::updateScene()
...
@@ -126,15 +126,8 @@ void RealSpaceCanvas::updateScene()
try
{
try
{
m_cautionSign
->
clear
();
m_cautionSign
->
clear
();
// if the view is locked, keep the current orientation of the camera
builder3D
.
populate
(
m_realSpaceModel
.
get
(),
*
m_currentItem
,
m_sceneGeometry
,
if
(
m_view_locked
)
m_view
->
cam
().
getPos
());
builder3D
.
populate
(
m_realSpaceModel
.
get
(),
*
m_currentItem
,
m_sceneGeometry
,
m_view
->
cam
().
getPos
());
// otherwise use default orientation of camera
else
{
builder3D
.
populate
(
m_realSpaceModel
.
get
(),
*
m_currentItem
,
m_sceneGeometry
);
defaultView
();
// Enforces default view and also sets the zoomLevel to default i.e. 0
}
}
catch
(
const
std
::
exception
&
ex
)
{
}
catch
(
const
std
::
exception
&
ex
)
{
m_cautionSign
->
setCautionMessage
(
ex
.
what
());
m_cautionSign
->
setCautionMessage
(
ex
.
what
());
}
catch
(...)
{
}
catch
(...)
{
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Realspace/RealSpaceCanvas.h
+
0
−
3
View file @
c6c7dfc0
...
@@ -41,11 +41,9 @@ public:
...
@@ -41,11 +41,9 @@ public:
RealSpaceCanvas
(
SampleModel
*
sampleModel
,
QWidget
*
parent
=
nullptr
);
RealSpaceCanvas
(
SampleModel
*
sampleModel
,
QWidget
*
parent
=
nullptr
);
void
setCurrentItem
(
SessionItem
*
item
);
void
setCurrentItem
(
SessionItem
*
item
);
void
defaultView
();
void
defaultView
();
void
sideView
();
void
sideView
();
void
topView
();
void
topView
();
void
changeLayerSize
(
double
layer_size_scale
);
void
changeLayerSize
(
double
layer_size_scale
);
void
savePicture
();
void
savePicture
();
...
@@ -63,7 +61,6 @@ private:
...
@@ -63,7 +61,6 @@ private:
SampleModel
*
m_sampleModel
;
SampleModel
*
m_sampleModel
;
GUI
::
RealSpace
::
Widget3D
*
m_view
;
GUI
::
RealSpace
::
Widget3D
*
m_view
;
std
::
unique_ptr
<
GUI
::
RealSpace
::
Model
>
m_realSpaceModel
;
std
::
unique_ptr
<
GUI
::
RealSpace
::
Model
>
m_realSpaceModel
;
bool
m_view_locked
;
SceneGeometry
m_sceneGeometry
;
SceneGeometry
m_sceneGeometry
;
CautionSign
*
m_cautionSign
;
CautionSign
*
m_cautionSign
;
SessionItem
*
m_currentItem
;
SessionItem
*
m_currentItem
;
...
...
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