qmake.bat update

Vaa3D · Jan 21, 2021 · 2a065d1 · 2a065d1
1 parent 1eadc48
commit 2a065d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/qmake.bat b/qmake.bat
@@ -6,7 +6,7 @@ set DEF_QT5=
 
 @echo off
 if %QT_VER%==4 (
-    echo %Qt 4
+    echo Qt 4
 ::set QT_BIN=C:\Qt\vs2010x64-qt-4.7.4\bin
 set QT_BIN=C:\Qt\vs2013x64-qt-4.8.6\bin
 )

diff --git a/v3d_main/terafly/src/terarepo b/v3d_main/terafly/src/terarepo
+4 −0		LICENSE.txt
+4 −0		LICENSE_APPLE.txt
+12 −10		README.md
+8 −1		cmake/InstallLocation.cmake
+4 −4		cmake/Version.cmake
+29 −1		src/crossmips/CMakeLists.txt
+54 −0		src/crossmips/block_reduce.h
+10 −886		src/crossmips/compute_funcs.cpp
+1,688 −0		src/crossmips/compute_funcs.cu
+57 −8		src/crossmips/compute_funcs.h
+53 −0		src/crossmips/device_reduce_shfl_shmem.h
+114 −8		src/crossmips/libcrossmips.cpp
+55 −0		src/crossmips/warp_reduce.h
+1 −0		src/gui/CMergeTiles.cpp
+2 −2		src/gui/PTabImport.cpp
+2 −1		src/gui/PTabPlaceTiles.cpp
+157 −0		src/imagemanager/ComposedVolume.cpp
+109 −0		src/imagemanager/ComposedVolume.h
+6 −0		src/imagemanager/IM_config.h
+2 −2		src/imagemanager/MappedVolume.cpp
+741 −0		src/imagemanager/MultiCycleVolume.cpp
+185 −0		src/imagemanager/MultiCycleVolume.h
+706 −0		src/imagemanager/MultiSliceVolume.cpp
+187 −0		src/imagemanager/MultiSliceVolume.h
+8 −8		src/imagemanager/RawFmtMngr.cpp
+2 −1		src/imagemanager/SimpleVolume.cpp
+2 −1		src/imagemanager/SimpleVolumeRaw.cpp
+2 −1		src/imagemanager/StackedVolume.cpp
+10 −5		src/imagemanager/Tiff3DMngr.cpp
+1 −0		src/imagemanager/TiledMCVolume.cpp
+3 −2		src/imagemanager/TiledMCVolume.h
+32 −20		src/imagemanager/TiledVolume.cpp
+1 −0		src/imagemanager/TimeSeries.cpp
+3 −2		src/imagemanager/TimeSeries.h
+10 −9		src/imagemanager/UnstitchedVolume.cpp
+3 −0		src/imagemanager/UnstitchedVolume.h
+10 −2		src/imagemanager/VirtualVolume.cpp
+6 −5		src/imagemanager/VirtualVolume.h
+27 −0		src/iomanager/IOPluginAPI.h
+76 −11		src/iomanager/plugins/IMS_HDF5/IMS_HDF5.cpp
+24 −0		src/iomanager/plugins/bioformats2D/CMakeLists.txt
+54 −0		src/iomanager/plugins/bioformats2D/bioformats2D.cpp
+8 −0		src/iomanager/plugins/bioformats2D/bioformats2D.h
+24 −0		src/iomanager/plugins/bioformats3D/CMakeLists.txt
+53 −0		src/iomanager/plugins/bioformats3D/bioformats3D.cpp
+8 −0		src/iomanager/plugins/bioformats3D/bioformats3D.h
+671 −0		src/iomanager/plugins/bioformats3D/bioformats_basecode.inc
+22 −4		src/iomanager/plugins/dcimg/dcimg.cpp
+8 −0		src/iomanager/plugins/exampleplugin2D/exampleplugin2D.cpp
+11 −2		src/iomanager/plugins/opencv2D/opencv2D.cpp
+12 −3		src/iomanager/plugins/tiff2D/tiff2D.cpp
+9 −0		src/iomanager/plugins/tiff3D/tiff3D.cpp
+60 −29		src/multilayersmanager/MultiLayers.cpp
+12 −0		src/multilayersmanager/MultiLayers.h
+130 −30		src/multilayersmanager/StackStitcher2.cpp
+37 −4		src/multilayersmanager/StackStitcher2.h
+4 −0		src/stitcher/Displacement.h
+20 −0		src/stitcher/DisplacementMIPNCC.cpp
+4 −0		src/stitcher/DisplacementMIPNCC.h
+13 −3		src/stitcher/S_config.h
+88 −6		src/stitcher/StackStitcher.cpp
+10 −0		src/stitcher/TPAlgo.cpp
+242 −0		src/stitcher/TPAlgoLQP.cpp
+64 −0		src/stitcher/TPAlgoLQP.h
+47 −2		src/ui/CLI.cpp
+11 −0		src/ui/CLI.h
+57 −1		src/ui/main.cpp
+2 −2		src/utils/matlablib/mexfunction.cpp
+40 −2		src/utils/mergedisplacements/displacementManager.cpp
+702 −0		src/utils/pyscripts/LQP_HE.py
+1,737 −0		src/utils/pyscripts/Parastitcher.py
+2 −0		src/utils/pyscripts/README.txt
+1,141 −0		src/utils/pyscripts/paraconverter.py
+15 −3		src/utils/teraconverter/TemplateCLI.cpp
+7 −5		src/utils/teraconverter/TemplateCLI.h
+2 −0		src/utils/teraconverter/teraconverter.cpp
+71 −53		src/utils/terastitcher2/TeraStitcher2CLI.cpp
+11 −6		src/utils/terastitcher2/TeraStitcher2CLI.h
+135 −88		src/utils/terastitcher2/terastitcher2.cpp
+128 −88		src/utils/volumeconverter/VolumeConverter.cpp
+5 −3		src/utils/volumeconverter/VolumeConverter.h
+23 −5		src/volumemanager/vmBlockVolume.cpp
+2 −1		src/volumemanager/vmBlockVolume.h
+3 −3		src/volumemanager/vmStack.cpp
+22 −4		src/volumemanager/vmStackedVolume.cpp
+2 −1		src/volumemanager/vmStackedVolume.h
+8 −0		src/volumemanager/vmVirtualVolume.h