Peter M. Groen / openbr

Commit 88cbcc4fb972a797d34ef30241a1089e78b429f7

Authored by Josh Klontz
1 parent 02751c49

now using theme_minimal

Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
sdk/core/plot.cpp
  View file @88cbcc4
@@ -431,7 +431,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show) @@ -431,7 +431,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show)
431 p.file.write(qPrintable(QString("qplot(X, Y, data=DET, geom=\"line\"") + 431 p.file.write(qPrintable(QString("qplot(X, Y, data=DET, geom=\"line\"") +
432 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) + 432 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) +
433 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) + 433 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) +
434 - QString(", xlab=\"False Accept Rate\", ylab=\"False Reject Rate\") + geom_abline(alpha=0.5, colour=\"grey\", linetype=\"dashed\") + theme_bw()") + 434 + QString(", xlab=\"False Accept Rate\", ylab=\"False Reject Rate\") + geom_abline(alpha=0.5, colour=\"grey\", linetype=\"dashed\") + theme_minimal()") +
435 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) + 435 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) +
436 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) + 436 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) +
437 QString(" + scale_x_continuous(trans=\"log10\") + scale_y_continuous(trans=\"log10\")") + 437 QString(" + scale_x_continuous(trans=\"log10\") + scale_y_continuous(trans=\"log10\")") +
@@ -440,7 +440,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show) @@ -440,7 +440,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show)
440 p.file.write(qPrintable(QString("qplot(X, 1-Y, data=DET, geom=\"line\"") + 440 p.file.write(qPrintable(QString("qplot(X, 1-Y, data=DET, geom=\"line\"") +
441 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) + 441 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) +
442 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) + 442 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) +
443 - QString(", xlab=\"False Accept Rate\", ylab=\"True Accept Rate\") + theme_bw()") + 443 + QString(", xlab=\"False Accept Rate\", ylab=\"True Accept Rate\") + theme_minimal()") +
444 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) + 444 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) +
445 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) + 445 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) +
446 QString(" + scale_x_continuous(trans=\"log10\") + scale_y_continuous(labels=percent)") + 446 QString(" + scale_x_continuous(trans=\"log10\") + scale_y_continuous(labels=percent)") +
@@ -449,7 +449,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show) @@ -449,7 +449,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show)
449 p.file.write(qPrintable(QString("qplot(X, data=SD, geom=\"histogram\", fill=Y, position=\"identity\", alpha=I(1/2)") + 449 p.file.write(qPrintable(QString("qplot(X, data=SD, geom=\"histogram\", fill=Y, position=\"identity\", alpha=I(1/2)") +
450 QString(", xlab=\"Score%1\"").arg((p.flip ? p.majorSize : p.minorSize) > 1 ? " / " + (p.flip ? p.majorHeader : p.minorHeader) : QString()) + 450 QString(", xlab=\"Score%1\"").arg((p.flip ? p.majorSize : p.minorSize) > 1 ? " / " + (p.flip ? p.majorHeader : p.minorHeader) : QString()) +
451 QString(", ylab=\"Frequency%1\"").arg((p.flip ? p.minorSize : p.majorSize) > 1 ? " / " + (p.flip ? p.minorHeader : p.majorHeader) : QString()) + 451 QString(", ylab=\"Frequency%1\"").arg((p.flip ? p.minorSize : p.majorSize) > 1 ? " / " + (p.flip ? p.minorHeader : p.majorHeader) : QString()) +
452 - QString(") + scale_fill_manual(\"Ground Truth\", values=c(\"blue\", \"red\")) + theme_bw() + scale_x_continuous(minor_breaks=NULL) + scale_y_continuous(minor_breaks=NULL) + theme(axis.text.y=element_blank(), axis.ticks=element_blank(), axis.text.x=element_text(angle=-90, hjust=0))") + 452 + QString(") + scale_fill_manual(\"Ground Truth\", values=c(\"blue\", \"red\")) + theme_minimal() + scale_x_continuous(minor_breaks=NULL) + scale_y_continuous(minor_breaks=NULL) + theme(axis.text.y=element_blank(), axis.ticks=element_blank(), axis.text.x=element_text(angle=-90, hjust=0))") +
453 (p.majorSize > 1 ? (p.minorSize > 1 ? QString(" + facet_grid(%2 ~ %1, scales=\"free\")").arg((p.flip ? p.majorHeader : p.minorHeader), (p.flip ? p.minorHeader : p.majorHeader)) : QString(" + facet_wrap(~ %1, scales = \"free\")").arg(p.majorHeader)) : QString()) + 453 (p.majorSize > 1 ? (p.minorSize > 1 ? QString(" + facet_grid(%2 ~ %1, scales=\"free\")").arg((p.flip ? p.majorHeader : p.minorHeader), (p.flip ? p.minorHeader : p.majorHeader)) : QString(" + facet_wrap(~ %1, scales = \"free\")").arg(p.majorHeader)) : QString()) +
454 QString(" + theme(aspect.ratio=1)") + 454 QString(" + theme(aspect.ratio=1)") +
455 QString("\nggsave(\"%1\")\n").arg(p.subfile("SD")))); 455 QString("\nggsave(\"%1\")\n").arg(p.subfile("SD"))));
@@ -457,7 +457,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show) @@ -457,7 +457,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show)
457 p.file.write(qPrintable(QString("qplot(X, Y, data=CMC, geom=\"line\", xlab=\"Rank\", ylab=\"Retrieval Rate\"") + 457 p.file.write(qPrintable(QString("qplot(X, Y, data=CMC, geom=\"line\", xlab=\"Rank\", ylab=\"Retrieval Rate\"") +
458 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) + 458 (p.majorSize > 1 ? QString(", colour=factor(%1)").arg(p.majorHeader) : QString()) +
459 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) + 459 (p.minorSize > 1 ? QString(", linetype=factor(%1)").arg(p.minorHeader) : QString()) +
460 - QString(") + theme_bw() + scale_x_continuous(limits = c(1,25), breaks = c(1,5,10,25))") + 460 + QString(") + theme_minimal() + scale_x_continuous(limits = c(1,25), breaks = c(1,5,10,25))") +
461 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) + 461 (p.majorSize > 1 ? getScale("colour", p.majorHeader, p.majorSize) : QString()) +
462 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) + 462 (p.minorSize > 1 ? QString(" + scale_linetype_discrete(\"%1\")").arg(p.minorHeader) : QString()) +
463 QString(" + scale_y_continuous(labels=percent)") + 463 QString(" + scale_y_continuous(labels=percent)") +
@@ -466,7 +466,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show) @@ -466,7 +466,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show)
466 p.file.write(qPrintable(QString("qplot(factor(%1), data=BC, geom=\"bar\", position=\"dodge\", weight=Y").arg(p.majorHeader) + 466 p.file.write(qPrintable(QString("qplot(factor(%1), data=BC, geom=\"bar\", position=\"dodge\", weight=Y").arg(p.majorHeader) +
467 (p.majorSize > 1 ? QString(", fill=factor(%1)").arg(p.majorHeader) : QString()) + 467 (p.majorSize > 1 ? QString(", fill=factor(%1)").arg(p.majorHeader) : QString()) +
468 QString(", xlab=\"%1False Accept Rate\"").arg(p.majorSize > 1 ? p.majorHeader + " / " : QString()) + 468 QString(", xlab=\"%1False Accept Rate\"").arg(p.majorSize > 1 ? p.majorHeader + " / " : QString()) +
469 - QString(", ylab=\"True Accept Rate%1\") + theme_bw()").arg(p.minorSize > 1 ? " / " + p.minorHeader : QString()) + 469 + QString(", ylab=\"True Accept Rate%1\") + theme_minimal()").arg(p.minorSize > 1 ? " / " + p.minorHeader : QString()) +
470 (p.majorSize > 1 ? getScale("fill", p.majorHeader, p.majorSize) : QString()) + 470 (p.majorSize > 1 ? getScale("fill", p.majorHeader, p.majorSize) : QString()) +
471 (p.minorSize > 1 ? QString(" + facet_grid(%2 ~ X)").arg(p.minorHeader) : QString(" + facet_wrap(~ X)")) + 471 (p.minorSize > 1 ? QString(" + facet_grid(%2 ~ X)").arg(p.minorHeader) : QString(" + facet_wrap(~ X)")) +
472 QString(" + theme(legend.position=\"none\", axis.text.x=element_text(angle=-90, hjust=0)) + geom_text(data=BC, aes(label=Y, y=0.05))") + 472 QString(" + theme(legend.position=\"none\", axis.text.x=element_text(angle=-90, hjust=0)) + geom_text(data=BC, aes(label=Y, y=0.05))") +
@@ -474,7 +474,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show) @@ -474,7 +474,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show)
474 474
475 p.file.write(qPrintable(QString("qplot(X, Y, data=FAR, geom=\"line\"") + 475 p.file.write(qPrintable(QString("qplot(X, Y, data=FAR, geom=\"line\"") +
476 ((p.flip ? p.majorSize : p.minorSize) > 1 ? QString(", colour=factor(%1)").arg(p.flip ? p.majorHeader : p.minorHeader) : QString()) + 476 ((p.flip ? p.majorSize : p.minorSize) > 1 ? QString(", colour=factor(%1)").arg(p.flip ? p.majorHeader : p.minorHeader) : QString()) +
477 - QString(", xlab=\"Score%1\", ylab=\"False Accept Rate\") + theme_bw()").arg((p.flip ? p.minorSize : p.majorSize) > 1 ? " / " + (p.flip ? p.minorHeader : p.majorHeader) : QString()) + 477 + QString(", xlab=\"Score%1\", ylab=\"False Accept Rate\") + theme_minimal()").arg((p.flip ? p.minorSize : p.majorSize) > 1 ? " / " + (p.flip ? p.minorHeader : p.majorHeader) : QString()) +
478 ((p.flip ? p.majorSize : p.minorSize) > 1 ? getScale("colour", p.flip ? p.majorHeader : p.minorHeader, p.flip ? p.majorSize : p.minorSize) : QString()) + 478 ((p.flip ? p.majorSize : p.minorSize) > 1 ? getScale("colour", p.flip ? p.majorHeader : p.minorHeader, p.flip ? p.majorSize : p.minorSize) : QString()) +
479 QString(" + scale_y_continuous(trans=\"log10\")") + 479 QString(" + scale_y_continuous(trans=\"log10\")") +
480 ((p.flip ? p.minorSize : p.majorSize) > 1 ? QString(" + facet_wrap(~ %1, scales=\"free_x\")").arg(p.flip ? p.minorHeader : p.majorHeader) : QString()) + 480 ((p.flip ? p.minorSize : p.majorSize) > 1 ? QString(" + facet_wrap(~ %1, scales=\"free_x\")").arg(p.flip ? p.minorHeader : p.majorHeader) : QString()) +
@@ -483,7 +483,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show) @@ -483,7 +483,7 @@ bool br::Plot(const QStringList &files, const QString &destination, bool show)
483 483
484 p.file.write(qPrintable(QString("qplot(X, Y, data=FRR, geom=\"line\"") + 484 p.file.write(qPrintable(QString("qplot(X, Y, data=FRR, geom=\"line\"") +
485 ((p.flip ? p.majorSize : p.minorSize) > 1 ? QString(", colour=factor(%1)").arg(p.flip ? p.majorHeader : p.minorHeader) : QString()) + 485 ((p.flip ? p.majorSize : p.minorSize) > 1 ? QString(", colour=factor(%1)").arg(p.flip ? p.majorHeader : p.minorHeader) : QString()) +
486 - QString(", xlab=\"Score%1\", ylab=\"False Reject Rate\") + theme_bw()").arg((p.flip ? p.minorSize : p.majorSize) > 1 ? " / " + (p.flip ? p.minorHeader : p.majorHeader) : QString()) + 486 + QString(", xlab=\"Score%1\", ylab=\"False Reject Rate\") + theme_minimal()").arg((p.flip ? p.minorSize : p.majorSize) > 1 ? " / " + (p.flip ? p.minorHeader : p.majorHeader) : QString()) +
487 ((p.flip ? p.majorSize : p.minorSize) > 1 ? getScale("colour", p.flip ? p.majorHeader : p.minorHeader, p.flip ? p.majorSize : p.minorSize) : QString()) + 487 ((p.flip ? p.majorSize : p.minorSize) > 1 ? getScale("colour", p.flip ? p.majorHeader : p.minorHeader, p.flip ? p.majorSize : p.minorSize) : QString()) +
488 QString(" + scale_y_continuous(trans=\"log10\")") + 488 QString(" + scale_y_continuous(trans=\"log10\")") +
489 ((p.flip ? p.minorSize : p.majorSize) > 1 ? QString(" + facet_wrap(~ %1, scales=\"free_x\")").arg(p.flip ? p.minorHeader : p.majorHeader) : QString()) + 489 ((p.flip ? p.minorSize : p.majorSize) > 1 ? QString(" + facet_wrap(~ %1, scales=\"free_x\")").arg(p.flip ? p.minorHeader : p.majorHeader) : QString()) +
@@ -499,6 +499,6 @@ bool br::PlotMetadata(const QStringList &files, const QString &columns, bool sho @@ -499,6 +499,6 @@ bool br::PlotMetadata(const QStringList &files, const QString &columns, bool sho
499 499
500 RPlot p(files, "PlotMetadata", false); 500 RPlot p(files, "PlotMetadata", false);
501 foreach (const QString &column, columns.split(";")) 501 foreach (const QString &column, columns.split(";"))
502 - p.file.write(qPrintable(QString("qplot(%1, %2, data=data, geom=\"violin\", fill=%1) + coord_flip() + theme_bw()\nggsave(\"%2.pdf\")\n").arg(p.majorHeader, column))); 502 + p.file.write(qPrintable(QString("qplot(%1, %2, data=data, geom=\"violin\", fill=%1) + coord_flip() + theme_minimal()\nggsave(\"%2.pdf\")\n").arg(p.majorHeader, column)));
503 return p.finalize(show); 503 return p.finalize(show);
504 } 504 }