Skip to content

Commit 41251ce

Browse files
poteatpoteat
committed
sync
1 parent 5ca772b commit 41251ce

12 files changed

Lines changed: 109 additions & 51 deletions

File tree

‎ApplyConvolution/ApplyConvolution.vcxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@
7979
<IntrinsicFunctions>true</IntrinsicFunctions>
8080
<SDLCheck>true</SDLCheck>
8181
<AdditionalIncludeDirectories>..\CBL\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<LanguageStandard>stdcpp17</LanguageStandard>
83+
<EnableModules>false</EnableModules>
8284
</ClCompile>
8385
<Link>
8486
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -91,6 +93,7 @@
9193
<Optimization>Disabled</Optimization>
9294
<SDLCheck>true</SDLCheck>
9395
<AdditionalIncludeDirectories>..\CBL\;</AdditionalIncludeDirectories>
96+
<LanguageStandard>stdcpp17</LanguageStandard>
9497
</ClCompile>
9598
</ItemDefinitionGroup>
9699
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -99,6 +102,8 @@
99102
<Optimization>Disabled</Optimization>
100103
<SDLCheck>true</SDLCheck>
101104
<AdditionalIncludeDirectories>..\CBL\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
105+
<LanguageStandard>stdcpp17</LanguageStandard>
106+
<EnableModules>false</EnableModules>
102107
</ClCompile>
103108
</ItemDefinitionGroup>
104109
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -109,6 +114,7 @@
109114
<IntrinsicFunctions>true</IntrinsicFunctions>
110115
<SDLCheck>true</SDLCheck>
111116
<AdditionalIncludeDirectories>..\CBL\;</AdditionalIncludeDirectories>
117+
<LanguageStandard>stdcpp17</LanguageStandard>
112118
</ClCompile>
113119
<Link>
114120
<EnableCOMDATFolding>true</EnableCOMDATFolding>

‎CBL.sln‎

