Merge conflic solved

Merge branch 'master' of github.com:daid/Cura

Conflicts:
	Cura/util/profile.py

diff --git a/Cura/cura.py b/Cura/cura.py
index b65ac355aefd7f73c0467cb9c4b014319f0348e1..14dc53b1e5cb6ef968a08bb2228d077c569bea73 100644 (file)
--- 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 f95c2d28a461438670c6458ff520edb829a3a401..4f53c63a62f94025b447ceaf108e319e7f126c41 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -139,7 +139,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",
@@ -379,7 +379,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",
@@ -398,7 +398,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 54d0008d286877f9b3d37975988542b3e36e32f6..83bbc2a4d98831dce2d3c15a97e54e43a6b28d72 100644 (file)
--- a/Cura/gui/opengl.py
+++ b/Cura/gui/opengl.py
@@ -77,6 +77,31 @@ def DrawMachine(machineSize):
        glVertex3f(0, machineSize.y, machineSize.z)\r
        glEnd()\r
 \r
+def DrawBox(vMin, vMax):\r
+       glBegin(GL_LINE_LOOP)\r
+       glVertex3f(vMin.x, vMin.y, vMin.z)\r
+       glVertex3f(vMax.x, vMin.y, vMin.z)\r
+       glVertex3f(vMax.x, vMax.y, vMin.z)\r
+       glVertex3f(vMin.x, vMax.y, vMin.z)\r
+       glEnd()\r
+\r
+       glBegin(GL_LINE_LOOP)\r
+       glVertex3f(vMin.x, vMin.y, vMax.z)\r
+       glVertex3f(vMax.x, vMin.y, vMax.z)\r
+       glVertex3f(vMax.x, vMax.y, vMax.z)\r
+       glVertex3f(vMin.x, vMax.y, vMax.z)\r
+       glEnd()\r
+       glBegin(GL_LINES)\r
+       glVertex3f(vMin.x, vMin.y, vMin.z)\r
+       glVertex3f(vMin.x, vMin.y, vMax.z)\r
+       glVertex3f(vMax.x, vMin.y, vMin.z)\r
+       glVertex3f(vMax.x, vMin.y, vMax.z)\r
+       glVertex3f(vMax.x, vMax.y, vMin.z)\r
+       glVertex3f(vMax.x, vMax.y, vMax.z)\r
+       glVertex3f(vMin.x, vMax.y, vMin.z)\r
+       glVertex3f(vMin.x, vMax.y, vMax.z)\r
+       glEnd()\r
+\r
 def DrawSTL(mesh):\r
        for face in mesh.faces:\r
                glBegin(GL_TRIANGLES)\r

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 3bdfbb2cba979b4bed76b0313dc6c315b9ce4e60..7f999961ba59ec91aff4b1190a0c9438f00b7cdb 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -64,8 +64,10 @@ profileDefaultSettings = {
        'bridge_material_amount': '100',\r
        'raft_margin': '5',\r
        'raft_base_material_amount': '100',\r
-       'raft_interface_material_amount': '100',\r
+       'raft_interface_material_amount': '100',
        'bottom_thickness': '0.3',\r
+       'add_start_end_gcode': 'True',\r
+       'gcode_extension': 'gcode',
 }\r
 preferencesDefaultSettings = {\r
        'wizardDone': 'False',\r