2018.01.01 patch

ApplicationCode/Adm/projectfilekeywords/2018.01/ri-objectKeywords.txt

@@ -0,0 +1,188 @@
+// ResInsight version string : 2018.01.00-dev.01
+// Report generated : Fri 5. Jan 15:39:23 2018
+//
+//
+
+AsciiDataCurve
+CalcScript
+CalculatedSummaryCase
+CellEdgeResultSlot
+CellFilter
+CellPropertyFilter
+CellPropertyFilters
+CellRangeFilter
+CellRangeFilterCollection
+ChangeDataSourceFeatureUi
+CmdAddItemExecData
+CmdDeleteItemExecData
+CmdFieldChangeExecData
+CrossSection
+CrossSectionCollection
+EclipseCase
+EclipseGeometrySelectionItem
+Fault
+Faults
+FileSummaryCase
+FishbonesCollection
+FishbonesMultipleSubs
+FishbonesPipeProperties
+FlowCharacteristicsPlot
+FlowDiagSolution
+FlowPlotCollection
+FormationNames
+FormationNamesCollectionObject
+FractureContainment
+FractureDefinitionCollection
+GeoMechGeometrySelectionItem
+GeoMechPropertyFilter
+GeoMechPropertyFilters
+GeoMechResultDefinition
+GeoMechResultSlot
+GeoMechView
+GridCollection
+GridSummaryCase
+GridTimeHistoryCurve
+IntersectionBox
+Legend
+MainPlotCollection
+MdiWindowController
+MockModelSettings
+MultiSnapshotDefinition
+NoCommonAreaNNC
+ObservedDataCollection
+PdmDocument
+PdmObjectCollection
+PdmObjectGroup
+Perforation
+PerforationCollection
+PropertyFilter
+ResInsightAnalysisModels
+ResInsightGeoMechCase
+ResInsightGeoMechModels
+ResInsightOilField
+ResInsightProject
+ReservoirCellResultStorage
+ReservoirView
+ResultDefinition
+ResultSlot
+ResultStorageEntryInfo
+RftAddress
+RiaPreferences
+RiaRegressionTest
+RicCaseAndFileExportSettingsUi
+RicCellRangeUi
+RicDeleteItemExecData
+RicExportCarfinUi
+RicExportCompletionDataSettingsUi
+RicExportToLasFileObj
+RicExportToLasFileResampleUi
+RicLinkVisibleViewsFeatureUi
+RicPasteAsciiDataToSummaryPlotFeatureUi
+RicSaveEclipseInputVisibleCellsUi
+RicSelectSummaryPlotUI
+RicSelectViewUI
+RicSummaryAddressSelection
+RicSummaryCurveCalculator
+RicSummaryCurveCreator
+RicWellPathsUnitSystemSettingsUi
+RifReaderSettings
+RimBinaryExportSettings
+RimCaseCollection
+RimCommandExecuteScript
+RimCommandIssueFieldChanged
+RimCommandObject
+RimCsvUserData
+RimDialogData
+RimEllipseFractureTemplate
+RimExportInputSettings
+RimFaultResultSlot
+RimFractureExportSettings
+RimIdenticalGridCaseGroup
+RimInputProperty
+RimInputPropertyCollection
+RimInputReservoir
+RimNoCommonAreaNncCollection
+RimObservedEclipseUserData
+RimOilFieldEntry
+RimOilRegionEntry
+RimStatisticalCalculation
+RimStatisticalCollection
+RimStimPlanColors
+RimStimPlanFractureTemplate
+RimStimPlanLegendConfig
+RimSummaryCalculation
+RimSummaryCalculationCollection
+RimSummaryCalculationVariable
+RimSummaryCurveCollection
+RimSummaryCurveCollectionModifier
+RimTernaryLegendConfig
+RimTimeStepFilter
+RimViewLinkerCollection
+RimWellLogExtractionCurve
+RimWellPathEntry
+RimWellPathImport
+ScriptLocation
+SimWellFracture
+SimWellFractureCollection
+SummaryAddress
+SummaryCaseCollection
+SummaryCaseSubCollection
+SummaryCrossPlot
+SummaryCrossPlotCollection
+SummaryCurve
+SummaryCurveAutoName
+SummaryCurveFilter
+SummaryFilterSettings
+SummaryObservedDataFile
+SummaryPageDownloadEntity
+SummaryPlot
+SummaryPlotCollection
+SummaryTimeAxisProperties
+SummaryYAxisProperties
+TC2
+TestCommand1
+TofAccumulatedPhaseFractionsPlot
+TotalWellAllocationPlot
+View3dOverlayInfoConfig
+ViewController
+ViewLinker
+Well
+WellAllocationPlot
+WellAllocationPlotLegend
+WellFlowRateCurve
+WellLogFile
+WellLogFileChannel
+WellLogFileCurve
+WellLogPlot
+WellLogPlotCollection
+WellLogPlotTrack
+WellLogRftCurve
+WellPath
+WellPathCompletion
+WellPathCompletionCollection
+WellPathCompletions
+WellPathFracture
+WellPathFractureCollection
+WellPaths
+WellPltPlot
+WellPltPlotCollection
+WellRftPlot
+WellRftPlotCollection
+Wells
+closeProject
+computeCaseGroupStatistics
+exportMsw
+exportMultiCaseSnapshots
+exportProperty
+exportSimWellCompletions
+exportSnapshots
+exportWellPathCompletions
+loadCase
+openProject
+replaceCase
+replaceSourceCases
+runOctaveScript
+setExportFolder
+setMainWindowSize
+setStartDir
+setTimeStep

