Lxy
/
TreasureFinder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 完善20日动量及界面优化

Browse Source
master
laixingyu 3 years ago
parent fb7e2f0acc
commit e1bf0487e1
6 changed files with 535 additions and 444 deletions
Show Stats Download Patch File Download Diff File

82
mainwindow.cpp
Unescape View File

@ -28,12 +28,12 @@ MainWindow::~MainWindow()
void MainWindow::SetUserInfo(UserInfo user) void MainWindow::SetUserInfo(UserInfo user)
{ {
m_UserInfo = user; m_UserInfo = user;
ui->trends->SetUserInfo(user); ui->trendsPage->SetUserInfo(user);
} }
void MainWindow::LoadTrendsData() void MainWindow::LoadTrendsData()
{ {
ui->trends->LoadTrendsData(); ui->trendsPage->LoadTrendsData();
} }
void MainWindow::Init() void MainWindow::Init()
@ -71,7 +71,7 @@ void MainWindow::Init()
connect(btn, SIGNAL(clicked()), this, SLOT(buttonClick())); connect(btn, SIGNAL(clicked()), this, SLOT(buttonClick()));
} }
ui->btnMain->click(); ui->tradeRecordBtn->click();
} }
void MainWindow::InitStyle() void MainWindow::InitStyle()
@ -141,15 +141,15 @@ void MainWindow::getQssColor(const QString &qss, const QString &flag, QString &c
//qDebug() << TIMEMS << flag << color; //qDebug() << TIMEMS << flag << color;
} }
bool MainWindow::eventFilter(QObject *watched, QEvent *event) //bool MainWindow::eventFilter(QObject *watched, QEvent *event)
{ //{
if (watched == ui->widgetTitle) { // if (watched == ui->widgetTitle) {
if (event->type() == QEvent::MouseButtonDblClick) { // if (event->type() == QEvent::MouseButtonDblClick) {
on_btnMenu_Max_clicked(); // on_btnMenu_Max_clicked();
} // }
} // }
return QWidget::eventFilter(watched, event); // return QWidget::eventFilter(watched, event);
} //}
void MainWindow::getQssColor(const QString &qss, QString &textColor, QString &panelColor, void MainWindow::getQssColor(const QString &qss, QString &textColor, QString &panelColor,
QString &borderColor, QString &normalColorStart, QString &normalColorEnd, QString &borderColor, QString &normalColorStart, QString &normalColorEnd,
@ -168,22 +168,27 @@ void MainWindow::getQssColor(const QString &qss, QString &textColor, QString &pa
void MainWindow::buttonClick() void MainWindow::buttonClick()
{ {
QAbstractButton *b = (QAbstractButton *)sender(); QAbstractButton *b = (QAbstractButton *)sender();
QString name = b->text(); QString name = b->objectName();
QList<QAbstractButton *> tbtns = ui->widgetTop->findChildren<QAbstractButton *>(); QList<QAbstractButton *> tbtns = ui->widgetTop->findChildren<QAbstractButton *>();
foreach (QAbstractButton *btn, tbtns) { foreach (QAbstractButton *btn, tbtns) {
btn->setChecked(btn == b); btn->setChecked(btn == b);
} }
if (name == "交易记录") { if (name == "tradeRecordBtn")
ui->stackedWidget->setCurrentIndex(0); {
} else if (name == "动量趋势") {
ui->stackedWidget->setCurrentIndex(1);
} else if (name == "ddd") {
ui->stackedWidget->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0);
} else if (name == "vvv") { } else if (name == "trendsBtn")
{
ui->stackedWidget->setCurrentIndex(1); ui->stackedWidget->setCurrentIndex(1);
} else if (name == "aaa") { } else if (name == "limitBtn")
{
ui->stackedWidget->setCurrentIndex(2);
} else if (name == "newRecordBtn")
{
ui->stackedWidget->setCurrentIndex(3);
} else if (name == "logouBtn")
{
exit(0); exit(0);
} }
} }
@ -214,3 +219,40 @@ void MainWindow::on_btnMenu_Close_clicked()
close(); close();
} }
bool MainWindow::eventFilter(QObject *watched, QEvent *event)
{
QWidget *w = (QWidget *)watched;
if(w->property("form") != "title")
{
return QObject::eventFilter(watched, event);
}
if (!w->property("canMove").toBool())
{
return QObject::eventFilter(watched, event);
}
static QPoint mousePoint;
static bool mousePressed = false;
QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
if (mouseEvent->type() == QEvent::MouseButtonPress) {
if (mouseEvent->button() == Qt::LeftButton) {
mousePressed = true;
mousePoint = mouseEvent->globalPos() - this->pos();
}
} else if (mouseEvent->type() == QEvent::MouseButtonRelease) {
mousePressed = false;
} else if (mouseEvent->type() == QEvent::MouseMove) {
if (mousePressed) {
this->move(mouseEvent->globalPos() - mousePoint);
return true;
}
}
else if (event->type() == QEvent::MouseButtonDblClick) {
on_btnMenu_Max_clicked();
}
return QObject::eventFilter(watched, event);
}

