Turn plugin manager read only when it comes to settings.

src/dtkComposer/dtkComposerNodeControlWhile.cpp

@@ -4,9 +4,9 @@
  * Copyright (C) 2008-2011 - Julien Wintz, Inria.
  * Created: Sat Feb 25 00:02:50 2012 (+0100)
  * Version: $Id$
- * Last-Updated: Wed Mar 21 11:53:05 2012 (+0100)
- *           By: tkloczko
- *     Update #: 58
+ * Last-Updated: Thu May  3 09:38:56 2012 (+0200)
+ *           By: Julien Wintz
+ *     Update #: 59
  */
 
 /* Commentary: 

src/dtkComposer/dtkComposerNodeView.cpp

@@ -4,9 +4,9 @@
  * Copyright (C) 2008-2011 - Julien Wintz, Inria.
  * Created: Tue Apr 24 23:29:24 2012 (+0200)
  * Version: $Id$
- * Last-Updated: Thu Apr 26 15:25:17 2012 (+0200)
+ * Last-Updated: Thu May  3 10:52:47 2012 (+0200)
  *           By: Julien Wintz
- *     Update #: 122
+ *     Update #: 139
  */
 
 /* Commentary: 
@@ -31,9 +31,18 @@ class dtkComposerNodeViewPrivate
 {
 public:
     dtkComposerTransmitterReceiver<QString> receiver_type;
+
+public:
     dtkComposerTransmitterReceiver<dtkVector3DReal> receiver_head_position;
+
+public:
     dtkComposerTransmitterReceiver<dtkQuaternionReal> receiver_head_orientation;
 
+public:
+    dtkComposerTransmitterReceiver<dtkVector3DReal> receiver_screen_upper_left;
+    dtkComposerTransmitterReceiver<dtkVector3DReal> receiver_screen_lower_left;
+    dtkComposerTransmitterReceiver<dtkVector3DReal> receiver_screen_lower_right;
+
 public:
     dtkAbstractView *view;
 };
@@ -45,6 +54,9 @@ dtkComposerNodeView::dtkComposerNodeView(void) : QObject(), dtkComposerNodeLeaf(
     this->appendReceiver(&(d->receiver_type));
     this->appendReceiver(&(d->receiver_head_position));
     this->appendReceiver(&(d->receiver_head_orientation));
+    this->appendReceiver(&(d->receiver_screen_upper_left));
+    this->appendReceiver(&(d->receiver_screen_lower_left));
+    this->appendReceiver(&(d->receiver_screen_lower_right));
 
     connect(this, SIGNAL(runned()), this, SLOT(onRun()));
 }
@@ -85,6 +97,15 @@ QString dtkComposerNodeView::inputLabelHint(int port)
     if(port == 2)
         return "head orientation";
 
+    if(port == 3)
+        return "screen upper left";
+
+    if(port == 4)
+        return "screen lower left";
+
+    if(port == 5)
+        return "screen lower right";
+
     return dtkComposerNodeLeaf::inputLabelHint(port);
 }
 
@@ -116,4 +137,13 @@ void dtkComposerNodeView::onRun(void)
 
     if(!d->receiver_head_orientation.isEmpty())
         d->view->setHeadOrientation(d->receiver_head_orientation.data());
+
+    if(!d->receiver_screen_upper_left.isEmpty())
+        d->view->setUpperLeft(d->receiver_screen_upper_left.data());
+
+    if(!d->receiver_screen_lower_left.isEmpty())
+        d->view->setLowerLeft(d->receiver_screen_lower_left.data());
+
+    if(!d->receiver_screen_lower_right.isEmpty())
+        d->view->setLowerRight(d->receiver_screen_lower_right.data());
 }

src/dtkCore/dtkAbstractView.cpp

@@ -4,9 +4,9 @@
  * Copyright (C) 2008 - Julien Wintz, Inria.
  * Created: Fri Nov  7 16:01:09 2008 (+0100)
  * Version: $Id$
- * Last-Updated: Thu Apr 26 13:10:40 2012 (+0200)
+ * Last-Updated: Thu May  3 10:39:55 2012 (+0200)
  *           By: Julien Wintz
- *     Update #: 318
+ *     Update #: 325
  */
 
 /* Commentary:
@@ -394,7 +394,7 @@ QList<dtkAbstractViewInteractor *> dtkAbstractView::interactors(void) const
 }
 
 // /////////////////////////////////////////////////////////////////
-// vr compatibility api
+// Deprecated VR API
 // /////////////////////////////////////////////////////////////////
 
 void dtkAbstractView::initialize(void)
@@ -489,7 +489,7 @@ double dtkAbstractView::cameraZoom(void) const
 }
 
 // /////////////////////////////////////////////////////////////////
-// 
+// New VR API
 // /////////////////////////////////////////////////////////////////
 
 void dtkAbstractView::setHeadPosition(dtkVector3D<double> position)
@@ -506,6 +506,27 @@ void dtkAbstractView::setHeadOrientation(dtkQuaternion<double> orientation)
     DTK_DEFAULT_IMPLEMENTATION;
 }
 
+void dtkAbstractView::setUpperLeft(dtkVector3D<double> position)
+{
+    DTK_UNUSED(position);
+
+    DTK_DEFAULT_IMPLEMENTATION;
+}
+
+void dtkAbstractView::setLowerLeft(dtkVector3D<double> position)
+{
+    DTK_UNUSED(position);
+
+    DTK_DEFAULT_IMPLEMENTATION;
+}
+
+void dtkAbstractView::setLowerRight(dtkVector3D<double> position)
+{
+    DTK_UNUSED(position);
+
+    DTK_DEFAULT_IMPLEMENTATION;
+}
+
 // /////////////////////////////////////////////////////////////////
 // Debug stream operators
 // /////////////////////////////////////////////////////////////////

src/dtkCore/dtkAbstractView.h

@@ -4,9 +4,9 @@
  * Copyright (C) 2008 - Julien Wintz, Inria.
  * Created: Fri Nov  7 16:00:26 2008 (+0100)
  * Version: $Id$
- * Last-Updated: Fri Apr 27 14:08:04 2012 (+0200)
- *           By: tkloczko
- *     Update #: 324
+ * Last-Updated: Thu May  3 10:40:03 2012 (+0200)
+ *           By: Julien Wintz
+ *     Update #: 328
  */
 
 /* Commentary:
@@ -155,6 +155,13 @@ public:
     virtual void setHeadPosition(dtkVector3D<double> position);
     virtual void setHeadOrientation(dtkQuaternion<double> orientation);
 
+public:
+    virtual void setUpperLeft(dtkVector3D<double> position);
+    virtual void setLowerLeft(dtkVector3D<double> position);
+    virtual void setLowerRight(dtkVector3D<double> position);
+
+// /////////////////////////////////////////////////////////////////
+
 private:
     DTK_DECLARE_PRIVATE(dtkAbstractView);
 };

src/dtkCore/dtkPluginManager.cpp

@@ -4,9 +4,9 @@
  * Copyright (C) 2008 - Julien Wintz, Inria.
  * Created: Tue Aug  4 12:20:59 2009 (+0200)
  * Version: $Id$
- * Last-Updated: Fri Apr 27 18:10:45 2012 (+0200)
+ * Last-Updated: Thu May  3 11:01:55 2012 (+0200)
  *           By: Julien Wintz
- *     Update #: 247
+ *     Update #: 248
  */
 
 /* Commentary:
@@ -215,10 +215,10 @@ void dtkPluginManager::readSettings(void)
 
 void dtkPluginManager::writeSettings(void)
 {
-    QSettings settings("inria", "dtk");
-    settings.beginGroup("plugins");
-    settings.setValue("path", d->path);
-    settings.endGroup();
+    // QSettings settings("inria", "dtk");
+    // settings.beginGroup("plugins");
+    // settings.setValue("path", d->path);
+    // settings.endGroup();
 }
 
 void dtkPluginManager::printPlugins(void)

src/dtkLog/dtkLog.h

@@ -4,9 +4,9 @@
  * Copyright (C) 2008-2011 - Julien Wintz, Inria.
  * Created: Thu Mar  1 14:37:36 2012 (+0100)
  * Version: $Id$
- * Last-Updated: Mon Apr 16 12:07:08 2012 (+0200)
+ * Last-Updated: Mon Apr 30 15:08:46 2012 (+0200)
  *           By: Julien Wintz
- *     Update #: 134
+ *     Update #: 135
  */
 
 /* Commentary: See credits at EOF.
@@ -57,7 +57,7 @@ namespace dtkLog
         dtkLogEngine(dtkLog::Debug).stream()
 
 // /////////////////////////////////////////////////////////////////
-// 
+// Info level stream
 // /////////////////////////////////////////////////////////////////
 
 #define dtkInfo()                                                       \
@@ -67,7 +67,7 @@ namespace dtkLog
         dtkLogEngine(dtkLog::Info).stream()
 
 // /////////////////////////////////////////////////////////////////
-// 
+// Warn level stream
 // /////////////////////////////////////////////////////////////////
 
 #define dtkWarn()                                                       \
@@ -77,7 +77,7 @@ namespace dtkLog
         dtkLogEngine(dtkLog::Warn).stream()
 
 // /////////////////////////////////////////////////////////////////
-// 
+// Error level stream
 // /////////////////////////////////////////////////////////////////
 
 #define dtkError()                                                      \
@@ -87,7 +87,7 @@ namespace dtkLog
         dtkLogEngine(dtkLog::Error).stream()
 
 // /////////////////////////////////////////////////////////////////
-// 
+// Fatal level stream
 // /////////////////////////////////////////////////////////////////
 
 #define dtkFatal()                                                      \