[clitk-commits-list] Clitk branch master updated. v1.2.0-615-gb723c35
root
root at tux.creatis.insa-lyon.fr
Tue Dec 27 15:50:09 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Clitk".
The branch, master has been updated
via b723c3573a7b923bda4a8113159870b9fadabad2 (commit)
via 13048c1469b7421804addb724efe87d7e1313a80 (commit)
via 318e088575f1fe3e043230f829e8175b316ca056 (commit)
via 2e9a4d4f5a2057c62dc451e355d022025ae12a57 (commit)
from cdec3fe358bfd005cb60ad6bf83def00291c86ea (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=b723c3573a7b923bda4a8113159870b9fadabad2
commit b723c3573a7b923bda4a8113159870b9fadabad2
Author: Vivien Delmon <vivien.delmon at creatis.insa-lyon.fr>
Date: Tue Dec 27 15:49:12 2011 +0100
Add Overlay properties to SaveState / ReadState
- Use vvSlicerManagers to Get/Set Overlay properties.
diff --git a/vv/vvReadState.cxx b/vv/vvReadState.cxx
index 62d8b59..dafcf3f 100644
--- a/vv/vvReadState.cxx
+++ b/vv/vvReadState.cxx
@@ -141,6 +141,9 @@ std::string vvReadState::ReadFusion(int index)
std::string vvReadState::ReadOverlay(int index)
{
std::string file, value;
+ int vali;
+ double vald;
+ vvSlicerManager* slicerManager = m_Window->GetSlicerManagers()[index];
while (!m_XmlReader->isEndElement() || value != "Overlay") {
m_XmlReader->readNext();
value = m_XmlReader->qualifiedName().toString().toStdString();
@@ -150,8 +153,29 @@ std::string vvReadState::ReadOverlay(int index)
if (!m_XmlReader->hasError())
m_Window->AddOverlayImage(index, file.c_str());
}
+ if (value == "OverlayColorWindow") {
+ vald = m_XmlReader->readElementText().toDouble();
+ if (!m_XmlReader->hasError())
+ slicerManager->SetOverlayColorWindow(vald);
+ }
+ if (value == "OverlayColorLevel") {
+ vald = m_XmlReader->readElementText().toDouble();
+ if (!m_XmlReader->hasError())
+ slicerManager->SetOverlayColorLevel(vald);
+ }
+ if (value == "LinkOverlayWindowLevel") {
+ vali = m_XmlReader->readElementText().toInt();
+ if (!m_XmlReader->hasError())
+ slicerManager->SetLinkOverlayWindowLevel(vali);
+ }
+ if (value == "OverlayColor") {
+ vali = m_XmlReader->readElementText().toInt();
+ if (!m_XmlReader->hasError())
+ slicerManager->SetOverlayColor(vali);
+ }
}
}
+ m_Window->ImageInfoChanged();
return value;
}
diff --git a/vv/vvSaveState.cxx b/vv/vvSaveState.cxx
index e7b6193..c1a7e49 100644
--- a/vv/vvSaveState.cxx
+++ b/vv/vvSaveState.cxx
@@ -80,7 +80,7 @@ void vvSaveState::SaveImage(const QTreeWidgetItem* item, int index)
if (role == "fusion")
SaveFusion(item_child, slicerManager);
else if (role == "overlay")
- SaveOverlay(item_child);
+ SaveOverlay(item_child, slicerManager);
else if (role == "vector")
SaveVector(item_child);
}
@@ -101,11 +101,15 @@ void vvSaveState::SaveFusion(const QTreeWidgetItem* item, const vvSlicerManager*
m_XmlWriter->writeEndElement();
}
-void vvSaveState::SaveOverlay(QTreeWidgetItem* item)
+void vvSaveState::SaveOverlay(const QTreeWidgetItem* item, const vvSlicerManager* vvManager)
{
m_XmlWriter->writeStartElement("Overlay");
std::string filename = item->data(0, Qt::UserRole).toString().toStdString();
m_XmlWriter->writeTextElement("FileName", QDir::current().absoluteFilePath(filename.c_str()));
+ m_XmlWriter->writeTextElement("OverlayColorWindow", QString::number(vvManager->GetOverlayColorWindow()));
+ m_XmlWriter->writeTextElement("OverlayColorLevel", QString::number(vvManager->GetOverlayColorLevel()));
+ m_XmlWriter->writeTextElement("LinkOverlayWindowLevel", QString::number(vvManager->GetLinkOverlayWindowLevel()));
+ m_XmlWriter->writeTextElement("OverlayColor", QString::number(vvManager->GetOverlayColor()));
m_XmlWriter->writeEndElement();
}
diff --git a/vv/vvSaveState.h b/vv/vvSaveState.h
index 9d236ed..2991580 100644
--- a/vv/vvSaveState.h
+++ b/vv/vvSaveState.h
@@ -25,7 +25,7 @@ protected:
void SaveTree();
void SaveImage(const QTreeWidgetItem* item, int index);
void SaveFusion(const QTreeWidgetItem* item, const vvSlicerManager* slicerManager);
- void SaveOverlay(const QTreeWidgetItem* item);
+ void SaveOverlay(const QTreeWidgetItem* item, const vvSlicerManager* slicerManager);
void SaveVector(const QTreeWidgetItem* item);
std::auto_ptr<QXmlStreamWriter> m_XmlWriter;
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=13048c1469b7421804addb724efe87d7e1313a80
commit 13048c1469b7421804addb724efe87d7e1313a80
Author: Vivien Delmon <vivien.delmon at creatis.insa-lyon.fr>
Date: Tue Dec 27 15:35:44 2011 +0100
Add Fusion properties to SaveState / ReadState
- Add constness on QTreeWidgetItem.
- Use vvSlicerManagers to Get/Set Fusion properties.
diff --git a/vv/vvReadState.cxx b/vv/vvReadState.cxx
index 83a7c5e..62d8b59 100644
--- a/vv/vvReadState.cxx
+++ b/vv/vvReadState.cxx
@@ -1,5 +1,6 @@
#include "vvReadState.h"
#include "vvMainWindow.h"
+#include "vvSlicerManager.h"
#include <qtreewidget.h>
@@ -75,7 +76,7 @@ std::string vvReadState::ReadImage()
}
}
else if (current_index >= 0) {
- if (value == "Fusion")
+ if (value == "Fusion")
value = ReadFusion(current_index);
else if (value == "Overlay")
value = ReadOverlay(current_index);
@@ -94,6 +95,9 @@ std::string vvReadState::ReadImage()
std::string vvReadState::ReadFusion(int index)
{
std::string file, value;
+ int vali;
+ double vald;
+ vvSlicerManager* slicerManager = m_Window->GetSlicerManagers()[index];
while (!m_XmlReader->isEndElement() || value != "Fusion") {
m_XmlReader->readNext();
value = m_XmlReader->qualifiedName().toString().toStdString();
@@ -103,8 +107,34 @@ std::string vvReadState::ReadFusion(int index)
if (!m_XmlReader->hasError())
m_Window->AddFusionImage(index, file.c_str());
}
+ if (value == "FusionOpacity") {
+ vali = m_XmlReader->readElementText().toInt();
+ if (!m_XmlReader->hasError())
+ slicerManager->SetFusionOpacity(vali);
+ }
+ if (value == "FusionThresholdOpacity") {
+ vali = m_XmlReader->readElementText().toInt();
+ if (!m_XmlReader->hasError())
+ slicerManager->SetFusionThresholdOpacity(vali);
+ }
+ if (value == "FusionColorMap") {
+ vali = m_XmlReader->readElementText().toInt();
+ if (!m_XmlReader->hasError())
+ slicerManager->SetFusionColorMap(vali);
+ }
+ if (value == "FusionWindow") {
+ vald = m_XmlReader->readElementText().toDouble();
+ if (!m_XmlReader->hasError())
+ slicerManager->SetFusionWindow(vald);
+ }
+ if (value == "FusionLevel") {
+ vald = m_XmlReader->readElementText().toDouble();
+ if (!m_XmlReader->hasError())
+ slicerManager->SetFusionLevel(vald);
+ }
}
}
+ m_Window->ImageInfoChanged();
return value;
}
diff --git a/vv/vvSaveState.cxx b/vv/vvSaveState.cxx
index e573bb9..e7b6193 100644
--- a/vv/vvSaveState.cxx
+++ b/vv/vvSaveState.cxx
@@ -59,10 +59,11 @@ void vvSaveState::SaveTree()
m_XmlWriter->writeEndElement();
}
-void vvSaveState::SaveImage(QTreeWidgetItem* item, int index)
+void vvSaveState::SaveImage(const QTreeWidgetItem* item, int index)
{
+ const vvSlicerManager * slicerManager = m_Window->GetSlicerManagers()[index];
m_XmlWriter->writeStartElement("Image");
-
+
std::ostringstream indexStr;
indexStr.str("");
indexStr << index;
@@ -70,28 +71,33 @@ void vvSaveState::SaveImage(QTreeWidgetItem* item, int index)
std::string filename = item->data(0, Qt::UserRole).toString().toStdString();
m_XmlWriter->writeTextElement("FileName", QDir::current().absoluteFilePath(filename.c_str()));
-
+
QTreeWidgetItem* item_child;
std::string role;
for (int i = 0; i < item->childCount(); i++) {
item_child = item->child(i);
role = item_child->data(1,Qt::UserRole).toString().toStdString();
if (role == "fusion")
- SaveFusion(item_child);
+ SaveFusion(item_child, slicerManager);
else if (role == "overlay")
SaveOverlay(item_child);
else if (role == "vector")
SaveVector(item_child);
}
-
+
m_XmlWriter->writeEndElement();
}
-void vvSaveState::SaveFusion(QTreeWidgetItem* item)
+void vvSaveState::SaveFusion(const QTreeWidgetItem* item, const vvSlicerManager* vvManager)
{
m_XmlWriter->writeStartElement("Fusion");
std::string filename = item->data(0, Qt::UserRole).toString().toStdString();
m_XmlWriter->writeTextElement("FileName", QDir::current().absoluteFilePath(filename.c_str()));
+ m_XmlWriter->writeTextElement("FusionOpacity", QString::number(vvManager->GetFusionOpacity()));
+ m_XmlWriter->writeTextElement("FusionThresholdOpacity", QString::number(vvManager->GetFusionThresholdOpacity()));
+ m_XmlWriter->writeTextElement("FusionColorMap", QString::number(vvManager->GetFusionColorMap()));
+ m_XmlWriter->writeTextElement("FusionWindow", QString::number(vvManager->GetFusionWindow()));
+ m_XmlWriter->writeTextElement("FusionLevel", QString::number(vvManager->GetFusionLevel()));
m_XmlWriter->writeEndElement();
}
@@ -103,7 +109,7 @@ void vvSaveState::SaveOverlay(QTreeWidgetItem* item)
m_XmlWriter->writeEndElement();
}
-void vvSaveState::SaveVector(QTreeWidgetItem* item)
+void vvSaveState::SaveVector(const QTreeWidgetItem* item)
{
m_XmlWriter->writeStartElement("Vector");
std::string filename = item->data(0, Qt::UserRole).toString().toStdString();
diff --git a/vv/vvSaveState.h b/vv/vvSaveState.h
index 7a7cda9..9d236ed 100644
--- a/vv/vvSaveState.h
+++ b/vv/vvSaveState.h
@@ -3,6 +3,7 @@
#include <string>
#include <memory>
+#include "vvSlicerManager.h"
class vvMainWindow;
class QXmlStreamWriter;
@@ -22,10 +23,10 @@ protected:
void SaveGlobals();
void SaveGUI();
void SaveTree();
- void SaveImage(QTreeWidgetItem* item, int index);
- void SaveFusion(QTreeWidgetItem* item);
- void SaveOverlay(QTreeWidgetItem* item);
- void SaveVector(QTreeWidgetItem* item);
+ void SaveImage(const QTreeWidgetItem* item, int index);
+ void SaveFusion(const QTreeWidgetItem* item, const vvSlicerManager* slicerManager);
+ void SaveOverlay(const QTreeWidgetItem* item);
+ void SaveVector(const QTreeWidgetItem* item);
std::auto_ptr<QXmlStreamWriter> m_XmlWriter;
std::auto_ptr<QFile> m_File;
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=318e088575f1fe3e043230f829e8175b316ca056
commit 318e088575f1fe3e043230f829e8175b316ca056
Author: Vivien Delmon <vivien.delmon at creatis.insa-lyon.fr>
Date: Tue Dec 27 15:30:50 2011 +0100
Add constness some getters
diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx
index 9a16309..e739eef 100644
--- a/vv/vvSlicerManager.cxx
+++ b/vv/vvSlicerManager.cxx
@@ -763,7 +763,7 @@ double vvSlicerManager::GetColorLevel()
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
-double vvSlicerManager::GetOverlayColorWindow()
+double vvSlicerManager::GetOverlayColorWindow() const
{
if (mSlicers.size())
return mSlicers[0]->GetOverlayColorWindow();
@@ -772,7 +772,7 @@ double vvSlicerManager::GetOverlayColorWindow()
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
-double vvSlicerManager::GetOverlayColorLevel()
+double vvSlicerManager::GetOverlayColorLevel() const
{
if (mSlicers.size())
return mSlicers[0]->GetOverlayColorLevel();
@@ -781,7 +781,7 @@ double vvSlicerManager::GetOverlayColorLevel()
//----------------------------------------------------------------------------
//----------------------------------------------------------------------------
-bool vvSlicerManager::GetLinkOverlayWindowLevel()
+bool vvSlicerManager::GetLinkOverlayWindowLevel() const
{
if (mSlicers.size())
return mSlicers[0]->GetLinkOverlayWindowLevel();
diff --git a/vv/vvSlicerManager.h b/vv/vvSlicerManager.h
index e8a229b..aff339a 100644
--- a/vv/vvSlicerManager.h
+++ b/vv/vvSlicerManager.h
@@ -139,31 +139,31 @@ class vvSlicerManager : public QObject {
double GetColorWindow();
double GetColorLevel();
- double GetOverlayColorWindow();
- double GetOverlayColorLevel();
- bool GetLinkOverlayWindowLevel();
+ double GetOverlayColorWindow() const;
+ double GetOverlayColorLevel() const;
+ bool GetLinkOverlayWindowLevel() const;
int GetColorMap() {
return mColorMap;
}
int GetPreset() {
return mPreset;
}
- int GetOverlayColor() {
+ int GetOverlayColor() const {
return mOverlayColor;
}
- int GetFusionOpacity() {
+ int GetFusionOpacity() const {
return mFusionOpacity;
}
- int GetFusionThresholdOpacity() {
+ int GetFusionThresholdOpacity() const {
return mFusionThresOpacity;
}
- int GetFusionColorMap() {
+ int GetFusionColorMap() const {
return mFusionColorMap;
}
- double GetFusionWindow() {
+ double GetFusionWindow() const {
return mFusionWindow;
}
- double GetFusionLevel() {
+ double GetFusionLevel() const {
return mFusionLevel;
}
http://git.creatis.insa-lyon.fr/pubgit/?p=clitk.git;a=commitdiff;h=2e9a4d4f5a2057c62dc451e355d022025ae12a57
commit 2e9a4d4f5a2057c62dc451e355d022025ae12a57
Author: Vivien Delmon <vivien.delmon at creatis.insa-lyon.fr>
Date: Tue Dec 27 13:42:20 2011 +0100
Remove tmp files
- Remove tmp files after executing the script
- use mktemp instead of /tmp/$RANDOM
diff --git a/scripts/pts_to_landmarks.sh b/scripts/pts_to_landmarks.sh
index 87bc9ee..e93cbe4 100755
--- a/scripts/pts_to_landmarks.sh
+++ b/scripts/pts_to_landmarks.sh
@@ -12,10 +12,11 @@
if [ $# -ne 2 ]; then
echo "Usage: $0 input.pts output.txt" 1>&2
+ exit 1
fi
-to_append=/tmp/$RANDOM
-to_prepend=/tmp/$RANDOM
+to_append=`mktemp`
+to_prepend=`mktemp`
for i in $(seq 0 $((`cat $1 | wc -l` - 1)));
do
@@ -25,3 +26,5 @@ done
echo "LANDMARKS1" > $2
paste -d ' ' $to_prepend $1 $to_append >> $2
+
+rm $to_append $to_prepend
-----------------------------------------------------------------------
Summary of changes:
scripts/pts_to_landmarks.sh | 7 ++++-
vv/vvReadState.cxx | 56 ++++++++++++++++++++++++++++++++++++++++++-
vv/vvSaveState.cxx | 28 ++++++++++++++-------
vv/vvSaveState.h | 9 ++++---
vv/vvSlicerManager.cxx | 6 ++--
vv/vvSlicerManager.h | 18 +++++++-------
6 files changed, 96 insertions(+), 28 deletions(-)
hooks/post-receive
--
Clitk
More information about the Clitk-commits-list
mailing list