Code for avoiding possible problem on Window while importing html module

Add possibility to load CanOpen DS-301 Help even if no index is selected

diff --git a/objdictgen/doc_index/DS301_index.py b/objdictgen/doc_index/DS301_index.py
index bf70f5902407b333871c671d146996cbedb7b3a5..cc4832077e2510f7864644b2ee4163e9959420f2 100644 (file)
--- a/objdictgen/doc_index/DS301_index.py
+++ b/objdictgen/doc_index/DS301_index.py
@@ -6,13 +6,14 @@ import os
 DS301_PDF_INDEX = {0x1000: 86, 0x1001: 87, 0x1002: 87, 0x1003: 88, 0x1005: 89, 0x1006: 90, 0x1007: 90, 0x1008: 91, 0x1009: 91, 0x100A: 91, 0x100C: 92, 0x100D: 92, 0x1010: 92, 0x1011: 94, 0x1012: 97, 0x1013: 98, 0x1014: 98, 0x1015: 99, 0x1016: 100, 0x1017: 101, 0x1018: 101, 0x1020: 117, 0x1200: 103, 0x1201: 103, 0x1280: 105, 0x1400: 106, 0x1600: 109, 0x1800: 111, 0x1A00: 112}
 
 def OpenPDFDocIndex(index):
-    if index not in DS301_PDF_INDEX:
-           return """No documentation for this index."""
     if not os.path.isfile("../doc/301_v04000201.pdf"):
         return """No documentation file available.
 Please read can festival documentation to know how to obtain one."""
     try:
-        os.system("xpdf -remote DS301 ../doc/301_v04000201.pdf "+str(DS301_PDF_INDEX[index])+" &")
+        if index in DS301_PDF_INDEX:
+            os.system("xpdf -remote DS301 ../doc/301_v04000201.pdf "+str(DS301_PDF_INDEX[index])+" &")
+        else:
+            os.system("xpdf -remote DS301 ../doc/301_v04000201.pdf &")
         return True
     except:
         return """Check if xpdf is correctly installed on your computer"""

diff --git a/objdictgen/objdictedit.py b/objdictgen/objdictedit.py
index cc6a07041c2578d1ebd616339714595fbcf90e16..5d2b034a4f5217f276d37617ca3621481e3f3c95 100755 (executable)
--- a/objdictgen/objdictedit.py
+++ b/objdictgen/objdictedit.py
@@ -23,7 +23,6 @@
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 from wxPython.wx import *
-from wxPython.html import *
 from wxPython.grid import *
 import wx
 from wx.lib.anchors import LayoutAnchors
@@ -32,30 +31,79 @@ import wx.grid
 from types import *
 import os, re, platform, sys, time, traceback, getopt
 
-__version__ = "$Revision: 1.9 $"
+__version__ = "$Revision: 1.10 $"
 
 from nodemanager import *
 from node import OD_Subindex,OD_MultipleSubindexes,OD_IdenticalSubindexes,OD_IdenticalIndexes
 from doc_index.DS301_index import *
 
-wxEVT_HTML_URL_CLICK = wxNewId()
+try:
+    from wxPython.html import *
 
-def EVT_HTML_URL_CLICK(win, func):
-    win.Connect(-1, -1, wxEVT_HTML_URL_CLICK, func)
+    wxEVT_HTML_URL_CLICK = wxNewId()
 
-class wxHtmlWindowUrlClick(wxPyEvent):
-    def __init__(self, linkinfo):
-        wxPyEvent.__init__(self)
-        self.SetEventType(wxEVT_HTML_URL_CLICK)
-        self.linkinfo = (linkinfo.GetHref(), linkinfo.GetTarget())
+    def EVT_HTML_URL_CLICK(win, func):
+        win.Connect(-1, -1, wxEVT_HTML_URL_CLICK, func)
 
