Changed visibility to public

p4#: 22398
This commit is contained in:
Magne Sjaastad
2013-09-13 09:18:29 +02:00
parent 32b148ee0e
commit 7eac8f26d5
2 changed files with 42 additions and 1 deletions

View File

@@ -21,6 +21,7 @@
#include "RimCalcScript.h"
#include "cafPdmUiTextEditor.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmDocument.h"
#include <QFile>
@@ -49,9 +50,19 @@ RimCommandObject::~RimCommandObject()
//--------------------------------------------------------------------------------------------------
RimCommandExecuteScript::RimCommandExecuteScript()
{
CAF_PDM_InitFieldNoDefault(&name, "Name", "Name", "", "", "");
CAF_PDM_InitField(&scriptText, "ScriptText", QString(), "ScriptText", "", "" ,"");
scriptText.setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName());
CAF_PDM_InitField(&isEnabled, "IsEnabled", true, "Enabled ", "", "", "");
CAF_PDM_InitField(&execute, "Execute", true, "Execute", "", "", "");
execute.setIOWritable(false);
execute.setIOReadable(false);
execute.setUiEditorTypeName(caf::PdmUiPushButtonEditor::uiEditorTypeName());
execute.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
}
//--------------------------------------------------------------------------------------------------
@@ -67,6 +78,8 @@ RimCommandExecuteScript::~RimCommandExecuteScript()
//--------------------------------------------------------------------------------------------------
void RimCommandExecuteScript::redo()
{
if (!isEnabled) return;
RiaApplication* app = RiaApplication::instance();
QString octavePath = app->octavePath();
if (!octavePath.isEmpty())
@@ -106,6 +119,27 @@ void RimCommandExecuteScript::defineEditorAttribute(const caf::PdmFieldHandle* f
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimCommandExecuteScript::userDescriptionField()
{
return &name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCommandExecuteScript::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (&execute == changedField)
{
RiaApplication* app = RiaApplication::instance();
app->addCommandObject(this);
app->executeCommandObjects();
}
}