Commit a4b787af authored by Julien Wintz's avatar Julien Wintz
Browse files

Merging request #93.

parent ef77bdb6
......@@ -2,6 +2,7 @@
*~
.DS_Store
build
build-*
install
*.user
.cproject
......
......@@ -39,7 +39,7 @@ if(QT4_FOUND)
NAMES ${QWT_NAMES}
PATHS /usr/local/qwt/lib /usr/local/lib /usr/lib)
if(QWT_LIBRARY)
if(QWT_INCLUDE_DIR AND QWT_LIBRARY)
set(QWT_LIBRARIES ${QWT_LIBRARY})
set(QWT_FOUND "YES")
......@@ -49,7 +49,7 @@ if(QT4_FOUND)
endif(NOT BUILD_SHARED_LIBS)
endif(CYGWIN)
endif(QWT_LIBRARY)
endif(QWT_INCLUDE_DIR AND QWT_LIBRARY)
endif(QT4_FOUND)
mark_as_advanced(QWT_INCLUDE_DIR QWT_LIBRARY QWT_DIR)
......@@ -142,11 +142,11 @@ endif()
## #################################################################
if (APPLE)
set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
set(CMAKE_INSTALL_NAME_DIR "${LIBRARY_INSTALL_OUTPUT_PATH}")
endif ()
if (UNIX AND NOT APPLE)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
set(CMAKE_INSTALL_RPATH "${LIBRARY_INSTALL_OUTPUT_PATH}")
endif ()
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
......
......@@ -22,9 +22,9 @@ set(dtk_VERSION_MINOR "@dtk_VERSION_MINOR@")
set(dtk_VERSION_BUILD "@dtk_VERSION_BUILD@")
set(dtk_VERSION "@dtk_VERSION@")
set(DTK_INCLUDE_DIR "@dtk_INCLUDE_DIR@")
set(DTK_LIBRARY_DIR "@dtk_LIBRARY_DIR@")
set(DTK_CMAKE_DIR "@dtk_CMAKE_DIR@")
set(dtk_INCLUDE_DIRS "@dtk_INCLUDE_DIR@")
set(dtk_LIBRARY_DIRS "@dtk_LIBRARY_DIR@")
set(dtk_CMAKE_DIRS "@dtk_CMAKE_DIR@")
set(dtk_USE_FILE "@dtk_USE_FILE@")
......
......@@ -223,7 +223,7 @@ endif(DTK_BUILD_MPI AND MPI_FOUND AND QUAT_LIBRARY AND VRPN_LIBRARY)
## Qwt
## #################################################################
find_package(Qwt QUIET)
find_package(Qwt 6 QUIET)
if(QWT_FOUND)
add_definitions(-DHAVE_PLOT)
......
......@@ -21,11 +21,11 @@ if(NOT DTK_USE_FILE_INCLUDED)
set(DTK_USE_FILE_INCLUDED 1)
include_directories(${DTK_INCLUDE_DIR})
include_directories(${dtk_INCLUDE_DIRS})
link_directories(${DTK_LIBRARY_DIR})
link_directories(${dtk_LIBRARY_DIRS})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${DTK_CMAKE_DIR})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${dtk_CMAKE_DIRS})
include(dtkDependencies)
include(dtkBuild)
......
#include "../src/dtkComposer/dtkComposer.h"
#include "../src/dtkComposer/dtkComposer_p.h"
#include "../src/dtkComposer/dtkComposerCompass.h"
#include "../src/dtkComposer/dtkComposerEvaluator.h"
#include "../src/dtkComposer/dtkComposerEvaluator_p.h"
#include "../src/dtkComposer/dtkComposerFactory.h"
#include "../src/dtkComposer/dtkComposerFactoryView.h"
#include "../src/dtkComposer/dtkComposerGraph.h"
......@@ -31,7 +33,9 @@
#include "../src/dtkComposer/dtkComposerNodeControlFor.h"
#include "../src/dtkComposer/dtkComposerNodeControlForEach.h"
#include "../src/dtkComposer/dtkComposerNodeControlIf.h"
#include "../src/dtkComposer/dtkComposerNodeControlMap.h"
#include "../src/dtkComposer/dtkComposerNodeControlWhile.h"
#include "../src/dtkComposer/dtkComposerNodeData.h"
#include "../src/dtkComposer/dtkComposerNodeDistributed.h"
#include "../src/dtkComposer/dtkComposerNodeFile.h"
#include "../src/dtkComposer/dtkComposerNodeFileOperator.h"
......@@ -40,7 +44,12 @@
#include "../src/dtkComposer/dtkComposerNodeList.h"
#include "../src/dtkComposer/dtkComposerNodeListOperator.h"
#include "../src/dtkComposer/dtkComposerNodeLogger.h"
#include "../src/dtkComposer/dtkComposerNodeMatrixSquareReal.h"
#include "../src/dtkComposer/dtkComposerNodeMatrixSquareRealOperatorBinary.h"
#include "../src/dtkComposer/dtkComposerNodeMatrixSquareRealOperatorUnary.h"
#include "../src/dtkComposer/dtkComposerNodeNumberOperator.h"
#include "../src/dtkComposer/dtkComposerNodePlotCurve.h"
#include "../src/dtkComposer/dtkComposerNodePlotView.h"
#include "../src/dtkComposer/dtkComposerNodeProcess.h"
#include "../src/dtkComposer/dtkComposerNodeProxy.h"
#include "../src/dtkComposer/dtkComposerNodeQuaternion.h"
......@@ -58,16 +67,23 @@
#include "../src/dtkComposer/dtkComposerNodeVector3DOperatorTernary.h"
#include "../src/dtkComposer/dtkComposerNodeVector3DOperatorUnary.h"
#include "../src/dtkComposer/dtkComposerNodeVectorOperator.h"
#include "../src/dtkComposer/dtkComposerNodeVectorReal.h"
#include "../src/dtkComposer/dtkComposerNodeVectorRealOperatorBinary.h"
#include "../src/dtkComposer/dtkComposerNodeVectorRealOperatorModifier.h"
#include "../src/dtkComposer/dtkComposerNodeVectorRealOperatorUnary.h"
#include "../src/dtkComposer/dtkComposerNodeView.h"
#include "../src/dtkComposer/dtkComposerNodeWorld.h"
#include "../src/dtkComposer/dtkComposerReader.h"
#include "../src/dtkComposer/dtkComposerScene.h"
#include "../src/dtkComposer/dtkComposerScene_p.h"
#include "../src/dtkComposer/dtkComposerSceneEdge.h"
#include "../src/dtkComposer/dtkComposerSceneModel.h"
#include "../src/dtkComposer/dtkComposerSceneNode.h"
#include "../src/dtkComposer/dtkComposerSceneNode_p.h"
#include "../src/dtkComposer/dtkComposerSceneNodeComposite.h"
#include "../src/dtkComposer/dtkComposerSceneNodeControl.h"
#include "../src/dtkComposer/dtkComposerSceneNodeEditor.h"
#include "../src/dtkComposer/dtkComposerSceneNodeEditor_p.h"
#include "../src/dtkComposer/dtkComposerSceneNodeLeaf.h"
#include "../src/dtkComposer/dtkComposerSceneNote.h"
#include "../src/dtkComposer/dtkComposerScenePort.h"
......@@ -77,6 +93,7 @@
#include "../src/dtkComposer/dtkComposerStackUtils.h"
#include "../src/dtkComposer/dtkComposerStackView.h"
#include "../src/dtkComposer/dtkComposerTransmitter.h"
#include "../src/dtkComposer/dtkComposerTransmitter_p.h"
#include "../src/dtkComposer/dtkComposerTransmitterEmitter.h"
#include "../src/dtkComposer/dtkComposerTransmitterProxy.h"
#include "../src/dtkComposer/dtkComposerTransmitterReceiver.h"
......
#include "../src/dtkContainer/dtkAbstractContainer.h"
#include "../src/dtkContainer/dtkAbstractContainerOrdered.h"
#include "../src/dtkContainer/dtkAbstractContainerWrapper.h"
#include "../src/dtkContainer/dtkContainerVector.h"
#include "../src/dtkContainer/dtkContainerVectorWrapper.h"
#include "../src/dtkCore/dtkAbstractData.h"
#include "../src/dtkCore/dtkAbstractData_p.h"
#include "../src/dtkCore/dtkAbstractDataComposite.h"
#include "../src/dtkCore/dtkAbstractDataConverter.h"
#include "../src/dtkCore/dtkAbstractDataConverter_p.h"
#include "../src/dtkCore/dtkAbstractDataDeserializer.h"
#include "../src/dtkCore/dtkAbstractDataDeserializer_p.h"
#include "../src/dtkCore/dtkAbstractDataFactory.h"
#include "../src/dtkCore/dtkAbstractDataReader.h"
#include "../src/dtkCore/dtkAbstractDataReader_p.h"
#include "../src/dtkCore/dtkAbstractDataSerializer.h"
#include "../src/dtkCore/dtkAbstractDataSerializer_p.h"
#include "../src/dtkCore/dtkAbstractDataWriter.h"
#include "../src/dtkCore/dtkAbstractDataWriter_p.h"
#include "../src/dtkCore/dtkAbstractFactory.h"
#include "../src/dtkCore/dtkAbstractObject.h"
#include "../src/dtkCore/dtkAbstractObject_p.h"
#include "../src/dtkCore/dtkAbstractProcess.h"
#include "../src/dtkCore/dtkAbstractProcess_p.h"
#include "../src/dtkCore/dtkAbstractProcessFactory.h"
#include "../src/dtkCore/dtkAbstractView.h"
#include "../src/dtkCore/dtkAbstractView_p.h"
#include "../src/dtkCore/dtkAbstractViewAnimator.h"
#include "../src/dtkCore/dtkAbstractViewAnimator_p.h"
#include "../src/dtkCore/dtkAbstractViewFactory.h"
#include "../src/dtkCore/dtkAbstractViewInteractor.h"
#include "../src/dtkCore/dtkAbstractViewInteractor_p.h"
#include "../src/dtkCore/dtkAbstractViewNavigator.h"
#include "../src/dtkCore/dtkAbstractViewNavigator_p.h"
#include "../src/dtkCore/dtkCpuid.h"
#include "../src/dtkCore/dtkGlobal.h"
#include "../src/dtkCore/dtkPlugin.h"
#include "../src/dtkCore/dtkPlugin_p.h"
#include "../src/dtkCore/dtkPluginManager.h"
#include "../src/dtkCore/dtkSignalBlocker.h"
#include "../src/dtkCore/dtkSingleton.h"
#include "../src/dtkCore/dtkSingletonDeclare.h"
#include "../src/dtkCore/dtkSmartPointer.h"
#include "../src/dtkCore/dtkUpdater.h"
#include "../src/dtkCore/dtkUpdater_p.h"
......@@ -22,10 +22,14 @@
#include "../src/dtkDistributed/dtkDistributedServer.h"
#include "../src/dtkDistributed/dtkDistributedServerDaemon.h"
#include "../src/dtkDistributed/dtkDistributedServerManager.h"
#include "../src/dtkDistributed/dtkDistributedServerManager_p.h"
#include "../src/dtkDistributed/dtkDistributedServerManagerOar.h"
#include "../src/dtkDistributed/dtkDistributedServerManagerSsh.h"
#include "../src/dtkDistributed/dtkDistributedServerManagerTorque.h"
#include "../src/dtkDistributed/dtkDistributedService.h"
#include "../src/dtkDistributed/dtkDistributedService_p.h"
#include "../src/dtkDistributed/dtkDistributedServiceUnix_p.h"
#include "../src/dtkDistributed/dtkDistributedServiceWin_p.h"
#include "../src/dtkDistributed/dtkDistributedSlave.h"
#include "../src/dtkDistributed/dtkDistributedSocket.h"
#include "../src/dtkDistributed/dtkDistributedUnixServerSocket.h"
......
......@@ -2,5 +2,7 @@
#include "../src/dtkLog/dtkLogDestination.h"
#include "../src/dtkLog/dtkLogEngine.h"
#include "../src/dtkLog/dtkLogger.h"
#include "../src/dtkLog/dtkLogger_p.h"
#include "../src/dtkLog/dtkLogModel.h"
#include "../src/dtkLog/dtkLogView.h"
#include "../src/dtkLog/dtkLogView_p.h"
#include "../src/dtkPlot/dtkPlotCurve.h"
#include "../src/dtkPlot/dtkPlotRenderer.h"
#include "../src/dtkPlot/dtkPlotView.h"
#include "../src/dtkPlot/dtkPlotViewPanner.h"
#include "../src/dtkPlot/dtkPlotViewPicker.h"
#include "../src/dtkPlot/dtkPlotViewZoomer.h"
#include "../src/dtkVr/dtkVrFlystickRecognizer.h"
#include "../src/dtkVr/dtkVrFlystickRecognizer_p.h"
#include "../src/dtkVr/dtkVrGestureRecognizer.h"
#include "../src/dtkVr/dtkVrGestureRecognizer_p.h"
#include "../src/dtkVr/dtkVrHeadRecognizer.h"
#include "../src/dtkVr/dtkVrHeadRecognizer_p.h"
#include "../src/dtkVr/dtkVrScreen.h"
#include "../src/dtkVr/dtkVrTracker.h"
#include "../src/dtkVr/dtkVrTrackerKinect.h"
#include "../src/dtkVr/dtkVrTrackerKinect_p.h"
#include "../src/dtkVr/dtkVrTrackerVrpn.h"
#include "dtkComposerEvaluator_p.h"
\ No newline at end of file
......@@ -4,9 +4,9 @@
* Copyright (C) 2011 - babette lekouta, Inria.
* Created: Tue May 15 11:35:09 2012 (+0200)
* Version: $Id$
* Last-Updated: Thu Jun 28 16:28:32 2012 (+0200)
* By: tkloczko
* Update #: 55
* Last-Updated: Sat Jun 30 01:37:47 2012 (+0200)
* By: Julien Wintz
* Update #: 56
*/
/* Commentary:
......@@ -40,7 +40,6 @@ public:
dtkComposerTransmitterEmitterVector<qreal> emitter_array;
};
dtkComposerNodeArrayScalarOperatorModifier::dtkComposerNodeArrayScalarOperatorModifier(void) : dtkComposerNodeLeaf(), d(new dtkComposerNodeArrayScalarOperatorModifierPrivate)
{
this->appendReceiver(&d->receiver_array);
......
#include "dtkComposerNodeControlMap.h"
\ No newline at end of file
#include "dtkComposerNodeData.h"
\ No newline at end of file
#include "dtkComposerNodeMatrixSquareReal.h"
\ No newline at end of file
#include "dtkComposerNodeMatrixSquareRealOperatorBinary.h"
\ No newline at end of file
#include "dtkComposerNodeMatrixSquareRealOperatorUnary.h"
\ No newline at end of file
Markdown is supported
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