Skip to content

Commit

Permalink
Merge pull request #85 from aglowacki/master
Browse files Browse the repository at this point in the history
Multiple updates
  • Loading branch information
aglowacki authored Jul 1, 2024
2 parents cd35210 + 6a1a08d commit 67fc2b9
Show file tree
Hide file tree
Showing 237 changed files with 6,000 additions and 2,337 deletions.
22 changes: 11 additions & 11 deletions src/core/CAEmitDataChangeHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef TXM_CA_EMIT_DATA_CHANGE_HANDLER_H
#define TXM_CA_EMIT_DATA_CHANGE_HANDLER_H

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

#include <handlers/base/CAEventHandler.h>

Expand All @@ -17,7 +17,7 @@

#include <iostream>

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

/**
* @brief Template class for data change handler.
Expand Down Expand Up @@ -62,7 +62,7 @@ class CAEmitDataChangeHandler

};

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

/**
* Partial Template specialization
Expand Down Expand Up @@ -107,7 +107,7 @@ class CAEmitDataChangeHandler<QString, K>

};

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

template <class T, class K>
CAEmitDataChangeHandler<T,K>::CAEmitDataChangeHandler(K* model,
Expand All @@ -117,7 +117,7 @@ CAEmitDataChangeHandler<T,K>::CAEmitDataChangeHandler(K* model,

}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

template <class T, class K>
void CAEmitDataChangeHandler<T,K>::onFailure()
Expand All @@ -127,7 +127,7 @@ void CAEmitDataChangeHandler<T,K>::onFailure()

}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

template <class T, class K>
void CAEmitDataChangeHandler<T,K>::onSuccess()
Expand All @@ -138,7 +138,7 @@ void CAEmitDataChangeHandler<T,K>::onSuccess()

}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

template <class K>
CAEmitDataChangeHandler<QString, K>::CAEmitDataChangeHandler(K* model,
Expand All @@ -148,7 +148,7 @@ CAEmitDataChangeHandler<QString, K>::CAEmitDataChangeHandler(K* model,

}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

template <class K>
void CAEmitDataChangeHandler<QString, K>::onFailure()
Expand All @@ -158,7 +158,7 @@ void CAEmitDataChangeHandler<QString, K>::onFailure()

}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

template <class K>
void CAEmitDataChangeHandler<QString, K>::onSuccess()
Expand All @@ -175,8 +175,8 @@ void CAEmitDataChangeHandler<QString, K>::onSuccess()

}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

#endif

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
12 changes: 6 additions & 6 deletions src/core/ColorMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include <QStringList>
#include <QDir>

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

ColorMap* ColorMap::_inst = nullptr;

Expand All @@ -60,15 +60,15 @@ ColorMap::ColorMap()

}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

ColorMap::~ColorMap()
{


}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

ColorMap* ColorMap::inst()
{
Expand All @@ -80,7 +80,7 @@ ColorMap* ColorMap::inst()

}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

QVector<QRgb>* ColorMap::get_color_map(QString name)
{
Expand All @@ -91,7 +91,7 @@ QVector<QRgb>* ColorMap::get_color_map(QString name)
return nullptr;
}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

void ColorMap::reload_color_maps()
{
Expand Down Expand Up @@ -144,4 +144,4 @@ void ColorMap::reload_color_maps()

}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
8 changes: 4 additions & 4 deletions src/core/ColorMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
#include <QVector>
#include <QRgb>

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------

/**
* @brief Singleton class to call python scripts.
Expand Down Expand Up @@ -91,8 +91,8 @@ class ColorMap

};

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

#endif

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
8 changes: 4 additions & 4 deletions src/core/CorrelationCoefficient.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#include <Eigen/Core>

/*---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------

template<typename _T>
_T find_coefficient(const Eigen::Array<_T, Eigen::Dynamic, Eigen::RowMajor>& x_arr, const Eigen::Array<_T, Eigen::Dynamic, Eigen::RowMajor>& y_arr)
Expand All @@ -27,8 +27,8 @@ _T find_coefficient(const Eigen::Array<_T, Eigen::Dynamic, Eigen::RowMajor>& x_a
return corr;
}

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

#endif

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
6 changes: 3 additions & 3 deletions src/core/GlobalThreadPool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* See LICENSE file.
*---------------------------------------------------------------------------*/

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
#include "core/GlobalThreadPool.h"

std::mutex Global_Thread_Pool::_mutex;

Global_Thread_Pool* Global_Thread_Pool::_this_inst(nullptr);
/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------

Global_Thread_Pool::Global_Thread_Pool() : ThreadPool(std::thread::hardware_concurrency() - 1)
{
Expand All @@ -31,4 +31,4 @@ Global_Thread_Pool* Global_Thread_Pool::inst()



/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
4 changes: 2 additions & 2 deletions src/core/GlobalThreadPool.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#ifndef Global_Thread_Pool_H
#define Global_Thread_Pool_H

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
#include "core/defines.h"
#include "workflow/threadpool.h"

Expand All @@ -30,4 +30,4 @@ class DLL_EXPORT Global_Thread_Pool : public ThreadPool

#endif

/*---------------------------------------------------------------------------*/
//---------------------------------------------------------------------------
Loading

0 comments on commit 67fc2b9

Please sign in to comment.