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

#1784 Set curve appearance when pasting ASCII curves

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-08-21 10:11:15 +02:00
parent 23ecdffe01
commit 13266a9535
5 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp
View File

@@ -239,6 +239,10 @@ std::vector<RimAsciiDataCurve*> RicPasteAsciiDataToSummaryPlotFeature::parseCurv
{ {
curve->setTitle(QString("%1: %2").arg(curvePrefix).arg(headers[i])); curve->setTitle(QString("%1: %2").arg(curvePrefix).arg(headers[i]));
} }
// Appearance
curve->setSymbol(settings.pointSymbol());
curve->setLineStyle(settings.lineStyle());
curve->setSymbolSkipDinstance(settings.symbolSkipDinstance());
curveToTypeMap[guessCurveType(headers[i])].push_back(curve); curveToTypeMap[guessCurveType(headers[i])].push_back(curve);
curves.push_back(curve); curves.push_back(curve);
} }

36
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp
View File

@@ -74,6 +74,10 @@ RicPasteAsciiDataToSummaryPlotFeatureUi::RicPasteAsciiDataToSummaryPlotFeatureUi
CAF_PDM_InitField(&m_useCustomDateFormat, "UseCustomDateFormat", false, "Use Custom Date Format", "", "", ""); CAF_PDM_InitField(&m_useCustomDateFormat, "UseCustomDateFormat", false, "Use Custom Date Format", "", "", "");
CAF_PDM_InitField(&m_customDateFormat, "CustomDateFormat", QString(), "Custom Date Format", "", "", ""); CAF_PDM_InitField(&m_customDateFormat, "CustomDateFormat", QString(), "Custom Date Format", "", "", "");
CAF_PDM_InitField(&m_curveLineStyle, "LineStyle", caf::AppEnum<RimPlotCurve::LineStyleEnum>(RimPlotCurve::STYLE_NONE), "Line Style", "", "", "");
CAF_PDM_InitField(&m_curveSymbol, "Symbol", caf::AppEnum<RimPlotCurve::PointSymbolEnum>(RimPlotCurve::SYMBOL_ELLIPSE), "Symbol", "", "", "");
CAF_PDM_InitField(&m_curveSymbolSkipDistance, "SymbolSkipDinstance", 0.0f, "Symbol Skip Distance", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_cellSeparator, "CellSeparator", "Cell Separator", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_cellSeparator, "CellSeparator", "Cell Separator", "", "", "");
} }
@@ -143,6 +147,30 @@ QString RicPasteAsciiDataToSummaryPlotFeatureUi::curvePrefix() const
return m_curvePrefix(); return m_curvePrefix();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPlotCurve::LineStyleEnum RicPasteAsciiDataToSummaryPlotFeatureUi::lineStyle() const
{
return m_curveLineStyle();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPlotCurve::PointSymbolEnum RicPasteAsciiDataToSummaryPlotFeatureUi::pointSymbol() const
{
return m_curveSymbol();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
float RicPasteAsciiDataToSummaryPlotFeatureUi::symbolSkipDinstance() const
{
return m_curveSymbolSkipDistance();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -190,5 +218,13 @@ void RicPasteAsciiDataToSummaryPlotFeatureUi::defineUiOrdering(QString uiConfigN
cellGroup->add(&m_cellSeparator); cellGroup->add(&m_cellSeparator);
} }
{
caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Appearance");
appearanceGroup->add(&m_curveLineStyle);
appearanceGroup->add(&m_curveSymbol);
appearanceGroup->add(&m_curveSymbolSkipDistance);
}
uiOrdering.skipRemainingFields(); uiOrdering.skipRemainingFields();
} }

19
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h
View File

@@ -18,6 +18,8 @@
#pragma once #pragma once
#include "RimPlotCurve.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafPdmField.h" #include "cafPdmField.h"
#include "cafAppEnum.h" #include "cafAppEnum.h"
@@ -69,11 +71,14 @@ public:
public: public:
RicPasteAsciiDataToSummaryPlotFeatureUi(); RicPasteAsciiDataToSummaryPlotFeatureUi();
QString dateFormat() const; QString dateFormat() const;
QLocale decimalLocale() const; QLocale decimalLocale() const;
QString cellSeparator() const; QString cellSeparator() const;
QString plotTitle() const; QString plotTitle() const;
QString curvePrefix() const; QString curvePrefix() const;
RimPlotCurve::LineStyleEnum lineStyle() const;
RimPlotCurve::PointSymbolEnum pointSymbol() const;
float symbolSkipDinstance() const;
void createNewPlot(); void createNewPlot();
@@ -90,5 +95,9 @@ private:
caf::PdmField<QString> m_customDateFormat; caf::PdmField<QString> m_customDateFormat;
caf::PdmField<CellSeparatorEnum> m_cellSeparator; caf::PdmField<CellSeparatorEnum> m_cellSeparator;
caf::PdmField<caf::AppEnum<RimPlotCurve::LineStyleEnum>> m_curveLineStyle;
caf::PdmField<caf::AppEnum<RimPlotCurve::PointSymbolEnum>> m_curveSymbol;
caf::PdmField<float> m_curveSymbolSkipDistance;
bool m_createNewPlot; bool m_createNewPlot;
}; };

8
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@@ -419,6 +419,14 @@ void RimPlotCurve::setSymbol(PointSymbolEnum symbolStyle)
m_pointSymbol = symbolStyle; m_pointSymbol = symbolStyle;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlotCurve::setSymbolSkipDinstance(float distance)
{
m_symbolSkipPixelDistance = distance;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimPlotCurve.h
View File

@@ -70,6 +70,7 @@ public:
cvf::Color3f color() const { return m_curveColor; } cvf::Color3f color() const { return m_curveColor; }
void setLineStyle(LineStyleEnum lineStyle); void setLineStyle(LineStyleEnum lineStyle);
void setSymbol(PointSymbolEnum symbolStyle); void setSymbol(PointSymbolEnum symbolStyle);
void setSymbolSkipDinstance(float distance);
void setLineThickness(int thickness); void setLineThickness(int thickness);
bool isCurveVisible() const; bool isCurveVisible() const;