Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
mag-core
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
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Scientific Software
Takin
mag-core
Commits
8f74cbe7
Commit
8f74cbe7
authored
5 years ago
by
Tobias WEBER
Browse files
Options
Downloads
Patches
Plain Diff
continued with moldyn dialog
parent
67a30235
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
tools/moldyn/moldyn-loader.h
+5
-0
5 additions, 0 deletions
tools/moldyn/moldyn-loader.h
tools/moldyn/moldyn.cpp
+96
-4
96 additions, 4 deletions
tools/moldyn/moldyn.cpp
tools/moldyn/moldyn.h
+1
-1
1 addition, 1 deletion
tools/moldyn/moldyn.h
with
102 additions
and
5 deletions
tools/moldyn/moldyn-loader.h
+
5
−
0
View file @
8f74cbe7
...
...
@@ -216,6 +216,11 @@ class MolDyn
return
0
;
}
// center cell (in rlu)
vecCoords
[
0
]
-=
0.5
;
vecCoords
[
1
]
-=
0.5
;
vecCoords
[
2
]
-=
0.5
;
atomconf
.
emplace_back
(
std
::
move
(
vecCoords
));
}
...
...
This diff is collapsed.
Click to expand it.
tools/moldyn/moldyn.cpp
+
96
−
4
View file @
8f74cbe7
...
...
@@ -10,10 +10,13 @@
#include
<QtWidgets/QApplication>
#include
<QtWidgets/QGridLayout>
#include
<QtWidgets/QFileDialog>
#include
<QtWidgets/QLabel>
#include
<QtWidgets/QSpinBox>
#include
<QtWidgets/QMessageBox>
#include
<iostream>
#include
<tuple>
#include
<memory>
#include
"libs/algos.h"
#include
"libs/helper.h"
...
...
@@ -24,6 +27,56 @@ constexpr t_real g_eps = 1e-6;
constexpr
int
g_prec
=
6
;
// ----------------------------------------------------------------------------
/**
* File dialog with options
*/
class
MolDynFileDlg
:
public
QFileDialog
{
public:
MolDynFileDlg
(
QWidget
*
parent
,
const
QString
&
title
,
const
QString
&
dir
,
const
QString
&
filter
)
:
QFileDialog
(
parent
,
title
,
dir
,
filter
)
{
// options panel with frame skip
QLabel
*
labelFrameSkip
=
new
QLabel
(
"Frame Skip: "
,
this
);
m_spinFrameSkip
=
new
QSpinBox
(
this
);
m_spinFrameSkip
->
setValue
(
10
);
m_spinFrameSkip
->
setMinimum
(
0
);
m_spinFrameSkip
->
setMaximum
(
9999999
);
labelFrameSkip
->
setSizePolicy
(
QSizePolicy
{
QSizePolicy
::
Fixed
,
QSizePolicy
::
Fixed
});
m_spinFrameSkip
->
setSizePolicy
(
QSizePolicy
{
QSizePolicy
::
Expanding
,
QSizePolicy
::
Fixed
});
QWidget
*
pPanel
=
new
QWidget
();
auto
pPanelGrid
=
new
QGridLayout
(
pPanel
);
pPanelGrid
->
setSpacing
(
2
);
pPanelGrid
->
setContentsMargins
(
4
,
4
,
4
,
4
);
pPanelGrid
->
addWidget
(
labelFrameSkip
,
0
,
0
,
1
,
1
);
pPanelGrid
->
addWidget
(
m_spinFrameSkip
,
0
,
1
,
1
,
1
);
// add the options panel to the layout
setOptions
(
QFileDialog
::
DontUseNativeDialog
);
QGridLayout
*
pGrid
=
reinterpret_cast
<
QGridLayout
*>
(
layout
());
if
(
pGrid
)
pGrid
->
addWidget
(
pPanel
,
pGrid
->
rowCount
(),
0
,
1
,
pGrid
->
columnCount
());
}
int
GetFrameSkip
()
const
{
return
m_spinFrameSkip
->
value
();
}
private
:
QSpinBox
*
m_spinFrameSkip
=
nullptr
;
};
// ----------------------------------------------------------------------------
MolDynDlg
::
MolDynDlg
(
QWidget
*
pParent
)
:
QMainWindow
{
pParent
},
m_sett
{
new
QSettings
{
"tobis_stuff"
,
"moldyn"
}}
...
...
@@ -98,6 +151,8 @@ MolDynDlg::MolDynDlg(QWidget* pParent) : QMainWindow{pParent},
m_slider
=
new
QSlider
(
Qt
::
Horizontal
,
this
);
m_slider
->
setSizePolicy
(
QSizePolicy
{
QSizePolicy
::
Expanding
,
QSizePolicy
::
Minimum
});
m_slider
->
setMinimum
(
0
);
m_slider
->
setSingleStep
(
1
);
m_slider
->
setPageStep
(
10
);
m_slider
->
setTracking
(
1
);
connect
(
m_slider
,
&
QSlider
::
valueChanged
,
this
,
&
MolDynDlg
::
SliderValueChanged
);
...
...
@@ -151,8 +206,14 @@ void MolDynDlg::Change3DItem(std::size_t obj, const t_vec *vec, const t_vec *col
void
MolDynDlg
::
New
()
{
m_mol
.
Clear
();
for
(
const
auto
&
obj
:
m_sphereHandles
)
m_plot
->
GetImpl
()
->
RemoveObject
(
obj
);
m_sphereHandles
.
clear
();
// TODO: clear 3d objects
m_slider
->
setValue
(
0
);
m_plot
->
update
();
}
...
...
@@ -163,18 +224,26 @@ void MolDynDlg::Load()
try
{
QString
dirLast
=
m_sett
->
value
(
"dir"
,
""
).
toString
();
QString
filename
=
QFileDialog
::
getOpenFileName
(
this
,
"Load File"
,
dirLast
,
"Molecular Dynamics File (*)"
);
auto
filedlg
=
std
::
make_shared
<
MolDynFileDlg
>
(
this
,
"Load File"
,
dirLast
,
"Molecular Dynamics File (*)"
);
if
(
!
filedlg
->
exec
())
return
;
auto
files
=
filedlg
->
selectedFiles
();
if
(
!
files
.
size
())
return
;
QString
filename
=
files
[
0
];
if
(
filename
==
""
||
!
QFile
::
exists
(
filename
))
return
;
m_sett
->
setValue
(
"dir"
,
QFileInfo
(
filename
).
path
());
if
(
!
m_mol
.
LoadFile
(
filename
.
toStdString
(),
m_frameskip
))
New
();
if
(
!
m_mol
.
LoadFile
(
filename
.
toStdString
(),
filedlg
->
GetFrameSkip
()))
{
QMessageBox
::
critical
(
this
,
"Molecular Dynamics"
,
"Error loading file."
);
return
;
}
m_slider
->
setMaximum
(
m_mol
.
GetFrameCount
());
m_slider
->
setMaximum
(
m_mol
.
GetFrameCount
()
-
1
);
// atom colors
...
...
@@ -265,8 +334,12 @@ void MolDynDlg::SetStatusMsg(const std::string& msg)
*/
void
MolDynDlg
::
PlotMouseDown
(
bool
left
,
bool
mid
,
bool
right
)
{
if
(
!
m_plot
)
return
;
if
(
left
&&
m_curPickedObj
>
0
)
{
m_plot
->
GetImpl
()
->
ToggleObjectHighlight
(
m_curPickedObj
);
m_plot
->
update
();
}
}
...
...
@@ -334,6 +407,25 @@ void MolDynDlg::closeEvent(QCloseEvent *evt)
m_sett
->
setValue
(
"geo"
,
saveGeometry
());
}
}
void
MolDynDlg
::
keyPressEvent
(
QKeyEvent
*
evt
)
{
if
(
evt
->
key
()
==
Qt
::
Key_Left
||
evt
->
key
()
==
Qt
::
Key_Down
)
m_slider
->
setValue
(
m_slider
->
value
()
-
m_slider
->
singleStep
());
else
if
(
evt
->
key
()
==
Qt
::
Key_Right
||
evt
->
key
()
==
Qt
::
Key_Up
)
m_slider
->
setValue
(
m_slider
->
value
()
+
m_slider
->
singleStep
());
else
if
(
evt
->
key
()
==
Qt
::
Key_PageUp
)
m_slider
->
setValue
(
m_slider
->
value
()
+
m_slider
->
pageStep
());
else
if
(
evt
->
key
()
==
Qt
::
Key_PageDown
)
m_slider
->
setValue
(
m_slider
->
value
()
-
m_slider
->
pageStep
());
else
if
(
evt
->
key
()
==
Qt
::
Key_Home
)
m_slider
->
setValue
(
m_slider
->
minimum
());
else
if
(
evt
->
key
()
==
Qt
::
Key_End
)
m_slider
->
setValue
(
m_slider
->
maximum
());
QMainWindow
::
keyPressEvent
(
evt
);
}
// ----------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
tools/moldyn/moldyn.h
+
1
−
1
View file @
8f74cbe7
...
...
@@ -52,6 +52,7 @@ protected:
void
SliderValueChanged
(
int
val
);
virtual
void
closeEvent
(
QCloseEvent
*
evt
)
override
;
virtual
void
keyPressEvent
(
QKeyEvent
*
evt
)
override
;
protected:
...
...
@@ -72,7 +73,6 @@ private:
bool
m_ignoreChanges
=
1
;
t_real
m_atomscale
=
0.4
;
unsigned
int
m_frameskip
=
10
;
};
...
...
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