From 09d14c8ee2ef30752c1fbdbbe0c6fd607e104469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 30 Jun 2015 21:38:33 +0200 Subject: [PATCH] Support Octave-4.0.0 on windows.(#325) The modifications is also working in the old 3.6.1 version of octave, so they should be good in the versions between too. --- OctavePlugin/riGetCaseGroups.cpp | 2 +- OctavePlugin/riGetCases.cpp | 2 +- OctavePlugin/riGetCurrentCase.cpp | 10 +++++----- OctavePlugin/riGetPropertyNames.cpp | 2 +- OctavePlugin/riGetSelectedCases.cpp | 2 +- OctavePlugin/riGetTimeStepDates.cpp | 2 +- OctavePlugin/riGetTimeStepDays.cpp | 2 +- OctavePlugin/riGetWellCells.cpp | 2 +- OctavePlugin/riGetWellStatus.cpp | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/OctavePlugin/riGetCaseGroups.cpp b/OctavePlugin/riGetCaseGroups.cpp index d1e9b896e5..58ec3bd3e8 100644 --- a/OctavePlugin/riGetCaseGroups.cpp +++ b/OctavePlugin/riGetCaseGroups.cpp @@ -126,7 +126,7 @@ DEFUN_DLD (riGetCaseGroups, args, nargout, // Build a map between the field name and field cell values - Octave_map m; + octave_map m; m.assign(riOctavePlugin::caseGroupInfo_CaseGroupId, cellValuesA); m.assign(riOctavePlugin::caseGroupInfo_CaseGroupName, cellValuesB); diff --git a/OctavePlugin/riGetCases.cpp b/OctavePlugin/riGetCases.cpp index 5fb681ac01..9d68816376 100644 --- a/OctavePlugin/riGetCases.cpp +++ b/OctavePlugin/riGetCases.cpp @@ -144,7 +144,7 @@ DEFUN_DLD (riGetCases, args, nargout, // Build a map between the field name and field cell values - Octave_map m; + octave_map m; m.assign(riOctavePlugin::caseInfo_CaseId, cellValuesA); m.assign(riOctavePlugin::caseInfo_CaseName, cellValuesB); diff --git a/OctavePlugin/riGetCurrentCase.cpp b/OctavePlugin/riGetCurrentCase.cpp index 80b0ffe4ac..90bd23aac1 100644 --- a/OctavePlugin/riGetCurrentCase.cpp +++ b/OctavePlugin/riGetCurrentCase.cpp @@ -95,12 +95,12 @@ DEFUN_DLD (riGetCurrentCase, args, nargout, getCurrentCase(caseId, caseName, caseType, caseGroupId, "127.0.0.1", 40001); - Octave_map fieldMap; + octave_map fieldMap; - fieldMap.assign(riOctavePlugin::caseInfo_CaseId, caseId); - fieldMap.assign(riOctavePlugin::caseInfo_CaseName, caseName.toLatin1().data()); - fieldMap.assign(riOctavePlugin::caseInfo_CaseType, caseType.toLatin1().data()); - fieldMap.assign(riOctavePlugin::caseInfo_CaseGroupId, caseGroupId); + fieldMap.assign(riOctavePlugin::caseInfo_CaseId, Cell(caseId)); + fieldMap.assign(riOctavePlugin::caseInfo_CaseName, Cell(std::string(caseName.toLatin1().data()), true)); + fieldMap.assign(riOctavePlugin::caseInfo_CaseType, Cell(std::string(caseType.toLatin1().data()), true)); + fieldMap.assign(riOctavePlugin::caseInfo_CaseGroupId, Cell(caseGroupId)); retval = octave_value(fieldMap); } diff --git a/OctavePlugin/riGetPropertyNames.cpp b/OctavePlugin/riGetPropertyNames.cpp index 1d1309521c..b62add2179 100644 --- a/OctavePlugin/riGetPropertyNames.cpp +++ b/OctavePlugin/riGetPropertyNames.cpp @@ -158,7 +158,7 @@ DEFUN_DLD (riGetPropertyNames, args, nargout, // Build a map between the field name and field cell values - Octave_map m; + octave_map m; m.assign(riOctavePlugin::propertyInfo_PropName, cellValuesB); m.assign(riOctavePlugin::propertyInfo_PropType, cellValuesC); diff --git a/OctavePlugin/riGetSelectedCases.cpp b/OctavePlugin/riGetSelectedCases.cpp index a7379c666d..4ea1227884 100644 --- a/OctavePlugin/riGetSelectedCases.cpp +++ b/OctavePlugin/riGetSelectedCases.cpp @@ -134,7 +134,7 @@ DEFUN_DLD (riGetSelectedCases, args, nargout, // Build a map between the field name and field cell values - Octave_map m; + octave_map m; m.assign(riOctavePlugin::caseInfo_CaseId, cellValuesA); m.assign(riOctavePlugin::caseInfo_CaseName, cellValuesB); diff --git a/OctavePlugin/riGetTimeStepDates.cpp b/OctavePlugin/riGetTimeStepDates.cpp index fbfe5dbf8f..e856a8df87 100644 --- a/OctavePlugin/riGetTimeStepDates.cpp +++ b/OctavePlugin/riGetTimeStepDates.cpp @@ -165,7 +165,7 @@ DEFUN_DLD (riGetTimeStepDates, args, nargout, // Build a map between the field name and field cell values - Octave_map m; + octave_map m; m.assign(riOctavePlugin::timeStepDate_Year, cellValuesA); m.assign(riOctavePlugin::timeStepDate_Month, cellValuesB); diff --git a/OctavePlugin/riGetTimeStepDays.cpp b/OctavePlugin/riGetTimeStepDays.cpp index 03d8e55508..fa72b69236 100644 --- a/OctavePlugin/riGetTimeStepDays.cpp +++ b/OctavePlugin/riGetTimeStepDays.cpp @@ -110,7 +110,7 @@ DEFUN_DLD (riGetTimeStepDays, args, nargout, getTimeStepDates(decimalDays, caseId, "127.0.0.1", 40001); - dim_vector dv(2); + dim_vector dv(2, 1); dv(0) = decimalDays.size(); dv(1) = 1; NDArray oct_decimalDays(dv); diff --git a/OctavePlugin/riGetWellCells.cpp b/OctavePlugin/riGetWellCells.cpp index 3183345d28..09991c404b 100644 --- a/OctavePlugin/riGetWellCells.cpp +++ b/OctavePlugin/riGetWellCells.cpp @@ -249,7 +249,7 @@ DEFUN_DLD (riGetWellCells, args, nargout, // Build a map between the field name and field cell values - Octave_map m; + octave_map m; m.assign(riOctavePlugin::wellCellInfo_I, cellIscv ); m.assign(riOctavePlugin::wellCellInfo_J, cellJscv ); diff --git a/OctavePlugin/riGetWellStatus.cpp b/OctavePlugin/riGetWellStatus.cpp index 55b22d7826..0e779dd108 100644 --- a/OctavePlugin/riGetWellStatus.cpp +++ b/OctavePlugin/riGetWellStatus.cpp @@ -194,7 +194,7 @@ DEFUN_DLD (riGetWellStatus, args, nargout, // Build a map between the field name and field cell values - Octave_map m; + octave_map m; m.assign(riOctavePlugin::wellStatus_WellType, cellValuesB); m.assign(riOctavePlugin::wellStatus_WellStatus, cellValuesC);