Changeset 2484 for palm/trunk/SCRIPTS/palm_jm

Timestamp:

Sep 20, 2017 2:22:42 PM (7 years ago)

Author:

maronga

Message:

updates in palm_jm and palmrungui

File:

• palm/trunk/SCRIPTS/palm_jm (modified) (9 diffs)

palm/trunk/SCRIPTS/palm_jm

@@ -16 +16 @@
 #
 # Copyright 1997-2016  Leibniz Universitaet Hannover
-#--------------------------------------------------------------------------------#
+##--------------------------------------------------------------------------------#
 #
 # Current revisions:
@@ -25 +25 @@
 # -----------------
 # $Id$
+# Adapted for palmrun with USER_CODE always stored under /JOBS/name/USER_CODE/.
+# Added PALM logo
+# 
+# 2068 2016-11-11 21:59:39Z maronga
 #
 # 2067 2016-11-11 21:55:49Z maronga
@@ -68 +72 @@
    palm_dir = out.split("palm")[0] + "palm/" + out.split("palm")[1].split("/")[1]
    out = None
-   
-   # remove this line on release
-#   palm_dir = '/home/maronga/PUB/thinktank/maronga/job_manager'
-   
+      
    job_dir = palm_dir + '/JOBS'
    user_dir = palm_dir + '/USER_CODE'
@@ -95 +96 @@
         # Load predefined mainwindow
         uic.loadUi(palm_bin + '/palm_jm_files/palm_jm.ui', self)
+
+        self.palm_logo.setPixmap(QtGui.QPixmap(palm_dir  + "/trunk/SCRIPTS/palmrungui_files/logo.png"))
+
+
     
         # Display MainWindow
@@ -100 +105 @@
         QtGui.QApplication.processEvents()
 
-        self.load_jobs()
+        #self.load_jobs()
 
     
@@ -149 +154 @@
                 self.list_input.addItem(str(list_of_files[i]))
   
-       job_to_show = user_dir + "/" + self.list_jobs.currentItem().text()
+       job_to_show = job_dir + "/" + self.list_jobs.currentItem().text() + "/USER_CODE"
        
        if ( os.path.isdir(job_to_show) ):
@@ -199 +204 @@
              shutil.copy(tmp_file, new_file)
 
-#      copy and rename user code (if present)
-       user_code_to_copy = user_dir + "/" + old_job_name
-       new_user_code_dir = user_dir + "/" + new_job_name
-
-#      check if a job exists with the new job name  
-       if ( os.path.isdir(new_user_code_dir) ):
-           notify = QtGui.QMessageBox.warning(self,'Create new user code directory',"Error. Could not create user code directory. A user code directory with the new name already exists.")
+
+
+
+       new_user_dir  = job_dir + "/" + new_job_name + "/USER_CODE"
+       
+#      check if user code exists in the new job directory 
+       if ( os.path.isdir(new_user_dir) ):
+           notify = QtGui.QMessageBox.warning(self,'Create new user code directory',"Error. Could not create user code directory. A user code directiory with the new name already exists.")
            self.setEnabled(True)
            return
        else:
-           os.makedirs(new_user_code_dir)
-
-       if ( os.path.isdir(user_code_to_copy) ):
-
-          list_of_files = os.listdir(user_code_to_copy)
+           os.makedirs(new_user_dir)
+
+
+#      copy user code files (if present)       
+       user_to_copy = job_dir + "/" + old_job_name + "/USER_CODE"
+
+       if ( os.path.isdir(user_to_copy) ):
+
+          list_of_files = os.listdir(user_to_copy)
          
           for i in range(0,len(list_of_files)):
 
-             tmp_file = user_code_to_copy + "/" + list_of_files[i]        
-             new_file = new_user_code_dir + "/" + list_of_files[i]
+             tmp_file = user_to_copy + "/" + list_of_files[i]          
+             new_file = new_user_dir + "/" + list_of_files[i]
              shutil.copy(tmp_file, new_file)
 
@@ -269 +279 @@
                 shutil.copy(tmp_file, new_file)
 
-#         copy and rename user code (if present)
-          user_code_to_copy = user_dir + "/" + old_job_name
-          new_user_code_dir = user_dir + "/" + new_job_name
-
-#         check if a job exists with the new job name  
-          if ( os.path.isdir(new_user_code_dir) ):
-             notify = QtGui.QMessageBox.warning(self,'Create new user code directory',"Error. Could not create user code directory. A user code directory with the new name already exists.")
-             self.setEnabled(True)
-             return
+
+          new_user_dir  = job_dir + "/" + new_job_name + "/USER_CODE"
+       
+#         check if user code exists in the new job directory 
+          if ( os.path.isdir(new_user_dir) ):
+              notify = QtGui.QMessageBox.warning(self,'Create new user code directory',"Error. Could not create user code directory. A user code directiory with the new name already exists.")
+              self.setEnabled(True)
+              return
           else:
-             os.makedirs(new_user_code_dir)
-
-          if ( os.path.isdir(user_code_to_copy) ):
-
-             list_of_files = os.listdir(user_code_to_copy)
+              os.makedirs(new_user_dir)
+
+
+#         copy user code files (if present)       
+          user_to_copy = job_dir + "/" + old_job_name + "/USER_CODE"
+
+          if ( os.path.isdir(user_to_copy) ):
+
+             list_of_files = os.listdir(user_to_copy)
          
              for i in range(0,len(list_of_files)):
 
-                tmp_file = user_code_to_copy + "/" + list_of_files[i]        
-                new_file = new_user_code_dir + "/" + list_of_files[i]
+                tmp_file = user_to_copy + "/" + list_of_files[i]          
+                new_file = new_user_dir + "/" + list_of_files[i]
                 shutil.copy(tmp_file, new_file)
 
@@ -345 +358 @@
        sel_files = self.list_user.selectedItems()
        
-       input_dir = user_dir + "/" + sel_job + "/"
+       input_dir = job_dir + "/" + sel_job + "/USER_CODE/"
        
        open_files = ""