Commit 39453060 authored by Matthias Möller's avatar Matthias Möller

rename addObject function

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16237 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 077e9aa1
......@@ -366,7 +366,7 @@ class DataControlPlugin : public QObject, BaseInterface, ToolboxInterface, KeyIn
int groupObjects(IdList _objectIDs, QString _groupName = "");
/// add an object to an existing group
bool groupObject(int _objectId, int _groupId);
bool addObjectToGroup(int _objectId, int _groupId);
/** remove an object from its group and place it at the toplevel group
*
......
......@@ -122,7 +122,7 @@ void DataControlPlugin::setDescriptions(){
emit setSlotDescription("printObjectInfoToLog()",tr("Print info about all objects to log"),
QStringList(), QStringList());
emit setSlotDescription("groupObject(int,int)",tr("Add an Object to an existing group"),
emit setSlotDescription("addObjectToGroup(int,int)",tr("Add an Object to an existing group"),
QStringList(tr("objectId,groupId").split(",")),
QStringList(tr("ID of an object.,ID of an group where the object has to be added.").split(",")));
......@@ -607,7 +607,7 @@ QStringList DataControlPlugin::availableDataTypeNames() const {
*
* @return success
*/
bool DataControlPlugin::groupObject(int _objectId, int _groupId)
bool DataControlPlugin::addObjectToGroup(int _objectId, int _groupId)
{
BaseObject* obj = 0;
BaseObject* group = 0;
......
......@@ -72,7 +72,7 @@ id2 = primitivesgenerator.addSphere()
id3 = primitivesgenerator.addSphere()
groupid = datacontrol.groupObjects([id1,id2])
datacontrol.groupObject(id3,groupid)
datacontrol.addObjectToGroup(id3,groupid)
datacontrol.groupObjects([id1,id2,id3])//Can be done, if all objects are in the same group
if (datacontrol.groupCount() != 2)
......@@ -84,7 +84,7 @@ if (datacontrol.groupCount() != 2)
core.exitFailure()
}
if (datacontrol.groupObject(id3,id2))
if (datacontrol.addObjectToGroup(id3,id2))
{
print("Could add an object to an object which is not a Group.")
core.exitFailure();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment