diff --git a/Modules/IGTUI/Qmitk/QmitkFiducialRegistrationWidget.ui b/Modules/IGTUI/Qmitk/QmitkFiducialRegistrationWidget.ui
index 61dee043e6..b0d6be8822 100755
--- a/Modules/IGTUI/Qmitk/QmitkFiducialRegistrationWidget.ui
+++ b/Modules/IGTUI/Qmitk/QmitkFiducialRegistrationWidget.ui
@@ -1,361 +1,367 @@
QmitkFiducialRegistrationWidget
0
0
- 568
- 388
+ 570
+ 442
0
0
Form
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Status:
+
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+
+ -
+
+
+
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 40
+
+
+
+ Register (object is moved)
+
+
+
+ -
+
+
-
+
+
+ Move Image Points
+
+
+
+ -
+
+
+
+ 0
+ 40
+
+
+
+ <html><head/><body><p>Find fiducial correspondences (needs 6+ fiducial pairs)</p></body></html>
+
+
+ Find fiducial
+ correspondences
+
+
+
+
+
-
Fiducial Registration method
-
true
Static
true
-
true
Hybrid Continuous
false
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 40
-
-
-
- Register (object is moved)
-
-
-
-
-
0
0
Image / object / moving fiducials
-
-
- 6
+
+
+
+ 30
+ 30
+ 210
+ 171
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+
+
+
+ 10
+ 229
+ 252
+ 88
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 37
+
-
- 6
+
+
+ 16777215
+ 170
+
-
- 6
+
+
-
- 6
+
+ Qt::AlignCenter
-
-
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 37
-
-
-
-
- 16777215
- 37
-
-
-
-
-
-
- Qt::AlignCenter
-
-
- false
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 0
- 35
-
-
-
- Add image fiducial
-
-
-
-
-
-
-
+
+ false
+
+
+
+
+ 20
+ 20
+ 201
+ 35
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 35
+
+
+
+
+ 16777215
+ 70
+
+
+
+ Add image fiducial
+
+
+
-
0
0
+
+
+ 16777215
+ 800
+
+
Tracker / fixed fiducials
-
-
- 6
+
+
+
+ 7
+ 216
+ 251
+ 101
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 37
+
-
- 6
+
+
+ 16777215
+ 170
+
-
- 6
+
+
-
- 6
+
+ Qt::AlignCenter
-
-
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 37
-
-
-
-
- 16777215
- 37
-
-
-
-
-
-
- Qt::AlignCenter
-
-
- false
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 0
- 35
-
-
-
- &Add current
+
+ false
+
+
+
+
+ 10
+ 20
+ 221
+ 71
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 37
+
+
+
+
+ 16777215
+ 170
+
+
+
+ &Add current
instrument position
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- Status:
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
-
-
-
-
-
- Qt::AlignCenter
-
-
-
-
-
- -
-
-
-
-
-
- Move Image Points
-
-
-
- -
-
-
-
- 0
- 40
-
-
-
- <html><head/><body><p>Find fiducial correspondences (needs 6+ fiducial pairs)</p></body></html>
-
-
- Find fiducial
- correspondences
-
+
+
+
+
+
+
+ 40
+ 40
+ 221
+ 141
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
m_RegisterFiducialsBtn
m_gbFiducialRegistration
+
QmitkPointListWidget
- QListWidget
+ QWidget
+ 1
diff --git a/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui b/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui
index ad7a933d2b..cb24dc832c 100644
--- a/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui
+++ b/Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui
@@ -1,598 +1,623 @@
QmitkNavigationToolCreationWidgetControls
0
0
- 357
- 405
+ 441
+ 576
Form
-
-
Device Type:
-
150
0
150
16777215
-
-
- QFrame::Box
+
+
+ 0
+ 77
+
-
- QFrame::Plain
-
-
- 2
+
+
+ 16777215
+ 2000
+
- 0
+ 2
6
0
0
- 337
- 209
+ 423
+ 382
Basic Information
-
-
100
0
Name:
-
NewTool
-
-
100
0
Calibration File:
-
none
-
40
16777215
Load
-
Qt::Vertical
20
40
0
0
- 337
- 173
+ 423
+ 382
Tool Visualization
-
Default representation (shows tool coordinates)
true
-
Use surface from data storage
-
-
200
0
150
16777215
-
Qt::Horizontal
40
20
-
Load surface from file
-
-
false
40
16777215
Load
-
Qt::Horizontal
40
20
-
Qt::Vertical
20
8
0
0
- 337
- 173
+ 423
+ 382
Tool Landmarks
-
+
+ true
+
+
+
+ 0
+ 100
+
+
+
+
+ 16777215
+ 800
+
+
+
+
+ 75
+ true
+
+
- 1
+ 0
+
+
+
+ 30
+ 150
+
Calibration Landmarks
+
+ 30
+
-
-
+
+
+
+ 600
+ 600
+
+
+
Registration Landmarks
-
0
0
- 337
- 173
+ 423
+ 382
Advanced
-
- -
-
-
-
-
-
-
- 100
- 0
-
-
-
- Tool Type:
-
-
-
- -
-
-
-
- 150
- 0
-
-
-
-
- 150
- 16777215
-
-
-
-
-
- Instrument
-
-
- -
-
- Fiducial
-
-
- -
-
- Skinmarker
-
-
- -
-
- Unkown
-
-
-
-
-
-
- -
-
-
-
-
-
-
- 100
- 0
-
-
-
- Identifier:
-
-
-
- -
-
-
- <not given>
-
-
-
-
-
- -
-
-
-
-
-
-
- 100
- 0
-
-
-
- Serial Number:
-
-
-
- -
-
-
- <not given>
-
-
-
-
-
- -
-
-
-
-
+
+
+
-
+
+
+
+ 100
+ 0
+
+
+
+ Tool Type:
+
+
+
+ -
+
+
+
+ 150
+ 0
+
+
+
+
+ 150
+ 16777215
+
+
+
-
- Tooltip:
+ Instrument
-
-
- -
-
+
+ -
-
-
-
-
- -
-
-
- Qt::Horizontal
+ Fiducial
-
-
- 40
- 20
-
-
-
-
- -
-
+
+ -
- Edit Tooltip
-
-
- true
+ Skinmarker
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
+
+ -
- Tool Axis:
-
-
-
- -
-
-
- Qt::Horizontal
+ Unkown
-
-
- 40
- 20
-
-
-
-
- -
-
-
- QAbstractSpinBox::CorrectToPreviousValue
-
-
- -9999
-
-
- 9999
-
-
- 1
-
-
-
- -
-
-
- -9999
-
-
- 9999
-
-
-
- -
-
-
- -9999
-
-
- 9999
-
-
-
-
-
-
+
+
+
+
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ Identifier:
+
+
+
+ -
+
+
+ <not given>
+
+
+
+
+
+
+
+ -
+
+
+
+ 100
+ 0
+
+
+
+ Serial Number:
+
+
+
+ -
+
+
+ <not given>
+
+
+
+
+
+
+
+ -
+
+
+ Tooltip:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Edit Tooltip
+
+
+ true
+
+
+
+
+
+
+
+ -
+
+
+ Tool Axis:
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ QAbstractSpinBox::CorrectToPreviousValue
+
+
+ -9999
+
+
+ 9999
+
+
+ 1
+
+
+
+ -
+
+
+ -9999
+
+
+ 9999
+
+
+
+ -
+
+
+ -9999
+
+
+ 9999
+
+
+
+
+
-
Qt::Horizontal
-
-
Qt::Horizontal
40
20
-
Cancel
-
Finished
QmitkPointListWidget
QWidget
1
QmitkDataStorageComboBox
QComboBox
QmitkDataStorageComboBox.h
1
diff --git a/Modules/IGTUI/Qmitk/QmitkNavigationToolStorageSelectionWidgetControls.ui b/Modules/IGTUI/Qmitk/QmitkNavigationToolStorageSelectionWidgetControls.ui
index 2c4bc42225..158219d8cb 100644
--- a/Modules/IGTUI/Qmitk/QmitkNavigationToolStorageSelectionWidgetControls.ui
+++ b/Modules/IGTUI/Qmitk/QmitkNavigationToolStorageSelectionWidgetControls.ui
@@ -1,38 +1,45 @@
QmitkNavigationToolStorageSelectionWidgetControls
0
0
- 199
- 111
+ 448
+ 150
+
+
+ 16777215
+ 16777215
+
+
Form
-
-
+
0
0
QmitkServiceListWidget
- QListWidget
+ QWidget
+ 1
diff --git a/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp b/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp
index 0114f21af9..42b4cadb60 100644
--- a/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp
+++ b/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp
@@ -1,274 +1,274 @@
/*===================================================================
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.
===================================================================*/
#include "QmitkToolTrackingStatusWidget.h"
#include
QmitkToolTrackingStatusWidget::QmitkToolTrackingStatusWidget(QWidget* parent)
: QWidget(parent), m_Controls(nullptr), m_StatusLabels(nullptr), m_NavigationDatas(nullptr), m_NavDatasNewFlag(false), m_previewToolStorage(nullptr)
{
m_ShowPositions = false;
m_ShowQuaternions = false;
m_Alignment = Qt::AlignHCenter;
m_Style = QmitkToolTrackingStatusWidget::VerticalUpperStyle;
CreateQtPartControl( this );
}
void QmitkToolTrackingStatusWidget::SetStyle(QmitkToolTrackingStatusWidget::Style newStyle)
{
//set new style
m_Style = newStyle;
//update current labels to show them in the new style
Refresh();
}
void QmitkToolTrackingStatusWidget::SetShowPositions(bool enable)
{
m_ShowPositions = enable;
//update current labels
Refresh();
}
void QmitkToolTrackingStatusWidget::SetShowQuaternions(bool enable)
{
m_ShowQuaternions = enable;
//update current labels
Refresh();
}
void QmitkToolTrackingStatusWidget::SetTextAlignment(Qt::AlignmentFlag alignment)
{
m_Alignment = alignment;
//update current labels
Refresh();
}
QmitkToolTrackingStatusWidget::~QmitkToolTrackingStatusWidget()
{
m_Context->RemoveServiceListener(this, &QmitkToolTrackingStatusWidget::OnServiceEvent);
//m_Controls = nullptr;
if (m_StatusLabels!=nullptr) {delete m_StatusLabels;}
if (m_NavigationDatas != nullptr)
{
m_NavigationDatas->clear();
if (m_NavDatasNewFlag)
{
delete m_NavigationDatas;
}
}
}
void QmitkToolTrackingStatusWidget::CreateQtPartControl(QWidget *parent)
{
if (!m_Controls)
{
// create GUI widgets
m_Controls = new Ui::QmitkToolTrackingStatusWidgetControls;
m_Controls->setupUi(parent);
this->CreateConnections();
//add empty label
AddEmptyLabel();
}
m_Context = us::GetModuleContext();
std::string m_Filter = "(" + us::ServiceConstants::OBJECTCLASS() + "=" + "org.mitk.services.NavigationToolStorage" + ")";
m_Context->AddServiceListener(this, &QmitkToolTrackingStatusWidget::OnServiceEvent, m_Filter);
}
void QmitkToolTrackingStatusWidget::OnServiceEvent(const us::ServiceEvent event)
{
if ((event.GetType() == us::ServiceEvent::MODIFIED) && (m_previewToolStorage.IsNotNull())) {this->PreShowTools(m_previewToolStorage);}
}
void QmitkToolTrackingStatusWidget::CreateConnections()
{
}
void QmitkToolTrackingStatusWidget::SetNavigationDatas(std::vector* navDatas)
{
m_NavigationDatas = navDatas;
m_previewToolStorage = nullptr;
}
void QmitkToolTrackingStatusWidget::AddNavigationData(mitk::NavigationData::Pointer nd)
{
if(m_NavigationDatas == nullptr)
{
m_NavigationDatas = new std::vector();
m_NavDatasNewFlag = true;
m_previewToolStorage = nullptr;
}
m_NavigationDatas->push_back(nd);
}
void QmitkToolTrackingStatusWidget::Refresh(int posPrecision, int quatPrecision)
{
if(m_NavigationDatas == nullptr || m_NavigationDatas->size() <= 0)
{
RemoveGuiLabels();
AddEmptyLabel();
return;
}
mitk::NavigationData* navData;
for(unsigned int i = 0; i < m_NavigationDatas->size(); i++)
{
navData = m_NavigationDatas->at(i).GetPointer();
QString name(navData->GetName());
QString pos = "";
QString quat = "";
if (m_ShowPositions)
{
mitk::Point3D position = navData->GetPosition();
pos = " [" + QString::number(position[0],'f',posPrecision) + ";" + QString::number(position[1],'f',posPrecision) + ";" + QString::number(position[2],'f',posPrecision) + "]";
}
if (m_ShowQuaternions)
{
mitk::Quaternion quaternion = navData->GetOrientation();
quat = " / [qx:" + QString::number(quaternion.x(),'f',quatPrecision) + ";qy:" + QString::number(quaternion.y(),'f',quatPrecision) + ";qz:" + QString::number(quaternion.z(),'f',quatPrecision) + ";qr:" + QString::number(quaternion.r()) + "]";
}
if(!(m_StatusLabels->at(i)->text() == name+pos+quat))
m_StatusLabels->at(i)->setText(name+pos+quat);
if(navData->IsDataValid())
- m_StatusLabels->at(i)->setStyleSheet("QLabel{background-color: #8bff8b }");
+ m_StatusLabels->at(i)->setStyleSheet("QLabel{background-color: #1F641C }");
else
m_StatusLabels->at(i)->setStyleSheet("QLabel{background-color: #ff7878 }");
}
}
void QmitkToolTrackingStatusWidget::ShowStatusLabels()
{
RemoveGuiLabels();
if(m_NavigationDatas == nullptr || m_NavigationDatas->size() <= 0)
{
RemoveGuiLabels();
AddEmptyLabel();
return;
}
m_StatusLabels = new QVector();
mitk::NavigationData* navData;
QLabel* label;
for(unsigned int i = 0; i < m_NavigationDatas->size(); i++)
{
navData = m_NavigationDatas->at(i).GetPointer();
QString name(navData->GetName());
label = new QLabel(name, this);
label->setObjectName(name);
label->setAlignment(m_Alignment | Qt::AlignVCenter);
label->setFrameStyle(QFrame::Panel | QFrame::Sunken);
m_StatusLabels->append(label);
if (m_Style == QmitkToolTrackingStatusWidget::VerticalUpperStyle)
m_Controls->m_VerticalLayout->addWidget(m_StatusLabels->at(i));
else m_Controls->m_GridLayout->addWidget(m_StatusLabels->at(i),i,0);
}
}
void QmitkToolTrackingStatusWidget::PreShowTools(mitk::NavigationToolStorage::Pointer toolStorage)
{
RemoveGuiLabels();
QLabel* label;
for(unsigned int i = 0; i < toolStorage->GetToolCount(); i++)
{
QString name(toolStorage->GetTool(i)->GetToolName().c_str());
label = new QLabel(name, this);
label->setObjectName(name);
label->setAlignment(m_Alignment | Qt::AlignVCenter);
label->setFrameStyle(QFrame::Panel | QFrame::Sunken);
- label->setStyleSheet("QLabel{background-color: #dddddd }");
+ //label->setStyleSheet("QLabel{background-color: #dddddd }");
if (m_Style == QmitkToolTrackingStatusWidget::VerticalUpperStyle) m_Controls->m_VerticalLayout->addWidget(label);
else m_Controls->m_GridLayout->addWidget(label);
}
m_previewToolStorage = toolStorage;
}
void QmitkToolTrackingStatusWidget::RemoveStatusLabels()
{
//remove GUI elements
RemoveGuiLabels();
//clear members
if(m_StatusLabels != nullptr && m_StatusLabels->size() > 0)
{
delete m_StatusLabels;
m_StatusLabels = new QVector< QLabel* >();
}
if(m_NavigationDatas != nullptr && m_NavigationDatas->size() > 0)
{
if (m_NavDatasNewFlag)
{
delete m_NavigationDatas;
m_NavDatasNewFlag = false;
}
m_NavigationDatas = new std::vector();
m_NavDatasNewFlag = true;
}
//add empty label
AddEmptyLabel();
}
void QmitkToolTrackingStatusWidget::RemoveGuiLabels()
{
while(m_Controls->m_GridLayout->count() > 0 || m_Controls->m_VerticalLayout->count() > 0)
{
if (m_Controls->m_GridLayout->count() > 0)
{
QWidget* actWidget = m_Controls->m_GridLayout->itemAt(0)->widget();
m_Controls->m_GridLayout->removeWidget(actWidget);
delete actWidget;
}
else if (m_Controls->m_VerticalLayout->count() > 0)
{
QWidget* actWidget = m_Controls->m_VerticalLayout->itemAt(0)->widget();
m_Controls->m_VerticalLayout->removeWidget(actWidget);
delete actWidget;
}
}
}
void QmitkToolTrackingStatusWidget::AddEmptyLabel()
{
//add a label which tells that no tools are loaded yet
QLabel* label = new QLabel("No tools loaded yet.", this);
label->setObjectName("No tools loaded yet.");
label->setAlignment(m_Alignment | Qt::AlignVCenter);
label->setFrameStyle(QFrame::Panel | QFrame::Sunken);
- label->setStyleSheet("QLabel{background-color: #dddddd }");
+ //label->setStyleSheet("QLabel{background-color: #dddddd }");
if (m_Style == QmitkToolTrackingStatusWidget::VerticalUpperStyle) m_Controls->m_VerticalLayout->addWidget(label);
else m_Controls->m_GridLayout->addWidget(label);
}
diff --git a/Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTFiducialRegistrationControls.ui b/Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTFiducialRegistrationControls.ui
index 608bda5390..3e320044a8 100644
--- a/Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTFiducialRegistrationControls.ui
+++ b/Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTFiducialRegistrationControls.ui
@@ -1,169 +1,178 @@
IGTFiducialRegistrationControls
0
0
392
753
0
0
QmitkTemplate
2
2
2
2
-
Configuration
-
<html><head/><body><p><span style=" font-weight:600;">Choose Tracking Pointer:</span></p></body></html>
-
-
+
-
-
Choose Selected
-
Qt::Horizontal
40
20
-
<none>
-
Qt::Horizontal
-
<html><head/><body><p><span style=" font-weight:600;">Choose Image or Surface:</span></p></body></html>
-
-
-
Choose Selected
-
Qt::Horizontal
40
20
-
<none>
-
Point Based Registration
-
-
+
+
+
+ 16777215
+ 900
+
+
+
QmitkNavigationDataSourceSelectionWidget
- QTextBrowser
+ QWidget
QmitkNavigationDataSourceSelectionWidget.h
+ 1
QmitkFiducialRegistrationWidget
QTextBrowser
QmitkFiducialRegistrationWidget.h
QmitkDataStorageComboBox
QComboBox
QmitkDataStorageComboBox.h
+ 1
diff --git a/Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTNavigationToolCalibrationControls.ui b/Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTNavigationToolCalibrationControls.ui
index 20f1642f61..58438bfc24 100644
--- a/Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTNavigationToolCalibrationControls.ui
+++ b/Plugins/org.mitk.gui.qt.igttracking/src/internal/IGTNavigationToolCalibrationControls.ui
@@ -1,1126 +1,1126 @@
IGTNavigationToolCalibrationControls
0
0
557
958
-
-
- 0
- 0
-
-
QmitkTemplate
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Navigation Tool Calibration</span></p></body></html>
-
Tool to calibrate
-
0
50
16777215
50
-
Calibration pointer
-
0
30
- tabWidget
-
true
+
+
+ 75
+ true
+
+
0
+
+ Qt::ElideMiddle
+
Initialization
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; text-decoration: underline;">Choose Tracking Device and Tools</span></p></body></html>
-
-
Qt::Horizontal
-
-
120
0
Tool to Calibrate:
-
Qt::Horizontal
40
20
-
<none>
-
-
Qt::Horizontal
40
20
-
150
0
Use as Tool to Calibrate
-
Qt::Horizontal
-
-
120
0
Calibration Pointer:
-
Qt::Horizontal
40
20
-
<none>
-
-
Qt::Horizontal
40
20
-
150
0
Use as Calibration Pointer
-
Qt::Horizontal
-
Qt::Vertical
20
586
Tool Tip Calibration
-
-
50
false
Calibration Method:
-
Qt::Horizontal
40
20
-
-
Manual
-
Single Reference Tool
-
Multiple Tools Reference
-
Pivoting
-
Qt::Horizontal
-
0
-
Current Tool Tip Translation:
-
true
true
-
Current Tool Tip Orientation:
-
true
true
-
-
Qt::Horizontal
40
20
-
Start Edit Tooltip
-
0
0
319
160
319
160
QFrame {
border-image: url(:/IGTNavigationToolCalibration/Description.svg);
}
QFrame::Box
QFrame::Plain
1
-
0
0
Current Offset between Tool to calibrate and Calibration pointer:
-
-
Pos:
-
8
Qt::AlignCenter
-
-
Rot:
-
8
Qt::AlignCenter
-
Qt::Horizontal
-
-
0
0
Number of tracking data to collect:
-
0
0
10000
100
-
Qt::AlignCenter
-
0
0
1: Collect Navigation Data
-
Qt::Horizontal
-
Invert calibration transformation
-
-
Calibrate position
true
-
Calibrate orientation
true
-
false
2: Run Calibration
-
Qt::Horizontal
-
0
0
New Tool Tip Position and/or Orientation of Tool to calibrate:
-
-
Pos:
-
8
Qt::AlignCenter
-
-
Rot:
-
8
Qt::AlignCenter
-
false
3: Set New Tool Tip Position and/or Tool Orientation
-
Qt::Vertical
20
40
-
-
Number of pivot poses to collect:
-
10
1000
100
-
-
Number of saved poses:
-
0
-
Qt::Horizontal
40
20
-
Collect Pivot Poses
-
Calibration Result:
-
-
-
Qt::Horizontal
40
20
-
175
0
Compute Pivot Point
-
-
Qt::Horizontal
40
20
-
false
0
0
175
0
Use Computed Pivot Point
-
Qt::Vertical
20
99
Tool Landmark Calibration
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; text-decoration: underline;">Calibrate tool by marking the landmarks with the pointer</span></p></body></html>
-
Registration Landmarks
-
0
170
-
Add Pointer Position
-
Calibration Landmarks
-
-
Qt::Vertical
20
259
Tool Axis Calibration
-
QLayout::SetDefaultConstraint
-
-
Tool axis:
-
Get Positions
-
Calibrate Tool Axis
-
-
4
-1000.000000000000000
1000.000000000000000
-
4
-1000.000000000000000
1000.000000000000000
-
4
-1000.000000000000000
1000.000000000000000
-
-
Calibrate the tool axis:
1. Make sure, tool tips of both tools are calibrated
2. Hold pointer at the end of the needle
3. Get Position
4. Calibrate tool axis
Alternative: Manually edit the axis using the spinboxes.
-
Qt::Vertical
20
497
- gridLayoutWidget_2
- label_18
verticalSpacer_5
-
-
Qt::Horizontal
40
20
-
Save Calibrated Navigation Tool
tabWidget
label
groupBox
groupBox_2
QmitkPointListWidget
QWidget
1
QmitkNavigationDataSourceSelectionWidget
QWidget
QmitkNavigationDataSourceSelectionWidget.h
1
QmitkToolTrackingStatusWidget
QWidget
QmitkToolTrackingStatusWidget.h
1
diff --git a/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui
index 5b33d3bb49..24285782bc 100644
--- a/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui
@@ -1,963 +1,978 @@
QmitkMITKIGTTrackingToolboxViewControls
0
0
662
648
0
0
QmitkTemplate
-
0
Tracking
-
0
0
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 220
+
+
+
+
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+ -
+
-
+
+
-
10
+ 6
75
true
true
Tracking Tools
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Tracking Tools</span></p></body></html>
-
+
-
0
0
-
-
ToolStorage:
-
<none>
-
Qt::Horizontal
40
20
-
0
0
+
+
+ 200
+ 0
+
-
-
Qt::Horizontal
13
49
-
-
120
0
Auto Detection
-
120
0
Add Single Tool
-
120
0
Load Tool Storage
-
120
0
Reset
-
-
+
-
0
0
-
+
+
-
+
Status: disconnected
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Tracking Control</span></p></body></html>
- -
-
-
-
- 10
- 75
- true
-
-
+
-
+
- Tracking Control
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+ Status: disconnected
- -
+
-
-
Qt::Horizontal
40
20
-
142
0
Connect
- -
+
-
-
Qt::Horizontal
40
20
-
142
0
Start Tracking
- -
+
-
-
Qt::Horizontal
40
20
-
<html><head/><body><p><span style=" color:#ff0000;">Tracking Frozen!</span></p></body></html>
-
true
142
0
Freeze Tracking
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
-
-
-
-
-
-
-
Options
-
-
Disable All Timers
-
true
<html><head/><body><p align="right"><span style=" color:#ff0000;">Rendering Disabled!</span></p></body></html>
Qt::AutoText
-
Update Rate Options
-
-
Update Rate [per second]
-
Qt::Horizontal
40
20
-
100
10
-
Use different Render and Log Update Rates
-
-
false
Render Update Rate [fps]
-
Qt::Horizontal
40
20
-
false
0
100
10
-
-
false
Log Update Rate [per second]
-
Qt::Horizontal
40
20
-
false
1
120
10
60
-
Tracking Volume Options
-
true
Show Tracking Volume
true
-
Select Model:
-
-
Open IGT Link
-
Enable Open IGT Link MicroService
true
-
Select Open IGT Link Data Format:
-
-
TRANSFORM
-
QTDATA
-
TDATA
-
POSITION
-
Other Options
-
Show Tool Quaternions
-
Simple UI
-
Caution, only for backward compatibility:
-
Inverse mode (Quaternions are stored inverse)
-
Tool Visualization Options
-
true
Show Tool Projection
-
false
Show Tool Axis
-
Qt::Vertical
20
600
Logging
-
-
Filename:
-
-
Choose File
-
-
Limit Number Of Logged Frames:
-
Qt::Horizontal
40
20
-
1
9999
300
-
CSV format
true
-
XML format
-
Skip invalid data
-
Logging Status
-
Logging OFF
-
Logged Frames: 0
-
-
Qt::Horizontal
40
20
-
Start Logging
-
Stop Logging
-
Qt::Vertical
20
40
-
-
-
-
- 9
- 810
- 303
- 70
-
-
-
- -
-
+
-
+
+
-
-
-
-
- 70
- 50
-
-
-
- Connect
-
-
-
- -
-
-
-
- 70
- 50
-
-
-
- Start
+
+
-
+
+
+
+ 70
+ 50
+
+
+
+ Connect
+
+
+
+ -
+
+
+
+ 70
+ 50
+
+
+
+ Start
Tracking
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 70
- 50
-
-
-
- Advanced
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 70
+ 50
+
+
+
+ Advanced
Mode
-
-
+
+
+
+
-
-
-
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
QmitkToolTrackingStatusWidget
QWidget
QmitkToolTrackingStatusWidget.h
1
QmitkTrackingDeviceConfigurationWidget
QWidget
QmitkTrackingDeviceConfigurationWidget.h
1
QmitkNavigationToolCreationWidget
QWidget
QmitkNavigationToolCreationWidget.h
1
diff --git a/Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui b/Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui
index 82f7fa1f3d..8081c07f5f 100644
--- a/Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui
+++ b/Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui
@@ -1,412 +1,461 @@
UltrasoundSupportControls
0
0
- 407
- 820
+ 522
+ 916
0
0
QmitkTemplate
- 2
+ 15
- 2
+ 15
- 2
+ 15
- 2
+ 15
-
+
+ true
+
+
+
+ 7
+ 50
+ false
+
+
+
+ Qt::TabFocus
+
1
true
false
false
:/USUI/ultrasound01-probe-300ppi.png
:/USUI/ultrasound01-probe-300ppi.png:/USUI/ultrasound01-probe-300ppi.png
Device Management
-
+
- 0
+ 15
- 0
+ 15
- 0
+ 15
- 0
+ 15
-
+
+ 15
+
+
+ 15
+
+
+ 15
+
+
+ 15
+
-
+
+ 12
+
+
+ 12
+
+
+ 12
+
+
+ 12
+
-
10
75
true
Ultrasound Devices:
-
-
-
+
+ 12
+
+
+ 12
+
+
+ 12
+
+
+ 12
+
-
10
75
true
Active Devices:
-
0
0
-
-
Show US image in MITK
true
-
Qt::Vertical
20
40
false
:/USUI/ultrasound02-scan-300ppi.png
:/USUI/ultrasound02-scan-72ppi-deactivated.png
:/USUI/ultrasound02-scan-300ppi.png:/USUI/ultrasound02-scan-300ppi.png
US Imaging
-
-
-
Qt::Vertical
20
40
-
Qt::Horizontal
-
Update Image Data Automatically
true
-
-
Freeze
:/USUI/system-lock-screen.png:/USUI/system-lock-screen.png
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:7.8pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt; font-weight:600;">Framrate Settings:</span></p></body></html>
-
Current overall Framerate: 0 FPS
-
-
Image Pipeline Framerate Limit [FPS]:
-
Qt::Horizontal
40
20
-
1
500
50
-
-
Update 2D View
false
false
-
Qt::Horizontal
40
20
-
Framerate Limit [FPS]:
-
1
100
20
-
-
Update 3D View
false
-
Qt::Horizontal
18
20
-
Framerate Limit [FPS]:
-
1
100
5
QmitkUSDeviceManagerWidget
QWidget
QmitkUSDeviceManagerWidget.h
1
QmitkUSNewVideoDeviceWidget
QWidget
QmitkUSNewVideoDeviceWidget.h
1
QmitkServiceListWidget
QWidget
1