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

#1866 AppFwk : Rename to QTreeViewStateSerializer

Browse Source
This commit is contained in:
Magne Sjaastad 2017-09-06 13:06:37 +02:00
parent 9d5f5b32fc
commit e634ff664e
6 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Application/RiaApplication.cpp
View File

@ -63,7 +63,7 @@
#include "RimSummaryCurveFilter.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "RimTreeViewStateSerializer.h"
#include "cafQTreeViewStateSerializer.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
#include "RimWellAllocationPlot.h"
@ -656,12 +656,12 @@ void RiaApplication::storeTreeViewState()
caf::PdmUiTreeView* projectTreeView = mainPlotWindow()->projectTreeView();
QString treeViewState;
RimTreeViewStateSerializer::storeTreeViewStateToString(projectTreeView->treeView(), treeViewState);
caf::QTreeViewStateSerializer::storeTreeViewStateToString(projectTreeView->treeView(), treeViewState);
QModelIndex mi = projectTreeView->treeView()->currentIndex();
QString encodedModelIndexString;
RimTreeViewStateSerializer::encodeStringFromModelIndex(mi, encodedModelIndexString);
caf::QTreeViewStateSerializer::encodeStringFromModelIndex(mi, encodedModelIndexString);
project()->plotWindowTreeViewState = treeViewState;
project()->plotWindowCurrentModelIndexPath = encodedModelIndexString;
@ -673,12 +673,12 @@ void RiaApplication::storeTreeViewState()
if (projectTreeView)
{
QString treeViewState;
RimTreeViewStateSerializer::storeTreeViewStateToString(projectTreeView->treeView(), treeViewState);
caf::QTreeViewStateSerializer::storeTreeViewStateToString(projectTreeView->treeView(), treeViewState);
QModelIndex mi = projectTreeView->treeView()->currentIndex();
QString encodedModelIndexString;
RimTreeViewStateSerializer::encodeStringFromModelIndex(mi, encodedModelIndexString);
caf::QTreeViewStateSerializer::encodeStringFromModelIndex(mi, encodedModelIndexString);
project()->mainWindowTreeViewState = treeViewState;
project()->mainWindowCurrentModelIndexPath = encodedModelIndexString;

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -62,7 +62,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewWindow.h
${CEE_CURRENT_LIST_DIR}RimView.h
${CEE_CURRENT_LIST_DIR}RimViewManipulator.h
${CEE_CURRENT_LIST_DIR}RimCase.h
${CEE_CURRENT_LIST_DIR}RimTreeViewStateSerializer.h
${CEE_CURRENT_LIST_DIR}cafQTreeViewStateSerializer.h
${CEE_CURRENT_LIST_DIR}RimViewController.h
${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.h
${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.h
@ -158,7 +158,7 @@ ${CEE_CURRENT_LIST_DIR}RimViewWindow.cpp
${CEE_CURRENT_LIST_DIR}RimView.cpp
${CEE_CURRENT_LIST_DIR}RimViewManipulator.cpp
${CEE_CURRENT_LIST_DIR}RimCase.cpp
${CEE_CURRENT_LIST_DIR}RimTreeViewStateSerializer.cpp
${CEE_CURRENT_LIST_DIR}cafQTreeViewStateSerializer.cpp
${CEE_CURRENT_LIST_DIR}RimViewController.cpp
${CEE_CURRENT_LIST_DIR}RimMainPlotCollection.cpp
${CEE_CURRENT_LIST_DIR}RimWellLogPlotCollection.cpp

11
ApplicationCode/ProjectDataModel/RimTreeViewStateSerializer.cpp → ApplicationCode/ProjectDataModel/cafQTreeViewStateSerializer.cpp
View File

@ -16,7 +16,8 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimTreeViewStateSerializer.h"
#include "cafQTreeViewStateSerializer.h"
#include <QTreeView>
@ -67,7 +68,7 @@ void storeExpandedState(QStringList & nodes, const QTreeView * view, QAbstractIt
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimTreeViewStateSerializer::applyTreeViewStateFromString( QTreeView* treeView, const QString& treeViewState)
void caf::QTreeViewStateSerializer::applyTreeViewStateFromString( QTreeView* treeView, const QString& treeViewState)
{
if (treeView->model())
{
@ -83,7 +84,7 @@ void RimTreeViewStateSerializer::applyTreeViewStateFromString( QTreeView* treeVi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimTreeViewStateSerializer::storeTreeViewStateToString(const QTreeView* treeView, QString& treeViewState)
void caf::QTreeViewStateSerializer::storeTreeViewStateToString(const QTreeView* treeView, QString& treeViewState)
{
if (treeView->model())
{
@ -100,7 +101,7 @@ void RimTreeViewStateSerializer::storeTreeViewStateToString(const QTreeView* tre
/// Find index based of an encode QString <row> <column>;<row> <column>;...;<row> <column>
/// Set the decoded index as current index in the QAbstractItemView
//--------------------------------------------------------------------------------------------------
QModelIndex RimTreeViewStateSerializer::getModelIndexFromString(QAbstractItemModel* model, const QString& currentIndexString)
QModelIndex caf::QTreeViewStateSerializer::getModelIndexFromString(QAbstractItemModel* model, const QString& currentIndexString)
{
QStringList modelIndexStringList = currentIndexString.split(";");
@ -124,7 +125,7 @@ QModelIndex RimTreeViewStateSerializer::getModelIndexFromString(QAbstractItemMod
//--------------------------------------------------------------------------------------------------
/// Store path to model index in item view using follwoing encoding into a QString <row> <column>;<row> <column>;...;<row> <column>
//--------------------------------------------------------------------------------------------------
void RimTreeViewStateSerializer::encodeStringFromModelIndex(const QModelIndex mi, QString& encodedModelIndex)
void caf::QTreeViewStateSerializer::encodeStringFromModelIndex(const QModelIndex mi, QString& encodedModelIndex)
{
if (!mi.isValid()) return;

6
ApplicationCode/ProjectDataModel/RimTreeViewStateSerializer.h → ApplicationCode/ProjectDataModel/cafQTreeViewStateSerializer.h
View File

@ -24,7 +24,10 @@ class QTreeView;
class QString;
class QAbstractItemModel;
class RimTreeViewStateSerializer
namespace caf
{
class QTreeViewStateSerializer
{
public:
static void applyTreeViewStateFromString(QTreeView* treeView, const QString& treeViewState);
@ -34,3 +37,4 @@ public:
static void encodeStringFromModelIndex(const QModelIndex mi, QString& currentIndexString);
};
} // End namespace caf

6
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@ -24,7 +24,7 @@
#include "RimProject.h"
#include "RimSummaryPlot.h"
#include "RimTreeViewStateSerializer.h"
#include "cafQTreeViewStateSerializer.h"
#include "RimViewWindow.h"
#include "RimWellAllocationPlot.h"
#include "RimWellLogPlot.h"
@ -642,13 +642,13 @@ void RiuMainPlotWindow::restoreTreeViewState()
if (!stateString.isEmpty())
{
m_projectTreeView->treeView()->collapseAll();
RimTreeViewStateSerializer::applyTreeViewStateFromString(m_projectTreeView->treeView(), stateString);
caf::QTreeViewStateSerializer::applyTreeViewStateFromString(m_projectTreeView->treeView(), stateString);
}
QString currentIndexString = RiaApplication::instance()->project()->plotWindowCurrentModelIndexPath;
if (!currentIndexString.isEmpty())
{
QModelIndex mi = RimTreeViewStateSerializer::getModelIndexFromString(m_projectTreeView->treeView()->model(), currentIndexString);
QModelIndex mi = caf::QTreeViewStateSerializer::getModelIndexFromString(m_projectTreeView->treeView()->model(), currentIndexString);
m_projectTreeView->treeView()->setCurrentIndex(mi);
}
}

6
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -33,7 +33,7 @@
#include "RimGeoMechCase.h"
#include "RimGeoMechView.h"
#include "RimProject.h"
#include "RimTreeViewStateSerializer.h"
#include "cafQTreeViewStateSerializer.h"
#include "RimView.h"
#include "RiuDragDrop.h"
@ -1449,13 +1449,13 @@ void RiuMainWindow::restoreTreeViewState()
if (!stateString.isEmpty())
{
m_projectTreeView->treeView()->collapseAll();
RimTreeViewStateSerializer::applyTreeViewStateFromString(m_projectTreeView->treeView(), stateString);
caf::QTreeViewStateSerializer::applyTreeViewStateFromString(m_projectTreeView->treeView(), stateString);
}
QString currentIndexString = RiaApplication::instance()->project()->mainWindowCurrentModelIndexPath;
if (!currentIndexString.isEmpty())
{
QModelIndex mi = RimTreeViewStateSerializer::getModelIndexFromString(m_projectTreeView->treeView()->model(), currentIndexString);
QModelIndex mi = caf::QTreeViewStateSerializer::getModelIndexFromString(m_projectTreeView->treeView()->model(), currentIndexString);
m_projectTreeView->treeView()->setCurrentIndex(mi);
}
}