diff --git a/cmake-build-release/Testing/Temporary/LastTest.log b/cmake-build-release/Testing/Temporary/LastTest.log index e5da0f2..1ee4ecb 100644 --- a/cmake-build-release/Testing/Temporary/LastTest.log +++ b/cmake-build-release/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Jan 25 14:42 EST +Start testing: Jan 25 14:48 EST ---------------------------------------------------------- -End testing: Jan 25 14:42 EST +End testing: Jan 25 14:48 EST diff --git a/src/main.cpp b/src/main.cpp index e1f2ee5..d4211b3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -126,11 +126,16 @@ struct node std::cout << function_name_map[to_underlying(type)] << " "; else { - evaluate(); if (type == function_t::SCALAR) + { + evaluate(); std::cout << img->get().x() << " "; - else + } else if (type == function_t::COLOR) + { + evaluate(); std::cout << '{' << img->get().x() << ", " << img->get().y() << ", " << img->get().z() << "} "; + } else + std::cout << function_name_map[to_underlying(type)] << " "; } for (size_t i = 0; i < argc; i++) sub_nodes[i]->print_tree();