Commit 172e5b63 authored by Kristin Berry's avatar Kristin Berry
Browse files

Fixed merge conflicts

parents 189f8083 da0d3267

isis/src/control/apps/cnetwinnow/cnetwinnow.cpp

+6 −4
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ void IsisMain() { 
        measFlag[j] = true;  //test passed

    }





    //for now it is necessary to set measures to ignor before testing to see if they would split the network

      //this will change when the expected ControlNet::isCriticalMeasure(...) method is written

    for (int j=0; j<measGroup.size(); j++) {
@@ -319,8 +318,12 @@ void IsisMain() { 
    }



    //if the number of islands has increased the network has split

    if (net.GetSerialConnections().size() > numInitialIslands) islandFlag = false; //test failed

    else islandFlag = true; //test passed

    if (net.GetSerialConnections().size() > numInitialIslands) {

      islandFlag = false; //test failed

    }

    else {

      islandFlag = true; //test passed

    }



    //again we will temporarily be setting the measure back to unignored

      //this will change when the expected ControlNet::isCriticalMeasure(...) method is written
@@ -376,7 +379,6 @@ void IsisMain() { 
  fclose(guiltyFile);

  fclose(ignoredReport);





  //save out the winnowed ControlNet

  net.Write(ui.GetFileName("ONET"));

}

isis/src/control/objs/BundleAdjust/BundleAdjust.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1675,7 +1675,8 @@ namespace Isis { 
      SparseBlockColumnMatrix *normalsColumn = m_sparseNormals[columnIndex];



      if ( !normalsColumn ) {

        QString status = "\nSparseBlockColumnMatrix retrieval failure at column " + columnIndex;

        QString status = "\nSparseBlockColumnMatrix retrieval failure at column " + 

                         QString::number(columnIndex);

        outputBundleStatus(status);

        return false;

      }
@@ -1700,9 +1701,9 @@ namespace Isis { 
          status.append(", row ");

          status.append(rowIndex);

          outputBundleStatus(status);

          status = "Total # of block columns: " + numBlockcolumns;

          status = "Total # of block columns: " + QString::number(numBlockcolumns);

          outputBundleStatus(status);

          status = "Total # of blocks: " + m_sparseNormals.numberOfBlocks();

          status = "Total # of blocks: " + QString::number(m_sparseNormals.numberOfBlocks());

          outputBundleStatus(status);

          return false;

        }

isis/src/control/objs/ControlMeasure/ControlMeasure.cpp

+20 −20
Original line number Diff line number Diff line
@@ -1037,31 +1037,31 @@ namespace Isis { 
    p_dateTime = new QString;

    p_loggedData = new QVector<ControlMeasureLogData>();



    *p_serialNumber = *other.p_serialNumber;

    *p_chooserName = *other.p_chooserName;

    *p_dateTime = *other.p_dateTime;

    bool oldLock = p_editLock;

    p_editLock = false;



    p_sample = other.p_sample;

    p_line = other.p_line;

    *p_loggedData = *other.p_loggedData;



    p_measureType = other.p_measureType;

    SetCubeSerialNumber(*other.p_serialNumber);

    SetChooserName(*other.p_chooserName);

    SetDateTime(*other.p_dateTime);

    SetType(other.p_measureType);

    //  Call SetIgnored to update the ControlGraphNode.  However, SetIgnored

    //  will return if EditLock is true, so set to false temporarily.

    p_editLock = false;

    SetIgnored(other.p_ignore);

    p_editLock = other.p_editLock;

    p_sample = other.p_sample;

    p_line = other.p_line;

    p_diameter = other.p_diameter;

    p_aprioriSample = other.p_aprioriSample;

    p_aprioriLine = other.p_aprioriLine;

    p_sampleSigma = other.p_sampleSigma;

    p_lineSigma = other.p_lineSigma;

    p_sampleResidual = other.p_sampleResidual;

    p_lineResidual = other.p_lineResidual;

    p_camera = other.p_camera;

    p_focalPlaneMeasuredX = other.p_focalPlaneMeasuredX;

    p_focalPlaneMeasuredY = other.p_focalPlaneMeasuredY;

    p_focalPlaneComputedX = other.p_focalPlaneComputedX;

    p_focalPlaneComputedY = other.p_focalPlaneComputedY;

    SetDiameter(other.p_diameter);

    SetAprioriSample(other.p_aprioriSample);

    SetAprioriLine(other.p_aprioriLine);

    SetSampleSigma(other.p_sampleSigma);

    SetLineSigma(other.p_lineSigma);

    SetResidual(other.p_sampleResidual, other.p_lineResidual);

    SetCamera(other.p_camera);

    SetFocalPlaneMeasured(other.p_focalPlaneMeasuredX, other.p_focalPlaneMeasuredY);

    SetFocalPlaneComputed(other.p_focalPlaneComputedX, other.p_focalPlaneComputedY);

    p_editLock = oldLock;

    SetEditLock(other.p_editLock);



    return *this;

  }

isis/src/control/objs/ControlMeasure/ControlMeasure.h

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ namespace Isis { 
   *                           to allow for communication between the ControlNetVitals class

   *                           and changes made to the Control Network that it is observing.

   *                           Fixes #5435.

   *  @history 2018-06-29 Adam Goins - Modified operator= to use setters when setting values

   *                           so that the proper signals/slots are called. Fixes #5435.

   */

  class ControlMeasure : public QObject {

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

+17 −6
Original line number Diff line number Diff line
@@ -534,8 +534,18 @@ namespace Isis { 
          }

        }



        std::pair<ImageConnection, bool> result = boost::edge(m_vertexMap[imageSerial],

                                                              m_vertexMap[adjacentSerial],

                                                              m_controlGraph);

        QString edgeStrength = "UNKNOWN";

        if (result.second) {

          edgeStrength = toString(m_controlGraph[result.first].strength);

        }



        graphString.append(imageSerial);

        graphString.append(" ----[");

        graphString.append(" ----(");

        graphString.append(edgeStrength);

        graphString.append(") [");

        graphString.append(commonPoints.join(","));

        graphString.append("]---- ");

        graphString.append(adjacentSerial);
@@ -687,8 +697,9 @@ namespace Isis { 


    // Make sure there is a node for every measure in this measure's parent

    for (int i = 0; i < point->GetNumMeasures(); i++) {

      QString sn = point->GetMeasure(i)->GetCubeSerialNumber();

      if (!m_vertexMap.contains(sn)) {

      ControlMeasure *adjacentMeasure = point->GetMeasure(i);

      QString sn = adjacentMeasure->GetCubeSerialNumber();

      if (!adjacentMeasure->IsIgnored() && !m_vertexMap.contains(sn)) {

        QString msg = "Node does not exist for [";

        msg += measure->GetCubeSerialNumber() + "]";

        throw IException(IException::Programmer, msg, _FILEINFO_);
@@ -831,9 +842,9 @@ namespace Isis { 
    // Decrement the edge strength for edges from this node

    // Remove edge if the strength becomes 0.

    for (int i = 0; i < point->GetNumMeasures(); i++) {

      QString sn = point->GetMeasure(i)->GetCubeSerialNumber();

      if (m_vertexMap.contains(sn)) {

        // boost doesn't add separate edges for A -> B and B -> A like the old graph.

      ControlMeasure *adjacentMeasure = point->GetMeasure(i);

      QString sn = adjacentMeasure->GetCubeSerialNumber();

      if (!adjacentMeasure->IsIgnored() && m_vertexMap.contains(sn)) {

        if (QString::compare(serial, sn) !=0) {

          if( removeEdge(serial, sn) ) {

            emit networkModified(GraphModified);