Commit 5508280d authored by John Bonn's avatar John Bonn
Browse files

Updated numbering of merged control networks m00374 

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

isis/src/control/apps/cnetmerge/cnetmerge.cpp

+2 −2
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ ControlNet * mergeNetworks(FileList &filelist, PvlObject &conflictLog, 
    PvlObject cnetLog = createNetworkLog(newNet);



    // Merge the network, add the resulting conflicts to the log

    progress.SetText("Merging file " + QString::number(cnetIndex) 

                                     + " of " + QString::number(filelist.size()-1));

    progress.SetText("Merging file " + QString::number(cnetIndex+1) 

                                     + " of " + QString::number(filelist.size()));

    mergeNetwork(*baseNet, newNet, cnetLog, progress);

    addLog(conflictLog, cnetLog);