From 8a53e7004fc78a590bb55de30039b06231bfc33f Mon Sep 17 00:00:00 2001 From: Janne Kangas Date: Wed, 25 Apr 2018 14:27:19 +0300 Subject: Disable Evaluator Datainput MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable evaluator from Studio UI. Also remove use of evaluator from example. Task-ID: QT3DS-1500 Change-Id: I9e8557d3a3aec3d0e2f3c64a8a2447220ac5fbed Reviewed-by: Mahmoud Badri Reviewed-by: Miikka Heikkinen Reviewed-by: Tomi Korpipää --- .../studio3d/qmldatainput/presentation/datainput.uia | 1 - .../studio3d/qmldatainput/presentation/datainput.uip | 11 ----------- .../studio3d/qmldatainput/qml/qmldatainput/main.qml | 14 -------------- src/Authoring/Client/Code/Core/Doc/Doc.cpp | 5 ++++- src/Authoring/Studio/Application/DataInputDlg.cpp | 19 ++++++++++++++++--- src/Authoring/Studio/Application/DataInputDlg.h | 2 ++ src/Authoring/Studio/Application/DataInputListDlg.cpp | 2 ++ .../Studio/Application/DataInputSelectView.cpp | 2 ++ src/Authoring/Studio/_Win/Application/StudioApp.cpp | 2 ++ 9 files changed, 28 insertions(+), 30 deletions(-) diff --git a/examples/studio3d/qmldatainput/presentation/datainput.uia b/examples/studio3d/qmldatainput/presentation/datainput.uia index b6bb808d..d2522cde 100644 --- a/examples/studio3d/qmldatainput/presentation/datainput.uia +++ b/examples/studio3d/qmldatainput/presentation/datainput.uia @@ -9,7 +9,6 @@ - diff --git a/examples/studio3d/qmldatainput/presentation/datainput.uip b/examples/studio3d/qmldatainput/presentation/datainput.uip index ec1089f2..56b4e5bf 100644 --- a/examples/studio3d/qmldatainput/presentation/datainput.uip +++ b/examples/studio3d/qmldatainput/presentation/datainput.uip @@ -14,13 +14,9 @@ - - - - @@ -28,8 +24,6 @@ - - @@ -49,19 +43,14 @@ - - - - - diff --git a/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml b/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml index 4812e644..5a29a808 100644 --- a/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml +++ b/examples/studio3d/qmldatainput/qml/qmldatainput/main.qml @@ -73,7 +73,6 @@ Item { property string inputString: "" property int inputFloat: 0.0 property variant inputVariant: 0 - property real inputEvaluator: 0.0 // A changing property to demonstrate DataInput NumberAnimation { target: studio3D @@ -138,15 +137,6 @@ Item { loops: Animation.Infinite running: true } - NumberAnimation { - target: studio3D - property: "inputEvaluator" - duration: 8000 - from: 10.0 - to: 50.0 - loops: Animation.Infinite - running: true - } // ViewerSettings item is used to specify presentation independent viewer settings. ViewerSettings { @@ -187,10 +177,6 @@ Item { name: "variantInput" value: studio3D.inputVariant } - DataInput { - name: "evaluatorInput" - value: studio3D.inputEvaluator - } } //![1] } diff --git a/src/Authoring/Client/Code/Core/Doc/Doc.cpp b/src/Authoring/Client/Code/Core/Doc/Doc.cpp index e9b841ad..b64ceea7 100644 --- a/src/Authoring/Client/Code/Core/Doc/Doc.cpp +++ b/src/Authoring/Client/Code/Core/Doc/Doc.cpp @@ -2829,12 +2829,15 @@ void CDoc::LoadUIADataInputs(const QString &uiaFile, item->type = EDataType::DataTypeVector2; } else if (!QString(type.c_str()).compare(QStringLiteral("Variant"))) { item->type = EDataType::DataTypeVariant; - } else if (!QString(type.c_str()) + } +#ifdef DATAINPUT_EVALUATOR_ENABLED + else if (!QString(type.c_str()) .compare(QStringLiteral("Evaluator"))) { item->type = EDataType::DataTypeEvaluator; if (theReader->Att("evaluator", evaluator)) item->valueString = evaluator.c_str(); } +#endif } datainputs.push_back(item); diff --git a/src/Authoring/Studio/Application/DataInputDlg.cpp b/src/Authoring/Studio/Application/DataInputDlg.cpp index 03febb71..d428d1a2 100644 --- a/src/Authoring/Studio/Application/DataInputDlg.cpp +++ b/src/Authoring/Studio/Application/DataInputDlg.cpp @@ -51,7 +51,9 @@ CDataInputDlg::CDataInputDlg(CDataInputDialogItem **datainput, QStandardItemMode m_ui->comboBoxTypeList->setItemDelegate(itemDelegate); m_ui->comboBoxTypeList->addItem(tr("Boolean")); +#ifdef DATAINPUT_EVALUATOR_ENABLED m_ui->comboBoxTypeList->addItem(tr("Evaluator")); +#endif m_ui->comboBoxTypeList->addItem(tr("Float")); m_ui->comboBoxTypeList->addItem(tr("Ranged Number")); m_ui->comboBoxTypeList->addItem(tr("String")); @@ -96,9 +98,11 @@ void CDataInputDlg::initDialog() m_min = m_dataInput->minValue; m_max = m_dataInput->maxValue; } +#ifdef DATAINPUT_EVALUATOR_ENABLED else if (m_type == DataTypeEvaluator) { m_ui->lineEditEvaluation->setText(m_dataInput->valueString); } +#endif } else { m_name = getUniqueId(tr("newDataInput")); m_ui->lineEditInputName->setText(m_name); @@ -115,9 +119,11 @@ void CDataInputDlg::on_buttonBox_accepted() m_dataInput->minValue = m_min; m_dataInput->maxValue = m_max; } +#ifdef DATAINPUT_EVALUATOR_ENABLED else if (m_type == DataTypeEvaluator) { m_dataInput->valueString = m_text; } +#endif QDialog::accept(); } @@ -183,15 +189,18 @@ void CDataInputDlg::updateVisibility(int type) m_ui->doubleSpinBoxMin->setVisible(false); m_ui->doubleSpinBoxMax->setVisible(false); } - +#ifdef DATAINPUT_EVALUATOR_ENABLED if (type == DataTypeEvaluator) { m_ui->lineEditEvaluation->setVisible(true); m_ui->labelEvaluation->setVisible(true); - } else { m_ui->lineEditEvaluation->setVisible(false); m_ui->labelEvaluation->setVisible(false); } +#else + m_ui->lineEditEvaluation->setVisible(false); + m_ui->labelEvaluation->setVisible(false); +#endif } const bool CDataInputDlg::isEquivalentDataType(int dlgType, @@ -214,7 +223,11 @@ const bool CDataInputDlg::isEquivalentDataType(int dlgType, // Variant can be bound to any property type. // Allow also Evaluator binding to any property as we only know the evaluation // result type at runtime. - || dlgType == EDataType::DataTypeVariant || dlgType == EDataType::DataTypeEvaluator) { + || dlgType == EDataType::DataTypeVariant +#ifdef DATAINPUT_EVALUATOR_ENABLED + || dlgType == EDataType::DataTypeEvaluator +#endif + ) { return true; } diff --git a/src/Authoring/Studio/Application/DataInputDlg.h b/src/Authoring/Studio/Application/DataInputDlg.h index 0af8e743..e38ee8b8 100644 --- a/src/Authoring/Studio/Application/DataInputDlg.h +++ b/src/Authoring/Studio/Application/DataInputDlg.h @@ -48,7 +48,9 @@ QT_FORWARD_DECLARE_CLASS(QStandardItemModel) enum EDataType { DataTypeBoolean = 0, +#ifdef DATAINPUT_EVALUATOR_ENABLED DataTypeEvaluator, +#endif DataTypeFloat, DataTypeRangedNumber, DataTypeString, diff --git a/src/Authoring/Studio/Application/DataInputListDlg.cpp b/src/Authoring/Studio/Application/DataInputListDlg.cpp index 8ef2a895..a80e8fce 100644 --- a/src/Authoring/Studio/Application/DataInputListDlg.cpp +++ b/src/Authoring/Studio/Application/DataInputListDlg.cpp @@ -164,9 +164,11 @@ void CDataInputListDlg::updateContents() dataInput.append(new QStandardItem(tr("String"))); } else if (dataInputType == DataTypeFloat) { dataInput.append(new QStandardItem(tr("Float"))); +#ifdef DATAINPUT_EVALUATOR_ENABLED } else if (dataInputType == DataTypeEvaluator) { dataInput.append(new QStandardItem(tr("Evaluator"))); dataInput.append(new QStandardItem(m_dataInputs.at(i)->valueString)); +#endif } else if (dataInputType == DataTypeBoolean) { dataInput.append(new QStandardItem(tr("Boolean"))); } else if (dataInputType == DataTypeVector3) { diff --git a/src/Authoring/Studio/Application/DataInputSelectView.cpp b/src/Authoring/Studio/Application/DataInputSelectView.cpp index 852bdbb2..468930af 100644 --- a/src/Authoring/Studio/Application/DataInputSelectView.cpp +++ b/src/Authoring/Studio/Application/DataInputSelectView.cpp @@ -85,9 +85,11 @@ QString DataInputSelectView::getDiTypeStr(int type) case EDataType::DataTypeBoolean: return tr("Boolean"); break; +#ifdef DATAINPUT_EVALUATOR_ENABLED case EDataType::DataTypeEvaluator: return tr("Evaluator"); break; +#endif case EDataType::DataTypeFloat: return tr("Float"); break; diff --git a/src/Authoring/Studio/_Win/Application/StudioApp.cpp b/src/Authoring/Studio/_Win/Application/StudioApp.cpp index 02a1413d..c5ece20d 100644 --- a/src/Authoring/Studio/_Win/Application/StudioApp.cpp +++ b/src/Authoring/Studio/_Win/Application/StudioApp.cpp @@ -1553,8 +1553,10 @@ void CStudioApp::SaveUIAFile(bool subpresentations) list.append(QStringLiteral("Vector3")); else if (item->type == EDataType::DataTypeVector2) list.append(QStringLiteral("Vector2")); +#ifdef DATAINPUT_EVALUATOR_ENABLED else if (item->type == EDataType::DataTypeEvaluator) list.append(QStringLiteral("Evaluator")); +#endif else if (item->type == EDataType::DataTypeVariant) list.append(QStringLiteral("Variant")); -- cgit v1.2.3