Lines changed: 65 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,46 @@ MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_CBL", "CBL\CBL.vcxproj", "{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}"
77
EndProject
88
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "applyConvolution", "ApplyConvolution\ApplyConvolution.vcxproj", "{5A7DE24A-2C71-4905-A9A9-9989C289F57C}"
9+
ProjectSection(ProjectDependencies) = postProject
10+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF} = {47DE671E-63C8-4D0B-AF38-4D680D4D54EF}
11+
EndProjectSection
912
EndProject
1013
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "axisQualityMetric", "axisQualityMetric\axisQualityMetric.vcxproj", "{90E97570-F693-4219-AA00-3DACE69B9A11}"
14+
ProjectSection(ProjectDependencies) = postProject
15+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF} = {47DE671E-63C8-4D0B-AF38-4D680D4D54EF}
16+
EndProjectSection
1117
EndProject
1218
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cropMRCFromPDB", "cropMRCFromPDB\cropMRCFromPDB.vcxproj", "{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}"
19+
ProjectSection(ProjectDependencies) = postProject
20+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF} = {47DE671E-63C8-4D0B-AF38-4D680D4D54EF}
21+
EndProjectSection
1322
EndProject
1423
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dataMetric", "dataMetric\dataMetric.vcxproj", "{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}"
24+
ProjectSection(ProjectDependencies) = postProject
25+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF} = {47DE671E-63C8-4D0B-AF38-4D680D4D54EF}
26+
EndProjectSection
1527
EndProject
1628
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mergePDBSet", "mergePDBSet\mergePDBSet.vcxproj", "{03368E16-836A-4FE6-8C00-0E2444A5CE2E}"
29+
ProjectSection(ProjectDependencies) = postProject
30+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF} = {47DE671E-63C8-4D0B-AF38-4D680D4D54EF}
31+
EndProjectSection
1732
EndProject
1833
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "off2mrc", "off2mrc\off2mrc.vcxproj", "{1B8CD312-20E4-4025-9DA5-058B089F22E5}"
19-
EndProject
20-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runCommandOnPair", "runCommandOnPair\runCommandOnPair.vcxproj", "{DD164449-193D-487D-9ABF-61AEDFB8872A}"
34+
ProjectSection(ProjectDependencies) = postProject
35+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF} = {47DE671E-63C8-4D0B-AF38-4D680D4D54EF}
36+
EndProjectSection
2137
EndProject
2238
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runProgOnPair", "runProgOnPair\runProgOnPair.vcxproj", "{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}"
39+
ProjectSection(ProjectDependencies) = postProject
40+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF} = {47DE671E-63C8-4D0B-AF38-4D680D4D54EF}
41+
EndProjectSection
2342
EndProject
2443
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utility", "Utility", "{FA8C4CC7-BA2C-424C-8E4E-37F49A06ADFD}"
2544
EndProject
2645
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iterativeFit", "iterativeFit\iterativeFit.vcxproj", "{0E003406-D08D-47A0-A6D8-37649313C1ED}"
46+
ProjectSection(ProjectDependencies) = postProject
47+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF} = {47DE671E-63C8-4D0B-AF38-4D680D4D54EF}
48+
EndProjectSection
2749
EndProject
2850
Global
2951
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,81 +56,74 @@ Global
3456
EndGlobalSection
3557
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3658
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Debug|x64.ActiveCfg = Debug|Win32
59+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Debug|x64.Build.0 = Debug|Win32
3760
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Debug|x86.ActiveCfg = Debug|Win32
3861
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Debug|x86.Build.0 = Debug|Win32
39-
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Release|x64.ActiveCfg = Release|Win32
40-
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Release|x86.ActiveCfg = Release|Win32
41-
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Release|x86.Build.0 = Release|Win32
42-
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Debug|x64.ActiveCfg = Debug|x64
43-
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Debug|x64.Build.0 = Debug|x64
62+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Release|x64.ActiveCfg = Debug|Win32
63+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Release|x64.Build.0 = Debug|Win32
64+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Release|x86.ActiveCfg = Debug|Win32
65+
{47DE671E-63C8-4D0B-AF38-4D680D4D54EF}.Release|x86.Build.0 = Debug|Win32
66+
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Debug|x64.ActiveCfg = Debug|Win32
4467
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Debug|x86.ActiveCfg = Debug|Win32
4568
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Debug|x86.Build.0 = Debug|Win32
46-
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Release|x64.ActiveCfg = Release|x64
47-
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Release|x64.Build.0 = Release|x64
48-
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Release|x86.ActiveCfg = Release|Win32
49-
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Release|x86.Build.0 = Release|Win32
50-
{90E97570-F693-4219-AA00-3DACE69B9A11}.Debug|x64.ActiveCfg = Debug|x64
51-
{90E97570-F693-4219-AA00-3DACE69B9A11}.Debug|x64.Build.0 = Debug|x64
69+
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Release|x64.ActiveCfg = Debug|Win32
70+
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Release|x86.ActiveCfg = Debug|Win32
71+
{5A7DE24A-2C71-4905-A9A9-9989C289F57C}.Release|x86.Build.0 = Debug|Win32
72+
{90E97570-F693-4219-AA00-3DACE69B9A11}.Debug|x64.ActiveCfg = Debug|Win32
5273
{90E97570-F693-4219-AA00-3DACE69B9A11}.Debug|x86.ActiveCfg = Debug|Win32
5374
{90E97570-F693-4219-AA00-3DACE69B9A11}.Debug|x86.Build.0 = Debug|Win32
54-
{90E97570-F693-4219-AA00-3DACE69B9A11}.Release|x64.ActiveCfg = Release|x64
55-
{90E97570-F693-4219-AA00-3DACE69B9A11}.Release|x64.Build.0 = Release|x64
56-
{90E97570-F693-4219-AA00-3DACE69B9A11}.Release|x86.ActiveCfg = Release|Win32
57-
{90E97570-F693-4219-AA00-3DACE69B9A11}.Release|x86.Build.0 = Release|Win32
58-
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Debug|x64.ActiveCfg = Debug|Win32
75+
{90E97570-F693-4219-AA00-3DACE69B9A11}.Release|x64.ActiveCfg = Debug|Win32
76+
{90E97570-F693-4219-AA00-3DACE69B9A11}.Release|x86.ActiveCfg = Debug|Win32
77+
{90E97570-F693-4219-AA00-3DACE69B9A11}.Release|x86.Build.0 = Debug|Win32
78+
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Debug|x64.ActiveCfg = Release|Win32
79+
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Debug|x64.Build.0 = Release|Win32
5980
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Debug|x86.ActiveCfg = Debug|Win32
6081
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Debug|x86.Build.0 = Debug|Win32
6182
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Release|x64.ActiveCfg = Release|Win32
62-
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Release|x86.ActiveCfg = Release|Win32
63-
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Release|x86.Build.0 = Release|Win32
64-
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Debug|x64.ActiveCfg = Debug|Win32
83+
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Release|x64.Build.0 = Release|Win32
84+
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Release|x86.ActiveCfg = Debug|Win32
85+
{F66FB0AB-958A-4BBE-B59E-A5C058DC720A}.Release|x86.Build.0 = Debug|Win32
86+
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Debug|x64.ActiveCfg = Release|Win32
87+
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Debug|x64.Build.0 = Release|Win32
6588
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Debug|x86.ActiveCfg = Debug|Win32
6689
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Debug|x86.Build.0 = Debug|Win32
6790
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Release|x64.ActiveCfg = Release|Win32
68-
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Release|x86.ActiveCfg = Release|Win32
69-
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Release|x86.Build.0 = Release|Win32
70-
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Debug|x64.ActiveCfg = Debug|Win32
91+
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Release|x64.Build.0 = Release|Win32
92+
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Release|x86.ActiveCfg = Debug|Win32
93+
{702D65A9-04CA-4D4D-ADAE-BC108F7937A9}.Release|x86.Build.0 = Debug|Win32
94+
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Debug|x64.ActiveCfg = Release|Win32
95+
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Debug|x64.Build.0 = Release|Win32
7196
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Debug|x86.ActiveCfg = Debug|Win32
7297
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Debug|x86.Build.0 = Debug|Win32
7398
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Release|x64.ActiveCfg = Release|Win32
74-
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Release|x86.ActiveCfg = Release|Win32
75-
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Release|x86.Build.0 = Release|Win32
76-
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Debug|x64.ActiveCfg = Debug|Win32
99+
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Release|x64.Build.0 = Release|Win32
100+
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Release|x86.ActiveCfg = Debug|Win32
101+
{03368E16-836A-4FE6-8C00-0E2444A5CE2E}.Release|x86.Build.0 = Debug|Win32
102+
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Debug|x64.ActiveCfg = Release|Win32
103+
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Debug|x64.Build.0 = Release|Win32
77104
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Debug|x86.ActiveCfg = Debug|Win32
78105
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Debug|x86.Build.0 = Debug|Win32
79106
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Release|x64.ActiveCfg = Release|Win32
80-
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Release|x86.ActiveCfg = Release|Win32
81-
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Release|x86.Build.0 = Release|Win32
82-
{DD164449-193D-487D-9ABF-61AEDFB8872A}.Debug|x64.ActiveCfg = Debug|x64
83-
{DD164449-193D-487D-9ABF-61AEDFB8872A}.Debug|x64.Build.0 = Debug|x64
84-
{DD164449-193D-487D-9ABF-61AEDFB8872A}.Debug|x86.ActiveCfg = Debug|Win32
85-
{DD164449-193D-487D-9ABF-61AEDFB8872A}.Debug|x86.Build.0 = Debug|Win32
86-
{DD164449-193D-487D-9ABF-61AEDFB8872A}.Release|x64.ActiveCfg = Release|x64
87-
{DD164449-193D-487D-9ABF-61AEDFB8872A}.Release|x64.Build.0 = Release|x64
88-
{DD164449-193D-487D-9ABF-61AEDFB8872A}.Release|x86.ActiveCfg = Release|Win32
89-
{DD164449-193D-487D-9ABF-61AEDFB8872A}.Release|x86.Build.0 = Release|Win32
90-
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Debug|x64.ActiveCfg = Debug|x64
91-
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Debug|x64.Build.0 = Debug|x64
107+
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Release|x64.Build.0 = Release|Win32
108+
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Release|x86.ActiveCfg = Debug|Win32
109+
{1B8CD312-20E4-4025-9DA5-058B089F22E5}.Release|x86.Build.0 = Debug|Win32
110+
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Debug|x64.ActiveCfg = Debug|Win32
92111
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Debug|x86.ActiveCfg = Debug|Win32
93112
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Debug|x86.Build.0 = Debug|Win32
94-
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Release|x64.ActiveCfg = Release|x64
95-
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Release|x64.Build.0 = Release|x64
96-
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Release|x86.ActiveCfg = Release|Win32
97-
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Release|x86.Build.0 = Release|Win32
98-
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Debug|x64.ActiveCfg = Debug|x64
99-
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Debug|x64.Build.0 = Debug|x64
113+
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Release|x64.ActiveCfg = Debug|Win32
114+
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Release|x86.ActiveCfg = Debug|Win32
115+
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC}.Release|x86.Build.0 = Debug|Win32
116+
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Debug|x64.ActiveCfg = Debug|Win32
100117
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Debug|x86.ActiveCfg = Debug|Win32
101118
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Debug|x86.Build.0 = Debug|Win32
102-
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Release|x64.ActiveCfg = Release|x64
103-
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Release|x64.Build.0 = Release|x64
104-
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Release|x86.ActiveCfg = Release|Win32
105-
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Release|x86.Build.0 = Release|Win32
119+
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Release|x64.ActiveCfg = Debug|Win32
120+
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Release|x86.ActiveCfg = Debug|Win32
121+
{0E003406-D08D-47A0-A6D8-37649313C1ED}.Release|x86.Build.0 = Debug|Win32
106122
EndGlobalSection
107123
GlobalSection(SolutionProperties) = preSolution
108124
HideSolutionNode = FALSE
109125
EndGlobalSection
110126
GlobalSection(NestedProjects) = preSolution
111-
{DD164449-193D-487D-9ABF-61AEDFB8872A} = {FA8C4CC7-BA2C-424C-8E4E-37F49A06ADFD}
112127
{62A07481-ACA6-43A3-B8E6-C0EFC21D80EC} = {FA8C4CC7-BA2C-424C-8E4E-37F49A06ADFD}
113128
EndGlobalSection
114129
GlobalSection(ExtensibilityGlobals) = postSolution

