ENH: changeset to backout in order to take into account new implemented methods

Code/Application/mvdMainWindow.cxx

@@ -133,6 +133,8 @@ void
 MainWindow
 ::InitializeDockWidgets()
 {
+  // TODO : salbert uncomment and use new methods
+/*
   // instanciate the manipulator and the renderer relative to this widget
   QuicklookViewManipulator * qlViewManipulator = new QuicklookViewManipulator();
   ImageModelRenderer *   qlModelRenderer   = new ImageModelRenderer();
@@ -142,17 +144,21 @@ MainWindow
   GLImageWidget * qlWidget = new GLImageWidget( qlViewManipulator, qlModelRenderer, this );
   qlWidget->setMinimumSize(100,100); // TODO : temporary
   
+  // TODO : salbert uncomment and apply new modifications
   AddWidgetToDock( 
     qlWidget,
     QUICKLOOK_DOCK,
     tr( "Quicklook" ),
     Qt::LeftDockWidgetArea
     );
-  
+ 
   // Connect the setLargestPossibleregion
   QObject::connect(
     qlWidget, SIGNAL( ModelImageRegionChanged(const ImageRegionType&) ),
-    qlViewManipulator, SLOT( OnModelImageRegionChanged(const ImageRegionType&)) );
+    qlViewManipulator, SLOT( OnModelImageRegionChanged(const
+  ImageRegionType&)) );
+
+*/
 
 
   //
@@ -348,14 +354,15 @@ MainWindow
     SLOT( updateGL() )
   );
 
-  // TODO : where to do this
-    QObject::disconnect(
-    vectorImageModel->GetQuicklookModel(),
-    SIGNAL( SettingsUpdated() ),
-    // to:
-    qobject_cast<GLImageWidget *>(GetQuicklookDock()->widget()),
-    SLOT( updateGL()  )
-  );
+  // TODO : uncomment and apply new corrections
+  // // TODO : where to do this
+  //   QObject::disconnect(
+  //   vectorImageModel->GetQuicklookModel(),
+  //   SIGNAL( SettingsUpdated() ),
+  //   // to:
+  //   qobject_cast<GLImageWidget *>(GetQuicklookDock()->widget()),
+  //   SLOT( updateGL()  )
+  // );
 
 }
 
@@ -401,29 +408,33 @@ MainWindow
     SLOT( updateGL()  )
   );
 
-
-  // TODO : where to do this
-    QObject::connect(
-    vectorImageModel->GetQuicklookModel(),
-    SIGNAL( SettingsUpdated() ),
-    // to:
-    qobject_cast<GLImageWidget *>(GetQuicklookDock()->widget()),
-    SLOT( updateGL()  )
-  );
-
-  // Connect newly selected model to UI controller.
-  QObject::connect(
-    colorSetupWidget,
-    SIGNAL( CurrentIndexChanged( RgbaChannel, int ) ),
-    // to:
-    vectorImageModel->GetQuicklookModel(),
-    SLOT( OnCurrentIndexChanged( RgbaChannel, int ) )
-  );
+  
+  // TODO : salbert uncomment and use new methods
+  // // TODO : where to do this
+  //   QObject::connect(
+  //   vectorImageModel->GetQuicklookModel(),
+  //   SIGNAL( SettingsUpdated() ),
+  //   // to:
+  //   qobject_cast<GLImageWidget *>(GetQuicklookDock()->widget()),
+  //   SLOT( updateGL()  )
+  // );
+
+  // TODO : salbert uncomment and use new methods 
+  // // Connect newly selected model to UI controller.
+  // QObject::connect(
+  //   colorSetupWidget,
+  //   SIGNAL( CurrentIndexChanged( RgbaChannel, int ) ),
+  //   // to:
+  //   vectorImageModel->GetQuicklookModel(),
+  //   SLOT( OnCurrentIndexChanged( RgbaChannel, int ) )
+  // );
 
 
   // 
   qobject_cast<GLImageWidget *>(centralWidget())->SetImageModel(vectorImageModel);
-  qobject_cast<GLImageWidget *>(GetQuicklookDock()->widget())->SetImageModel(vectorImageModel->GetQuicklookModel());
+
+  // TODO : salbert uncomment and use new methods
+  //qobject_cast<GLImageWidget *>(GetQuicklookDock()->widget())->SetImageModel(vectorImageModel->GetQuicklookModel());
 }
 
 /*****************************************************************************/

Code/Common/mvdAbstractImageModel.cxx

@@ -162,7 +162,8 @@ AbstractImageModel
 ::virtual_BuildModel()
 {
   newChildModel< HistogramModel >();
-  newChildModel< QuicklookModel >();
+  // TODO : salbert uncomment and apply new modifications
+  //newChildModel< QuicklookModel >();
 }
 
 /*******************************************************************************/