X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvLinkPanel.cxx;h=5cfd853b57c9f7a63bf894476add8787b776e20d;hb=959d91564af1b0e33303f3c15d803d2dafcaa54d;hp=511248e4b5a5301364d8f35990fc9abea0fe22a3;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/vv/vvLinkPanel.cxx b/vv/vvLinkPanel.cxx
index 511248e..5cfd853 100644
--- a/vv/vvLinkPanel.cxx
+++ b/vv/vvLinkPanel.cxx
@@ -14,9 +14,11 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+  ======================================================================-====*/
+
 #ifndef _vvLinkPanel_CXX
 #define _vvLinkPanel_CXX
+
 #include "vvLinkPanel.h"
 #include "clitkCommon.h"
 
@@ -24,159 +26,196 @@
 #include <Qt>
 #include "QTreePushButton.h"
 
-//====================================================================
+//------------------------------------------------------------------------------
 vvLinkPanel::vvLinkPanel(QWidget * parent):QWidget(parent)
 {
-    setupUi(this);
-    imageNames.resize(0);
-    image1Ids.resize(0);
-    image2Ids.resize(0);
-
-    linkTableWidget->resizeColumnsToContents();
-    linkTableWidget->verticalHeader()->hide();
-    linkTableWidget->horizontalHeader()->hide();
-    linkTableWidget->hideColumn(4);
-    linkTableWidget->hideColumn(5);
-
-    connect(image1ComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(UpdateComboBox2(int)));
-    connect(linkButton,SIGNAL(clicked()),this,SLOT(addLink()));
-    connect(linkAllButton,SIGNAL(clicked()),this,SLOT(linkAll()));
+  setupUi(this);
+  imageNames.resize(0);
+  image1Ids.resize(0);
+  image2Ids.resize(0);
+
+  linkTableWidget->resizeColumnsToContents();
+  linkTableWidget->verticalHeader()->hide();
+  linkTableWidget->horizontalHeader()->hide();
+  linkTableWidget->hideColumn(4);
+  linkTableWidget->hideColumn(5);
+
+  connect(image1ComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(UpdateComboBox2(int)));
+  connect(linkButton,SIGNAL(clicked()),this,SLOT(addLink()));
+  connect(linkAllButton,SIGNAL(clicked()),this,SLOT(linkAll()));
 }
+//------------------------------------------------------------------------------
+
 
+//------------------------------------------------------------------------------
 void vvLinkPanel::addImage(std::string name, std::string id)
 {
-    imageNames.push_back(name);
-    image1Ids.push_back(id);
-    UpdateComboBox1();
+  imageNames.push_back(name);
+  image1Ids.push_back(id);
+  UpdateComboBox1();
 }
+//------------------------------------------------------------------------------
 
+
+//------------------------------------------------------------------------------
 void vvLinkPanel::removeImage(int index)
 {
-    std::string idRemoved = image1Ids[index];
-    std::vector<std::string>::iterator Nameiter = imageNames.begin();
-    std::vector<std::string>::iterator Iditer = image1Ids.begin();
-    for (int i = 0; i < index; i++)
+  std::string idRemoved = image1Ids[index];
+  std::vector<std::string>::iterator Nameiter = imageNames.begin();
+  std::vector<std::string>::iterator Iditer = image1Ids.begin();
+  for (int i = 0; i < index; i++)
     {
-        Nameiter++;
-        Iditer++;
+      Nameiter++;
+      Iditer++;
     }
-    imageNames.erase(Nameiter);
-    image1Ids.erase(Iditer);
-    UpdateComboBox1();
-    for (int i = linkTableWidget->rowCount() - 1; i >= 0 ;i--)
+  imageNames.erase(Nameiter);
+  image1Ids.erase(Iditer);
+  UpdateComboBox1();
+  for (int i = linkTableWidget->rowCount() - 1; i >= 0 ;i--)
     {
-        if (linkTableWidget->item(i,4)->text().toStdString() == idRemoved ||
-                linkTableWidget->item(i,5)->text().toStdString() == idRemoved)
+      if (linkTableWidget->item(i,4)->text().toStdString() == idRemoved ||
+          linkTableWidget->item(i,5)->text().toStdString() == idRemoved)
         {
-            emit removeLink(linkTableWidget->item(i,4)->text(),linkTableWidget->item(i,5)->text());
-            linkTableWidget->removeRow(i);
-            UpdateComboBox2(image1ComboBox->currentIndex());
+          emit removeLink(linkTableWidget->item(i,4)->text(),linkTableWidget->item(i,5)->text());
+          linkTableWidget->removeRow(i);
+          UpdateComboBox2(image1ComboBox->currentIndex());
         }
     }
 }
