code cleaning/refactoring

Author: PierreRaybaut

plugins/imageplotplugin.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 CEA
-# Pierre Raybaut
-# Licensed under the terms of the CECILL License
-# (see guiqwt/__init__.py for details)
+# Copyright © 2013 Pierre Raybaut
+# Licensed under the terms of the MIT License
 
 """
 imageplotplugin

plugins/matplotlibplugin.py

@@ -1,66 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009 Pierre Raybaut
+# Copyright © 2013 Pierre Raybaut
 # Licensed under the terms of the MIT License
 
-from PyQt4.QtGui import QIcon
-from PyQt4.QtDesigner import QPyDesignerCustomWidgetPlugin
+"""
+matplotlibplugin
+================
 
-import os
-from matplotlib import rcParams
-from matplotlibwidget import MatplotlibWidget
-
-rcParams['font.size'] = 9
-
-class MatplotlibPlugin(QPyDesignerCustomWidgetPlugin):
-    def __init__(self, parent=None):
-        QPyDesignerCustomWidgetPlugin.__init__(self)
-
-        self._initialized = False
-
-    def initialize(self, formEditor):
-        if self._initialized:
-            return
-
-        self._initialized = True
-
-    def isInitialized(self):
-        return self._initialized
-
-    def createWidget(self, parent):
-        return MatplotlibWidget(parent)
+A Matplotlib widget plugin for Qt Designer
+"""
 
-    def name(self):
-        return "MatplotlibWidget"
-
-    def group(self):
-        return "Python(x,y)"
-
-    def icon(self):
-        image = os.path.join(rcParams['datapath'], 'images', 'matplotlib.png')
-        return QIcon(image)
-
-    def toolTip(self):
-        return ""
-
-    def whatsThis(self):
-        return ""
-
-    def isContainer(self):
-        return False
-
-    def domXml(self):
-        return '<widget class="MatplotlibWidget" name="mplwidget">\n' \
-               '</widget>\n'
-
-    def includeFile(self):
-        return "matplotlibwidget"
+import os.path as osp
 
+from matplotlib import rcParams
+rcParams['font.size'] = 9
 
-if __name__ == '__main__':
-    import sys
-    from PyQt4.QtGui import QApplication
-    app = QApplication(sys.argv)
-    widget = MatplotlibWidget()
-    widget.show()
-    sys.exit(app.exec_())
+from guiqwt.qtdesigner import create_qtdesigner_plugin
+Plugin = create_qtdesigner_plugin("Matplotlib", "matplotlibwidget",
+              "MatplotlibWidget",
+              icon=osp.join(rcParams['datapath'], 'images', 'matplotlib.png'))

plugins/plotplugin.py

@@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 CEA
-# Pierre Raybaut
-# Licensed under the terms of the CECILL License
-# (see guiqwt/__init__.py for details)
+# Copyright © 2013 Pierre Raybaut
+# Licensed under the terms of the MIT License
 
 """
 plotplugin

setup.py

@@ -13,13 +13,18 @@ def get_data_files(dirname):
             flist.append(osp.join(dirpath, fname))
     return flist
 
-setup(name='PyQtdesignerplugins', version='1.0',
-      description='PyQtdesignerplugins installs Qt Designer plugins for PyQt4',
-      long_description="""PyQtdesignerplugins installs Python Qt designer plugins (Matplotlib, guiqwt, ...) in PyQt4 directory""", 
+PROJECT_NAME = 'PyQtdesignerplugins'
+
+setup(name=PROJECT_NAME, version='1.1',
+      description='%s installs Qt Designer plugins for PyQt4' % PROJECT_NAME,
+      long_description="""%s installs Python Qt designer plugins (Matplotlib, guiqwt, ...) in PyQt4 directory.
+
+%s is part of the WinPython distribution project.
+""" % (PROJECT_NAME, PROJECT_NAME), 
       py_modules = ['matplotlibwidget'],
       data_files=[(r'Lib\site-packages\PyQt4\plugins\designer\python', get_data_files('plugins'))],
       requires=["PyQt4 (>4.3)",],
       author = "Pierre Raybaut",
       author_email = 'pierre.raybaut@gmail.com',
-      url = 'http://code.google.com/p/winpython/',
+      url = 'http://winpython.sourceforge.net/',
       classifiers=['Operating System :: Microsoft :: Windows'])