InspectorGadget, resize of MapOriginLevel widget, selection fixes

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2358 5a81b35b-ba03-0410-adc8-b2c5c5119f08

modules/gui/pymod/scene/map_level_widget.py

@@ -30,16 +30,14 @@ from PyQt4 import QtCore, QtGui
 
 from preset_widget import PresetWidget
 
-class AdditionalSettingsWidget(QtGui.QWidget):
+class AdditionalSettingsWidget(QtGui.QStackedWidget):
   def __init__(self, parent=None):
-    QtGui.QWidget.__init__(self, parent)
-    self.stack = QtGui.QStackedWidget(self);
+    QtGui.QStackedWidget.__init__(self, parent)
     self.map_widget_ = MapLevelWidget(self)
-    self.setContentsMargins(0,0,0,0)
     self.preset_widget_ = PresetWidget(self)
-    self.stack.addWidget(self.map_widget_);
-    self.stack.addWidget(self.preset_widget_);
-    self.stack.setContentsMargins(0,0,0,0)
+    self.addWidget(self.preset_widget_);
+    self.addWidget(self.map_widget_);
+    self.setContentsMargins(0,0,0,0)
     self.setMinimumSize(self.preset_widget_.minimumSize())
     
   def Update(self):
@@ -57,16 +55,14 @@ class AdditionalSettingsWidget(QtGui.QWidget):
       self.map_widget_.Update()
       self.setMinimumSize(self.map_widget_.minimumSize())
       self.resize(self.map_widget_.minimumSize())
-      self.stack.resize(self.map_widget_.minimumSize())
-      self.stack.setMinimumSize(self.map_widget_.minimumSize())
-      self.stack.setCurrentWidget(self.map_widget_)
+      self.setMinimumSize(self.map_widget_.minimumSize())
+      self.setCurrentWidget(self.map_widget_)
     elif all_entity:
       self.preset_widget_.Update()
       self.setMinimumSize(self.preset_widget_.minimumSize())
       self.resize(self.preset_widget_.minimumSize())
-      self.stack.resize(self.preset_widget_.minimumSize())
-      self.stack.setMinimumSize(self.preset_widget_.minimumSize())
-      self.stack.setCurrentWidget(self.preset_widget_)
+      self.setMinimumSize(self.preset_widget_.minimumSize())
+      self.setCurrentWidget(self.preset_widget_)
     else:
       self.setEnabled(False)
     

modules/gui/pymod/scene/scene_selection_helper.py

@@ -41,7 +41,7 @@ class SelHelper():
   IS_ONE_TYPE = 16
   IS_MULTI_TYPE = 32
   SINGLE_SELECTION = 64
-  MULTI_SELCTION = 128
+  MULTI_SELECTION = 128
     
   def __init__(self):
     self.__dict__ = self.__shared_state
@@ -103,4 +103,4 @@ class SelHelper():
   def CheckMinOneFlag(self, flags):
     if((self.current_flags_ - (self.current_flags_ & flags)) < self.current_flags_):
       return True
-    return False
+    return False
\ No newline at end of file

modules/gui/pymod/scene/wireframe_widget.py

@@ -93,7 +93,7 @@ class WireframeWidget(QtGui.QWidget):
   def Update(self):
     self.setEnabled(True)
     self.UpdateGui()
-    if SelHelper().CheckNotFlags(SelHelper.HAS_IMG | SelHelper.IS_SINGLE):
+    if SelHelper().CheckNotFlags(SelHelper.HAS_IMG | SelHelper.IS_ONE_TYPE):
       self.setEnabled(False)          
 
   def GetText(self):