-// Copyright (C) 2006-2013 CEA/DEN, EDF R&D
+// Copyright (C) 2006-2014 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
}
}
-void GuiEditor::CreateNode(std::string typeNode)
+SubjectNode* GuiEditor::CreateNode(std::string typeNode)
{
DEBTRACE("GuiEditor::CreateNode " << typeNode);
YACS::ENGINE::Catalog *catalog = YACS::ENGINE::getSALOMERuntime()->getBuiltinCatalog();
if (!sub)
{
DEBTRACE("GuiEditor::CreateNode : invalid selection!");
- return;
+ return 0;
}
DEBTRACE(sub->getName());
if (!cnode)
{
DEBTRACE("GuiEditor::CreateNode : no ComposedNode selected!");
- return;
+ return 0;
}
- _createNode(catalog, cnode, typeNode, "", Resource::COMPONENT_INSTANCE_NEW);
+ return _createNode(catalog, cnode, typeNode, "", Resource::COMPONENT_INSTANCE_NEW);
}
-void GuiEditor::_createNode(YACS::ENGINE::Catalog* catalog,
- SubjectComposedNode *cnode,
- std::string service,
- std::string compoName,
- bool createNewComponentInstance)
+SubjectNode* GuiEditor::_createNode(YACS::ENGINE::Catalog* catalog,
+ SubjectComposedNode *cnode,
+ std::string service,
+ std::string compoName,
+ bool createNewComponentInstance)
{
+ SubjectNode* aNewNode = 0;
+
// --- find a name not used
string name = service;
map<int, SubjectNode*>::reverse_iterator rit = bodyMap.rbegin();
swCase = (*rit).first + 1;
}
- if (!aSwitch->addNode(catalog, compoName, service, name, createNewComponentInstance, swCase))
+ aNewNode = aSwitch->addNode(catalog, compoName, service, name, createNewComponentInstance, swCase);
+ if (!aNewNode)
Message mess;
}
else if (cnode && (dynamic_cast<SubjectBloc*>(cnode) == 0) && cnode->getChild() != 0)
{
//the bloc has been successfully created. Add the new node
SubjectBloc* newbloc = dynamic_cast<SubjectBloc*>(cnode->getChild());
- if (!newbloc->addNode(catalog, compoName, service, name, createNewComponentInstance))
+ aNewNode = newbloc->addNode(catalog, compoName, service, name, createNewComponentInstance);
+ if (!aNewNode)
Message mess;
}
else
}
}
else if (cnode)
- if (!cnode->addNode(catalog, compoName, service, name, createNewComponentInstance))
+ aNewNode = cnode->addNode(catalog, compoName, service, name, createNewComponentInstance);
+ if (!aNewNode)
Message mess;
+ return aNewNode;
}
void GuiEditor::AddTypeFromCatalog(const ItemMimeData* myData)
Message mess("Put in Bloc not possible for this kind of object");
}
-void GuiEditor::PutGraphInForeachLoop(std::string typeNode)
-{
- // put graph in Bloc node before
- std::string blocname = PutGraphInBloc();
-
- Proc* proc = GuiContext::getCurrent()->getProc();
- Node* bloc = proc->getChildByShortName(blocname);
- SubjectNode * sbloc = GuiContext::getCurrent()->_mapOfSubjectNode[bloc];
- //put the built bloc into target node
- sbloc->putInComposedNode("ForEachLoop_"+typeNode,"ForEachLoop_"+typeNode);
-}
-
-void GuiEditor::PutGraphInOptimizerLoop()
+void GuiEditor::PutGraphInNode(std::string typeNode)
{
// put graph in Bloc node before
std::string blocname = PutGraphInBloc();
-
+ // put the built bloc into target node type
Proc* proc = GuiContext::getCurrent()->getProc();
Node* bloc = proc->getChildByShortName(blocname);
SubjectNode * sbloc = GuiContext::getCurrent()->_mapOfSubjectNode[bloc];
- //put the built bloc into target node
- sbloc->putInComposedNode("OptimizerLoop0","OptimizerLoop");
+ // create a target node
+ SubjectNode * snode = CreateNode(typeNode);
+ // put the built bloc into target node
+ sbloc->putInComposedNode(snode->getName(), typeNode);
+ // select a target node
+ YACS::HMI::SubjectProc* subproc = QtGuiContext::getQtCurrent()->getSubjectProc();
+ QtGuiContext::getQtCurrent()->setSelectedSubject(subproc);
+ arrangeNodes(false);
}
std::string GuiEditor::PutGraphInBloc()
{
Proc* proc = GuiContext::getCurrent()->getProc();
- std::list<Node *> children = proc->getChildren();
+ std::list<Node *> children = proc->edGetDirectDescendants();
//get the set of children node names
std::set<std::string> names;
//get the next numbered name
std::stringstream tryname;
- long newid=0;
+ long newid = GuiContext::getCurrent()->getNewId();
while (newid < 100000)
{
tryname.str("");
std::string blocname = tryname.str();
//put one by one the child nodes of Proc node into a new Bloc node
- SubjectNode * snode;
+ std::map< std::string, std::pair<QPointF, QPointF> > aMapOfNodePosition;
+ SceneItem *item = 0;
+ SceneNodeItem *inode = 0;
+ SubjectNode * snode = 0;
for (std::list<Node*>::iterator it = children.begin(); it != children.end(); ++it)
{
snode = GuiContext::getCurrent()->_mapOfSubjectNode[(*it)];
snode->saveLinks();
- snode->putInComposedNode(blocname,"Bloc", false);
+ item = QtGuiContext::getQtCurrent()->_mapOfSceneItem[snode];
+ YASSERT(item);
+ inode = dynamic_cast<SceneNodeItem*>(item);
+ YASSERT(inode);
+ // save current node position to restore it after reparenting
+ aMapOfNodePosition[snode->getName()] = std::make_pair(inode->pos(), QPointF(inode->getExpandedX(), inode->getExpandedY()));
+ // put in Bloc node
+ snode->putInComposedNode(blocname, "Bloc", false);
}
for (std::list<Node*>::iterator it = children.begin(); it != children.end(); ++it)
{
snode = 0;
snode = GuiContext::getCurrent()->_mapOfSubjectNode[(*it)];
snode->restoreLinks();
+ item = QtGuiContext::getQtCurrent()->_mapOfSceneItem[snode];
+ YASSERT(item);
+ inode = dynamic_cast<SceneNodeItem*>(item);
+ YASSERT(inode);
+ // restore node position
+ inode->setPos(aMapOfNodePosition[snode->getName()].first);
+ // update node position for shrink/expand operation
+ inode->setExpandedPos(aMapOfNodePosition[snode->getName()].second);
+ // notify node about position changing
+ inode->checkGeometryChange();
}
+ Node* bloc = proc->getChildByShortName(blocname);
+ SubjectNode* sbloc = GuiContext::getCurrent()->_mapOfSubjectNode[bloc];
+ item = QtGuiContext::getQtCurrent()->_mapOfSceneItem[sbloc];
+ YASSERT(item);
+ // notify bloc about child position changing
+ item->checkGeometryChange();
+ // select a target bloc
+ YACS::HMI::SubjectProc* subproc = QtGuiContext::getQtCurrent()->getSubjectProc();
+ QtGuiContext::getQtCurrent()->setSelectedSubject(subproc);
return blocname;
}
