Commit 63f9c882 authored by Tomáš Jakubec's avatar Tomáš Jakubec
Browse files

Console text colouring.

parent d8ea4801

Unstructured_mesh/Unstructured_mesh.pro.user

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE QtCreatorProject>

<!-- Written by QtCreator 4.10.0, 2019-11-19T16:14:18. -->

<!-- Written by QtCreator 4.10.0, 2019-11-20T00:19:29. -->

<qtcreator>

 <data>

  <variable>EnvironmentId</variable>

Unstructured_mesh/main.cpp

+5 −2
Original line number Diff line number Diff line 
#include <iostream>

//#define UNDEBUG

//#define CONSOLE_COLOURED_OUTPUT

#include "../src/Debug/Debug.h"

#include "../src/UnstructuredMesh/UnstructuredMesh.h"

#include "../src/UnstructuredMesh/MeshFunctions/MeshFunctions.h"
@@ -13,6 +14,7 @@ 
#include "../src/Traits/MemberApproach/MemberApproach.h"

#include <fstream>

#include <list>

#include <windows.h>

using namespace std;
@@ -930,12 +932,13 @@ int main() 
    //testMesh2D();

    //testMesh2DLoadAndWrite();

    //testMesh3D();

    //test3DMeshDeformedPrisms();

    test3DMeshDeformedPrisms();

    //testMeshRefine();

    //testMeshDataContainer();

    //UnstructuredMesh<5, size_t, double, 6,5,4> m;

    //m.ComputeElementMeasures();

    //test3DMeshLoad();



    testFPMA_poly();

    //testFPMA_poly();



}

src/Debug/ConsoleLogger.h

+41 −7
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ 
#define CONSOLELOGGER_H

#include "VariableExport.h"



// TODO prefer exportable class to iterable

#ifdef _WIN32

#ifdef CONSOLE_COLOURED_OUTPUT

#include <windows.h>

#endif

#endif

/**

 * @brief The ConsoleLogger class

 */
@@ -38,10 +42,26 @@ public: 
    template<typename VAR_NAME, typename VAR>

    static void writeVar(int line, const char* cppFile, VAR_NAME name,const VAR& value){



#ifdef __linux__

        std::cerr << "In file " << cppFile << " at line " << line << " variable \033[0;33m" << name << "\033[0m has value of \033[0;31m";

        VariableExport::_writeWar(std::cerr, value);





#ifdef CONSOLE_COLOURED_OUTPUT

#ifdef _WIN32

        HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);

        std::cerr << "In file " << cppFile << " at line " << line << " variable " << name << " has value of ";

        SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY);

        std::cerr << name;

        SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);

        std::cerr << " has value of ";

        SetConsoleTextAttribute(hConsole, FOREGROUND_GREEN);

        VariableExport::exportVariable(std::cerr, value);

        SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);

        std::cerr << "\n";

#else

        std::cerr << "In file " << cppFile << " at line " << line << " variable \033[0;33m" << name << "\033[0m has value of \033[0;32m";

        VariableExport::exportVariable(std::cerr, value);

        std::cerr << "\033[0m\n";



#endif

#else

        std::cerr << "In file " << cppFile << " at line " << line << " variable " << name << " has value of ";

        VariableExport::exportVariable(std::cerr, value);
@@ -52,10 +72,24 @@ public: 
    template<typename VAR_NAME, typename VAR>

    static void writeVar(int line, const char* cppFile, VAR_NAME name,const std::initializer_list<VAR>& value){



#ifdef __linux__

        std::cerr << "In file " << cppFile << " at line " << line << " variable \033[0;33m" << name << "\033[0m has value of \033[0;31m";

        VariableExport::_writeWar(std::cerr, value);

#ifdef CONSOLE_COLOURED_OUTPUT

#ifdef _WIN32

        HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);

        std::cerr << "In file " << cppFile << " at line " << line << " variable " << name << " has value of ";

        SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_INTENSITY);

        std::cerr << name;

        SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);

        std::cerr << " has value of ";

        SetConsoleTextAttribute(hConsole, FOREGROUND_GREEN);

        VariableExport::exportVariable(std::cerr, value);

        SetConsoleTextAttribute(hConsole, FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE);

        std::cerr << "\n";

#else

        std::cerr << "In file " << cppFile << " at line " << line << " variable \033[0;33m" << name << "\033[0m has value of \033[0;32m";

        VariableExport::exportVariable(std::cerr, value);

        std::cerr << "\033[0m\n";



#endif

#else

        std::cerr << "In file " << cppFile << " at line " << line << " variable " << name << " has value of ";

        VariableExport::exportVariable(std::cerr, value);

src/Debug/Debug.h

+4 −0
Original line number Diff line number Diff line
@@ -105,6 +105,10 @@ abort();} 
#define HTMLDBGVAR(...)



#define HTMLDBGCOND(condition, ...)



#define CSVDBGVAR(...)



#define CSVDBGCOND(condition, ...)

#endif //UNDEBUG



#endif // DEBUG_H

src/UnstructuredMesh/MeshDataContainer/MeshDataIO/VTKMeshDataReader.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class VTKMeshDataReader { 
    }

private:



    template<typename T,unsigned int Index = 0, typename VOID = void>

    template<typename T,unsigned int Index = 0, typename Void = void>

    struct readCellData{};



    template<typename T,unsigned int Index, typename... Types>