Commit 6d363bb4 authored by Emmanuel Promayon's avatar Emmanuel Promayon

FIXED mispelling and API (serie -> series, instanciate -> instantiate, substract -> subtract)

parent a39b04f0
camitk_extension(COMPONENT_EXTENSION
NEEDS_GDCM
CEP_NAME CEP_IMAGING
DESCRIPTION "This allows one to read a single DICOM image file (.dcm) using the library GDCM 2.2.x"
DESCRIPTION "This extension adds support for DICOM single image file (.dcm) and series thanks to the gdcm library"
INSTALL_ALL_HEADERS
ENABLE_AUTO_TEST
)
......
......@@ -44,18 +44,18 @@
using namespace camitk;
// --------------- Constructor -------------------
DicomComponent::DicomComponent(DicomSerie* dicomSerie) : ImageComponent("") {
DicomComponent::DicomComponent(DicomSeries* dicomSeries) : ImageComponent("") {
// associated the component's dicom series
serie = dicomSerie;
series = dicomSeries;
std::vector<std::string> stdFileNames = dicomSerie->getStdFileNames();
std::vector<std::string> stdFileNames = dicomSeries->getStdFileNames();
// scan files for series description
gdcm::Scanner scanner;
gdcm::Tag serieDescriptionTag = gdcm::Tag(0x0008, 0x103e);
scanner.AddTag(serieDescriptionTag);
gdcm::Tag seriesDescriptionTag = gdcm::Tag(0x0008, 0x103e);
scanner.AddTag(seriesDescriptionTag);
scanner.Scan(stdFileNames);
setName(QString(scanner.GetValue(stdFileNames.at(0).c_str(), serieDescriptionTag)));
setName(QString(scanner.GetValue(stdFileNames.at(0).c_str(), seriesDescriptionTag)));
// Use Image Position Patient filter (IPPSorter) to correctly sort slices according to their Z spacing
// Also deduce the actual Z spacing
......@@ -150,8 +150,8 @@ DicomComponent::DicomComponent(DicomSerie* dicomSerie) : ImageComponent("") {
// --------------- destructor -------------------
DicomComponent::~DicomComponent() {
if (serie) {
delete serie;
if (series != nullptr) {
delete series;
}
}
......
......@@ -30,7 +30,7 @@
#include <ImageComponent.h>
class DicomSerie;
class DicomSeries;
class vtkGDCMImageReader;
/**
......@@ -50,15 +50,15 @@ public:
/**
* Create a new Component that handles DICOM images
* This method may throw an AbortException if a problem occurs.
* @param dSerie to the associated DicomSerie
* @param dSeries to the associated DicomSerie
**/
DicomComponent(DicomSerie* dSerie);
DicomComponent(DicomSeries* dSeries);
/**
* @brief Get the DicomSerie associated to this component.
* @brief Get the DicomSeries associated to this component.
*/
DicomSerie* getSerie() {
return serie;
DicomSeries* getSeries() {
return series;
}
/// Default Destructor
......@@ -81,7 +81,7 @@ private:
/**
* @brief Read the direct cosines angles from the input image
* @param fileNames the SERIE slices
* @param fileNames the SERIES slices
* @return the corresponding ImageOrientation, rounded modulo 90 degrees
*/
camitk::ImageOrientationHelper::PossibleImageOrientations readDirectCosinesAngle(const std::vector< std::string >& fileNames) const;
......@@ -94,9 +94,9 @@ private:
double roundCosine(const double& value) const;
/**
* @brief The associated DicomSerie to this component.
* @brief The associated DicomSeries to this component.
*/
DicomSerie* serie;
DicomSeries* series;
};
#endif // DICOMCOMPONENT_H
......
......@@ -28,7 +28,7 @@
#include "DicomParser.h"
#include "DicomDialog.h"
#include "DicomDialogEntry.h"
#include "DicomSerie.h"
#include "DicomSeries.h"
#include <Application.h>
// include generated components headers
......@@ -54,45 +54,45 @@ QStringList DicomComponentExtension::getFileExtensions() const {
// --------------- Open -------------------
Component* DicomComponentExtension::open(const QString& path) {
serieParsed = DicomParser::parseDirectory(path);
seriesParsed = DicomParser::parseDirectory(path);
// create a Dialog entry for each series parsed
foreach (DicomSerie* dicomSerie, serieParsed) {
foreach (DicomSeries* dicomSeries, seriesParsed) {
DicomDialogEntry* entry = new DicomDialogEntry();
entry->setSelected(false);
entry->setAcquisitionDate(dicomSerie->getAcquisitionDate());
entry->setAcquisitionTime(dicomSerie->getAcquisitionTime());
entry->setStudyName(dicomSerie->getStudyName());
entry->setSerieName(dicomSerie->getSerieName());
entry->setSerieDescription(dicomSerie->getSerieDescription());
entry->setPatientName(dicomSerie->getPatientName());
serieDialogEntries.append(entry);
entry->setAcquisitionDate(dicomSeries->getAcquisitionDate());
entry->setAcquisitionTime(dicomSeries->getAcquisitionTime());
entry->setStudyName(dicomSeries->getStudyName());
entry->setSeriesName(dicomSeries->getSeriesName());
entry->setSeriesDescription(dicomSeries->getSeriesDescription());
entry->setPatientName(dicomSeries->getPatientName());
seriesDialogEntries.append(entry);
}
// Prompt the user which series he wishes to open
QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
dialog = new DicomDialog(serieDialogEntries);
serieDialogEntries = dialog->getSelectedDicomDialogEntries();
dialog = new DicomDialog(seriesDialogEntries);
seriesDialogEntries = dialog->getSelectedDicomDialogEntries();
QApplication::restoreOverrideCursor();
// Open each selected Dicom as a component
if (!serieDialogEntries.isEmpty()) {
foreach (DicomDialogEntry* entry, serieDialogEntries) {
if (!seriesDialogEntries.isEmpty()) {
foreach (DicomDialogEntry* entry, seriesDialogEntries) {
// Find the corresponding Dicom Series in the List
foreach (DicomSerie* serie, serieParsed) {
if ((serie->getStudyName() == entry->getStudyName()) &&
(serie->getSerieName() == entry->getSerieName())) {
lastOpenedComponent = new DicomComponent(serie);
foreach (DicomSeries* series, seriesParsed) {
if ((series->getStudyName() == entry->getStudyName()) &&
(series->getSeriesName() == entry->getSeriesName())) {
lastOpenedComponent = new DicomComponent(series);
break;
}
else {
delete serie;
delete series;
}
}
}
}
serieDialogEntries.clear();
seriesDialogEntries.clear();
return lastOpenedComponent;
......
......@@ -37,7 +37,7 @@ class Component;
class DicomDialog;
class DicomDialogEntry;
#include "DicomSerie.h"
#include "DicomSeries.h"
/**
......@@ -65,7 +65,7 @@ public:
/// Method returning the component extension descrption
virtual QString getDescription() const {
return "This allows one to read a single .dcm DICOM image file using the library GDCM 2.2.x";
return "This extension adds support for DICOM single image file (.dcm) and series thanks to the gdcm library";
};
......@@ -101,10 +101,10 @@ private:
DicomDialog* dialog;
/// The different Dicom SERIES parsed
QList<DicomSerie*> serieParsed;
QList<DicomSeries*> seriesParsed;
/// The series dialog entries representation in the VIEW
QList<DicomDialogEntry*> serieDialogEntries;
QList<DicomDialogEntry*> seriesDialogEntries;
};
......
......@@ -54,9 +54,9 @@ DicomDialog::DicomDialog(QList<DicomDialogEntry*> elements): QDialog() {
ui.tableWidget->setItem(row, column++, new QTableWidgetItem(item->getAcquisitionDate().toString()));
ui.tableWidget->setItem(row, column++, new QTableWidgetItem(item->getAcquisitionTime().toString(Qt::SystemLocaleShortDate)));
ui.tableWidget->setItem(row, column++, new QTableWidgetItem(item->getPatientName()));
ui.tableWidget->setItem(row, column++, new QTableWidgetItem(item->getSerieDescription()));
ui.tableWidget->setItem(row, column++, new QTableWidgetItem(item->getSeriesDescription()));
ui.tableWidget->setItem(row, column++, new QTableWidgetItem(item->getStudyName()));
ui.tableWidget->setItem(row, column++, new QTableWidgetItem(item->getSerieName()));
ui.tableWidget->setItem(row, column++, new QTableWidgetItem(item->getSeriesName()));
row++;
}
......
......@@ -95,7 +95,7 @@
</column>
<column>
<property name="text">
<string>Serie</string>
<string>Series</string>
</property>
</column>
</widget>
......
......@@ -30,7 +30,7 @@
DicomDialogEntry::DicomDialogEntry() {
acquisitionDate = QDate::currentDate();
studyName = "NOT FOUND";
serieName = "NOT FOUND";
seriesName = "NOT FOUND";
patientName = "NOT FOUND";
}
......@@ -47,11 +47,11 @@ QTime DicomDialogEntry::getAcquisitionTime() const {
QString DicomDialogEntry::getStudyName() {
return studyName;
}
QString DicomDialogEntry::getSerieName() {
return serieName;
QString DicomDialogEntry::getSeriesName() {
return seriesName;
}
QString DicomDialogEntry::getSerieDescription() {
return serieDescription;
QString DicomDialogEntry::getSeriesDescription() {
return seriesDescription;
}
QString DicomDialogEntry::getPatientName() {
return patientName;
......@@ -71,11 +71,11 @@ void DicomDialogEntry::setAcquisitionTime(QTime time) {
void DicomDialogEntry::setStudyName(QString name) {
studyName = name;
}
void DicomDialogEntry::setSerieName(QString name) {
serieName = name;
void DicomDialogEntry::setSeriesName(QString name) {
seriesName = name;
}
void DicomDialogEntry::setSerieDescription(QString name) {
serieDescription = name;
void DicomDialogEntry::setSeriesDescription(QString name) {
seriesDescription = name;
}
void DicomDialogEntry::setPatientName(QString name) {
patientName = name;
......
......@@ -53,8 +53,8 @@ public:
QDate getAcquisitionDate();
QTime getAcquisitionTime() const;
QString getStudyName();
QString getSerieName();
QString getSerieDescription();
QString getSeriesName();
QString getSeriesDescription();
QString getPatientName();
///@}
......@@ -64,8 +64,8 @@ public:
void setAcquisitionDate(QDate date);
void setAcquisitionTime(QTime time);
void setStudyName(QString name);
void setSerieDescription(QString name);
void setSerieName(QString name);
void setSeriesDescription(QString name);
void setSeriesName(QString name);
void setPatientName(QString name);
///@}
......@@ -91,10 +91,10 @@ private:
QString studyName;
/// Name of this SERIES.
QString serieName;
QString seriesName;
/// Description of this SERIES.
QString serieDescription;
QString seriesDescription;
/// Name of the patient.
QString patientName;
......
......@@ -33,9 +33,9 @@
// --------------- parseDirectory -------------------
QList<DicomSerie*> DicomParser::parseDirectory(const QString& directory) {
QList<DicomSeries*> DicomParser::parseDirectory(const QString& directory) {
QList<DicomSerie*> dicomSeries;
QList<DicomSeries*> allDicomSeries;
// Recursively get all files in the input directory
gdcm::Directory dir;
......@@ -91,107 +91,107 @@ QList<DicomSerie*> DicomParser::parseDirectory(const QString& directory) {
// scan files for series
gdcm::Scanner seriesScanner;
gdcm::Tag serieUIDTag = gdcm::Tag(0x0020, 0x000e);
seriesScanner.AddTag(serieUIDTag);
gdcm::Tag seriesUIDTag = gdcm::Tag(0x0020, 0x000e);
seriesScanner.AddTag(seriesUIDTag);
seriesScanner.Scan(studyFileNames);
const std::set< std::string > serieValues = seriesScanner.GetValues();
foreach (std::string serieName, serieValues) {
const std::set< std::string > seriesValues = seriesScanner.GetValues();
foreach (std::string serieName, seriesValues) {
// get file associated with this series
std::vector< std::string > serieFileNames = seriesScanner.GetAllFilenamesFromTagToValue(serieUIDTag, serieName.c_str());
// build a DicomSerie object corresponding to what we have found
if (serieFileNames.size() > 0) {
DicomSerie* dicomSerie = new DicomSerie();
dicomSerie->setAcquisitionDate(DicomParser::getAcquisitionDate(serieFileNames));
dicomSerie->setAcquisitionTime(DicomParser::getAcquisitionTime(serieFileNames));
dicomSerie->setStudyName(DicomParser::getStudyName(serieFileNames));
dicomSerie->setSerieName(DicomParser::getSerieName(serieFileNames));
dicomSerie->setSerieDescription(DicomParser::getSerieDescription(serieFileNames));
dicomSerie->setPatientName(DicomParser::getPatientName(serieFileNames));
dicomSerie->setStdFileNames(serieFileNames);
dicomSerie->setFileNames(stdListOfStringToQt(serieFileNames));
dicomSeries.append(dicomSerie);
std::vector< std::string > seriesFileNames = seriesScanner.GetAllFilenamesFromTagToValue(seriesUIDTag, serieName.c_str());
// build a DicomSeries object corresponding to what we have found
if (seriesFileNames.size() > 0) {
DicomSeries* additionalDicomSeries = new DicomSeries();
additionalDicomSeries->setAcquisitionDate(DicomParser::getAcquisitionDate(seriesFileNames));
additionalDicomSeries->setAcquisitionTime(DicomParser::getAcquisitionTime(seriesFileNames));
additionalDicomSeries->setStudyName(DicomParser::getStudyName(seriesFileNames));
additionalDicomSeries->setSeriesName(DicomParser::getSeriesName(seriesFileNames));
additionalDicomSeries->setSeriesDescription(DicomParser::getSeriesDescription(seriesFileNames));
additionalDicomSeries->setPatientName(DicomParser::getPatientName(seriesFileNames));
additionalDicomSeries->setStdFileNames(seriesFileNames);
additionalDicomSeries->setFileNames(stdListOfStringToQt(seriesFileNames));
allDicomSeries.append(additionalDicomSeries);
}
}
}
return dicomSeries;
return allDicomSeries;
}
// --------------- getAcquisitionDate -------------------
QDate DicomParser::getAcquisitionDate(const std::vector<std::string>& serieFileNames) {
QDate DicomParser::getAcquisitionDate(const std::vector<std::string>& seriesFileNames) {
gdcm::Scanner scanner;
gdcm::Tag acquisitionDateUIDTag = gdcm::Tag(0x0008, 0x0022);
scanner.AddTag(acquisitionDateUIDTag);
scanner.Scan(serieFileNames);
scanner.Scan(seriesFileNames);
std::string file = serieFileNames.at(0);
std::string file = seriesFileNames.at(0);
const char* acquisitionDate = scanner.GetValue(file.c_str(), acquisitionDateUIDTag);
return QDate::fromString(QString(acquisitionDate), "yyyyMMdd");
}
// --------------- getAcquisitionTime -------------------
QTime DicomParser::getAcquisitionTime(const std::vector<std::string>& serieFileNames) {
QTime DicomParser::getAcquisitionTime(const std::vector<std::string>& seriesFileNames) {
gdcm::Scanner scanner;
gdcm::Tag acquisitionTimeUIDTag = gdcm::Tag(0x0008, 0x0032);
scanner.AddTag(acquisitionTimeUIDTag);
scanner.Scan(serieFileNames);
scanner.Scan(seriesFileNames);
std::string file = serieFileNames.at(0);
std::string file = seriesFileNames.at(0);
const char* acquisitionTime = scanner.GetValue(file.c_str(), acquisitionTimeUIDTag);
return QTime::fromString(QString(acquisitionTime), "hhmmss");
}
// --------------- getPatientName -------------------
QString DicomParser::getPatientName(const std::vector<std::string>& serieFileNames) {
QString DicomParser::getPatientName(const std::vector<std::string>& seriesFileNames) {
gdcm::Scanner scanner;
gdcm::Tag patientNameUIDTag = gdcm::Tag(0x0010, 0x0010);
scanner.AddTag(patientNameUIDTag);
scanner.Scan(serieFileNames);
scanner.Scan(seriesFileNames);
std::string file = serieFileNames.at(0);
std::string file = seriesFileNames.at(0);
const char* patientName = scanner.GetValue(file.c_str(), patientNameUIDTag);
return QString(patientName);
}
// --------------- getSerieName -------------------
QString DicomParser::getSerieName(const std::vector<std::string>& serieFileNames) {
// --------------- getSeriesName -------------------
QString DicomParser::getSeriesName(const std::vector<std::string>& seriesFileNames) {
gdcm::Scanner scanner;
gdcm::Tag serieUIDTag = gdcm::Tag(0x0020, 0x000e);
scanner.AddTag(serieUIDTag);
scanner.Scan(serieFileNames);
gdcm::Tag seriesUIDTag = gdcm::Tag(0x0020, 0x000e);
scanner.AddTag(seriesUIDTag);
scanner.Scan(seriesFileNames);
std::string file = serieFileNames.at(0);
const char* serieName = scanner.GetValue(file.c_str(), serieUIDTag);
return QString(serieName);
std::string file = seriesFileNames.at(0);
const char* seriesName = scanner.GetValue(file.c_str(), seriesUIDTag);
return QString(seriesName);
}
// --------------- getSerieDescription -------------------
QString DicomParser::getSerieDescription(const std::vector<std::string>& serieFileNames) {
// --------------- getSeriesDescription -------------------
QString DicomParser::getSeriesDescription(const std::vector<std::string>& seriesFileNames) {
gdcm::Scanner scanner;
gdcm::Tag serieDescriptionTag = gdcm::Tag(0x0008, 0x103e);
scanner.AddTag(serieDescriptionTag);
scanner.Scan(serieFileNames);
gdcm::Tag seriesDescriptionTag = gdcm::Tag(0x0008, 0x103e);
scanner.AddTag(seriesDescriptionTag);
scanner.Scan(seriesFileNames);
std::string file = serieFileNames.at(0);
const char* serieDescription = scanner.GetValue(file.c_str(), serieDescriptionTag);
return QString(serieDescription);
std::string file = seriesFileNames.at(0);
const char* seriesDescription = scanner.GetValue(file.c_str(), seriesDescriptionTag);
return QString(seriesDescription);
}
// --------------- getStudyName -------------------
QString DicomParser::getStudyName(const std::vector<std::string>& serieFileNames) {
QString DicomParser::getStudyName(const std::vector<std::string>& seriesFileNames) {
gdcm::Scanner scanner;
gdcm::Tag serieUIDTag = gdcm::Tag(0x0020, 0x000e);
scanner.AddTag(serieUIDTag);
scanner.Scan(serieFileNames);
gdcm::Tag seriesUIDTag = gdcm::Tag(0x0020, 0x000e);
scanner.AddTag(seriesUIDTag);
scanner.Scan(seriesFileNames);
std::string file = serieFileNames.at(0);
const char* studyName = scanner.GetValue(file.c_str(), serieUIDTag);
std::string file = seriesFileNames.at(0);
const char* studyName = scanner.GetValue(file.c_str(), seriesUIDTag);
return QString(studyName);
}
......@@ -216,16 +216,16 @@ std::vector< std::string > DicomParser::qtListOfStringToStd(const QList<QString>
}
// --------------- getZSpacing -------------------
double DicomParser::getZSpacing(const std::vector<std::string>& serieFileNames) {
double DicomParser::getZSpacing(const std::vector<std::string>& seriesFileNames) {
gdcm::Scanner scanner;
gdcm::Tag zSpacingTag = gdcm::Tag(0x0018, 0x0088);
scanner.AddTag(zSpacingTag);
scanner.Scan(serieFileNames);
scanner.Scan(seriesFileNames);
std::string file = serieFileNames.at(0);
std::string file = seriesFileNames.at(0);
const char* value = scanner.GetValue(file.c_str(), zSpacingTag);
if (!value) {
CAMITK_ERROR_ALT(QObject::tr("No Z spacing found on image: \"%1\"").arg(QString::fromStdString(serieFileNames.at(0))))
CAMITK_ERROR_ALT(QObject::tr("No Z spacing found on image: \"%1\"").arg(QString::fromStdString(seriesFileNames.at(0))))
return 1.0;
}
return atof(value);
......
......@@ -27,7 +27,7 @@
#define DICOMPARSER_H
// CamiTK includes
#include <DicomSerie.h>
#include "DicomSeries.h"
// Qt includes
#include <QMap>
......@@ -64,14 +64,14 @@ public:
* @param directory The input directory to parse DICOM image files.
* @return A list of DicomSerie, high level CamiTK object which store information of a SERIES
*/
static QList<DicomSerie*> parseDirectory(const QString& directory);
static QList<DicomSeries*> parseDirectory(const QString& directory);
/**
* @brief Retrieve the DICOM image file Z spacing attribute (commonly known as spacing between slices)
* @param serieFileNames the input DICOM image images to retrieve the Z spacing attribute from.
* @param seriesFileNames the input DICOM image images to retrieve the Z spacing attribute from.
* @return the Z spacing value.
*/
static double getZSpacing(const std::vector<std::string>& serieFileNames);
static double getZSpacing(const std::vector<std::string>& seriesFileNames);
private:
/**
......@@ -90,45 +90,45 @@ private:
/**
* @brief Retrieve the SERIES acquisition date.
* @param serieFileNames The filenames belonging to a single series.
* @param seriesFileNames The filenames belonging to a single series.
* @return the acquisition date of this SERIES.
*/
static QDate getAcquisitionDate(const std::vector<std::string>& serieFileNames);
static QDate getAcquisitionDate(const std::vector<std::string>& seriesFileNames);
/**
* @brief Retrieve the SERIES acquisition time.
* @param serieFileNames The filenames belonging to a single series.
* @param seriesFileNames The filenames belonging to a single series.
* @return the acquisition time of this SERIES.
*/
static QTime getAcquisitionTime(const std::vector<std::string>& serieFileNames);
static QTime getAcquisitionTime(const std::vector<std::string>& seriesFileNames);
/**
* @brief Retrieve the patient name information from the input files.
* @param serieFileNames The filenames belonging to a single series.
* @param seriesFileNames The filenames belonging to a single series.
* @return the patient name.
*/
static QString getPatientName(const std::vector<std::string>& serieFileNames);
static QString getPatientName(const std::vector<std::string>& seriesFileNames);
/**
* @brief Retrieve the series name.
* @param serieFileNames The filenames belonging to a single series.
* @param seriesFileNames The filenames belonging to a single series.
* @return the series name.
*/
static QString getSerieName(const std::vector<std::string>& serieFileNames);
static QString getSeriesName(const std::vector<std::string>& seriesFileNames);
/**
* @brief Retrieve the series description.
* @param serieFileNames The filenames belonging to a single series.
* @param seriesFileNames The filenames belonging to a single series.
* @return the series description.
*/
static QString getSerieDescription(const std::vector<std::string>& serieFileNames);
static QString getSeriesDescription(const std::vector<std::string>& seriesFileNames);
/**
* @brief Retrieve the study name.
* @param serieFileNames The filenames belonging to a single series.
* @param seriesFileNames The filenames belonging to a single series.
* @return the study name.
*/
static QString getStudyName(const std::vector<std::string>& serieFileNames);
static QString getStudyName(const std::vector<std::string>& seriesFileNames);
};
......
......@@ -23,66 +23,66 @@
* $CAMITK_LICENCE_END$
****************************************************************************/
// CamiTK includes
#include "DicomSerie.h"
#include "DicomSeries.h"
// --------------- Constructor -------------------
DicomSerie::DicomSerie() {
DicomSeries::DicomSeries() {
acquisitionDate = QDate::currentDate();
studyName = "NOT FOUND";
serieName = "NOT FOUND";
serieDescription = "NOT FOUND";
seriesName = "NOT FOUND";
seriesDescription = "NOT FOUND";
patientName = "NOT FOUND";
}
// --------------- Getters -------------------
QDate DicomSerie::getAcquisitionDate() const {
QDate DicomSeries::getAcquisitionDate() const {
return acquisitionDate;
}
QTime DicomSerie::getAcquisitionTime() const {
QTime DicomSeries::getAcquisitionTime() const {
return acquisitionTime;
}
QString DicomSerie::getStudyName() const {
QString DicomSeries::getStudyName() const {
return studyName;
}
QString DicomSerie::getSerieName() const {
return serieName;
QString DicomSeries::getSeriesName() const {
return seriesName;
}
QString DicomSerie::getSerieDescription() const {
return serieDescription;
QString DicomSeries::getSeriesDescription() const {
return seriesDescription;
}
QString DicomSerie::getPatientName() const {
QString DicomSeries::getPatientName() const {
return patientName;
}
QList<QString> DicomSerie::getFileNames() const {
QList<QString> DicomSeries::getFileNames() const {
return fileNames;
}
std::vector<std::string> DicomSerie::getStdFileNames() const {
std::vector<std::string> DicomSeries::getStdFileNames() const {
return stdFileNames;
}
// --------------- Setters -------------------
void DicomSerie::setAcquisitionDate(QDate date) {
void DicomSeries::setAcquisitionDate(QDate date) {
acquisitionDate = date;
}
void DicomSerie::setAcquisitionTime(QTime time) {
void DicomSeries::setAcquisitionTime(QTime time) {
acquisitionTime = time;
}
void DicomSerie::setStudyName(QString name) {
void DicomSeries::setStudyName(QString name) {
studyName = name;
}
void DicomSerie::setSerieName(QString name) {
serieName = name;
void DicomSeries::setSeriesName(QString name) {
seriesName = name;
}
void DicomSerie::setSerieDescription(QString name) {
serieDescription = name;
void DicomSeries::setSeriesDescription(QString name) {
seriesDescription = name;
}
void DicomSerie::setPatientName(QString name) {
void DicomSeries::setPatientName(QString name) {
patientName = name;
}
void DicomSerie::setFileNames(QList<QString> inputFileNames) {
void DicomSeries::setFileNames(QList<QString> inputFileNames) {
fileNames = inputFileNames;
}
void DicomSerie::setStdFileNames(std::vector<std::string> inputFileNames) {
void DicomSeries::setStdFileNames(std::vector<std::string> inputFileNames) {
stdFileNames = inputFileNames;
}
......
......@@ -23,8 +23,8 @@
* $CAMITK_LICENCE_END$
****************************************************************************/
#ifndef DICOMSERIE_H
#define DICOMSERIE_H
#ifndef DICOM_SERIES_H