From 0327362aa5211aad81c2a65c04204aae163ce7f2 Mon Sep 17 00:00:00 2001
From: Stephane Albert <stephane.albert@c-s.fr>
Date: Thu, 5 Mar 2015 11:00:15 +0100
Subject: [PATCH] ENH: Fixed signal/slot connections.
---
Code/Common/Gui/mvdImageViewWidget.cxx | 40 ++++++++------------------
Code/Common/Gui/mvdImageViewWidget.h | 2 +-
2 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/Code/Common/Gui/mvdImageViewWidget.cxx b/Code/Common/Gui/mvdImageViewWidget.cxx
index 535e66c16e..e40f5ca5e7 100644
--- a/Code/Common/Gui/mvdImageViewWidget.cxx
+++ b/Code/Common/Gui/mvdImageViewWidget.cxx
@@ -201,10 +201,10 @@ ImageViewWidget
QObject::connect(
stackedLayerModel,
- SIGNAL( AboutToDeleteLayer( size_t ) ),
+ SIGNAL( LayerAboutToBeDeleted( size_t ) ),
// to:
this,
- SLOT( OnAboutToDeleteLayer( size_t ) )
+ SLOT( OnLayerAboutToBeDeleted( size_t ) )
);
QObject::connect(
@@ -795,22 +795,6 @@ ImageViewWidget
this,
SLOT( updateGL() )
);
-
- QObject::connect(
- layer,
- SIGNAL( LayerAdded( size_t ) ),
- // from:
- this,
- SLOT( OnLayerAdded( size_t ) )
- );
-
- QObject::disconnect(
- layer,
- SIGNAL( AboutToDeleteLayer( size_t ) ),
- // from:
- this,
- SLOT( OnAboutToDeleteLayer( size_t ) )
- );
}
/*******************************************************************************/
@@ -870,16 +854,6 @@ ImageViewWidget
m_Manipulator->CenterOn( point );
}
-/******************************************************************************/
-void
-ImageViewWidget
-::OnAboutToDeleteLayer( size_t index )
-{
- assert( GetLayerStack()!=NULL );
-
- Disconnect( GetLayerStack()->At( index ) );
-}
-
/******************************************************************************/
void
ImageViewWidget
@@ -914,6 +888,16 @@ ImageViewWidget
updateGL();
}
+/******************************************************************************/
+void
+ImageViewWidget
+::OnLayerAboutToBeDeleted( size_t index )
+{
+ assert( GetLayerStack()!=NULL );
+
+ Disconnect( GetLayerStack()->At( index ) );
+}
+
/******************************************************************************/
void
ImageViewWidget
diff --git a/Code/Common/Gui/mvdImageViewWidget.h b/Code/Common/Gui/mvdImageViewWidget.h
index 6dede5c2bd..2cdaf5aef7 100644
--- a/Code/Common/Gui/mvdImageViewWidget.h
+++ b/Code/Common/Gui/mvdImageViewWidget.h
@@ -325,7 +325,7 @@ private slots:
void OnLayerAdded( size_t );
/**
*/
- void OnAboutToDeleteLayer( size_t );
+ void OnLayerAboutToBeDeleted( size_t );
};
}// end namespace 'mvd'
--
GitLab