add the commit of code

Author: kmolLin

Pyquino.e4p

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
 <!-- eric project file for project Pyquino -->
-<!-- Saved: 2017-07-14, 14:01:37 -->
+<!-- Saved: 2017-08-11, 12:13:43 -->
 <!-- Copyright (C) 2017 you-sheng,  -->
 <Project version="5.1">
   <Language>en_US</Language>
@@ -13,21 +13,23 @@
   <Email></Email>
   <Eol index="0"/>
   <Sources>
+    <Source>core/GraphyViewModule.py</Source>
+    <Source>core/RightClick.py</Source>
     <Source>core/Ui_mainwindow.py</Source>
-    <Source>core/Ui_mainwindow2.py</Source>
+    <Source>core/Ui_settingForm.py</Source>
     <Source>core/__init__.py</Source>
     <Source>core/gcode/gcodeParser.py</Source>
     <Source>core/graphy/Ui_graphy.py</Source>
     <Source>core/graphy/__init__.py</Source>
     <Source>core/graphy/graphy.py</Source>
-    <Source>core/graphy_test.py</Source>
     <Source>core/info.py</Source>
     <Source>core/mainwindow.py</Source>
     <Source>core/monitor/Ui_machine_mointor.py</Source>
     <Source>core/monitor/__init__.py</Source>
     <Source>core/monitor/machine_mointor.py</Source>
     <Source>core/serialportcontext.py</Source>
     <Source>core/serialportedittext.py</Source>
+    <Source>core/settingForm.py</Source>
     <Source>core/vrep/Ui_vrep_setting.py</Source>
     <Source>core/vrep/vrep_setting.py</Source>
     <Source>core/vrep/vrep_test.py</Source>
@@ -44,10 +46,10 @@
     <Source>testCode/test.py</Source>
   </Sources>
   <Forms>
+    <Form>core/settingForm.ui</Form>
     <Form>core/gcode/mainwindow.ui</Form>
     <Form>core/graphy/graphy.ui</Form>
     <Form>core/mainwindow.ui</Form>
-    <Form>core/mainwindow2.ui</Form>
     <Form>core/monitor/machine_mointor.ui</Form>
     <Form>core/monitor/mainwindow.ui</Form>
     <Form>core/vrep/vrep_setting.ui</Form>

_eric6project/Pyquino.e4q

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
 <!-- eric6 user project file for project Pyquino -->
-<!-- Saved: 2017-07-20, 15:08:10 -->
+<!-- Saved: 2017-11-19, 13:36:29 -->
 <!-- Copyright (C) 2017 you-sheng,  -->
 <UserProject version="4.0"/>

_eric6project/Pyquino.e6t

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Tasks SYSTEM "Tasks-6.0.dtd">
 <!-- eric6 tasks file for project Pyquino -->
-<!-- Saved: 2017-08-07, 20:28:58 -->
+<!-- Saved: 2017-11-19, 13:38:53 -->
 <Tasks version="6.0">
   <ProjectScanFilter></ProjectScanFilter>
-  <Task priority="1" completed="False" type="1" uid="{2672eadf-84b3-48c4-ac30-d495eb0b856a}">
-    <Summary>TODO: not implemented yet</Summary>
+  <Task priority="1" completed="False" type="1" uid="{ffbfc3fe-6425-4797-be6e-85fc94452adc}">
+    <Summary>TODO: context menu not yet</Summary>
     <Description></Description>
-    <Created>2017-08-07, 20:28:55</Created>
+    <Created>2017-11-19, 13:38:50</Created>
     <Resource>
       <Filename>core/mainwindow.py</Filename>
-      <Linenumber>424</Linenumber>
+      <Linenumber>91</Linenumber>
     </Resource>
   </Task>
 </Tasks>

core/mainwindow.py

@@ -32,18 +32,7 @@ def __init__(self, args, parent=None):
         super(MainWindow, self).__init__(parent)
         self.setupUi(self)
         rightClick(self)
-        '''
-        pal = QPalette()
-        pal.setColor(QPalette.Background, QColor(125,125 ,125))
-        
-        self.setAutoFillBackground(True)
-        self.setPalette(pal)
-        '''
-        print(args)
         self.initForms()
-
-        #self.comboBoxBaud.setCurrentIndex(len(bauds) - 1)        
-        
 
     def initForms(self):
 
@@ -54,48 +43,39 @@ def initForms(self):
             self.comboBoxPort.addItems(ports)
             print(ports)
         else:
-            #todo:scan system serial port
             self.__scanSerialPorts__()
-        
+        # setting bauds and get serial port
         bauds = ["50","75","134","110","150","200","300","600","1200","2400","4800","9600","14400","19200","38400","56000","57600",
             "115200"]
         self.comboBoxBaud.addItems(bauds)
         self.comboBoxBaud.setCurrentIndex(len(bauds) - 1)
