Everything from HALO

elliotwoods · Jun 24, 2018 · 4ce49f9 · 4ce49f9
1 parent 9ef494b
commit 4ce49f9
Show file tree

Hide file tree

Showing 59 changed files with 5,867 additions and 68 deletions.
diff --git a/Application/.vs/config/applicationhost.config b/Application/.vs/config/applicationhost.config
diff --git a/Application/Rulr.sln b/Application/Rulr.sln
@@ -12,6 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Rulr", "Rulr.vcxproj", "{08
 		{C135C231-F751-482D-9E4C-C29473E3DD98} = {C135C231-F751-482D-9E4C-C29473E3DD98}
 		{CBFC3D47-1E57-4291-90B6-C344B836B8DA} = {CBFC3D47-1E57-4291-90B6-C344B836B8DA}
 		{4172965B-8375-4DF7-B213-A242DC92BC90} = {4172965B-8375-4DF7-B213-A242DC92BC90}
+		{85FF8660-9C77-43A1-B8EE-F2B3182A6C52} = {85FF8660-9C77-43A1-B8EE-F2B3182A6C52}
 		{056CE582-26C0-4041-8B4A-EE2B53E77208} = {056CE582-26C0-4041-8B4A-EE2B53E77208}
 		{09FAF69E-1054-477B-8CF6-B5349771197C} = {09FAF69E-1054-477B-8CF6-B5349771197C}
 		{45CE5AA6-9DFD-497A-8CAF-1743A8075F5A} = {45CE5AA6-9DFD-497A-8CAF-1743A8075F5A}
@@ -165,6 +166,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_BrightnessAssignment
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Calibrate", "..\Plugin_Calibrate\Plugin_Calibrate.vcxproj", "{C135C231-F751-482D-9E4C-C29473E3DD98}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C400D413-78E4-4F60-B5E2-7965FCAC0EEC} = {C400D413-78E4-4F60-B5E2-7965FCAC0EEC}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SLS", "SLS", "{B5D96B9A-620B-49D9-8A5D-B30C62FC76E4}"
 EndProject
@@ -180,6 +184,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_LSS", "..\Plugin_LSS
 		{C400D413-78E4-4F60-B5E2-7965FCAC0EEC} = {C400D413-78E4-4F60-B5E2-7965FCAC0EEC}
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Experiments", "Experiments", "{B93C7CAE-7E6C-4B10-80F2-FB823EAF130D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Experiments", "..\Plugin_Experiments\Plugin_Experiments.vcxproj", "{85FF8660-9C77-43A1-B8EE-F2B3182A6C52}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C400D413-78E4-4F60-B5E2-7965FCAC0EEC} = {C400D413-78E4-4F60-B5E2-7965FCAC0EEC}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -231,9 +242,7 @@ Global
 		{3E918808-ADEE-4B04-9042-25F795280BAD}.Release|x64.ActiveCfg = Release|x64
 		{3E918808-ADEE-4B04-9042-25F795280BAD}.Release|x64.Build.0 = Release|x64
 		{CBFC3D47-1E57-4291-90B6-C344B836B8DA}.Debug|x64.ActiveCfg = Release|x64
-		{CBFC3D47-1E57-4291-90B6-C344B836B8DA}.Debug|x64.Build.0 = Release|x64
 		{CBFC3D47-1E57-4291-90B6-C344B836B8DA}.Release|x64.ActiveCfg = Release|x64
-		{CBFC3D47-1E57-4291-90B6-C344B836B8DA}.Release|x64.Build.0 = Release|x64
 		{5B11C632-4E4E-4F86-914D-61F2F1FA6C0B}.Debug|x64.ActiveCfg = Release|x64
 		{5B11C632-4E4E-4F86-914D-61F2F1FA6C0B}.Debug|x64.Build.0 = Release|x64
 		{5B11C632-4E4E-4F86-914D-61F2F1FA6C0B}.Release|x64.ActiveCfg = Release|x64
