fixed some bugs, updates related to location of documents folder

Classim/CustomTool/createManRepWindow.py

@@ -6,16 +6,12 @@
 from DatabaseSys.Databasesupport import *
 from pprint import pprint
 
-gusername = os.environ['username'] #windows. What about linux
-gparent_dir = 'C:\\Users\\'+gusername +'\\Documents'
-dbDir = os.path.join(gparent_dir,'classim')
-
 class createManRepWindow(QWidget):
     """
     This window is a QWidget.
     """
     def __init__(self):
-        conn, c = openDB(dbDir + '\\crop.db')
+        conn, c = openDB('crop.db')
         if c:
             super().__init__()
             self.setGeometry(0,0,520,400)

Classim/CustomTool/custom1.py

@@ -6,8 +6,6 @@
 from DatabaseSys.Databasesupport import *
 from PyQt5.QtCore import Qt, QModelIndex, QVariant, QAbstractItemModel
 
-# add all the custom listbox, signal and slot cases here
-username=os.environ['username']
 KEY,NODE = range(2)
 
 @contextmanager

Classim/CustomTool/generateModelInputFiles.py

@@ -6,6 +6,7 @@
 import pandas as pd
 from CustomTool.custom1 import *
 from CustomTool.UI import *
+from CustomTool.getClassimDir import *
 from DatabaseSys.Databasesupport import *
 from Models.cropdata import *
 from TabbedDialog.tableWithSignalSlot import *
@@ -14,30 +15,17 @@
 from PyQt5.QtCore import QFile, QTextStream, QIODevice
 
 
-global runpath1
-global app_dir
-global repository_dir
-
-gusername = os.environ['username'] #windows. What about linux
-gparent_dir = 'C:\\Users\\'+gusername +'\\Documents'
-app_dir = os.path.join(gparent_dir,'classim')
-if not os.path.exists(app_dir):
-    os.makedirs(app_dir)
-
-global db
-db = app_dir+'\\crop.db'
-
-run_dir = os.path.join(app_dir,'run')
-if not os.path.exists(run_dir):
-    os.makedirs(run_dir)
-
-runpath1= run_dir
-repository_dir = os.path.join(runpath1,'store')
+global classimDir
+global runDir
+global storeDir
 
+classimDir = getClassimDir()
+runDir = os.path.join(classimDir,'run')
+storeDir = os.path.join(runDir,'store')
 
 ## This should always be there
-if not os.path.exists(repository_dir):
-    print('RotationTab Error: Missing repository_dir')
+if not os.path.exists(storeDir):
+    print('RotationTab Error: Missing store folder.')
 
 
 def copyFile(src,dest):
@@ -329,11 +317,11 @@ def WriteCropVariety(crop,cultivar,field_name,field_path):
     fh.close()
 
 
-def WriteWeather(experiment,treatmentname,stationtype,weather,field_name,field_path,tempVar,rainVar,CO2Var):
+def WriteWeather(experiment,treatmentname,stationtype,weather,field_path,tempVar,rainVar,CO2Var):
     # First create .wea file that stores the daily/hourly weather information for the simulation period
     filename = field_path+'\\'+stationtype + '.wea'   
     # getting weather data from sqlite
-    conn, c = openDB(db)
+    conn, c = openDB('crop.db')
 
     # get date range for treatment
     op_date_query = "select distinct odate from operations o, treatment t, experiment e where t.tid = o.o_t_exid and e.exid=t.t_exid and e.name=? and t.name = ?"
@@ -658,7 +646,6 @@ def WriteMulchGeo(field_path,nutrient):
     mulchDecompList = getMulchDecomp(nutrient)   
 
     CODEC="UTF-8"        
-    #field_path = os.path.join(runpath1,field_name)
     filename = field_path+'\\MulchGeo.mul'        
     fh = QFile(filename)