Changeset 426:465ac4f60426 in orange-bioinformatics

Timestamp:

07/17/08 13:43:32 (5 years ago)

Author:

ales_erjavec <ales.erjavec@…>

Branch:

default

Convert:

38fdf5c6d549c77c8b497f8d925aca578d74f603

Message:

-fixed image widget layout problem

File:

• widgets/OWMoleculeVisualizer.py (modified) (14 diffs)

widgets/OWMoleculeVisualizer.py

@@ -5 +5 @@
 <priority>2015</priority>
 """
+
+from __future__ import with_statement
 
 import orange
@@ -64 +66 @@
     def syncfunc(func):
         def f(*args, **kw):
-            lock.acquire()
-            ret = func(*args, **kw)
-            lock.release()
+            with lock:
+                ret = func(*args, **kw)
             return ret
         return f
@@ -143 +144 @@
                 return inst
             except Exception, ex:
-                print "Image cache loading failed", ex
+                print "Image cache loading failed", filename, ex
+                from traceback import print_exception
+                print_exception(*sys.exc_info())
                 inst = cls(*args, **kw)
+                print inst
                 inst.cachefilename = filename
                 return inst
@@ -202 +206 @@
         self.selected=False
         self.label=QLabel()
+        self.label.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed)
         self.image=MolImage(master, self, context)
+        self.image.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.label.setText(context.title)
         self.label.setAlignment(Qt.AlignHCenter | Qt.AlignVCenter)
@@ -210 +216 @@
         layout.addWidget(self.image)
         self.setLayout(layout)
+        self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
         self.show()
 
@@ -297 +304 @@
         
     def resizeEvent(self, event):
+        print "in resizeEvent"
         QScrollArea.resizeEvent(self, event)
         size=event.size()
@@ -304 +312 @@
         if numColumns!=oldNumColumns:
             self.master.numColumns=numColumns
-            self.master.redrawImages(useCached=not self.master.overRideCache)
+            print "in resizeEvent calling redrawImages"
+##            self.master.redrawImages(useCached=not self.master.overRideCache)
+            self.master.rearrangeLayout()
 ##        print self.maximumSize().height(), self.viewport().maximumSize().height()
         
@@ -392 +402 @@
 ##        self.gridLayout.setAutoAdd(False)
         self.listBox=QListWidget(spliter)
-        self.connect(self.listBox, SIGNAL("highlighted(int)"), self.fragmentSelection)
+        self.connect(self.listBox, SIGNAL("currentRowChanged(int)"), self.fragmentSelection)
 ##        self.scrollArea.setFocusPolicy(QWidget.StrongFocus)
 ##        self.listBox.setFocusPolicy(QWidget.NoFocus)
@@ -588 +598 @@
         
     def fragmentSelection(self, index):
+        if index == -1:
+            index = 0
         self.selectedFragment=self.fragmentSmiles[index]
         self.selectMarkedMoleculesButton.setEnabled(bool(self.selectedFragment))
@@ -595 +607 @@
         
     def renderImages(self,useCached=False):
-        def fixNumColumns(numItems, numColumns):
-            if (self.imageSize+4)*(numItems/numColumns+1)>30000:
-                return numItems/(30000/(self.imageSize+4))
-            else:
-                return numColumns
+##        def fixNumColumns(numItems, numColumns):
+##            if (self.imageSize+4)*(numItems/numColumns+1)>30000:
+##                return numItems/(30000/(self.imageSize+4))
+##            else:
+##                return numColumns
         
         self.numColumns=self.scrollArea.width()/(self.imageSize+4) or 1
+        self.gridLayout = QGridLayout()
+        self.scrollArea.takeWidget()
+        self.molWidget = QWidget()
+        self.scrollArea.setWidget(self.molWidget)
+        self.molWidget.setLayout(self.gridLayout)
         self.imageWidgets=[]
         self.imageCache.newEpoch()
@@ -607 +624 @@
         self.fromCacheCount=0
         if self.showFragments and self.fragmentSmiles:
-            correctedNumColumns=fixNumColumns(len(self.fragmentSmiles[1:]), self.numColumns)
+            correctedNumColumns=self.numColumns #fixNumColumns(len(self.fragmentSmiles[1:]), self.numColumns)
             self.progressBarInit()
             for i,fragment in enumerate(self.fragmentSmiles[1:]):
@@ -628 +645 @@
                     return
             molSmiles=[(str(e[sAttr]), e) for e in self.molData if not e[sAttr].isSpecial()]
-            correctedNumColumns=fixNumColumns(len(molSmiles), self.numColumns)
+            correctedNumColumns=self.numColumns #fixNumColumns(len(molSmiles), self.numColumns)
             self.progressBarInit()
             if self.colorFragments and self.selectedFragment:
@@ -649 +666 @@
         #print "done drawing"
         self.overRideCache=False
+##        import sip
+##        sip.delete(self.molWidget.layout())
+##        self.molWidget.setLayout(self.gridLayout)
+##        self.molWidget.layout().activate()
         self.molWidget.setMinimumSize(self.gridLayout.sizeHint())
         self.molWidget.show()
@@ -657 +678 @@
     def destroyImageWidgets(self):
         for w in self.imageWidgets:
+            w.hide()
             self.gridLayout.removeWidget(w)
         self.imageWidgets=[]
+
+    def rearrangeLayout(self):
+        self.numColumns=self.scrollArea.width()/(self.imageSize+4) or 1
+        self.molWidget = QWidget()
+        self.gridLayout = QGridLayout()
+        self.molWidget.setLayout(self.gridLayout)
+        for i, w in enumerate(self.imageWidgets):
+            self.gridLayout.addWidget(w, i/self.numColumns, i%self.numColumns)
+        self.scrollArea.takeWidget()
+        self.scrollArea.setWidget(self.molWidget)
+        self.molWidget.setMinimumSize(self.gridLayout.sizeHint())
+        self.molWidget.show()
             
     def showImages(self, useCached=False):