summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Sims <mark@nanorex.com>2008-06-06 15:43:47 +0000
committerMark Sims <mark@nanorex.com>2008-06-06 15:43:47 +0000
commit3577256e50df63fb65702e1e3091484db3148f6d (patch)
tree845ce0dd7722c7f6f3d2c77a9658e9bd392fb386
parentc1bc7ed9c0211f179bc4aa28903c38dd4eaba651 (diff)
downloadnanoengineer-theirix-3577256e50df63fb65702e1e3091484db3148f6d.tar.gz
nanoengineer-theirix-3577256e50df63fb65702e1e3091484db3148f6d.zip
Cleanup of dialog UI.
-rwxr-xr-xcad/src/commands/MinimizeEnergy/MinimizeEnergyProp.py34
-rwxr-xr-xcad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.py343
-rwxr-xr-xcad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.ui948
-rw-r--r--cad/src/commands/MinimizeEnergy/WhatsThisText_for_MinimizeEnergyDialog.py6
4 files changed, 534 insertions, 797 deletions
diff --git a/cad/src/commands/MinimizeEnergy/MinimizeEnergyProp.py b/cad/src/commands/MinimizeEnergy/MinimizeEnergyProp.py
index b7422c6de..832848c45 100755
--- a/cad/src/commands/MinimizeEnergy/MinimizeEnergyProp.py
+++ b/cad/src/commands/MinimizeEnergy/MinimizeEnergyProp.py
@@ -25,7 +25,7 @@ from PyQt4.Qt import QSize
from utilities.Log import greenmsg, redmsg, orangemsg, _graymsg, quote_html
from commands.MinimizeEnergy.MinimizeEnergyPropDialog import Ui_MinimizeEnergyPropDialog
from PM.GroupButtonMixin import GroupButtonMixin
-from sponsors.Sponsors import SponsorableMixin
+#@from sponsors.Sponsors import SponsorableMixin
from utilities.icon_utilities import geticon
from utilities.prefs_constants import Minimize_watchRealtimeMinimization_prefs_key
@@ -48,11 +48,11 @@ from utilities.debug_prefs import debug_pref, Choice_boolean_False
from widgets.prefs_widgets import connect_checkbox_with_boolean_pref
#class MinimizeEnergyProp(QDialog, SponsorableMixin, GroupButtonMixin, Ui_MinimizeEnergyPropDialog):
-class MinimizeEnergyProp(QDialog, SponsorableMixin, Ui_MinimizeEnergyPropDialog):
+class MinimizeEnergyProp(QDialog, Ui_MinimizeEnergyPropDialog):
cmdname = greenmsg("Minimize Energy: ") # WARNING: self.cmdname might be used by one of the superclasses
plain_cmdname = "Minimize Energy"
- sponsor_keyword = None
+ #@sponsor_keyword = None
def __init__(self, win):
QDialog.__init__(self, win) # win is parent.
@@ -66,40 +66,24 @@ class MinimizeEnergyProp(QDialog, SponsorableMixin, Ui_MinimizeEnergyPropDialog)
#fix some icon problems
self.setWindowIcon(
geticon('ui/border/MinimizeEnergy.png'))
- self.done_btn.setIcon(
- geticon('ui/actions/Properties Manager/Done.png'))
- self.abort_btn.setIconSize(QSize(22, 22))
- self.abort_btn.setIcon(
- geticon('ui/actions/Properties Manager/Abort.png'))
- self.restore_btn.setIconSize(QSize(22, 22))
- self.restore_btn.setIcon(
- geticon('ui/actions/Properties Manager/Restore.png'))
- self.done_btn.setIconSize(QSize(22, 22))
- self.whatsthis_btn.setIcon(
- geticon('ui/actions/Properties Manager/WhatsThis.png'))
- self.whatsthis_btn.setIconSize(QSize(22, 22))
-
+
self.connect(self.cancel_btn,
SIGNAL("clicked()"),
self.cancel_btn_clicked)
- self.connect(self.done_btn,
- SIGNAL("clicked()"),
- self.ok_btn_clicked)
self.connect(self.ok_btn,
SIGNAL("clicked()"),
self.ok_btn_clicked)
self.connect(self.restore_btn,
SIGNAL("clicked()"),
self.restore_defaults_btn_clicked)
- self.connect(self.sponsor_btn,
- SIGNAL("clicked()"),
- self.open_sponsor_homepage)
+
+ self.whatsthis_btn.setIcon(
+ geticon('ui/actions/Properties Manager/WhatsThis.png'))
+ self.whatsthis_btn.setIconSize(QSize(22, 22))
+
self.connect(self.whatsthis_btn,
SIGNAL("clicked()"),
self.whatsthis_btn_clicked)
- self.connect(self.abort_btn,
- SIGNAL("clicked()"),
- self.cancel_btn_clicked)
connect_checkbox_with_boolean_pref(
self.electrostaticsForDnaDuringMinimize_checkBox,
diff --git a/cad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.py b/cad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.py
index e525a0a99..cd48fbf8d 100755
--- a/cad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.py
+++ b/cad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'MinimizeEnergyPropDialog.ui'
#
-# Created: Thu Jun 05 18:16:46 2008
+# Created: Fri Jun 06 11:41:20 2008
# by: PyQt4 UI code generator 4.2
#
# WARNING! All changes made in this file will be lost!
@@ -12,79 +12,127 @@ from PyQt4 import QtCore, QtGui
class Ui_MinimizeEnergyPropDialog(object):
def setupUi(self, MinimizeEnergyPropDialog):
MinimizeEnergyPropDialog.setObjectName("MinimizeEnergyPropDialog")
- MinimizeEnergyPropDialog.resize(QtCore.QSize(QtCore.QRect(0,0,300,550).size()).expandedTo(MinimizeEnergyPropDialog.minimumSizeHint()))
+ MinimizeEnergyPropDialog.resize(QtCore.QSize(QtCore.QRect(0,0,300,480).size()).expandedTo(MinimizeEnergyPropDialog.minimumSizeHint()))
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Policy(3),QtGui.QSizePolicy.Policy(3))
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(MinimizeEnergyPropDialog.sizePolicy().hasHeightForWidth())
MinimizeEnergyPropDialog.setSizePolicy(sizePolicy)
- MinimizeEnergyPropDialog.setMinimumSize(QtCore.QSize(300,550))
+ MinimizeEnergyPropDialog.setMinimumSize(QtCore.QSize(300,480))
self.gridlayout = QtGui.QGridLayout(MinimizeEnergyPropDialog)
- self.gridlayout.setMargin(2)
- self.gridlayout.setSpacing(4)
+ self.gridlayout.setMargin(9)
+ self.gridlayout.setSpacing(6)
self.gridlayout.setObjectName("gridlayout")
- spacerItem = QtGui.QSpacerItem(270,5,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
- self.gridlayout.addItem(spacerItem,2,0,1,1)
+ spacerItem = QtGui.QSpacerItem(221,21,QtGui.QSizePolicy.Minimum,QtGui.QSizePolicy.Expanding)
+ self.gridlayout.addItem(spacerItem,5,0,1,1)
- self.body_frame = QtGui.QFrame(MinimizeEnergyPropDialog)
+ self.hboxlayout = QtGui.QHBoxLayout()
+ self.hboxlayout.setMargin(0)
+ self.hboxlayout.setSpacing(6)
+ self.hboxlayout.setObjectName("hboxlayout")
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Policy(3),QtGui.QSizePolicy.Policy(3))
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.body_frame.sizePolicy().hasHeightForWidth())
- self.body_frame.setSizePolicy(sizePolicy)
- self.body_frame.setFrameShape(QtGui.QFrame.StyledPanel)
- self.body_frame.setFrameShadow(QtGui.QFrame.Raised)
- self.body_frame.setObjectName("body_frame")
+ self.whatsthis_btn = QtGui.QToolButton(MinimizeEnergyPropDialog)
+ self.whatsthis_btn.setObjectName("whatsthis_btn")
+ self.hboxlayout.addWidget(self.whatsthis_btn)
- self.gridlayout1 = QtGui.QGridLayout(self.body_frame)
- self.gridlayout1.setMargin(4)
- self.gridlayout1.setSpacing(4)
- self.gridlayout1.setObjectName("gridlayout1")
+ spacerItem1 = QtGui.QSpacerItem(41,23,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+ self.hboxlayout.addItem(spacerItem1)
+
+ self.cancel_btn = QtGui.QPushButton(MinimizeEnergyPropDialog)
+ self.cancel_btn.setAutoDefault(False)
+ self.cancel_btn.setObjectName("cancel_btn")
+ self.hboxlayout.addWidget(self.cancel_btn)
+
+ self.ok_btn = QtGui.QPushButton(MinimizeEnergyPropDialog)
+ self.ok_btn.setAutoDefault(False)
+ self.ok_btn.setObjectName("ok_btn")
+ self.hboxlayout.addWidget(self.ok_btn)
+ self.gridlayout.addLayout(self.hboxlayout,6,0,1,1)
+
+ self.buttonGroup8_2 = QtGui.QGroupBox(MinimizeEnergyPropDialog)
+ self.buttonGroup8_2.setObjectName("buttonGroup8_2")
+
+ self.vboxlayout = QtGui.QVBoxLayout(self.buttonGroup8_2)
+ self.vboxlayout.setMargin(4)
+ self.vboxlayout.setSpacing(4)
+ self.vboxlayout.setObjectName("vboxlayout")
+
+ self.minimize_engine_combobox = QtGui.QComboBox(self.buttonGroup8_2)
+ self.minimize_engine_combobox.setObjectName("minimize_engine_combobox")
+ self.vboxlayout.addWidget(self.minimize_engine_combobox)
+ self.gridlayout.addWidget(self.buttonGroup8_2,0,0,1,1)
+
+ self.buttonGroup8 = QtGui.QGroupBox(MinimizeEnergyPropDialog)
+ self.buttonGroup8.setObjectName("buttonGroup8")
+
+ self.vboxlayout1 = QtGui.QVBoxLayout(self.buttonGroup8)
+ self.vboxlayout1.setMargin(4)
+ self.vboxlayout1.setSpacing(2)
+ self.vboxlayout1.setObjectName("vboxlayout1")
+
+ self.minimize_all_rbtn = QtGui.QRadioButton(self.buttonGroup8)
+ self.minimize_all_rbtn.setChecked(True)
+ self.minimize_all_rbtn.setObjectName("minimize_all_rbtn")
+ self.vboxlayout1.addWidget(self.minimize_all_rbtn)
+
+ self.minimize_sel_rbtn = QtGui.QRadioButton(self.buttonGroup8)
+ self.minimize_sel_rbtn.setObjectName("minimize_sel_rbtn")
+ self.vboxlayout1.addWidget(self.minimize_sel_rbtn)
- self.watch_motion_groupbox = QtGui.QGroupBox(self.body_frame)
+ self.electrostaticsForDnaDuringMinimize_checkBox = QtGui.QCheckBox(self.buttonGroup8)
+ self.electrostaticsForDnaDuringMinimize_checkBox.setChecked(True)
+ self.electrostaticsForDnaDuringMinimize_checkBox.setObjectName("electrostaticsForDnaDuringMinimize_checkBox")
+ self.vboxlayout1.addWidget(self.electrostaticsForDnaDuringMinimize_checkBox)
+
+ self.enableNeighborSearching_check_box = QtGui.QCheckBox(self.buttonGroup8)
+ self.enableNeighborSearching_check_box.setChecked(True)
+ self.enableNeighborSearching_check_box.setObjectName("enableNeighborSearching_check_box")
+ self.vboxlayout1.addWidget(self.enableNeighborSearching_check_box)
+ self.gridlayout.addWidget(self.buttonGroup8,1,0,1,1)
+
+ self.watch_motion_groupbox = QtGui.QGroupBox(MinimizeEnergyPropDialog)
self.watch_motion_groupbox.setCheckable(True)
self.watch_motion_groupbox.setObjectName("watch_motion_groupbox")
- self.gridlayout2 = QtGui.QGridLayout(self.watch_motion_groupbox)
- self.gridlayout2.setMargin(4)
- self.gridlayout2.setSpacing(2)
- self.gridlayout2.setObjectName("gridlayout2")
+ self.gridlayout1 = QtGui.QGridLayout(self.watch_motion_groupbox)
+ self.gridlayout1.setMargin(4)
+ self.gridlayout1.setSpacing(2)
+ self.gridlayout1.setObjectName("gridlayout1")
self.update_asap_rbtn = QtGui.QRadioButton(self.watch_motion_groupbox)
self.update_asap_rbtn.setChecked(True)
self.update_asap_rbtn.setObjectName("update_asap_rbtn")
- self.gridlayout2.addWidget(self.update_asap_rbtn,0,0,1,1)
+ self.gridlayout1.addWidget(self.update_asap_rbtn,0,0,1,1)
- self.hboxlayout = QtGui.QHBoxLayout()
- self.hboxlayout.setMargin(0)
- self.hboxlayout.setSpacing(2)
- self.hboxlayout.setObjectName("hboxlayout")
+ self.hboxlayout1 = QtGui.QHBoxLayout()
+ self.hboxlayout1.setMargin(0)
+ self.hboxlayout1.setSpacing(2)
+ self.hboxlayout1.setObjectName("hboxlayout1")
self.update_every_rbtn = QtGui.QRadioButton(self.watch_motion_groupbox)
self.update_every_rbtn.setObjectName("update_every_rbtn")
- self.hboxlayout.addWidget(self.update_every_rbtn)
+ self.hboxlayout1.addWidget(self.update_every_rbtn)
self.update_number_spinbox = QtGui.QSpinBox(self.watch_motion_groupbox)
self.update_number_spinbox.setMaximum(9999)
self.update_number_spinbox.setMinimum(1)
self.update_number_spinbox.setProperty("value",QtCore.QVariant(1))
self.update_number_spinbox.setObjectName("update_number_spinbox")
- self.hboxlayout.addWidget(self.update_number_spinbox)
+ self.hboxlayout1.addWidget(self.update_number_spinbox)
self.update_units_combobox = QtGui.QComboBox(self.watch_motion_groupbox)
self.update_units_combobox.setObjectName("update_units_combobox")
- self.hboxlayout.addWidget(self.update_units_combobox)
+ self.hboxlayout1.addWidget(self.update_units_combobox)
- spacerItem1 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
- self.hboxlayout.addItem(spacerItem1)
- self.gridlayout2.addLayout(self.hboxlayout,1,0,1,1)
- self.gridlayout1.addWidget(self.watch_motion_groupbox,4,0,1,1)
+ spacerItem2 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+ self.hboxlayout1.addItem(spacerItem2)
+ self.gridlayout1.addLayout(self.hboxlayout1,1,0,1,1)
+ self.gridlayout.addWidget(self.watch_motion_groupbox,2,0,1,1)
- self.groupBox20 = QtGui.QGroupBox(self.body_frame)
+ self.groupBox20 = QtGui.QGroupBox(MinimizeEnergyPropDialog)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Policy(5),QtGui.QSizePolicy.Policy(5))
sizePolicy.setHorizontalStretch(0)
@@ -93,41 +141,41 @@ class Ui_MinimizeEnergyPropDialog(object):
self.groupBox20.setSizePolicy(sizePolicy)
self.groupBox20.setObjectName("groupBox20")
- self.hboxlayout1 = QtGui.QHBoxLayout(self.groupBox20)
- self.hboxlayout1.setMargin(4)
- self.hboxlayout1.setSpacing(4)
- self.hboxlayout1.setObjectName("hboxlayout1")
+ self.hboxlayout2 = QtGui.QHBoxLayout(self.groupBox20)
+ self.hboxlayout2.setMargin(4)
+ self.hboxlayout2.setSpacing(4)
+ self.hboxlayout2.setObjectName("hboxlayout2")
- self.vboxlayout = QtGui.QVBoxLayout()
- self.vboxlayout.setMargin(0)
- self.vboxlayout.setSpacing(2)
- self.vboxlayout.setObjectName("vboxlayout")
+ self.vboxlayout2 = QtGui.QVBoxLayout()
+ self.vboxlayout2.setMargin(0)
+ self.vboxlayout2.setSpacing(2)
+ self.vboxlayout2.setObjectName("vboxlayout2")
self.endrms_lbl = QtGui.QLabel(self.groupBox20)
self.endrms_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.endrms_lbl.setObjectName("endrms_lbl")
- self.vboxlayout.addWidget(self.endrms_lbl)
+ self.vboxlayout2.addWidget(self.endrms_lbl)
self.endmax_lbl = QtGui.QLabel(self.groupBox20)
self.endmax_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.endmax_lbl.setObjectName("endmax_lbl")
- self.vboxlayout.addWidget(self.endmax_lbl)
+ self.vboxlayout2.addWidget(self.endmax_lbl)
self.cutoverrms_lbl = QtGui.QLabel(self.groupBox20)
self.cutoverrms_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.cutoverrms_lbl.setObjectName("cutoverrms_lbl")
- self.vboxlayout.addWidget(self.cutoverrms_lbl)
+ self.vboxlayout2.addWidget(self.cutoverrms_lbl)
self.cutovermax_lbl = QtGui.QLabel(self.groupBox20)
self.cutovermax_lbl.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.cutovermax_lbl.setObjectName("cutovermax_lbl")
- self.vboxlayout.addWidget(self.cutovermax_lbl)
- self.hboxlayout1.addLayout(self.vboxlayout)
+ self.vboxlayout2.addWidget(self.cutovermax_lbl)
+ self.hboxlayout2.addLayout(self.vboxlayout2)
- self.vboxlayout1 = QtGui.QVBoxLayout()
- self.vboxlayout1.setMargin(0)
- self.vboxlayout1.setSpacing(2)
- self.vboxlayout1.setObjectName("vboxlayout1")
+ self.vboxlayout3 = QtGui.QVBoxLayout()
+ self.vboxlayout3.setMargin(0)
+ self.vboxlayout3.setSpacing(2)
+ self.vboxlayout3.setObjectName("vboxlayout3")
self.endRmsDoubleSpinBox = QtGui.QDoubleSpinBox(self.groupBox20)
@@ -140,7 +188,7 @@ class Ui_MinimizeEnergyPropDialog(object):
self.endRmsDoubleSpinBox.setMaximum(501.0)
self.endRmsDoubleSpinBox.setProperty("value",QtCore.QVariant(1.0))
self.endRmsDoubleSpinBox.setObjectName("endRmsDoubleSpinBox")
- self.vboxlayout1.addWidget(self.endRmsDoubleSpinBox)
+ self.vboxlayout3.addWidget(self.endRmsDoubleSpinBox)
self.endMaxDoubleSpinBox = QtGui.QDoubleSpinBox(self.groupBox20)
@@ -153,7 +201,7 @@ class Ui_MinimizeEnergyPropDialog(object):
self.endMaxDoubleSpinBox.setMaximum(2501.0)
self.endMaxDoubleSpinBox.setProperty("value",QtCore.QVariant(0.0))
self.endMaxDoubleSpinBox.setObjectName("endMaxDoubleSpinBox")
- self.vboxlayout1.addWidget(self.endMaxDoubleSpinBox)
+ self.vboxlayout3.addWidget(self.endMaxDoubleSpinBox)
self.cutoverRmsDoubleSpinBox = QtGui.QDoubleSpinBox(self.groupBox20)
@@ -166,7 +214,7 @@ class Ui_MinimizeEnergyPropDialog(object):
self.cutoverRmsDoubleSpinBox.setMaximum(12500.0)
self.cutoverRmsDoubleSpinBox.setProperty("value",QtCore.QVariant(0.0))
self.cutoverRmsDoubleSpinBox.setObjectName("cutoverRmsDoubleSpinBox")
- self.vboxlayout1.addWidget(self.cutoverRmsDoubleSpinBox)
+ self.vboxlayout3.addWidget(self.cutoverRmsDoubleSpinBox)
self.cutoverMaxDoubleSpinBox = QtGui.QDoubleSpinBox(self.groupBox20)
@@ -179,150 +227,47 @@ class Ui_MinimizeEnergyPropDialog(object):
self.cutoverMaxDoubleSpinBox.setMaximum(60001.0)
self.cutoverMaxDoubleSpinBox.setProperty("value",QtCore.QVariant(0.0))
self.cutoverMaxDoubleSpinBox.setObjectName("cutoverMaxDoubleSpinBox")
- self.vboxlayout1.addWidget(self.cutoverMaxDoubleSpinBox)
- self.hboxlayout1.addLayout(self.vboxlayout1)
-
- spacerItem2 = QtGui.QSpacerItem(80,20,QtGui.QSizePolicy.MinimumExpanding,QtGui.QSizePolicy.Minimum)
- self.hboxlayout1.addItem(spacerItem2)
- self.gridlayout1.addWidget(self.groupBox20,5,0,1,1)
-
- self.buttonGroup8 = QtGui.QGroupBox(self.body_frame)
- self.buttonGroup8.setObjectName("buttonGroup8")
+ self.vboxlayout3.addWidget(self.cutoverMaxDoubleSpinBox)
+ self.hboxlayout2.addLayout(self.vboxlayout3)
- self.vboxlayout2 = QtGui.QVBoxLayout(self.buttonGroup8)
- self.vboxlayout2.setMargin(4)
- self.vboxlayout2.setSpacing(2)
- self.vboxlayout2.setObjectName("vboxlayout2")
-
- self.minimize_all_rbtn = QtGui.QRadioButton(self.buttonGroup8)
- self.minimize_all_rbtn.setChecked(True)
- self.minimize_all_rbtn.setObjectName("minimize_all_rbtn")
- self.vboxlayout2.addWidget(self.minimize_all_rbtn)
-
- self.minimize_sel_rbtn = QtGui.QRadioButton(self.buttonGroup8)
- self.minimize_sel_rbtn.setObjectName("minimize_sel_rbtn")
- self.vboxlayout2.addWidget(self.minimize_sel_rbtn)
-
- self.electrostaticsForDnaDuringMinimize_checkBox = QtGui.QCheckBox(self.buttonGroup8)
- self.electrostaticsForDnaDuringMinimize_checkBox.setChecked(True)
- self.electrostaticsForDnaDuringMinimize_checkBox.setObjectName("electrostaticsForDnaDuringMinimize_checkBox")
- self.vboxlayout2.addWidget(self.electrostaticsForDnaDuringMinimize_checkBox)
-
- self.enableNeighborSearching_check_box = QtGui.QCheckBox(self.buttonGroup8)
- self.enableNeighborSearching_check_box.setChecked(True)
- self.enableNeighborSearching_check_box.setObjectName("enableNeighborSearching_check_box")
- self.vboxlayout2.addWidget(self.enableNeighborSearching_check_box)
- self.gridlayout1.addWidget(self.buttonGroup8,3,0,1,1)
-
- self.buttonGroup8_2 = QtGui.QGroupBox(self.body_frame)
- self.buttonGroup8_2.setObjectName("buttonGroup8_2")
-
- self.vboxlayout3 = QtGui.QVBoxLayout(self.buttonGroup8_2)
- self.vboxlayout3.setMargin(4)
- self.vboxlayout3.setSpacing(4)
- self.vboxlayout3.setObjectName("vboxlayout3")
-
- self.minimize_engine_combobox = QtGui.QComboBox(self.buttonGroup8_2)
- self.minimize_engine_combobox.setObjectName("minimize_engine_combobox")
- self.vboxlayout3.addWidget(self.minimize_engine_combobox)
- self.gridlayout1.addWidget(self.buttonGroup8_2,2,0,1,1)
-
- self.hboxlayout2 = QtGui.QHBoxLayout()
- self.hboxlayout2.setMargin(0)
- self.hboxlayout2.setSpacing(6)
- self.hboxlayout2.setObjectName("hboxlayout2")
-
- spacerItem3 = QtGui.QSpacerItem(35,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+ spacerItem3 = QtGui.QSpacerItem(80,20,QtGui.QSizePolicy.MinimumExpanding,QtGui.QSizePolicy.Minimum)
self.hboxlayout2.addItem(spacerItem3)
-
- self.done_btn = QtGui.QToolButton(self.body_frame)
- self.done_btn.setIcon(QtGui.QIcon("../../../../:icons/MinimizeEnergyPropDialog_image2"))
- self.done_btn.setObjectName("done_btn")
- self.hboxlayout2.addWidget(self.done_btn)
-
- self.abort_btn = QtGui.QToolButton(self.body_frame)
- self.abort_btn.setIcon(QtGui.QIcon("../../../../:icons/MinimizeEnergyPropDialog_image3"))
- self.abort_btn.setObjectName("abort_btn")
- self.hboxlayout2.addWidget(self.abort_btn)
-
- self.restore_btn = QtGui.QToolButton(self.body_frame)
- self.restore_btn.setIcon(QtGui.QIcon("../../../../:icons/MinimizeEnergyPropDialog_image4"))
- self.restore_btn.setObjectName("restore_btn")
- self.hboxlayout2.addWidget(self.restore_btn)
-
- self.whatsthis_btn = QtGui.QToolButton(self.body_frame)
- self.whatsthis_btn.setIcon(QtGui.QIcon("../../../../:icons/MinimizeEnergyPropDialog_image5"))
- self.whatsthis_btn.setObjectName("whatsthis_btn")
- self.hboxlayout2.addWidget(self.whatsthis_btn)
-
- spacerItem4 = QtGui.QSpacerItem(35,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
- self.hboxlayout2.addItem(spacerItem4)
- self.gridlayout1.addLayout(self.hboxlayout2,1,0,1,1)
-
- self.sponsor_btn = QtGui.QPushButton(self.body_frame)
- self.sponsor_btn.setAutoDefault(False)
- self.sponsor_btn.setFlat(True)
- self.sponsor_btn.setObjectName("sponsor_btn")
- self.gridlayout1.addWidget(self.sponsor_btn,0,0,1,1)
- self.gridlayout.addWidget(self.body_frame,1,0,1,1)
-
- self.heading_frame = QtGui.QFrame(MinimizeEnergyPropDialog)
- self.heading_frame.setFrameShape(QtGui.QFrame.NoFrame)
- self.heading_frame.setFrameShadow(QtGui.QFrame.Plain)
- self.heading_frame.setObjectName("heading_frame")
-
- self.heading_pixmap = QtGui.QLabel(self.heading_frame)
- self.heading_pixmap.setGeometry(QtCore.QRect(0,8,16,16))
-
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Policy(0),QtGui.QSizePolicy.Policy(0))
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(self.heading_pixmap.sizePolicy().hasHeightForWidth())
- self.heading_pixmap.setSizePolicy(sizePolicy)
- self.heading_pixmap.setScaledContents(True)
- self.heading_pixmap.setAlignment(QtCore.Qt.AlignVCenter)
- self.heading_pixmap.setObjectName("heading_pixmap")
-
- self.heading_label = QtGui.QLabel(self.heading_frame)
- self.heading_label.setGeometry(QtCore.QRect(3,0,267,21))
-
- font = QtGui.QFont()
- font.setFamily("Sans Serif")
- font.setPointSize(12)
- font.setWeight(75)
- font.setItalic(False)
- font.setUnderline(False)
- font.setStrikeOut(False)
- font.setBold(True)
- self.heading_label.setFont(font)
- self.heading_label.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop)
- self.heading_label.setObjectName("heading_label")
- self.gridlayout.addWidget(self.heading_frame,0,0,1,1)
+ self.gridlayout.addWidget(self.groupBox20,3,0,1,1)
self.hboxlayout3 = QtGui.QHBoxLayout()
- self.hboxlayout3.setMargin(4)
+ self.hboxlayout3.setMargin(0)
self.hboxlayout3.setSpacing(6)
self.hboxlayout3.setObjectName("hboxlayout3")
- spacerItem5 = QtGui.QSpacerItem(59,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
- self.hboxlayout3.addItem(spacerItem5)
-
- self.cancel_btn = QtGui.QPushButton(MinimizeEnergyPropDialog)
- self.cancel_btn.setAutoDefault(False)
- self.cancel_btn.setObjectName("cancel_btn")
- self.hboxlayout3.addWidget(self.cancel_btn)
+ spacerItem4 = QtGui.QSpacerItem(40,20,QtGui.QSizePolicy.Expanding,QtGui.QSizePolicy.Minimum)
+ self.hboxlayout3.addItem(spacerItem4)
- self.ok_btn = QtGui.QPushButton(MinimizeEnergyPropDialog)
- self.ok_btn.setAutoDefault(False)
- self.ok_btn.setObjectName("ok_btn")
- self.hboxlayout3.addWidget(self.ok_btn)
- self.gridlayout.addLayout(self.hboxlayout3,3,0,1,1)
+ self.restore_btn = QtGui.QPushButton(MinimizeEnergyPropDialog)
+ self.restore_btn.setObjectName("restore_btn")
+ self.hboxlayout3.addWidget(self.restore_btn)
+ self.gridlayout.addLayout(self.hboxlayout3,4,0,1,1)
self.retranslateUi(MinimizeEnergyPropDialog)
QtCore.QMetaObject.connectSlotsByName(MinimizeEnergyPropDialog)
def retranslateUi(self, MinimizeEnergyPropDialog):
MinimizeEnergyPropDialog.setWindowTitle(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize Energy", None, QtGui.QApplication.UnicodeUTF8))
+ self.cancel_btn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8))
+ self.cancel_btn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8))
+ self.ok_btn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "OK", None, QtGui.QApplication.UnicodeUTF8))
+ self.ok_btn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize Energy", None, QtGui.QApplication.UnicodeUTF8))
+ self.buttonGroup8_2.setTitle(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize physics engine", None, QtGui.QApplication.UnicodeUTF8))
+ self.minimize_engine_combobox.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Choose the simulation engine with which to minimize energy.", None, QtGui.QApplication.UnicodeUTF8))
+ self.minimize_engine_combobox.addItem(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "NanoDynamics-1 (Default)", None, QtGui.QApplication.UnicodeUTF8))
+ self.minimize_engine_combobox.addItem(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "GROMACS with ND1 Force Field", None, QtGui.QApplication.UnicodeUTF8))
+ self.minimize_engine_combobox.addItem(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Background GROMACS with ND1 Force Field", None, QtGui.QApplication.UnicodeUTF8))
+ self.buttonGroup8.setTitle(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize Options", None, QtGui.QApplication.UnicodeUTF8))
+ self.minimize_all_rbtn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Perform energy minimization on all the atoms in the workspace", None, QtGui.QApplication.UnicodeUTF8))
+ self.minimize_all_rbtn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize all", None, QtGui.QApplication.UnicodeUTF8))
+ self.minimize_sel_rbtn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Perform energy minimization on only the atoms that have been selected", None, QtGui.QApplication.UnicodeUTF8))
+ self.minimize_sel_rbtn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize selection", None, QtGui.QApplication.UnicodeUTF8))
+ self.electrostaticsForDnaDuringMinimize_checkBox.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Electrostatics for DNA reduced model", None, QtGui.QApplication.UnicodeUTF8))
+ self.enableNeighborSearching_check_box.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Enable neighbor searching (slow but accurate)", None, QtGui.QApplication.UnicodeUTF8))
self.watch_motion_groupbox.setTitle(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Watch motion in real time", None, QtGui.QApplication.UnicodeUTF8))
self.update_asap_rbtn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Update every 2 seconds, or faster if it doesn\'t slow adjustments by more than 20%", None, QtGui.QApplication.UnicodeUTF8))
self.update_asap_rbtn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Update as fast as possible", None, QtGui.QApplication.UnicodeUTF8))
@@ -347,25 +292,5 @@ class Ui_MinimizeEnergyPropDialog(object):
self.endMaxDoubleSpinBox.setSuffix(QtGui.QApplication.translate("MinimizeEnergyPropDialog", " pN", None, QtGui.QApplication.UnicodeUTF8))
self.cutoverRmsDoubleSpinBox.setSuffix(QtGui.QApplication.translate("MinimizeEnergyPropDialog", " pN", None, QtGui.QApplication.UnicodeUTF8))
self.cutoverMaxDoubleSpinBox.setSuffix(QtGui.QApplication.translate("MinimizeEnergyPropDialog", " pN", None, QtGui.QApplication.UnicodeUTF8))
- self.buttonGroup8.setTitle(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize Options", None, QtGui.QApplication.UnicodeUTF8))
- self.minimize_all_rbtn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Perform energy minimization on all the atoms in the workspace", None, QtGui.QApplication.UnicodeUTF8))
- self.minimize_all_rbtn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize all", None, QtGui.QApplication.UnicodeUTF8))
- self.minimize_sel_rbtn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Perform energy minimization on only the atoms that have been selected", None, QtGui.QApplication.UnicodeUTF8))
- self.minimize_sel_rbtn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize selection", None, QtGui.QApplication.UnicodeUTF8))
- self.electrostaticsForDnaDuringMinimize_checkBox.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Electrostatics for DNA reduced model", None, QtGui.QApplication.UnicodeUTF8))
- self.enableNeighborSearching_check_box.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Enable neighbor searching (slow but accurate)", None, QtGui.QApplication.UnicodeUTF8))
- self.buttonGroup8_2.setTitle(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize physics engine", None, QtGui.QApplication.UnicodeUTF8))
- self.minimize_engine_combobox.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Choose the simulation engine with which to minimize energy.", None, QtGui.QApplication.UnicodeUTF8))
- self.minimize_engine_combobox.addItem(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "NanoDynamics-1 (Default)", None, QtGui.QApplication.UnicodeUTF8))
- self.minimize_engine_combobox.addItem(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "GROMACS with ND1 Force Field", None, QtGui.QApplication.UnicodeUTF8))
- self.minimize_engine_combobox.addItem(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Background GROMACS with ND1 Force Field", None, QtGui.QApplication.UnicodeUTF8))
- self.done_btn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "OK", None, QtGui.QApplication.UnicodeUTF8))
- self.abort_btn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8))
- self.restore_btn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Restore Defaults", None, QtGui.QApplication.UnicodeUTF8))
- self.whatsthis_btn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "What\'s This Help", None, QtGui.QApplication.UnicodeUTF8))
- self.heading_label.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize Energy", None, QtGui.QApplication.UnicodeUTF8))
- self.cancel_btn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8))
- self.cancel_btn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Cancel", None, QtGui.QApplication.UnicodeUTF8))
- self.ok_btn.setToolTip(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "OK", None, QtGui.QApplication.UnicodeUTF8))
- self.ok_btn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Minimize Energy", None, QtGui.QApplication.UnicodeUTF8))
+ self.restore_btn.setText(QtGui.QApplication.translate("MinimizeEnergyPropDialog", "Restore Defaults", None, QtGui.QApplication.UnicodeUTF8))
diff --git a/cad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.ui b/cad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.ui
index 8fdc29e68..366060f7c 100755
--- a/cad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.ui
+++ b/cad/src/commands/MinimizeEnergy/MinimizeEnergyPropDialog.ui
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>300</width>
- <height>550</height>
+ <height>480</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -20,7 +20,7 @@
<property name="minimumSize" >
<size>
<width>300</width>
- <height>550</height>
+ <height>480</height>
</size>
</property>
<property name="windowTitle" >
@@ -31,12 +31,12 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
- <number>2</number>
+ <number>9</number>
</property>
<property name="spacing" >
- <number>4</number>
+ <number>6</number>
</property>
- <item row="2" column="0" >
+ <item row="5" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
@@ -46,442 +46,192 @@
</property>
<property name="sizeHint" >
<size>
- <width>270</width>
- <height>5</height>
+ <width>221</width>
+ <height>21</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="0" >
- <widget class="QFrame" name="body_frame" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item row="6" column="0" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
</property>
- <property name="frameShape" >
- <enum>QFrame::StyledPanel</enum>
+ <property name="spacing" >
+ <number>6</number>
</property>
- <property name="frameShadow" >
- <enum>QFrame::Raised</enum>
+ <item>
+ <widget class="QToolButton" name="whatsthis_btn" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>41</width>
+ <height>23</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cancel_btn" >
+ <property name="toolTip" >
+ <string>Cancel</string>
+ </property>
+ <property name="text" >
+ <string>Cancel</string>
+ </property>
+ <property name="autoDefault" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="ok_btn" >
+ <property name="toolTip" >
+ <string>OK</string>
+ </property>
+ <property name="text" >
+ <string>Minimize Energy</string>
+ </property>
+ <property name="autoDefault" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QGroupBox" name="buttonGroup8_2" >
+ <property name="title" >
+ <string>Minimize physics engine</string>
</property>
- <layout class="QGridLayout" >
+ <layout class="QVBoxLayout" >
<property name="margin" >
<number>4</number>
</property>
<property name="spacing" >
<number>4</number>
</property>
- <item row="4" column="0" >
- <widget class="QGroupBox" name="watch_motion_groupbox" >
- <property name="title" >
- <string>Watch motion in real time</string>
- </property>
- <property name="checkable" >
- <bool>true</bool>
+ <item>
+ <widget class="QComboBox" name="minimize_engine_combobox" >
+ <property name="toolTip" >
+ <string>Choose the simulation engine with which to minimize energy.</string>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>4</number>
+ <item>
+ <property name="text" >
+ <string>NanoDynamics-1 (Default)</string>
</property>
- <property name="spacing" >
- <number>2</number>
+ </item>
+ <item>
+ <property name="text" >
+ <string>GROMACS with ND1 Force Field</string>
</property>
- <item row="0" column="0" >
- <widget class="QRadioButton" name="update_asap_rbtn" >
- <property name="toolTip" >
- <string>Update every 2 seconds, or faster if it doesn't slow adjustments by more than 20%</string>
- </property>
- <property name="text" >
- <string>Update as fast as possible</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>2</number>
- </property>
- <item>
- <widget class="QRadioButton" name="update_every_rbtn" >
- <property name="toolTip" >
- <string>Specify how often to update the screen during adjustments</string>
- </property>
- <property name="text" >
- <string>Update every</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="update_number_spinbox" >
- <property name="toolTip" >
- <string>Specify how often to update the screen during adjustments</string>
- </property>
- <property name="maximum" >
- <number>9999</number>
- </property>
- <property name="minimum" >
- <number>1</number>
- </property>
- <property name="value" >
- <number>1</number>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="update_units_combobox" >
- <property name="toolTip" >
- <string>Specify how often to update the screen during adjustments</string>
- </property>
- <item>
- <property name="text" >
- <string>frames</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>seconds</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>minutes</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>hours</string>
- </property>
- </item>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
+ </item>
+ <item>
+ <property name="text" >
+ <string>Background GROMACS with ND1 Force Field</string>
+ </property>
+ </item>
</widget>
</item>
- <item row="5" column="0" >
- <widget class="QGroupBox" name="groupBox20" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QGroupBox" name="buttonGroup8" >
+ <property name="title" >
+ <string>Minimize Options</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>4</number>
+ </property>
+ <property name="spacing" >
+ <number>2</number>
+ </property>
+ <item>
+ <widget class="QRadioButton" name="minimize_all_rbtn" >
+ <property name="toolTip" >
+ <string>Perform energy minimization on all the atoms in the workspace</string>
</property>
- <property name="title" >
- <string>Convergence criteria</string>
+ <property name="text" >
+ <string>Minimize all</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
</property>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>4</number>
- </property>
- <property name="spacing" >
- <number>4</number>
- </property>
- <item>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>2</number>
- </property>
- <item>
- <widget class="QLabel" name="endrms_lbl" >
- <property name="toolTip" >
- <string>Target RMS force (pN)</string>
- </property>
- <property name="text" >
- <string>EndRMS:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="endmax_lbl" >
- <property name="toolTip" >
- <string>Target max force (pN)</string>
- </property>
- <property name="text" >
- <string>EndMax:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="cutoverrms_lbl" >
- <property name="toolTip" >
- <string>Cutover RMS force (pN)</string>
- </property>
- <property name="text" >
- <string>CutoverRMS:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="cutovermax_lbl" >
- <property name="toolTip" >
- <string>Cutover max force (pN)</string>
- </property>
- <property name="text" >
- <string>CutoverMax:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>2</number>
- </property>
- <item>
- <widget class="QDoubleSpinBox" name="endRmsDoubleSpinBox" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="suffix" >
- <string> pN</string>
- </property>
- <property name="decimals" >
- <number>3</number>
- </property>
- <property name="maximum" >
- <double>501.000000000000000</double>
- </property>
- <property name="value" >
- <double>1.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="endMaxDoubleSpinBox" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="suffix" >
- <string> pN</string>
- </property>
- <property name="decimals" >
- <number>2</number>
- </property>
- <property name="maximum" >
- <double>2501.000000000000000</double>
- </property>
- <property name="value" >
- <double>0.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="cutoverRmsDoubleSpinBox" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="suffix" >
- <string> pN</string>
- </property>
- <property name="decimals" >
- <number>2</number>
- </property>
- <property name="maximum" >
- <double>12500.000000000000000</double>
- </property>
- <property name="value" >
- <double>0.000000000000000</double>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QDoubleSpinBox" name="cutoverMaxDoubleSpinBox" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="suffix" >
- <string> pN</string>
- </property>
- <property name="decimals" >
- <number>2</number>
- </property>
- <property name="maximum" >
- <double>60001.000000000000000</double>
- </property>
- <property name="value" >
- <double>0.000000000000000</double>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>80</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QGroupBox" name="buttonGroup8" >
- <property name="title" >
- <string>Minimize Options</string>
+ <item>
+ <widget class="QRadioButton" name="minimize_sel_rbtn" >
+ <property name="toolTip" >
+ <string>Perform energy minimization on only the atoms that have been selected</string>
+ </property>
+ <property name="text" >
+ <string>Minimize selection</string>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>4</number>
- </property>
- <property name="spacing" >
- <number>2</number>
- </property>
- <item>
- <widget class="QRadioButton" name="minimize_all_rbtn" >
- <property name="toolTip" >
- <string>Perform energy minimization on all the atoms in the workspace</string>
- </property>
- <property name="text" >
- <string>Minimize all</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="minimize_sel_rbtn" >
- <property name="toolTip" >
- <string>Perform energy minimization on only the atoms that have been selected</string>
- </property>
- <property name="text" >
- <string>Minimize selection</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="electrostaticsForDnaDuringMinimize_checkBox" >
- <property name="text" >
- <string>Electrostatics for DNA reduced model</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="enableNeighborSearching_check_box" >
- <property name="text" >
- <string>Enable neighbor searching (slow but accurate)</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QGroupBox" name="buttonGroup8_2" >
- <property name="title" >
- <string>Minimize physics engine</string>
+ <item>
+ <widget class="QCheckBox" name="electrostaticsForDnaDuringMinimize_checkBox" >
+ <property name="text" >
+ <string>Electrostatics for DNA reduced model</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="enableNeighborSearching_check_box" >
+ <property name="text" >
+ <string>Enable neighbor searching (slow but accurate)</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QGroupBox" name="watch_motion_groupbox" >
+ <property name="title" >
+ <string>Watch motion in real time</string>
+ </property>
+ <property name="checkable" >
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>4</number>
+ </property>
+ <property name="spacing" >
+ <number>2</number>
+ </property>
+ <item row="0" column="0" >
+ <widget class="QRadioButton" name="update_asap_rbtn" >
+ <property name="toolTip" >
+ <string>Update every 2 seconds, or faster if it doesn't slow adjustments by more than 20%</string>
+ </property>
+ <property name="text" >
+ <string>Update as fast as possible</string>
+ </property>
+ <property name="checked" >
+ <bool>true</bool>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>4</number>
- </property>
- <property name="spacing" >
- <number>4</number>
- </property>
- <item>
- <widget class="QComboBox" name="minimize_engine_combobox" >
- <property name="toolTip" >
- <string>Choose the simulation engine with which to minimize energy.</string>
- </property>
- <item>
- <property name="text" >
- <string>NanoDynamics-1 (Default)</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>GROMACS with ND1 Force Field</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Background GROMACS with ND1 Force Field</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
</widget>
</item>
<item row="1" column="0" >
@@ -490,184 +240,290 @@
<number>0</number>
</property>
<property name="spacing" >
- <number>6</number>
+ <number>2</number>
</property>
<item>
+ <widget class="QRadioButton" name="update_every_rbtn" >
+ <property name="toolTip" >
+ <string>Specify how often to update the screen during adjustments</string>
+ </property>
+ <property name="text" >
+ <string>Update every</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="update_number_spinbox" >
+ <property name="toolTip" >
+ <string>Specify how often to update the screen during adjustments</string>
+ </property>
+ <property name="maximum" >
+ <number>9999</number>
+ </property>
+ <property name="minimum" >
+ <number>1</number>
+ </property>
+ <property name="value" >
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="update_units_combobox" >
+ <property name="toolTip" >
+ <string>Specify how often to update the screen during adjustments</string>
+ </property>
+ <item>
+ <property name="text" >
+ <string>frames</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>seconds</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>minutes</string>
+ </property>
+ </item>
+ <item>
+ <property name="text" >
+ <string>hours</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
<property name="sizeHint" >
<size>
- <width>35</width>
+ <width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QGroupBox" name="groupBox20" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title" >
+ <string>Convergence criteria</string>
+ </property>
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>4</number>
+ </property>
+ <property name="spacing" >
+ <number>4</number>
+ </property>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>2</number>
+ </property>
<item>
- <widget class="QToolButton" name="done_btn" >
+ <widget class="QLabel" name="endrms_lbl" >
<property name="toolTip" >
- <string>OK</string>
+ <string>Target RMS force (pN)</string>
</property>
<property name="text" >
- <string/>
+ <string>EndRMS:</string>
</property>
- <property name="icon" >
- <iconset>../../../../:icons/MinimizeEnergyPropDialog_image2</iconset>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="abort_btn" >
+ <widget class="QLabel" name="endmax_lbl" >
<property name="toolTip" >
- <string>Cancel</string>
+ <string>Target max force (pN)</string>
</property>
<property name="text" >
- <string/>
+ <string>EndMax:</string>
</property>
- <property name="icon" >
- <iconset>../../../../:icons/MinimizeEnergyPropDialog_image3</iconset>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="restore_btn" >
+ <widget class="QLabel" name="cutoverrms_lbl" >
<property name="toolTip" >
- <string>Restore Defaults</string>
+ <string>Cutover RMS force (pN)</string>
</property>
<property name="text" >
- <string/>
+ <string>CutoverRMS:</string>
</property>
- <property name="icon" >
- <iconset>../../../../:icons/MinimizeEnergyPropDialog_image4</iconset>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="whatsthis_btn" >
+ <widget class="QLabel" name="cutovermax_lbl" >
<property name="toolTip" >
- <string>What's This Help</string>
+ <string>Cutover max force (pN)</string>
</property>
<property name="text" >
- <string/>
+ <string>CutoverMax:</string>
</property>
- <property name="icon" >
- <iconset>../../../../:icons/MinimizeEnergyPropDialog_image5</iconset>
+ <property name="alignment" >
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <property name="spacing" >
+ <number>2</number>
+ </property>
<item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <widget class="QDoubleSpinBox" name="endRmsDoubleSpinBox" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
+ <property name="suffix" >
+ <string> pN</string>
</property>
- <property name="sizeHint" >
- <size>
- <width>35</width>
- <height>20</height>
- </size>
+ <property name="decimals" >
+ <number>3</number>
</property>
- </spacer>
+ <property name="maximum" >
+ <double>501.000000000000000</double>
+ </property>
+ <property name="value" >
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDoubleSpinBox" name="endMaxDoubleSpinBox" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="suffix" >
+ <string> pN</string>
+ </property>
+ <property name="decimals" >
+ <number>2</number>
+ </property>
+ <property name="maximum" >
+ <double>2501.000000000000000</double>
+ </property>
+ <property name="value" >
+ <double>0.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDoubleSpinBox" name="cutoverRmsDoubleSpinBox" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="suffix" >
+ <string> pN</string>
+ </property>
+ <property name="decimals" >
+ <number>2</number>
+ </property>
+ <property name="maximum" >
+ <double>12500.000000000000000</double>
+ </property>
+ <property name="value" >
+ <double>0.000000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDoubleSpinBox" name="cutoverMaxDoubleSpinBox" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="suffix" >
+ <string> pN</string>
+ </property>
+ <property name="decimals" >
+ <number>2</number>
+ </property>
+ <property name="maximum" >
+ <double>60001.000000000000000</double>
+ </property>
+ <property name="value" >
+ <double>0.000000000000000</double>
+ </property>
+ </widget>
</item>
</layout>
</item>
- <item row="0" column="0" >
- <widget class="QPushButton" name="sponsor_btn" >
- <property name="text" >
- <string/>
- </property>
- <property name="icon" >
- <iconset/>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="autoDefault" >
- <bool>false</bool>
+ <property name="sizeType" >
+ <enum>QSizePolicy::MinimumExpanding</enum>
</property>
- <property name="flat" >
- <bool>true</bool>
+ <property name="sizeHint" >
+ <size>
+ <width>80</width>
+ <height>20</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
</layout>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QFrame" name="heading_frame" >
- <property name="frameShape" >
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Plain</enum>
- </property>
- <widget class="QLabel" name="heading_pixmap" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>8</y>
- <width>16</width>
- <height>16</height>
- </rect>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="pixmap" >
- <pixmap/>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- <property name="alignment" >
- <set>Qt::AlignVCenter</set>
- </property>
- </widget>
- <widget class="QLabel" name="heading_label" >
- <property name="geometry" >
- <rect>
- <x>3</x>
- <y>0</y>
- <width>267</width>
- <height>21</height>
- </rect>
- </property>
- <property name="font" >
- <font>
- <family>Sans Serif</family>
- <pointsize>12</pointsize>
- <weight>75</weight>
- <italic>false</italic>
- <bold>true</bold>
- <underline>false</underline>
- <strikeout>false</strikeout>
- </font>
- </property>
- <property name="text" >
- <string>Minimize Energy</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
- </widget>
- </item>
- <item row="3" column="0" >
+ <item row="4" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
- <number>4</number>
+ <number>0</number>
</property>
<property name="spacing" >
<number>6</number>
@@ -677,40 +533,18 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
<property name="sizeHint" >
<size>
- <width>59</width>
+ <width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
- <widget class="QPushButton" name="cancel_btn" >
- <property name="toolTip" >
- <string>Cancel</string>
- </property>
+ <widget class="QPushButton" name="restore_btn" >
<property name="text" >
- <string>Cancel</string>
- </property>
- <property name="autoDefault" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="ok_btn" >
- <property name="toolTip" >
- <string>OK</string>
- </property>
- <property name="text" >
- <string>Minimize Energy</string>
- </property>
- <property name="autoDefault" >
- <bool>false</bool>
+ <string>Restore Defaults</string>
</property>
</widget>
</item>
diff --git a/cad/src/commands/MinimizeEnergy/WhatsThisText_for_MinimizeEnergyDialog.py b/cad/src/commands/MinimizeEnergy/WhatsThisText_for_MinimizeEnergyDialog.py
index ef6d9a586..298d470f8 100644
--- a/cad/src/commands/MinimizeEnergy/WhatsThisText_for_MinimizeEnergyDialog.py
+++ b/cad/src/commands/MinimizeEnergy/WhatsThisText_for_MinimizeEnergyDialog.py
@@ -62,12 +62,6 @@ def whatsThis_MinimizeEnergyDialog(minimizeEnergyDialog):
_med.cutoverRmsDoubleSpinBox.setWhatsThis(_text)
_med.cutoverrms_lbl.setWhatsThis(_text)
- _med.sponsor_btn.setWhatsThis(
- """<b>NanoEngineer-1 Sponsor</b>
- <p>
- Click on the logo to learn more
- about this NanoEngineer-1 sponsor.
- </p>""")
_med.minimize_all_rbtn.setWhatsThis(
"""<b>Minimize All</b>
<p>Perform energy minimization on all the atoms in the workspace.