Page MenuHomePhabricator
Files F821

IGTLoggerPatch.diff
Public
Actions

Authored By
gergel
May 7 2012, 5:39 PM
Size
4 KB
Referenced Files
None
Subscribers
None

IGTLoggerPatch.diff
View Options

diff --git a/Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp b/Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp
index ee5cdf3..c27a7b1 100644
--- a/Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp
+++ b/Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.cpp
@@ -38,7 +38,7 @@ PURPOSE. See the above copyright notices for more information.
QmitkIGTLoggerWidget::QmitkIGTLoggerWidget(QWidget* parent, Qt::WindowFlags f)
-: QWidget(parent, f), m_Recorder(NULL), m_RecordingActivated(false)
+: QWidget(parent, f), m_Recorder(NULL), m_RecordingActivated(false),m_SampleCounter(0)
{
m_Controls = NULL;
CreateQtPartControl(this);
@@ -80,8 +80,7 @@ void QmitkIGTLoggerWidget::CreateConnections()
connect( m_RecordingTimer, SIGNAL(timeout()), this, SLOT(OnRecording()) );
connect( (QObject*)(m_Controls->m_leRecordingValue), SIGNAL(editingFinished()), this, SLOT(UpdateRecordingTime()) );
connect( (QObject*)(m_Controls->m_cbRecordingType), SIGNAL(activated(int)), this, SLOT(UpdateRecordingTime()) );
- connect( (QObject*)(m_Controls->m_leOutputFile), SIGNAL(editingFinished()), this, SLOT(UpdateOutputFileName()) );
-
+ connect( (QObject*)(m_Controls->m_leOutputFile), SIGNAL(editingFinished()), this, SLOT(UpdateOutputFileName()) );
}
}
@@ -169,18 +168,17 @@ void QmitkIGTLoggerWidget::StopRecording()
void QmitkIGTLoggerWidget::OnRecording()
{
- static unsigned int sampleCounter = 0;
unsigned int int_samples = m_Samples.toInt();
- if(sampleCounter >= int_samples)
+ if(m_SampleCounter >= int_samples)
{
this->StopRecording();
- sampleCounter=0;
+ m_SampleCounter=0;
return;
}
m_Recorder->Update();
if (m_Controls->m_cbRecordingType->currentIndex()==1)
- sampleCounter++;
+ m_SampleCounter++;
}
void QmitkIGTLoggerWidget::OnChangePressed()
@@ -271,6 +269,11 @@ void QmitkIGTLoggerWidget::SetDefaultRecordingSettings()
m_Controls->m_cbRecordingType->setCurrentIndex(0);
m_Samples="100";
m_MilliSeconds="2000";
+
+// m_Controls->m_leRecordingValue->setText("infinite");
+// m_Controls->m_cbRecordingType->setCurrentIndex(2);
+// m_Samples="100";
+// m_MilliSeconds="2000";
}
void QmitkIGTLoggerWidget::SetOutputFileName()
@@ -296,3 +299,29 @@ void QmitkIGTLoggerWidget::SetOutputFileName()
}
m_Controls->m_leOutputFile->setText(m_CmpFilename);
}
+
+void QmitkIGTLoggerWidget::SetOutputFileName( QString filename )
+{
+ m_Controls->m_leOutputFile->setText(filename);
+ m_CmpFilename=filename;
+}
+
+QString QmitkIGTLoggerWidget::GetOutputFileName()
+{
+ return m_CmpFilename;
+}
+
+
+std::pair<int, QString> QmitkIGTLoggerWidget::GetRecordingInfo()
+{
+ std::pair <int, QString> recordingInfo;
+ recordingInfo.first = m_Controls->m_cbRecordingType->currentIndex();
+ recordingInfo.second = m_Controls->m_leRecordingValue->text();
+ return recordingInfo;
+}
+
+void QmitkIGTLoggerWidget::SetRecordingInfo(std::pair<int, QString> recordingInfo)
+{
+ m_Controls->m_leRecordingValue->setText(recordingInfo.second);
+ m_Controls->m_cbRecordingType->setCurrentIndex(recordingInfo.first);
+}
diff --git a/Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.h b/Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.h
index e2528fe..b38697e 100644
--- a/Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.h
+++ b/Modules/IGTUI/Qmitk/QmitkIGTLoggerWidget.h
@@ -50,21 +50,27 @@ class MitkIGTUI_EXPORT QmitkIGTLoggerWidget : public QWidget
void SetDataStorage(mitk::DataStorage* dataStorage);
void SetRecorder(mitk::NavigationDataRecorder::Pointer recorder);
+ void SetOutputFileName(QString filename);
+ QString GetOutputFileName();
+ std::pair<int,QString> GetRecordingInfo();
+ void SetRecordingInfo(std::pair<int, QString> recordingInfo);
+
signals:
void SignalRecordingStarted();
void SignalRecordingStopped();
- protected slots:
+ public slots:
+ void OnStartRecording(bool recording);
+
+ protected slots:
void OnChangePressed();
- void OnStartRecording(bool recording);
void OnRecording();
void UpdateRecordingTime();
void StopRecording();
void UpdateOutputFileName();
-
protected:
/// \brief Creation of the connections
@@ -73,7 +79,6 @@ class MitkIGTUI_EXPORT QmitkIGTLoggerWidget : public QWidget
virtual void CreateQtPartControl(QWidget *parent);
void SetDefaultRecordingSettings();
void SetOutputFileName();
-
Ui::QmitkIGTLoggerWidgetControls* m_Controls;
/** @brief holds the DataStorage */
@@ -87,5 +92,6 @@ class MitkIGTUI_EXPORT QmitkIGTLoggerWidget : public QWidget
QString m_MilliSeconds;
QString m_Samples;
bool m_RecordingActivated;
+ unsigned int m_SampleCounter;
};
#endif
\ No newline at end of file

File Metadata

Mime Type
text/plain
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
793
Default Alt Text
IGTLoggerPatch.diff (4 KB)

Event Timeline

gergel added a comment.May 7 2012, 5:39 PM

patch for synchronic logging of two logger widgets

MITK · MIC · IMSY · DKFZ