Skip to content

Commit

Permalink
Removes depreciated database integration. Addresses #84 and #85
Browse files Browse the repository at this point in the history
  • Loading branch information
cfangmeier committed Jun 20, 2024
1 parent ad20d05 commit 257d0ec
Show file tree
Hide file tree
Showing 297 changed files with 1,045 additions and 1,931 deletions.
11 changes: 9 additions & 2 deletions Example Project/Config/dialog-test.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; Execute with: DIALOG Config\dialog-test.ini
[window]
width=220
height=220
width=300
height=450
title=Test Dialog

[float_input_1]
Expand Down Expand Up @@ -32,3 +32,10 @@ y=10
default=true
variable=$bool2

[picture_1]
label=Cat
path=C:\Users\cfang\Desktop\2569566.jpg
x=50
y=170
width=200
height=200
4 changes: 2 additions & 2 deletions Example Project/Config/flex_config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ geometry.tool_holder_offset: {-0.677,-101.445,-43.72}
#====== Vision/Pattern Recognition parameters
#================================================

reference_image.default: Data\reference_images\rectangle_test.png
reference_image.hdi_fid: Data\reference_images\HDI_fid.png
reference_image.default: Data\reference_images\friday_afternoon_developer.jpg
reference_image.coffee_maker: Data\reference_images\coffee_maker.jpg

vision.debug_enable: False
vision.findfid_result: Logs\
Expand Down
26 changes: 13 additions & 13 deletions Gantry/Application Utilities/Console Log/Console Log.lvclass

Large diffs are not rendered by default.

Binary file modified Gantry/Application Utilities/Decode scancodes into ascii.vi
Binary file not shown.
29 changes: 6 additions & 23 deletions Gantry/External/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ set(CMAKE_CXX_STANDARD 17)

# To get these libs, download the OpenCV 4.5.5 installer for windows and unpack it to C:
set(OPENCV_INC "C:/opencv/build/include")
set(OPENCV_LIBDIR "C:/opencv/build/x64/vc14/lib")
set(OPENCV_LIB "opencv_world455")
set(OPENCV_LIBDIR "C:/opencv/build/x64/vc16/lib")
set(OPENCV_LIB "opencv_world490")

set(LV_INC "C:/Program Files/National Instruments/LabVIEW 2022/cintools")
set(LV_LIBDIR "C:/Program Files/National Instruments/LabVIEW 2022/cintools/")
set(LV_LIB "labview")
set(LV_INC "C:/Program Files/National Instruments/LabVIEW 2024/cintools/")
set(LV_LIBDIR "C:/Program Files/National Instruments/LabVIEW 2024/cintools/")
set(LV_LIB "labviewv")

set(WMF_LIB
dxva2.lib
Expand All @@ -39,26 +39,9 @@ set(WMF_LIB
# odbccp32.lib
)

set(MYSQL_INC "C:/Program Files/MySQL/Connector C++ 8.0/include")
set(MYSQL_LIBDIR "C:/Program Files/MySQL/Connector C++ 8.0/lib64/vs14/")
set(MYSQL_LIB mysqlcppconn8 mysqlcppconn libssl)

add_library(Database SHARED Database/database.cpp Database/sha512.cpp)
# The .lib files should be found automatically if they are installed in the standard place by the
# MySQL Connector C++ 64-bit msi installer, typically this is C:\Program Files\MySQL\Connector C++ 8.0\lib64\vs14
# In addition, to run during development, the dlls should be copied to somewhere on your PATH or the build directory
target_include_directories(Database PUBLIC ${MYSQL_INC} "include/")
target_link_directories(Database PUBLIC ${MYSQL_LIBDIR})
target_link_libraries(Database PUBLIC ${MYSQL_LIB})


add_executable(test_Database Database/test_Database.cpp)
target_link_libraries(test_Database PUBLIC Database)


add_library(Vision SHARED Vision/vision.cpp Vision/vision.h Vision/vision_utils.cpp Vision/vision_utils.h)
target_include_directories(Vision PUBLIC "include/" ${LV_INC} ${OPENCV_INC})
target_link_directories(Vision PUBLIC ${OPENCV_LIBDIR} ${LB_LIBDIR})
target_link_directories(Vision PUBLIC ${OPENCV_LIBDIR} ${LV_LIBDIR})
target_link_libraries(Vision PUBLIC ${OPENCV_LIB} ${LV_LIB})

add_executable(test_Vision Vision/test_Vision.cpp)
Expand Down
318 changes: 0 additions & 318 deletions Gantry/External/Database/database.cpp

This file was deleted.

Loading

0 comments on commit 257d0ec

Please sign in to comment.