diff options
Diffstat (limited to 'clients/tde/src/part/scope/part.cpp')
| -rw-r--r-- | clients/tde/src/part/scope/part.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp index e5ebfa4..401fd66 100644 --- a/clients/tde/src/part/scope/part.cpp +++ b/clients/tde/src/part/scope/part.cpp @@ -529,6 +529,9 @@ ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject * connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop())); m_updateTimeoutTimer = new TQTimer(this); connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop())); + m_controlWidgetViewFixupTimer = new TQTimer(this); + connect(m_controlWidgetViewFixupTimer, SIGNAL(timeout()), this, SLOT(controlWidgetViewSetWidth())); + m_controlWidgetViewFixupTimer->start(100, FALSE); // Initialize data m_hdivs = 0; @@ -579,6 +582,10 @@ ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject * // Create widgets m_base = new ScopeBase(widget()); + m_base->oscilloscopeControlCanvas->addChild(m_base->oscilloscopeControlCanvasWidget); + m_base->oscilloscopeControlCanvas->setHScrollBarMode(TQScrollView::AlwaysOff); + m_base->oscilloscopeControlCanvas->setFrameShape(TQFrame::NoFrame); + m_base->oscilloscopeControlCanvas->setMargin(0); m_traceControlWidgetGrid = new TQGridLayout(m_base->traceControlLayoutWidget); m_postProcessTraceControlWidgetGrid = new TQGridLayout(m_base->postProcessTraceControlLayoutWidget); m_mathTraceControlWidgetGrid = new TQGridLayout(m_base->mathTraceControlLayoutWidget); @@ -643,6 +650,8 @@ ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject * } ScopePart::~ScopePart() { + m_controlWidgetViewFixupTimer->stop(); + if (m_instrumentMutex->locked()) { printf("[WARNING] Exiting when data transfer still in progress!\n\r"); fflush(stdout); } @@ -2471,6 +2480,15 @@ void ScopePart::updateTraceControlWidgets() { } } +void ScopePart::controlWidgetViewSetWidth() { + if (m_base->oscilloscopeControlCanvas->contentsHeight() > m_base->oscilloscopeControlCanvas->height()) { + m_base->oscilloscopeControlCanvas->setFixedWidth(m_base->oscilloscopeControlCanvas->contentsWidth() + m_base->oscilloscopeControlCanvas->verticalScrollBar()->sliderRect().width()); + } + else { + m_base->oscilloscopeControlCanvas->setFixedWidth(m_base->oscilloscopeControlCanvas->contentsWidth()); + } +} + void ScopePart::traceControlEnableChanged(bool enabled) { int i; int channel = -1; |