From fd8a4714d6fdfac4fb06a829616e7ac756d4e762 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Wed, 17 Dec 2014 20:46:27 +0000 Subject: [PATCH] CLucene is optional ! .. oops --- src/HistogramWindow.cpp | 2 ++ src/PowerHist.cpp | 2 ++ src/RideSummaryWindow.cpp | 3 ++- src/TreeMapWindow.cpp | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/HistogramWindow.cpp b/src/HistogramWindow.cpp index ed37c8d83..b4fcf0f7b 100644 --- a/src/HistogramWindow.cpp +++ b/src/HistogramWindow.cpp @@ -998,9 +998,11 @@ HistogramWindow::updateChart() } FilterSet fs; +#ifdef GC_HAVE_LUCENE fs.addFilter(isfiltered, files); fs.addFilter(context->isfiltered, context->filters); fs.addFilter(context->ishomefiltered, context->homeFilters); +#endif // setData using the summary metrics -- always reset since filters may // have changed, or perhaps the bin width... diff --git a/src/PowerHist.cpp b/src/PowerHist.cpp index e1d98a3a8..44d8f4660 100644 --- a/src/PowerHist.cpp +++ b/src/PowerHist.cpp @@ -1563,8 +1563,10 @@ PowerHist::setDataFromCompare(QString totalMetric, QString distMetric) // set the specification FilterSet fs; +#ifdef GC_HAVE_LUCENE fs.addFilter(context->isfiltered, context->filters); fs.addFilter(context->ishomefiltered, context->homeFilters); +#endif Specification spec; spec.setDateRange(DateRange(cd.start,cd.end)); spec.setFilterSet(fs); diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp index 94213f109..c1a6c8832 100644 --- a/src/RideSummaryWindow.cpp +++ b/src/RideSummaryWindow.cpp @@ -337,10 +337,11 @@ RideSummaryWindow::refresh() } FilterSet fs; +#ifdef GC_HAVE_LUCENE fs.addFilter(filtered, filters); fs.addFilter(context->isfiltered, context->filters); fs.addFilter(context->ishomefiltered, context->homeFilters); - +#endif specification.setFilterSet(fs); } rideSummary->page()->mainFrame()->setHtml(htmlSummary()); diff --git a/src/TreeMapWindow.cpp b/src/TreeMapWindow.cpp index cb06ab4a1..de7cd112c 100644 --- a/src/TreeMapWindow.cpp +++ b/src/TreeMapWindow.cpp @@ -235,8 +235,10 @@ TreeMapWindow::refresh() // set the specification FilterSet fs; +#ifdef GC_HAVE_LUCENE fs.addFilter(context->isfiltered, context->filters); fs.addFilter(context->ishomefiltered, context->homeFilters); +#endif settings.specification.setFilterSet(fs); settings.specification.setDateRange(dr);