From eb1569efc38d714fddf4510d4986081f99ae743b Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Fri, 24 Nov 2017 11:20:57 +0100 Subject: [PATCH] renamed TaskListModelCache -> MetaTaskListModel --- .../motion_planning_tasks/src/CMakeLists.txt | 2 +- ...del_cache.cpp => meta_task_list_model.cpp} | 20 +++++++++---------- ...t_model_cache.h => meta_task_list_model.h} | 12 +++++------ .../src/task_display.cpp | 4 ++-- .../src/task_list_model.cpp | 2 +- .../motion_planning_tasks/src/task_panel.cpp | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) rename visualization/motion_planning_tasks/src/{task_list_model_cache.cpp => meta_task_list_model.cpp} (85%) rename visualization/motion_planning_tasks/src/{task_list_model_cache.h => meta_task_list_model.h} (91%) diff --git a/visualization/motion_planning_tasks/src/CMakeLists.txt b/visualization/motion_planning_tasks/src/CMakeLists.txt index 9e9a3352..bcb2546f 100644 --- a/visualization/motion_planning_tasks/src/CMakeLists.txt +++ b/visualization/motion_planning_tasks/src/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(${MOVEIT_LIB_NAME} local_task_model.cpp remote_task_model.cpp task_list_model.cpp - task_list_model_cache.cpp + meta_task_list_model.cpp task_panel.cpp task_panel_p.h task_display.cpp diff --git a/visualization/motion_planning_tasks/src/task_list_model_cache.cpp b/visualization/motion_planning_tasks/src/meta_task_list_model.cpp similarity index 85% rename from visualization/motion_planning_tasks/src/task_list_model_cache.cpp rename to visualization/motion_planning_tasks/src/meta_task_list_model.cpp index 43e053c4..12d6d460 100644 --- a/visualization/motion_planning_tasks/src/task_list_model_cache.cpp +++ b/visualization/motion_planning_tasks/src/meta_task_list_model.cpp @@ -34,25 +34,25 @@ /* Author: Robert Haschke */ -#include "task_list_model_cache.h" +#include "meta_task_list_model.h" #include "task_list_model.h" #include "task_display.h" namespace moveit_rviz_plugin { -TaskListModelCache::TaskListModelCache() +MetaTaskListModel::MetaTaskListModel() { connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(onRowsRemoved(QModelIndex,int,int))); } -TaskListModelCache &TaskListModelCache::instance() +MetaTaskListModel &MetaTaskListModel::instance() { - static TaskListModelCache instance_; + static MetaTaskListModel instance_; return instance_; } -bool TaskListModelCache::insertModel(TaskListModel *model, TaskDisplay *display) +bool MetaTaskListModel::insertModel(TaskListModel *model, TaskDisplay *display) { if (!model || !display) return false; @@ -67,14 +67,14 @@ bool TaskListModelCache::insertModel(TaskListModel *model, TaskDisplay *display) return true; } -void TaskListModelCache::onRowsRemoved(const QModelIndex &parent, int first, int last) +void MetaTaskListModel::onRowsRemoved(const QModelIndex &parent, int first, int last) { if (!parent.isValid()) { display_.remove(first, last-first+1); } } -void TaskListModelCache::onDisplayNameChanged(const QString &name) +void MetaTaskListModel::onDisplayNameChanged(const QString &name) { int row = display_.indexOf(static_cast(sender())); if (row < 0) return; @@ -86,7 +86,7 @@ void TaskListModelCache::onDisplayNameChanged(const QString &name) setData(idx, name, Qt::EditRole); } -bool TaskListModelCache::setData(const QModelIndex &index, const QVariant &value, int role) +bool MetaTaskListModel::setData(const QModelIndex &index, const QVariant &value, int role) { bool result = TreeMergeProxyModel::setData(index, value, role); if (result && isGroupItem(index)) { @@ -96,7 +96,7 @@ bool TaskListModelCache::setData(const QModelIndex &index, const QVariant &value } std::pair -TaskListModelCache::getTaskListModel(const QModelIndex &index) const +MetaTaskListModel::getTaskListModel(const QModelIndex &index) const { QAbstractItemModel *m = getModel(index).first; if (!m) return std::make_pair(nullptr, nullptr); @@ -106,7 +106,7 @@ TaskListModelCache::getTaskListModel(const QModelIndex &index) const } std::pair -TaskListModelCache::getTaskModel(const QModelIndex &index) const +MetaTaskListModel::getTaskModel(const QModelIndex &index) const { if (!index.isValid()) return std::make_pair(nullptr, QModelIndex()); diff --git a/visualization/motion_planning_tasks/src/task_list_model_cache.h b/visualization/motion_planning_tasks/src/meta_task_list_model.h similarity index 91% rename from visualization/motion_planning_tasks/src/task_list_model_cache.h rename to visualization/motion_planning_tasks/src/meta_task_list_model.h index fbb444fc..91188289 100644 --- a/visualization/motion_planning_tasks/src/task_list_model_cache.h +++ b/visualization/motion_planning_tasks/src/meta_task_list_model.h @@ -46,7 +46,7 @@ MOVEIT_CLASS_FORWARD(BaseTaskModel) MOVEIT_CLASS_FORWARD(TaskListModel) MOVEIT_CLASS_FORWARD(TaskDisplay) -/** TaskListModelCache maintains a model of multiple registered TaskListModels, +/** MetaTaskListModel maintains a model of multiple registered TaskListModels, * which are grouped in a hierarchical fashion according to the name of the * associated display. * @@ -55,16 +55,16 @@ MOVEIT_CLASS_FORWARD(TaskDisplay) * * This is a singleton instance. */ -class TaskListModelCache : public utils::TreeMergeProxyModel { +class MetaTaskListModel : public utils::TreeMergeProxyModel { Q_OBJECT // 1:1 correspondence of displays to models QVector display_; /// class is singleton - TaskListModelCache(); - TaskListModelCache(const TaskListModelCache&) = delete; - void operator=(const TaskListModelCache&) = delete; + MetaTaskListModel(); + MetaTaskListModel(const MetaTaskListModel&) = delete; + void operator=(const MetaTaskListModel&) = delete; // hide this, as we want to offer another API using utils::TreeMergeProxyModel::insertModel; @@ -74,7 +74,7 @@ class TaskListModelCache : public utils::TreeMergeProxyModel { void onDisplayNameChanged(const QString &name); public: - static TaskListModelCache& instance(); + static MetaTaskListModel& instance(); /// insert a new TaskListModel together with it's associated display bool insertModel(TaskListModel* model, TaskDisplay* display); diff --git a/visualization/motion_planning_tasks/src/task_display.cpp b/visualization/motion_planning_tasks/src/task_display.cpp index 8aebccff..656cb864 100644 --- a/visualization/motion_planning_tasks/src/task_display.cpp +++ b/visualization/motion_planning_tasks/src/task_display.cpp @@ -38,7 +38,7 @@ #include "task_display.h" #include "task_list_model.h" -#include "task_list_model_cache.h" +#include "meta_task_list_model.h" #include #include #include @@ -56,7 +56,7 @@ namespace moveit_rviz_plugin TaskDisplay::TaskDisplay() : Display() { task_list_model_.reset(new TaskListModel); - TaskListModelCache::instance().insertModel(task_list_model_.get(), this); + MetaTaskListModel::instance().insertModel(task_list_model_.get(), this); connect(task_list_model_.get(), SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(onTasksInserted(QModelIndex,int,int))); diff --git a/visualization/motion_planning_tasks/src/task_list_model.cpp b/visualization/motion_planning_tasks/src/task_list_model.cpp index b0a5483f..c4bb522f 100644 --- a/visualization/motion_planning_tasks/src/task_list_model.cpp +++ b/visualization/motion_planning_tasks/src/task_list_model.cpp @@ -144,7 +144,7 @@ TaskListModel::TaskListModel(QObject *parent) TaskListModel::~TaskListModel() { ROS_DEBUG_NAMED(LOGNAME, "destroying TaskListModel: %p", this); - // inform TaskListModelCache that we will remove our stuff + // inform MetaTaskListModel that we will remove our stuff removeRows(0, rowCount()); } diff --git a/visualization/motion_planning_tasks/src/task_panel.cpp b/visualization/motion_planning_tasks/src/task_panel.cpp index df9cb6f7..a2cb74f1 100644 --- a/visualization/motion_planning_tasks/src/task_panel.cpp +++ b/visualization/motion_planning_tasks/src/task_panel.cpp @@ -39,7 +39,7 @@ #include #include "task_panel_p.h" -#include "task_list_model_cache.h" +#include "meta_task_list_model.h" #include "local_task_model.h" #include "factory_model.h" #include "pluginlib_factory.h" @@ -98,7 +98,7 @@ TaskPanelPrivate::TaskPanelPrivate(TaskPanel *q_ptr) { setupUi(q_ptr); // init tasks view - tasks_view->setModel(&TaskListModelCache::instance()); + tasks_view->setModel(&MetaTaskListModel::instance()); tasks_view->setSelectionMode(QAbstractItemView::ExtendedSelection); tasks_view->setAcceptDrops(true); @@ -123,14 +123,14 @@ void TaskPanelPrivate::initSettings(rviz::Property* root) std::pair TaskPanelPrivate::getTaskListModel(const QModelIndex &index) const { - auto *meta_model = static_cast(tasks_view->model()); + auto *meta_model = static_cast(tasks_view->model()); return meta_model->getTaskListModel(index); } std::pair TaskPanelPrivate::getTaskModel(const QModelIndex &index) const { - auto *meta_model = static_cast(tasks_view->model()); + auto *meta_model = static_cast(tasks_view->model()); return meta_model->getTaskModel(index); }