-class wxUrlClickHtmlWindow(wxHtmlWindow):
-    """ HTML window that generates and OnLinkClicked event.
+    class wxHtmlWindowUrlClick(wxPyEvent):
+        def __init__(self, linkinfo):
+            wxPyEvent.__init__(self)
+            self.SetEventType(wxEVT_HTML_URL_CLICK)
+            self.linkinfo = (linkinfo.GetHref(), linkinfo.GetTarget())
 
-    Use this to avoid having to override HTMLWindow
-    """
-    def OnLinkClicked(self, linkinfo):
-        wxPostEvent(self, wxHtmlWindowUrlClick(linkinfo))
+    class wxUrlClickHtmlWindow(wxHtmlWindow):
+        """ HTML window that generates and OnLinkClicked event.
+
+        Use this to avoid having to override HTMLWindow
+        """
+        def OnLinkClicked(self, linkinfo):
+            wxPostEvent(self, wxHtmlWindowUrlClick(linkinfo))
+    
+#-------------------------------------------------------------------------------
+#                                Html Frame
+#-------------------------------------------------------------------------------
+
+    [wxID_HTMLFRAME, wxID_HTMLFRAMEHTMLCONTENT] = [wx.NewId() for _init_ctrls in range(2)]
+
+    class HtmlFrame(wx.Frame):
+        def _init_ctrls(self, prnt):
+            # generated method, don't edit
+            wx.Frame.__init__(self, id=wxID_HTMLFRAME, name='HtmlFrame',
+                  parent=prnt, pos=wx.Point(320, 231), size=wx.Size(853, 616),
+                  style=wx.DEFAULT_FRAME_STYLE, title='')
+            self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=wxID_HTMLFRAME)
+            
+            self.HtmlContent = wxUrlClickHtmlWindow(id=wxID_HTMLFRAMEHTMLCONTENT,
+                  name='HtmlContent', parent=self, pos=wx.Point(0, 0),
+                  size=wx.Size(-1, -1), style=wxHW_SCROLLBAR_AUTO|wxHW_NO_SELECTION)
+            EVT_HTML_URL_CLICK(self.HtmlContent, self.OnLinkClick)
+
+        def __init__(self, parent, opened):
+            self._init_ctrls(parent)
+            self.HtmlFrameOpened = opened
+        
+        def SetHtmlCode(self, htmlcode):
+            self.HtmlContent.SetPage(htmlcode)
+            
+        def SetHtmlPage(self, htmlpage):
+            self.HtmlContent.LoadPage(htmlpage)
+            
+        def OnCloseFrame(self, event):
+            self.HtmlFrameOpened.remove(self.GetTitle())
+            event.Skip()
+        
+        def OnLinkClick(self, event):
+            url = event.linkinfo[0]
+            try:
+                import webbrowser
+            except ImportError:
+                wxMessageBox('Please point your browser at: %s' % url)
+            else:
+                webbrowser.open(url)
+    
+    Html_Window = True
+except:
+    Html_Window = False
 
 def create(parent):
     return objdictedit(parent)
@@ -806,16 +854,17 @@ class objdictedit(wx.Frame):
 
         parent.Append(help='', id=wxID_OBJDICTEDITHELPMENUITEMS0,
               kind=wx.ITEM_NORMAL, text='DS-301 Standard\tF1')
-        parent.Append(help='', id=wxID_OBJDICTEDITHELPMENUITEMS1,
-              kind=wx.ITEM_NORMAL, text='CAN Festival Docs\tF2')
-        parent.Append(help='', id=wxID_OBJDICTEDITHELPMENUITEMS2,
-              kind=wx.ITEM_NORMAL, text='About')
         self.Bind(wx.EVT_MENU, self.OnHelpDS301Menu,
               id=wxID_OBJDICTEDITHELPMENUITEMS0)
