update readme todo etc.

Author: hustlei

README.md

@@ -17,6 +17,7 @@ Digtize the graph(figure/chart) from image format, such as graph scanned from bo
 + Setting multiple x-axis values or y-axis values
 + Display axes grid predict by x-ais and y-axis setting
 + Scale background(graph) image
++ fiting any digitized curve by polynomials
 + Export csv format curve points data
 + Switch different system themes (xp, vista etc.)
 

README_zh-CN.md

@@ -19,6 +19,7 @@ ps：本人经常遇到需要使用扫描的曲线图，但是十分不便，所
 + x坐标轴及y坐标轴均可以设置多个点
 + 根据坐标轴设置，推断坐标轴各个点位置，并以网格形式显示
 + 可以缩放曲线图图片
++ 多项式拟合曲线
 + 导出 csv 格式数据
 + 支持切换系统主题(xp, vista etc.)
 

src/core/graphicsView.py

@@ -14,7 +14,7 @@
 from PyQt5.QtCore import pyqtSignal, QRectF, QPoint, QPointF, Qt, QItemSelectionModel, QModelIndex, QItemSelection
 from PyQt5.QtGui import QStandardItemModel, QStandardItem, QPainter, QIcon, QPen, QPixmap, QColor
 from PyQt5.QtWidgets import (QGraphicsView, QGraphicsScene, QGraphicsPixmapItem, QGraphicsItem, QGraphicsLineItem,
-                             QInputDialog, QLineEdit)
+                             QInputDialog, QLineEdit, QStyledItemDelegate, qApp)
 
 from core.enums import OpMode, PointType, RandItem
 from core.graphicsItems import QGraphicsPointItem, QGraphicsAxesItem
@@ -515,6 +515,9 @@ def addCurve(self, name=None):
         item3.setAutoTristate(False)
         item3.setEditable(False)
         item3.setCheckState(Qt.Checked)
+        item1.setTextAlignment(Qt.AlignCenter)
+        item2.setTextAlignment(Qt.AlignCenter)
+        item3.setTextAlignment(Qt.AlignCenter)
         self.curveModel.appendRow([item1, item2, item3])
         self.changeCurrentCurve(name)
         self.sigModified.emit(True)
@@ -916,3 +919,21 @@ def switch(self, isOn):
         else:
             self.setIcon(self.iconoff)
         self.isOn = isOn
+
+
+# class IconDelegate(QStyledItemDelegate):
+#     def __init__(self, parent=None):
+#         super().__init__(parent)
+#
+#     def paint(painter, option, index):  # QStyleOptionViewItem QModelIndex
+#         # 判断是不是icon所在的index
+#         if index.column() == 0:
+#             QStyledItemDelegate.paint(painter, option, index)
+#
+#             QPixmap
+#             pixmap = QPixmap("icon.png")
+#             qApp.style().drawItemPixmap(painter, option.rect, Qt.AlignCenter, QPixmap(pixmap))
+
+# tableWidget->setItemDelegate(new IconDelegate(this));
+# tableWidget->setItemDelegateForColumn(colum, new IconDelegate(this));
+# tableWidget->setItemDelegateForRow(row, new IconDelegate(this));

src/core/mainwin.py

@@ -171,7 +171,7 @@ def changecurvetable(index):
             if index.column() == 0:
                 self.view.changeCurrentCurve(self.view.curveModel.item(index.row(), 1).text())
             elif index.column() == 1:
-                self.view.renameCurve(name=self.view.curveModel.item(index.row(),1).text())
+                self.view.renameCurve(name=self.view.curveModel.item(index.row(), 1).text())
 
         self.curveTable.doubleClicked.connect(changecurvetable)
 

todo.md

@@ -1,19 +1,22 @@
 
 # Todo
 
-1. double click to change curve name
 1. order the points table of current curve by ascending order of x axis
 
 for future
 
 1. settings
     + export precision
+    + curve colors and types
+    + recent file
 2. i18n
-3. installition
+3. redo undo
+4. installition
 
 # performed
 
 + 2020.05.06:fixed rename curve error
 + 2020.05.06:add delete curve tool
 + 2020.05.06:selected curve automatically be the current curve
 + 2020.05.05:fitting curve by polynamial
++ double click to change curve name