Change to a 64bit build and updates OpenCV to 4.1.0

CUASAS · Jun 12, 2019 · a1a277d · a1a277d
1 parent ed0340e
commit a1a277d
Show file tree

Hide file tree

Showing 228 changed files with 138 additions and 80,963 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+*.pdb filter=lfs diff=lfs merge=lfs -text
+*.dll filter=lfs diff=lfs merge=lfs -text
diff --git a/README.md b/README.md
@@ -0,0 +1,25 @@
+Pixel Gantry Vision
+===================
+
+This is the C++ code that utilizes OpenCV for calculating focus and identifying fiducial marks in pixel module construction. This code is compiled to a dll and then access through the included LabVIEW adapter VIs.
+
+
+Install OpenCV
+==============
+
+OpenCV is a required dependency of the gVision software. It can be installed by following these steps:
+
+  - Download The OpenCV installer from the following url: https://sourceforge.net/projects/opencvlibrary/files/4.1.0/opencv-4.1.0-vc14_vc15.exe/download
+  - Use the installer to unpack OpenCV into pixel-gantry-vision\gVisionSource.
+
+
+Compiling the Code
+==================
+
+Compiling the code requires Visual Studio 2019 (or later) so install that first. Community edition is fine, but the the more full featured releases will work as well. After getting Visual Studio open up the project (`gVision.sln`) and build. If there are errors, check that the project paths are correct.
+
+
+After Compilation
+=================
+
+After sucessfully compiling the code, you should have the file `gVisionSource\x64\Release\gVision.dll`. There is a LabVIEW script called `Update Binaries.vi` which is responsible for copying the necessary dlls over to the `gVisionBin` directory inside the LabVIEW part of the project. Run this VI and run the tests. If the tests work, then the `gVisionLV` library can be copied over to the `pixel-gantry-control` project for use.
diff --git a/depends22_x86/depends.dll b/depends22_x86/depends.dll
diff --git a/gVisionLV/Update Binaries.vi b/gVisionLV/Update Binaries.vi
diff --git a/gVisionLV/gVision/calc_focus.vi b/gVisionLV/gVision/calc_focus.vi
diff --git a/gVisionLV/gVision/find_fiducial.vi b/gVisionLV/gVision/find_fiducial.vi
diff --git a/gVisionLV/gVision/fit_focus_gauss.vi b/gVisionLV/gVision/fit_focus_gauss.vi
diff --git a/gVisionLV/gVision/gVision.lvlib b/gVisionLV/gVision/gVision.lvlib
diff --git a/gVisionLV/gVision/get_safe_path.vi b/gVisionLV/gVision/get_safe_path.vi
diff --git a/gVisionLV/gVisionLV.lvlps b/gVisionLV/gVisionLV.lvlps
@@ -1,5 +1,5 @@
 [ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "438,586,1204,1003"
+ProjectExplorer.ClassicPosition[String] = "97,1219,862,1636"
 
 [AB_Cache_{77228E7A-B344-462E-98A7-B727431AA691}]
 Cache_ProjSymbolChksum[String] = "7dea362b3fac8e00956a4952a3d4f474"

diff --git a/gVisionLV/gVisionLV.lvproj b/gVisionLV/gVisionLV.lvproj
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Project Type="Project" LVVersion="11008008">
+<Project Type="Project" LVVersion="19008000">
 	<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
 	<Item Name="My Computer" Type="My Computer">
 		<Property Name="IOScan.Faults" Type="Str"></Property>
@@ -25,15 +25,27 @@
 		<Item Name="gVisionBin" Type="Folder" URL="../gVisionBin">
 			<Property Name="NI.DISK" Type="Bool">true</Property>
 		</Item>
+		<Item Name="tests" Type="Folder">
+			<Item Name="calc_focus_test.vi" Type="VI" URL="../tests/calc_focus_test.vi"/>
+			<Item Name="find_fiducial_test.vi" Type="VI" URL="../tests/find_fiducial_test.vi"/>
+			<Item Name="safe_move_test.vi" Type="VI" URL="../tests/safe_move_test.vi"/>
+		</Item>
 		<Item Name="Update Binaries.vi" Type="VI" URL="../Update Binaries.vi"/>
 		<Item Name="Dependencies" Type="Dependencies">
 			<Item Name="vi.lib" Type="Folder">
+				<Item Name="Image Type" Type="VI" URL="/&lt;vilib&gt;/vision/Image Controls.llb/Image Type"/>
+				<Item Name="IMAQ Create" Type="VI" URL="/&lt;vilib&gt;/vision/Basics.llb/IMAQ Create"/>
 				<Item Name="IMAQ GetImagePixelPtr" Type="VI" URL="/&lt;vilib&gt;/vision/Basics.llb/IMAQ GetImagePixelPtr"/>
 				<Item Name="IMAQ GetImageSize" Type="VI" URL="/&lt;vilib&gt;/vision/Basics.llb/IMAQ GetImageSize"/>
 				<Item Name="IMAQ Image.ctl" Type="VI" URL="/&lt;vilib&gt;/vision/Image Controls.llb/IMAQ Image.ctl"/>
+				<Item Name="IMAQ ReadFile 2" Type="VI" URL="/&lt;vilib&gt;/vision/Files.llb/IMAQ ReadFile 2"/>
 				<Item Name="NI_AALPro.lvlib" Type="Library" URL="/&lt;vilib&gt;/Analysis/NI_AALPro.lvlib"/>
+				<Item Name="NI_Vision_Development_Module.lvlib" Type="Library" URL="/&lt;vilib&gt;/vision/NI_Vision_Development_Module.lvlib"/>
+			</Item>
+			<Item Name="lvanlys.dll" Type="Document" URL="/&lt;resource&gt;/lvanlys.dll"/>
+			<Item Name="nivision.dll" Type="Document" URL="nivision.dll">
+				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
 			</Item>
-			<Item Name="lvanlys.dll" Type="Document" URL="../../../../../../Program Files (x86)/National Instruments/LabVIEW 2011/resource/lvanlys.dll"/>
 			<Item Name="nivissvc.dll" Type="Document" URL="nivissvc.dll">
 				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
 			</Item>
@@ -55,6 +67,7 @@
 				<Property Name="Bld_localDestDir" Type="Path">../lv_builds/NI_AB_PROJECTNAME/gVision API</Property>
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{CA1BE3A6-65CD-4063-8C7F-A2D953D96EEE}</Property>
+				<Property Name="Bld_version.major" Type="Int">1</Property>
 				<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
 				<Property Name="Destination[0].path" Type="Path">../lv_builds/NI_AB_PROJECTNAME/gVision API</Property>
 				<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>

diff --git a/gVisionLV/tests/calc_focus_test.vi b/gVisionLV/tests/calc_focus_test.vi
diff --git a/gVisionLV/tests/find_fiducial_test.vi b/gVisionLV/tests/find_fiducial_test.vi
diff --git a/gVisionLV/tests/safe_move_test.vi b/gVisionLV/tests/safe_move_test.vi
diff --git a/gVisionSource/.gitignore b/gVisionSource/.gitignore
@@ -229,3 +229,6 @@ _Pvt_Extensions
 
 # FAKE - F# Make
 .fake/
+
+# The opencv Installation
+opencv
diff --git a/gVisionSource/Dependencies/opencv300/LICENSE b/gVisionSource/Dependencies/opencv300/LICENSE
diff --git a/gVisionSource/Dependencies/opencv300/bin/opencv_core300.dll b/gVisionSource/Dependencies/opencv300/bin/opencv_core300.dll
diff --git a/gVisionSource/Dependencies/opencv300/bin/opencv_highgui300.dll b/gVisionSource/Dependencies/opencv300/bin/opencv_highgui300.dll
diff --git a/gVisionSource/Dependencies/opencv300/bin/opencv_imgcodecs300.dll b/gVisionSource/Dependencies/opencv300/bin/opencv_imgcodecs300.dll
diff --git a/gVisionSource/Dependencies/opencv300/bin/opencv_imgproc300.dll b/gVisionSource/Dependencies/opencv300/bin/opencv_imgproc300.dll
diff --git a/gVisionSource/Dependencies/opencv300/bin/opencv_videoio300.dll b/gVisionSource/Dependencies/opencv300/bin/opencv_videoio300.dll
diff --git a/gVisionSource/Dependencies/opencv300/include/opencv/cv.h b/gVisionSource/Dependencies/opencv300/include/opencv/cv.h
diff --git a/gVisionSource/Dependencies/opencv300/include/opencv/cv.hpp b/gVisionSource/Dependencies/opencv300/include/opencv/cv.hpp
diff --git a/gVisionSource/Dependencies/opencv300/include/opencv/cvaux.h b/gVisionSource/Dependencies/opencv300/include/opencv/cvaux.h
diff --git a/gVisionSource/Dependencies/opencv300/include/opencv/cvaux.hpp b/gVisionSource/Dependencies/opencv300/include/opencv/cvaux.hpp
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		*.pdb filter=lfs diff=lfs merge=lfs -text
		*.dll filter=lfs diff=lfs merge=lfs -text
-Original file line number
+Diff line change
@@ Expand Up / @@ -229,3 +229,6 @@ _Pvt_Extensions @@
     # FAKE - F# Make
     .fake/
+    # The opencv Installation
+    opencv