Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Only allow variable nodes to have their number of slots changed.

Browse source 
--HG--
branch : dfighter-tools
This commit is contained in:
dfighter1985 2014-09-16 03:45:26 +02:00
parent 89aaa52703
commit 142d82d788
3 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/studio/src/plugins/gui_editor/expression_editor.cpp
View file

@ -84,15 +84,6 @@ void ExpressionEditor::contextMenuEvent( QContextMenuEvent *e )
QMenu menu; QMenu menu;
QAction *a = NULL; QAction *a = NULL;
QMenu *mm = menu.addMenu( "Add node" );
a = mm->addAction( "1 slot" );
connect( a, SIGNAL( triggered() ), this, SLOT( onAddNode1() ) );
a = mm->addAction( "2 slots" );
connect( a, SIGNAL( triggered() ), this, SLOT( onAddNode2() ) );
a = mm->addAction( "3 slots" );
connect( a, SIGNAL( triggered() ), this, SLOT( onAddNode3() ) );
if( m_selectionCount > 0 ) if( m_selectionCount > 0 )
{ {
@ -100,10 +91,18 @@ void ExpressionEditor::contextMenuEvent( QContextMenuEvent *e )
connect( a, SIGNAL( triggered() ), this, SLOT( onDeleteSelection() ) ); connect( a, SIGNAL( triggered() ), this, SLOT( onDeleteSelection() ) );
if( m_selectionCount == 1 ) if( m_selectionCount == 1 )
{
QList< QGraphicsItem* > l = m_scene->selectedItems();
ExpressionNode *node = dynamic_cast< ExpressionNode* >( l[ 0 ] );
if( node != NULL )
{
if( node->variable() )
{ {
a = menu.addAction( "Change slot count" ); a = menu.addAction( "Change slot count" );
connect( a, SIGNAL( triggered() ), this, SLOT( onChangeSlotCount() ) ); connect( a, SIGNAL( triggered() ), this, SLOT( onChangeSlotCount() ) );
} }
}
}
else else
if( m_selectionCount == 2 ) if( m_selectionCount == 2 )
{ {
@ -219,6 +218,7 @@ void ExpressionEditor::onItemDblClicked( QTreeWidgetItem *item )
ExpressionNode *node = new ExpressionNode( n, info->slotNames.count() ); ExpressionNode *node = new ExpressionNode( n, info->slotNames.count() );
node->setFlags( QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable ); node->setFlags( QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsMovable );
node->setSlotNames( info->slotNames ); node->setSlotNames( info->slotNames );
node->setVariable( info->variable );
m_scene->addItem( node ); m_scene->addItem( node );
} }

2
code/studio/src/plugins/gui_editor/expression_node.cpp
View file

@ -105,6 +105,8 @@ QGraphicsItem( parent )
m_h = 100; m_h = 100;
m_hh = 20.0; m_hh = 20.0;
m_variable = false;
m_name = name; m_name = name;
if( slotCount > 3 ) if( slotCount > 3 )

5
code/studio/src/plugins/gui_editor/expression_node.h
View file

@ -55,6 +55,9 @@ public:
void setSlotNames( const QList< QString > &l ); void setSlotNames( const QList< QString > &l );
void setVariable( bool b ){ m_variable = b; }
bool variable() const{ return m_variable; }
protected: protected:
void mouseMoveEvent( QGraphicsSceneMouseEvent *e ); void mouseMoveEvent( QGraphicsSceneMouseEvent *e );
@ -70,6 +73,8 @@ private:
QList< ExpressionLink* > m_links; QList< ExpressionLink* > m_links;
QString m_name; QString m_name;
bool m_variable;
}; };
#endif #endif