Commit fa9b350c authored by MONSEIGNE Thibaut's avatar MONSEIGNE Thibaut

Fix: Coding Rules Avoïd some warning

parent ad867e14
......@@ -41,10 +41,10 @@ bool parse_arguments(int argc, char** argv, SConfiguration& rConfiguration)
for (auto it = l_vArgValue.begin(); it != l_vArgValue.end(); ++it)
{
if (*it.empty()) { }
if (*it == "") {}
else if (*it == "-c" || *it == "--config")
{
if (*++it.empty())
if (*++it == "")
{
std::cout << "Error: Switch --config needs an argument\n";
return false;
......@@ -53,7 +53,7 @@ bool parse_arguments(int argc, char** argv, SConfiguration& rConfiguration)
}
else if (*it == "-d" || *it == "--define")
{
if (*++it.empty())
if (*++it == "")
{
std::cout << "Error: Need two arguments after -d / --define.\n";
return false;
......@@ -62,7 +62,7 @@ bool parse_arguments(int argc, char** argv, SConfiguration& rConfiguration)
// Were not using = as a separator for token/value, as on Windows its a problem passing = to the cmd interpreter
// which is used to launch the actual designer exe.
const std::string& l_rToken = *it;
if (*++it.empty())
if (*++it == "")
{
std::cout << "Error: Need two arguments after -d / --define.\n";
return false;
......@@ -74,7 +74,7 @@ bool parse_arguments(int argc, char** argv, SConfiguration& rConfiguration)
}
else if (*it == "-k" || *it == "--kernel")
{
if (*++it.empty())
if (*++it == "")
{
std::cout << "Error: Switch --kernel needs an argument\n";
return false;
......
......@@ -78,10 +78,10 @@ namespace OpenViBETracker
return true;
}
virtual bool initialize() override;
bool initialize() override;
// Process the whole stream from source to target
virtual bool spool(bool verbose) override;
bool spool(bool verbose) override;
protected:
......@@ -117,10 +117,10 @@ namespace OpenViBETracker
return true;
}
virtual bool initialize() override;
bool initialize() override;
// Process the whole bundle from source to target
virtual bool spool(bool verbose) override;
bool spool(bool verbose) override;
protected:
......
......@@ -26,7 +26,7 @@ namespace OpenViBETracker
setSource(&source);
}
virtual bool initialize() override
bool initialize() override
{
// @fixme these should actually come from the box description
......
......@@ -89,7 +89,7 @@ namespace OpenViBE
const uint64_t ui64StartTime,
const uint64_t ui64EndTime) override { return true; }
virtual CIdentifier getClassIdentifier() const override { return 0; };
CIdentifier getClassIdentifier() const override { return 0; };
CMemoryBuffer m_InBuffer;
CMemoryBuffer m_OutBuffer;
......
......@@ -98,40 +98,40 @@ namespace OpenViBETracker
g_idle_add(fun, ptr);
}
virtual void log(const OpenViBE::time64 time64Value) override { logWrapper(time64Value); };
void log(const OpenViBE::time64 time64Value) override { logWrapper(time64Value); };
virtual void log(const uint64_t ui64Value) override { logWrapper(ui64Value); };
virtual void log(const uint32_t ui32Value) override { logWrapper(ui32Value); };
virtual void log(const uint16_t ui16Value) override { logWrapper(ui16Value); };
virtual void log(const uint8_t ui8Value) override { logWrapper(ui8Value); };
void log(const uint64_t ui64Value) override { logWrapper(ui64Value); };
void log(const uint32_t ui32Value) override { logWrapper(ui32Value); };
void log(const uint16_t ui16Value) override { logWrapper(ui16Value); };
void log(const uint8_t ui8Value) override { logWrapper(ui8Value); };
virtual void log(const int64_t i64Value) override { logWrapper(i64Value); };
virtual void log(const int32_t i32Value) override { logWrapper(i32Value); };
virtual void log(const int16_t i16Value) override { logWrapper(i16Value); };
virtual void log(const int8_t i8Value) override { logWrapper(i8Value); };
void log(const int64_t i64Value) override { logWrapper(i64Value); };
void log(const int32_t i32Value) override { logWrapper(i32Value); };
void log(const int16_t i16Value) override { logWrapper(i16Value); };
void log(const int8_t i8Value) override { logWrapper(i8Value); };
virtual void log(const double f64Value) override { logWrapper(f64Value); };
virtual void log(const float f32Value) override { logWrapper(f32Value); };
void log(const double f64Value) override { logWrapper(f64Value); };
void log(const float f32Value) override { logWrapper(f32Value); };
virtual void log(const bool bValue) override { logWrapper(bValue); };
void log(const bool bValue) override { logWrapper(bValue); };
virtual void log(const OpenViBE::Kernel::ELogLevel eLogLevel) override { logWrapper(eLogLevel); };
virtual void log(const OpenViBE::Kernel::ELogColor eLogColor) override { logWrapper(eLogColor); };
void log(const OpenViBE::Kernel::ELogLevel eLogLevel) override { logWrapper(eLogLevel); };
void log(const OpenViBE::Kernel::ELogColor eLogColor) override { logWrapper(eLogColor); };
// With these calls we need to make copies, as by the time the actual calls are run in gtk_idle, the originals may be gone
virtual void log(const OpenViBE::CIdentifier& rValue) override
void log(const OpenViBE::CIdentifier& rValue) override
{
OpenViBE::CIdentifier nonRef = rValue;
logWrapper(nonRef);
};
virtual void log(const OpenViBE::CString& rValue) override
void log(const OpenViBE::CString& rValue) override
{
OpenViBE::CString nonRef = rValue;
logWrapper(nonRef);
};
virtual void log(const char* pValue) override
void log(const char* pValue) override
{
// This one is tricksy, we cannot simply use CString as we'd lose color, but with char* we need to free the memory. Use a specialization.
#if defined(TARGET_OS_Windows)
......
......@@ -45,7 +45,7 @@ namespace OpenViBETracker
public:
Decoder(const OpenViBE::Kernel::IKernelContext& ctx, Stream<T>& stream) : m_Stream(stream), m_Decoder(ctx) { };
virtual bool decode(const EncodedChunk& chk) override
bool decode(const EncodedChunk& chk) override
{
m_Decoder.decode(chk);
if (m_Decoder.isHeaderReceived())
......
......@@ -27,28 +27,28 @@ namespace OpenViBETracker
ProcExternalProcessing(const OpenViBE::Kernel::IKernelContext& KernelContext) : Processor(KernelContext) {};
ProcExternalProcessing(const OpenViBE::Kernel::IKernelContext& KernelContext, const ProcExternalProcessing& other);
virtual bool initialize(const std::string& xmlFile) override;
virtual bool uninitialize() override;
bool initialize(const std::string& xmlFile) override;
bool uninitialize() override;
// Set targets for push and pull
virtual bool setNewSource(StreamBundle* source, bool sendHeader, bool sendEnd) override;
virtual bool setNewTarget(StreamBundle* target) override;
bool setNewSource(StreamBundle* source, bool sendHeader, bool sendEnd) override;
bool setNewTarget(StreamBundle* target) override;
virtual bool play(bool playFast, std::function<bool(ovtime_t)> quitCallback) override { return play(playFast, quitCallback, nullptr); };
bool play(bool playFast, std::function<bool(ovtime_t)> quitCallback) override { return play(playFast, quitCallback, nullptr); };
// @param nextTrackFun Callback to request more data (used for catenate mode)
virtual bool play(bool playFast, std::function<bool(ovtime_t)> quitCallback, std::function<bool()> nextTrackFun);
// virtual bool play(bool playFast) override;
virtual bool stop() override;
// bool play(bool playFast) override;
bool stop() override;
virtual bool setProcessorPorts(uint32_t sendPort, uint32_t recvPort) override
bool setProcessorPorts(uint32_t sendPort, uint32_t recvPort) override
{
m_SendPort = sendPort;
m_RecvPort = recvPort;
return true;
}
virtual bool getProcessorPorts(uint32_t& sendPort, uint32_t& recvPort) const override
bool getProcessorPorts(uint32_t& sendPort, uint32_t& recvPort) const override
{
sendPort = m_SendPort;
recvPort = m_RecvPort;
......@@ -74,7 +74,7 @@ namespace OpenViBETracker
virtual bool canPull() const { return m_DoReceive; };
virtual bool canPush() const { return m_DoSend; };
virtual ovtime_t getCurrentTime() const override;
ovtime_t getCurrentTime() const override;
virtual bool isSynced() const
{
......@@ -82,11 +82,11 @@ namespace OpenViBETracker
(m_DoReceive ? (m_pullStartTime != BufferedClient::CLIENT_NOT_STARTED) : true);
}
virtual bool isRunning() const override { return m_IsRunning; }
bool isRunning() const override { return m_IsRunning; }
// Serialize state to configuration manager
virtual bool save() override;
virtual bool load() override;
bool save() override;
bool load() override;
protected:
bool connectClient(Communication::MessagingClient& client, uint32_t port);
......
......@@ -90,7 +90,7 @@ namespace OpenViBETracker
protected:
// implements push
virtual bool step() override;
bool step() override;
// Under the base class' mutex
bool m_bPleaseFlush = false;
......@@ -116,7 +116,7 @@ namespace OpenViBETracker
protected:
// implements pull
virtual bool step() override;
bool step() override;
// Keep polling the sender for chunks as long as there is one available
virtual bool popMessagesToBuffer();
......
......@@ -66,7 +66,7 @@ namespace OpenViBETracker
clear();
};
virtual OpenViBE::CIdentifier getTypeIdentifier() const override { return T::getTypeIdentifier(); };
OpenViBE::CIdentifier getTypeIdentifier() const override { return T::getTypeIdentifier(); };
// Note: There is no corresponding setters, use the non-const versions to modify the header
virtual const typename T::Header& getHeader() const { return m_Header; };
......@@ -110,7 +110,7 @@ namespace OpenViBETracker
return true;
}
virtual size_t getChunkCount() const override { return m_Chunks.size(); };
size_t getChunkCount() const override { return m_Chunks.size(); };
virtual bool getChunk(size_t idx, typename T::Buffer** ptr) const
{
......@@ -146,7 +146,7 @@ namespace OpenViBETracker
return true;
};
virtual ovtime_t getDuration() const override
ovtime_t getDuration() const override
{
const size_t chunkCount = getChunkCount();
if (chunkCount == 0)
......@@ -159,7 +159,7 @@ namespace OpenViBETracker
}
}
virtual ovtime_t getStartTime() const override
ovtime_t getStartTime() const override
{
const size_t chunkCount = getChunkCount();
if (chunkCount == 0)
......@@ -173,7 +173,7 @@ namespace OpenViBETracker
}
// @fixme efficiency
virtual bool getOverlapping() const override
bool getOverlapping() const override
{
for (size_t i = 1; i < m_Chunks.size(); i++)
{
......@@ -186,7 +186,7 @@ namespace OpenViBETracker
};
// @fixme efficiency
virtual bool getNoncontinuous() const override
bool getNoncontinuous() const override
{
for (size_t i = 1; i < m_Chunks.size(); i++)
{
......
......@@ -27,9 +27,9 @@ namespace OpenViBETracker
StreamRendererChannelLocalization(const OpenViBE::Kernel::IKernelContext& ctx, std::shared_ptr<const Stream<TypeChannelLocalization>> stream)
: StreamRendererLabel(ctx), m_Stream(stream) { };
virtual OpenViBE::CString renderAsText(uint32_t indent) const override;
OpenViBE::CString renderAsText(uint32_t indent) const override;
virtual bool showChunkList() override;
bool showChunkList() override;
protected:
......
......@@ -26,9 +26,9 @@ namespace OpenViBETracker
StreamRendererChannelUnits(const OpenViBE::Kernel::IKernelContext& ctx, std::shared_ptr<const Stream<TypeChannelUnits>> stream)
: StreamRendererLabel(ctx), m_Stream(stream) { };
virtual OpenViBE::CString renderAsText(uint32_t indent) const override;
OpenViBE::CString renderAsText(uint32_t indent) const override;
virtual bool showChunkList() override;
bool showChunkList() override;
protected:
......
......@@ -26,9 +26,9 @@ namespace OpenViBETracker
StreamRendererExperimentInformation(const OpenViBE::Kernel::IKernelContext& ctx, std::shared_ptr<const Stream<TypeExperimentInformation>> stream)
: StreamRendererLabel(ctx), m_Stream(stream) { };
virtual OpenViBE::CString renderAsText(uint32_t indent) const override;
OpenViBE::CString renderAsText(uint32_t indent) const override;
virtual bool showChunkList() override;
bool showChunkList() override;
protected:
......
......@@ -24,20 +24,20 @@ namespace OpenViBETracker
public:
StreamRendererLabel(const OpenViBE::Kernel::IKernelContext& ctx) : StreamRendererBase(ctx) { };
virtual bool initialize() override;
virtual bool uninitialize() override { return true; };
virtual bool setTitle(const char* title) override;
bool initialize() override;
bool uninitialize() override { return true; };
bool setTitle(const char* title) override;
virtual bool spool(ovtime_t startTime, ovtime_t endTime) override { return true; };
bool spool(ovtime_t startTime, ovtime_t endTime) override { return true; };
virtual bool setRulerVisibility(bool isVisible) override { return true; };
bool setRulerVisibility(bool isVisible) override { return true; };
virtual bool showChunkList(const char* title);
protected:
virtual bool reset(ovtime_t startTime, ovtime_t endTime) override { return true; };
virtual bool realize() override { return true; };
bool reset(ovtime_t startTime, ovtime_t endTime) override { return true; };
bool realize() override { return true; };
GtkWidget* m_pLabel;
};
......
......@@ -23,27 +23,27 @@ namespace OpenViBETracker
StreamRendererMatrix(const OpenViBE::Kernel::IKernelContext& ctx, std::shared_ptr<const Stream<TypeMatrix>> stream)
: StreamRendererBase(ctx), m_Stream(stream) { };
virtual bool initialize() override;
bool initialize() override;
virtual bool spool(ovtime_t startTime, ovtime_t endTime) override
bool spool(ovtime_t startTime, ovtime_t endTime) override
{
return spoolImpl<TypeMatrix, StreamRendererMatrix>(m_Stream, *this, startTime, endTime);
}
virtual OpenViBE::CString renderAsText(uint32_t indent) const override;
virtual bool showChunkList() override;
OpenViBE::CString renderAsText(uint32_t indent) const override;
bool showChunkList() override;
protected:
friend bool spoolImpl<TypeMatrix, StreamRendererMatrix>(std::shared_ptr<const Stream<TypeMatrix>> stream, StreamRendererMatrix& renderer, ovtime_t startTime, ovtime_t endTime);
virtual bool finalize() override;
virtual bool reset(ovtime_t startTime, ovtime_t endTime) override;
bool finalize() override;
bool reset(ovtime_t startTime, ovtime_t endTime) override;
virtual bool push(const TypeMatrix::Buffer& chunk, bool zeroInput = false);
virtual bool mouseButton(int32_t x, int32_t y, int32_t button, int status) override;
bool mouseButton(int32_t x, int32_t y, int32_t button, int status) override;
virtual bool preDraw() override;
virtual bool draw() override;
bool preDraw() override;
bool draw() override;
size_t m_NumRows = 0;
size_t m_NumCols = 0;
......
......@@ -24,13 +24,13 @@ namespace OpenViBETracker
public:
StreamRendererNothing(const OpenViBE::Kernel::IKernelContext& ctx) : StreamRendererBase(ctx) { };
virtual bool initialize() override { return true; };
virtual bool uninitialize() override { return true; };
virtual bool setTitle(const char* title) override { return true; };
bool initialize() override { return true; };
bool uninitialize() override { return true; };
bool setTitle(const char* title) override { return true; };
virtual bool spool(ovtime_t startTime, ovtime_t endTime) override { return true; };
bool spool(ovtime_t startTime, ovtime_t endTime) override { return true; };
virtual bool setRulerVisibility(bool isVisible) override { return true; };
bool setRulerVisibility(bool isVisible) override { return true; };
virtual bool showChunkList(const char* title) { return true; };
......@@ -43,7 +43,7 @@ namespace OpenViBETracker
protected:
virtual bool reset(ovtime_t startTime, ovtime_t endTime) override { return true; };
virtual bool realize() override { return true; };
bool reset(ovtime_t startTime, ovtime_t endTime) override { return true; };
bool realize() override { return true; };
};
};
......@@ -22,23 +22,23 @@ namespace OpenViBETracker
StreamRendererSignal(const OpenViBE::Kernel::IKernelContext& ctx, std::shared_ptr<const Stream<TypeSignal>> stream)
: StreamRendererBase(ctx), m_Stream(stream) { };
virtual bool initialize() override;
bool initialize() override;
virtual bool spool(ovtime_t startTime, ovtime_t endTime) override
bool spool(ovtime_t startTime, ovtime_t endTime) override
{
return spoolImpl<TypeSignal, StreamRendererSignal>(m_Stream, *this, startTime, endTime);
}
virtual OpenViBE::CString renderAsText(uint32_t indent) const override;
virtual bool showChunkList() override;
OpenViBE::CString renderAsText(uint32_t indent) const override;
bool showChunkList() override;
protected:
friend bool spoolImpl<TypeSignal, StreamRendererSignal>(std::shared_ptr<const Stream<TypeSignal>> stream, StreamRendererSignal& renderer, ovtime_t startTime, ovtime_t endTime);
virtual bool push(const TypeSignal::Buffer& chunk, bool zeroInput = false);
virtual bool reset(ovtime_t startTime, ovtime_t endTime) override;
virtual bool mouseButton(int32_t x, int32_t y, int32_t button, int status) override;
bool reset(ovtime_t startTime, ovtime_t endTime) override;
bool mouseButton(int32_t x, int32_t y, int32_t button, int status) override;
size_t m_ChannelCount = 0;
size_t m_SamplesPerChunk = 0;
......
......@@ -23,27 +23,27 @@ namespace OpenViBETracker
StreamRendererSpectrum(const OpenViBE::Kernel::IKernelContext& ctx, std::shared_ptr<const Stream<TypeSpectrum>> stream)
: StreamRendererBase(ctx), m_Stream(stream) { };
virtual bool initialize() override;
bool initialize() override;
virtual bool spool(ovtime_t startTime, ovtime_t endTime) override
bool spool(ovtime_t startTime, ovtime_t endTime) override
{
return spoolImpl<TypeSpectrum, StreamRendererSpectrum>(m_Stream, *this, startTime, endTime);
}
virtual OpenViBE::CString renderAsText(uint32_t indent) const override;
virtual bool showChunkList() override;
OpenViBE::CString renderAsText(uint32_t indent) const override;
bool showChunkList() override;
protected:
friend bool spoolImpl<TypeSpectrum, StreamRendererSpectrum>(std::shared_ptr<const Stream<TypeSpectrum>> stream, StreamRendererSpectrum& renderer, ovtime_t startTime, ovtime_t endTime);
virtual bool finalize() override;
virtual bool reset(ovtime_t startTime, ovtime_t endTime) override;
bool finalize() override;
bool reset(ovtime_t startTime, ovtime_t endTime) override;
virtual bool push(const TypeSpectrum::Buffer& chunk, bool zeroInput = false);
virtual bool mouseButton(int32_t x, int32_t y, int32_t button, int status) override;
bool mouseButton(int32_t x, int32_t y, int32_t button, int status) override;
virtual bool preDraw() override;
virtual bool draw() override;
bool preDraw() override;
bool draw() override;
size_t m_ChannelCount = 0;
size_t m_SpectrumElements = 0;
......
......@@ -22,15 +22,15 @@ namespace OpenViBETracker
StreamRendererStimulation(const OpenViBE::Kernel::IKernelContext& ctx, std::shared_ptr<const Stream<TypeStimulation>> stream)
: StreamRendererBase(ctx), m_Stream(stream) { };
virtual bool initialize() override;
bool initialize() override;
virtual bool spool(ovtime_t startTime, ovtime_t endTime) override
bool spool(ovtime_t startTime, ovtime_t endTime) override
{
return spoolImpl<TypeStimulation, StreamRendererStimulation>(m_Stream, *this, startTime, endTime);
}
virtual OpenViBE::CString renderAsText(uint32_t indent) const override;
virtual bool showChunkList() override;
OpenViBE::CString renderAsText(uint32_t indent) const override;
bool showChunkList() override;
protected:
......@@ -38,9 +38,9 @@ namespace OpenViBETracker
virtual bool push(const TypeStimulation::Buffer& chunk, bool zeroInput = false);
virtual bool reset(ovtime_t startTime, ovtime_t endTime) override;
bool reset(ovtime_t startTime, ovtime_t endTime) override;
virtual bool mouseButton(int32_t x, int32_t y, int32_t button, int status) override;
bool mouseButton(int32_t x, int32_t y, int32_t button, int status) override;
size_t m_ChannelCount = 0;
size_t m_SamplesPerChunk = 0;
......
......@@ -19,9 +19,9 @@ namespace OpenViBETracker
class WorkspaceNotes : public OpenViBE::Kernel::IComment
{
public:
virtual OpenViBE::CIdentifier getIdentifier() const override { return 0; }
OpenViBE::CIdentifier getIdentifier() const override { return 0; }
virtual OpenViBE::CString getText() const override { return m_Notes; }
OpenViBE::CString getText() const override { return m_Notes; }
virtual bool setIdentifier(
const OpenViBE::CIdentifier& rIdentifier) override { return true; }
......
......@@ -86,7 +86,7 @@ bool parse_arguments(int argc, char** argv, SConfiguration& rConfiguration)
for (auto it = l_vArgValue.cbegin(); it != l_vArgValue.cend(); ++it)
{
if (*it.empty()) { }
if (*it == "") { }
else if (*it == "-h" || *it == "--help")
{
l_oConfiguration.m_help = true;
......@@ -95,7 +95,7 @@ bool parse_arguments(int argc, char** argv, SConfiguration& rConfiguration)
}
else if (*it == "-c" || *it == "--config")
{
if (*++it.empty())
if (*++it == "")
{
std::cout << "Error: Switch --config needs an argument\n";
return false;
......@@ -104,7 +104,7 @@ bool parse_arguments(int argc, char** argv, SConfiguration& rConfiguration)
}
else if (*it == "-d" || *it == "--define")
{
if (*++it.empty())
if (*++it == "")
{
std::cout << "Error: Need two arguments after -d / --define.\n";
return false;
......@@ -113,7 +113,7 @@ bool parse_arguments(int argc, char** argv, SConfiguration& rConfiguration)
// Were not using = as a separator for token/value, as on Windows its a problem passing = to the cmd interpreter
// which is used to launch the actual designer exe.
const std::string& l_rToken = *it;
if (*++it.empty())
if (*++it == "")
{
std::cout << "Error: Need two arguments after -d / --define.\n";
return false;
......
......@@ -1087,7 +1087,7 @@ uint32 CDriverOpenBCI::readFromDevice(FD_TYPE i32FileDescriptor, void* pBuffer,
default:
if(FD_ISSET(i32FileDescriptor, &l_inputFileDescriptorSet))
{
ssize_t l_i32ReadLength=::read(i32FileDescriptor, reinterpret_cast<uint8_t*>(pBuffer)+ui32BufferSize-l_ui32BytesLeftToRead, l_ui32BytesLeftToRead);
size_t l_i32ReadLength=::read(i32FileDescriptor, reinterpret_cast<uint8_t*>(pBuffer)+ui32BufferSize-l_ui32BytesLeftToRead, l_ui32BytesLeftToRead);
if(l_i32ReadLength <= 0)
{
l_bFinished = true;
......
......@@ -29,7 +29,7 @@ namespace OpenViBEPlugins
virtual bool uninitialize();
virtual bool processClock(OpenViBE::CMessageClock& rMessageClock);
virtual bool process();
virtual bool processInput(uint32_t inputIndex) override;
bool processInput(uint32_t inputIndex) override;
_IsDerivedFromClass_Final_(OpenViBEToolkit::TBoxAlgorithm < OpenViBE::Plugins::IBoxAlgorithm >, OVP_ClassId_BoxAlgorithm_MatlabScripting);
......
......@@ -66,9 +66,7 @@ namespace OpenViBEPlugins
* \param i32Width New window width
* \param i32Height New window height
*/
void onResizeEventCB(
gint i32Width,
gint i32Height);
void onResizeEventCB(gint i32Width, gint i32Height);
/**
* \brief Updates scale following a resize event or a time scale change
......@@ -87,18 +85,15 @@ namespace OpenViBEPlugins
* \brief Add a channel to the list of channels to be displayed
* \param ui32Channel Index of channel to be displayed
*/
void addChannel(
uint32_t ui32Channel);
void addChannel(uint32_t ui32Channel);
void addChannelList(
uint32_t ui32Channel);
void addChannelList(uint32_t ui32Channel);
/**
* \brief Get rectangle to clear and redraw based on latest signal data received
* \param[out] rRect Rectangle holding part of drawing area to clear and update
*/
void getUpdateRectangle(
GdkRectangle& rRect);
void getUpdateRectangle(GdkRectangle& rRect);
/**
* \brief Flag widget so that its whole window is redrawn at next refresh
......@@ -115,8 +110,7 @@ namespace OpenViBEPlugins
* \brief Draws the signal on the signal's drawing area.
* \param rExposedArea Exposed area that needs to be redrawn
*/
void draw(
const GdkRectangle& rExposedArea);
void draw(const GdkRectangle& rExposedArea);
/**
* \brief Clip signals to drawing area
......@@ -125,8 +119,7 @@ namespace OpenViBEPlugins
* \param ui64PointCount Number of points to clip
* \return The number of points to display.
*/
uint64_t cropCurve(
uint64_t ui64PointCount);
uint64_t cropCurve(uint64_t ui64PointCount);
/**
* \brief Computes the parameters necessary for the signal to be zoomed at the selected coordinates.
......@@ -134,36 +127,24 @@ namespace OpenViBEPlugins
* \param f64XClick The X-coordinate of the center of the area we want to zoom in.
* \param f64YClick The Y-coordinate of the center of the area we want to zoom in.
*/
void computeZoom(
bool bZoomIn,
double f64XClick,
double f64YClick);
void computeZoom(bool bZoomIn, double f64XClick, double f64YClick);
/**
* \brief Returns empiric y min and maxes of the currently shown signal chunks for all subchannels.
* Note that the actually used display limits may be different. This function can be used
* to get the data extremal values and then use these to configure the display appropriately.
*/
void getDisplayedValueRange(
std::vector<double>& rDisplayedValueMin,
std::vector<double>& rDisplayedValueMax) const;
void getDisplayedValueRange(std::vector<double>& rDisplayedValueMin, std::vector<double>& rDisplayedValueMax) const;
/*
* \brief Sets scale for all subchannels.
*/
void setGlobalScaleParameters(
const double f64Min,