Changeset 4481 for palm/trunk/SCRIPTS/palmrungui

Timestamp:

Mar 31, 2020 6:55:54 PM (5 years ago)

Author:

maronga

Message:

Bugfix for copyright updates in document_changes; copyright update applied to all files

File:

• palm/trunk/SCRIPTS/palmrungui (modified) (5 diffs)

palm/trunk/SCRIPTS/palmrungui

@@ -15 +15 @@
 # PALM. If not, see <http://www.gnu.org/licenses/>.
 #
-# Copyright 1997-2018  Leibniz Universitaet Hannover
+# Copyright 1997-2020  Leibniz Universitaet Hannover
 #--------------------------------------------------------------------------------#
 #
@@ -25 +25 @@
 # -----------------
 # $Id$
+# Bugfixes: - reading history lines discard button caused error message
+#           - deleting of USER_CODE files did not work
+# 
+# 4470 2020-03-24 06:52:19Z maronga
 # Added file size output, more I/O functionalities, new/removed buttons
 # 
@@ -1112 +1116 @@
        opt.exec_()
 
-       palmrunline = str(history_entry)
-       palmrunline = palmrunline[17:]
-       palmrunline = palmrunline[:len(palmrunline)-1]
-       palmrunline = filter(None,palmrunline.split("("))[0]
-       self.groupBox.findChild(QtGui.QLineEdit,"commandline").setText(palmrunline)
-
-#      Set selected item to jobname in "available jobs" list
-       jobname = str(history_entry[17:])
-       jobname = filter(None,jobname.split(" -r"))[1]
-       jobname = jobname.strip()
-       jobname = filter(None,jobname.split(" "))[0]
-       jobname = jobname.replace("\"","") 
-       item2int = self.list_jobs.findItems(jobname,QtCore.Qt.MatchCaseSensitive)
-
-       if ( item2int != [] ):
-          self.list_jobs.setCurrentItem(item2int[0])
-          self.update_input()
-
-#      Add tooltip tag
-       tag = str(history_entry).split('\n')[0]
-       tag = filter(None,tag.split("("))[1]
-       tag = tag.replace(")","")
-       self.groupBox.findChild(QtGui.QLineEdit,"line_tag").setText(tag)
+       if ( history_entry != "" ):
+          palmrunline = str(history_entry)
+          palmrunline = palmrunline[17:]
+          palmrunline = palmrunline[:len(palmrunline)-1]
+          palmrunline = filter(None,palmrunline.split("("))[0]
+          self.groupBox.findChild(QtGui.QLineEdit,"commandline").setText(palmrunline)
+
+#         Set selected item to jobname in "available jobs" list
+          jobname = str(history_entry[17:])
+          jobname = filter(None,jobname.split(" -r"))[1]
+          jobname = jobname.strip()
+          jobname = filter(None,jobname.split(" "))[0]
+          jobname = jobname.replace("\"","")
+          item2int = self.list_jobs.findItems(jobname,QtCore.Qt.MatchCaseSensitive)
+
+          if ( item2int != [] ):
+             self.list_jobs.setCurrentItem(item2int[0])
+             self.update_input()
+
+#         Add tooltip tag
+          tag = str(history_entry).split('\n')[0]
+          tag = filter(None,tag.split("("))[1]
+          tag = tag.replace(")","")
+          self.groupBox.findChild(QtGui.QLineEdit,"line_tag").setText(tag)
  
-#      Process palmrungui to set up gui controls
-       self.setup_gui(palmrunline)
+#         Process palmrungui to set up gui controls
+          self.setup_gui(palmrunline)
 
 
@@ -1606 +1611 @@
           sel_files = self.list_user.selectedItems()
 
-          input_dir = job_dir + "/" + sel_job + "/USER/"
+          input_dir = job_dir + "/" + sel_job + "/USER_CODE/"
 
           for i in range(0,len(sel_files)):
@@ -1745 +1750 @@
     def DiscardHistory(self):
 
-
+       global history_entry
+       history_entry = ""
        self.close()