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

Some renaming and comments

Browse Source
This commit is contained in:
Jacob Støren 2015-08-20 09:58:27 +02:00
parent f7ef9c575e
commit f0ee19d8f7
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -1617,7 +1617,7 @@ void RiuMainWindow::OBSOLETE_slotCurrentChanged(const QModelIndex & current, con
void RiuMainWindow::selectedObjectsChanged()
{
std::vector<caf::PdmUiItem*> uiItems;
m_projectTreeView->selectedObjects(uiItems);
m_projectTreeView->selectedUiItems(uiItems);
caf::SelectionManager::instance()->setSelectedItems(uiItems);
caf::PdmObjectHandle* firstSelectedObject = NULL;
@ -2064,7 +2064,7 @@ void RiuMainWindow::slotCreateCommandObject()
if (!app->project()) return;
std::vector<caf::PdmUiItem*> selectedUiItems;
m_projectTreeView->selectedObjects(selectedUiItems);
m_projectTreeView->selectedUiItems(selectedUiItems);
caf::PdmObjectGroup selectedObjects;
for (size_t i = 0; i < selectedUiItems.size(); ++i)

7
Fwk/AppFwk/cafUserInterface/cafPdmUiPropertyView.h
View File

@ -58,10 +58,11 @@ public:
PdmUiPropertyView(QWidget* parent = 0, Qt::WindowFlags f = 0);
~PdmUiPropertyView();
void setUiConfigurationName(QString uiConfigName);
PdmObjectHandle* currentObject();
void setUiConfigurationName(QString uiConfigName);
PdmObjectHandle* currentObject();
public slots:
void showProperties( caf::PdmObjectHandle* object);
void showProperties(caf::PdmObjectHandle* object); // Signal/Slot system needs caf:: prefix in some cases
private:
PdmUiObjectEditorHandle* m_currentObjectView;
QString m_uiConfigName;

7
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.cpp
View File

@ -110,7 +110,7 @@ QTreeView* PdmUiTreeView::treeView()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmUiTreeView::selectedObjects(std::vector<PdmUiItem*>& objects)
void PdmUiTreeView::selectedUiItems(std::vector<PdmUiItem*>& objects)
{
m_treeViewEditor->selectedUiItems(objects);
}
@ -147,9 +147,10 @@ void PdmUiTreeView::enableDefaultContextMenu(bool enable)
}
//--------------------------------------------------------------------------------------------------
///
/// Enables or disables automatic updating of the SelectionManager selection state based on
/// the selections in this tree view
//--------------------------------------------------------------------------------------------------
void PdmUiTreeView::setCurrentSelectionToCurrentEditorSelection(bool enable)
void PdmUiTreeView::enableSelectionManagerUpdating(bool enable)
{
m_treeViewEditor->enableSelectionManagerUpdating(enable);
}

13
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeView.h
View File

@ -65,33 +65,34 @@ public:
~PdmUiTreeView();
void enableDefaultContextMenu(bool enable);
void setCurrentSelectionToCurrentEditorSelection(bool enable); // TODO: rename
void enableSelectionManagerUpdating(bool enable); // TODO: rename
void setUiConfigurationName(QString uiConfigName);
void setPdmItem(caf::PdmUiItem* object);
QTreeView* treeView();
void selectedObjects(std::vector<PdmUiItem*>& objects); // TODO: rename
void selectedUiItems(std::vector<PdmUiItem*>& objects); // TODO: rename
void selectAsCurrentItem(PdmUiItem* uiItem);
void setExpanded(const PdmUiItem* uiItem, bool doExpand) const ;
// QModelIndex access
// Use this translation only when it is inconvenient to traverse
// the Pdm model directly.
PdmUiItem* uiItemFromModelIndex(const QModelIndex& index) const;
QModelIndex findModelIndex(const PdmUiItem* object) const;
void setDragDropHandle(PdmUiDragDropHandle* dragDropHandle);
signals:
void selectionChanged();
// Convenience signal for use with PdmUiPropertyView
signals:
void selectedObjectChanged(caf::PdmObjectHandle* object);
void selectedObjectChanged(caf::PdmObjectHandle* object); // Signal/Slot system needs caf:: prefix in some cases
private slots:
void slotOnSelectionChanged();
private:
private:
PdmUiTreeViewEditor* m_treeViewEditor;
QString m_uiConfigName;
QVBoxLayout* m_layout;