50
mainwindow.ui
Unescape View File

@ -14,15 +14,21 @@
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<widget class="QWidget" name="widgetTitle" native="true"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="geometry"> <property name="leftMargin">
<rect> <number>0</number>
<x>0</x> </property>
<y>0</y> <property name="topMargin">
<width>1440</width> <number>0</number>
<height>65</height> </property>
</rect> <property name="rightMargin">
<number>0</number>
</property> </property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QWidget" name="widgetTitle" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -87,7 +93,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QToolButton" name="btnMain"> <widget class="QToolButton" name="tradeRecordBtn">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding"> <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -107,7 +113,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="btnConfig"> <widget class="QToolButton" name="trendsBtn">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding"> <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -127,7 +133,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="btnData"> <widget class="QToolButton" name="limitBtn">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding"> <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -150,7 +156,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="btnHelp"> <widget class="QToolButton" name="newRecordBtn">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding"> <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -173,7 +179,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="btnExit"> <widget class="QToolButton" name="logouBtn">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding"> <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -319,16 +325,10 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
<item>
<widget class="QStackedWidget" name="stackedWidget"> <widget class="QStackedWidget" name="stackedWidget">
<property name="geometry"> <widget class="QWidget" name="tradePage">
<rect>
<x>0</x>
<y>70</y>
<width>1440</width>
<height>830</height>
</rect>
</property>
<widget class="QWidget" name="page">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
@ -443,8 +443,12 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="TrendsWidget" name="trends"/> <widget class="TrendsWidget" name="trendsPage"/>
<widget class="QWidget" name="limitPage"/>
<widget class="QWidget" name="newRecordPage"/>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<action name="AddTrading"> <action name="AddTrading">
<property name="text"> <property name="text">

4
qss/blacksoft.css
Unescape View File

