Compare commits

..

No commits in common. "655eff4f62ae7957b17e0008cb19a563444d91c7" and "4cca680029611215b9c8a3913f3d4b015d5aa2c1" have entirely different histories.

7 changed files with 21 additions and 30 deletions

View File

@ -1402,7 +1402,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<context>
<name>T_LineChart</name>
<message>
<location filename="qml/chart/T_LineChart.qml" line="11"/>
<location filename="qml/chart/T_LineChart.qml" line="10"/>
<source>Line Chart</source>
<translation type="unfinished"></translation>
</message>

View File

@ -1500,7 +1500,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<context>
<name>T_LineChart</name>
<message>
<location filename="qml/chart/T_LineChart.qml" line="11"/>
<location filename="qml/chart/T_LineChart.qml" line="10"/>
<source>Line Chart</source>
<translation type="unfinished">线</translation>
</message>

View File

@ -7,9 +7,7 @@ import "../component"
FluScrollablePage{
id: root
title: qsTr("Line Chart")
property var data : []
FluFrame{
Layout.preferredWidth: 500
@ -17,14 +15,13 @@ FluScrollablePage{
padding: 10
Layout.topMargin: 20
FluChart{
id: chart
anchors.fill: parent
chartType: 'line'
chartData: { return {
labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
datasets: [{
label: 'My First Dataset',
data: root.data,
data: [65, 59, 80, 81, 56, 55, 40],
fill: false,
borderColor: 'rgb(75, 192, 192)',
tension: 0.1
@ -44,20 +41,5 @@ FluScrollablePage{
}
}
}
Timer{
id: timer
interval: 300
repeat: true
onTriggered: {
root.data.push(Math.random()*100)
if(root.data.length>7){
root.data.shift()
}
chart.animateToNewData()
}
}
Component.onCompleted: {
timer.restart()
}
}
}

View File

@ -164,7 +164,7 @@ FluScrollablePage{
verticalCenter: parent.verticalCenter
left: parent.left
}
currentIndex: -1
currentIndex: 1
FluCheckBox{
disabled: radio_button_switch4.checked
text: qsTr("Radio Button_1")

View File

@ -8,6 +8,7 @@
class FluTableModel : public QAbstractTableModel {
Q_OBJECT
Q_PROPERTY_AUTO(int, dataSourceSize)
Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
Q_PROPERTY_AUTO(QList<QVariantMap>, rows)
Q_PROPERTY(int rowCount READ rowCount CONSTANT)

View File

@ -18,9 +18,7 @@ Item{
for(var i = 0;i<buttons.length;i++){
buttons[i].checked = false
}
if(currentIndex>=0 && currentIndex<buttons.length){
buttons[currentIndex].checked = true
}
buttons[currentIndex].checked = true
}
}
implicitWidth: childrenRect.width
@ -44,6 +42,9 @@ Item{
}
}
}
if(control.currentIndex < 0){
control.currentIndex = 0
}
d.updateChecked()
}
}
@ -51,7 +52,7 @@ Item{
Component{
id:com_horizontal
RowLayout {
data: control.buttons
data: buttons
spacing: control.spacing
Component.onCompleted: {
for(var i = 0;i<control.buttons.length;i++){
@ -64,6 +65,9 @@ Item{
}
}
}
if(control.currentIndex < 0){
control.currentIndex = 0
}
d.updateChecked()
}
}

View File

@ -19,9 +19,7 @@ Item{
for(var i = 0;i<buttons.length;i++){
buttons[i].checked = false
}
if(currentIndex>=0 && currentIndex<buttons.length){
buttons[currentIndex].checked = true
}
buttons[currentIndex].checked = true
}
}
implicitWidth: childrenRect.width
@ -45,6 +43,9 @@ Item{
}
}
}
if(control.currentIndex < 0){
control.currentIndex = 0
}
d.updateChecked()
}
}
@ -52,7 +53,7 @@ Item{
Component{
id:com_horizontal
RowLayout {
data: control.buttons
data: buttons
spacing: control.spacing
Component.onCompleted: {
for(var i = 0;i<control.buttons.length;i++){
@ -65,6 +66,9 @@ Item{
}
}
}
if(control.currentIndex < 0){
control.currentIndex = 0
}
d.updateChecked()
}
}