Compare View
Commits (3)
Showing
2 changed files
Show diff stats
stim/envi/envi.h
| @@ -374,7 +374,10 @@ public: | @@ -374,7 +374,10 @@ public: | ||
| 374 | return ((bsq<double>*)file)->open(fname, header.samples, header.lines, header.bands, header.header_offset, header.wavelength); | 374 | return ((bsq<double>*)file)->open(fname, header.samples, header.lines, header.bands, header.header_offset, header.wavelength); |
| 375 | } | 375 | } |
| 376 | else | 376 | else |
| 377 | + { | ||
| 378 | + std::cout << "ERROR: The specified data format (" << header.data_type << ") is not supported" << std::endl; | ||
| 377 | return false; | 379 | return false; |
| 380 | + } | ||
| 378 | } | 381 | } |
| 379 | 382 | ||
| 380 | else if(header.interleave == envi_header::BIL) { //if the infile is bil file | 383 | else if(header.interleave == envi_header::BIL) { //if the infile is bil file |
| @@ -384,8 +387,10 @@ public: | @@ -384,8 +387,10 @@ public: | ||
| 384 | else if(header.data_type == envi_header::float64) { | 387 | else if(header.data_type == envi_header::float64) { |
| 385 | return ((bil<double>*)file)->open(fname, header.samples, header.lines, header.bands, header.header_offset, header.wavelength); | 388 | return ((bil<double>*)file)->open(fname, header.samples, header.lines, header.bands, header.header_offset, header.wavelength); |
| 386 | } | 389 | } |
| 387 | - else | 390 | + { |
| 391 | + std::cout << "ERROR: The specified data format (" << header.data_type << ") is not supported" << std::endl; | ||
| 388 | return false; | 392 | return false; |
| 393 | + } | ||
| 389 | } | 394 | } |
| 390 | 395 | ||
| 391 | else if(header.interleave == envi_header::BIP) { //if the infile is bip file | 396 | else if(header.interleave == envi_header::BIP) { //if the infile is bip file |
| @@ -395,8 +400,10 @@ public: | @@ -395,8 +400,10 @@ public: | ||
| 395 | else if(header.data_type == envi_header::float64) { | 400 | else if(header.data_type == envi_header::float64) { |
| 396 | return ((bip<double>*)file)->open(fname, header.samples, header.lines, header.bands, header.header_offset, header.wavelength); | 401 | return ((bip<double>*)file)->open(fname, header.samples, header.lines, header.bands, header.header_offset, header.wavelength); |
| 397 | } | 402 | } |
| 398 | - else | 403 | + { |
| 404 | + std::cout << "ERROR: The specified data format (" << header.data_type << ") is not supported" << std::endl; | ||
| 399 | return false; | 405 | return false; |
| 406 | + } | ||
| 400 | } | 407 | } |
| 401 | 408 | ||
| 402 | return true; | 409 | return true; |
stim/visualization/gl_network.h
| 1 | #ifndef JACK_GL_NETWORK | 1 | #ifndef JACK_GL_NETWORK |
| 2 | #define JACK_GL_NETWORK | 2 | #define JACK_GL_NETWORK |
| 3 | 3 | ||
| 4 | -#include"network.h" | 4 | +#include<stim/biomodels/network.h> |
| 5 | #include<GL/glut.h> | 5 | #include<GL/glut.h> |
| 6 | #include<stim/visualization/aaboundingbox.h> | 6 | #include<stim/visualization/aaboundingbox.h> |
| 7 | 7 |