Skip to content

Commit 3c7bb8d

Browse files
committed
bug in template usage removed
1 parent 0485ece commit 3c7bb8d

File tree

2 files changed

+93
-3
lines changed

2 files changed

+93
-3
lines changed

src/CMakeLists.txt

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
cmake_minimum_required(VERSION 4.3.0)
2+
3+
# set the project name
4+
project(GreasePad VERSION 1.2.1 LANGUAGES CXX)
5+
6+
7+
# CONFIG specify the C++ standard
8+
set(CMAKE_CXX_STANDARD 11)
9+
set(CMAKE_CXX_STANDARD_REQUIRED True)
10+
11+
# my installation directories
12+
set(Qt6_DIR "C:/Qt/6.10.0/msvc2022_64/lib/cmake/Qt6")
13+
14+
15+
16+
17+
18+
19+
find_package(Qt6 REQUIRED COMPONENTS Core)
20+
21+
22+
set(CMAKE_AUTOMOC ON)
23+
set(CMAKE_AUTORCC ON)
24+
set(CMAKE_AUTOUIC ON)
25+
26+
#set(Qt6_DIR "C:/Qt/6.10.0/mscv2022_64/lib/cmake/Qt6")
27+
28+
find_package(Qt6 REQUIRED COMPONENTS Core Widgets Svg)
29+
30+
qt_standard_project_setup()
31+
32+
# add the executable
33+
qt_add_executable(GreasePad
34+
adjustment.cpp
35+
commands.cpp
36+
constraints.cpp
37+
main.cpp
38+
mainwindow.cpp
39+
mainscene.cpp
40+
mainview.cpp
41+
matrix.cpp
42+
qconstraints.cpp
43+
qformattool.cpp
44+
qsegment.cpp
45+
qstroke.cpp
46+
quantiles.cpp
47+
state.cpp
48+
uncertain/quncertain.cpp
49+
uncertain/uncertain.cpp
50+
uncertain/upoint.cpp
51+
uncertain/usegment.cpp
52+
uncertain/ustraightline.cpp
53+
)
54+
55+
56+
# INCLUDEPATH
57+
target_include_directories(GreasePad PUBLIC "D:/Dev/clone/eigen/")
58+
target_include_directories(GreasePad PUBLIC "D:/Dev/clone/GreasePad/src")
59+
target_include_directories(GreasePad PUBLIC "C:/Qt/6.10.0/msvc2022_64/include/QtCore")
60+
target_include_directories(GreasePad PUBLIC "C:/Qt/6.10.0/msvc2022_64/include/QtGui")
61+
target_include_directories(GreasePad PUBLIC "C:/Qt/6.10.0/msvc2022_64/include/QtWidgets")
62+
target_include_directories(GreasePad PUBLIC "C:/Qt/6.10.0/msvc2022_64/include/QtSvg")
63+
target_include_directories(GreasePad PUBLIC "C:/Qt/6.10.0/msvc2022_64/include")
64+
65+
66+
67+
68+
#set(Eigen3_DIR "D:/Dev/clone/eigen/")
69+
#set(CMAKE_CONFIGURATION_TYPES "Debug;Release;Profile")
70+
set(CMAKE_INSTALL_PREFIX "D:/Dev")
71+
set(CMAKE_BUILD_TYPE "Debug")
72+
73+
74+
#if(CMAKE_VERSION VERSION_LESS "3.7.0")
75+
# set(CMAKE_INCLUDE_CURRENT_DIR ON)
76+
#endif()
77+
78+
79+
#find_package(Eigen3 REQUIRED NO_MODULE)
80+
81+
82+
#target_link_libraries(GreasePad Eigen)
83+
target_link_libraries(GreasePad PRIVATE Qt6::Core Qt6::Widgets Qt6::Svg)
84+
85+
86+
install(TARGETS GreasePad DESTINATION bin CONFIGURATION Debug)
87+
88+
89+
# in Eingabeaufforderung (not PowerShell)
90+
# set PATH=C:\Qt\6.10.0\msvc2022_64\bin;%PATH%

src/adjustment.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ class AdjustmentFramework
7272
getEntity( const Eigen::Index s) const
7373
{
7474
const Eigen::Index offset = N*s;
75-
const Eigen::Matrix<double,N,N> RR = Geometry::Rot_ab(
76-
l_.segment(offset,N).eval(),
77-
l0_.segment(offset,N).eval() );
75+
const Eigen::Matrix<double,N,N> RR = Geometry::Rot_ab<double,3>(
76+
l_.segment(offset,N),
77+
l0_.segment(offset,N) );
7878

7979
return { l0_.segment(offset,N),
8080
RR*Cov_ll_.block(offset,offset,N,N)*RR.adjoint() };

0 commit comments

Comments
 (0)