Commit 0982335a authored by Moses Milazzo's avatar Moses Milazzo
Browse files

Updated filters to include CONSTRAINED and EDITLOCKED. 



git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6015 41f8697f-d340-4b68-9986-7bafba869bb8
parent aae4b215

isis/src/control/apps/cnetextract/cnetextract.cpp

+18 −3
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ void IsisMain() { 
  bool noSingleMeasure   = ui.GetBoolean("NOSINGLEMEASURES");

  bool reference         = ui.GetBoolean("REFERENCE");

  bool fixed             = ui.GetBoolean("FIXED");

  bool constrained       = ui.GetBoolean("CONSTRAINED");

  bool editLocked        = ui.GetBoolean("EDITLOCKED");

  bool noTolerancePoints = ui.GetBoolean("TOLERANCE");

  bool pointsEntered     = ui.WasEntered("POINTLIST");

  bool cubePoints        = ui.GetBoolean("CUBES");
@@ -67,10 +69,10 @@ void IsisMain() { 
  bool retainReference   = ui.GetBoolean("RETAIN_REFERENCE");

  bool latLon            = ui.GetBoolean("LATLON");



  if(!(noIgnore || noMeasureless || noSingleMeasure || reference || fixed ||

       noTolerancePoints || pointsEntered || cubePoints || latLon)) {

  if(!(noIgnore || noMeasureless || noSingleMeasure || editLocked || reference || fixed ||

       noTolerancePoints || pointsEntered || cubePoints || constrained || latLon)) {

    QString msg = "At least one filter must be selected [";

    msg += "NOIGNORE,NOMEASURELESS,NOSINGLEMEASURE,REFERENCE,FIXED,TOLERANCE,";

    msg += "NOIGNORE,NOMEASURELESS,NOSINGLEMEASURE,REFERENCE,FIXED,CONSTRAINED,EDITLOCKED,TOLERANCE,";

    msg += "POINTLIST,CUBES,LATLON]";

    throw IException(IException::User, msg, _FILEINFO_);

  }
@@ -112,6 +114,8 @@ void IsisMain() { 
  QVector<QString> tolerancePoints;

  QVector<QString> nonReferenceMeasures;

  QVector<QString> nonFixedPoints;

  QVector<QString> nonConstrainedPoints;

  QVector<QString> nonEditLockedPoints;

  QVector<QString> nonCubePoints;

  QVector<QString> noCubeMeasures;

// This is commented out since this does not correspond to any filters or the
@@ -161,6 +165,12 @@ void IsisMain() { 
      omit(outNet, cp);

      continue;

    }

    if(constrained && !(controlpt->GetType() == ControlPoint::Constrained)) {

      nonConstrainedPoints.append(controlpt->GetId());

      omit(outNet, cp);

      continue;

    }





    if(noSingleMeasure) {

      bool invalidPoint = false;
@@ -173,6 +183,11 @@ void IsisMain() { 
        continue;

      }

    }

    if (editLocked && !(controlpt->IsEditLocked())){

      nonEditLockedPoints.append(controlpt->GetId());

      omit(outNet, cp);

      continue;

    }



    // Change the current point into a new point by manipulation of its control measures

    ControlPoint *newPoint = outNet.GetPoint(cp);

isis/src/control/apps/cnetextract/cnetextract.xml

+53 −0
Original line number Diff line number Diff line
@@ -106,6 +106,16 @@ 
          <td align="center"><code>FIXED</code></td>

          <td align="left"><code>These points are not fixed.</code></td>

        </tr>

        <tr>

          <td align="center"><code>[PREFIX]NonConstrainedPoints.txt</code></td>

          <td align="center"><code>CONSTRAINED</code></td>

          <td align="left"><code>These points are not constrained.</code></td>

        </tr>

        <tr>

          <td align="center"><code>[PREFIX]NonEditLockedPoints.txt</code></td>

          <td align="center"><code>EDITLOCKED</code></td>

          <td align="left"><code>These points are not editlocked.</code></td>

        </tr>

        <tr>

          <td align="center"><code>[PREFIX]TolerancePoints.txt</code></td>

          <td align="center"><code>TOLERANCE</code></td>
@@ -258,6 +268,9 @@ 
    <change name="Debbie A. Cook" date="2012-11-30">

      Changed to use TProjection instead of Projection.  References #775.

    </change>

    <change name="Moses P. Milazzo" date="2014-11-13">

      Added EditLocked and Constrained filters. References #255.

    </change>

  </history>



  <category>
@@ -507,6 +520,46 @@ 
        </description>

      </parameter>



      <parameter name="CONSTRAINED">

        <type>boolean</type>

        <default><item>False</item></default>

        <brief>

          Only extract constrained Control Points

        </brief>

        <description>

          <p>

            When selected, only constrained Control Points will be extracted into the

            output Control Network file.

          </p>



          <p>

            When option PREFIX is used, report file [PREFIX]NonConstrainedPoints.txt will also be

            created. Each Control Point it lists was not

            extracted due to this filter.

          </p>

        </description>

      </parameter>



      <parameter name="EDITLOCKED">

        <type>boolean</type>

        <default><item>False</item></default>

        <brief>

          Only extract editlocked Control Points

        </brief>

        <description>

          <p>

            When selected, only editlocked Control Points will be extracted into the

            output Control Network file.

          </p>



          <p>

            When option PREFIX is used, report file [PREFIX]NonEditLockedPoints.txt will also be

            created. Each Control Point it lists was not

            extracted due to this filter.

          </p>

        </description>

      </parameter>



      <parameter name="TOLERANCE">

        <type>boolean</type>

        <default><item>False</item></default>