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

Updates from RPM

Browse Source
This commit is contained in:
Magne Sjaastad 2015-08-13 14:16:41 +02:00
parent e12a5b62de
commit b9b7d77fc6
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
View File

@ -19,29 +19,30 @@
#include "cafCmdFeatureManager.h"
#endif
#include "cafPdmDocument.h"
#include "cafPdmObject.h"
#include "cafPdmObjectGroup.h"
#include "cafPdmProxyValueField.h"
#include "cafPdmPtrField.h"
#include "cafPdmReferenceHelper.h"
#include "cafPdmUiFilePathEditor.h"
#include "cafPdmUiListEditor.h"
#include "cafPdmUiPropertyView.h"
#include "cafPdmUiTableView.h"
#include "cafPdmUiTextEditor.h"
#include "cafPdmUiTreeView.h"
#include "cafPdmReferenceHelper.h"
#include "cafSelectionManager.h"
#include "cafUiTreeModelPdm.h"
#include "cafPdmProxyValueField.h"
#include "cafPdmPtrField.h"
class DemoPdmObjectGroup: public caf::PdmObjectGroup
class DemoPdmObjectGroup : public caf::PdmObjectCollection
{
CAF_PDM_HEADER_INIT;
public:
DemoPdmObjectGroup()
{
objects.uiCapability()->setUiHidden(true);
}
};
@ -181,12 +182,12 @@ public:
{
if (uiObject->userDescriptionField())
{
caf::PdmUiFieldHandle* uiFieldHandle = caf::uiField(uiObject->userDescriptionField());
if (uiFieldHandle)
{
userDesc = uiFieldHandle->uiValue().toString();
}
}
caf::PdmUiFieldHandle* uiFieldHandle = uiObject->userDescriptionField()->uiCapability();
if (uiFieldHandle)
{
userDesc = uiFieldHandle->uiValue().toString();
}
}
options.push_back(caf::PdmOptionItemInfo(uiObject->uiName() + "(" + userDesc + ")", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(objects[i]))));
}
@ -460,13 +461,13 @@ void MainWindow::buildTestModel()
m_testRoot = new DemoPdmObjectGroup;
DemoPdmObject* demoObject = new DemoPdmObject;
m_testRoot->addObject(demoObject);
m_testRoot->objects.push_back(demoObject);
SmallDemoPdmObject* smallObj1 = new SmallDemoPdmObject;
m_testRoot->addObject(smallObj1);
m_testRoot->objects.push_back(smallObj1);
SmallDemoPdmObjectA* smallObj2 = new SmallDemoPdmObjectA;
m_testRoot->addObject(smallObj2);
m_testRoot->objects.push_back(smallObj2);
DemoPdmObject* demoObj2 = new DemoPdmObject;
@ -512,7 +513,7 @@ void MainWindow::setPdmRoot(caf::PdmObjectHandle* pdmRoot)
if (fields.size())
{
caf::PdmFieldHandle* field = fields[0];
caf::PdmUiFieldHandle* uiFieldHandle = uiField(field);
caf::PdmUiFieldHandle* uiFieldHandle = field->uiCapability();
if (uiFieldHandle)
{
m_pdmUiTreeView2->setPdmItem(uiFieldHandle);
@ -546,7 +547,7 @@ void MainWindow::releaseTestData()
{
if (m_testRoot)
{
m_testRoot->deleteObjects();
m_testRoot->objects.deleteAllChildObjects();
delete m_testRoot;
}
}

4
Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.h
View File

@ -10,7 +10,7 @@ class QUndoView;
namespace caf
{
class PdmObjectGroup;
class PdmObjectCollection;
class PdmObjectHandle;
class UiTreeModelPdm;
class PdmUiPropertyView;
@ -58,6 +58,6 @@ private:
caf::PdmUiTreeView* m_pdmUiTreeView2;
caf::PdmUiPropertyView* m_pdmUiPropertyView;
caf::PdmUiTableView* m_pdmUiTableView;
caf::PdmObjectGroup* m_testRoot;
caf::PdmObjectCollection* m_testRoot;
};

4
Fwk/AppFwk/cafUserInterface/cafPdmUiTableViewEditor.cpp
View File

@ -383,7 +383,9 @@ void PdmUiTableViewEditor::tableViewWidgetFocusChanged(QEvent* focusEvent)
}
else if (focusEvent->type() == QEvent::FocusOut)
{
SelectionManager::instance()->clear(m_selectionRole);
// Clearing the selection here causes the Menu to not display all items
// Not sure how this can be handled correctly
// SelectionManager::instance()->clear(m_selectionRole);
}
}
}