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

Store QtProperty, IPrimitive pairs and look the primitive up when the property changes.

Browse source 
--HG--
branch : gsoc2014-dfighter
This commit is contained in:
dfighter1985 2014-07-12 00:01:17 +02:00
parent 820b6bc8ca
commit 8f8b4fae65
2 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
code/studio/src/plugins/world_editor/property_editor_widget.cpp
View file

@ -28,12 +28,48 @@
// Qt includes
#include <QtCore/QModelIndex>
#include <QMap>
#include "const_string_array_property.h"
namespace WorldEditor
{
struct PropertyEditorWidgetPrivate
{
QMap< QtProperty*, NLLIGO::IPrimitive* > propToPrim;
void clearPrimitives()
{
propToPrim.clear();
}
void addPrimitive( QtProperty *p, NLLIGO::IPrimitive *prim )
{
QMap< QtProperty*, NLLIGO::IPrimitive* >::const_iterator itr
= propToPrim.find( p );
if( itr != propToPrim.end() )
return;
propToPrim[ p ] = prim;
}
NLLIGO::IPrimitive* getPrimitive( QtProperty *p )
{
NLLIGO::IPrimitive *prim = NULL;
QMap< QtProperty*, NLLIGO::IPrimitive* >::const_iterator itr
= propToPrim.find( p );
if( itr != propToPrim.end() )
{
prim = itr.value();
}
return prim;
}
};
PropertyEditorWidget::PropertyEditorWidget(QWidget *parent)
: QWidget(parent)
{
@ -60,6 +96,8 @@ PropertyEditorWidget::PropertyEditorWidget(QWidget *parent)
m_groupManager = new QtGroupPropertyManager(this);
d_ptr = new PropertyEditorWidgetPrivate();
connect(m_stringManager, SIGNAL(propertyChanged(QtProperty *)), this, SLOT(propertyChanged(QtProperty *)));
connect(m_boolManager, SIGNAL(propertyChanged(QtProperty *)), this, SLOT(propertyChanged(QtProperty *)));
connect(m_enumManager, SIGNAL(propertyChanged(QtProperty *)), this, SLOT(propertyChanged(QtProperty *)));
@ -74,10 +112,13 @@ PropertyEditorWidget::PropertyEditorWidget(QWidget *parent)
PropertyEditorWidget::~PropertyEditorWidget()
{
delete d_ptr;
d_ptr = NULL;
}
void PropertyEditorWidget::clearProperties()
{
d_ptr->clearPrimitives();
m_ui.treePropertyBrowser->clear();
}
@ -170,6 +211,8 @@ void PropertyEditorWidget::updateSelection(Node *node)
else
prop = addBoolProperty(ligoProperty, parameter, primitive);
d_ptr->addPrimitive( prop, const_cast< NLLIGO::IPrimitive* >( primitive ) );
// Default value ?
if ((ligoProperty == NULL) || (ligoProperty->Default))
prop->setModified(false);
@ -198,6 +241,12 @@ void PropertyEditorWidget::updateSelection(Node *node)
void PropertyEditorWidget::propertyChanged(QtProperty *p)
{
nlinfo(QString("property %1 changed").arg(p->propertyName()).toUtf8().constData());
NLLIGO::IPrimitive *prim = d_ptr->getPrimitive( p );
if( prim != NULL )
{
}
}
void PropertyEditorWidget::resetProperty(QtProperty *property)
@ -422,5 +471,6 @@ void PropertyEditorWidget::blockSignalsOfProperties(bool block)
m_boolManager->blockSignals(block);
m_enumManager->blockSignals(block);
m_stringArrayManager->blockSignals(block);
m_constStrArrPropMgr->blockSignals(block);
}
} /* namespace WorldEditor */

5
code/studio/src/plugins/world_editor/property_editor_widget.h
View file

@ -38,6 +38,9 @@ class ConstStrArrEditorFactory;
namespace WorldEditor
{
struct PropertyEditorWidgetPrivate;
/**
@class PropertyEditorWidget
@brief PropertyEditorWidget
@ -91,6 +94,8 @@ private:
ConstStrArrEditorFactory *m_constStrArrEditorFactory;
Ui::PropertyEditorWidget m_ui;
PropertyEditorWidgetPrivate *d_ptr;
}; /* PropertyEditorWidget */
} /* namespace WorldEditor */