OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed obsolete code

Browse Source 
p4#: 21363
This commit is contained in:
Magne Sjaastad
2013-04-22 14:44:43 +02:00
parent b20be8ad25
commit 290f8d4e58
5 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/RimCalcScript.cpp
View File

@@ -47,17 +47,3 @@ RimCalcScript::~RimCalcScript()
{ {
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCalcScript::readContentFromFile()
{
QFile file(absolutePath);
if (file.open(QIODevice::ReadOnly | QIODevice::Text))
{
QString fileContent = file.readAll();
content = fileContent;
}
}

4
ApplicationCode/ProjectDataModel/RimCalcScript.h
View File

@@ -33,8 +33,6 @@ public:
RimCalcScript(); RimCalcScript();
virtual ~RimCalcScript(); virtual ~RimCalcScript();
void readContentFromFile();
caf::PdmField<QString> absolutePath; caf::PdmField<QString> absolutePath;
caf::PdmField<QString> content; caf::PdmField<QString> content; // TODO: Obsolete field, can be deleted on next project file revision.
}; };

1
ApplicationCode/ProjectDataModel/RimScriptCollection.cpp
View File

@@ -89,7 +89,6 @@ void RimScriptCollection::readContentFromDisc()
RimCalcScript* calcScript = new RimCalcScript; RimCalcScript* calcScript = new RimCalcScript;
calcScript->absolutePath = fileName; calcScript->absolutePath = fileName;
calcScript->setUiName(fi.baseName()); calcScript->setUiName(fi.baseName());
calcScript->readContentFromFile();
calcScripts.push_back(calcScript); calcScripts.push_back(calcScript);
} }

20
ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
View File

@@ -138,7 +138,6 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
} }
} }
menu.addAction(QString("New"), this, SLOT(slotNewScript())); menu.addAction(QString("New"), this, SLOT(slotNewScript()));
//menu.addAction(QString("ReadFromFile"), this, SLOT(slotReadScriptContentFromFile()));
menu.addSeparator(); menu.addSeparator();
{ {
@@ -382,25 +381,6 @@ void RimUiTreeView::slotAddSliceFilterK()
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimUiTreeView::slotReadScriptContentFromFile()
{
QModelIndex index = currentIndex();
RimUiTreeModelPdm* myModel = dynamic_cast<RimUiTreeModelPdm*>(model());
caf::PdmUiTreeItem* uiItem = myModel->getTreeItemFromIndex(currentIndex());
if (uiItem)
{
RimCalcScript* calcScript = dynamic_cast<RimCalcScript*>(uiItem->dataObject().p());
if (calcScript)
{
calcScript->readContentFromFile();
}
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimUiTreeView.h
View File

@@ -62,7 +62,6 @@ private slots:
void slotAddPropertyFilter(); void slotAddPropertyFilter();
void slotDeletePropertyFilter(); void slotDeletePropertyFilter();
void slotReadScriptContentFromFile();
void slotEditScript(); void slotEditScript();
void slotNewScript(); void slotNewScript();
void slotExecuteScript(); void slotExecuteScript();