@@ -247,31 +256,23 @@ Global
 		{4D3BCFDD-E65D-4247-B303-E0839CAEC6A6}.Release|x64.ActiveCfg = Release|x64
 		{4D3BCFDD-E65D-4247-B303-E0839CAEC6A6}.Release|x64.Build.0 = Release|x64
 		{5688EFFC-E727-4032-9CC3-2697085BEC57}.Debug|x64.ActiveCfg = Release|x64
-		{5688EFFC-E727-4032-9CC3-2697085BEC57}.Debug|x64.Build.0 = Release|x64
 		{5688EFFC-E727-4032-9CC3-2697085BEC57}.Release|x64.ActiveCfg = Release|x64
-		{5688EFFC-E727-4032-9CC3-2697085BEC57}.Release|x64.Build.0 = Release|x64
 		{C087079E-2A0E-4B85-A479-C28E2D01A048}.Debug|x64.ActiveCfg = Release|x64
 		{C087079E-2A0E-4B85-A479-C28E2D01A048}.Debug|x64.Build.0 = Release|x64
 		{C087079E-2A0E-4B85-A479-C28E2D01A048}.Release|x64.ActiveCfg = Release|x64
 		{C087079E-2A0E-4B85-A479-C28E2D01A048}.Release|x64.Build.0 = Release|x64
 		{4172965B-8375-4DF7-B213-A242DC92BC90}.Debug|x64.ActiveCfg = Release|x64
-		{4172965B-8375-4DF7-B213-A242DC92BC90}.Debug|x64.Build.0 = Release|x64
 		{4172965B-8375-4DF7-B213-A242DC92BC90}.Release|x64.ActiveCfg = Release|x64
-		{4172965B-8375-4DF7-B213-A242DC92BC90}.Release|x64.Build.0 = Release|x64
 		{DFE9EE67-8247-43D6-A957-813EFAD6111E}.Debug|x64.ActiveCfg = Release|x64
 		{DFE9EE67-8247-43D6-A957-813EFAD6111E}.Release|x64.ActiveCfg = Release|x64
 		{09FAF69E-1054-477B-8CF6-B5349771197C}.Debug|x64.ActiveCfg = Release|x64
-		{09FAF69E-1054-477B-8CF6-B5349771197C}.Debug|x64.Build.0 = Release|x64
 		{09FAF69E-1054-477B-8CF6-B5349771197C}.Release|x64.ActiveCfg = Release|x64
-		{09FAF69E-1054-477B-8CF6-B5349771197C}.Release|x64.Build.0 = Release|x64
 		{C400D413-78E4-4F60-B5E2-7965FCAC0EEC}.Debug|x64.ActiveCfg = Release|x64
 		{C400D413-78E4-4F60-B5E2-7965FCAC0EEC}.Debug|x64.Build.0 = Release|x64
 		{C400D413-78E4-4F60-B5E2-7965FCAC0EEC}.Release|x64.ActiveCfg = Release|x64
 		{C400D413-78E4-4F60-B5E2-7965FCAC0EEC}.Release|x64.Build.0 = Release|x64
 		{F8877612-5358-423D-980F-28A6DBDF252E}.Debug|x64.ActiveCfg = Release|x64
-		{F8877612-5358-423D-980F-28A6DBDF252E}.Debug|x64.Build.0 = Release|x64
 		{F8877612-5358-423D-980F-28A6DBDF252E}.Release|x64.ActiveCfg = Release|x64
-		{F8877612-5358-423D-980F-28A6DBDF252E}.Release|x64.Build.0 = Release|x64
 		{1977CCBA-FAB0-4037-8E67-018DE0022E7C}.Debug|x64.ActiveCfg = Release|x64
 		{1977CCBA-FAB0-4037-8E67-018DE0022E7C}.Debug|x64.Build.0 = Release|x64
 		{1977CCBA-FAB0-4037-8E67-018DE0022E7C}.Release|x64.ActiveCfg = Release|x64
