Commit 89d8a760 authored by KLOCZKO Thibaud's avatar KLOCZKO Thibaud
Browse files

Merge branch 'master' of dtk.inria.fr:dtk/dtk

Solve Conflicts:
	src/dtkComposer/dtkComposerTransmitterReceiver.h
parents 3d63befa 5c3587bb
......@@ -4,9 +4,9 @@
* Copyright (C) 2011 - Thibaud Kloczko, Inria.
* Created: Wed Nov 2 10:48:42 2011 (+0100)
* Version: $Id$
* Last-Updated: Wed Apr 4 14:19:13 2012 (+0200)
* By: Julien Wintz
* Update #: 141
* Last-Updated: Wed May 16 13:40:43 2012 (+0200)
* By: tkloczko
* Update #: 149
*/
/* Commentary:
......@@ -21,6 +21,7 @@
#include <dtkComposer/dtkComposerTransmitter.h>
#include <dtkComposer/dtkComposerTransmitterEmitter.h>
#include <dtkComposer/dtkComposerTransmitterReceiver.h>
#include <dtkCore/dtkAbstractData>
#include <dtkCore/dtkAbstractProcess>
......@@ -41,6 +42,9 @@ class dummyData : public dtkAbstractData
public:
dummyData(void) : dtkAbstractData() {;}
~dummyData(void) {;}
public:
bool operator == (const dummyData& other) { return false;}
public:
QString identifier(void) const {return QString("Dummy data");}
......@@ -189,11 +193,13 @@ int dummyModifier::update(void)
// /////////////////////////////////////////////////////////////////
typedef dtkComposerTransmitterEmitter<dummyData *> dummyDataTransmitter;
typedef dtkComposerTransmitterEmitter<dummyData> dummyDataTransmitter;
typedef dtkComposerTransmitterEmitter<otherData *> otherDataTransmitter;
typedef dtkComposerTransmitterEmitter<double> doubleTransmitter;
typedef dtkComposerTransmitterEmitter<dtkMatrixSquared<int> *> matrixTransmitter;
typedef dtkComposerTransmitterReceiver<dummyData> dummyDataReceiver;
Q_DECLARE_METATYPE(dtkMatrixSquared<int> *);
void run(void)
......@@ -206,9 +212,9 @@ void run(void)
// tranmitter
qRegisterMetaType<dummyData *>();
qRegisterMetaType<dummyData>();
dummyDataTransmitter ddt;
ddt.setData(gen->dummy());
ddt.setData(*gen->dummy());
qRegisterMetaType<otherData *>();
otherDataTransmitter odt;
......@@ -221,6 +227,13 @@ void run(void)
matrixTransmitter mxt;
mxt.setData(&(gen->matrix()));
// receiver
dummyDataReceiver receiver;
receiver.connect(&ddt);
qDebug() << receiver.data();
// modifier
dummyModifier *mod = new dummyModifier();
......@@ -231,7 +244,7 @@ void run(void)
// mod->setMatrix(&(gen->matrix()));
mod->setValue(dbt.data());
mod->setDummyData(ddt.data());
mod->setDummyData(&ddt.data());
mod->setOtherData(odt.data());
mod->setMatrix(mxt.data());
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2012 - Nicolas Niclausse, Inria.
* Created: 2012/01/30 10:37:32
* Version: $Id$
* Last-Updated: Tue May 15 12:23:16 2012 (+0200)
* By: tkloczko
* Update #: 568
* Last-Updated: Wed May 16 12:15:49 2012 (+0200)
* By: Julien Wintz
* Update #: 571
*/
/* Commentary:
......@@ -545,17 +545,17 @@ dtkComposerFactory::dtkComposerFactory(void) : d(new dtkComposerFactoryPrivate)
// process nodes
d->nodes << "Process";
d->descriptions["Process"] = "<p>Description not yet filled!</p>";
d->tags["Process"] = QStringList() << "process" ;
d->types["Process"] = "process";
d->nodes << "Generic Process";
d->descriptions["Generic Process"] = "<p>Description not yet filled!</p>";
d->tags["Generic Process"] = QStringList() << "process" ;
d->types["Generic Process"] = "process";
// process nodes
// view nodes
d->nodes << "View";
d->descriptions["View"] = "<p>Description not yet filled!</p>";
d->tags["View"] = QStringList() << "view" ;
d->types["View"] = "view";
d->nodes << "Generic View";
d->descriptions["Generic View"] = "<p>Description not yet filled!</p>";
d->tags["Generic View"] = QStringList() << "view" ;
d->types["Generic View"] = "view";
// dtkDistributed nodes
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2008-2011 - Julien Wintz, Inria.
* Created: Tue Apr 24 23:29:24 2012 (+0200)
* Version: $Id$
* Last-Updated: ven. mai 11 16:18:49 2012 (+0200)
* By: Nicolas Niclausse
* Update #: 149
* Last-Updated: Wed May 16 11:23:11 2012 (+0200)
* By: Julien Wintz
* Update #: 150
*/
/* Commentary:
......@@ -78,6 +78,7 @@ dtkComposerNodeView::~dtkComposerNodeView(void)
void dtkComposerNodeView::run(void)
{
emit runned();
qApp->processEvents();
}
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2008-2011 - Julien Wintz, Inria.
* Created: Tue Jan 31 18:17:43 2012 (+0100)
* Version: $Id$
* Last-Updated: Fri May 11 17:39:42 2012 (+0200)
* By: tkloczko
* Update #: 3907
* Last-Updated: Wed May 16 12:01:06 2012 (+0200)
* By: Julien Wintz
* Update #: 3911
*/
/* Commentary:
......@@ -1851,15 +1851,11 @@ void dtkComposerStackCommandReparentNode::setOriginNode(dtkComposerSceneNode *no
{
e->origin = node;
e->source = dynamic_cast<dtkComposerSceneNodeComposite *>(node->parent());
qDebug() << e->source->title();
}
void dtkComposerStackCommandReparentNode::setTargetNode(dtkComposerSceneNode *node)
{
e->target = dynamic_cast<dtkComposerSceneNodeComposite *>(node);
qDebug() << e->target->title();
}
void dtkComposerStackCommandReparentNode::setOriginPosition(QPointF position)
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2011 - Thibaud Kloczko, Inria.
* Created: Tue Feb 14 11:39:15 2012 (+0100)
* Version: $Id$
* Last-Updated: Wed May 16 11:59:19 2012 (+0200)
* Last-Updated: Wed May 16 13:43:32 2012 (+0200)
* By: tkloczko
* Update #: 79
* Update #: 77
*/
/* Commentary:
......@@ -28,6 +28,7 @@
#include <QtCore>
template <typename T> class dtkComposerTransmitterEmitter;
class dtkComposerTransmitterVariant;
// /////////////////////////////////////////////////////////////////
......@@ -54,7 +55,6 @@ public:
dtkContainerList<T>& list(void);
const dtkContainerList<T>& list(void) const;
public:
bool isEmpty(void) const;
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2008 - Julien Wintz, Inria.
* Created: Fri Nov 7 16:00:26 2008 (+0100)
* Version: $Id$
* Last-Updated: mar. avril 24 13:30:58 2012 (+0200)
* By: Nicolas Niclausse
* Update #: 246
* Last-Updated: Wed May 16 12:11:05 2012 (+0200)
* By: Julien Wintz
* Update #: 247
*/
/* Commentary:
......@@ -47,6 +47,11 @@ public:
public:
dtkAbstractData& operator = (const dtkAbstractData& other);
public:
bool operator == (const dtkAbstractData& other) {
return false;
}
public:
friend DTKCORE_EXPORT QDebug operator<<(QDebug debug, const dtkAbstractData& data);
friend DTKCORE_EXPORT QDebug operator<<(QDebug debug, dtkAbstractData *data);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment