Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
Takin
mag-core
Commits
d855e4f5
Verified
Commit
d855e4f5
authored
Jul 27, 2020
by
Tobias WEBER
Browse files
some cleanups
parent
e7837613
Changes
30
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
d855e4f5
...
...
@@ -53,7 +53,7 @@ tools/magstructfact/build/**
tools/magsgbrowser/build/**
tools/pol/build/**
tools/moldyn/build/**
tools/
main
/build/**
tools/
scanbrowser
/build/**
tools/setup/build/**
*.pyc
.DS_Store
...
...
CMakeLists.txt
View file @
d855e4f5
...
...
@@ -27,5 +27,5 @@ add_subdirectory(tools/pol)
add_subdirectory
(
tools/moldyn
)
#
main GUI
tool
add_subdirectory
(
tools/
main
)
#
new scan browser
tool
add_subdirectory
(
tools/
scanbrowser
)
tools/magstructfact/magstructfact.cpp
View file @
d855e4f5
...
...
@@ -524,7 +524,7 @@ MagStructFactDlg::MagStructFactDlg(QWidget* pParent) : QDialog{pParent},
connect
(
acSave
,
&
QAction
::
triggered
,
this
,
&
MagStructFactDlg
::
Save
);
connect
(
acImportCIF
,
&
QAction
::
triggered
,
this
,
&
MagStructFactDlg
::
ImportCIF
);
connect
(
acExit
,
&
QAction
::
triggered
,
this
,
&
QDialog
::
close
);
// unit cell view
connect
(
ac3DView
,
&
QAction
::
triggered
,
this
,
[
this
]()
...
...
@@ -1923,10 +1923,10 @@ void MagStructFactDlg::Calc()
auto
objArrowRe
=
m_plotSC
->
GetImpl
()
->
AddLinkedObject
(
m_arrowSC
,
0
,
0
,
0
,
1
,
1
,
1
,
1
);
auto
objArrowIm
=
m_plotSC
->
GetImpl
()
->
AddLinkedObject
(
m_arrowSC
,
0
,
0
,
0
,
1
,
1
,
1
,
1
);
auto
[
_vecReM
,
_vecImM
]
=
tl2
::
split_cplx
<
t_
cplx
>
(
moment
);
auto
[
_vecReM
,
_vecImM
]
=
tl2
::
split_cplx
<
t_
vec_cplx
,
t_vec
>
(
moment
);
auto
vecReM
=
tl2
::
convert
<
t_vec_gl
>
(
_vecReM
);
auto
vecImM
=
tl2
::
convert
<
t_vec_gl
>
(
_vecImM
);
auto
normReM
=
tl2
::
norm
<
t_vec_gl
>
(
vecReM
);
auto
normImM
=
tl2
::
norm
<
t_vec_gl
>
(
vecImM
);
...
...
tools/
main
/CMakeLists.txt
→
tools/
scanbrowser
/CMakeLists.txt
View file @
d855e4f5
...
...
@@ -46,11 +46,11 @@ find_package(BISON 3.0 REQUIRED)
file
(
MAKE_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/parser
)
# parser
BISON_TARGET
(
cliparser
../
cli/cliparser.y
${
CMAKE_CURRENT_BINARY_DIR
}
/parser/cliparser_impl.cpp
BISON_TARGET
(
cliparser cli/cliparser.y
${
CMAKE_CURRENT_BINARY_DIR
}
/parser/cliparser_impl.cpp
COMPILE_FLAGS
"-S lalr1.cc --defines=
${
CMAKE_CURRENT_BINARY_DIR
}
/parser/cliparser_impl.h"
)
# lexer
FLEX_TARGET
(
clilexer
../
cli/clilexer.l
${
CMAKE_CURRENT_BINARY_DIR
}
/parser/clilexer_impl.cpp
FLEX_TARGET
(
clilexer cli/clilexer.l
${
CMAKE_CURRENT_BINARY_DIR
}
/parser/clilexer_impl.cpp
COMPILE_FLAGS
"--c++ --header-file=
${
CMAKE_CURRENT_BINARY_DIR
}
/parser/clilexer_impl.h"
)
ADD_FLEX_BISON_DEPENDENCY
(
clilexer cliparser
)
...
...
@@ -65,9 +65,8 @@ set_property(SOURCE
include_directories
(
"
${
PROJECT_SOURCE_DIR
}
"
"
${
PROJECT_SOURCE_DIR
}
/ext"
"
${
PROJECT_SOURCE_DIR
}
/tools/cli"
"
${
PROJECT_SOURCE_DIR
}
/../.."
"
${
PROJECT_SOURCE_DIR
}
/../../ext"
"
${
PROJECT_SOURCE_DIR
}
/
../../tools/
cli"
"
${
PROJECT_SOURCE_DIR
}
/cli"
"
${
Boost_INCLUDE_DIRS
}
"
"
${
Boost_INCLUDE_DIRS
}
/.."
"
${
PROJECT_BINARY_DIR
}
/parser"
)
...
...
@@ -84,9 +83,9 @@ add_executable(magtool
${
BISON_cliparser_OUTPUT_SOURCE
}
${
BISON_cliparser_OUTPUT_HEADER
}
${
FLEX_clilexer_OUTPUTS
}
${
FLEX_clilexer_OUTPUT_HEADER
}
../
cli/cliparser.cpp
../
cli/cliparser.h
../
cli/cliparser_types.h
../
cli/ast.cpp
../
cli/sym.cpp
../
cli/funcs.cpp
../
cli/funcs.h
cli/cliparser.cpp cli/cliparser.h cli/cliparser_types.h
cli/ast.cpp cli/sym.cpp
cli/funcs.cpp cli/funcs.h
../../libs/log.cpp
...
...
tools/cli/ast.cpp
→
tools/
scanbrowser/
cli/ast.cpp
View file @
d855e4f5
...
...
@@ -6,7 +6,7 @@
*/
#include
"cliparser.h"
#include
"
tools/main
/globals.h"
#include
"
..
/globals.h"
#include
"funcs.h"
#include
<cmath>
...
...
tools/cli/clilexer.l
→
tools/
scanbrowser/
cli/clilexer.l
View file @
d855e4f5
File moved
tools/cli/cliparser.cpp
→
tools/
scanbrowser/
cli/cliparser.cpp
View file @
d855e4f5
File moved
tools/cli/cliparser.h
→
tools/
scanbrowser/
cli/cliparser.h
View file @
d855e4f5
...
...
@@ -13,6 +13,7 @@
#include
<vector>
#include
<map>
#include
<memory>
#include
<boost/signals2/signal.hpp>
#undef yyFlexLexer
...
...
@@ -20,7 +21,7 @@
#include
"cliparser_types.h"
#include
"cliparser_impl.h"
#include
"
tools/main
/data.h"
#include
"
..
/data.h"
class
CliAST
;
...
...
tools/cli/cliparser.y
→
tools/
scanbrowser/
cli/cliparser.y
View file @
d855e4f5
File moved
tools/cli/cliparser_types.h
→
tools/
scanbrowser/
cli/cliparser_types.h
View file @
d855e4f5
File moved
tools/cli/funcs.cpp
→
tools/
scanbrowser/
cli/funcs.cpp
View file @
d855e4f5
...
...
@@ -6,7 +6,7 @@
*/
#include
"funcs.h"
#include
"
tools/main
/globals.h"
#include
"
..
/globals.h"
#include
"libs/phys.h"
...
...
tools/cli/funcs.h
→
tools/
scanbrowser/
cli/funcs.h
View file @
d855e4f5
File moved
tools/cli/sym.cpp
→
tools/
scanbrowser/
cli/sym.cpp
View file @
d855e4f5
...
...
@@ -6,7 +6,7 @@
*/
#include
"cliparser.h"
#include
"
tools/main
/globals.h"
#include
"
..
/globals.h"
#include
"funcs.h"
#include
"libs/algos.h"
#include
"libs/str.h"
...
...
tools/
main
/command.cpp
→
tools/
scanbrowser
/command.cpp
View file @
d855e4f5
File moved
tools/
main
/command.h
→
tools/
scanbrowser
/command.h
View file @
d855e4f5
...
...
@@ -16,7 +16,7 @@
#include
<QtWidgets/QTextEdit>
#include
<memory>
#include
"
tools/
cli/cliparser.h"
#include
"cli/cliparser.h"
/**
...
...
tools/
main
/data.cpp
→
tools/
scanbrowser
/data.cpp
View file @
d855e4f5
File moved
tools/
main
/data.h
→
tools/
scanbrowser
/data.h
View file @
d855e4f5
File moved
tools/
main
/filebrowser.cpp
→
tools/
scanbrowser
/filebrowser.cpp
View file @
d855e4f5
File moved
tools/
main
/filebrowser.h
→
tools/
scanbrowser
/filebrowser.h
View file @
d855e4f5
...
...
@@ -8,6 +8,9 @@
#ifndef __FILEBROWSER_H__
#define __FILEBROWSER_H__
#include
"data.h"
//#include "plot.h"
#include
<QtCore/QSettings>
#include
<QtCore/QEvent>
#include
<QtWidgets/QWidget>
...
...
@@ -20,9 +23,6 @@
#include
<vector>
#include
<string>
#include
"data.h"
//#include "plot.h"
/**
...
...
tools/
main
/globals.cpp
→
tools/
scanbrowser
/globals.cpp
View file @
d855e4f5
File moved
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment