X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/48f48e6a26a54751ecd0ab90b10ab972cc5e89cd..8fb3c55ee009a11db5e1c08a4cfb286979412745:/GroupScene.cpp?ds=inline

diff --git a/GroupScene.cpp b/GroupScene.cpp
index 48de27e..70c88e2 100644
--- a/GroupScene.cpp
+++ b/GroupScene.cpp
@@ -5,7 +5,7 @@
 #include "GroupWidget.h"
 #include "GroupItem.h"
 #include "BoxItem.h"
-#include "SourceItem.h"
+#include "StimuliItem.h"
 #include "ConnectionItem.h"
 #include "InterfaceItem.h"
 #include "AbstractBlock.h"
@@ -38,6 +38,17 @@ GroupScene::~GroupScene() {
   groupItem = NULL;
 }
 
+/*
+void GroupScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
+
+  //QGraphicsScene::mouseMoveEvent(event);
+  
+  QPointF p = event->scenePos();
+  cout << p.x() << "," << p.y() << endl;
+
+}
+*/
+
 void GroupScene::setSelectedInterface(int id, InterfaceItem* iface) {
   if ((id < 1)|| (id > 2)) return;
   selectedInterfaces[id-1] = iface;
@@ -62,7 +73,7 @@ int GroupScene::setItemsId(int countInit) {
   int counter = countInit;
   groupItem->setId(counter++);
   if (isTopScene()) {
-    foreach(SourceItem *item, sourceItems){
+    foreach(StimuliItem *item, stimuliItems){
       item->setId(counter++);
     } 
   }
@@ -78,7 +89,7 @@ int GroupScene::setInterfacesId(int countInit) {
     inter->setId(counter++);
   }
   if (isTopScene()) {
-    foreach(SourceItem *item, sourceItems){
+    foreach(StimuliItem *item, stimuliItems){
       foreach(InterfaceItem* inter, item->getInterfaces()){
         inter->setId(counter++);
       }
@@ -92,19 +103,40 @@ int GroupScene::setInterfacesId(int countInit) {
   return counter;
 }
 
-BoxItem *GroupScene::createBoxItem(AbstractBlock *block) {
+BoxItem *GroupScene::createBoxItem(AbstractBlock *block, BoxItem::Position position, int lock, BoxItem::SpanType span) {
 
-  BoxItem* item = new BoxItem(block,dispatcher,params,groupItem);
+  BoxItem* item = new BoxItem(block,dispatcher,params,groupItem, lock, span, position);
   item->setZValue(1);
   // add item from the QList
   boxItems.append(item);
   // repainting the group
   groupItem->updateShape();
-  // center the new block
-  QPointF newPos((groupItem->getWidth()-item->getTotalWidth())/2.0, (groupItem->getHeight()-item->getTotalHeight())/2.0);
+
+/*
+  // position the new block
+  double x,y;
+  if (hPos == BoxItem::Left) {
+    x = 0;
+  }
+  else if (hPos == BoxItem::Center) {
+    x = (groupItem->getWidth()-item->getTotalWidth())/2.0;
+  }
+  else if (hPos == BoxItem::Right) {
+    x = groupItem->getWidth()-item->getTotalWidth();
+  }
+  if (vPos == BoxItem::Top) {
+    y = 0;
+  }
+  else if (vPos == BoxItem::Center) {
+    y = (groupItem->getHeight()-item->getTotalHeight())/2.0;
+  }
+  else if (vPos == BoxItem::Bottom) {
+    y = groupItem->getHeight()-item->getTotalHeight();
+  }
+  QPointF newPos(x,y);
   newPos = newPos-item->getOriginPoint();
   item->moveTo(newPos);
-
+*/
   return item;
 }
 
@@ -124,41 +156,42 @@ void GroupScene::removeBoxItem(BoxItem* item) {
   groupItem->updateShape();
 }
 
-SourceItem *GroupScene::createSourceItem(AbstractBlock *block) {
+StimuliItem *GroupScene::createStimuliItem(AbstractBlock *block) {
 
-  SourceItem* item = new SourceItem(block,dispatcher,params);
+  StimuliItem* item = new StimuliItem(block,dispatcher,params);
   // adding item to the scene
   addItem(item);
   item->setZValue(1);
   // add item from the QList
-  sourceItems.append(item);    
+  stimuliItems.append(item);    
   // center the new block
   QPointF groupPos = groupItem->pos();
-  QPointF newPos(groupPos.x()-item->getTotalWidth()-50, groupPos.y());  
+  QPointF newPos(groupPos.x()-item->getTotalWidth()-100, groupPos.y());
   newPos = newPos-item->getOriginPoint();
   item->moveTo(newPos);
   return item;
 }
 
-void GroupScene::addSourceItem(SourceItem* item) {  
+void GroupScene::addStimuliItem(StimuliItem* item) {  
   // adding item to the scene
   addItem(item);
   item->setZValue(1);  
   // add item from the QList
-  sourceItems.append(item);  
+  stimuliItems.append(item);  
 }
 
-void GroupScene::removeSourceItem(SourceItem* item) {
+void GroupScene::removeStimuliItem(StimuliItem* item) {
   // remove item from the viewport
   removeItem(item);
   // remove item from the QList
-  sourceItems.removeAll(item);  
+  stimuliItems.removeAll(item);  
 }
 
-void GroupScene::createConnectionItem(InterfaceItem *iface1, InterfaceItem *iface2) {
+void GroupScene::createConnectionItem(InterfaceItem *iface1, InterfaceItem *iface2, bool visible) {
   ConnectionItem* conn = NULL;
   
   conn = new ConnectionItem(iface1,iface2, dispatcher, params);
+  conn->setVisible(visible);
   addItem(conn);  
   addConnectionItem(conn);
 }
@@ -211,11 +244,11 @@ void GroupScene::unselecteInterfaces() {
 
   if (selectedInterfaces[0] != NULL) {
     selectedInterfaces[0]->selected = false;
-    selectedInterfaces[0] == NULL;
+    selectedInterfaces[0] = NULL;
   }
   if (selectedInterfaces[1] != NULL) {
     selectedInterfaces[1]->selected = false;
-    selectedInterfaces[1] == NULL;
+    selectedInterfaces[1] = NULL;
   }
 }
 
@@ -239,8 +272,8 @@ void GroupScene::save(QXmlStreamWriter &writer) {
 
   if (isTopScene()) {
     writer.writeStartElement("source_items");
-    writer.writeAttribute("count",QString::number(sourceItems.length()));
-    foreach(SourceItem* item, sourceItems) {
+    writer.writeAttribute("count",QString::number(stimuliItems.length()));
+    foreach(StimuliItem* item, stimuliItems) {
       item->save(writer);
     }
     writer.writeEndElement(); // source_items