Changeset 836

Timestamp:

09/13/05 12:05:34 (3 years ago)

Author:

tzanko

Message:

Fixed tickets #29 and #12. Worked on #11, did some optimizations. I cannot tell the difference on my machine, though.

Files:

• nbshell/trunk/ChangeLog (modified) (1 diff)
• nbshell/trunk/nbshell/IPythonLog.py (modified) (2 diffs)
• nbshell/trunk/nbshell/PythonPlugin.py (modified) (8 diffs)
• nbshell/trunk/nbshell/PythonWidget.py (modified) (4 diffs)
• nbshell/trunk/nbshell/frame.py (modified) (1 diff)

nbshell/trunk/ChangeLog

@@ +1 @@
+2005-09-13  Tzanko Matev  <tsanko@gmail.com>
+
+    * IPythonLog.py (IPythonLog.filename_iter): Changed generation of
+    figure names to avoid 'filename.nbk_1.png' names. This resolves
+    ticket #29.
+
+    * PythonPlugin.py (PythonNotebookViewPlugin): 
+    * PythonWidget.py (Shell.OnKeyDown): Added history. The user can
+    access it using Ctrl-Up/Alt-P, Ctrl-Down/Alt-N. This resolves 
+    ticket  #12.
+
+    * PythonPlugin.py (PythonNotebookView.Update, PromptLen, CanEdit):
+    Added a variable self.promptlens, which contains the lenghts of
+    the prompts and is generated when Update is called. This slightly
+    optimizes PromptLen and CanEdit. Added other small optimisations
+    to CanEdit. As a result typing should get a bit faster. See ticket
+    #11 for more info.
+
+    
-2005-09-12  Tzanko Matev  <tsanko@gmail.com>
-

nbshell/trunk/nbshell/IPythonLog.py