@@ -301,9 +302,7 @@ Global
 		{3985EE69-9945-40C4-839B-C21A17D5F151}.Release|x64.ActiveCfg = Release|x64
 		{3985EE69-9945-40C4-839B-C21A17D5F151}.Release|x64.Build.0 = Release|x64
 		{E91D390E-75A3-4435-8CE9-B14271A8866A}.Debug|x64.ActiveCfg = Release|x64
-		{E91D390E-75A3-4435-8CE9-B14271A8866A}.Debug|x64.Build.0 = Release|x64
 		{E91D390E-75A3-4435-8CE9-B14271A8866A}.Release|x64.ActiveCfg = Release|x64
-		{E91D390E-75A3-4435-8CE9-B14271A8866A}.Release|x64.Build.0 = Release|x64
 		{B6EF2661-4D10-4DAE-B4CF-BD0A92EA864C}.Debug|x64.ActiveCfg = Release|x64
 		{B6EF2661-4D10-4DAE-B4CF-BD0A92EA864C}.Debug|x64.Build.0 = Release|x64
 		{B6EF2661-4D10-4DAE-B4CF-BD0A92EA864C}.Release|x64.ActiveCfg = Release|x64
@@ -313,9 +312,7 @@ Global
 		{82E035B1-8706-4571-9774-53990D679319}.Release|x64.ActiveCfg = Release|x64
 		{82E035B1-8706-4571-9774-53990D679319}.Release|x64.Build.0 = Release|x64
 		{CAD38B0E-6390-4999-B51F-E4C130D21A30}.Debug|x64.ActiveCfg = Release|x64
-		{CAD38B0E-6390-4999-B51F-E4C130D21A30}.Debug|x64.Build.0 = Release|x64
 		{CAD38B0E-6390-4999-B51F-E4C130D21A30}.Release|x64.ActiveCfg = Release|x64
-		{CAD38B0E-6390-4999-B51F-E4C130D21A30}.Release|x64.Build.0 = Release|x64
 		{45CE5AA6-9DFD-497A-8CAF-1743A8075F5A}.Debug|x64.ActiveCfg = Release|x64
 		{45CE5AA6-9DFD-497A-8CAF-1743A8075F5A}.Debug|x64.Build.0 = Release|x64
 		{45CE5AA6-9DFD-497A-8CAF-1743A8075F5A}.Release|x64.ActiveCfg = Release|x64
@@ -327,29 +324,25 @@ Global
 		{9BF86707-A2E9-4727-B3E1-7D0A3B4CE3E3}.Debug|x64.ActiveCfg = Release|x64
 		{9BF86707-A2E9-4727-B3E1-7D0A3B4CE3E3}.Release|x64.ActiveCfg = Release|x64
 		{056CE582-26C0-4041-8B4A-EE2B53E77208}.Debug|x64.ActiveCfg = Release|x64
-		{056CE582-26C0-4041-8B4A-EE2B53E77208}.Debug|x64.Build.0 = Release|x64
 		{056CE582-26C0-4041-8B4A-EE2B53E77208}.Release|x64.ActiveCfg = Release|x64
-		{056CE582-26C0-4041-8B4A-EE2B53E77208}.Release|x64.Build.0 = Release|x64
 		{5C557280-E9E7-4789-83F6-7185A89772BD}.Debug|x64.ActiveCfg = Release|x64
 		{5C557280-E9E7-4789-83F6-7185A89772BD}.Debug|x64.Build.0 = Release|x64
 		{5C557280-E9E7-4789-83F6-7185A89772BD}.Release|x64.ActiveCfg = Release|x64
 		{5C557280-E9E7-4789-83F6-7185A89772BD}.Release|x64.Build.0 = Release|x64
