Skip to content

Commit 538b353

Browse files
Bugfix ring location, Ring -> RING, window size larger
1 parent 9884536 commit 538b353

File tree

2 files changed

+31
-16
lines changed

2 files changed

+31
-16
lines changed

GUIs/plugin.ui

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>620</width>
10-
<height>815</height>
10+
<height>790</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -24,8 +24,8 @@
2424
</property>
2525
<property name="maximumSize">
2626
<size>
27-
<width>700</width>
28-
<height>850</height>
27+
<width>900</width>
28+
<height>900</height>
2929
</size>
3030
</property>
3131
<property name="windowTitle">
@@ -676,7 +676,7 @@
676676
<item>
677677
<widget class="QGroupBox" name="groupBox_12">
678678
<property name="sizePolicy">
679-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
679+
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
680680
<horstretch>0</horstretch>
681681
<verstretch>0</verstretch>
682682
</sizepolicy>
@@ -701,7 +701,7 @@
701701
<item row="3" column="0">
702702
<widget class="QDoubleSpinBox" name="coeff_thr">
703703
<property name="sizePolicy">
704-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
704+
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
705705
<horstretch>0</horstretch>
706706
<verstretch>0</verstretch>
707707
</sizepolicy>
@@ -726,7 +726,7 @@
726726
<item row="1" column="0">
727727
<widget class="QSpinBox" name="min_presence">
728728
<property name="sizePolicy">
729-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
729+
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
730730
<horstretch>0</horstretch>
731731
<verstretch>0</verstretch>
732732
</sizepolicy>
@@ -751,7 +751,7 @@
751751
<item row="3" column="1">
752752
<widget class="QDoubleSpinBox" name="p_thr">
753753
<property name="sizePolicy">
754-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
754+
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
755755
<horstretch>0</horstretch>
756756
<verstretch>0</verstretch>
757757
</sizepolicy>
@@ -786,7 +786,7 @@
786786
<item row="1" column="1">
787787
<widget class="QSpinBox" name="max_presence">
788788
<property name="sizePolicy">
789-
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
789+
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
790790
<horstretch>0</horstretch>
791791
<verstretch>0</verstretch>
792792
</sizepolicy>
@@ -1305,6 +1305,12 @@
13051305
<layout class="QVBoxLayout" name="verticalLayout_11">
13061306
<item>
13071307
<widget class="QDoubleSpinBox" name="rmsd_val">
1308+
<property name="sizePolicy">
1309+
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
1310+
<horstretch>0</horstretch>
1311+
<verstretch>0</verstretch>
1312+
</sizepolicy>
1313+
</property>
13081314
<property name="alignment">
13091315
<set>Qt::AlignCenter</set>
13101316
</property>
@@ -1345,6 +1351,12 @@
13451351
<layout class="QVBoxLayout" name="verticalLayout_9">
13461352
<item>
13471353
<widget class="QSpinBox" name="n_cluster">
1354+
<property name="sizePolicy">
1355+
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
1356+
<horstretch>0</horstretch>
1357+
<verstretch>0</verstretch>
1358+
</sizepolicy>
1359+
</property>
13481360
<property name="alignment">
13491361
<set>Qt::AlignCenter</set>
13501362
</property>
@@ -1672,7 +1684,7 @@
16721684
</sizepolicy>
16731685
</property>
16741686
<property name="text">
1675-
<string>Ring-md executable:</string>
1687+
<string>RING executable:</string>
16761688
</property>
16771689
</widget>
16781690
</item>
@@ -2216,8 +2228,11 @@
22162228
</item>
22172229
<item row="4" column="1">
22182230
<widget class="QCheckBox" name="override_memory">
2231+
<property name="toolTip">
2232+
<string>Usefull when structure has been modified</string>
2233+
</property>
22192234
<property name="text">
2220-
<string>Re-execute Ring each time</string>
2235+
<string>Do not save RING output</string>
22212236
</property>
22222237
</widget>
22232238
</item>

main_window.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ def __init__(self, app=None, parent=None):
3131
self.corr_dialog = CorrelationDialog(self)
3232
self.freq_dialog = FreqDialog(self)
3333

34-
if os.path.exists("{}/.ring/bin/Ring-md".format(environ['HOME'])):
34+
if os.path.exists("{}/.ring/bin/Ring".format(environ['HOME'])):
3535
self.widg.ring_path.setText("{}/.ring/bin/Ring".format(environ['HOME']))
3636
else:
37-
self.log("Ring-md path not found in current directory, please set it manually", warning=True)
37+
self.log("RING path not found in current directory, please set it manually", warning=True)
3838

3939
# Execute Ring
4040
self.widg.visualize_btn.clicked.connect(self.run)
@@ -316,7 +316,7 @@ def refresh_sele(self):
316316
and not self.widg.override_memory.isChecked():
317317
self.widg.visualize_btn.setText("Show")
318318
else:
319-
self.widg.visualize_btn.setText("Execute Ring")
319+
self.widg.visualize_btn.setText("Execute RING")
320320

321321
def visualize(self, selection=None, color=None, int_type=None):
322322
from pymol import stored
@@ -553,7 +553,7 @@ def resi_plot_fn(self):
553553

554554
if not os.path.exists(file_pth):
555555
self.log(
556-
"Before this you need to run Ring-md on the whole object first. Select it above and press the Show button",
556+
"Before this you need to run RING on the whole object first. Select it above and press the Show button",
557557
error=True)
558558
return
559559

@@ -626,7 +626,7 @@ def inter_heatmap(self):
626626
if sele_inter != "ALL":
627627
file_pth = "/tmp/ring/md/" + stored.model + ".gfreq_{}".format(sele_inter)
628628
if not os.path.exists(file_pth):
629-
self.log("Before this you need to run Ring-md on the object first!", error=True)
629+
self.log("Before this you need to run RING on the object first!", error=True)
630630
return
631631

632632
contact_freq = dict()
@@ -695,7 +695,7 @@ def get_values_from_input(self):
695695
file_pth = "/tmp/ring/" + stored.model + ".cif_ringEdges"
696696
if not os.path.exists(file_pth):
697697
self.log(
698-
"Before this you need to run Ring-md on the object first. Select it above and press the Show button",
698+
"Before this you need to run RING on the object first. Select it above and press the Show button",
699699
error=True)
700700
raise ValueError
701701

0 commit comments

Comments
 (0)