From 0ed8e32b0c5bca5d3ce81c789c9418b77f9c5aac Mon Sep 17 00:00:00 2001
From: Daid <daid303@gmail.com>
Date: Tue, 17 Apr 2012 19:12:40 +0200
Subject: [PATCH] Some changes for the project manager.

---
 Cura/cura.py                                  |  5 ++++
 Cura/cura_sf/fabmetheus_utilities/settings.py |  6 ++---
 Cura/gui/opengl.py                            | 25 +++++++++++++++++++
 Cura/util/profile.py                          |  2 ++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/Cura/cura.py b/Cura/cura.py
index b65ac355..14dc53b1 100644
--- a/Cura/cura.py
+++ b/Cura/cura.py
@@ -46,10 +46,15 @@ __license__ = 'GNU Affero General Public License http://www.gnu.org/licenses/agp
 def main():
 	parser = OptionParser(usage="usage: %prog [options] <filename>.stl")
 	parser.add_option("-p", "--profile", action="store", type="string", dest="profile", help="Use these profile settings instead of loading current_profile.ini")
+	parser.add_option("-P", "--project", action="store_true", dest="openprojectplanner", help="Open the project planner")
 	parser.add_option("-r", "--print", action="store", type="string", dest="printfile", help="Open the printing interface, instead of the normal cura interface.")
 	(options, args) = parser.parse_args()
 	if options.profile != None:
 		profile.loadGlobalProfileFromString(options.profile)
+	if options.openprojectplanner != None:
+		from gui import projectPlanner
+		projectPlanner.main()
+		return
 	if options.printfile != None:
 		from gui import printWindow
 		printWindow.startPrintInterface(options.printfile)
diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index 58b82ce5..ce43dd7e 100644
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -136,7 +136,7 @@ def getProfileInformation():
 			'Infill_Width': storedSettingFloat("nozzle_size"),
 			'Loop_Order_Choice': DEFSET,
 			'Overlap_Removal_Width_over_Perimeter_Width_ratio': DEFSET,
-			'Turn_Extruder_Heater_Off_at_Shut_Down': DEFSET,
+			'Turn_Extruder_Heater_Off_at_Shut_Down': "False",
 			'Volume_Fraction_ratio': DEFSET,
 		},'fill': {
 			'Activate_Fill': "True",
@@ -376,7 +376,7 @@ def getProfileInformation():
 			'Retraction_Distance_millimeters': storedSettingFloat('retraction_amount'),
 			'Restart_Extra_Distance_millimeters': storedSettingFloat('retraction_extra'),
 		},'alteration': {
-			'Activate_Alteration': "True",
+			'Activate_Alteration': storedSetting('add_start_end_gcode'),
 			'Name_of_End_File': "end.gcode",
 			'Name_of_Start_File': "start.gcode",
 			'Remove_Redundant_Mcode': "True",
@@ -395,7 +395,7 @@ def getProfileInformation():
 			'gcode_step': DEFSET,
 			'gcode_time_segment': DEFSET,
 			'gcode_small': DEFSET,
-			'File_Extension': DEFSET,
+			'File_Extension': storedSetting('gcode_extension'),
 			'Name_of_Replace_File': DEFSET,
 			'Save_Penultimate_Gcode': "False",
 		}
diff --git a/Cura/gui/opengl.py b/Cura/gui/opengl.py
index 583b1414..6262a655 100644
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -77,6 +77,31 @@ def DrawMachine(machineSize):
 	glVertex3f(0, machineSize.y, machineSize.z)
 	glEnd()
 
+def DrawBox(vMin, vMax):
+	glBegin(GL_LINE_LOOP)
+	glVertex3f(vMin.x, vMin.y, vMin.z)
+	glVertex3f(vMax.x, vMin.y, vMin.z)
+	glVertex3f(vMax.x, vMax.y, vMin.z)
+	glVertex3f(vMin.x, vMax.y, vMin.z)
+	glEnd()
+
+	glBegin(GL_LINE_LOOP)
+	glVertex3f(vMin.x, vMin.y, vMax.z)
+	glVertex3f(vMax.x, vMin.y, vMax.z)
+	glVertex3f(vMax.x, vMax.y, vMax.z)
+	glVertex3f(vMin.x, vMax.y, vMax.z)
+	glEnd()
+	glBegin(GL_LINES)
+	glVertex3f(vMin.x, vMin.y, vMin.z)
+	glVertex3f(vMin.x, vMin.y, vMax.z)
+	glVertex3f(vMax.x, vMin.y, vMin.z)
+	glVertex3f(vMax.x, vMin.y, vMax.z)
+	glVertex3f(vMax.x, vMax.y, vMin.z)
+	glVertex3f(vMax.x, vMax.y, vMax.z)
+	glVertex3f(vMin.x, vMax.y, vMin.z)
+	glVertex3f(vMin.x, vMax.y, vMax.z)
+	glEnd()
+
 def DrawSTL(mesh):
 	for face in mesh.faces:
 		glBegin(GL_TRIANGLES)
diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 8735152d..0b903e88 100644
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -66,6 +66,8 @@ profileDefaultSettings = {
 	'raft_base_material_amount': '100',
 	'raft_interface_material_amount': '100',
 	'bottom_thickness': '0.0',
+	'add_start_end_gcode': 'True',
+	'gcode_extension': 'gcode',
 }
 preferencesDefaultSettings = {
 	'wizardDone': 'False',
-- 
2.30.2