Skip to content

Commit

Permalink
ENH: Fix too much logging in debug mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@Punzo
Punzo committed Jan 22, 2024
1 parent 1637c3f commit b65c0f6
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 39 deletions.
18 changes: 9 additions & 9 deletions Libs/Core/ctkLogger.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ctkLoggerPrivate
~ctkLoggerPrivate() = default;

#ifndef QT_NO_DEBUG
ctkErrorLogLevel::LogLevel LogLevel{ctkErrorLogLevel::LogLevel::Info};
ctkErrorLogLevel::LogLevel LogLevel{ctkErrorLogLevel::LogLevel::Debug};
#else
ctkErrorLogLevel::LogLevel LogLevel{ctkErrorLogLevel::LogLevel::Warning};
#endif
Expand All @@ -50,32 +50,32 @@ ctkLogger::ctkLogger(QString name, QObject* _parent)
ctkLogger::~ctkLogger() = default;

//-----------------------------------------------------------------------------
void ctkLogger::debug(const QString& s)
void ctkLogger::trace(const QString& s)
{
Q_D(ctkLogger);
if (d->LogLevel <= ctkErrorLogLevel::LogLevel::Debug)
if (d->LogLevel <= ctkErrorLogLevel::LogLevel::Trace)
{
qDebug().nospace() << qUtf8Printable(s);
}
}

//-----------------------------------------------------------------------------
void ctkLogger::info(const QString& s)
void ctkLogger::debug(const QString& s)
{
Q_D(ctkLogger);
if (d->LogLevel <= ctkErrorLogLevel::LogLevel::Info)
if (d->LogLevel <= ctkErrorLogLevel::LogLevel::Debug)
{
qInfo().nospace() << qUtf8Printable(s);
qDebug().nospace() << qUtf8Printable(s);
}
}

//-----------------------------------------------------------------------------
void ctkLogger::trace(const QString& s)
void ctkLogger::info(const QString& s)
{
Q_D(ctkLogger);
if (d->LogLevel <= ctkErrorLogLevel::LogLevel::Trace)
if (d->LogLevel <= ctkErrorLogLevel::LogLevel::Info)
{
qDebug().nospace() << qUtf8Printable(s);
qInfo().nospace() << qUtf8Printable(s);
}
}

