Open file from command line

diff --git a/config.py b/config.py
index b25a37de9dcb281cd83ef0ca238396d97689c32e..aff86905f28bb435516e940d7dc43741bee6a159 100644 (file)
--- a/config.py
+++ b/config.py
@@ -45,7 +45,6 @@ config["preset_directory"]=os.path.join(config["data_directory"], config["preset
 config["template_directory"]=os.path.join(config["data_directory"], config["template_directory"])
 config["template"]=os.path.join(config["template_directory"], config["template"])
 config["resource"]=os.path.abspath(os.path.join(real_dir, "resource"))
-print(config["resource"])
 if(args.prescriber is None):
     config["prescriber_directory"]=os.path.join(config["data_directory"], config["prescriber_directory"])
     config["prescriber"]=os.path.join(config["prescriber_directory"], config["prescriber"])

diff --git a/window.py b/window.py
index 4a5585ac8db3a48f05fbfb260307f61c27c42645..e9dcd9dcc1f7b8408941ac9e44472d22f76b61d1 100644 (file)
--- a/window.py
+++ b/window.py
@@ -36,9 +36,12 @@ class MainWindow(QMainWindow):
         self.load_interface()
         self.save_state=md5("".encode()).hexdigest()
 
-    def cmd_open(self):
+    def cmd_open(self, file="data/document/test.mpaz"):
         try:
-            self.current_file.set_file(QFileDialog.getOpenFileName(self, "Open File", config["document_directory"], "Prescriptions (*.mpaz);; All Files (*)")[0])
+            if(file):
+                self.current_file.set_file(file)
+            else:
+                self.current_file.set_file(QFileDialog.getOpenFileName(self, "Open File", config["document_directory"], "Prescriptions (*.mpaz);; All Files (*)")[0])
             self.current_file.open()
             self.prescription.read_from(os.path.join(self.current_file.directory.name,"prescription.json"))
             self.load_interface_from_instance()
@@ -547,5 +550,8 @@ class MainWindow(QMainWindow):
         self.edit_prescriber=EditPrescriber()
         self.viewbox=ViewBox()
 
-        self.cmd_new()
+        if(config["filename"]):
+            self.cmd_open(config["filename"])
+        else:
+            self.cmd_new()
         self.show()