-        
+        # setting Checkbox 
         checks = ["None","Odd","Even","Zero","One"]
         self.comboBoxCheckSum.addItems(checks)
         self.comboBoxCheckSum.setCurrentIndex(len(checks) - 1)
-        
+        # setting start Bit of the hex
         bits = ["4 Bits", "5 Bits","6 Bits", "7 Bits", "8 Bits"]
         self.comboBoxBits.addItems(bits)
         self.comboBoxBits.setCurrentIndex(len(bits) - 1)
-        
+        #setting stop bit of the box
         stopbits = ["1 Bit","1.5 Bits","2 Bits"];
         self.comboBoxStopBits.addItems(stopbits)
         self.comboBoxStopBits.setCurrentIndex(0)
-        
-        
-        #self._auto_send_signal.connect(self.__auto_send_update__)
-        
+        # get the comboBox get number
         port = self.comboBoxPort.currentText()
         baud = int("%s" % self.comboBoxBaud.currentText(), 10)
         self._serial_context_ = serialportcontext.SerialPortContext(port = port,baud = baud)
 
-#        self.lineEditReceivedCounts.setText("0")
-#        self.lineEditSentCounts.setText("0")
         self.pushButtonOpenSerial.clicked.connect(self.__open_serial_port__)
-       # self.pushButtonClearRecvArea.clicked.connect(self.__clear_recv_area__)
         self.pushButtonSendData.clicked.connect(self.__send_data__)
         self._receive_signal.connect(self.__display_recv_data__)
-       # self.pushButtonOpenRecvFile.clicked.connect(self.__save_recv_file__)
         self.actionSend.triggered.connect(self.__open_send_file__)
         self.actionOpenGL.triggered.connect(self.__opengl__)
         self.actionVrep.triggered.connect(self.__teset__)
         self._send_file_data = ''
         self.numberx = 0
         self.numbery = 0
         self.numberz = 0
-        #self.__control__()
         self.actionControl.triggered.connect(self.__control__)
 
         ##machine_control button setting
@@ -107,9 +87,8 @@ def initForms(self):
         self.zupButton.clicked.connect(self.__zupButton__)
         self.zdownButton.clicked.connect(self.__zdownButton__)
         self.graphyViewModule.insertWidget(1, graphy())
-        # def __auto_send_update__(self):
-        #    self.lineEditSentCounts.setText("%d" % self._serial_context_.getSendCounts())
 
+    #TODO: context menu not yet
     @pyqtSlot(QPoint)
     def on_treeWidget_context_menu(self, point):
         action = self.popMenu_treeWidget.exec_(self.treeWidget.mapToGlobal(point))
@@ -126,14 +105,7 @@ def on_treeWidget_context_menu(self, point):
             except:
                 print("No select")
         elif action == self.action_treeWidget_send:
-            try :
-                ## 0807 not yet to do
-                data = 'asa'
-                if self._serial_context_.isRunning():
-                    if len(data) > 0: self._serial_context_.send(data, 0)
-                    print(self.tree.currentItem().takeChildren())
-            except:
-                pass
+            self.graphyViewModule()
 
 
     def reflesh(self):
@@ -177,7 +149,7 @@ def __control__(self):
         print("control open")
         dlg = Machine()
         dlg.show()
-        if dlg.exec_(): pass
+        dlg.exec_()
 
     def __open_send_file__(self):
         filename = QFileDialog.getOpenFileName(self, caption="Open Send File")
@@ -326,7 +298,7 @@ def __open_serial_port__(self):
                 self.pushButtonOpenSerial.setText(u'close')
             except Exception as e:
                 print("error")
-                #QtGui.QMessageBox.critical(self,u"打开端口",u"打开端口失败,请检查!")
+                #QtGui.QMessageBox.critical(self,u"Open port",u"please check the port!")
 
     def __clear_recv_area__(self): self.textEditReceived.clear()
     def __clear_send_area__(self): self.textEditSent.clear()
@@ -411,20 +383,6 @@ def on_homeButton_clicked(self):
 
 
 
-    @pyqtSlot(QTreeWidgetItem, QTreeWidgetItem)
-    def on_tree_currentItemChanged(self, current, previous):
-        """
-        Slot documentation goes here.
-        
-        @param current DESCRIPTION
-        @type QTreeWidgetItem
-        @param previous DESCRIPTION
-        @type QTreeWidgetItem
-        """
-        # TODO: not implemented yet
-        #print(current.text(0))
-
-    
     @pyqtSlot(QTreeWidgetItem, int)
     def on_tree_itemChanged(self, item, column):
         if column==0:

core/mainwindow.ui

@@ -749,11 +749,14 @@
          </rect>
         </property>
         <property name="text">
-         <string>send</string>
+         <string>&amp;Send</string>
         </property>
         <property name="autoDefault">
          <bool>true</bool>
         </property>
+        <property name="default">
+         <bool>false</bool>
+        </property>
        </widget>
        <widget class="QTextEdit" name="textEditReceived">
         <property name="geometry">