Commit 2249b0fb authored by amystamile-usgs's avatar amystamile-usgs
Browse files

more rebase fixes

parent 6d945319

isis/src/base/objs/LabelTranslationManager/unitTest.cpp

+9 −9
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int main(void) { 
  Preference::Preferences(true);

  stringstream trnsStrm;

  trnsStrm << "Group = NumberOfLines" << endl;

  trnsStrm << "  Auto" << endl;

  trnsStrm << "  Auto = 1" << endl;

  trnsStrm << "  OutputName = Lines" << endl;

  trnsStrm << "  OutputPosition = (\"Object\",\"IsisCube\",";

  trnsStrm <<                      "\"Group\",\"Dimensions\")" << endl;
@@ -57,8 +57,8 @@ int main(void) { 
  trnsStrm << "  Translation = (*,*)" << endl;

  trnsStrm << "EndGroup" << endl;

  trnsStrm << "Group = NumberOfBands" << endl;

  trnsStrm << "  Auto" << endl;

  trnsStrm << "  Optional" << endl;

  trnsStrm << "  Auto = 1" << endl;

  trnsStrm << "  Optional = 1" << endl;

  trnsStrm << "  OutputName = Bands" << endl;

  trnsStrm << "  OutputPosition = (\"Object\",\"IsisCube\",";

  trnsStrm <<                      "\"Group\",\"Dimensions\")" << endl;
@@ -68,14 +68,14 @@ int main(void) { 
  trnsStrm << "  Translation = (*,*)" << endl;

  trnsStrm << "EndGroup" << endl;

  trnsStrm << "Group = Bonus" << endl;

  trnsStrm << "  Auto" << endl;

  trnsStrm << "  Optional" << endl;

  trnsStrm << "  Auto = 1" << endl;

  trnsStrm << "  Optional = 1" << endl;

  trnsStrm << "  InputPosition = (Image,Pixel)" << endl;

  trnsStrm << "  InputKey = Bonus" << endl;

  trnsStrm << "  Translation = (*,*)" << endl;

  trnsStrm << "EndGroup" << endl;

  trnsStrm << "Group = Extra" << endl;

  trnsStrm << "  Optional" << endl;

  trnsStrm << "  Optional = 1" << endl;

  trnsStrm << "  InputPosition = (Image,Bogus)" << endl;

  trnsStrm << "  InputKey = Extra" << endl;

  trnsStrm << "  Translation = (*,*)" << endl;
@@ -87,7 +87,7 @@ int main(void) { 
  trnsStrm << "  Translation = (*,*)" << endl;

  trnsStrm << "EndGroup" << endl;

  trnsStrm << "Group = BandName" << endl;

  trnsStrm << "  Auto" << endl;

  trnsStrm << "  Auto = 1" << endl;

  trnsStrm << "  OutputName = Band" << endl;

  trnsStrm << "  OutputPosition = (\"Object\",\"IsisCube\",";

  trnsStrm <<                      "\"Object\",\"BandBin\")" << endl;
@@ -96,7 +96,7 @@ int main(void) { 
  trnsStrm << "  Translation = (*,*)" << endl;

  trnsStrm << "EndGroup" << endl;

  trnsStrm << "Group = CenterLongitude" << endl;

  trnsStrm << "  Auto" << endl;

  trnsStrm << "  Auto = 1" << endl;

  trnsStrm << "  OutputPosition = (\"Group\",\"Mapping\")" << endl;

  trnsStrm << "  OutputName = CenterLongitude" << endl;

  trnsStrm << "  InputPosition = IMAGE_MAP_PROJECTION" << endl;

isis/src/base/objs/PvlToPvlTranslationManager/unitTest.cpp

+11 −11
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int main(void) { 
    trnsStrm << "  Translation = (*,*)" << endl;

    trnsStrm << "EndGroup" << endl;

    trnsStrm << "Group = NumberOfLines" << endl;

    trnsStrm << "  Auto" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  OutputName = Lines" << endl;

    trnsStrm << "  OutputPosition = (\"Object\",\"IsisCube\",";

    trnsStrm <<                      "\"Group\",\"Dimensions\")" << endl;
@@ -70,8 +70,8 @@ int main(void) { 
    trnsStrm << "  Translation = (*,*)" << endl;

    trnsStrm << "EndGroup" << endl;

    trnsStrm << "Group = NumberOfBands" << endl;

    trnsStrm << "  Auto" << endl;

    trnsStrm << "  Optional" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  Optional = 1" << endl;

    trnsStrm << "  OutputName = Bands" << endl;

    trnsStrm << "  OutputPosition = (\"Object\",\"IsisCube\",";

    trnsStrm <<                      "\"Group\",\"Dimensions\")" << endl;
@@ -81,21 +81,21 @@ int main(void) { 
    trnsStrm << "  Translation = (*,*)" << endl;

    trnsStrm << "EndGroup" << endl;

    trnsStrm << "Group = Bonus" << endl;

    trnsStrm << "  Auto" << endl;

    trnsStrm << "  Optional" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  Optional = 1" << endl;

    trnsStrm << "  InputPosition = (Image,Pixel)" << endl;

    trnsStrm << "  InputKey = Bonus" << endl;

    trnsStrm << "  Translation = (*,*)" << endl;

    trnsStrm << "EndGroup" << endl;

    trnsStrm << "Group = Extra" << endl;

    trnsStrm << "  Auto" << endl;

    trnsStrm << "  Optional" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  Optional = 1" << endl;

    trnsStrm << "  InputPosition = (Image,Bogus)" << endl;

    trnsStrm << "  InputKey = Extra" << endl;

    trnsStrm << "  Translation = (*,*)" << endl;

    trnsStrm << "EndGroup" << endl;

    trnsStrm << "Group = BytesPerPixel" << endl;

    trnsStrm << "  Auto" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  InputPosition = Size" << endl;

    trnsStrm << "  InputPosition = (Image,Size)" << endl;

    trnsStrm << "  InputPosition = (Image,Pixel)" << endl;
@@ -123,7 +123,7 @@ int main(void) { 
    trnsStrm << "  Translation = (False,No)" << endl;

    trnsStrm << "EndGroup" << endl;

    trnsStrm << "Group = BandName" << endl;

    trnsStrm << "  Auto" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  OutputName = Band" << endl;

    trnsStrm << "  OutputPosition = (\"Object\",\"IsisCube\",";

    trnsStrm <<                      "\"Object\",\"BandBin\")" << endl;
@@ -147,7 +147,7 @@ int main(void) { 
    trnsStrm << "EndGroup" << endl;



    trnsStrm << "Group = CenterLongitude" << endl;

    trnsStrm << "  Auto" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  OutputPosition = (\"Group\",\"Mapping\")" << endl;

    trnsStrm << "  OutputName = CenterLongitude" << endl;

    trnsStrm << "  InputPosition = IMAGE_MAP_PROJECTION" << endl;

isis/src/base/objs/PvlToXmlTranslationManager/unitTest.cpp

+7 −7
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int main(void) { 
    ofstream trnsStrm;

    trnsStrm.open ("temp.trn");

    trnsStrm << "Group = Samples" << endl;

    trnsStrm << " Auto" << endl;

    trnsStrm << " Auto = 1" << endl;

    trnsStrm << " InputKey        = Samples" <<endl;

    trnsStrm << " InputPosition   = (IsisCube, Core, Dimensions)" <<endl;

    trnsStrm << " OutputName      = elements" <<endl;
@@ -70,7 +70,7 @@ int main(void) { 
    trnsStrm << "EndGroup" << endl;



    trnsStrm << "Group = Lines" << endl;

    trnsStrm << " Auto" << endl;

    trnsStrm << " Auto = 1" << endl;

    trnsStrm << " InputKey        = Lines" <<endl;

    trnsStrm << " InputPosition   = (IsisCube, Core, Dimensions)" <<endl;

    trnsStrm << " OutputName      = elements" <<endl;
@@ -81,7 +81,7 @@ int main(void) { 
    trnsStrm << "EndGroup" << endl;



    trnsStrm << "Group = ExposureDuration" << endl;

    trnsStrm << " Auto" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  InputKey = ExposureDuration" << endl;

    trnsStrm << "  InputPosition = (IsisCube, Instrument)" << endl;

    trnsStrm << "  OutputName = att@Exposure_Time" << endl;
@@ -90,7 +90,7 @@ int main(void) { 
    trnsStrm << "EndGroup" << endl;



    trnsStrm << "Group = AttributeOutput" << endl;

    trnsStrm << " Auto" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  InputKey = Filter" << endl;

    trnsStrm << "  InputPosition = (IsisCube, Instrument)" << endl;

    trnsStrm << "  OutputName = Filter" << endl;
@@ -100,7 +100,7 @@ int main(void) { 
    trnsStrm << "EndGroup" << endl;



    trnsStrm << "Group = DefaultOutput" << endl;

    trnsStrm << " Auto" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  InputKey = NotInLabel" << endl;

    trnsStrm << "  InputPosition = (IsisCube, Instrument)" << endl;

    trnsStrm << "  OutputName = NotInLabel" << endl;
@@ -111,7 +111,7 @@ int main(void) { 
    trnsStrm << "End" << endl;



    trnsStrm << "Group = BadInputGroup" << endl;

    trnsStrm << " Auto" << endl;

    trnsStrm << "  Auto = 1" << endl;

    trnsStrm << "  InputKey = NotInLabel" << endl;

    trnsStrm << "  InputPosition = (IsisCube, NotAGroup)" << endl;

    trnsStrm << "  OutputName = BadInputGroup" << endl;

isis/src/base/objs/PvlTranslationTable/unitTest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ int main(void) { 
    in << "  Translation = (*,*)" << endl;

    in << "EndGroup" << endl;

    in << "Group = CoreBitsPerPixel" << endl;

    in << "  Auto" << endl;

    in << "  Auto = 1" << endl;

    in << "  OutputName = BitsPerPixel" << endl;

    in << "  OutputPosition = (\"Object\",\"IsisCube\", \"Object\",\"Core\",";

    in <<                      "\"Group\",\"Pixels\")" << endl;
@@ -182,8 +182,8 @@ int main(void) { 
          in2 << "  Translation = (*,*)" << endl;

          in2 << "EndGroup" << endl;

          in2 << "Group = CoreBitsPerPixel" << endl;

          in2 << "  Auto" << endl;

          in2 << "  Optional" << endl;

          in2 << "  Auto = 1" << endl;

          in2 << "  Optional = 1" << endl;

          in2 << "  OutputName = BitsPerPixel" << endl;

          in2 << "  OutputPosition = (\"Object\",\"IsisCube\", \"Object\",\"Core\",";

          in2 <<                      "\"Group\",\"Pixels\")" << endl;