[Kst] branches/work/kst/portto4/kst/src
Adam Treat
treat at kde.org
Tue Oct 2 20:06:34 CEST 2007
SVN commit 720216 by treat:
* Clean up the layout of some of these dialogs
* Look at the curve rendering time... needs to be greatly improved.
It looks like the problem is in KstVCurve though...* Clean up the layout of some of these dialogs
* Look at the curve rendering time... needs to be greatly improved.
It looks like the problem is in KstVCurve though...* Clean up the layout of some of these dialogs
* Look at the curve rendering time... needs to be greatly improved.
It looks like the problem is in KstVCurve though...* Clean up the layout of some of these dialogs
* Look at the curve rendering time... needs to be greatly improved.
It looks like the problem is in KstVCurve though...* Clean up the layout of some of these dialogs
* Look at the curve rendering time... needs to be greatly improved.
It looks like the problem is in KstVCurve though...* Clean up the layout of some of these dialogs
* Look at the curve rendering time... needs to be greatly improved.
It looks like the problem is in KstVCurve though...* Clean up the layout of some of these dialogs
* Look at the curve rendering time... needs to be greatly improved.
It looks like the problem is in KstVCurve though...* Clean up the layout of some of these dialogs
* Look at the curve rendering time... needs to be greatly improved.
It looks like the problem is in KstVCurve though...
M +15 -0 libkstapp/plotrenderitem.cpp
M +23 -59 libkstapp/vectortab.ui
M +14 -2 widgets/curveappearance.ui
M +2 -2 widgets/curveplacement.ui
M +2 -14 widgets/datarange.ui
--- branches/work/kst/portto4/kst/src/libkstapp/plotrenderitem.cpp #720215:720216
@@ -11,8 +11,12 @@
#include "plotrenderitem.h"
+#include <QTime>
+
#include "plotitem.h"
+//#define CURVE_DRAWING_TIME
+
namespace Kst {
PlotRenderItem::PlotRenderItem(const QString &name, PlotItem *parentItem)
@@ -75,7 +79,18 @@
Q_UNUSED(widget);
painter->drawRect(rect());
painter->fillRect(rect(), Qt::white);
+
+#ifdef CURVE_DRAWING_TIME
+ QTime time;
+ time.start();
+#endif
+
paint(painter);
+
+#ifdef CURVE_DRAWING_TIME
+ int elapsed = time.elapsed();
+ qDebug()<<"curve drawing took" << elapsed << "to render.";
+#endif
}
--- branches/work/kst/portto4/kst/src/libkstapp/vectortab.ui #720215:720216
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>431</width>
- <height>377</height>
+ <height>413</height>
</rect>
</property>
<layout class="QGridLayout" >
@@ -15,20 +15,8 @@
<property name="title" >
<string>Source</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item row="0" column="0" >
+ <layout class="QHBoxLayout" >
+ <item>
<widget class="QRadioButton" name="_readFromSource" >
<property name="text" >
<string>Read from data source</string>
@@ -38,23 +26,7 @@
</property>
</widget>
</item>
- <item row="0" column="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>110</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="1" >
+ <item>
<widget class="QRadioButton" name="_generateX" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
@@ -70,6 +42,22 @@
</property>
</widget>
</item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</item>
@@ -95,18 +83,6 @@
<string>Data Vector Parameters</string>
</property>
<layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
<item row="1" column="0" >
<widget class="QLabel" name="label_5" >
<property name="text" >
@@ -160,15 +136,15 @@
<item>
<spacer>
<property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
- <width>181</width>
- <height>21</height>
+ <width>21</width>
+ <height>0</height>
</size>
</property>
</spacer>
@@ -213,18 +189,6 @@
<string>Vector values</string>
</property>
<layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
<property name="sizePolicy" >
--- branches/work/kst/portto4/kst/src/widgets/curveappearance.ui #720215:720216
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>406</width>
- <height>163</height>
+ <width>373</width>
+ <height>148</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -16,6 +16,18 @@
</sizepolicy>
</property>
<layout class="QVBoxLayout" >
+ <property name="leftMargin" >
+ <number>0</number>
+ </property>
+ <property name="topMargin" >
+ <number>0</number>
+ </property>
+ <property name="rightMargin" >
+ <number>0</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>0</number>
+ </property>
<item>
<widget class="QGroupBox" name="GroupBox9_2_2_2" >
<property name="sizePolicy" >
--- branches/work/kst/portto4/kst/src/widgets/curveplacement.ui #720215:720216
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>348</width>
- <height>117</height>
+ <width>363</width>
+ <height>121</height>
</rect>
</property>
<property name="sizePolicy" >
--- branches/work/kst/portto4/kst/src/widgets/datarange.ui #720215:720216
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>422</width>
- <height>124</height>
+ <width>440</width>
+ <height>119</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -40,18 +40,6 @@
<string>Data Range</string>
</property>
<layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
<item row="2" column="5" >
<widget class="QCheckBox" name="_doFilter" >
<property name="enabled" >
More information about the Kst
mailing list