‎CBL/CBL.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@
5555
<Optimization>Disabled</Optimization>
5656
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5757
<AdditionalIncludeDirectories>Z:\Splinetwister\Splinetwister\Eigen;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
58+
<LanguageStandard>stdcpp17</LanguageStandard>
59+
<EnableModules>true</EnableModules>
5860
</ClCompile>
5961
<Link>
6062
<SubSystem>Console</SubSystem>
@@ -79,6 +81,8 @@
7981
<BufferSecurityCheck>false</BufferSecurityCheck>
8082
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
8183
<FloatingPointModel>Fast</FloatingPointModel>
84+
<LanguageStandard>stdcpp17</LanguageStandard>
85+
<EnableModules>true</EnableModules>
8286
</ClCompile>
8387
<Link>
8488
<SubSystem>Console</SubSystem>

‎CBL/mrc.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,14 @@ namespace cbl
550550
}
551551
}
552552

553+
std::vector<mrc> kmeans()
554+
{
555+
// Choose a random position out of all voxels
556+
557+
// for (int i = 0; i < ma)
558+
559+
}
560+
553561
std::vector<mrc> cluster(int num_required_voxels = 0)
554562
{
555563
// Create a copy of the map, grouping voxels by setting their densities to successive

‎CBL/off.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <limits>
33
#include <math.h>
44

5-
#include "mrc.h"
65
#include "pdb.h"
6+
#include "mrc.h"
77

88
namespace cbl
99
{

‎axisQualityMetric/axisQualityMetric.vcxproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@
100100
<Optimization>Disabled</Optimization>
101101
<SDLCheck>true</SDLCheck>
102102
<ConformanceMode>true</ConformanceMode>
103+
<AdditionalIncludeDirectories>../CBL;</AdditionalIncludeDirectories>
104+
<LanguageStandard>stdcpp17</LanguageStandard>
105+
<EnableModules>false</EnableModules>
103106
</ClCompile>
104107
</ItemDefinitionGroup>
105108
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -110,6 +113,9 @@
110113
<IntrinsicFunctions>true</IntrinsicFunctions>
111114
<SDLCheck>true</SDLCheck>
112115
<ConformanceMode>true</ConformanceMode>
116+
<AdditionalIncludeDirectories>../CBL;</AdditionalIncludeDirectories>
117+
<LanguageStandard>stdcpp17</LanguageStandard>
118+
<EnableModules>false</EnableModules>
113119
</ClCompile>
114120
<Link>
115121
<EnableCOMDATFolding>true</EnableCOMDATFolding>

‎cropMRCFromPDB/cropMRCFromPDB.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
<Optimization>Disabled</Optimization>
4747
<SDLCheck>true</SDLCheck>
4848
<AdditionalIncludeDirectories>..\CBL\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
49+
<LanguageStandard>stdcpp17</LanguageStandard>
50+
<EnableModules>false</EnableModules>
4951
</ClCompile>
5052
<Link>
5153
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -60,6 +62,8 @@
6062
<SDLCheck>true</SDLCheck>
6163
<AdditionalIncludeDirectories>..\CBL\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6264
<ShowIncludes>false</ShowIncludes>
65+
<LanguageStandard>stdcpp17</LanguageStandard>
66+
<EnableModules>false</EnableModules>
6367
</ClCompile>
6468
<Link>
6569
<GenerateDebugInformation>true</GenerateDebugInformation>

‎dataMetric/dataMetric.vcxproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<IntrinsicFunctions>false</IntrinsicFunctions>
5252
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
5353
<WholeProgramOptimization>false</WholeProgramOptimization>
54+
<EnableModules>false</EnableModules>
5455
</ClCompile>
5556
<Link>
5657
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -66,6 +67,7 @@
6667
<AdditionalIncludeDirectories>..\CBL\;</AdditionalIncludeDirectories>
6768
<LanguageStandard>stdcpp17</LanguageStandard>
6869
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
70+
<EnableModules>false</EnableModules>
6971
</ClCompile>
7072
<Link>
7173
<GenerateDebugInformation>true</GenerateDebugInformation>

‎iterativeFit/iterativeFit.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include <string>
33
#include <functional>
44

5+
#include "mrc.h"
56
#include "off.h"
67
#include "plane.h"
78

‎iterativeFit/iterativeFit.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
<SDLCheck>true</SDLCheck>
8787
<ConformanceMode>true</ConformanceMode>
8888
<AdditionalIncludeDirectories>../CBL/;</AdditionalIncludeDirectories>
89+
<LanguageStandard>stdcpp17</LanguageStandard>
90+
<EnableModules>false</EnableModules>
8991
</ClCompile>
9092
</ItemDefinitionGroup>
9193
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -112,6 +114,8 @@
112114
<SDLCheck>true</SDLCheck>
113115
<ConformanceMode>true</ConformanceMode>
114116
<AdditionalIncludeDirectories>../CBL/;</AdditionalIncludeDirectories>
117+
<LanguageStandard>stdcpp17</LanguageStandard>
118+
<EnableModules>false</EnableModules>
115119
</ClCompile>
116120
<Link>
117121
<EnableCOMDATFolding>true</EnableCOMDATFolding>

0 commit comments

Comments
 (0)