X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=heatmapsim.cpp;h=b29e98b68c4af0824d4effbffa753ede522309c7;hb=315e38cf393c82be238da5b32574f225a020d25c;hp=c68d0cc413855650efc86f2370ad7ab82508e6b7;hpb=5b9b3e01150055e3b4bb1a911ea4c61d0b755e89;p=mothur.git diff --git a/heatmapsim.cpp b/heatmapsim.cpp index c68d0cc..b29e98b 100644 --- a/heatmapsim.cpp +++ b/heatmapsim.cpp @@ -20,7 +20,7 @@ #include "sharedbraycurtis.h" //********************************************************************************************************************** -HeatMapSim::HeatMapSim(){ +HeatMapSim::HeatMapSim(string dir) : outputDir(dir) { globaldata = GlobalData::getInstance(); } //********************************************************************************************************************** @@ -32,7 +32,7 @@ void HeatMapSim::getPic(vector lookup, vector //make file for each calculator selected for (int m = 0; m < calcs.size(); m++) { - string filenamesvg = getRootName(globaldata->inputFileName) + lookup[0]->getLabel() + calcs[m]->getName() + ".heatmap.sim.svg"; + string filenamesvg = outputDir + getRootName(getSimpleName(globaldata->inputFileName)) + lookup[0]->getLabel() + calcs[m]->getName() + ".heatmap.sim.svg"; openOutputFile(filenamesvg, outsvg); //svg image @@ -107,7 +107,7 @@ void HeatMapSim::getPic(vector< vector > dists, vector groups) { vector sims; - string filenamesvg = getRootName(globaldata->inputFileName) + "heatmap.sim.svg"; + string filenamesvg = outputDir + getRootName(getSimpleName(globaldata->inputFileName)) + "heatmap.sim.svg"; openOutputFile(filenamesvg, outsvg); //svg image