Refs #6315. Adding in Windows setup fix from Owen.

Merge branch 'feature/6936_pv_mantidplot_dialog' into feature/6315_build_pv_398 Conflicts: Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.cpp Code/Mantid/MantidPlot/src/Mantid/SetUpParaview.ui
mantidproject · Apr 26, 2013 · e25a844 · e25a844
2 parents 9e24c06 + 4d18de8
commit e25a844
Show file tree

Hide file tree

Showing 21 changed files with 871 additions and 409 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h b/Code/Mantid/Framework/API/inc/MantidAPI/ScriptRepository.h
@@ -471,10 +471,7 @@ They will work as was expected for folders @ref folders-sec.
               it it necessary that it identifies who was responsible for changing 
               the file. 
 
-       @param description is an optional argument, because, as 
-              explained at @ref script-description-sec it may be already inside the 
-              file. But, if the description is given, it will be inserted to the local
-              file (if it is a script) or to the README file inside the folder.
+       @param email An string that identifies the email of the author. 
      
 
       @exception ScriptRepoException may be triggered for an attempt to publish an 
@@ -486,7 +483,7 @@ They will work as was expected for folders @ref folders-sec.
      */
     virtual void upload(const std::string & file_path, const std::string & comment,
                 const std::string & author, 
-                const std::string & description = std::string())  = 0;
+                const std::string & email)  = 0;
 
     /** Define the file patterns that will not be listed in listFiles. 
         This is important to force the ScriptRepository to not list hidden files, 

diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/GenerateEventsFilter.h
@@ -61,7 +61,7 @@ namespace Algorithms
   class DLLExport GenerateEventsFilter : public API::Algorithm
   {
   public:
-    GenerateEventsFilter();
+    explicit GenerateEventsFilter();
     virtual ~GenerateEventsFilter();
 
     /// Algorithm's name for identification overriding a virtual method
@@ -83,34 +83,51 @@ namespace Algorithms
     void setFilterByTimeOnly();
     void setFilterByLogValue(std::string logname);
 
-    void processSingleValueFilter(Kernel::TimeSeriesProperty<double>* mlog, double minvalue, double maxvalue,
+    void processSingleValueFilter(double minvalue, double maxvalue,
         bool filterincrease, bool filterdecrease);
 
-    void processMultipleValueFilters(Kernel::TimeSeriesProperty<double>* mlog, double minvalue, double maxvalue,
+    void processMultipleValueFilters(double minvalue, double maxvalue,
         bool filterincrease, bool filterdecrease);
 
-    void makeFilterByValue(Kernel::TimeSeriesProperty<double>* mlog,
-        Kernel::TimeSplitterType& split, double min, double max, double TimeTolerance, bool centre,
+    void makeFilterByValue(Kernel::TimeSplitterType& split, double min, double max, double TimeTolerance, bool centre,
         bool filterIncrease, bool filterDecrease, Kernel::DateAndTime startTime, Kernel::DateAndTime stopTime,
         int wsindex);
 
-    void makeMultipleFiltersByValues(Kernel::TimeSeriesProperty<double>* mlog,
-        Kernel::TimeSplitterType& split, std::map<size_t, int> indexwsindexmap, std::vector<double> logvalueranges,
+    void makeMultipleFiltersByValues(Kernel::TimeSplitterType& split, std::map<size_t, int> indexwsindexmap, std::vector<double> logvalueranges,
         bool centre, bool filterIncrease, bool filterDecrease, Kernel::DateAndTime startTime, Kernel::DateAndTime stopTime);
 
+    void processIntegerValueFilter(Kernel::TimeSplitterType &splitters, int minvalue, int maxvalue,
+                                   bool filterIncrease, bool filterDecrease, Kernel::DateAndTime runend);
+
     size_t searchValue(std::vector<double> sorteddata, double value);
 
-    DataObjects::EventWorkspace_const_sptr mEventWS;
-    API::ISplittersWorkspace_sptr mSplitters;
-    API::ITableWorkspace_sptr mFilterInfoWS;
+    DataObjects::EventWorkspace_const_sptr m_dataWS;
+    API::ISplittersWorkspace_sptr m_splitWS;
+    API::ITableWorkspace_sptr m_filterInfoWS;
 
     Kernel::DateAndTime mStartTime;
     Kernel::DateAndTime mStopTime;
 
-    double m_convertfactor;
+    double m_timeUnitConvertFactor;
+
+    Kernel::TimeSeriesProperty<double>* m_dblLog;
+    Kernel::TimeSeriesProperty<int>* m_intLog;
+
+    bool m_logAtCentre;
+    double m_logTimeTolerance;
 
   };
 
+  /** Generate a new time splitter and add to a list of splitters
+    */
+  void make_splitter(Kernel::DateAndTime start, Kernel::DateAndTime stop, int group, Kernel::time_duration tolerance,
+                     Kernel::TimeSplitterType& splitters)
+  {
+    Kernel::SplittingInterval newsplit(start - tolerance, stop - tolerance, group);
+    splitters.push_back(newsplit);
+
+    return;
+  }
 
 } // namespace Algorithms
 } // namespace Mantid