Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Interson merge #25

Merged
merged 130 commits into from
Oct 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
02bf36f
ENH: Initial commit.
thewtex Mar 25, 2014
141bab4
ENH: Add README
thewtex Mar 25, 2014
43d7900
ENH: IntersonClass skeleton.
thewtex Mar 25, 2014
1bfa930
ENH: Add IntersonClass::Version.
thewtex Mar 25, 2014
5fbf163
ENH: Add HWControls skeleton.
thewtex Mar 25, 2014
9983e44
ENH: HWControls::GetProbeID
thewtex Mar 25, 2014
fc842fa
ENH: Find the probe.
thewtex Mar 25, 2014
7fe6202
ENH: Add SetFrequency.
thewtex Mar 26, 2014
fbd4e0a
ENH: Add voltage controls.
thewtex Mar 26, 2014
378a18a
ENH: SendDynamic and {Start,Stop} motor.
thewtex Mar 26, 2014
9466283
ENH: Hard button methods.
thewtex Mar 26, 2014
b97b10e
ENH: Start/stop acquisition.
thewtex Apr 1, 2014
cfb53c3
ENH: Get frame rate, serial number, fpga version.
thewtex Apr 1, 2014
124464f
ENH: Enable/Disable RF decimator.
thewtex Apr 1, 2014
10ecb1b
ENH: Add IntersonCxx::Imaging::Scan2DClass constructor.
thewtex Apr 1, 2014
7ea268e
ENH: Add Scan2D constants.
thewtex Apr 1, 2014
e51b696
ENH: Scan2D RFData.
thewtex Apr 1, 2014
b0c75cb
ENH: StartReadScan.
thewtex Apr 1, 2014
b7cf83c
ENH: Improvements to StartReadScan.
thewtex Apr 2, 2014
0fdc05e
ENH: DisposeScan(), AbortScan().
thewtex Apr 3, 2014
7cc2c91
ENH: AcquireIntersonBMode app skeleton.
thewtex Apr 7, 2014
1e396c6
ENH: App uses the Interson .dll's.
thewtex Apr 7, 2014
f673b27
BUG: Avoid exception when probe not connected.
thewtex Apr 7, 2014
5ea8510
ENH: Start/stop app.
thewtex Apr 7, 2014
11c249c
ENH: typedef NewBmodeImageCallback.
thewtex Apr 8, 2014
73d46ff
ENH: NewBmodeImageHandler
thewtex Apr 8, 2014
5f06132
ENH: CLI callback.
thewtex Apr 8, 2014
3ce5655
ENH: Copy image buffer data in callback.
thewtex Apr 8, 2014
2b0f516
ENH: Set hardware settings before acquisition.
thewtex Apr 8, 2014
4f12555
ENH: Acquire multiple frames.
thewtex Apr 8, 2014
fdc2c2b
ENH: AcquireIntersonRF skeleton.
thewtex Apr 8, 2014
66feb2f
ENH: StartRFReadScan, RF callback.
thewtex Apr 8, 2014
58c0eeb
ENH: RF data tests.
thewtex Apr 8, 2014
f8bdcc3
ENH: Start PrintIntersonProbeInfo.
thewtex Apr 8, 2014
329de6b
ENH: frequencyIndex flag.
thewtex Apr 9, 2014
85f2852
ENH: Set/Get FrameAvg.
thewtex Apr 9, 2014
ef61c28
ENH: GetTrueDepth.
thewtex Apr 9, 2014
313c825
ENH: App set voltage.
thewtex Apr 9, 2014
0c70301
ENH: Control "Dynamic" gain in BMode app.
thewtex Apr 9, 2014
45aa7a0
ENH: Add RF decimator flag.
thewtex Apr 9, 2014
07f7430
ENH: Output serial number, FPGA in ProbeInfo app.
thewtex Apr 9, 2014
2539623
ENH: Print probe supported depths / frame rates.
thewtex Apr 9, 2014
70fde6d
ENH: ScanConverter class skeleton.
thewtex Apr 10, 2014
59dc20d
ENH: Add ScanConverterError.
thewtex Apr 10, 2014
998f6b5
ENH: GetHeightScan.
thewtex Apr 10, 2014
8a2f27c
ENH: GetWidthScan.
thewtex Apr 10, 2014
d8717b5
ENH: Get{MmPerPixel, ZeroOfYScale}.
thewtex Apr 10, 2014
a8aa27e
ENH: HardInitScanConverter.
thewtex Apr 10, 2014
8bc52e3
ENH: IdleInitScanConverter.
thewtex Apr 10, 2014
bfaed4f
ENH: NewScanConvertedBmodeImageCallback.
thewtex Apr 10, 2014
333ee59
ENH: Bmode scan conversion.
thewtex Apr 10, 2014
ffa5382
ENH: Generate IntersonSDKCxxConfig.cmake.
thewtex May 2, 2014
3b05acb
ENH: Print out SDK version in PrintIntersonProbeInfo.
thewtex May 4, 2014
0bd6e24
BUG: IntersonSDKCxxConfig.cmake must include the Targets.cmake file.
thewtex May 5, 2014
e8b6ace
DOC: Document dependencies.
thewtex Jun 12, 2014
c4257d9
Merge pull request #2 from KitwareMedical/dependencies
thewtex Jun 12, 2014
43f6b74
ENH: Put built output into bin / lib.
thewtex Jun 12, 2014
819d620
ENH: Define IntersonSDKCxx_RUNTIME_LIBRARY_DIRS in Config.cmake.
thewtex Jun 12, 2014
015dba4
1. Add Comments to the code using IntersonSDK 1.15v documentation
Oct 15, 2014
7a4b961
White Spaces deleted and UTF-8 formatting
Oct 16, 2014
6b24d34
Indentation following rules from ITK indentation and style
nenetto Oct 17, 2014
c66c74a
Indentation Problems
nenetto Oct 17, 2014
c8e1275
Merge pull request #3 from nenetto/master
thewtex Sep 18, 2015
3ee8117
ENH: Converted IntersonSDKWrapping to IntersonArraySDKWrapping
aylward Mar 8, 2017
bc60e06
Merge pull request #1 from aylward/InitialAdaptationToIntersonArray
aylward Mar 8, 2017
06e2728
Update README.rst
aylward Mar 8, 2017
4706fdb
DOC: Update the required Visual Studio version to 2015
thewtex Mar 8, 2017
119955d
Merge pull request #1 from thewtex/VSVersion
aylward Mar 8, 2017
b6050e7
ENH: Create a single container class for Imaging's subclasses
aylward Mar 9, 2017
640ccf3
Merge pull request #2 from KitwareMedical/CombineImagingClassesToCont…
aylward Mar 9, 2017
3335387
ENH: Removed unused class wrappings.
aylward Mar 10, 2017
a100b2f
Merge pull request #3 from aylward/RemovedUnusedSubclassWrappings
aylward Mar 10, 2017
865cdc8
COMP: Clean up code - order of calls, etc simplified.
aylward Mar 13, 2017
aeaff35
Merge pull request #4 from aylward/CleanUpCode
aylward Mar 13, 2017
4b1918e
STYLE: Fix spelling mistake in output
aylward Mar 13, 2017
50a25d0
Merge pull request #5 from aylward/SpellingMistake
aylward Mar 13, 2017
733830d
BUG: RF data was not enabled
sjh26 Mar 24, 2017
d755787
COMP: Fix compilation error with /RTC1
Mar 28, 2017
9ca2da3
Merge pull request #6 from sjh26/FixRFDataAcquisition
thewtex Mar 28, 2017
5a59df0
Merge pull request #7 from mjallais/master
thewtex Mar 28, 2017
2788ee1
BUG: Wrong .h filename in install directive
aylward Apr 14, 2017
ee0907c
Merge pull request #8 from aylward/InstallClassFix
aylward Apr 14, 2017
5ea27d1
ENH: Improve configuration export for build or install tree
Apr 21, 2017
fc740d1
COMP: Copy "IntersonArray.dll" and "IntersonArrayCxx.dll" in the appr…
May 9, 2017
92d6286
Merge pull request #12 from mjallais/CMakeListsUpdate
thewtex May 9, 2017
4a6546b
COMP: Add IntersonArraySDK_DIR, necessary to build Plus
May 10, 2017
6b14bc3
Updating cmake list for packing dlls etc
samuelgerber May 12, 2017
6e9d026
cmake: Add install rule for Internson shared library
samuelgerber May 16, 2017
0b41c6a
Merge pull request #14 from KitwareMedical/add-install-rule-for-inter…
thewtex May 16, 2017
61aa7b7
Fix Buffer Size
samuelgerber May 23, 2017
29a5c97
Updated AquireBmode app to corret buffer size
samuelgerber May 23, 2017
14e0547
Cleanup
samuelgerber May 23, 2017
adfe4a9
Merge pull request #13 from mjallais/FixPlus
thewtex Jun 1, 2017
2540bfd
Merge pull request #15 from KitwareMedical/buffer-size
samuelgerber Jun 2, 2017
8a21e77
Fix Buffer Size
samuelgerber May 23, 2017
ac642e3
Updated AquireBmode app to corret buffer size
samuelgerber May 23, 2017
592d10a
Cleanup
samuelgerber May 23, 2017
c0f5372
COMP: Remove depth variable from the XML file to avoid confusion
Apr 20, 2017
8ddb8ef
ENH: Set spacing in the output image
Apr 20, 2017
353778f
Fix Managed Code (#16)
samuelgerber Jan 12, 2018
b1ef58c
ENH: Now supports ninja build
aylward Feb 10, 2018
e9a9ed4
Merge branch 'master' into DepthFix
aylward Feb 11, 2018
adf88aa
Merge pull request #11 from mjallais/DepthFix
aylward Feb 11, 2018
579e85b
Merge branch 'master' into SupportNinjaBuild
aylward Feb 11, 2018
08dc01e
Merge pull request #17 from aylward/SupportNinjaBuild
aylward Feb 11, 2018
fec5778
BUG: Merge of commits produced inconsistencies.
aylward Feb 11, 2018
462fd57
Merge pull request #18 from aylward/MergeErrors
aylward Feb 11, 2018
482a2e2
ENH: Change API to support ArraySDK2.12 (#19)
aylward Feb 13, 2018
c6bd625
COMP: Help the build find MSCOREE.lib
thewtex Apr 9, 2018
f0e61f3
Merge pull request #20 from thewtex/sdk
thewtex Apr 9, 2018
2619f4b
DOC: Note that the x86 compiler is required
thewtex Apr 17, 2018
d65bff8
Merge pull request #21 from thewtex/readme-x86
thewtex Apr 17, 2018
856feba
ENH: Set the default focusIndex to 1
thewtex Apr 27, 2018
ec23fb1
BUG: Add correct Direction and Axial spacing for AcquireIntersonArray…
thewtex Apr 27, 2018
e4b3a5b
ENH: Set BMode spacing based on the frame rate
thewtex Apr 27, 2018
282d63c
STYLE: BMode console output tweaks
thewtex Apr 27, 2018
6d81d48
ENH: Add Direction to RF data
thewtex Apr 27, 2018
f0f4c3d
BUG: Increase the number of allowed RF frames to collect
thewtex Apr 27, 2018
0f09925
BUG: Remove debug code
thewtex Apr 27, 2018
3235ab8
ENH: Set RF Spacing based on frame rate
thewtex Apr 27, 2018
bf63690
Merge pull request #22 from thewtex/app-improvements
thewtex Apr 27, 2018
d4c85f0
ENH: Flip app images left-right forward-backward
thewtex May 1, 2018
c76bef7
Merge pull request #23 from thewtex/flip-lr
thewtex May 2, 2018
e8ab82f
ENH: Adds an option to build an OpenIGTLink server for RF data
sjh26 Aug 28, 2018
28ba613
Merge pull request #24 from KitwareMedical/add-openigtlink-apps
thewtex Aug 29, 2018
2298e51
BUG: Corret GetTrueDepth function call
ioluv Jan 22, 2019
8857d99
ENH: Update for Interson SDK version 2.21
brad-t-moore Jun 23, 2021
9440a50
Merge pull request #26 from brad-t-moore/update-interson-2-21
brad-t-moore Jul 1, 2021
3f33d70
ENH: Initial merge of IntersonArraySDKCxx
brad-t-moore Oct 29, 2021
0294b02
ENH: Moved IntersonArraySDKCxx to appropriate subfolder
brad-t-moore Oct 29, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 122 additions & 0 deletions Interson/IntersonArraySDKCxx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
##############################################################################
#
# Library: IntersonArraySDK
#
# Copyright Kitware Inc. 28 Corporate Drive,
# Clifton Park, NY, 12065, USA.
#
# All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################

cmake_minimum_required( VERSION 3.5 )

project( IntersonArraySDKCxx )

# CMake modules
include( CMakePackageConfigHelpers )
include( CTest )

# Options
option( BUILD_APPLICATIONS "Build applications" OFF )
option( BUILD_SERVERS "Build OpenIGTLink Servers" OFF)

# External dependencies
find_path( IntersonArraySDK_DIR
NAMES Libraries/IntersonArray.dll
PATHS C:/IntersonArraySDK
)
if( NOT IntersonArraySDK_DIR )
message( FATAL_ERROR "Please specify the path to the IntersonArraySDK"
" in IntersonArraySDK_DIR" )
endif()
set( IntersonArraySDK_LIBRARY "${IntersonArraySDK_DIR}/IntersonArray.dll" )
if( NOT EXISTS ${IntersonArraySDK_LIBRARY} )
message( FATAL_ERROR "Interson library is missing [${IntersonArraySDK_LIBRARY}]" )
endif()

# Install relative directories
set( INSTALL_LIB_DIR lib )
set( INSTALL_BIN_DIR bin )
set( INSTALL_INCLUDE_DIR include )
set( INSTALL_CMAKE_DIR cmake )

# Output directories
if( NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY )
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${IntersonArraySDKCxx_BINARY_DIR}/${INSTALL_BIN_DIR} )
endif()
if( NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY )
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${IntersonArraySDKCxx_BINARY_DIR}/${INSTALL_LIB_DIR} )
endif()
if( NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${IntersonArraySDKCxx_BINARY_DIR}/${INSTALL_LIB_DIR} )
endif()

