Skip to content
Snippets Groups Projects
Commit 6124e8e4 authored by Aaron Cuevas Lopez's avatar Aaron Cuevas Lopez
Browse files

Fix some memory leaks

parent 28e7eddd
No related branches found
No related tags found
No related merge requests found
...@@ -2129,7 +2129,7 @@ void PCAjob::computeSVD() ...@@ -2129,7 +2129,7 @@ void PCAjob::computeSVD()
// delete covariances // delete covariances
for (int k = 0; k < dim; k++) for (int k = 0; k < dim; k++)
delete cov[k]; delete[] cov[k];
delete[] cov; delete[] cov;
cov = nullptr; cov = nullptr;
......
...@@ -219,9 +219,6 @@ Electrode::~Electrode() ...@@ -219,9 +219,6 @@ Electrode::~Electrode()
delete[] voltageScale; delete[] voltageScale;
delete[] channels; delete[] channels;
delete[] runningStats; delete[] runningStats;
delete spikeSort;
} }
Electrode::Electrode(int ID, UniqueIDgenerator* uniqueIDgenerator_, PCAcomputingThread* pth, String _name, int _numChannels, int* _channels, float default_threshold, int pre, int post, float samplingRate , int sourceId, int subIdx) Electrode::Electrode(int ID, UniqueIDgenerator* uniqueIDgenerator_, PCAcomputingThread* pth, String _name, int _numChannels, int* _channels, float default_threshold, int pre, int post, float samplingRate , int sourceId, int subIdx)
...@@ -1125,7 +1122,7 @@ void SpikeSorter::addProbes(String probeType,int numProbes, int nElectrodesPerPr ...@@ -1125,7 +1122,7 @@ void SpikeSorter::addProbes(String probeType,int numProbes, int nElectrodesPerPr
increaseUniqueProbeID(probeType); increaseUniqueProbeID(probeType);
} }
} }
Array<Electrode*> SpikeSorter::getElectrodes() const OwnedArray<Electrode>& SpikeSorter::getElectrodes()
{ {
return electrodes; return electrodes;
} }
......
...@@ -173,9 +173,11 @@ public: ...@@ -173,9 +173,11 @@ public:
RunningStat* runningStats; RunningStat* runningStats;
SpikeHistogramPlot* spikePlot; SpikeHistogramPlot* spikePlot;
SpikeSortBoxes* spikeSort;
PCAcomputingThread* computingThread; PCAcomputingThread* computingThread;
UniqueIDgenerator* uniqueIDgenerator; UniqueIDgenerator* uniqueIDgenerator;
ScopedPointer<SpikeSortBoxes> spikeSort;
bool isMonitored; bool isMonitored;
}; };
...@@ -361,7 +363,7 @@ public: ...@@ -361,7 +363,7 @@ public:
void setElectrodeVoltageScale(int electrodeID, int index, float newvalue); void setElectrodeVoltageScale(int electrodeID, int index, float newvalue);
std::vector<int> getElectrodeChannels(int ID); std::vector<int> getElectrodeChannels(int ID);
Array<Electrode*> getElectrodes(); const OwnedArray<Electrode>& getElectrodes();
std::vector<String> electrodeTypes; std::vector<String> electrodeTypes;
...@@ -437,7 +439,7 @@ private: ...@@ -437,7 +439,7 @@ private:
int& currentChannel); int& currentChannel);
Array<Electrode*> electrodes; OwnedArray<Electrode> electrodes;
PCAcomputingThread computingThread; PCAcomputingThread computingThread;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(SpikeSorter); JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(SpikeSorter);
......
...@@ -463,7 +463,7 @@ void SpikeSorterEditor::buttonEvent(Button* button) ...@@ -463,7 +463,7 @@ void SpikeSorterEditor::buttonEvent(Button* button)
SpikeSorter* processor = (SpikeSorter*) getProcessor(); SpikeSorter* processor = (SpikeSorter*) getProcessor();
Array<Electrode*> electrodes = processor->getElectrodes(); const OwnedArray<Electrode>& electrodes = processor->getElectrodes();
for (int i = 0; i < electrodes.size(); i++) for (int i = 0; i < electrodes.size(); i++)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment