diff --git a/Plugins/org.mitk.annotations/resources/resources.qrc b/Plugins/org.mitk.annotations/resources/resources.qrc
index d22db754bf..64e61495d3 100644
--- a/Plugins/org.mitk.annotations/resources/resources.qrc
+++ b/Plugins/org.mitk.annotations/resources/resources.qrc
@@ -1,8 +1,8 @@
- annotations.json
+ annotationsFinal.json
logoOverlay.png
diff --git a/Plugins/org.mitk.annotations/src/internal/mitkAnnotationPresetLoader.h b/Plugins/org.mitk.annotations/src/internal/mitkAnnotationPresetLoader.h
index e7e2af0d13..7384c0d333 100644
--- a/Plugins/org.mitk.annotations/src/internal/mitkAnnotationPresetLoader.h
+++ b/Plugins/org.mitk.annotations/src/internal/mitkAnnotationPresetLoader.h
@@ -1,59 +1,59 @@
/*===================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
#ifndef MITKANNOTATIONPRESETLOADER_H
#define MITKANNOTATIONPRESETLOADER_H
// mitk
#include "mitkDataProvider.h"
#include "mitkIRenderWindowPartListener.h"
// qmitk
#include "ui_QmitkAnnotationPresetLoaderViewControls.h"
#include
// stl
#include
class AnnotationPresetLoader : public QmitkAbstractView, public mitk::IRenderWindowPartListener
{
Q_OBJECT
// void SaveCurrentConfiguration(const std::string &fileName);
void LoadPreset(const std::string &fileName);
void AxialTimeOrSliceChanged();
void CreateQtPartControl(QWidget *parent) override;
void OnSelectionChanged(berry::IWorkbenchPart::Pointer part, const QList &nodes) override;
public slots:
void OnLoadConfigurationPressed();
private:
void RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart) override;
void RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart) override;
void SetFocus() override;
Ui::AnnotationPresetLoaderControls m_Controls{};
itk::TimeStamp m_CurrentPositionTime;
mitk::BaseData::ConstPointer m_CurrentSelectedData;
mitk::Point3D m_CurrentSelectedPosition;
unsigned int m_CurrentSelectedTimeStep = 0;
itk::IndexValueType m_CurrentSelectedZSlice = 0;
itk::TimeStamp m_SelectedNodeTime;
bool m_ValidSelectedPosition = false;
- std::map m_ManagedAnnotations;
+ std::vector> m_ManagedAnnotations;
};
#endif // MITKANNOTATIONPRESETLOADER_H