# Add subdirectories
add_subdirectory( include )
add_subdirectory( src )
if( BUILD_TESTING )
add_subdirectory( test )
endif()
if( BUILD_APPLICATIONS )
add_subdirectory( app )
endif()

if( BUILD_SERVERS )
add_subdirectory( openigtlink )
endif()

# Install Interson libraries
install( FILES ${IntersonArraySDK_LIBRARY}
DESTINATION ${INSTALL_BIN_DIR} COMPONENT Runtime
)

# Configure 'IntersonArraySDKCxxConfig.cmake' for a build tree
set(CONFIG_DIR_CONFIG ${PROJECT_BINARY_DIR})
set(intersonArraySDKCxx_config ${PROJECT_BINARY_DIR}/IntersonArraySDKCxxConfig.cmake)
configure_package_config_file(
IntersonArraySDKCxxConfig.cmake.in
${intersonArraySDKCxx_config}
INSTALL_DESTINATION ${PROJECT_BINARY_DIR}
PATH_VARS CONFIG_DIR_CONFIG
NO_CHECK_REQUIRED_COMPONENTS_MACRO
)

# Configure 'IntersonArraySDKCxxConfig.cmake' for an install tree
set(CONFIG_DIR_CONFIG ${INSTALL_CMAKE_DIR})
set( intersonArraySDKCxx_install_config ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/IntersonArraySDKCxxConfig.cmake )
configure_package_config_file(
IntersonArraySDKCxxConfig.cmake.in
${intersonArraySDKCxx_install_config}
INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}
PATH_VARS CONFIG_DIR_CONFIG
NO_CHECK_REQUIRED_COMPONENTS_MACRO
)
install(
FILES ${intersonArraySDKCxx_install_config}
DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development
)

