Fix crash on sensor monitor startup

master
Timothy Pearson 8 years ago
parent db047c23a6
commit 063c820d6a

@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* (c) 2012-2014 Timothy Pearson * (c) 2012-2016 Timothy Pearson
* Raptor Engineering * Raptor Engineering
* http://www.raptorengineeringinc.com * http://www.raptorengineeringinc.com
*/ */
@ -126,11 +126,11 @@ namespace RemoteLab
class SensorMonitorPart : public KParts::RemoteInstrumentPart class SensorMonitorPart : public KParts::RemoteInstrumentPart
{ {
Q_OBJECT Q_OBJECT
public: public:
SensorMonitorPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&); SensorMonitorPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
~SensorMonitorPart(); ~SensorMonitorPart();
virtual bool openFile() { return false; } // pure virtual in the base class virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL(); virtual bool closeURL();
static TDEAboutData *createAboutData(); static TDEAboutData *createAboutData();
@ -138,7 +138,7 @@ namespace RemoteLab
public slots: public slots:
virtual bool openURL(const KURL &url); virtual bool openURL(const KURL &url);
void updateZoomWidgetLimits(const TQRectF& zoomRect); void updateZoomWidgetLimits(const TQRectF& zoomRect);
private slots: private slots:
void postInit(); void postInit();
void resizeToHint(); void resizeToHint();
@ -162,7 +162,7 @@ namespace RemoteLab
void saveWaveforms(); void saveWaveforms();
void saveWaveforms(TQString fileName); void saveWaveforms(TQString fileName);
void recallWaveforms(); void recallWaveforms();
private: private:
SensorMonitorBase* m_base; SensorMonitorBase* m_base;
TraceWidget* m_traceWidget; TraceWidget* m_traceWidget;
@ -187,7 +187,7 @@ namespace RemoteLab
TQ_INT32 m_samplesInTrace[MAXTRACES+1]; TQ_INT32 m_samplesInTrace[MAXTRACES+1];
bool m_channelActive[MAXTRACES+1]; bool m_channelActive[MAXTRACES+1];
TQString m_traceUnits[MAXTRACES+1]; TQString m_traceUnits[MAXTRACES+1];
TraceControlWidget* m_traceControlWidgetList[MAXTRACES]; TraceControlWidget* m_traceControlWidgetList[MAXTRACES+1];
TQ_UINT32 m_sampleRequestIndex; TQ_UINT32 m_sampleRequestIndex;
bool m_sampleRequestInProgress[MAXTRACES+1]; bool m_sampleRequestInProgress[MAXTRACES+1];
}; };

Loading…
Cancel
Save