ApplicationCode/Application/Tools/CMakeLists_files.cmake

@@ -24,6 +24,7 @@ ${CEE_CURRENT_LIST_DIR}RiaStdStringTools.h
 ${CEE_CURRENT_LIST_DIR}RiaSummaryCurveAnalyzer.h
 ${CEE_CURRENT_LIST_DIR}RiaSimWellBranchTools.h
 ${CEE_CURRENT_LIST_DIR}RiaProjectFileVersionTools.h
+${CEE_CURRENT_LIST_DIR}RiaStringEncodingTools.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -45,6 +46,7 @@ ${CEE_CURRENT_LIST_DIR}RiaStdStringTools.cpp
 ${CEE_CURRENT_LIST_DIR}RiaSummaryCurveAnalyzer.cpp
 ${CEE_CURRENT_LIST_DIR}RiaSimWellBranchTools.cpp
 ${CEE_CURRENT_LIST_DIR}RiaProjectFileVersionTools.cpp
+${CEE_CURRENT_LIST_DIR}RiaStringEncodingTools.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/Application/Tools/RiaStringEncodingTools.cpp

@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-     Statoil ASA
+//  Copyright (C) 2013-     Ceetron Solutions AS
+//  Copyright (C) 2011-2012 Ceetron AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RiaStringEncodingTools.h"
+
+
+const std::string RiaStringEncodingTools::toNativeEncoded(const QString& qstring)
+{
+#ifdef WIN32
+    return std::string(qstring.toLatin1().data());
+#else
+    return std::string(qstring.toUtf8().data());
+#endif
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+const QString RiaStringEncodingTools::fromNativeEncoded(const char* native)
+{
+#ifdef WIN32
+    return QString::fromLatin1(native);
+#else
+    return QString::fromUtf8(native);
+#endif
+}

ApplicationCode/Application/Tools/RiaStringEncodingTools.h

@@ -0,0 +1,38 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2011-     Statoil ASA
+//  Copyright (C) 2013-     Ceetron Solutions AS
+//  Copyright (C) 2011-2012 Ceetron AS
+// 
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+// 
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include <QString>
+#include <QByteArray>
+#include <string>
+
+//==================================================================================================
+//
+// 
+//
+//==================================================================================================
+class RiaStringEncodingTools
+{
+public:
+    static const std::string    toNativeEncoded(const QString& qstring);
+
+    static const QString        fromNativeEncoded(const char* native);
+};

ApplicationCode/Application/Tools/RiaSummaryCurveAnalyzer.cpp

@@ -97,29 +97,29 @@ std::set<RifEclipseSummaryAddress::SummaryVarCategory> RiaSummaryCurveAnalyzer::
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::set<QString> RiaSummaryCurveAnalyzer::identifierTexts(RifEclipseSummaryAddress::SummaryVarCategory category) const
+std::vector<QString> RiaSummaryCurveAnalyzer::identifierTexts(RifEclipseSummaryAddress::SummaryVarCategory category) const
 {
-    std::set<QString> stringSet;
+    std::vector<QString> stringSet;
 
     if (category == RifEclipseSummaryAddress::SUMMARY_REGION)
     {
         for (const auto& regionNumber : m_regionNumbers)
         {
-            stringSet.insert(QString::number(regionNumber));
+            stringSet.push_back(QString::number(regionNumber));
         }
     }
     else if (category == RifEclipseSummaryAddress::SUMMARY_WELL)
     {
         for (const auto& wellName : m_wellNames)
         {
-            stringSet.insert(QString::fromStdString(wellName));
+            stringSet.push_back(QString::fromStdString(wellName));
         }
     }
     else if (category == RifEclipseSummaryAddress::SUMMARY_WELL_GROUP)
     {
         for (const auto& wellGroupName : m_wellGroupNames)
         {
-            stringSet.insert(QString::fromStdString(wellGroupName));
+            stringSet.push_back(QString::fromStdString(wellGroupName));
         }
     }
 

ApplicationCode/Application/Tools/RiaSummaryCurveAnalyzer.h

@@ -48,7 +48,7 @@ class RiaSummaryCurveAnalyzer
 
     std::set<RifEclipseSummaryAddress::SummaryVarCategory> categories() const;
 
-    std::set<QString> identifierTexts(RifEclipseSummaryAddress::SummaryVarCategory category) const;
+    std::vector<QString> identifierTexts(RifEclipseSummaryAddress::SummaryVarCategory category) const;
 
     static std::vector<RifEclipseSummaryAddress> addressesForCategory(const std::vector<RifEclipseSummaryAddress>& addresses,
                                                                       RifEclipseSummaryAddress::SummaryVarCategory category);