# Configure 'IntersonArraySDKCxxTargets.cmake'
export( TARGETS IntersonArrayCxx
FILE ${PROJECT_BINARY_DIR}/IntersonArraySDKCxxTargets.cmake
)

# Install 'IntersonArraySDKCxxTargets.cmake' and 'IntersonArraySDKCxxConfig.cmake'
install( EXPORT IntersonArraySDKCxxTargets
FILE IntersonArraySDKCxxTargets.cmake
DESTINATION ${INSTALL_CMAKE_DIR}
COMPONENT Development
)
41 changes: 41 additions & 0 deletions Interson/IntersonArraySDKCxx/IntersonArraySDKCxxConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
##############################################################################
#
# Library: IntersonArraySDK
#
# Copyright Kitware Inc. 28 Corporate Drive,
# Clifton Park, NY, 12065, USA.
#
# All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################

# Config file for the IntersonArraySDKCxx library wrapper.
#
# It defines the following variables:
# IntersonArraySDKCxx_LIBRARIES - libraries to link against
# IntersonArraySDK_DIR - Path to the IntersonArraySDK used to
# build this library.

@PACKAGE_INIT@

set_and_check( IntersonArraySDKCxx_TARGETS "@PACKAGE_CONFIG_DIR_CONFIG@/IntersonArraySDKCxxTargets.cmake" )

if( NOT IntersonArraySDKCxx_TARGETS_IMPORTED )
set( IntersonArraySDKCxx_TARGETS_IMPORTED 1 )
include( ${IntersonArraySDKCxx_TARGETS} )
endif()

set( IntersonArraySDKCxx_LIBRARIES IntersonArrayCxx )
set( IntersonArraySDK_DIR "@IntersonArraySDK_DIR@" )
File renamed without changes.
12 changes: 12 additions & 0 deletions Interson/IntersonArraySDKCxx/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
IntersonArraySDKCxx
===================

C++ Wrapper for the C# SDK for Interson's Linear Array Probe
-------------------------------------------------------------

Dependencies
------------

- CMake
- Interson Array SDK
- Visual Studio, VC x86 Compiler >= 2015
Loading