Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit eae3aa52 authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files

SCHNApps: set Camera as Q_OBJECT

parent 326e47d1
...@@ -35,10 +35,11 @@ file( ...@@ -35,10 +35,11 @@ file(
) )
SET(SCHNApps_H_OBJECT_FILES SET(SCHNApps_H_OBJECT_FILES
${SCHNApps_ROOT_DIR}/include/view.h ${SCHNApps_ROOT_DIR}/include/camera.h
${SCHNApps_ROOT_DIR}/include/window.h
${SCHNApps_ROOT_DIR}/include/mapHandler.h ${SCHNApps_ROOT_DIR}/include/mapHandler.h
${SCHNApps_ROOT_DIR}/include/plugin.h ${SCHNApps_ROOT_DIR}/include/plugin.h
${SCHNApps_ROOT_DIR}/include/view.h
${SCHNApps_ROOT_DIR}/include/window.h
${SCHNApps_ROOT_DIR}/include/viewButtonArea.h ${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h ${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/pluginsDialog.h ${SCHNApps_ROOT_DIR}/include/dialogs/pluginsDialog.h
......
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
ADD_SUBDIRECTORY(cameraControl)
ADD_SUBDIRECTORY(importSurface) ADD_SUBDIRECTORY(importSurface)
ADD_SUBDIRECTORY(importVolume) ADD_SUBDIRECTORY(importVolume)
ADD_SUBDIRECTORY(differentialProperties) ADD_SUBDIRECTORY(differentialProperties)
......
...@@ -35,9 +35,10 @@ file( ...@@ -35,9 +35,10 @@ file(
) )
SET(SCHNApps_H_OBJECT_FILES SET(SCHNApps_H_OBJECT_FILES
${SCHNApps_ROOT_DIR}/include/view.h ${SCHNApps_ROOT_DIR}/include/camera.h
${SCHNApps_ROOT_DIR}/include/mapHandler.h ${SCHNApps_ROOT_DIR}/include/mapHandler.h
${SCHNApps_ROOT_DIR}/include/plugin.h ${SCHNApps_ROOT_DIR}/include/plugin.h
${SCHNApps_ROOT_DIR}/include/view.h
${SCHNApps_ROOT_DIR}/include/window.h ${SCHNApps_ROOT_DIR}/include/window.h
${SCHNApps_ROOT_DIR}/include/viewButtonArea.h ${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h ${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h
......
...@@ -14,6 +14,8 @@ class Window; ...@@ -14,6 +14,8 @@ class Window;
class Camera : public qglviewer::Camera class Camera : public qglviewer::Camera
{ {
Q_OBJECT
public: public:
static unsigned int cameraCount; static unsigned int cameraCount;
...@@ -42,13 +44,11 @@ public slots: ...@@ -42,13 +44,11 @@ public slots:
bool getDrawPath() const { return m_drawPath; } bool getDrawPath() const { return m_drawPath; }
void setDrawPath(bool b); void setDrawPath(bool b);
public:
// virtual void draw();
/********************************************************* /*********************************************************
* MANAGE LINKED VIEWS * MANAGE LINKED VIEWS
*********************************************************/ *********************************************************/
public:
void linkView(View* view); void linkView(View* view);
void unlinkView(View* view); void unlinkView(View* view);
const QList<View*>& getLinkedViews() const { return l_views; } const QList<View*>& getLinkedViews() const { return l_views; }
...@@ -58,6 +58,7 @@ public: ...@@ -58,6 +58,7 @@ public:
* SNAPSHOTS * SNAPSHOTS
*********************************************************/ *********************************************************/
public slots:
void resetSnapCount() { m_snapCount = 0; } void resetSnapCount() { m_snapCount = 0; }
void saveSnapshot(QString snapPathName); void saveSnapshot(QString snapPathName);
......
...@@ -64,7 +64,10 @@ public: ...@@ -64,7 +64,10 @@ public:
* MANAGE LINKED CAMERA * MANAGE LINKED CAMERA
*********************************************************/ *********************************************************/
public slots:
Camera* getCurrentCamera() const { return m_currentCamera; } Camera* getCurrentCamera() const { return m_currentCamera; }
public:
void setCurrentCamera(Camera* c); void setCurrentCamera(Camera* c);
/********************************************************* /*********************************************************
......
...@@ -72,7 +72,11 @@ public: ...@@ -72,7 +72,11 @@ public:
Camera* addCamera(const QString& name); Camera* addCamera(const QString& name);
Camera* addCamera(); Camera* addCamera();
void removeCamera(const QString& name); void removeCamera(const QString& name);
public slots:
Camera* getCamera(const QString& name) const; Camera* getCamera(const QString& name) const;
public:
QList<Camera*> getCamerasList() const { return h_cameras.values(); } QList<Camera*> getCamerasList() const { return h_cameras.values(); }
const CameraHash& getCamerasHash() const { return h_cameras; } const CameraHash& getCamerasHash() const { return h_cameras; }
......
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