@@ -13 +13 @@
-__version__ = Release.version
-
+import os.path
-import sys
-import StringIO
@@ -114 +115 @@
-        """A generator function used for generating unique figure filenames"""
-        counter = 1
-self.doc.fileinfo['name'
+os.path.splitext(self.doc.fileinfo['name'])[0
-        while True:
-            yield "%s_%d.png"%(fn,counter)

nbshell/trunk/nbshell/PythonPlugin.py

@@ -97 +97 @@
-        self.view = None    #This plugin is designed for a single view. For
-                            #multiple views there should be some modifications
-print "block:"
+#print "block:" #dbg
-        #etree.dump(self.element) #dbg
-        self.cells = [self.log.log[int(x.attrib['number'])] for x in element]
@@ -185 +185 @@
-        self.prompt_in_tpl = 'In [%s]: '
-        self.prompt_out_tpl = 'Out[%s]: '
+        
+        self.hist_max_len = 666 #TODO: This must go in some configuration file
+        self.history = [] #FIFO of at most self.hist_max_len strings
+        self.hist_current = None #Index of the curret history item
+        
+    def add_to_history(self, line = None):
+        """Adds the line to the history. If line is None gets the current line
+        from the window"""
+        if line is None:
+            linenum = self.window.GetCurrentLine()
+            line = self.window.GetLine(linenum)[self.promptlens[self.line2log[linenum][0]]:]
+        
+        if line: #We don't need empty lines
+            self.history.append(line)
+            l = len(self.history)
+            if l > self.hist_max_len:
+                del(self.history[0])
+            self.hist_current = l-1
+    
+    def get_hist_item(self, dir= -1):
+        """Gets the next previous line from the history if dir<0 or the next
+        line if dir>0. If the history is empty return None"""
+
+        dir = dir/abs(dir)
+        if self.hist_current is None:
+            return None
+        self.hist_current+=dir
+        l = len(self.history)
+        if self.hist_current == l:
+            self.hist_current = 0
+        elif self.hist_current < 0:
+            self.hist_current = l-1
+        
+        return self.history[self.hist_current]
+    
+    def hist_replace(self, dir):
+        """Replaces the current line with prevoius (dir<0) or next (dir>0)
+        line from the history"""
+        
+        t = self.get_hist_item(dir)
+        if not t:
+            return
+        
+        pos = self.window.GetCurrentPos()
+        linenum = self.window.LineFromPosition(pos)
+
+        if not self.CanEdit(pos = pos, line = linenum):
+            return None
+
+        startpos = self.window.PositionFromLine(linenum) +\
+                 self.promptlens[self.line2log[linenum][0]]
+        endpos = self.window.GetLineEndPosition(linenum)
+
+        self.window.SetTargetStart(startpos)
+        self.window.SetTargetEnd(endpos)
+        self.window.ReplaceTarget(t)
+
-
-    def SetFocus(self):
@@ -307 +364 @@
-        # Here we set up the text which will be displayed in the window
-        outtext = StringIO.StringIO()
+        #self.promptlen[i] holds the length of the prompt of cell i
+        self.promptlens = []
-        for i, cell in enumerate(cells):
-            number =  cell.number
@@ -348 +407 @@
-            for j in range(len(lines)):
-                l2l_append((i, j+1))
+            
+            #set up self.promptlens
+            self.promptlens.append(len(prompt))
-                #print "i -> %s, id->%s, type->%s, text->%s"%(str(i), str(id), str(type), str(text))
-            #oldlinecnt = linecnt
@@ -398 +460 @@
-        if line is None: #a separator line
-            return 0
-
+return self.promptlens[line[0]]
-        #if line[1] != 1: #currently only the first line of a block is indented and has a prompt
-        #    return 0
-        
-        #get the number of digits of the number of the input
-
-
-
-
+#
+#
+#
+#
-    
-    def UpdateDoc(self):
@@ -541 +603 @@
-        #    return False
-        #Check if the current cell is an input cell
-
-
-
-
-
-
+
+
+
-        """Return true if the given editing operation should succeed at the
-        given position if pos is None use the current position. oper can be
@@ -561 +620 @@
-        
-        pos = pos or self.window.GetCurrentPos()
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-            return False
-
@@ -576 +641 @@
-        if oper == 'delete' and self.window.GetCharAt(pos) == ord('\n'):
-            #Check if the next line belongs to the same input
-self.line2log
-self.line2log
-self.line2log[line+1][0] == self.line2log
+l2l
+l2l
+l2l[line+1][0] == l2l
-        elif oper == 'backspace':
-            #Check if this is the first line
-self.line2log
+l2l
-        else:
-            return True

nbshell/trunk/nbshell/PythonWidget.py

@@ -266 +266 @@
-        if not shiftDown and not controlDown and key == wx.WXK_RETURN:
-            if self.view.CanEdit():
+                self.view.add_to_history()
-                self.view.InsertLineBreak()
-        #Shift-Return, (Shift-Enter) is used to execute the current input
@@ -271 +272 @@
-            if self.CallTipActive():
-                self.CallTipCancel()
+            self.view.add_to_history()
-            self.view.ProcessLine()
-        #Ctrl-Return will reexecute the current input and all cells after it
@@ -276 +278 @@
-            if self.CallTipActive():
-                self.CallTipCancel()
+            self.view.add_to_history()
-            self.view.ProcessLine(flag = True)
-
@@ -351 +354 @@
-        #    self.PasteAndRun()
-        # Replace with the previous command from the history buffer.
-#
-#
-#    self.OnHistoryReplace(step=+
+
+
+    self.view.hist_replace(dir=-
-        # Replace with the next command from the history buffer.
-#
-#
-#    self.OnHistoryReplace(step=-
+
+
+    self.view.hist_replace(dir=+
-        # Insert the previous command from the history buffer.
-        #elif (shiftDown and key == wx.WXK_UP) and self.view.CanEdit():

nbshell/trunk/nbshell/frame.py

@@ -128 +128 @@
-        menu.Append(filemenu, "&File")
-        menu.Append(insertmenu, "&Insert")
-&N
+N&
-        self.SetMenuBar(menu)
-