Skip to content

Compatibility with Windows Visual Studio 2022 #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alonsoJASL wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Compatibility with Windows Visual Studio 2022 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CemrgApp/Modules/CemrgAppModule/include/CemrgAtrialTools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class MITKCEMRGAPPMODULE_EXPORT CemrgAtrialTools {
public:
CemrgAtrialTools();
void SetDefaultSegmentationTags();
ImageType::Pointer LoadImage(QString imagePath, bool binarise=false);
ImageType::Pointer CemrgLoadImage(QString imagePath, bool binarise = false);
ShortImageType::Pointer LoadShortImage(QString imagePath);

inline void SetDebugMode(bool s2d){debugSteps=s2d; debugMessages=s2d;};
Expand Down
10 changes: 5 additions & 5 deletions CemrgApp/Modules/CemrgAppModule/src/CemrgAtrialTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ ShortImageType::Pointer LoadShortImage(QString imagePath){
return itkImage;
}

ImageType::Pointer CemrgAtrialTools::LoadImage(QString imagePath, bool binarise){
ImageType::Pointer CemrgAtrialTools::CemrgLoadImage(QString imagePath, bool binarise){
mitk::Image::Pointer mitkImage = mitk::IOUtil::Load<mitk::Image>(imagePath.toStdString());
ImageType::Pointer itkImage = ImageType::New();
mitk::CastToItkImage(mitkImage, itkImage);
Expand Down Expand Up @@ -177,9 +177,9 @@ void CemrgAtrialTools::AdjustSegmentationLabelToImage(QString segImPath, QString

void CemrgAtrialTools::ResampleSegmentationLabelToImage(QString segImPath, QString imPath, QString outImPath){
MITK_INFO(debugMessages) << ("[ResampleSegmentationLabelToImage] Loading " + segImPath).toStdString();
ImageType::Pointer segItk = LoadImage(segImPath);
ImageType::Pointer segItk = CemrgLoadImage(segImPath);
MITK_INFO(debugMessages) << ("[ResampleSegmentationLabelToImage] Loading " + imPath).toStdString();
ImageType::Pointer im = LoadImage(imPath);
ImageType::Pointer im = CemrgLoadImage(imPath);

itk::ResampleImageFilter<ImageType, ImageType>::Pointer resampleFilter;
resampleFilter = itk::ResampleImageFilter<ImageType, ImageType>::New();
Expand All @@ -199,7 +199,7 @@ void CemrgAtrialTools::ResampleSegmentationLabelToImage(QString segImPath, QStri

ImageType::Pointer CemrgAtrialTools::RemoveNoiseFromAutomaticSegmentation(QString dir, QString segName){
QString inputPath = dir + "/" + segName;
ImageType::Pointer orgSegImage = LoadImage(inputPath);
ImageType::Pointer orgSegImage = CemrgLoadImage(inputPath);

MITK_INFO << "Extracting clean segmentation.";
ConnectedComponentImageFilterType::Pointer conn1 = ConnectedComponentImageFilterType::New();
Expand Down Expand Up @@ -242,7 +242,7 @@ void CemrgAtrialTools::QuickBinarise(ImageType::Pointer imToBin){

ImageType::Pointer CemrgAtrialTools::CleanAutomaticSegmentation(QString dir, QString segName, QString cleanName){
QString inputPath = dir + "/" + segName;
ImageType::Pointer orgSegImage = LoadImage(inputPath);
ImageType::Pointer orgSegImage = CemrgLoadImage(inputPath);
ImageType::Pointer atriumCoarse = RemoveNoiseFromAutomaticSegmentation(dir, segName);

if(!cleanName.isEmpty()){
Expand Down
8 changes: 4 additions & 4 deletions CemrgApp/Plugins/kcl.cemrgapp.atrialfibres/src/internal/AtrialFibresView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ void AtrialFibresView::SegmentIMGS() {
}
}

ImageType::Pointer segImage = atrium->LoadImage(path);
ImageType::Pointer segImage = atrium->CemrgLoadImage(path);
path = UserIncludeLgeAnalysis(path, segImage);

mitk::Image::Pointer im = mitk::ImportItkImage(segImage);
Expand Down Expand Up @@ -705,7 +705,7 @@ void AtrialFibresView::CreateLabelledMesh(){

QString prodPath = directory + "/";

ImageType::Pointer pveins = atrium->LoadImage(prodPath+"PVeinsLabelled.nii");
ImageType::Pointer pveins = atrium->CemrgLoadImage(prodPath+"PVeinsLabelled.nii");
if(!tagName.contains("Labelled")){
std::string msg = "Changing working name from " + tagName.toStdString() + " to 'Labelled'";
QMessageBox::information(NULL, "Attention", msg.c_str());
Expand Down Expand Up @@ -1554,7 +1554,7 @@ void AtrialFibresView::ScarProjection(){
MITK_INFO << "[SCAR_PROJECTION][5] Thresholding";
double mean = 0.0, stdv = 0.0;
bool binarise=true;
ImageType::Pointer segITK = atrium->LoadImage(segPath, binarise);
ImageType::Pointer segITK = atrium->CemrgLoadImage(segPath, binarise);
mitk::IOUtil::Save(atrium->ImErode(segITK), Path("roi.nii").toStdString());

atrium->ResampleSegmentationLabelToImage(Path("roi.nii"), lgePath);
Expand Down Expand Up @@ -2340,7 +2340,7 @@ QString AtrialFibresView::UserIncludeLgeAnalysis(QString segPath, ImageType::Poi
cmd->ExecuteRegistration(directory, lgePath, mraPath); // rigid.dof is the default name
cmd->ExecuteTransformation(directory, segPath, segRegPath);

segImage = atrium->LoadImage(segRegPath);
segImage = atrium->CemrgLoadImage(segRegPath);

resultString = segRegPath;
tagName += "-reg";
Expand Down
Loading