#1918 : Observed Data : Rename of several files

This commit is contained in:
Magne Sjaastad
2017-09-27 10:19:24 +02:00
parent a24ce670cf
commit dc23c63b97
11 changed files with 63 additions and 55 deletions

View File

@@ -20,7 +20,7 @@
#include "RimObservedDataCollection.h"
#include "RimObservedData.h"
#include "RimObservedRsmspecColumnBasedData.h"
#include "RimColumnBasedUserData.h"
#include "RimSummaryObservedDataFile.h"
CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection");
@@ -70,9 +70,9 @@ RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName
if (fileName.endsWith(".rsm", Qt::CaseInsensitive))
{
RimObservedRsmspecColumnBasedData* rsmspecColumnBasedData = new RimObservedRsmspecColumnBasedData();
RimColumnBasedUserData* columnBasedUserData = new RimColumnBasedUserData();
observedData = rsmspecColumnBasedData;
observedData = columnBasedUserData;
}
else
{