+//------------------------------------------------------------------------------
+
 
+//------------------------------------------------------------------------------
 void vvLinkPanel::UpdateComboBox1()
 {
-    image1ComboBox->clear();
-    for (unsigned int i = 0; i < imageNames.size();i++)
+  image1ComboBox->clear();
+  for (unsigned int i = 0; i < imageNames.size();i++)
     {
-        image1ComboBox->addItem(imageNames[i].c_str());
+      image1ComboBox->addItem(imageNames[i].c_str());
     }
 }
+//------------------------------------------------------------------------------
 
+
+//------------------------------------------------------------------------------
 void vvLinkPanel::UpdateComboBox2(int index)
 {
-    image2ComboBox->clear();
-    image2Ids.resize(0);
-    if (imageNames.size() > 1 && index >= 0)
+  image2ComboBox->clear();
+  image2Ids.resize(0);
+  if (imageNames.size() > 1 && index >= 0)
     {
-        for (unsigned int i = 0; i < imageNames.size();i++)
+      for (unsigned int i = 0; i < imageNames.size();i++)
         {
-            if ((int)i != index)
+          if ((int)i != index)
             {
-                bool AlreadyLinked = false;
-                for (int row = 0; row < linkTableWidget->rowCount();row++)
+              bool AlreadyLinked = false;
+              for (int row = 0; row < linkTableWidget->rowCount();row++)
                 {
-                    if ((linkTableWidget->item(row,1)->text().toStdString() == imageNames[index] &&
-                            linkTableWidget->item(row,3)->text().toStdString() == imageNames[i]) ||
-                            (linkTableWidget->item(row,3)->text().toStdString() == imageNames[index] &&
-                             linkTableWidget->item(row,1)->text().toStdString() == imageNames[i]))
+                  if ((linkTableWidget->item(row,1)->text().toStdString() == imageNames[index] &&
+                       linkTableWidget->item(row,3)->text().toStdString() == imageNames[i]) ||
+                      (linkTableWidget->item(row,3)->text().toStdString() == imageNames[index] &&
+                       linkTableWidget->item(row,1)->text().toStdString() == imageNames[i]))
                     {
-                        AlreadyLinked = true;
-                        break;
+                      AlreadyLinked = true;
+                      break;
                     }
                 }
-                if (!AlreadyLinked)
+              if (!AlreadyLinked)
                 {
-                    image2ComboBox->addItem(imageNames[i].c_str());
-                    image2Ids.push_back(image1Ids[i]);
+                  image2ComboBox->addItem(imageNames[i].c_str());
+                  image2Ids.push_back(image1Ids[i]);
                 }
             }
         }
     }
-    if (image2ComboBox->count() == 0)
-        linkButton->setEnabled(0);
-    else
-        linkButton->setEnabled(1);
+  if (image2ComboBox->count() == 0)
+    linkButton->setEnabled(0);
+  else
+    linkButton->setEnabled(1);
 }
+//------------------------------------------------------------------------------
+
 
+//------------------------------------------------------------------------------
 void vvLinkPanel::linkAll()
 {
-    //First remove all links
-    while (linkTableWidget->rowCount())
-        removeLink(1,1);
-    //Now create all possible links
-    int count=image2ComboBox->count();
-    for (int j=0;j<count;j++)
+  //First remove all links
+  while (linkTableWidget->rowCount())
+    removeLink(1,1);
+  //Now create all possible links
+  int count=image2ComboBox->count();
+  for (int j=0;j<count;j++)
     {
-        image1ComboBox->setCurrentIndex(j);
-        image2ComboBox->setCurrentIndex(0);
-        for (int i=0;i< count-j;i++)
-            addLink();
+      image1ComboBox->setCurrentIndex(j);
+      image2ComboBox->setCurrentIndex(0);
+      for (int i=0;i< count-j;i++)
+        addLink();
     }
 }
+//------------------------------------------------------------------------------
 