Expand Down
60 changes: 30 additions & 30 deletions Libs/DICOM/Core/ctkDICOMDatabase.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ bool ctkDICOMDatabasePrivate::loggedExec(QSqlQuery& query, const QString& queryS
if (!success)
{
QSqlError sqlError = query.lastError();
logger.debug("SQL failed\n Bad SQL: " + query.lastQuery());
logger.debug("Error text: " + sqlError.text());
logger.trace("SQL failed\n Bad SQL: " + query.lastQuery());
logger.trace("Error text: " + sqlError.text());
}
else
{
logger.debug("SQL worked!\n SQL: " + query.lastQuery());
logger.trace("SQL worked!\n SQL: " + query.lastQuery());
}
return (success);
}
Expand All @@ -180,12 +180,12 @@ bool ctkDICOMDatabasePrivate::loggedExecBatch(QSqlQuery& query)
if (!success)
{
QSqlError sqlError = query.lastError();
logger.debug( "SQL failed\n Bad SQL: " + query.lastQuery());
logger.debug( "Error text: " + sqlError.text());
logger.trace( "SQL failed\n Bad SQL: " + query.lastQuery());
logger.trace( "Error text: " + sqlError.text());
}
else
{
logger.debug("SQL worked!\n SQL: " + query.lastQuery());
logger.trace("SQL worked!\n SQL: " + query.lastQuery());
}
return (success);
}
Expand Down Expand Up @@ -280,7 +280,7 @@ bool ctkDICOMDatabasePrivate::executeScript(const QString script)
{
if (! (*it).startsWith("--") )
{
logger.debug(*it + "\n");
logger.trace(*it + "\n");
query.exec(*it);
if (query.lastError().type())
{
Expand Down Expand Up @@ -331,12 +331,12 @@ bool ctkDICOMDatabasePrivate::insertPatient(const ctkDICOMItem& dataset, int& db
{
// we found him
dbPatientID = checkPatientExistsQuery.value(checkPatientExistsQuery.record().indexOf("UID")).toInt();
logger.debug("Found patient in the database as UId: " + QString::number(dbPatientID));
logger.trace("Found patient in the database as UId: " + QString::number(dbPatientID));
foreach(QString key, this->InsertedPatientsCompositeIDCache.keys())
{
logger.debug("Patient ID cache item: " + key + "->" + this->InsertedPatientsCompositeIDCache[key]);
logger.trace("Patient ID cache item: " + key + "->" + this->InsertedPatientsCompositeIDCache[key]);
}
logger.debug("New patient ID cache item: " + compositeID + "->" + dbPatientID);
logger.trace("New patient ID cache item: " + compositeID + "->" + dbPatientID);
this->InsertedPatientsCompositeIDCache[compositeID] = dbPatientID;
return false;
}
Expand Down Expand Up @@ -366,7 +366,7 @@ bool ctkDICOMDatabasePrivate::insertPatient(const ctkDICOMItem& dataset, int& db
loggedExec(insertPatientStatement);
dbPatientID = insertPatientStatement.lastInsertId().toInt();
this->InsertedPatientsCompositeIDCache[compositeID] = dbPatientID;
logger.debug("New patient inserted: database item ID = " + QString().setNum(dbPatientID));
logger.trace("New patient inserted: database item ID = " + QString().setNum(dbPatientID));
return true;
}
}
Expand All @@ -381,7 +381,7 @@ bool ctkDICOMDatabasePrivate::insertStudy(const ctkDICOMItem& dataset, int dbPat
checkStudyExistsQuery.exec();
if (!checkStudyExistsQuery.next())
{
logger.debug("Need to insert new study: " + studyInstanceUID);
logger.trace("Need to insert new study: " + studyInstanceUID);

QString studyID(dataset.GetElementAsString(DCM_StudyID) );
QString studyDate(dataset.GetElementAsString(DCM_StudyDate) );
Expand Down Expand Up @@ -423,7 +423,7 @@ bool ctkDICOMDatabasePrivate::insertStudy(const ctkDICOMItem& dataset, int dbPat
}
else
{
logger.debug("Used existing study: " + studyInstanceUID);
logger.trace("Used existing study: " + studyInstanceUID);
this->InsertedStudyUIDsCache.insert(studyInstanceUID);
return false;
}
Expand All @@ -436,11 +436,11 @@ bool ctkDICOMDatabasePrivate::insertSeries(const ctkDICOMItem& dataset, QString
QSqlQuery checkSeriesExistsQuery(this->Database);
checkSeriesExistsQuery.prepare( "SELECT * FROM Series WHERE SeriesInstanceUID = ?" );
checkSeriesExistsQuery.bindValue( 0, seriesInstanceUID );
logger.debug("Statement: " + checkSeriesExistsQuery.lastQuery() );
logger.trace("Statement: " + checkSeriesExistsQuery.lastQuery() );
checkSeriesExistsQuery.exec();
if (!checkSeriesExistsQuery.next())
{
logger.debug("Need to insert new series: " + seriesInstanceUID);
logger.trace("Need to insert new series: " + seriesInstanceUID);

QString seriesDate(dataset.GetElementAsString(DCM_SeriesDate) );
QString seriesTime(dataset.GetElementAsString(DCM_SeriesTime) );
Expand Down Expand Up @@ -490,7 +490,7 @@ bool ctkDICOMDatabasePrivate::insertSeries(const ctkDICOMItem& dataset, QString
}
else
{
logger.debug("Used existing series: " + seriesInstanceUID);
logger.trace("Used existing series: " + seriesInstanceUID);
this->InsertedSeriesUIDsCache.insert(seriesInstanceUID);
return false;
}
Expand Down Expand Up @@ -720,23 +720,23 @@ bool ctkDICOMDatabasePrivate::insertPatientStudySeries(const ctkDICOMItem& datas
}
else
{
logger.debug("Insert new patient if not already in database: " + patientID + " " + patientsName);
logger.trace("Insert new patient if not already in database: " + patientID + " " + patientsName);
if (this->insertPatient(dataset, dbPatientID))
{
databaseWasChanged = true;
emit q->patientAdded(dbPatientID, patientID, patientsName, patientsBirthDate);
}
}

logger.debug("Going to insert this instance with dbPatientID: " + QString::number(dbPatientID));
logger.trace("Going to insert this instance with dbPatientID: " + QString::number(dbPatientID));

// Insert new study if needed
QString studyInstanceUID(dataset.GetElementAsString(DCM_StudyInstanceUID));
if (!this->InsertedStudyUIDsCache.contains(studyInstanceUID))
{
if (this->insertStudy(dataset, dbPatientID))
{
logger.debug("Study Added");
logger.trace("Study Added");
databaseWasChanged = true;
// let users of this class track when things happen
emit q->studyAdded(studyInstanceUID);
Expand All @@ -748,7 +748,7 @@ bool ctkDICOMDatabasePrivate::insertPatientStudySeries(const ctkDICOMItem& datas
{
if (this->insertSeries(dataset, studyInstanceUID))
{
logger.debug("Series Added");
logger.trace("Series Added");
databaseWasChanged = true;
emit q->seriesAdded(seriesInstanceUID);
}
Expand Down Expand Up @@ -834,7 +834,7 @@ void ctkDICOMDatabasePrivate::insert(const ctkDICOMItem& dataset, const QString&
QString sopInstanceUID(dataset.GetElementAsString(DCM_SOPInstanceUID));

// Check to see if the file has already been loaded
logger.debug("inserting filePath: " + filePath);
logger.trace("inserting filePath: " + filePath);

// Check if the file has been already indexed and skip indexing if it is
bool datasetInDatabase = false;
Expand All @@ -851,13 +851,13 @@ void ctkDICOMDatabasePrivate::insert(const ctkDICOMItem& dataset, const QString&
{
if (datasetUpToDate)
{
logger.debug("File " + databaseFilename + " already added");
logger.trace("File " + databaseFilename + " already added");
return;
}
// File is updated, delete record and re-index
if (!this->removeImage(sopInstanceUID))
{
logger.debug("File " + filePath + " cannot be added, failed to update existing values in the database");
logger.trace("File " + filePath + " cannot be added, failed to update existing values in the database");
return;
}
}
Expand All @@ -884,7 +884,7 @@ void ctkDICOMDatabasePrivate::insert(const ctkDICOMItem& dataset, const QString&
bool databaseWasChanged = this->insertPatientStudySeries(dataset, patientID, patientsName);
if (!sopInstanceUID.isEmpty() && !seriesInstanceUID.isEmpty() && !storedFilePath.isEmpty())
{
logger.debug("Maybe add Instance");
logger.trace("Maybe add Instance");
bool alreadyInserted = false;
if (!storeFile)
{
Expand Down Expand Up @@ -933,7 +933,7 @@ void ctkDICOMDatabasePrivate::insert(const ctkDICOMItem& dataset, const QString&
// let users of this class track when things happen
emit q->instanceAdded(sopInstanceUID);

logger.debug("Instance Added");
logger.trace("Instance Added");
databaseWasChanged = true;
}
if (generateThumbnail)
Expand Down Expand Up @@ -2373,11 +2373,11 @@ void ctkDICOMDatabase::insert( const QString& filePath, bool storeFile, bool gen
/// first we check if the file is already in the database
if (fileExistsAndUpToDate(filePath))
{
logger.debug( "File " + filePath + " already added.");
logger.trace( "File " + filePath + " already added.");
return;
}

logger.debug( "Processing " + filePath );
logger.trace( "Processing " + filePath );

ctkDICOMItem dataset;

Expand Down Expand Up @@ -2517,7 +2517,7 @@ void ctkDICOMDatabase::insert(const QList<ctkDICOMDatabase::IndexingResult>& ind
insertImageStatement.addBindValue(QDateTime::currentDateTime());
insertImageStatement.exec();
emit instanceAdded(sopInstanceUID);
logger.debug( "Instance Added" );
logger.trace( "Instance Added" );
databaseWasChanged = true;

if (generateThumbnail)
Expand Down Expand Up @@ -2737,7 +2737,7 @@ void ctkDICOMDatabase::insert(QList<QSharedPointer<ctkDICOMJobResponseSet>> jobR
(!storedFilePath.isEmpty() ||
!url.isEmpty()))
{
logger.debug( "Maybe add Instance" );
logger.trace( "Maybe add Instance" );
bool alreadyInserted = false;
if (!storeFile)
{
Expand Down Expand Up @@ -2785,7 +2785,7 @@ void ctkDICOMDatabase::insert(QList<QSharedPointer<ctkDICOMJobResponseSet>> jobR

// let users of this class track when things happen
emit instanceAdded(sopInstanceUID);
logger.debug( "Instance Added" );
logger.trace( "Instance Added" );
databaseWasChanged = true;
}
if (generateThumbnail)
Expand Down

0 comments on commit b65c0f6

Please sign in to comment.