-		{5C78C8F2-6D2D-4B46-9D92-E29015F0E66A}.Debug|x64.ActiveCfg = Debug|x64
-		{5C78C8F2-6D2D-4B46-9D92-E29015F0E66A}.Debug|x64.Build.0 = Debug|x64
+		{5C78C8F2-6D2D-4B46-9D92-E29015F0E66A}.Debug|x64.ActiveCfg = Release|x64
 		{5C78C8F2-6D2D-4B46-9D92-E29015F0E66A}.Release|x64.ActiveCfg = Release|x64
-		{5C78C8F2-6D2D-4B46-9D92-E29015F0E66A}.Release|x64.Build.0 = Release|x64
-		{C135C231-F751-482D-9E4C-C29473E3DD98}.Debug|x64.ActiveCfg = Debug|x64
-		{C135C231-F751-482D-9E4C-C29473E3DD98}.Debug|x64.Build.0 = Debug|x64
+		{C135C231-F751-482D-9E4C-C29473E3DD98}.Debug|x64.ActiveCfg = Release|x64
+		{C135C231-F751-482D-9E4C-C29473E3DD98}.Debug|x64.Build.0 = Release|x64
 		{C135C231-F751-482D-9E4C-C29473E3DD98}.Release|x64.ActiveCfg = Release|x64
 		{C135C231-F751-482D-9E4C-C29473E3DD98}.Release|x64.Build.0 = Release|x64
-		{651FDD8B-6C0C-4A82-89ED-182CFF129D03}.Debug|x64.ActiveCfg = Debug|x64
-		{651FDD8B-6C0C-4A82-89ED-182CFF129D03}.Debug|x64.Build.0 = Debug|x64
+		{651FDD8B-6C0C-4A82-89ED-182CFF129D03}.Debug|x64.ActiveCfg = Release|x64
 		{651FDD8B-6C0C-4A82-89ED-182CFF129D03}.Release|x64.ActiveCfg = Release|x64
-		{651FDD8B-6C0C-4A82-89ED-182CFF129D03}.Release|x64.Build.0 = Release|x64
-		{E26FB7D4-3D82-413D-88F7-8A1B6EE91A01}.Debug|x64.ActiveCfg = Debug|x64
-		{E26FB7D4-3D82-413D-88F7-8A1B6EE91A01}.Debug|x64.Build.0 = Debug|x64
+		{E26FB7D4-3D82-413D-88F7-8A1B6EE91A01}.Debug|x64.ActiveCfg = Release|x64
 		{E26FB7D4-3D82-413D-88F7-8A1B6EE91A01}.Release|x64.ActiveCfg = Release|x64
-		{E26FB7D4-3D82-413D-88F7-8A1B6EE91A01}.Release|x64.Build.0 = Release|x64
+		{85FF8660-9C77-43A1-B8EE-F2B3182A6C52}.Debug|x64.ActiveCfg = Release|x64
+		{85FF8660-9C77-43A1-B8EE-F2B3182A6C52}.Debug|x64.Build.0 = Release|x64
+		{85FF8660-9C77-43A1-B8EE-F2B3182A6C52}.Release|x64.ActiveCfg = Release|x64
+		{85FF8660-9C77-43A1-B8EE-F2B3182A6C52}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -414,5 +407,7 @@ Global
 		{651FDD8B-6C0C-4A82-89ED-182CFF129D03} = {B5D96B9A-620B-49D9-8A5D-B30C62FC76E4}
 		{61A0166A-57BD-43D7-BF73-A42CB13A9F1C} = {148566DA-E924-4085-B479-ACA0D1601C9A}
 		{E26FB7D4-3D82-413D-88F7-8A1B6EE91A01} = {61A0166A-57BD-43D7-BF73-A42CB13A9F1C}
+		{B93C7CAE-7E6C-4B10-80F2-FB823EAF130D} = {148566DA-E924-4085-B479-ACA0D1601C9A}
+		{85FF8660-9C77-43A1-B8EE-F2B3182A6C52} = {B93C7CAE-7E6C-4B10-80F2-FB823EAF130D}
 	EndGlobalSection
 EndGlobal
