diff options
Diffstat (limited to 'src/Viewer/studio3d')
-rw-r--r-- | src/Viewer/studio3d/q3dsdatainput.h | 8 | ||||
-rw-r--r-- | src/Viewer/studio3d/q3dspresentation.cpp | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Viewer/studio3d/q3dsdatainput.h b/src/Viewer/studio3d/q3dsdatainput.h index 2368126e..fc5933fa 100644 --- a/src/Viewer/studio3d/q3dsdatainput.h +++ b/src/Viewer/studio3d/q3dsdatainput.h @@ -30,7 +30,7 @@ #ifndef Q3DSDATAINPUT_H #define Q3DSDATAINPUT_H -#include "qstudio3dglobal.h" +#include <QtStudio3D/qstudio3dglobal.h> #include <QtCore/qobject.h> #include <QtCore/qvariant.h> @@ -58,9 +58,9 @@ public: virtual ~Q3DSDataInput(); enum class ValueRole { - Value, - Min, - Max + Value = 0, + Min = 1, + Max = 2 }; QString name() const; diff --git a/src/Viewer/studio3d/q3dspresentation.cpp b/src/Viewer/studio3d/q3dspresentation.cpp index e1ef5e1e..6884e0ee 100644 --- a/src/Viewer/studio3d/q3dspresentation.cpp +++ b/src/Viewer/studio3d/q3dspresentation.cpp @@ -267,7 +267,8 @@ void Q3DSPresentation::setDataInputValue(const QString &name, const QVariant &va Q3DSDataInput::ValueRole valueRole) { if (d_ptr->m_viewerApp) { - d_ptr->m_viewerApp->SetDataInputValue(name, value, valueRole); + d_ptr->m_viewerApp->SetDataInputValue(name, value, + (qt3ds::runtime::DataInputValueRole)valueRole); } else if (d_ptr->m_commandQueue) { d_ptr->m_commandQueue->queueCommand(QString(), CommandType_SetDataInputValue, name, value, static_cast<int>(valueRole)); |