Skip to content

Commit

Permalink
Add custom as a colour option for command line usages
Browse files Browse the repository at this point in the history
  • Loading branch information
rrwick committed Mar 11, 2021
1 parent c4af3e9 commit c4606db
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions command_line/commoncommandlinefunctions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void getSettingsUsage(QStringList * text)
*text << "";
*text << "Node colours";
*text << dashes;
*text << "--colour <scheme> Node colouring scheme, from one of the following options: random, uniform, depth, blastsolid, blastrainbow (default: random if --query option not used, blastsolid if --query option used)";
*text << "--colour <scheme> Node colouring scheme, from one of the following options: random, uniform, depth, blastsolid, blastrainbow, custom (default: random if --query option not used, blastsolid if --query option used)";
*text << "";
*text << "Random colour scheme";
*text << dashes;
Expand Down Expand Up @@ -268,7 +268,7 @@ QString checkForInvalidOrExcessSettings(QStringList * arguments)
checkOptionWithoutValue("--noaa", arguments);
checkOptionWithoutValue("--singlearr", arguments);
QStringList validColourOptions;
validColourOptions << "random" << "uniform" << "depth" << "blastsolid" << "blastrainbow";
validColourOptions << "random" << "uniform" << "depth" << "blastsolid" << "blastrainbow" << "custom";
error = checkOptionForString("--colour", arguments, validColourOptions); if (error.length() > 0) return error;
error = checkOptionForInt("--ransatpos", arguments, g_settings->randomColourPositiveSaturation, false); if (error.length() > 0) return error;
error = checkOptionForInt("--ransatneg", arguments, g_settings->randomColourNegativeSaturation, false); if (error.length() > 0) return error;
Expand Down Expand Up @@ -1048,6 +1048,8 @@ NodeColourScheme getColourSchemeOption(QString option, QStringList * arguments)
return BLAST_HITS_SOLID_COLOUR;
else if (colourString == "blastrainbow")
return BLAST_HITS_RAINBOW_COLOUR;
else if (colourString == "custom")
return CUSTOM_COLOURS;

//Random colours is the default
return defaultScheme;
Expand Down

0 comments on commit c4606db

Please sign in to comment.