AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added context menu for picking the connecting object when creating a link

This commit is contained in:
parax0 2016-03-07 10:25:53 -07:00
parent f4484556c0
commit 93d6e8dd14
3 changed files with 154 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
src/Editor/WorldEditor/WModifyTab.cpp
View File

@ -2,6 +2,7 @@
#include "ui_WModifyTab.h" #include "ui_WModifyTab.h"
#include "CLinkDialog.h" #include "CLinkDialog.h"
#include "CSelectInstanceDialog.h"
#include "CWorldEditor.h" #include "CWorldEditor.h"
#include "Editor/Undo/UndoCommands.h" #include "Editor/Undo/UndoCommands.h"
#include <Core/Scene/CScriptNode.h> #include <Core/Scene/CScriptNode.h>
@ -12,6 +13,7 @@
WModifyTab::WModifyTab(QWidget *pParent) WModifyTab::WModifyTab(QWidget *pParent)
: QWidget(pParent) : QWidget(pParent)
, ui(new Ui::WModifyTab) , ui(new Ui::WModifyTab)
, mIsPicking(false)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -25,20 +27,28 @@ WModifyTab::WModifyTab(QWidget *pParent)
mpOutLinkModel = new CLinkModel(this); mpOutLinkModel = new CLinkModel(this);
mpOutLinkModel->SetConnectionType(eOutgoing); mpOutLinkModel->SetConnectionType(eOutgoing);
mpAddFromViewportAction = new QAction("Choose from viewport", this);
mpAddFromListAction = new QAction("Choose from list", this);
mpAddLinkMenu = new QMenu(this);
mpAddLinkMenu->addAction(mpAddFromViewportAction);
mpAddLinkMenu->addAction(mpAddFromListAction);
ui->AddOutgoingConnectionToolButton->setMenu(mpAddLinkMenu);
ui->AddIncomingConnectionToolButton->setMenu(mpAddLinkMenu);
ui->InLinksTableView->setModel(mpInLinkModel); ui->InLinksTableView->setModel(mpInLinkModel);
ui->OutLinksTableView->setModel(mpOutLinkModel); ui->OutLinksTableView->setModel(mpOutLinkModel);
ui->InLinksTableView->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch); ui->InLinksTableView->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
ui->OutLinksTableView->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch); ui->OutLinksTableView->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
connect(ui->InLinksTableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnLinkTableDoubleClick(QModelIndex))); connect(ui->InLinksTableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnLinkTableDoubleClick(QModelIndex)));
connect(ui->OutLinksTableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnLinkTableDoubleClick(QModelIndex))); connect(ui->OutLinksTableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnLinkTableDoubleClick(QModelIndex)));
connect(ui->InLinksTableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(OnIncomingLinksSelectionModified())); connect(ui->InLinksTableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(OnLinksSelectionModified()));
connect(ui->OutLinksTableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(OnOutgoingLinksSelectionModified())); connect(ui->OutLinksTableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(OnLinksSelectionModified()));
connect(ui->AddOutgoingConnectionButton, SIGNAL(clicked()), this, SLOT(OnAddOutgoingLinkClicked())); connect(ui->AddOutgoingConnectionToolButton, SIGNAL(triggered(QAction*)), this, SLOT(OnAddLinkActionClicked(QAction*)));
connect(ui->AddIncomingConnectionButton, SIGNAL(clicked()), this, SLOT(OnAddIncomingLinkClicked())); connect(ui->AddIncomingConnectionToolButton, SIGNAL(triggered(QAction*)), this, SLOT(OnAddLinkActionClicked(QAction*)));
connect(ui->DeleteOutgoingConnectionButton, SIGNAL(clicked()), this, SLOT(OnDeleteOutgoingLinkClicked())); connect(ui->DeleteOutgoingConnectionButton, SIGNAL(clicked()), this, SLOT(OnDeleteLinksClicked()));
connect(ui->DeleteIncomingConnectionButton, SIGNAL(clicked()), this, SLOT(OnDeleteIncomingLinkClicked())); connect(ui->DeleteIncomingConnectionButton, SIGNAL(clicked()), this, SLOT(OnDeleteLinksClicked()));
connect(ui->EditOutgoingConnectionButton, SIGNAL(clicked()), this, SLOT(OnEditOutgoingLinkClicked())); connect(ui->EditOutgoingConnectionButton, SIGNAL(clicked()), this, SLOT(OnEditLinkClicked()));
connect(ui->EditIncomingConnectionButton, SIGNAL(clicked()), this, SLOT(OnEditIncomingLinkClicked())); connect(ui->EditIncomingConnectionButton, SIGNAL(clicked()), this, SLOT(OnEditLinkClicked()));
ClearUI(); ClearUI();
} }
@ -58,6 +68,9 @@ void WModifyTab::SetEditor(CWorldEditor *pEditor)
void WModifyTab::GenerateUI(QList<CSceneNode*>& Selection) void WModifyTab::GenerateUI(QList<CSceneNode*>& Selection)
{ {
if (mIsPicking)
mpWorldEditor->ExitPickMode();
if (Selection.size() == 1) if (Selection.size() == 1)
{ {
if (mpSelectedNode != Selection.front()) if (mpSelectedNode != Selection.front())
@ -117,45 +130,87 @@ void WModifyTab::OnWorldSelectionTransformed()
ui->PropertyView->UpdateEditorProperties(QModelIndex()); ui->PropertyView->UpdateEditorProperties(QModelIndex());
} }
void WModifyTab::OnOutgoingLinksSelectionModified() void WModifyTab::OnLinksSelectionModified()
{ {
u32 NumSelectedRows = ui->OutLinksTableView->selectionModel()->selectedRows().size(); if (sender() == ui->InLinksTableView->selectionModel())
ui->EditOutgoingConnectionButton->setEnabled(NumSelectedRows == 1); {
u32 NumSelectedRows = ui->InLinksTableView->selectionModel()->selectedRows().size();
ui->EditIncomingConnectionButton->setEnabled(NumSelectedRows == 1);
}
else
{
u32 NumSelectedRows = ui->OutLinksTableView->selectionModel()->selectedRows().size();
ui->EditOutgoingConnectionButton->setEnabled(NumSelectedRows == 1);
}
} }
void WModifyTab::OnIncomingLinksSelectionModified() void WModifyTab::OnAddLinkActionClicked(QAction *pAction)
{
u32 NumSelectedRows = ui->InLinksTableView->selectionModel()->selectedRows().size();
ui->EditIncomingConnectionButton->setEnabled(NumSelectedRows == 1);
}
void WModifyTab::OnAddOutgoingLinkClicked()
{ {
if (mpSelectedNode && mpSelectedNode->NodeType() == eScriptNode) if (mpSelectedNode && mpSelectedNode->NodeType() == eScriptNode)
{ {
CScriptObject *pInst = static_cast<CScriptNode*>(mpSelectedNode)->Object(); mAddLinkType = (sender() == ui->AddOutgoingConnectionToolButton ? eOutgoing : eIncoming);
if (pAction == mpAddFromViewportAction)
{
mpWorldEditor->EnterPickMode(eScriptNode, true, false, false);
connect(mpWorldEditor, SIGNAL(PickModeClick(SRayIntersection,QMouseEvent*)), this, SLOT(OnPickModeClick(SRayIntersection)));
connect(mpWorldEditor, SIGNAL(PickModeExited()), this, SLOT(OnPickModeExit()));
mIsPicking = true;
}
else if (pAction == mpAddFromListAction)
{
if (mIsPicking)
mpWorldEditor->ExitPickMode();
CSelectInstanceDialog Dialog(mpWorldEditor, this);
Dialog.exec();
CScriptObject *pTarget = Dialog.SelectedInstance();
if (pTarget)
{
CLinkDialog *pLinkDialog = mpWorldEditor->LinkDialog();
CScriptObject *pSelected = static_cast<CScriptNode*>(mpSelectedNode)->Object();
CScriptObject *pSender = (mAddLinkType == eOutgoing ? pSelected : pTarget);
CScriptObject *pReceiver = (mAddLinkType == eOutgoing ? pTarget : pSelected);
pLinkDialog->NewLink(pSender, pReceiver);
pLinkDialog->show();
}
}
}
}
void WModifyTab::OnPickModeClick(const SRayIntersection& rkIntersect)
{
mpWorldEditor->ExitPickMode();
CScriptObject *pTarget = static_cast<CScriptNode*>(rkIntersect.pNode)->Object();
if (pTarget)
{
CLinkDialog *pDialog = mpWorldEditor->LinkDialog(); CLinkDialog *pDialog = mpWorldEditor->LinkDialog();
pDialog->NewLink(pInst, nullptr); CScriptObject *pSelected = static_cast<CScriptNode*>(mpSelectedNode)->Object();
CScriptObject *pSender = (mAddLinkType == eOutgoing ? pSelected : pTarget);
CScriptObject *pReceiver = (mAddLinkType == eOutgoing ? pTarget : pSelected);
pDialog->NewLink(pSender, pReceiver);
pDialog->show(); pDialog->show();
} }
} }
void WModifyTab::OnAddIncomingLinkClicked() void WModifyTab::OnPickModeExit()
{ {
if (mpSelectedNode && mpSelectedNode->NodeType() == eScriptNode) disconnect(mpWorldEditor, SIGNAL(PickModeClick(SRayIntersection,QMouseEvent*)), this, 0);
{ disconnect(mpWorldEditor, SIGNAL(PickModeExited()), this, 0);
CScriptObject *pInst = static_cast<CScriptNode*>(mpSelectedNode)->Object(); mIsPicking = false;
CLinkDialog *pDialog = mpWorldEditor->LinkDialog();
pDialog->NewLink(nullptr, pInst);
pDialog->show();
}
} }
void WModifyTab::OnDeleteOutgoingLinkClicked() void WModifyTab::OnDeleteLinksClicked()
{ {
if (mpSelectedNode && mpSelectedNode->NodeType() == eScriptNode) if (mpSelectedNode && mpSelectedNode->NodeType() == eScriptNode)
{ {
QModelIndexList SelectedIndices = ui->OutLinksTableView->selectionModel()->selectedRows(); ELinkType Type = (sender() == ui->DeleteOutgoingConnectionButton ? eOutgoing : eIncoming);
QModelIndexList SelectedIndices = (Type == eOutgoing ? ui->OutLinksTableView->selectionModel()->selectedRows() : ui->InLinksTableView->selectionModel()->selectedRows());
if (!SelectedIndices.isEmpty()) if (!SelectedIndices.isEmpty())
{ {
@ -165,59 +220,24 @@ void WModifyTab::OnDeleteOutgoingLinkClicked()
Indices << SelectedIndices[iIdx].row(); Indices << SelectedIndices[iIdx].row();
CScriptObject *pInst = static_cast<CScriptNode*>(mpSelectedNode)->Object(); CScriptObject *pInst = static_cast<CScriptNode*>(mpSelectedNode)->Object();
CDeleteLinksCommand *pCmd = new CDeleteLinksCommand(mpWorldEditor, pInst, eOutgoing, Indices); CDeleteLinksCommand *pCmd = new CDeleteLinksCommand(mpWorldEditor, pInst, Type, Indices);
mpWorldEditor->UndoStack()->push(pCmd); mpWorldEditor->UndoStack()->push(pCmd);
} }
} }
} }
void WModifyTab::OnDeleteIncomingLinkClicked() void WModifyTab::OnEditLinkClicked()
{ {
if (mpSelectedNode && mpSelectedNode->NodeType() == eScriptNode) if (mpSelectedNode && mpSelectedNode->NodeType() == eScriptNode)
{ {
QModelIndexList SelectedIndices = ui->InLinksTableView->selectionModel()->selectedRows(); ELinkType Type = (sender() == ui->EditOutgoingConnectionButton ? eOutgoing : eIncoming);
QModelIndexList SelectedIndices = (Type == eOutgoing ? ui->OutLinksTableView->selectionModel()->selectedRows() : ui->InLinksTableView->selectionModel()->selectedRows());
if (!SelectedIndices.isEmpty())
{
QVector<u32> Indices;
for (int iIdx = 0; iIdx < SelectedIndices.size(); iIdx++)
Indices << SelectedIndices[iIdx].row();
CScriptObject *pInst = static_cast<CScriptNode*>(mpSelectedNode)->Object();
CDeleteLinksCommand *pCmd = new CDeleteLinksCommand(mpWorldEditor, pInst, eIncoming, Indices);
mpWorldEditor->UndoStack()->push(pCmd);
}
}
}
void WModifyTab::OnEditOutgoingLinkClicked()
{
if (mpSelectedNode && mpSelectedNode->NodeType() == eScriptNode)
{
QModelIndexList SelectedIndices = ui->OutLinksTableView->selectionModel()->selectedRows();
if (SelectedIndices.size() == 1) if (SelectedIndices.size() == 1)
{ {
CScriptObject *pInst = static_cast<CScriptNode*>(mpSelectedNode)->Object(); CScriptObject *pInst = static_cast<CScriptNode*>(mpSelectedNode)->Object();
CLinkDialog *pDialog = mpWorldEditor->LinkDialog(); CLinkDialog *pDialog = mpWorldEditor->LinkDialog();
pDialog->EditLink(pInst->Link(eOutgoing, SelectedIndices.front().row())); pDialog->EditLink(pInst->Link(Type, SelectedIndices.front().row()));
pDialog->show();
}
}
}
void WModifyTab::OnEditIncomingLinkClicked()
{
if (mpSelectedNode && mpSelectedNode->NodeType() == eScriptNode)
{
QModelIndexList SelectedIndices = ui->InLinksTableView->selectionModel()->selectedRows();
if (SelectedIndices.size() == 1)
{
CScriptObject *pInst = static_cast<CScriptNode*>(mpSelectedNode)->Object();
CLinkDialog *pDialog = mpWorldEditor->LinkDialog();
pDialog->EditLink(pInst->Link(eIncoming, SelectedIndices.front().row()));
pDialog->show(); pDialog->show();
} }
} }
@ -240,10 +260,7 @@ void WModifyTab::OnLinkTableDoubleClick(QModelIndex Index)
CScriptNode *pLinkedNode = pNode->Scene()->ScriptNodeByID(InstanceID); CScriptNode *pLinkedNode = pNode->Scene()->ScriptNodeByID(InstanceID);
if (pLinkedNode) if (pLinkedNode)
{ mpWorldEditor->ClearAndSelectNode(pLinkedNode);
mpWorldEditor->ClearSelection();
mpWorldEditor->SelectNode(pLinkedNode);
}
ui->InLinksTableView->clearSelection(); ui->InLinksTableView->clearSelection();
ui->OutLinksTableView->clearSelection(); ui->OutLinksTableView->clearSelection();

27
src/Editor/WorldEditor/WModifyTab.h
View File

@ -6,11 +6,9 @@
#include <Core/Scene/CSceneNode.h> #include <Core/Scene/CSceneNode.h>
#include <Core/Scene/CScriptNode.h> #include <Core/Scene/CScriptNode.h>
#include <QList>
#include <QMenu>
#include <QWidget> #include <QWidget>
#include <QScrollArea>
#include <QTabWidget>
#include <QVBoxLayout>
#include <QMap>
class CWorldEditor; class CWorldEditor;
@ -28,6 +26,12 @@ class WModifyTab : public QWidget
CLinkModel *mpInLinkModel; CLinkModel *mpInLinkModel;
CLinkModel *mpOutLinkModel; CLinkModel *mpOutLinkModel;
QMenu *mpAddLinkMenu;
QAction *mpAddFromViewportAction;
QAction *mpAddFromListAction;
ELinkType mAddLinkType;
bool mIsPicking;
public: public:
explicit WModifyTab(QWidget *pParent = 0); explicit WModifyTab(QWidget *pParent = 0);
~WModifyTab(); ~WModifyTab();
@ -39,14 +43,13 @@ public slots:
void OnInstanceLinksModified(const QList<CScriptObject*>& rkInstances); void OnInstanceLinksModified(const QList<CScriptObject*>& rkInstances);
void OnWorldSelectionTransformed(); void OnWorldSelectionTransformed();
void OnOutgoingLinksSelectionModified(); void OnLinksSelectionModified();
void OnIncomingLinksSelectionModified(); void OnAddLinkActionClicked(QAction *pAction);
void OnAddOutgoingLinkClicked(); void OnPickModeClick(const SRayIntersection& rkIntersect);
void OnAddIncomingLinkClicked(); void OnPickModeExit();
void OnDeleteOutgoingLinkClicked(); void OnDeleteLinksClicked();
void OnDeleteIncomingLinkClicked(); void OnEditLinkClicked();
void OnEditOutgoingLinkClicked();
void OnEditIncomingLinkClicked();
private: private:
Ui::WModifyTab *ui; Ui::WModifyTab *ui;

69
src/Editor/WorldEditor/WModifyTab.ui
View File

@ -155,7 +155,16 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QPushButton" name="AddOutgoingConnectionButton"> <widget class="QToolButton" name="AddOutgoingConnectionToolButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -163,16 +172,11 @@
<iconset resource="../Icons.qrc"> <iconset resource="../Icons.qrc">
<normaloff>:/icons/Plus.png</normaloff>:/icons/Plus.png</iconset> <normaloff>:/icons/Plus.png</normaloff>:/icons/Plus.png</iconset>
</property> </property>
</widget> <property name="popupMode">
</item> <enum>QToolButton::InstantPopup</enum>
<item>
<widget class="QPushButton" name="DeleteOutgoingConnectionButton">
<property name="text">
<string/>
</property> </property>
<property name="icon"> <property name="arrowType">
<iconset resource="../Icons.qrc"> <enum>Qt::NoArrow</enum>
<normaloff>:/icons/Minus v2.png</normaloff>:/icons/Minus v2.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -211,6 +215,17 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QPushButton" name="DeleteOutgoingConnectionButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../Icons.qrc">
<normaloff>:/icons/Minus v2.png</normaloff>:/icons/Minus v2.png</iconset>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -253,7 +268,16 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QPushButton" name="AddIncomingConnectionButton"> <widget class="QToolButton" name="AddIncomingConnectionToolButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -261,16 +285,8 @@
<iconset resource="../Icons.qrc"> <iconset resource="../Icons.qrc">
<normaloff>:/icons/Plus.png</normaloff>:/icons/Plus.png</iconset> <normaloff>:/icons/Plus.png</normaloff>:/icons/Plus.png</iconset>
</property> </property>
</widget> <property name="popupMode">
</item> <enum>QToolButton::InstantPopup</enum>
<item>
<widget class="QPushButton" name="DeleteIncomingConnectionButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../Icons.qrc">
<normaloff>:/icons/Minus v2.png</normaloff>:/icons/Minus v2.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -303,6 +319,17 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QPushButton" name="DeleteIncomingConnectionButton">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../Icons.qrc">
<normaloff>:/icons/Minus v2.png</normaloff>:/icons/Minus v2.png</iconset>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>