From 73d934b4d08b76babfd9d54f747e3ee43865fc9d Mon Sep 17 00:00:00 2001
From: Tats <info@sofianaudry.com>
Date: Sat, 30 Nov 2013 19:23:35 -0500
Subject: [PATCH] Some cleanup in switching of image source

---
 MainWindow.cpp     | 10 ++++++----
 MainWindow.h       |  2 +-
 MapperGLCanvas.cpp | 10 +++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/MainWindow.cpp b/MainWindow.cpp
index 6eea4b3..03239e9 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -55,8 +55,10 @@ void MainWindow::handleSourceItemSelectionChanged()
   QListWidgetItem* item = sourceList->currentItem();
   int idx = item->data(Qt::UserRole).toInt();
   std::cout << "idx=" << idx << std::endl;
-  sourceCanvas->switchImage(idx);
-  sourceCanvas->repaint();
+  setCurrentPaint(idx);
+  sourceCanvas->updateCanvas();
+  //sourceCanvas->switchImage(idx);
+  //sourceCanvas->repaint();
   destinationCanvas->repaint();
 }
 
@@ -179,8 +181,8 @@ void MainWindow::createLayout()
   connect(sourceCanvas,      SIGNAL(quadChanged()),
           destinationCanvas, SLOT(updateCanvas()));
 
-  connect(destinationCanvas, SIGNAL(imageChanged()),
-          sourceCanvas,      SLOT(updateCanvas()));
+//  connect(destinationCanvas, SIGNAL(imageChanged()),
+//          sourceCanvas,      SLOT(updateCanvas()));
 
   sourceCanvas->setFocusPolicy(Qt::ClickFocus);
   destinationCanvas->setFocusPolicy(Qt::ClickFocus);
diff --git a/MainWindow.h b/MainWindow.h
index 5748937..d8afb00 100644
--- a/MainWindow.h
+++ b/MainWindow.h
@@ -127,7 +127,7 @@ private:
 public:
   MappingManager& getMappingManager() { return *mappingManager; }
   int getCurrentPaintId() const { return currentPaintId; }
-  void setPaint(int id)
+  void setCurrentPaint(int id)
   {
     currentPaintId = id;
   }
diff --git a/MapperGLCanvas.cpp b/MapperGLCanvas.cpp
index 0d9f04f..5609809 100644
--- a/MapperGLCanvas.cpp
+++ b/MapperGLCanvas.cpp
@@ -192,11 +192,11 @@ void MapperGLCanvas::paintEvent(QPaintEvent* /* event */)
   updateGL();
 }
 
-void MapperGLCanvas::switchImage(int imageId)
-{
-  MainWindow::getInstance().setPaint(imageId);
-  emit imageChanged();
-}
+//void MapperGLCanvas::switchImage(int imageId)
+//{
+//  MainWindow::getInstance().setCurrentPaint(imageId);
+//  emit imageChanged();
+//}
 
 //QSize MapperGLCanvas::sizeHint() const
 //{