Unverified Commit 1601bd16 authored by Kristin's avatar Kristin Committed by GitHub
Browse files

Merge pull request #283 from jessemapel/ipce 

Fixed signals that caused seg faults in ControlNet
parents 9038954a 98f0edb8

isis/src/control/objs/ControlNet/ControlNet.cpp

+1 −11
Original line number Diff line number Diff line
@@ -480,11 +480,6 @@ namespace Isis { 
   }





   void ControlNet::emitNewMeasure(ControlMeasure *measure) {

     emit newMeasure(measure);

   }





   /**

   * Updates the ControlNet graph for the measure's serial number to

   * reflect the addition.  If there is currently no node for
@@ -695,11 +690,6 @@ namespace Isis { 
  }





  void ControlNet::emitMeasureRemoved(ControlMeasure *measure) {

    emit measureRemoved(measure);

  }





  /**

   * Updates the node for this measure's serial number to

   * reflect the deletion.  If this is the only measure left in the containing
@@ -891,7 +881,7 @@ namespace Isis { 


    // notify CubeSerialNumbers of the loss of this point

    foreach(ControlMeasure * measure, point->getMeasures()) {

      emit measureRemoved(measure);

      measureDeleted(measure);

    }



    emit pointDeleted(point);

isis/src/control/objs/ControlNet/ControlNet.h

+2 −3
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ namespace Isis { 
   *                           These signals exist for the purpose of communication between the

   *                           ControlNetVitals class, and the network that it is observing.

   *                           Fixes #5435.



   *   @history 2018-06-25 Jesse Mapel - Fixed the incorrect signal being called when adding and

   *                           removing measures. References #5435.

   */

  class ControlNet : public QObject {

      Q_OBJECT
@@ -374,8 +375,6 @@ namespace Isis { 
      void emitNetworkStructureModified();

      void emitMeasureModified(ControlMeasure *measure, ControlMeasure::ModType type, QVariant oldValue, QVariant newValue);

      void emitPointModified(ControlPoint *point, ControlPoint::ModType type, QVariant oldValue, QVariant newValue);

      void emitNewMeasure(ControlMeasure *measure);

      void emitMeasureRemoved(ControlMeasure *measure);

      void pointAdded(ControlPoint *point);



    private: // graphing functions

isis/src/control/objs/ControlPoint/ControlPoint.cpp

+1 −2
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ namespace Isis { 
    // notify parent network if we have one

    if (parentNetwork) {

      parentNetwork->measureAdded(measure);

      parentNetwork->emitNewMeasure(measure);

      parentNetwork->emitNetworkStructureModified();

    }

  }
@@ -307,7 +306,7 @@ namespace Isis { 


    // notify parent network of the change

    if (parentNetwork) {

      parentNetwork->emitMeasureRemoved(cm);

      parentNetwork->measureDeleted(cm);



      if (!IsIgnored() && !cm->IsIgnored()) {

        parentNetwork->emitNetworkStructureModified();