-        self.Bind(wx.EVT_MENU, self.OnHelpCANFestivalMenu,
-              id=wxID_OBJDICTEDITHELPMENUITEMS1)
-        self.Bind(wx.EVT_MENU, self.OnAboutMenu,
-              id=wxID_OBJDICTEDITHELPMENUITEMS2)
+        if Html_Window:
+            parent.Append(help='', id=wxID_OBJDICTEDITHELPMENUITEMS1,
+                  kind=wx.ITEM_NORMAL, text='CAN Festival Docs\tF2')
+            parent.Append(help='', id=wxID_OBJDICTEDITHELPMENUITEMS2,
+                  kind=wx.ITEM_NORMAL, text='About')
+            self.Bind(wx.EVT_MENU, self.OnHelpCANFestivalMenu,
+                  id=wxID_OBJDICTEDITHELPMENUITEMS1)
+            self.Bind(wx.EVT_MENU, self.OnAboutMenu,
+                  id=wxID_OBJDICTEDITHELPMENUITEMS2)
 
     def _init_coll_FileMenu_Items(self, parent):
         # generated method, don't edit
@@ -1001,17 +1050,25 @@ class objdictedit(wx.Frame):
         event.Skip()
 
     def OnHelpDS301Menu(self, event):
+        find_index = False
         selected = self.FileOpened.GetSelection()
         if selected >= 0:
             window = self.FileOpened.GetPage(selected)
             result = window.GetSelection()
             if result:
+                find_index = True
                 index, subIndex = result
                 result = OpenPDFDocIndex(index)
                 if type(result) == StringType:
                     message = wxMessageDialog(self, result, "ERROR", wxOK|wxICON_ERROR)
                     message.ShowModal()
                     message.Destroy()
+        if not find_index:
+            result = OpenPDFDocIndex(None)
+            if type(result) == StringType:
+                message = wxMessageDialog(self, result, "ERROR", wxOK|wxICON_ERROR)
+                message.ShowModal()
+                message.Destroy()
         event.Skip()
         
     def OnHelpCANFestivalMenu(self, event):
@@ -2217,52 +2274,6 @@ class CreateNodeDialog(wx.Dialog):
             else:
                 self.Profile.SetStringSelection("None")
         event.Skip()
-
-
-
-#-------------------------------------------------------------------------------
-#                                Html Frame
-#-------------------------------------------------------------------------------
-
-
-[wxID_HTMLFRAME, wxID_HTMLFRAMEHTMLCONTENT, 
-] = [wx.NewId() for _init_ctrls in range(2)]
-
-class HtmlFrame(wx.Frame):
-    def _init_ctrls(self, prnt):
-        # generated method, don't edit
-        wx.Frame.__init__(self, id=wxID_HTMLFRAME, name='HtmlFrame',
-              parent=prnt, pos=wx.Point(320, 231), size=wx.Size(853, 616),
-              style=wx.DEFAULT_FRAME_STYLE, title='')
-        self.Bind(wx.EVT_CLOSE, self.OnCloseFrame, id=wxID_HTMLFRAME)
-        
-        self.HtmlContent = wxUrlClickHtmlWindow(id=wxID_HTMLFRAMEHTMLCONTENT,
-              name='HtmlContent', parent=self, pos=wx.Point(0, 0),
-              size=wx.Size(-1, -1), style=wxHW_SCROLLBAR_AUTO|wxHW_NO_SELECTION)
-        EVT_HTML_URL_CLICK(self.HtmlContent, self.OnLinkClick)
-
-    def __init__(self, parent, opened):
-        self._init_ctrls(parent)
-        self.HtmlFrameOpened = opened
-    
-    def SetHtmlCode(self, htmlcode):
-        self.HtmlContent.SetPage(htmlcode)
-        
-    def SetHtmlPage(self, htmlpage):
-        self.HtmlContent.LoadPage(htmlpage)
-        
-    def OnCloseFrame(self, event):
-        self.HtmlFrameOpened.remove(self.GetTitle())
-        event.Skip()
-    
-    def OnLinkClick(self, event):
-        url = event.linkinfo[0]
-        try:
-            import webbrowser
-        except ImportError:
-            wxMessageBox('Please point your browser at: %s' % url)
-        else:
-            webbrowser.open(url)
     
 
 #-------------------------------------------------------------------------------