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

Changed: #1302 Added some stuff for weqt property editor.

Browse source 
--HG--
branch : gsoc2011-worldeditorqt
This commit is contained in:
dnk-88 2011-12-21 00:45:00 +03:00
parent c425740361
commit 8a7b7ecd0b
5 changed files with 117 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/nel/tools/3d/object_viewer_qt/src/plugins/core/CMakeLists.txt
View file

@ -11,7 +11,6 @@ SET(OVQT_EXT_SYS_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.
SET(OVQT_CORE_PLUGIN_HDR
icore.h
icontext.h
imenu_manager.h
icore_listener.h
ioptions_page.h
core_plugin.h

4
code/nel/tools/3d/object_viewer_qt/src/plugins/landscape_editor/list_zones_model.cpp
View file

@ -75,9 +75,7 @@ QVariant ListZonesModel::data(const QModelIndex &index, int role) const
}
}
QVariant ListZonesModel::headerData(int section,
Qt::Orientation /* orientation */,
int role) const
QVariant ListZonesModel::headerData(int section, Qt::Orientation, int role) const
{
return QVariant();
}

111
code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/property_editor_widget.cpp
View file

@ -37,12 +37,16 @@ PropertyEditorWidget::PropertyEditorWidget(QWidget *parent)
m_ui.setupUi(this);
m_variantManager = new QtVariantPropertyManager(this);
m_enumManager = new QtEnumPropertyManager(this);
connect(m_variantManager, SIGNAL(valueChanged(QtProperty *, const QVariant &)),
this, SLOT(valueChanged(QtProperty *, const QVariant &)));
QtVariantEditorFactory *variantFactory = new QtVariantEditorFactory(this);
QtEnumEditorFactory *enumFactory = new QtEnumEditorFactory(this);
m_ui.treePropertyBrowser->setFactoryForManager(m_variantManager, variantFactory);
m_ui.treePropertyBrowser->setFactoryForManager(m_enumManager, enumFactory);
m_groupManager = new QtGroupPropertyManager(this);
}
PropertyEditorWidget::~PropertyEditorWidget()
@ -51,10 +55,113 @@ PropertyEditorWidget::~PropertyEditorWidget()
void PropertyEditorWidget::clearProperties()
{
m_ui.treePropertyBrowser->clear();
}
void PropertyEditorWidget::setCurrentPrimitive(PrimitiveNode *node)
void PropertyEditorWidget::updateSelection(const NodeList &selected, const NodeList &deselected)
{
clearProperties();
// The parameter list
std::set<NLLIGO::CPrimitiveClass::CParameter> parameterList;
for (int i = 0; i < selected.size(); ++i)
{
if (selected.at(i)->type() == Node::RootPrimitiveNodeType)
{
/*
const_cast<IPrimitive*>(_PropDlgLocators[i].Primitive)->removePropertyByName("name");
const_cast<IPrimitive*>(_PropDlgLocators[i].Primitive)->removePropertyByName("path");
//TODO faire une fonction dans CWorldDoc pour recup m_strPathName
string name;
getDocument()->getPrimitiveDisplayName(name,_PropDlgLocators[i].getDatabaseIndex());
string path;
getDocument()->getFilePath(_PropDlgLocators[i].getDatabaseIndex(),path);
const_cast<IPrimitive*>(_PropDlgLocators[i].Primitive)->addPropertyByName("name",new CPropertyString (name));
const_cast<IPrimitive*>(_PropDlgLocators[i].Primitive)->addPropertyByName("path",new CPropertyString (path));
*/
}
if (selected.at(i)->type() == Node::PrimitiveNodeType)
{
PrimitiveNode *node = static_cast<PrimitiveNode *>(selected.at(i));
const NLLIGO::IPrimitive *primitive = node->primitive();
const NLLIGO::CPrimitiveClass *primClass = node->primitiveClass();
// Use the class or not ?
if (primClass)
{
QtProperty *groupNode;
groupNode = m_groupManager->addProperty(node->data(Qt::DisplayRole).toString());
m_ui.treePropertyBrowser->addProperty(groupNode);
// For each properties of the class
for (uint p = 0; p < primClass->Parameters.size(); p++)
{
// Is the parameter visible ?
if (primClass->Parameters[p].Visible)
{
QtProperty *param;
if (primClass->Parameters[p].Type == NLLIGO::CPrimitiveClass::CParameter::Boolean)
param = m_variantManager->addProperty(QVariant::Bool, primClass->Parameters[p].Name.c_str());
else if (primClass->Parameters[p].Type == NLLIGO::CPrimitiveClass::CParameter::ConstString)
{
param = m_enumManager->addProperty(primClass->Parameters[p].Name.c_str());
}
else if (primClass->Parameters[p].Type == NLLIGO::CPrimitiveClass::CParameter::String)
param = m_variantManager->addProperty(QVariant::String, primClass->Parameters[p].Name.c_str());
else
param = m_variantManager->addProperty(QVariant::String, primClass->Parameters[p].Name.c_str());
groupNode->addSubProperty(param);
parameterList.insert(primClass->Parameters[p]);
}
}
}
else
{
// For each primitive property
uint numProp = primitive->getNumProperty();
for (uint p = 0; p < numProp; p++)
{
// Get the property
std::string propertyName;
const NLLIGO::IProperty *prop;
nlverify(primitive->getProperty (p, propertyName, prop));
// Add a default property
NLLIGO::CPrimitiveClass::CParameter defProp(*prop, propertyName.c_str());
parameterList.insert(defProp);
}
}
}
}
// Remove property class
std::set<NLLIGO::CPrimitiveClass::CParameter>::iterator ite = parameterList.begin ();
while (ite != parameterList.end ())
{
// Next iterator
std::set<NLLIGO::CPrimitiveClass::CParameter>::iterator next = ite;
next++;
// Property name ?
if (ite->Name == "class")
{
// Remove it
parameterList.erase (ite);
}
ite = next;
}
// Add the default parameter
NLLIGO::CPrimitiveClass::CParameter defaultParameter;
defaultParameter.Visible = true;
defaultParameter.Filename = false;
}
} /* namespace WorldEditor */

7
code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/property_editor_widget.h
View file

@ -50,11 +50,16 @@ public:
public Q_SLOTS:
void clearProperties();
void setCurrentPrimitive(PrimitiveNode *node);
/// Update of selections
void updateSelection(const NodeList &selected, const NodeList &deselected);
private:
QtVariantPropertyManager *m_variantManager;
QtEnumPropertyManager *m_enumManager;
QtGroupPropertyManager *m_groupManager;
Ui::PropertyEditorWidget m_ui;
}; /* PropertyEditorWidget */

2
code/nel/tools/3d/object_viewer_qt/src/plugins/world_editor/world_editor_window.cpp
View file

@ -276,7 +276,7 @@ void WorldEditorWindow::updateSelection(const QItemSelection &selected, const QI
}
// TODO: update property editor
// ...
m_ui.propertyEditWidget->updateSelection(nodesSelected, nodesDeselected);
QList<QGraphicsItem *> itemSelected;
Q_FOREACH(Node *node, nodesSelected)