add help url, add feature for change current curve wen point selected

Author: hustlei

src/core/graphicsView.py

@@ -215,7 +215,9 @@ def mouseMoveEvent(self, evt):
                 item = items[0]
         if item:
             if isinstance(item, QGraphicsPointItem) and item.parentCurve:
-                self.changeCurrentCurve(item.parentCurve)
+                # self.changeCurrentCurve(item.parentCurve)
+                self.updateCurve(self.currentCurve, Qt.red)
+                self.updateCurvePoints(self.currentCurve)
                 self.sigModified.emit(True)
             elif isinstance(item, QGraphicsAxesItem):
                 if item.axis == "x":
@@ -416,6 +418,16 @@ def slotSceneSeletChanged(self):
             self.scene.clearSelection()
             return
         # item = items[0]
+        item = self.scene.focusItem()
+        if not item:
+            items = self.scene.selectedItems()
+            if len(items) != 1:
+                return
+            else:
+                item = items[0]
+        if item:
+            if isinstance(item, QGraphicsPointItem) and item.parentCurve:
+                self.changeCurrentCurve(item.parentCurve)
 
     def deleteItem(self, item):
         """delete point on curve or axis object"""

src/core/mainwin.py

@@ -194,12 +194,14 @@ def showoriginalgraph():
         # help
         aboutText = "<b><center>" + self.title + "</center></b><br><br>"
         aboutText += self.tr(
-            "This software is a Tool for digitize graph(like figure scanned from book).<br><br>")
+            "This software is for digitizing graph(such as figures scanned from book).<br><br>")
         aboutText += self.tr(
             "author: lileilei<br>website: <a href='https://github.com/hustlei/GraphDigitizer'>https"
-            "://github.com/hustlei/GraphDigitizer</a><br><br>welcom communicate with me: [email protected] ")
+            "://github.com/hustlei/GraphDigitizer</a><br><br>welcome anyone to communicate with me: [email protected] ")
         aboutText += "<br>copyright &copy; 2020, lileilei@WuHan."
         self.actions["about"].triggered.connect(lambda: QMessageBox.about(self, "about", aboutText))
+        import webbrowser
+        self.actions["help"].triggered.connect(lambda: webbrowser.open("https://github.com/hustlei/GraphDigitizer"))
 
     def initAxesAndCurveTable(self):
         self.axesxTable.setColumnWidth(0, 120)

src/core/mainwinbase.py

@@ -109,7 +109,6 @@ def keys2str(standardkey):
                                            None,
                                            ':appres.img/select.png',
                                            checkable=True)
-        self.actions["select"].setChecked(True)
         self.actions["axesx"] = createAct(self.tr("Set x axis postions"),
                                           self.tr("Set x axis position"),
                                           None,
@@ -125,7 +124,7 @@ def keys2str(standardkey):
                                           None,
                                           ':appres.img/curve.png',
                                           checkable=True)
-        self.actions["del"] = createAct(self.tr("&del point or curve"), self.tr("delete"), QKeySequence.Delete,
+        self.actions["del"] = createAct(self.tr("&del point or axis"), self.tr("delete"), QKeySequence.Delete,
                                         ':appres.img/delete.png')
         self.actions["addcurve"] = createAct(self.tr("add a new curve"), self.tr("add a new curve"),
                                              None, ':appres.img/new.png')
@@ -173,6 +172,7 @@ def keys2str(standardkey):
         self.actions["config"] = createAct(self.tr("&Config"), self.tr("settings"), None, ":appres.img/config.png")
 
         self.actions["about"] = createAct(self.tr("&About"), self.tr("About"))
+        self.actions["help"] = createAct(self.tr("&Help"), self.tr("Help"))
 
         # self.exitAct.triggered.connect(qApp.exit)#等价于qApp.quit
         self.actions["exit"].triggered.connect(self.close)
@@ -232,6 +232,8 @@ def createMenubar(self):
 
         self.menus["Config"].addAction(self.actions["config"])
 
+        self.menus["Help"].addAction(self.actions["help"])
+        self.menus["Help"].addSeparator()
         self.menus["Help"].addAction(self.actions["about"])
 
         for m in self.menus.values():

src/core/widgets/fit.py

@@ -30,7 +30,7 @@ def initUI(self):
         self.toolbar = QToolBar(self)
         self.curveCombobox = QComboBox()
         self.curveCombobox.setMinimumWidth(150)
-        self.curveCombobox.setMinimumHeight(26)
+        self.curveCombobox.setMinimumHeight(22)
         self.fitBtn = QPushButton(self.tr("fit"))
         self.toolbar.addWidget(self.curveCombobox)
         self.toolbar.addWidget(self.fitBtn)

todo.md

@@ -1,10 +1,8 @@
 
 # Todo
 
-1. change current curve when a new curve selected 
 1. double click to change curve name
 1. order the points table of current curve by ascending order of x axis
-1. fitting curves and interpolation
 
 for future
 
@@ -16,4 +14,6 @@ for future
 # performed
 
 + 2020.05.06:fixed rename curve error
-+ 2020.05.06:add delete curve tool
++ 2020.05.06:add delete curve tool
++ 2020.05.06:selected curve automatically be the current curve
++ 2020.05.05:fitting curve by polynamial