Working on reverting network editor space change

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -645,12 +645,7 @@ ExecutionContextHandle NetworkEditorController::createExecutionContext(const Exe
 boost::shared_ptr<boost::thread> NetworkEditorController::executeGeneric(const ExecutableLookup* lookup, ModuleFilter filter)
 {
   initExecutor();
-
-
-
-
   auto context = createExecutionContext(lookup, filter);
-
   return executionManager_.enqueueContext(context);
 }
 

src/Interface/Application/ModuleProxyWidget.cc

@@ -340,6 +340,7 @@ void ModuleProxyWidget::snapToGrid()
 
 void ModuleProxyWidget::keepInScene()
 {
+  #if 0 //post-ibbm
   //qDebug() << __FUNCTION__ << pos();
   if (x() < 0)
     setPos(10, y());
@@ -352,6 +353,7 @@ void ModuleProxyWidget::keepInScene()
     setPos(x(), NetworkBoundaries::sceneHeight - 10);
 
   //qDebug() << "~" << __FUNCTION__ << pos();
+  #endif
 }
 
 void ModuleProxyWidget::mouseMoveEvent(QGraphicsSceneMouseEvent *event)

src/Interface/Application/NetworkEditor.cc

@@ -85,7 +85,11 @@ NetworkEditor::NetworkEditor(const NetworkEditorParameters& params, QWidget* par
 
   connect(scene_, SIGNAL(changed(const QList<QRectF>&)), this, SIGNAL(sceneChanged(const QList<QRectF>&)));
 
-  setSceneRect(QRectF(0, 0, sceneWidth, sceneHeight));
+  //old
+  setSceneRect(QRectF(-1000, -1000, 2000, 2000));
+  centerOn(100, 100);
+  //new
+  //setSceneRect(QRectF(0, 0, sceneWidth, sceneHeight));
   //centerOn(sceneWidth / 2, sceneHeight / 4);
 
   setMouseAsDragMode();
@@ -142,6 +146,8 @@ boost::shared_ptr<NetworkEditorControllerGuiProxy> NetworkEditor::getNetworkEdit
 
 QPointF NetworkBoundaries::keepInScene(const QPointF& p)
 {
+  return p;
+  #if 0 //post-ibbm
   auto adjusted = p;
   if (adjusted.x() < 0)
     adjusted.setX(0);
@@ -155,6 +161,7 @@ QPointF NetworkBoundaries::keepInScene(const QPointF& p)
 
   return adjusted;
   //return QPointF(static_cast<int>(p.x()) % sceneWidth, static_cast<int>(p.y()) % sceneHeight);
+  #endif
 }
 
 void NetworkEditor::addModuleWidget(const std::string& name, ModuleHandle module, const ModuleCounter& count)
@@ -595,7 +602,7 @@ void NetworkEditor::copy()
   auto selected = scene_->selectedItems();
   if (selected.empty())
     return;
-    
+
   auto modSelected = [&selected](ModuleHandle mod)
   {
     for (const auto& item : selected)
@@ -1186,9 +1193,8 @@ SubnetworksHandle NetworkEditor::dumpSubnetworks(ModuleFilter modFilter) const
   return subnets;
 }
 
-void NetworkEditor::updateModulePositions(const ModulePositions& modulePositions, bool selectAll)
+QPointF NetworkEditor::getModulePositionAdjustment(const ModulePositions& modulePositions)
 {
-  QPointF furthestFromOrigin(0,0);
   std::vector<QPointF> positions;
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
@@ -1212,7 +1218,12 @@ void NetworkEditor::updateModulePositions(const ModulePositions& modulePositions
       adjustment = { minX.x(), minY.y() };
     }
   }
+  return adjustment;
+}
 
+void NetworkEditor::updateModulePositions(const ModulePositions& modulePositions, bool selectAll)
+{
+  const auto adjustment = QPointF(); // TODO: after ibbm, work on resizing of network editor space
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
     if (auto w = dynamic_cast<ModuleProxyWidget*>(item))

src/Interface/Application/NetworkEditor.h

@@ -397,6 +397,7 @@ namespace Gui {
     QList<QGraphicsItem*> includeConnections(QList<QGraphicsItem*> items) const;
     QRectF visibleRect() const;
     void deleteImpl(QList<QGraphicsItem*> items);
+    QPointF getModulePositionAdjustment(const SCIRun::Dataflow::Networks::ModulePositions& modulePositions);
 
     // default constructed
     bool modulesSelectedByCL_{ false };

src/Modules/Math/BooleanCompare.h

@@ -43,18 +43,18 @@ namespace Math {
   {
   public:
     BooleanCompare();
-    virtual void execute();
-    virtual void setStateDefaults();
+    virtual void execute() override;
+    virtual void setStateDefaults() override;
 
     INPUT_PORT(0, MatrixA, Matrix);
     INPUT_PORT(1, MatrixB, Matrix);
     INPUT_PORT(2, PossibleOutput, Matrix);
     OUTPUT_PORT(0, OutputMatrix, Matrix);
     OUTPUT_PORT(1, BooleanResult, Matrix);
-      
+
     MODULE_TRAITS_AND_INFO(ModuleHasUIAndAlgorithm)
     NEW_HELP_WEBPAGE_ONLY
-    
+
   };
 }}}