diff --git a/Core/src/ofxRulr.h b/Core/src/ofxRulr.h
@@ -4,7 +4,6 @@
 #include "ofxRulr/Version.h"
 
 #include "ofxRulr/Nodes/Base.h"
-#include "ofxRulr/Nodes/Procedure/Base.h"
 
 #include "ofxRulr/Graph/World.h"
 #include "ofxRulr/Graph/FactoryRegister.h"

diff --git a/Core/src/ofxRulr/Utils/CaptureSet.cpp b/Core/src/ofxRulr/Utils/CaptureSet.cpp
@@ -218,8 +218,14 @@ namespace ofxRulr {
 
 		//----------
 		void AbstractCaptureSet::add(shared_ptr<BaseCapture> capture) {
+			if (find(this->captures.begin(), this->captures.end(), capture) != this->captures.end()) {
+				return;
+			}
+
 			auto captureWeak = weak_ptr<BaseCapture>(capture);
 			capture->onDeletePressed += [captureWeak, this]() {
+				this->listView->clear();
+				this->viewDirty = true;
 				auto capture = captureWeak.lock();
 				if (capture) {
 					this->remove(capture);
@@ -266,9 +272,11 @@ namespace ofxRulr {
 
 		//----------
 		void AbstractCaptureSet::clear() {
+			this->listView->clear();
 			while (!this->captures.empty()) {
 				this->remove(* this->captures.begin());
 			}
+			this->viewDirty = true;
 		}
 
 		//----------
@@ -393,5 +401,10 @@ namespace ofxRulr {
 		vector<shared_ptr<ofxRulr::Utils::AbstractCaptureSet::BaseCapture>> AbstractCaptureSet::getAllCapturesUntyped() const {
 			return this->captures;
 		}
+
+		//----------
+		size_t AbstractCaptureSet::size() const {
+			return this->captures.size();
+		}
 	}
 }
diff --git a/Core/src/ofxRulr/Utils/CaptureSet.h b/Core/src/ofxRulr/Utils/CaptureSet.h
@@ -27,12 +27,12 @@ namespace ofxRulr {
 				ofxLiquidEvent<void> onDeletePressed;
 				ofxLiquidEvent<bool> onSelectionChanged;
 				ofParameter<chrono::system_clock::time_point> timestamp{ "Timestamp", chrono::system_clock::now() };
+				void rebuildDateStrings();
 			protected:
 				ofParameter<bool> selected{ "Selected", true };
 				virtual ofxCvGui::ElementPtr getDataDisplay();
 				void callbackSelectedChanged(bool &);
 
-				void rebuildDateStrings();
 				string timeString;
 				string secondString;
 				string dateString;
@@ -60,6 +60,8 @@ namespace ofxRulr {
 
 			ofxLiquidEvent<void> onChange;
 			ofxLiquidEvent<void> onSelectionChanged;
+
+			size_t size() const;
 		protected:
 			virtual bool getIsMultipleSelectionAllowed() = 0;
 			vector<shared_ptr<BaseCapture>> captures;

diff --git a/Nodes/src/ofxRulr/Nodes/Item/View.cpp b/Nodes/src/ofxRulr/Nodes/Item/View.cpp
@@ -378,8 +378,8 @@ namespace ofxRulr {
 					//adapted from https://github.com/Itseez/opencv/blob/master/samples/cpp/calibration.cpp#L170
 					cv::FileStorage fs(result.filePath, cv::FileStorage::WRITE);
 
-					fs << "image_width" << this->getWidth();
-					fs << "image_height" << this->getHeight();
+					fs << "image_width" << (int) this->getWidth();
+					fs << "image_height" << (int) this->getHeight();
 
 					fs << "camera_matrix" << this->getCameraMatrix();
 					fs << "distortion_coefficients" << this->getDistortionCoefficients();

diff --git a/Nodes/src/ofxRulr/Nodes/System/VideoOutput.cpp b/Nodes/src/ofxRulr/Nodes/System/VideoOutput.cpp
@@ -26,7 +26,18 @@ namespace ofxRulr {
 			VideoOutput::Output::Output(int index, GLFWmonitor * monitor) {
 				this->index = index;
 				this->monitor = monitor;
-				glfwGetMonitorPhysicalSize(monitor, &this->width, &this->height);
+
+				{
+					auto videoMode = glfwGetVideoMode(monitor);
+					if (videoMode != NULL) {
+						this->width = videoMode->width;
+						this->height = videoMode->height;
+					}
+					else {
+						this->width = 0;
+						this->height = 0;
+					}
+				}
 				this->name = glfwGetMonitorName(monitor);
 			}
 
@@ -532,8 +543,14 @@ namespace ofxRulr {
 							}
 
 							ofSetColor(255);
-							const auto textBounds = font.getStringBoundingBox(videoOutput.name, 0, 0);
-							font.drawString(videoOutput.name, (int)((selectButton->getWidth() - textBounds.width) / 2.0f), (int)((selectButton->getHeight() + textBounds.height) / 2.0f));
+							{
+								stringstream text;
+								text << videoOutput.name << endl;
+								text << videoOutput.width << "x" << videoOutput.height;
+								const auto textBounds = font.getStringBoundingBox(text.str(), 0, 0);
+								font.drawString(text.str(), (int)((selectButton->getWidth() - textBounds.width) / 2.0f), (int)((selectButton->getHeight() + textBounds.height) / 2.0f));
+							}
+
 						}
 						ofPopStyle();
 					};

diff --git a/Nodes/src/ofxRulr/Nodes/Test/ARCube.cpp b/Nodes/src/ofxRulr/Nodes/Test/ARCube.cpp
@@ -155,8 +155,8 @@ namespace ofxRulr {
 					}
 					RULR_CATCH_ALL_TO_ERROR
 
-						//update the fbo
-						this->fbo.begin();
+					//update the fbo
+					this->fbo.begin();
 					{
 						//draw the undistorted image
 						this->undistorted.draw(0, 0);

diff --git a/PlatformExamples/VVVV/SplitSymbolNames/main.v4p b/PlatformExamples/VVVV/SplitSymbolNames/main.v4p
diff --git a/Plugin_ArUco/Plugin_ArUco.vcxproj b/Plugin_ArUco/Plugin_ArUco.vcxproj
@@ -89,6 +89,7 @@
     <ClCompile Include="src\plugin.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="src\Constants_Plugin_ArUco.h" />
     <ClInclude Include="src\ofxRulr\Nodes\ArUco\ChArUcoBoard.h" />
     <ClInclude Include="src\ofxRulr\Nodes\ArUco\Detector.h" />
     <ClInclude Include="src\ofxRulr\Nodes\ArUco\Dictionary.h" />

diff --git a/Plugin_ArUco/Plugin_ArUco.vcxproj.filters b/Plugin_ArUco/Plugin_ArUco.vcxproj.filters
@@ -74,5 +74,8 @@
     <ClInclude Include="src\ofxRulr\Nodes\ArUco\AlignMarkerMap.h">
       <Filter>src\ofxRulr\Nodes\ArUco</Filter>
     </ClInclude>
+    <ClInclude Include="src\Constants_Plugin_ArUco.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Plugin_ArUco/src/Constants_Plugin_ArUco.h b/Plugin_ArUco/src/Constants_Plugin_ArUco.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#ifdef BUILD_Plugin_ArUco
+#define PLUGIN_ARUCO_EXPORTS __declspec(dllexport)
+#else
+#define PLUGIN_ARUCO_EXPORTS
+#endif
diff --git a/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/AlignMarkerMap.h b/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/AlignMarkerMap.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Constants_Plugin_ArUco.h"
 #include "ofxRulr/Nodes/Base.h"
 #include "ofxRulr/Utils/CaptureSet.h"
 #include "ofxNonLinearFit.h"
@@ -10,7 +11,7 @@
 namespace ofxRulr {
 	namespace Nodes {
 		namespace ArUco {
-			class AlignMarkerMap : public Nodes::Base {
+			class PLUGIN_ARUCO_EXPORTS AlignMarkerMap : public Nodes::Base {
 			public:
 				enum class Plane : int {
 					X, Y, Z

diff --git a/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/ChArUcoBoard.cpp b/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/ChArUcoBoard.cpp
@@ -146,6 +146,8 @@ namespace ofxRulr {
 					detectorParams->adaptiveThreshWinSizeMin = 3;
 					detectorParams->adaptiveThreshWinSizeMax = 33;
 					detectorParams->adaptiveThreshWinSizeStep = 5;
+					detectorParams->errorCorrectionRate = this->parameters.detection.errorCorrectionRate;
+
 					if (image.cols > 5000) {
 						detectorParams->minMarkerPerimeterRate = 0.003;
 					}

diff --git a/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/ChArUcoBoard.h b/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/ChArUcoBoard.h
@@ -1,13 +1,14 @@
 #pragma once
 
+#include "Constants_Plugin_ArUco.h"
 #include "ofxRulr/Nodes/Item/AbstractBoard.h"
 #include <opencv2/aruco/dictionary.hpp>
 #include <opencv2/aruco/charuco.hpp>
 
 namespace ofxRulr {
 	namespace Nodes {
 		namespace ArUco {
-			class ChArUcoBoard : public Nodes::Item::AbstractBoard {
+			class PLUGIN_ARUCO_EXPORTS ChArUcoBoard : public Nodes::Item::AbstractBoard {
 			public:
 				struct PaperSize {
 					string name;
@@ -34,21 +35,22 @@ namespace ofxRulr {
 
 				struct : ofParameterGroup {
 					struct : ofParameterGroup {
-						ofParameter<int> width{ "Width", 12 };
+						ofParameter<int> width{ "Width", 11 };
 						ofParameter<int> height{ "Height", 8 };
 						PARAM_DECLARE("Size [squares]", width, height);
 					} size;
 
 					struct : ofParameterGroup {
-						ofParameter<float> square{ "Square", 0.034875, 0.001, 0.10 }; // noah's board
+						ofParameter<float> square{ "Square", 0.025, 0.001, 0.10 };
 						ofParameter<float> marker{ "Marker", 0.0175, 0.001, 0.1 };
 						PARAM_DECLARE("Length [m]", square, marker);
 					} length;
 
 
 					struct : ofParameterGroup {
 						ofParameter<bool> refineStrategy{ "Refine strategy", true };
-						PARAM_DECLARE("Detection", refineStrategy);
+						ofParameter<float> errorCorrectionRate{ "Error correction rate", 0.6 };
+						PARAM_DECLARE("Detection", refineStrategy, errorCorrectionRate);
 					} detection;
 
 					struct : ofParameterGroup {

diff --git a/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/Detector.h b/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/Detector.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Constants_Plugin_ArUco.h"
 #include "ofxRulr/Nodes/Base.h"
 #include "ofxRulr/Nodes/Item/Camera.h"
 #include <aruco/aruco.h>
@@ -9,7 +10,7 @@
 namespace ofxRulr {
 	namespace Nodes {
 		namespace ArUco {
-			class Detector : public Nodes::Base {
+			class PLUGIN_ARUCO_EXPORTS Detector : public Nodes::Base {
 			public:
 				Detector();
 				string getTypeName() const override;

diff --git a/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/Dictionary.h b/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/Dictionary.h
@@ -1,12 +1,13 @@
 #pragma once
 
+#include "Constants_Plugin_ArUco.h"
 #include "ofxRulr/Nodes/Base.h"
 #include <opencv2/aruco.hpp>
 
 namespace ofxRulr {
 	namespace Nodes {
 		namespace ArUco {
-			class Dictionary : public Nodes::Base {
+			class PLUGIN_ARUCO_EXPORTS Dictionary : public Nodes::Base {
 			public:
 				Dictionary();
 				string getTypeName() const override;