Verified Commit d855e4f5 authored by Tobias WEBER's avatar Tobias WEBER
Browse files

some cleanups

parent e7837613
...@@ -53,7 +53,7 @@ tools/magstructfact/build/** ...@@ -53,7 +53,7 @@ tools/magstructfact/build/**
tools/magsgbrowser/build/** tools/magsgbrowser/build/**
tools/pol/build/** tools/pol/build/**
tools/moldyn/build/** tools/moldyn/build/**
tools/main/build/** tools/scanbrowser/build/**
tools/setup/build/** tools/setup/build/**
*.pyc *.pyc
.DS_Store .DS_Store
......
...@@ -27,5 +27,5 @@ add_subdirectory(tools/pol) ...@@ -27,5 +27,5 @@ add_subdirectory(tools/pol)
add_subdirectory(tools/moldyn) add_subdirectory(tools/moldyn)
# main GUI tool # new scan browser tool
add_subdirectory(tools/main) add_subdirectory(tools/scanbrowser)
...@@ -524,7 +524,7 @@ MagStructFactDlg::MagStructFactDlg(QWidget* pParent) : QDialog{pParent}, ...@@ -524,7 +524,7 @@ MagStructFactDlg::MagStructFactDlg(QWidget* pParent) : QDialog{pParent},
connect(acSave, &QAction::triggered, this, &MagStructFactDlg::Save); connect(acSave, &QAction::triggered, this, &MagStructFactDlg::Save);
connect(acImportCIF, &QAction::triggered, this, &MagStructFactDlg::ImportCIF); connect(acImportCIF, &QAction::triggered, this, &MagStructFactDlg::ImportCIF);
connect(acExit, &QAction::triggered, this, &QDialog::close); connect(acExit, &QAction::triggered, this, &QDialog::close);
// unit cell view // unit cell view
connect(ac3DView, &QAction::triggered, this, [this]() connect(ac3DView, &QAction::triggered, this, [this]()
...@@ -1923,10 +1923,10 @@ void MagStructFactDlg::Calc() ...@@ -1923,10 +1923,10 @@ void MagStructFactDlg::Calc()
auto objArrowRe = m_plotSC->GetImpl()->AddLinkedObject(m_arrowSC, 0,0,0, 1,1,1,1); 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 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 vecReM = tl2::convert<t_vec_gl>(_vecReM);
auto vecImM = tl2::convert<t_vec_gl>(_vecImM); auto vecImM = tl2::convert<t_vec_gl>(_vecImM);
auto normReM = tl2::norm<t_vec_gl>(vecReM); auto normReM = tl2::norm<t_vec_gl>(vecReM);
auto normImM = tl2::norm<t_vec_gl>(vecImM); auto normImM = tl2::norm<t_vec_gl>(vecImM);
......
...@@ -46,11 +46,11 @@ find_package(BISON 3.0 REQUIRED) ...@@ -46,11 +46,11 @@ find_package(BISON 3.0 REQUIRED)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/parser) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/parser)
# 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") COMPILE_FLAGS "-S lalr1.cc --defines=${CMAKE_CURRENT_BINARY_DIR}/parser/cliparser_impl.h")
# lexer # 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") COMPILE_FLAGS "--c++ --header-file=${CMAKE_CURRENT_BINARY_DIR}/parser/clilexer_impl.h")
ADD_FLEX_BISON_DEPENDENCY(clilexer cliparser) ADD_FLEX_BISON_DEPENDENCY(clilexer cliparser)
...@@ -65,9 +65,8 @@ set_property(SOURCE ...@@ -65,9 +65,8 @@ set_property(SOURCE
include_directories( include_directories(
"${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/ext" "${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/ext"
"${PROJECT_SOURCE_DIR}/tools/cli"
"${PROJECT_SOURCE_DIR}/../.." "${PROJECT_SOURCE_DIR}/../../ext" "${PROJECT_SOURCE_DIR}/../.." "${PROJECT_SOURCE_DIR}/../../ext"
"${PROJECT_SOURCE_DIR}/../../tools/cli" "${PROJECT_SOURCE_DIR}/cli"
"${Boost_INCLUDE_DIRS}" "${Boost_INCLUDE_DIRS}/.." "${Boost_INCLUDE_DIRS}" "${Boost_INCLUDE_DIRS}/.."
"${PROJECT_BINARY_DIR}/parser" "${PROJECT_BINARY_DIR}/parser"
) )
...@@ -84,9 +83,9 @@ add_executable(magtool ...@@ -84,9 +83,9 @@ add_executable(magtool
${BISON_cliparser_OUTPUT_SOURCE} ${BISON_cliparser_OUTPUT_HEADER} ${BISON_cliparser_OUTPUT_SOURCE} ${BISON_cliparser_OUTPUT_HEADER}
${FLEX_clilexer_OUTPUTS} ${FLEX_clilexer_OUTPUT_HEADER} ${FLEX_clilexer_OUTPUTS} ${FLEX_clilexer_OUTPUT_HEADER}
../cli/cliparser.cpp ../cli/cliparser.h ../cli/cliparser_types.h cli/cliparser.cpp cli/cliparser.h cli/cliparser_types.h
../cli/ast.cpp ../cli/sym.cpp cli/ast.cpp cli/sym.cpp
../cli/funcs.cpp ../cli/funcs.h cli/funcs.cpp cli/funcs.h
../../libs/log.cpp ../../libs/log.cpp
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#include "cliparser.h" #include "cliparser.h"
#include "tools/main/globals.h" #include "../globals.h"
#include "funcs.h" #include "funcs.h"
#include <cmath> #include <cmath>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <vector> #include <vector>
#include <map> #include <map>
#include <memory> #include <memory>
#include <boost/signals2/signal.hpp> #include <boost/signals2/signal.hpp>
#undef yyFlexLexer #undef yyFlexLexer
...@@ -20,7 +21,7 @@ ...@@ -20,7 +21,7 @@
#include "cliparser_types.h" #include "cliparser_types.h"
#include "cliparser_impl.h" #include "cliparser_impl.h"
#include "tools/main/data.h" #include "../data.h"
class CliAST; class CliAST;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#include "funcs.h" #include "funcs.h"
#include "tools/main/globals.h" #include "../globals.h"
#include "libs/phys.h" #include "libs/phys.h"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
*/ */
#include "cliparser.h" #include "cliparser.h"
#include "tools/main/globals.h" #include "../globals.h"
#include "funcs.h" #include "funcs.h"
#include "libs/algos.h" #include "libs/algos.h"
#include "libs/str.h" #include "libs/str.h"
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <QtWidgets/QTextEdit> #include <QtWidgets/QTextEdit>
#include <memory> #include <memory>
#include "tools/cli/cliparser.h" #include "cli/cliparser.h"
/** /**
......
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
#ifndef __FILEBROWSER_H__ #ifndef __FILEBROWSER_H__
#define __FILEBROWSER_H__ #define __FILEBROWSER_H__
#include "data.h"
//#include "plot.h"
#include <QtCore/QSettings> #include <QtCore/QSettings>
#include <QtCore/QEvent> #include <QtCore/QEvent>
#include <QtWidgets/QWidget> #include <QtWidgets/QWidget>
...@@ -20,9 +23,6 @@ ...@@ -20,9 +23,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "data.h"
//#include "plot.h"
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment