Changeset 838

Timestamp:

09/13/05 14:44:38 (3 years ago)

Author:

tzanko

Message:

Hopefully fixed performance issues in #11

Files:

• nbshell/trunk/ChangeLog (modified) (1 diff)
• nbshell/trunk/nbshell/IPythonLog.py (modified) (6 diffs)
• nbshell/trunk/nbshell/PythonPlugin.py (modified) (2 diffs)
• nbshell/trunk/nbshell/PythonWidget.py (modified) (1 diff)
• nbshell/trunk/nbshell/editwindow.py (modified) (1 diff)

nbshell/trunk/ChangeLog

@@ -1 +1 @@
-2005-09-13  Tzanko Matev  <tsanko@gmail.com>
+
+    * editwindow.py (EditWindow.__config): Turned Python lexer off. It
+    caused lagging, and was the reason for the performance issues
+    described in ticket #11. This should solve the problem
-
-    * IPythonLog.py (IPythonLog.filename_iter): Changed generation of

nbshell/trunk/nbshell/IPythonLog.py

@@ -32 +32 @@
-from lxml import etree
-
-findnew
+*
-
-#TODO: Fix the plotting API
@@ -233 +233 @@
-        """ This methods runs the input lines. """
-        #print 'running code...' #dbg
-
+#delta_time('__run: start')
-        print 'In[%d]: '%cell.number,cell.input #dbg
-        self.output = '' #used by displayhook to store output
@@ -245 +245 @@
-                                      displayhook = self.displayhook,\
-                                      stdout = cout, stderr = cerr)
-
+#delta_time('__run: code run') #dbg
-        #Retrieve stdout
-        text = '\n' + cout.getvalue()
@@ -255 +255 @@
-                                  for x in text.splitlines(False)]) #wrap stdout
-        cout.close()
-
+#delta_time('__run: handled stdout') #dbg
-        #Retrieve stderr
-        text = '\n' + cerr.getvalue()
@@ -265 +265 @@
-                                  for x in text.splitlines(False)]) #wrap stderr
-        cerr.close()
+        #delta_time('__run: handled stderr') #dbg
-        
-        if self.output != '':
@@ -270 +271 @@
-                                   for x in self.output.splitlines(False)]) #wrap the output
-            #print 'wrapped output ->', self.output.text #dbg
+        #delta_time('__run: handled output') #dbg
-
-        print 'Out[%d]: '%cell.number, cell.output #dbg

nbshell/trunk/nbshell/PythonPlugin.py

@@ -366 +366 @@
-        #self.promptlen[i] holds the length of the prompt of cell i
-        self.promptlens = []
+        #delta_time('Update start') #dbg
-        for i, cell in enumerate(cells):
-            number =  cell.number
@@ -424 +425 @@
-            #self.line2log.append(None) #append ane
-            #empty line at the end outtext.write('\n')
+        #delta_time('Update cycle end') #dbg
-        self.window.SetText(outtext.getvalue())
+        #delta_time('Text drawn on screen') #dbg
-        self.window.GotoPos(self.window.GetTextLength())
+        #delta_time('Update end') #dbg
-        #print "line2log->", self.window.line2log #dbg
-

nbshell/trunk/nbshell/PythonWidget.py

@@ -214 +214 @@
-        # Prevent modification of previously submitted
-        # commands/responses.
-if not self.view.CanEdit():
-
+#if not self.view.CanEdit(): #TODO: why is this here? We already checked in OnKeyDown
+#
-        key = event.KeyCode()
-        currpos = self.GetCurrentPos()

nbshell/trunk/nbshell/editwindow.py

@@ -107 +107 @@
-        #self.SetMarginWidth(1, 40)
-
-
+#
-        self.SetKeyWords(0, ' '.join(keyword.kwlist))
-