diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-04-28 12:55:08 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-04-28 12:55:08 -0500 |
| commit | bd0400a096268138037b3cfc129c298c961fc63d (patch) | |
| tree | a25466faf5d4978056a700fe3ead37d132e005d3 /clients/tde/src/part/scope | |
| parent | 9c98267db370d13a01d6135046061ce8a06dba07 (diff) | |
| download | ulab-bd0400a096268138037b3cfc129c298c961fc63d.tar.gz ulab-bd0400a096268138037b3cfc129c298c961fc63d.zip | |
Fix scope part crashes
Add server-provided caption support
Properly brand client application
Diffstat (limited to 'clients/tde/src/part/scope')
| -rw-r--r-- | clients/tde/src/part/scope/layout.ui | 16 | ||||
| -rw-r--r-- | clients/tde/src/part/scope/part.cpp | 4 |
2 files changed, 19 insertions, 1 deletions
diff --git a/clients/tde/src/part/scope/layout.ui b/clients/tde/src/part/scope/layout.ui index f680d86..2a94997 100644 --- a/clients/tde/src/part/scope/layout.ui +++ b/clients/tde/src/part/scope/layout.ui @@ -163,6 +163,14 @@ <property name="title"> <string>Notes</string> </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>3</vsizetype> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> <grid> <widget class="KTextEdit" row="0" column="0" colspan="1"> <property name="name"> @@ -171,6 +179,14 @@ <property name="text"> <string></string> </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>3</vsizetype> + <horstretch>0</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> </widget> </grid> </widget> diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp index a909397..fed1726 100644 --- a/clients/tde/src/part/scope/part.cpp +++ b/clients/tde/src/part/scope/part.cpp @@ -1972,7 +1972,9 @@ void ScopePart::processTriggerButtons() { } for (int i=0; i<m_maxNumberOfTraces;i++) { - m_traceControlWidgetList[i]->setTriggerChannel(i == (m_triggerChannel-1)); + if (m_traceControlWidgetList[i]) { + m_traceControlWidgetList[i]->setTriggerChannel(i == (m_triggerChannel-1)); + } } } |