minor

Author: dmnfarrell

docs/index.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" type="text/css" href="css/github-light.css" media="screen">
     <link rel="stylesheet" type="text/css" href="css/print.css" media="print">
 
-    <title>TABLExplore</title>
+    <title>Tablexplore</title>
 
     <link rel="shortcut icon"
          href="favicon.ico" />
@@ -21,7 +21,7 @@
       <div class="inner">
 
         <div>
-        <h1>TABLExplore</h1>
+        <h1>Tablexplore</h1>
         <h2>Application for plotting and analyzing tabulated data.</h2>
        </div>
       </div>
@@ -100,7 +100,7 @@ <h2>
           </h2>  </p>
 
           <p> <h2>
-            <a href="https://dmnfarrell.github.com/">Blog</a>
+            <a href="https://dmnfarrell.github.com/">My Blog</a>
           </h2>  </p>
 
           <h3>

tablexplore/app.py

@@ -726,8 +726,9 @@ def preferences(self):
 
     def online_documentation(self,event=None):
         """Open the online documentation"""
+
         import webbrowser
-        link='https://pandastable.readthedocs.io/en/latest/'
+        link='https://github.com/dmnfarrell/tablexplore'
         webbrowser.open(link,autoraise=1)
         return
 

tablexplore/core.py

@@ -34,6 +34,8 @@
 iconpath = os.path.join(module_path, 'icons')
 font = 'monospace'
 fontsize = 12
+fontstyle = ''
+textalignment = None
 
 try:
     _fromUtf8 = QtCore.QString.fromUtf8
@@ -77,7 +79,8 @@ def __init__(self, parent=None, dataframe=None, app=None,
         l = self.layout = QGridLayout()
         l.setSpacing(2)
         l.addWidget(self.splitter,1,1)
-        self.table = DataFrameTable(self, dataframe, font=font, fontsize=fontsize)
+        self.table = DataFrameTable(self, dataframe, font=font,
+                                    fontsize=fontsize, align=textalignment)
         self.splitter.addWidget(self.table)
         if toolbar == True:
             self.createToolbar()
@@ -809,7 +812,7 @@ class DataFrameTable(QTableView):
     QTableView with pandas DataFrame as model.
     """
     def __init__(self, parent=None, dataframe=None, font='Arial',
-                    fontsize=12, *args):
+                    fontsize=12, align=None, *args):
 
         QTableView.__init__(self)
         self.parent = parent
@@ -1221,17 +1224,23 @@ def data(self, index, role=QtCore.Qt.DisplayRole):
             if type(value) != str:
                 if type(value) == float and np.isnan(value):
                     return ''
+                elif type(value) == np.float:
+                    return value
                 else:
                     return (str(value))
             else:
                 return '{0}'.format(value)
         elif (role == QtCore.Qt.EditRole):
             value = self.df.iloc[i, j]
-            print (value, type(value))
+            #print (value, type(value))
             if np.isnan(value):
                 return ''
             else:
-                return value
+                try:
+                    return float(value)
+                except:
+                    return str(value)
+
         elif role == QtCore.Qt.BackgroundRole:
             return QColor(self.bg)
 

tablexplore/dialogs.py

@@ -862,6 +862,8 @@ def __init__(self, parent, options=None):
         self.setWindowTitle('Preferences')
         self.resize(700, 200)
         self.setGeometry(QtCore.QRect(300,300, 600, 200))
+        self.setMaximumWidth(600)
+        self.setMaximumHeight(300)
         self.createWidgets()
         self.show()
         return
@@ -872,16 +874,15 @@ def createWidgets(self):
         import pylab as plt
         colormaps = sorted(m for m in plt.cm.datad if not m.endswith("_r"))
         self.opts = {'rowheight':{'type':'spinbox','default':18,'range':(5,50),'label':'row height'},
-                'cellwidth':{'type':'spinbox','default':80,'range':(10,300),'label':'cell width'},
-                'linewidth':{'type':'spinbox','default':1,'range':(1,10),'label':'grid line width'},
-                'align':{'type':'combobox','default':'w','items':['w','e','center'],'label':'text align'},
+                #'cellwidth':{'type':'spinbox','default':80,'range':(10,300),'label':'cell width'},
+                'alignment':{'type':'combobox','default':'w','items':['left','right','center'],'label':'text align'},
                 'font':{'type':'font','default':'Arial','default':core.font},
-                'fontstyle':{'type':'combobox','default':'','items':['','bold','italic']},
+                #'fontstyle':{'type':'combobox','default':'','items':['','bold','italic']},
                 'fontsize':{'type':'slider','default':core.fontsize,'range':(5,40),'interval':1,'label':'font size'},
                 'floatprecision':{'type':'spinbox','default':2, 'label':'precision'},
                 }
-        sections = {'table':['align','rowheight','cellwidth','linewidth'],
-                    'formats':['font','fontstyle','fontsize','floatprecision']}
+        sections = {'table':['alignment','rowheight'],
+                    'formats':['font','fontsize','floatprecision']}
 
         dialog, self.widgets = dialogFromOptions(self, self.opts, sections)
 
@@ -896,9 +897,6 @@ def createButtons(self, parent):
 
         bw = self.button_widget = QWidget(parent)
         vbox = QHBoxLayout(bw)
-        #button = QPushButton("Save")
-        #button.clicked.connect(self.save)
-        #vbox.addWidget(button)
         button = QPushButton("Apply")
         button.clicked.connect(self.apply)
         vbox.addWidget(button)
@@ -914,6 +912,8 @@ def apply(self):
         from . import core
         core.font = kwds['font']
         core.fontsize = kwds['fontsize']
+        core.textalignment = kwds['alignment']
+        #core.fontstyle = kwds['fontstyle']
         self.parent.refresh()
         return