@ -462,7 +462,7 @@ QTreeView,QListView,QTableView,QSplitter::handle,QTreeView::branch{
background:#444444; background:#444444;
} }
QTableView::item:selected,QListView::item:selected,QTreeView::item:selected{ /*QTableView::item:selected,QListView::item:selected,QTreeView::item:selected{
color:#DCDCDC; color:#DCDCDC;
background:#383838; background:#383838;
} }
@ -476,7 +476,7 @@ QTableView::item,QListView::item,QTreeView::item{
padding:1px; padding:1px;
margin:0px; margin:0px;
border:0px; border:0px;
} }*/
QHeaderView::section,QTableCornerButton:section{ QHeaderView::section,QTableCornerButton:section{
padding:3px; padding:3px;

99
widget/trendswidget.cpp
Unescape View File

@ -1,6 +1,8 @@
#include "trendswidget.h" #include "trendswidget.h"
#include "ui_trendswidget.h" #include "ui_trendswidget.h"
#include <QDebug> #include <QDebug>
#include <QTableWidgetItem>
#include <QColor>
TrendsWidget::TrendsWidget(QWidget *parent) : TrendsWidget::TrendsWidget(QWidget *parent) :
QWidget(parent), QWidget(parent),
@ -8,8 +10,6 @@ TrendsWidget::TrendsWidget(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
m_UserData.SetManagerType(ManagerType::Ruoyi); m_UserData.SetManagerType(ManagerType::Ruoyi);
model = new QStandardItemModel;
ui->tableView->setModel(model);
} }
TrendsWidget::~TrendsWidget() TrendsWidget::~TrendsWidget()
@ -30,41 +30,66 @@ void TrendsWidget::SetUserInfo(UserInfo user)
void TrendsWidget::LoadTrendsData() void TrendsWidget::LoadTrendsData()
{ {
QList<QList<QString> > trends = m_UserData.GetTrends(QDate(),m_UserInfo.token); QList<QList<QString> > trends = m_UserData.GetTrends(QDate(),m_UserInfo.token);
// int rowCount = trends.count();
// int columnCount = 0;
// //更新到tableview中
// if(rowCount > 2)
// {
// model->insertRow(0);
// qDebug() << __FUNCTION__ << " trends[0]: " << trends[0];
// QList<QString> columns = trends[0];
// columnCount = columns.count();
// for (int column = 0; column < columnCount; ++column) {
// QStandardItem *item = new QStandardItem(columns[column]);
// model->setItem(0, column, item);
// }
// }
// qDebug() << __FUNCTION__ << " trends[1]: " <<trends[1];
// qDebug() << __FUNCTION__ << " trends[2]: " <<trends[2];
// qDebug() << __FUNCTION__ << " trends[3]: " <<trends[3];
// rowCount = trends[1].count();
// QList<QString> row1List = trends[1];
// qDebug() << __FUNCTION__ << trends[1];
// for(int row = 1 ; row < rowCount; row++)
// {
// qDebug() << __FUNCTION__ << row << trends[1][row];
// model->insertRow(row);
// QStandardItem *item = new QStandardItem(trends[1][row]);
// model->setItem(row, 0, item);
// } int rowCount = trends.count();
// for(int row = 2 ; row < rowCount; row++) int columnCount = 0;
// { //更新到tableview中
// for(int col = 0 ; col < columnCount; col++) if(rowCount > 2)
// { {
// QStandardItem *item = new QStandardItem(trends[row][col]); qDebug() << __FUNCTION__ << " trends[0]: " << trends[0];
// model->setItem(row, col+1, item); QStringList headText;
QList<QString> columns = trends[0];
QList<QString> rows0 = trends[1];
QList<QString> rows1 = trends[2];
qDebug() << __FUNCTION__ << " trends[1]: " << trends[1];
qDebug() << __FUNCTION__ << " trends[2]: " << trends[2];
columnCount = columns.count();
ui->tableWidget->setRowCount(trends[1].count());
ui->tableWidget->setColumnCount(columnCount);
for (int column = 0; column < columnCount; ++column) {
headText << columns[column];
}
// } ui->tableWidget->setHorizontalHeaderLabels(headText);
// } ui->tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
ui->tableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
ui->tableWidget->setSelectionMode(QAbstractItemView::SingleSelection);
ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
ui->tableWidget->setAlternatingRowColors(true);
ui->tableWidget->verticalHeader()->setVisible(false);
// ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
}
//设置首列
int tableRows = trends[1].count();
for(int row = 0; row < tableRows; row++)
{
ui->tableWidget->setRowHeight(row, 24);
QTableWidgetItem *item = new QTableWidgetItem(trends[1][row]);
ui->tableWidget->setItem(row, 0, item);
}
for(int datarow = 2, col = 1; datarow < rowCount; datarow++,col++)
{
for(int tablerow = 0 ; tablerow < tableRows; tablerow++)
{
QTableWidgetItem *item = new QTableWidgetItem(trends[datarow][tablerow]);
if(item->text().toInt() <= 3 && item->text().toInt() > 0)
{
item->setTextColor(Qt::white);
item->setBackground(QBrush(Qt::red));
}
else if(item->text().toInt() <= 6 && item->text().toInt() > 3)
{
item->setTextColor(Qt::white);
item->setBackground(QBrush(QColor(255,157,0)));
}
else if(item->text().toInt() <= 10 && item->text().toInt() > 6)
{
item->setTextColor(Qt::white);
item->setBackground(QBrush(QColor(255,208,0)));
}
ui->tableWidget->setItem(tablerow, col, item);
}
}
} }

1
widget/trendswidget.h
Unescape View File

@ -25,7 +25,6 @@ private:
Ui::TrendsWidget *ui; Ui::TrendsWidget *ui;
UserData m_UserData; UserData m_UserData;
UserInfo m_UserInfo; UserInfo m_UserInfo;
QStandardItemModel* model;
}; };
#endif // TRENDSWIDGET_H #endif // TRENDSWIDGET_H

27
widget/trendswidget.ui
Unescape View File

@ -6,16 +6,37 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>983</width> <width>1440</width>
<height>647</height> <height>647</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout" stretch="6,4">
<item> <item>
<widget class="QTableView" name="tableView"/> <widget class="QTableWidget" name="tableWidget">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QTabWidget" name="tabWidget">
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Tab 1</string>
</attribute>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Tab 2</string>
</attribute>
</widget>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>

Write Preview
Loading…
Cancel
Save