From b31bfd7d00365214d5a5df42651cba1e52fe2c64 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 12 Jan 2017 12:26:51 -0600 Subject: [PATCH] added SWC files as examples --- CMakeLists.txt | 2 ++ data/00_GT.swc | 0 data/1.swc | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ data/2.swc | 374 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.cu | 20 ++++++++++++-------- 5 files changed, 796 insertions(+), 8 deletions(-) create mode 100644 data/00_GT.swc create mode 100644 data/1.swc create mode 100644 data/2.swc diff --git a/CMakeLists.txt b/CMakeLists.txt index 62c4066..d2bea50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,3 +82,5 @@ configure_file(data/03_T.obj ${CMAKE_CURRENT_BINARY_DIR}/03_T.obj @ONLY) configure_file(data/04_GT.obj ${CMAKE_CURRENT_BINARY_DIR}/04_GT.obj @ONLY) configure_file(data/04_Ta.obj ${CMAKE_CURRENT_BINARY_DIR}/04_Ta.obj @ONLY) configure_file(data/04_Tb.obj ${CMAKE_CURRENT_BINARY_DIR}/04_Tb.obj @ONLY) +configure_file(data/1.swc ${CMAKE_CURRENT_BINARY_DIR}/1.swc @ONLY) +configure_file(data/2.swc ${CMAKE_CURRENT_BINARY_DIR}/2.swc @ONLY) diff --git a/data/00_GT.swc b/data/00_GT.swc new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/data/00_GT.swc diff --git a/data/1.swc b/data/1.swc new file mode 100644 index 0000000..7485222 --- /dev/null +++ b/data/1.swc @@ -0,0 +1,408 @@ +# Original file 20F-40x.swc edited using StdSwc version 1.31 on 5/6/15. +# Irregularities and fixes documented in 20F-40x.swc.std. See StdSwc1.31.doc for more information. +# +# Neurolucida to SWC conversion from L-Measure. Sridevi Polavaram: spolavar@gmu.edu +# Original fileName:C:\Users\praveen\Desktop\DataProcessing\CurrentArchives\To be processed\Bianchi\ASC 2\20F-40x.asc +#The original file has a single soma contour that is averaged into 3 soma points +1 1 0.0 0.0 0.0 8.33574 -1 +2 1 -6.04 -5.73 -0.27 8.33574 1 +3 1 6.04 5.73 0.27 8.33574 1 +4 3 3.07 7.47 12.1 0.935 1 +5 3 8.46 11.65 12.42 0.935 4 +6 3 13.28 16.46 12.62 0.68 5 +7 3 13.27 16.22 12.64 0.68 6 +8 3 14.8 20.74 18.89 0.68 7 +9 3 22.26 23.36 21.8 0.425 8 +10 3 25.14 23.53 22.14 0.425 9 +11 3 30.24 19.44 26.21 0.17 10 +12 3 30.09 19.54 27.48 0.17 11 +13 3 35.32 17.03 26.78 0.17 12 +14 3 35.48 16.92 25.43 0.17 13 +15 3 40.59 18.7 25.59 0.17 14 +16 3 40.49 18.76 26.42 0.17 15 +17 3 44.28 16.94 32.76 0.085 16 +18 3 45.58 19.98 33.66 0.085 17 +19 3 45.52 20.01 34.12 0.085 18 +20 3 50.69 18.14 37.1 0.085 19 +21 3 50.67 18.15 37.25 0.085 20 +22 3 54.17 15.63 38.95 0.085 21 +23 3 28.74 25.14 22.74 0.17 10 +24 3 28.85 25.07 21.77 0.17 23 +25 3 33.7 24.46 20.65 0.17 24 +26 3 39.24 28.27 25.6 0.17 25 +27 3 39.26 28.26 25.45 0.17 26 +28 3 44.27 29.62 26.4 0.17 27 +29 3 44.18 29.68 27.15 0.17 28 +30 3 46.92 36.15 27.82 0.17 29 +31 3 48.88 34.06 28.22 0.17 30 +32 3 52.03 34.6 30.31 0.085 31 +33 3 51.97 34.64 30.84 0.085 32 +34 3 59.42 35.99 29.56 0.085 33 +35 3 65.1 41.38 29.81 0.085 34 +36 3 64.1 48.39 34.43 0.085 35 +37 3 62.46 49.14 34.09 0.085 36 +38 3 62.86 53.1 35.6 0.085 37 +39 3 62.71 53.24 35.87 0.085 38 +40 3 61.62 54.9 30.18 0.085 39 +41 3 61.4 55.19 29.06 0.085 40 +42 3 60.6 58.05 28.28 0.085 41 +43 3 60.27 58.9 28.18 0.085 42 +44 3 60.33 61.06 28.01 0.085 43 +45 3 71.67 44.07 30.09 0.085 35 +46 3 75.95 46.97 30.37 0.085 45 +47 3 77.33 49.22 30.37 0.085 46 +48 3 77.4 49.17 29.76 0.085 47 +49 3 80.44 52.71 28.39 0.085 48 +50 3 79.84 52.85 28.39 0.085 49 +51 3 82.32 54.21 27.97 0.085 50 +52 3 82.19 54.09 27.96 0.085 51 +53 3 90.56 54.42 27.95 0.085 52 +54 3 90.08 54.43 27.89 0.085 53 +55 3 10.47 17.41 14.81 0.17 7 +56 3 10.49 17.39 14.66 0.17 55 +57 3 8.86 21.32 14.85 0.17 56 +58 3 8.79 21.37 15.44 0.17 57 +59 3 12.16 26.11 12.57 0.17 58 +60 3 12.26 26.04 11.75 0.17 59 +61 3 12.1 28.02 20.37 0.17 60 +62 3 14.65 33.93 16.55 0.085 61 +63 3 14.54 34.0 17.52 0.085 62 +64 3 14.43 39.66 20.51 0.085 63 +65 3 14.36 39.7 21.11 0.085 64 +66 3 14.38 46.45 24.18 0.085 65 +67 3 14.34 46.47 24.55 0.085 66 +68 3 15.57 50.83 25.2 0.085 67 +69 3 14.52 56.69 28.98 0.085 68 +70 3 14.37 56.84 29.26 0.085 69 +71 3 13.2 59.74 30.5 0.085 70 +72 3 11.84 69.1 35.57 0.085 71 +73 3 11.71 69.43 36.67 0.085 72 +74 3 12.2 74.01 38.52 0.085 73 +75 3 12.16 74.04 38.89 0.085 74 +76 3 15.29 77.86 39.81 0.085 75 +77 3 15.17 77.99 39.79 0.085 76 +78 3 14.13 82.57 39.31 0.085 77 +79 3 14.0 82.7 39.35 0.085 78 +80 3 15.61 91.07 40.66 0.085 79 +81 3 12.45 95.15 40.56 0.085 80 +82 3 13.63 103.94 42.54 0.085 81 +83 3 13.72 103.89 41.87 0.085 82 +84 3 11.73 110.7 46.6 0.085 83 +85 3 11.23 32.3 17.49 0.085 61 +86 3 11.05 32.42 18.98 0.085 85 +87 3 10.94 38.32 22.03 0.085 86 +88 3 10.82 38.39 23.0 0.085 87 +89 3 13.2 46.48 28.93 0.085 88 +90 3 13.04 46.58 30.28 0.085 89 +91 3 15.03 52.9 35.0 0.085 90 +92 3 14.97 52.94 35.45 0.085 91 +93 3 15.49 58.98 37.41 0.085 92 +94 3 15.54 59.38 38.0 0.085 93 +95 3 14.42 69.95 38.41 0.085 94 +96 3 18.94 73.23 40.69 0.085 95 +97 3 19.01 73.38 41.15 0.085 96 +98 3 19.55 75.24 42.06 0.085 97 +99 3 19.53 75.25 42.2 0.085 98 +100 3 -1.67 7.46 -5.82 1.105 1 +101 3 -0.61 17.76 -6.43 1.105 100 +102 3 -0.31 26.86 -7.11 1.105 101 +103 3 2.17 31.15 -6.91 0.765 102 +104 3 4.78 55.23 -9.64 0.765 103 +105 3 4.83 55.19 -10.09 0.765 104 +106 3 5.37 62.72 -14.05 0.765 105 +107 3 5.42 62.68 -14.51 0.765 106 +108 3 5.84 67.08 -7.15 0.595 107 +109 3 7.06 71.49 -7.35 0.34 108 +110 3 7.04 71.5 -7.2 0.34 109 +111 3 8.45 76.83 -4.77 0.34 110 +112 3 9.31 78.88 -4.44 0.34 111 +113 3 9.2 78.95 -3.54 0.34 112 +114 3 11.19 79.73 -1.83 0.34 113 +115 3 10.96 79.98 -1.88 0.34 114 +116 3 13.96 87.61 -0.13 0.17 115 +117 3 10.57 88.55 2.97 0.17 116 +118 3 11.17 96.1 2.53 0.17 117 +119 3 12.55 100.06 2.85 0.17 118 +120 3 17.54 108.04 5.27 0.17 119 +121 3 20.21 112.89 5.21 0.17 120 +122 3 31.23 124.75 5.61 0.085 121 +123 3 34.52 133.52 22.53 0.085 122 +124 3 34.65 133.64 22.53 0.085 123 +125 3 39.11 141.94 24.34 0.085 124 +126 3 39.46 142.31 24.5 0.085 125 +127 3 46.36 148.38 24.77 0.085 126 +128 3 11.44 112.28 13.93 0.085 119 +129 3 11.2 112.53 13.96 0.085 128 +130 3 12.32 118.52 13.85 0.085 129 +131 3 12.28 119.28 14.4 0.085 130 +132 3 12.4 127.72 15.98 0.085 131 +133 3 12.38 127.98 16.25 0.085 132 +134 3 14.33 136.38 19.73 0.085 133 +135 3 14.73 137.69 19.68 0.085 134 +136 3 15.05 147.29 18.96 0.085 135 +137 3 15.06 147.53 18.94 0.085 136 +138 3 16.43 156.49 18.41 0.085 137 +139 3 16.39 156.76 18.77 0.085 138 +140 3 15.57 163.25 19.77 0.085 139 +141 3 15.41 163.4 20.12 0.085 140 +142 3 18.44 168.86 20.21 0.085 141 +143 3 18.56 168.97 20.21 0.085 142 +144 3 21.03 171.31 20.32 0.085 143 +145 3 26.28 171.44 21.02 0.085 144 +146 3 26.41 171.55 20.95 0.085 145 +147 3 29.19 168.85 21.5 0.085 146 +148 3 29.31 168.96 21.5 0.085 147 +149 3 32.81 169.96 21.84 0.085 148 +150 3 -3.33 30.84 -3.19 0.17 102 +151 3 -5.8 34.87 -2.04 0.17 150 +152 3 -5.94 34.96 -0.84 0.17 151 +153 3 -5.2 40.27 -24.82 0.17 152 +154 3 -5.02 40.15 -26.31 0.17 153 +155 3 -8.15 50.12 -31.53 0.17 154 +156 3 -8.06 50.07 -32.2 0.17 155 +157 3 -10.03 52.54 -35.54 0.085 156 +158 3 -9.96 52.5 -36.14 0.085 157 +159 3 -13.16 55.96 -38.01 0.085 158 +160 3 -13.61 56.69 -38.13 0.085 159 +161 3 -14.98 61.68 -39.83 0.085 160 +162 3 -15.63 62.39 -40.27 0.085 161 +163 3 -20.28 66.69 -43.0 0.085 162 +164 3 -20.46 66.65 -43.56 0.085 163 +165 3 -24.94 68.86 -48.25 0.085 164 +166 3 -25.04 68.98 -48.35 0.085 165 +167 3 -29.38 71.6 -48.99 0.085 166 +168 3 -29.26 71.52 -50.04 0.085 167 +169 3 0.98 -9.49 -3.19 0.51 1 +170 3 0.85 -9.61 -3.19 0.51 169 +171 3 0.7 -14.16 -2.85 0.51 170 +172 3 0.58 -14.28 -2.86 0.51 171 +173 3 -1.98 -19.97 -2.72 0.255 172 +174 3 3.34 -8.43 10.47 1.19 1 +175 3 5.23 -12.67 11.03 1.19 174 +176 3 5.1 -12.79 11.02 1.19 175 +177 3 5.66 -22.53 21.42 0.595 176 +178 3 5.77 -22.89 21.46 0.595 177 +179 3 9.77 -29.02 25.25 0.595 178 +180 3 9.7 -28.92 24.86 0.595 179 +181 3 9.08 -35.32 32.7 0.34 180 +182 3 9.0 -35.26 33.37 0.34 181 +183 3 11.83 -43.05 30.5 0.17 182 +184 3 11.54 -47.96 30.85 0.17 183 +185 3 11.66 -48.09 30.88 0.17 184 +186 3 13.07 -52.32 31.38 0.17 185 +187 3 10.42 -54.93 30.73 0.085 186 +188 3 10.29 -55.29 30.74 0.085 187 +189 3 9.48 -61.87 31.16 0.085 188 +190 3 9.22 -62.58 31.18 0.085 189 +191 3 8.51 -66.04 31.37 0.085 190 +192 3 8.5 -66.52 31.41 0.085 191 +193 3 10.8 -76.41 32.46 0.085 192 +194 3 9.16 -80.64 26.32 0.085 193 +195 3 8.79 -80.99 26.3 0.085 194 +196 3 6.16 -85.53 29.09 0.085 195 +197 3 6.01 -86.12 29.2 0.085 196 +198 3 3.83 -90.75 29.3 0.085 197 +199 3 3.81 -91.47 29.35 0.085 198 +200 3 5.16 -93.9 29.7 0.085 199 +201 3 18.08 -60.34 25.72 0.085 186 +202 3 18.5 -61.5 25.02 0.085 201 +203 3 25.29 -71.82 23.96 0.085 202 +204 3 25.06 -71.67 25.84 0.085 203 +205 3 30.04 -83.8 30.36 0.085 204 +206 3 32.61 -88.77 31.14 0.085 205 +207 3 32.7 -89.62 31.22 0.085 206 +208 3 33.43 -92.87 31.56 0.085 207 +209 3 33.53 -93.72 31.64 0.085 208 +210 3 35.51 -98.8 32.27 0.085 209 +211 3 15.26 -32.51 22.43 0.17 180 +212 3 15.35 -32.57 21.68 0.17 211 +213 3 20.89 -33.66 25.65 0.17 212 +214 3 21.19 -34.05 27.09 0.17 213 +215 3 26.43 -34.75 29.77 0.17 214 +216 3 26.76 -35.35 29.92 0.17 215 +217 3 30.29 -39.71 32.91 0.085 216 +218 3 30.16 -40.31 32.87 0.085 217 +219 3 31.1 -45.56 29.1 0.085 218 +220 3 31.22 -45.93 29.07 0.085 219 +221 3 32.84 -48.64 29.1 0.085 220 +222 3 33.08 -48.88 29.14 0.085 221 +223 3 37.7 -49.83 29.77 0.085 222 +224 3 38.42 -53.08 30.19 0.085 223 +225 3 38.53 -53.2 30.22 0.085 224 +226 3 40.96 -55.79 30.71 0.085 225 +227 3 41.77 -56.64 30.88 0.085 226 +228 3 42.58 -57.5 31.04 0.085 227 +229 3 46.27 -57.95 31.52 0.085 228 +230 3 46.38 -58.07 31.54 0.085 229 +231 3 47.86 -60.39 31.9 0.085 230 +232 3 47.97 -60.51 31.92 0.085 231 +233 3 50.84 -60.58 32.27 0.085 232 +234 3 30.6 -34.11 38.48 0.17 216 +235 3 30.51 -34.05 39.23 0.17 234 +236 3 34.56 -35.41 45.48 0.17 235 +237 3 38.19 -36.69 54.21 0.17 236 +238 3 38.31 -36.81 54.23 0.17 237 +239 3 40.11 -37.07 61.28 0.085 238 +240 3 44.08 -36.18 58.7 0.085 239 +241 3 44.1 -36.25 59.47 0.085 240 +242 3 48.03 -35.77 61.14 0.085 241 +243 3 48.15 -35.65 61.14 0.085 242 +244 3 9.28 -20.78 7.18 0.255 176 +245 3 9.35 -20.83 6.57 0.255 244 +246 3 12.38 -23.75 1.04 0.255 245 +247 3 12.71 -28.62 -2.66 0.17 246 +248 3 12.62 -28.76 -2.89 0.17 247 +249 3 10.8 -37.59 -10.6 0.17 248 +250 3 10.68 -37.71 -10.6 0.17 249 +251 3 7.76 -43.24 -11.59 0.17 250 +252 3 8.0 -44.22 -11.79 0.17 251 +253 3 9.53 -50.56 -21.6 0.085 252 +254 3 9.4 -50.67 -21.6 0.085 253 +255 3 11.41 -59.19 -16.79 0.085 254 +256 3 11.4 -60.17 -16.95 0.085 255 +257 3 9.59 -64.69 -16.88 0.085 256 +258 3 9.08 -65.64 -16.87 0.085 257 +259 3 5.44 -72.36 -18.09 0.085 258 +260 3 5.11 -73.23 -18.51 0.085 259 +261 3 4.68 -75.5 -18.47 0.085 260 +262 3 4.88 -76.7 -18.35 0.085 261 +263 3 6.63 -81.54 -17.76 0.085 262 +264 3 6.79 -82.23 -17.22 0.085 263 +265 3 5.81 -86.7 -16.08 0.085 264 +266 3 5.5 -86.89 -15.49 0.085 265 +267 3 4.99 -88.62 -14.64 0.085 266 +268 3 5.43 -89.59 -14.51 0.085 267 +269 3 10.48 -93.5 -12.91 0.085 268 +270 3 10.42 -93.46 -12.39 0.085 269 +271 3 15.03 -56.05 -28.01 0.085 254 +272 3 15.22 -56.17 -29.59 0.085 271 +273 3 23.48 -26.82 1.86 0.17 246 +274 3 27.78 -29.23 3.86 0.17 273 +275 3 33.35 -28.74 -0.02 0.17 274 +276 3 32.65 -28.48 -0.19 0.17 275 +277 3 43.34 -29.14 5.49 0.085 276 +278 3 46.69 -28.74 5.86 0.085 277 +279 3 48.54 -27.23 5.89 0.085 278 +280 3 53.89 -28.69 6.49 0.085 279 +281 3 57.21 -29.0 6.98 0.085 280 +282 3 67.93 -26.25 8.05 0.085 281 +283 3 67.82 -26.13 8.03 0.085 282 +284 3 33.54 -23.18 2.7 0.085 276 +285 3 33.45 -23.12 3.45 0.085 284 +286 3 33.1 -20.55 3.89 0.085 285 +287 3 33.24 -20.55 0.7 0.085 286 +288 3 32.84 -19.62 -4.78 0.085 287 +289 3 32.81 -19.05 -5.36 0.085 288 +290 3 32.78 -16.25 -6.57 0.085 289 +291 3 31.98 -15.15 -6.75 0.085 290 +292 4 -11.32 -3.78 7.27 3.23 1 +293 4 -12.82 -4.38 7.14 3.23 292 +294 4 -21.82 -6.76 6.33 2.38 293 +295 4 -28.35 -9.49 5.68 2.38 294 +296 4 -38.67 -11.07 15.87 1.02 295 +297 4 -41.55 -11.51 18.72 1.02 296 +298 4 -54.11 -15.43 15.6 0.765 297 +299 4 -54.08 -15.45 15.38 0.765 298 +300 4 -57.62 -15.37 24.59 0.765 299 +301 4 -61.5 -16.73 14.36 0.765 300 +302 4 -64.46 -11.8 12.78 0.17 301 +303 4 -64.39 -11.85 12.18 0.17 302 +304 4 -65.77 -2.78 18.26 0.17 303 +305 4 -66.11 -2.41 18.19 0.17 304 +306 4 -71.69 2.27 17.16 0.17 305 +307 4 -77.74 7.4 17.1 0.17 306 +308 4 -84.31 7.1 13.35 0.085 307 +309 4 -72.33 -20.24 11.05 0.765 301 +310 4 -62.06 -18.79 33.44 0.17 300 +311 4 -66.97 -21.29 40.01 0.085 310 +312 4 -66.98 -21.28 40.15 0.085 311 +313 4 -69.45 -31.66 32.56 0.085 312 +314 4 -71.44 -36.92 30.89 0.085 313 +315 4 -71.5 -37.32 30.31 0.085 314 +316 4 -72.99 -41.6 28.78 0.085 315 +317 4 -64.65 -24.1 37.36 0.085 310 +318 4 -64.71 -24.06 37.82 0.085 317 +319 4 -67.92 -30.81 43.08 0.085 318 +320 4 -32.87 -4.1 8.01 0.85 296 +321 4 -32.89 -4.09 8.16 0.85 320 +322 4 -34.83 1.22 12.25 0.68 321 +323 4 -36.17 11.67 14.34 0.34 322 +324 4 -37.38 17.93 18.52 0.34 323 +325 4 -39.62 23.63 21.1 0.34 324 +326 4 -42.57 28.5 20.43 0.34 325 +327 4 -43.5 34.78 23.28 0.17 326 +328 4 -46.9 38.81 24.16 0.17 327 +329 4 -47.04 38.95 24.36 0.17 328 +330 4 -52.02 44.98 23.6 0.17 329 +331 4 -50.18 46.49 23.7 0.17 330 +332 4 -54.77 52.75 24.8 0.085 331 +333 4 -55.01 52.52 24.79 0.085 332 +334 4 -60.77 55.93 39.45 0.085 333 +335 4 -60.8 55.95 39.75 0.085 334 +336 4 -63.11 58.75 42.31 0.085 335 +337 4 -63.29 58.91 42.81 0.085 336 +338 4 -65.69 61.48 42.17 0.085 337 +339 4 -65.81 61.6 42.15 0.085 338 +340 4 -68.14 63.34 41.73 0.085 339 +341 4 -68.38 63.34 41.7 0.085 340 +342 4 -74.33 64.84 43.01 0.085 341 +343 4 -74.43 64.96 42.91 0.085 342 +344 4 -47.81 29.66 34.33 0.17 326 +345 4 -48.3 30.17 34.47 0.17 344 +346 4 -52.79 34.32 36.35 0.17 345 +347 4 -60.23 34.71 31.91 0.17 346 +348 4 -60.44 34.46 31.6 0.17 347 +349 4 -65.3 35.66 30.93 0.17 348 +350 4 -65.54 35.66 30.9 0.17 349 +351 4 -74.07 38.18 31.74 0.085 350 +352 4 -74.3 38.42 31.69 0.085 351 +353 4 -78.99 42.64 31.26 0.085 352 +354 4 -79.46 43.14 31.24 0.085 353 +355 4 -81.17 45.46 30.85 0.085 354 +356 4 -81.17 45.7 30.83 0.085 355 +357 4 -80.61 48.08 30.71 0.085 356 +358 4 -80.84 48.33 30.67 0.085 357 +359 4 -85.13 52.39 29.83 0.085 358 +360 4 -90.42 54.8 29.01 0.085 359 +361 4 -91.26 54.7 28.92 0.085 360 +362 4 -95.4 56.12 28.31 0.085 361 +363 4 -95.8 58.28 28.09 0.085 362 +364 4 -96.16 58.17 28.06 0.085 363 +365 4 -98.43 58.5 29.83 0.085 364 +366 4 -98.59 58.6 31.18 0.085 365 +367 4 -105.07 65.62 22.05 0.085 366 +368 4 -114.88 69.09 20.6 0.085 367 +369 4 -33.05 -17.8 15.95 0.255 295 +370 4 -34.05 -25.19 21.68 0.255 369 +371 4 -34.0 -25.26 22.31 0.255 370 +372 4 -31.55 -30.16 24.06 0.255 371 +373 4 -31.54 -30.4 24.0 0.255 372 +374 4 -30.38 -36.38 25.3 0.255 373 +375 4 -30.28 -36.75 25.34 0.255 374 +376 4 -31.56 -43.72 23.51 0.255 375 +377 4 -32.14 -53.97 18.35 0.17 376 +378 4 -32.1 -54.0 17.98 0.17 377 +379 4 -32.87 -61.21 9.95 0.085 378 +380 4 -32.75 -61.33 9.98 0.085 379 +381 4 -30.99 -64.32 7.9 0.085 380 +382 4 -31.1 -64.2 7.79 0.085 381 +383 4 -16.78 -8.43 23.97 0.425 293 +384 4 -16.87 -8.37 24.73 0.425 383 +385 4 -19.15 -13.92 25.34 0.34 384 +386 4 -19.0 -16.81 25.59 0.34 385 +387 4 -18.88 -16.89 24.62 0.34 386 +388 4 -16.94 -16.55 31.63 0.255 387 +389 4 -13.89 -18.55 32.07 0.255 388 +390 4 -16.32 -19.93 31.89 0.255 389 +391 4 -16.6 -24.6 32.22 0.085 390 +392 4 -16.73 -24.95 32.24 0.085 391 +393 4 -16.38 -30.6 39.22 0.085 392 +394 4 -16.61 -30.6 39.12 0.085 393 +395 4 -16.89 -35.59 46.44 0.085 394 +396 4 -16.92 -35.57 46.67 0.085 395 +397 4 -18.56 -44.39 60.48 0.085 396 +398 4 -18.69 -44.51 60.47 0.085 397 +399 4 -20.99 -58.73 47.15 0.085 398 +400 4 -20.46 -64.5 47.59 0.085 399 +401 4 -20.59 -64.62 47.66 0.085 400 +402 4 -20.33 -66.15 48.19 0.085 401 diff --git a/data/2.swc b/data/2.swc new file mode 100644 index 0000000..465eef8 --- /dev/null +++ b/data/2.swc @@ -0,0 +1,374 @@ +# Original file 20D-40x.swc edited using StdSwc version 1.31 on 5/6/15. +# Irregularities and fixes documented in 20D-40x.swc.std. See StdSwc1.31.doc for more information. +# +# Neurolucida to SWC conversion from L-Measure. Sridevi Polavaram: spolavar@gmu.edu +# Original fileName:C:\Users\praveen\Desktop\DataProcessing\CurrentArchives\To be processed\Bianchi\ASC 2\20D-40x.asc +#The original file has a single soma contour that is averaged into 3 soma points +1 1 0.0 0.0 0.0 6.79041 -1 +2 1 4.14 -5.06 1.8 6.79041 1 +3 1 -4.14 5.06 -1.8 6.79041 1 +4 3 -6.59 -3.46 -5.49 0.68 1 +5 3 -7.11 -3.78 -5.83 0.68 4 +6 3 -13.31 -3.98 -8.82 0.68 5 +7 3 -13.2 -4.11 -8.78 0.68 6 +8 3 -17.28 0.53 -10.57 0.34 7 +9 3 -17.08 0.04 -10.49 0.34 8 +10 3 -19.47 3.12 -3.45 0.17 9 +11 3 -19.24 3.34 -3.34 0.17 10 +12 3 -21.14 8.1 -0.96 0.17 11 +13 3 -21.24 8.1 -0.75 0.17 12 +14 3 -20.92 16.0 -4.26 0.085 13 +15 3 -20.46 16.03 -5.21 0.085 14 +16 3 -22.54 22.7 -6.64 0.085 15 +17 3 -24.58 22.54 -2.41 0.085 16 +18 3 -26.05 24.71 0.65 0.085 17 +19 3 -26.67 25.46 4.83 0.085 18 +20 3 -27.4 25.41 6.34 0.085 19 +21 3 -28.85 31.13 8.46 0.085 20 +22 3 -29.06 31.14 8.36 0.085 21 +23 3 -32.85 32.69 9.2 0.085 22 +24 3 -32.87 33.0 10.13 0.085 23 +25 3 -30.15 42.11 13.47 0.085 24 +26 3 -29.89 42.34 13.51 0.085 25 +27 3 -27.54 44.59 17.0 0.085 26 +28 3 -27.74 44.57 17.41 0.085 27 +29 3 -30.75 49.32 18.49 0.085 28 +30 3 -30.67 54.54 20.16 0.085 29 +31 3 -31.07 54.5 20.98 0.085 30 +32 3 -35.21 60.52 28.2 0.085 31 +33 3 -38.43 65.11 32.46 0.085 32 +34 3 -38.94 69.01 34.3 0.085 33 +35 3 -39.13 68.99 34.71 0.085 34 +36 3 -36.64 71.35 38.18 0.085 35 +37 3 -25.52 9.59 -0.83 0.085 13 +38 3 -26.24 9.32 0.07 0.085 37 +39 3 -31.08 10.54 3.08 0.085 38 +40 3 -31.18 10.67 3.04 0.085 39 +41 3 -25.83 1.13 -11.06 0.17 9 +42 3 -25.94 1.02 -11.12 0.17 41 +43 3 -30.9 1.82 -13.48 0.17 42 +44 3 -34.63 5.09 -15.57 0.085 43 +45 3 -34.19 5.02 -16.78 0.085 44 +46 3 -36.66 5.53 -19.9 0.085 45 +47 3 -35.45 -0.5 -14.06 0.085 43 +48 3 -36.92 -1.48 -12.79 0.085 47 +49 3 -39.54 -4.34 -11.64 0.085 48 +50 3 -39.65 -4.45 -11.69 0.085 49 +51 3 -41.42 -5.3 -12.58 0.085 50 +52 3 -21.7 -6.2 -6.65 0.255 7 +53 3 -27.48 -6.12 -4.05 0.255 52 +54 3 -27.81 -6.15 -3.37 0.255 53 +55 3 -30.89 -5.54 -3.56 0.255 54 +56 3 -31.94 -7.1 -17.0 0.17 55 +57 3 -32.05 -7.21 -17.06 0.17 56 +58 3 -34.49 -8.88 -19.98 0.17 57 +59 3 -34.23 -8.86 -20.52 0.17 58 +60 3 -38.45 -13.67 -24.34 0.17 59 +61 3 -38.59 -14.0 -24.93 0.17 60 +62 3 -41.3 -16.71 -26.33 0.17 61 +63 3 -41.51 -16.45 -26.42 0.17 62 +64 3 -42.0 -13.63 -26.97 0.17 63 +65 3 -41.85 -13.73 -27.57 0.17 64 +66 3 -43.7 -14.33 -32.7 0.17 65 +67 3 -43.66 -14.67 -33.11 0.17 66 +68 3 -47.56 -15.09 -38.12 0.085 67 +69 3 -51.7 -15.16 -42.89 0.085 68 +70 3 -51.89 -15.25 -43.32 0.085 69 +71 3 -58.82 -12.75 -46.66 0.085 70 +72 3 -58.93 -12.87 -46.71 0.085 71 +73 3 -64.04 -14.44 -51.59 0.085 72 +74 3 -63.75 -14.42 -52.2 0.085 73 +75 3 -69.22 -11.07 -54.55 0.085 74 +76 3 -69.4 -11.05 -54.72 0.085 75 +77 3 -73.77 -11.88 -58.54 0.085 76 +78 3 -73.55 -11.97 -59.28 0.085 77 +79 3 -77.81 -12.03 -61.84 0.085 78 +80 3 -77.93 -12.15 -61.89 0.085 79 +81 3 -80.41 -14.63 -63.18 0.085 80 +82 3 -81.35 -12.85 -64.32 0.085 81 +83 3 -81.42 -12.96 -64.45 0.085 82 +84 3 -83.71 -13.24 -66.41 0.085 83 +85 3 -83.65 -13.24 -66.55 0.085 84 +86 3 -85.05 -15.22 -68.9 0.085 85 +87 3 -88.17 -14.06 -72.54 0.085 86 +88 3 -88.52 -14.88 -72.75 0.085 87 +89 3 -92.92 -18.19 -75.16 0.085 88 +90 3 -35.21 -8.83 -6.69 0.17 55 +91 3 -38.7 -11.79 -5.11 0.17 90 +92 3 -38.59 -11.92 -5.07 0.17 91 +93 3 -44.43 -13.08 -1.96 0.17 92 +94 3 -47.52 -13.66 -2.29 0.17 93 +95 3 -48.24 -13.92 -1.39 0.17 94 +96 3 -54.97 -15.07 -0.04 0.17 95 +97 3 -54.86 -14.96 0.01 0.17 96 +98 3 -38.37 -15.07 -9.29 0.085 92 +99 3 -38.08 -15.04 -9.9 0.085 98 +100 3 -45.21 -16.76 -6.67 0.085 99 +101 3 -46.4 -17.75 -5.44 0.085 100 +102 3 -51.12 -23.48 -7.51 0.085 101 +103 3 -53.93 -27.66 -6.41 0.085 102 +104 3 -54.49 -27.7 -5.25 0.085 103 +105 3 -57.0 -29.91 -5.03 0.085 104 +106 3 -56.94 -30.04 -4.91 0.085 105 +107 3 -56.46 -31.87 -4.75 0.085 106 +108 3 -56.81 -32.45 -4.94 0.085 107 +109 3 -60.11 -36.53 -3.07 0.085 108 +110 3 -60.0 -36.65 -3.03 0.085 109 +111 3 -61.31 -40.9 -1.71 0.085 110 +112 3 6.71 7.47 -12.88 1.7 1 +113 3 6.36 9.9 -12.96 1.7 112 +114 3 12.04 15.93 -19.34 0.34 113 +115 3 14.53 20.65 -21.4 0.34 114 +116 3 15.09 21.22 -21.11 0.34 115 +117 3 16.18 25.96 -20.5 0.34 116 +118 3 15.78 25.93 -19.68 0.34 117 +119 3 15.44 27.85 -19.27 0.34 118 +120 3 15.37 27.98 -19.38 0.34 119 +121 3 14.24 30.57 -19.75 0.34 120 +122 3 14.47 30.8 -19.63 0.34 121 +123 3 19.11 35.91 -17.2 0.34 122 +124 3 19.22 36.02 -17.15 0.34 123 +125 3 21.81 38.38 -15.81 0.34 124 +126 3 26.62 43.45 -12.62 0.085 125 +127 3 22.3 41.92 -14.68 0.085 125 +128 3 22.31 42.16 -14.67 0.085 127 +129 3 22.48 46.52 -15.01 0.085 128 +130 3 22.71 46.53 -15.49 0.085 129 +131 3 18.14 53.93 -17.5 0.085 130 +132 3 18.25 54.04 -17.44 0.085 131 +133 3 14.14 64.67 -15.23 0.085 132 +134 3 9.96 72.54 -19.39 0.085 133 +135 3 10.04 72.65 -19.26 0.085 134 +136 3 11.11 75.11 -18.66 0.085 135 +137 3 7.01 84.67 -18.85 0.085 136 +138 3 5.7 91.0 -19.16 0.085 137 +139 3 6.07 92.3 -18.93 0.085 138 +140 3 7.42 97.07 -18.86 0.085 139 +141 3 7.89 97.79 -19.19 0.085 140 +142 3 6.99 103.93 -20.4 0.085 141 +143 3 6.91 104.53 -20.42 0.085 142 +144 3 5.09 108.26 -21.15 0.085 143 +145 3 5.1 108.5 -21.14 0.085 144 +146 3 5.23 111.85 -20.95 0.085 145 +147 3 5.15 15.22 -18.9 1.445 113 +148 3 6.56 24.85 -23.91 0.51 147 +149 3 13.33 29.51 -34.7 0.255 148 +150 3 13.99 29.56 -36.06 0.255 149 +151 3 15.3 37.21 -40.02 0.255 150 +152 3 19.45 43.89 -41.64 0.17 151 +153 3 19.9 44.48 -41.66 0.17 152 +154 3 22.28 48.2 -43.06 0.17 153 +155 3 22.34 48.2 -43.2 0.17 154 +156 3 25.8 59.22 -41.96 0.085 155 +157 3 30.07 62.3 -41.81 0.085 156 +158 3 30.46 62.54 -42.03 0.085 157 +159 3 33.72 68.71 -40.48 0.085 158 +160 3 34.51 69.5 -40.07 0.085 159 +161 3 37.62 73.72 -37.91 0.085 160 +162 3 38.39 74.76 -37.41 0.085 161 +163 3 40.92 77.73 -36.17 0.085 162 +164 3 41.0 77.84 -36.04 0.085 163 +165 3 43.21 78.9 -34.93 0.085 164 +166 3 43.43 79.12 -34.82 0.085 165 +167 3 18.04 53.06 -38.87 0.17 155 +168 3 19.79 57.23 -36.93 0.17 167 +169 3 20.13 57.57 -36.76 0.17 168 +170 3 20.89 61.13 -36.18 0.17 169 +171 3 20.64 61.38 -36.2 0.17 170 +172 3 15.82 67.85 -36.43 0.17 171 +173 3 15.69 67.84 -36.16 0.17 172 +174 3 16.69 71.0 -35.3 0.17 173 +175 3 16.8 71.12 -35.24 0.17 174 +176 3 17.87 75.62 -34.65 0.17 175 +177 3 17.77 75.75 -34.69 0.17 176 +178 3 16.58 81.72 -35.04 0.085 177 +179 3 16.77 81.94 -34.85 0.085 178 +180 3 19.21 87.23 -31.97 0.085 179 +181 3 19.31 87.68 -31.57 0.085 180 +182 3 20.32 91.1 -30.7 0.085 181 +183 3 20.69 91.2 -30.61 0.085 182 +184 3 25.61 93.32 -35.31 0.085 183 +185 3 22.07 93.8 -22.01 0.085 184 +186 3 15.44 56.42 -32.42 0.085 167 +187 3 15.51 56.43 -32.55 0.085 186 +188 3 14.6 58.74 -32.31 0.085 187 +189 3 14.24 58.71 -31.57 0.085 188 +190 3 11.44 59.86 -30.85 0.085 189 +191 3 11.34 59.85 -30.65 0.085 190 +192 3 18.39 42.85 -45.98 0.17 151 +193 3 18.91 42.89 -47.07 0.17 192 +194 3 20.84 44.11 -48.7 0.17 193 +195 3 21.14 44.13 -49.32 0.17 194 +196 3 20.36 47.68 -49.72 0.17 195 +197 3 20.03 48.73 -51.11 0.17 196 +198 3 20.32 48.75 -51.72 0.17 197 +199 3 18.9 51.71 -56.16 0.17 198 +200 3 19.13 51.72 -56.64 0.17 199 +201 3 22.32 54.81 -62.31 0.17 200 +202 3 24.16 58.4 -67.35 0.17 201 +203 3 28.97 61.19 -73.09 0.085 202 +204 3 29.98 62.2 -72.57 0.085 203 +205 3 30.32 62.55 -72.39 0.085 204 +206 3 6.4 28.87 -28.89 0.17 148 +207 3 0.09 32.31 -19.43 0.17 206 +208 3 -0.51 32.37 -17.88 0.17 207 +209 3 -4.24 41.98 -14.94 0.17 208 +210 3 -6.42 49.47 -11.33 0.17 209 +211 3 -7.11 49.42 -9.9 0.17 210 +212 3 -7.79 54.43 -6.42 0.17 211 +213 3 -7.11 57.96 -3.18 0.17 212 +214 3 -7.3 57.94 -2.78 0.17 213 +215 3 -5.99 60.29 -0.46 0.17 214 +216 3 -6.12 61.99 -0.53 0.17 215 +217 3 -6.22 62.12 -0.58 0.17 216 +218 3 -8.94 63.1 -1.18 0.17 217 +219 3 -9.14 63.08 -0.77 0.17 218 +220 3 -7.71 64.96 1.24 0.17 219 +221 3 -7.7 65.2 1.25 0.17 220 +222 3 -6.59 73.58 1.93 0.17 221 +223 3 -6.43 74.17 1.96 0.17 222 +224 3 -7.47 78.57 -0.56 0.17 223 +225 3 -7.52 79.18 -0.65 0.17 224 +226 3 -11.62 83.95 1.0 0.085 225 +227 3 -12.57 87.62 0.68 0.085 226 +228 3 -10.99 91.6 -7.08 0.085 227 +229 3 -21.25 97.31 5.6 0.085 228 +230 3 -22.63 97.2 8.47 0.085 229 +231 3 -24.1 103.45 14.05 0.085 230 +232 3 -23.97 104.63 14.49 0.085 231 +233 3 -22.86 109.77 16.74 0.085 232 +234 3 -23.04 109.99 17.16 0.085 233 +235 3 -23.34 116.37 19.78 0.085 234 +236 3 -22.88 120.07 20.14 0.085 235 +237 3 -22.62 120.29 20.19 0.085 236 +238 3 -20.59 122.33 21.25 0.085 237 +239 3 -19.8 126.12 21.77 0.085 238 +240 3 -19.61 126.11 21.94 0.085 239 +241 3 -17.36 125.36 23.0 0.085 240 +242 3 -9.18 77.54 -4.88 0.17 221 +243 3 -9.28 77.53 -4.67 0.17 242 +244 3 -12.23 82.05 -3.74 0.17 243 +245 3 -12.79 82.01 -2.57 0.17 244 +246 3 -12.51 88.01 -8.77 0.17 245 +247 3 -14.13 95.23 -9.71 0.17 246 +248 3 -14.15 95.84 -9.86 0.17 247 +249 3 -18.86 101.31 -11.85 0.17 248 +250 3 1.8 18.2 -24.61 0.765 147 +251 3 -0.62 18.47 -23.42 0.765 250 +252 3 0.07 27.15 -19.81 0.17 251 +253 3 -0.25 27.13 -19.13 0.17 252 +254 3 1.45 36.09 -18.98 0.17 253 +255 3 -2.0 42.16 -19.57 0.085 254 +256 3 0.0 44.51 -17.59 0.085 255 +257 3 0.07 44.38 -17.48 0.085 256 +258 3 1.42 42.73 -16.89 0.085 257 +259 3 -1.94 17.48 -30.82 0.51 251 +260 3 -2.74 16.53 -34.85 0.255 259 +261 3 -10.34 13.82 -35.25 0.085 260 +262 3 -10.42 13.71 -35.38 0.085 261 +263 3 -12.89 13.15 -40.88 0.085 262 +264 3 -12.73 13.16 -41.22 0.085 263 +265 3 -18.72 14.07 -38.36 0.085 264 +266 3 -19.33 13.92 -37.39 0.085 265 +267 3 -26.81 12.65 -39.78 0.085 266 +268 3 -28.56 12.04 -40.65 0.085 267 +269 3 -37.48 13.2 -42.55 0.085 268 +270 3 -45.73 19.58 -38.97 0.085 269 +271 3 -48.41 23.36 -40.12 0.085 270 +272 3 -48.48 23.49 -40.23 0.085 271 +273 3 -49.97 24.31 -40.91 0.085 272 +274 3 -5.49 12.26 -32.21 0.085 260 +275 3 -5.39 12.14 -32.17 0.085 274 +276 3 -6.31 12.14 -40.28 0.085 275 +277 3 -8.11 11.81 -46.03 0.085 276 +278 3 11.27 7.68 -11.35 0.51 1 +279 3 11.85 8.48 -11.05 0.51 278 +280 3 13.38 11.64 -10.19 0.51 279 +281 3 14.29 18.55 -9.49 0.34 280 +282 3 14.41 18.66 -9.43 0.34 281 +283 3 14.2 24.69 -9.31 0.255 282 +284 3 12.72 25.55 -15.03 0.255 283 +285 4 6.82 -6.9 -8.66 1.7 1 +286 4 9.89 -11.78 -7.62 1.7 285 +287 4 11.05 -12.09 -9.26 1.7 286 +288 4 16.88 -19.51 -12.11 1.275 287 +289 4 16.77 -19.62 -12.16 1.275 288 +290 4 19.95 -25.97 -14.91 1.105 289 +291 4 19.11 -29.36 -9.72 1.105 290 +292 4 15.61 -30.8 -7.84 0.17 291 +293 4 15.59 -31.28 -7.87 0.17 292 +294 4 15.43 -32.84 -8.01 0.17 293 +295 4 15.33 -32.85 -7.8 0.17 294 +296 4 15.85 -33.92 -6.24 0.17 295 +297 4 15.65 -33.93 -5.84 0.17 296 +298 4 12.86 -38.22 -7.0 0.085 297 +299 4 12.42 -41.44 -7.34 0.085 298 +300 4 11.94 -42.61 -7.61 0.085 299 +301 4 10.04 -47.06 -8.7 0.085 300 +302 4 15.97 -38.02 2.4 0.17 297 +303 4 16.11 -38.14 2.38 0.17 302 +304 4 18.5 -39.52 10.3 0.17 303 +305 4 18.28 -39.67 11.02 0.17 304 +306 4 23.68 -38.0 14.19 0.17 305 +307 4 25.13 -41.31 16.28 0.085 306 +308 4 24.08 -41.39 18.47 0.085 307 +309 4 24.27 -47.54 20.59 0.085 308 +310 4 23.45 -47.74 22.55 0.085 309 +311 4 23.09 -51.15 29.82 0.085 310 +312 4 23.38 -52.01 29.93 0.085 311 +313 4 22.89 -55.34 33.85 0.085 312 +314 4 22.58 -55.53 35.3 0.085 313 +315 4 26.09 -61.42 41.4 0.085 314 +316 4 26.19 -61.55 41.44 0.085 315 +317 4 28.18 -63.48 42.33 0.085 316 +318 4 27.99 -64.21 42.63 0.085 317 +319 4 25.52 -67.57 44.0 0.085 318 +320 4 25.23 -67.86 45.12 0.085 319 +321 4 26.46 -74.54 47.23 0.085 320 +322 4 26.91 -74.33 47.45 0.085 321 +323 4 23.7 -33.98 -16.6 0.765 291 +324 4 23.84 -34.1 -16.62 0.765 323 +325 4 28.56 -40.51 -21.74 1.19 324 +326 4 32.85 -45.96 -28.37 0.765 325 +327 4 32.93 -46.09 -28.26 0.765 326 +328 4 35.52 -50.8 -32.07 0.765 327 +329 4 35.62 -50.92 -32.02 0.765 328 +330 4 37.07 -51.79 -32.86 0.085 329 +331 4 37.84 -53.1 -32.54 0.51 330 +332 4 38.6 -54.41 -32.22 0.51 331 +333 4 31.04 -53.38 -36.93 0.17 331 +334 4 29.27 -54.59 -40.09 0.17 333 +335 4 29.16 -54.71 -40.15 0.17 334 +336 4 23.09 -61.28 -37.01 0.17 335 +337 4 23.01 -61.39 -37.15 0.17 336 +338 4 22.02 -64.69 -37.75 0.17 337 +339 4 19.18 -65.23 -39.14 0.085 338 +340 4 19.1 -65.34 -39.26 0.085 339 +341 4 16.36 -68.94 -39.88 0.085 340 +342 4 14.33 -68.92 -40.93 0.085 341 +343 4 39.4 -52.66 -31.7 0.085 330 +344 4 39.51 -52.55 -31.64 0.085 343 +345 4 43.96 -47.66 -29.39 0.085 344 +346 4 45.15 -46.9 -28.71 0.085 345 +347 4 50.87 -42.1 -25.77 0.085 346 +348 4 50.76 -41.97 -25.82 0.085 347 +349 4 31.6 -41.12 -21.47 0.17 325 +350 4 31.49 -40.78 -20.93 0.17 349 +351 4 30.29 -39.6 -17.42 0.17 350 +352 4 30.46 -39.52 -16.92 0.17 351 +353 4 31.46 -38.61 -12.2 0.17 352 +354 4 31.38 -38.78 -11.23 0.17 353 +355 4 33.22 -37.03 -9.26 0.17 354 +356 4 33.48 -36.81 -9.22 0.17 355 +357 4 34.84 -28.82 -32.16 0.085 324 +358 4 34.9 -28.82 -32.29 0.085 357 +359 4 37.03 -26.48 -32.52 0.085 358 +360 4 37.73 -26.42 -33.96 0.085 359 +361 4 43.35 -21.89 -34.78 0.085 360 +362 4 43.52 -21.88 -35.12 0.085 361 +363 4 46.08 -20.22 -36.35 0.085 362 +364 4 46.48 -20.19 -37.17 0.085 363 +365 4 48.16 -15.95 -38.72 0.085 364 +366 4 48.27 -15.84 -38.66 0.085 365 +367 4 50.92 -14.57 -37.33 0.085 366 +368 4 51.0 -14.7 -37.22 0.085 367 diff --git a/main.cu b/main.cu index d66c0ad..9f4bbd3 100644 --- a/main.cu +++ b/main.cu @@ -51,6 +51,7 @@ std::vector _t_gt; // store indices of nearest edge points in _ float resample_rate = 0.5f; //sample rate for the network (fraction of sigma used as the maximum sample rate) float camera_factor = 1.2f; //start point of the camera as a function of X and Y size float orbit_factor = 0.01f; //degrees per pixel used to orbit the camera +float zoom_factor = 5.0; //mouse click bool LButtonDown = false; // true when left button down @@ -60,9 +61,6 @@ bool RButtonDown = false; int mouse_x; int mouse_y; -// mouse wheel move -float des = 0.0f; - // render modes bool compareMode = true; // default mode is compare mode bool mappingMode = false; @@ -124,7 +122,6 @@ void glut_render_modelview(){ stim::vec3 focus = cam.getLookAt(); //get the camera focal point stim::vec3 up = cam.getUp(); //get the camera "up" orientation - eye[2] += des; //get camera closer to target by factor des gluLookAt(eye[0], eye[1], eye[2], focus[0], focus[1], focus[2], up[0], up[1], up[2]); //set up the OpenGL camera } @@ -390,7 +387,7 @@ void glut_mouse(int button, int state, int x, int y){ // define camera move based on mouse wheel move(actually we can combine this with glut_mouse) void glut_wheel(int wheel, int direction, int x, int y) { - float cam_move_fac; // camera move unit length + /*float cam_move_fac; // camera move unit length stim::vec3 eye = cam.getPosition(); // get the camera position (eye point) stim::vec3 focus = cam.getLookAt(); // get the camera focal point cam_move_fac = fabs(focus[2] - eye[2]) / 50; // divided by 50 @@ -398,7 +395,15 @@ void glut_wheel(int wheel, int direction, int x, int y) { if (direction > 0) // if it is button 3(up) des -= cam_move_fac; else // if it is button 4(down) - des += cam_move_fac; + des += cam_move_fac;*/ + float delta; + + if (direction > 0) // if it is button 3(up) + delta = -zoom_factor; + else // if it is button 4(down) + delta = zoom_factor; + + cam.Push(delta); glutPostRedisplay(); } @@ -476,8 +481,7 @@ void glut_initialize(){ glutAddMenuEntry("Exit", 3); //register menu 3 as exiting glutAttachMenu(GLUT_RIGHT_BUTTON); //register right mouse to open menu option } - if (swc_ind == 1) //only in rendering swc files, mouse wheel will be used - glutMouseWheelFunc(glut_wheel); + glutMouseWheelFunc(glut_wheel); texture_initialize(); //set up texture mapping (create texture maps, enable features) -- libgit2 0.21.4