Pi trac team dev branch - mostly work for Visual Studio compile environment. (#27)

* Improvements for running PiTrac in Visual Studio

* Fixes to compile better in Visual Studio

Author: jamespilgrim

Software/LMSourceCode/ImageProcessing/ImageProcessing.vcxproj

@@ -130,17 +130,17 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>BOOST_BIND_GLOBAL_PLACEHOLDERS;BOOST_ALL_DYN_LINK;BOOST_USE_WINAPI_VERSION=0x0A00;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>E:\Dev_Libs\opencv\build\include;E:\Dev_Libs\boost_1_81_0\;E:\Dev_Libs\NumCpp-master\include;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>E:\Dev_Libs\opencv\build\include;E:\Dev_Libs\boost_1_87_0\</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>E:\Dev_Libs\opencv\build\x64\vc16\lib;E:\Dev_Libs\boost_1_81_0\stage\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>E:\Dev_Libs\opencv\build\x64\vc16\lib\*d.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>E:\Dev_Libs\opencv\build\x64\vc16\lib;E:\Dev_Libs\boost_1_87_0\lib64-msvc-14.3</AdditionalLibraryDirectories>
+      <AdditionalDependencies>E:\Dev_Libs\opencv\build\x64\vc16\lib\opencv_world4100d.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -524,4 +524,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Software/LMSourceCode/ImageProcessing/ball_image_proc.cpp

@@ -2704,19 +2704,24 @@ namespace golf_sim {
             return rotationResult;
         }
 
+        bool write_spin_analysis_CSV_files = false;
 
-        // This data export can be used for, say, Excel analysis - CSV format
-        std::string csv_fname_coarse = "spin_analysis_coarse.csv";
-        ofstream csv_file_coarse(csv_fname_coarse);
-        GS_LOG_TRACE_MSG(trace, "Writing CSV spin data to: " + csv_fname_coarse);
-        for (auto& element : comparison_csv_data)
-        {
-            // Don't use logging utility so that we don't have all the timing crap in the output
-            csv_file_coarse << element;
+        GolfSimConfiguration::SetConstant("gs_config.spin_analysis.kWriteSpinAnalysisCsvFiles", write_spin_analysis_CSV_files);
+        
+        if (write_spin_analysis_CSV_files) {
+            // This data export can be used for, say, Excel analysis - CSV format
+            std::string csv_fname_coarse = "spin_analysis_coarse.csv";
+            ofstream csv_file_coarse(csv_fname_coarse);
+            GS_LOG_TRACE_MSG(trace, "Writing CSV spin data to: " + csv_fname_coarse);
+            for (auto& element : comparison_csv_data)
+            {
+                // Don't use logging utility so that we don't have all the timing crap in the output
+                csv_file_coarse << element;
+            }
+            csv_file_coarse.close();
         }
-        csv_file_coarse.close();
 
-        // See which angle looked best and then iterate more closely near thos angles
+        // See which angle looked best and then iterate more closely near those angles
         RotationCandidate c = candidates[maxIndex];
 
         std::string s = "Best Coarse Initial Rotation Candidate was #" + std::to_string(maxIndex) + " - Rot: (" + std::to_string(c.x_rotation_degrees) + ", " + std::to_string(c.y_rotation_degrees) + ", " + std::to_string(c.z_rotation_degrees) + ") ";
@@ -2752,15 +2757,18 @@ namespace golf_sim {
         // TBD - change CompareCandidateAngleImages to work directly with the "3D" images
         maxIndex = CompareCandidateAngleImages(&ball_image2DimpleEdges, &finalOutputCandidateElementsMat, &finalOutputCandidateElementsMatSize, &finalCandidates, comparison_csv_data);
 
-        std::string csv_fname_fine = "spin_analysis_fine.csv";
-        ofstream csv_file_fine(csv_fname_fine);
-        GS_LOG_TRACE_MSG(trace, "Writing CSV spin data to: " + csv_fname_fine);
-        for (auto& element : comparison_csv_data)
-        {
-            // Don't use logging utility so that we don't have all the timing crap in the output
-            csv_file_fine << element;
+        if (write_spin_analysis_CSV_files) {
+
+            std::string csv_fname_fine = "spin_analysis_fine.csv";
+            ofstream csv_file_fine(csv_fname_fine);
+            GS_LOG_TRACE_MSG(trace, "Writing CSV spin data to: " + csv_fname_fine);
+            for (auto& element : comparison_csv_data)
+            {
+                // Don't use logging utility so that we don't have all the timing crap in the output
+                csv_file_fine << element;
+            }
+            csv_file_fine.close();
         }
-        csv_file_fine.close();
 
         // Analyze the results
         int bestRotX = 0;

Software/LMSourceCode/ImageProcessing/golf_sim_config.json

@@ -7,7 +7,7 @@
 			"kLogWebserverImagesToFile": 1,
 			"kLogDiagnosticImagesToUniqueFiles": 0,
 			"kLinuxBaseImageLoggingDir": "/home/PiTracUserName/LM_Shares/Images/",
-			"kPCBaseImageLoggingDir": "D:\\GolfSim\\LM\\Images\\"
+			"kPCBaseImageLoggingDir": "L:/Images/"
 		},
 
 		"modes": {
@@ -68,6 +68,7 @@
 			"kPlacedBallHoughDpParam1": 1.5,
 			"kPlacedBallUseLargestBall": 0,
 
+			"Circle Refinement is not currently working - keep to 0": 0,
 			"kUseBestCircleRefinement": 0,
 			"kUseBestCircleLargestCircle": 0,
 
@@ -145,6 +146,7 @@
 
 		"spin_analysis": {
 
+			"kWriteSpinAnalysisCsvFiles": 0,
 			"kGaborMaxWhitePercent": 45,
 			"kGaborMinWhitePercent": 39,
 			"kCoarseXRotationDegreesIncrement": 3,
@@ -272,7 +274,7 @@
 		},
 
 		"testing": {
-			"kTwoImageTestTeedBallImage": "gs_log_img__log_ball_final_found_ball_img.png",
+			"kTwoImageTestTeedBallImage": "log_ball_final_found_ball_img.png",
 			"kTwoImageTestStrobedImage": "log_cam2_last_strobed_img.png",
 
 			"kExternallyStrobedEnvNumber_bits_for_fast_on_pulse_": 5,

Software/LMSourceCode/ImageProcessing/logging_tools.cpp

@@ -21,7 +21,7 @@ namespace golf_sim {
 
 
     // Create a custom sink to save the last <n> log messages
-
+    /*** TBD - Not Completed yet
     class RecentMessageSink : public basic_formatted_sink_backend<
         char,
         combine_requirements< synchronized_feeding, flushing >::type
@@ -57,7 +57,7 @@ namespace golf_sim {
 
         BOOST_LOG_API void flush() {};
     };
-
+    ***/
 
 
 
@@ -68,6 +68,7 @@ namespace golf_sim {
     bool LoggingTools::logging_tool_wait_for_keypress_ = false;
 
     boost::circular_buffer<std::string> LoggingTools::RecentLogMessages(20);
+
 #ifdef __unix__
     std::string LoggingTools::kBaseImageLoggingDir = "/mnt/VerdantShare/dev/GolfSim/LM/Images/";
 #else
@@ -158,6 +159,7 @@ namespace golf_sim {
         fsSink->locked_backend()->auto_flush(true);
 
         // Add our custom recent-messages sink to the logger.
+        /*** TBD - Not Completed yet
         boost::shared_ptr <RecentMessageSink> RMSink = boost::make_shared<RecentMessageSink>();
 
         // Wrap it into the frontend and register in the core.
@@ -168,6 +170,8 @@ namespace golf_sim {
         // boost::log::sources::logger logger;
         boost::log::core::get()->add_sink(sink);
         sink->set_formatter(logFmt);
+        ***/
+
     }
 
     boost::circular_buffer<std::string> &LoggingTools::GetRecentLogMessagesQueue() {