+
+//------------------------------------------------------------------------------
 void vvLinkPanel::addLink()
 {
-    if (!image1ComboBox->currentText().isEmpty()
-            && !image2ComboBox->currentText().isEmpty())
+  if (!image1ComboBox->currentText().isEmpty()
+      && !image2ComboBox->currentText().isEmpty())
     {
-        int row = linkTableWidget->rowCount();
-        linkTableWidget->insertRow(row);
-
-        linkTableWidget->setItem(row,1,new QTableWidgetItem(image1ComboBox->currentText()));
-        linkTableWidget->setItem(row,2,new QTableWidgetItem("&"));
-        linkTableWidget->setItem(row,3,new QTableWidgetItem(image2ComboBox->currentText()));
-        linkTableWidget->setItem(row,4,new QTableWidgetItem(image1Ids[image1ComboBox->currentIndex()].c_str()));
-        linkTableWidget->setItem(row,5,new QTableWidgetItem(image2Ids[image2ComboBox->currentIndex()].c_str()));
-        QTreePushButton* cButton = new QTreePushButton;
-        cButton->setIndex(linkTableWidget->rowCount());
-        cButton->setColumn(0);
-        cButton->setIcon(QIcon(QString::fromUtf8(":/new/prefix1/icons/exit.png")));
-        connect(cButton,SIGNAL(clickedInto(int, int)),
-                this,SLOT(removeLink(int, int)));
-        cButton->setToolTip(tr("remove link"));
-        linkTableWidget->setCellWidget(row,0,cButton);
-
-        linkTableWidget->resizeColumnToContents(0);
-        linkTableWidget->resizeColumnToContents(1);
-        linkTableWidget->resizeColumnToContents(2);
-        linkTableWidget->resizeColumnToContents(3);
-        linkTableWidget->setRowHeight(row,17);
-
-        emit addLink(image1Ids[image1ComboBox->currentIndex()].c_str(),
-                     image2Ids[image2ComboBox->currentIndex()].c_str());
-        UpdateComboBox2(image1ComboBox->currentIndex());
+      int row = linkTableWidget->rowCount();
+      linkTableWidget->insertRow(row);
+
+      linkTableWidget->setItem(row,1,new QTableWidgetItem(image1ComboBox->currentText()));
+      linkTableWidget->setItem(row,2,new QTableWidgetItem("&"));
+      linkTableWidget->setItem(row,3,new QTableWidgetItem(image2ComboBox->currentText()));
+      linkTableWidget->setItem(row,4,new QTableWidgetItem(image1Ids[image1ComboBox->currentIndex()].c_str()));
+      linkTableWidget->setItem(row,5,new QTableWidgetItem(image2Ids[image2ComboBox->currentIndex()].c_str()));
+      QTreePushButton* cButton = new QTreePushButton;
+      cButton->setIndex(linkTableWidget->rowCount());
+      cButton->setColumn(0);
+      cButton->setIcon(QIcon(QString::fromUtf8(":/common/icons/exit.png")));
+      connect(cButton,SIGNAL(clickedInto(int, int)),
+              this,SLOT(removeLink(int, int)));
+      cButton->setToolTip(tr("remove link"));
+      linkTableWidget->setCellWidget(row,0,cButton);
+
+      linkTableWidget->resizeColumnToContents(0);
+      linkTableWidget->resizeColumnToContents(1);
+      linkTableWidget->resizeColumnToContents(2);
+      linkTableWidget->resizeColumnToContents(3);
+      linkTableWidget->setRowHeight(row,17);
+
+      emit addLink(image1Ids[image1ComboBox->currentIndex()].c_str(),
+                   image2Ids[image2ComboBox->currentIndex()].c_str());
+      UpdateComboBox2(image1ComboBox->currentIndex());
     }
 
 }
+//------------------------------------------------------------------------------
+
 
+//------------------------------------------------------------------------------
 void vvLinkPanel::removeLink(int row, int column)
 {
-    emit removeLink(linkTableWidget->item(row-1,4)->text(),linkTableWidget->item(row-1,5)->text());
-    linkTableWidget->removeRow(row-1);
-    UpdateComboBox2(image1ComboBox->currentIndex());
+ //  DD(row);
+//   DD(column);
+  while (linkTableWidget->item(row-1,4) == NULL) {
+    --row;
+   //  DD(linkTableWidget->rowCount());
+//     DD(row);
+    // return;
+  }
+  if (linkTableWidget->item(row-1,5) == NULL) {
+    return; // should not happend ...
+  }
+  
+  emit removeLink(linkTableWidget->item(row-1,4)->text(),linkTableWidget->item(row-1,5)->text());
+  // DD("after emit");
+  linkTableWidget->removeRow(row-1);
+  // DD("after removeRow");
+  UpdateComboBox2(image1ComboBox->currentIndex());
+  // DD("end");
 }
+//------------------------------------------------------------------------------
 
 #endif /* end #define _vvLinkPanel_CXX */