Merge branch 'master' of /home/dsarrut/clitk3.server

[clitk.git] / vv / vvInfoPanel.cxx

diff --git a/vv/vvInfoPanel.cxx b/vv/vvInfoPanel.cxx
index e20a9c1a4e071fa13e3bffca9f7af43cc81ae0fa..da2bda3828c8bdb081e4786184eb49e1568c191f 100644 (file)
--- a/vv/vvInfoPanel.cxx
+++ b/vv/vvInfoPanel.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,14 +14,32 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-  ======================================================================-====*/
+  ===========================================================================**/
 #include <QtGui>
 #include <Qt>
 
 #include "vvInfoPanel.h"
 #include "clitkMemoryUsage.h"
+#include "clitkConfiguration.h"
 
 //------------------------------------------------------------------------------
+vvInfoPanel::vvInfoPanel(QWidget * parent):QWidget(parent)
+{
+  setupUi(this);
+#if CLITK_MEMORY_INFO==0
+  memoryUsageLabel->hide();
+#endif
+}
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+void vvInfoPanel::setTransformation(QString text)
+{
+  transformationLabel->setText(text);
+}
+
+//------------------------------------------------------------------------------
+
 void vvInfoPanel::setFileName(QString text)
 {
   if (text.size() > 30)
@@ -106,7 +124,7 @@ void vvInfoPanel::setCurrentInfo(int visibility, double x, double y, double z, d
 
 //------------------------------------------------------------------------------
 void vvInfoPanel::setViews(int window, int view, int slice)
-{
+{/*
   QString viewString;
   switch (view) {
   case 0: {
@@ -148,7 +166,7 @@ void vvInfoPanel::setViews(int window, int view, int slice)
     DRLabel->setText(text);
     break;
   }
-  }
+  }*/
 }
 //------------------------------------------------------------------------------
 
@@ -156,7 +174,7 @@ void vvInfoPanel::setViews(int window, int view, int slice)
 //------------------------------------------------------------------------------
 void vvInfoPanel::setMemoryInMb(QString text)
 {
-  memoryUsageLabel->setText("Memory usage: "+text);
+  memoryUsageLabel->setText("<font color=\"blue\">Memory usage :</font> "+text);
 }
 //------------------------------------------------------------------------------