fix: retrieve adhesion_type globally (CURA-2605)

BagelOrb · BagelOrb · commit 18bf08a1b535 · 2016-10-11T15:00:51.000+02:00
diff --git a/src/FffGcodeWriter.cpp b/src/FffGcodeWriter.cpp
@@ -393,8 +393,7 @@ void FffGcodeWriter::processLayer(SliceDataStorage& storage, int layer_nr, unsig
     if (layer_nr < 0)
     {
 #ifdef DEBUG
-        const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));
-        assert(train.getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT && "negative layer_number means post-raft, pre-model layer!");
+        assert(getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT && "negative layer_number means post-raft, pre-model layer!");
 #endif // DEBUG
         const int filler_layer_count = Raft::getFillerLayerCount(storage);
         layer_thickness = Raft::getFillerLayerHeight(storage);
@@ -410,8 +409,7 @@ void FffGcodeWriter::processLayer(SliceDataStorage& storage, int layer_nr, unsig
         z = storage.meshes[0].layers[layer_nr].printZ;
         if (layer_nr == 0)
         {
-            const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));
-            if (train.getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT)
+            if (getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT)
             {
                 include_helper_parts = false;
             }
diff --git a/src/raft.cpp b/src/raft.cpp
@@ -39,7 +39,7 @@ int Raft::getTotalThickness(const SliceDataStorage& storage)
 int Raft::getZdiffBetweenRaftAndLayer1(const SliceDataStorage& storage)
 {
     const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));
-    if (train.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)
+    if (storage.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)
     {
         return 0;
     }
@@ -62,10 +62,9 @@ int Raft::getFillerLayerCount(const SliceDataStorage& storage)
 
 int Raft::getFillerLayerHeight(const SliceDataStorage& storage)
 {
-    const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));
-    const int64_t normal_layer_height = storage.getSettingInMicrons("layer_height");
-    if (train.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)
+    if (storage.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)
     {
+        const int64_t normal_layer_height = storage.getSettingInMicrons("layer_height");
         return normal_layer_height;
     }
     const unsigned int filler_layer_height = round_divide(getZdiffBetweenRaftAndLayer1(storage), getFillerLayerCount(storage));

Original file line number	Diff line number	Diff line change
`@@ -393,8 +393,7 @@ void FffGcodeWriter::processLayer(SliceDataStorage& storage, int layer_nr, unsig`
`393`	`393`	`if (layer_nr < 0)`
`394`	`394`	`{`
`395`	`395`	`#ifdef DEBUG`
`396`		`- const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));`
`397`		`- assert(train.getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT && "negative layer_number means post-raft, pre-model layer!");`
	`396`	`+ assert(getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT && "negative layer_number means post-raft, pre-model layer!");`
`398`	`397`	`#endif // DEBUG`
`399`	`398`	`const int filler_layer_count = Raft::getFillerLayerCount(storage);`
`400`	`399`	`layer_thickness = Raft::getFillerLayerHeight(storage);`
`@@ -410,8 +409,7 @@ void FffGcodeWriter::processLayer(SliceDataStorage& storage, int layer_nr, unsig`
`410`	`409`	`z = storage.meshes[0].layers[layer_nr].printZ;`
`411`	`410`	`if (layer_nr == 0)`
`412`	`411`	`{`
`413`		`- const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));`
`414`		`- if (train.getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT)`
	`412`	`+ if (getSettingAsPlatformAdhesion("adhesion_type") == EPlatformAdhesion::RAFT)`
`415`	`413`	`{`
`416`	`414`	`include_helper_parts = false;`
`417`	`415`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ int Raft::getTotalThickness(const SliceDataStorage& storage)`
`39`	`39`	`int Raft::getZdiffBetweenRaftAndLayer1(const SliceDataStorage& storage)`
`40`	`40`	`{`
`41`	`41`	`const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));`
`42`		`- if (train.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)`
	`42`	`+ if (storage.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)`
`43`	`43`	`{`
`44`	`44`	`return 0;`
`45`	`45`	`}`
`@@ -62,10 +62,9 @@ int Raft::getFillerLayerCount(const SliceDataStorage& storage)`
`62`	`62`
`63`	`63`	`int Raft::getFillerLayerHeight(const SliceDataStorage& storage)`
`64`	`64`	`{`
`65`		`- const ExtruderTrain& train = *storage.meshgroup->getExtruderTrain(storage.getSettingAsIndex("adhesion_extruder_nr"));`
`66`		`- const int64_t normal_layer_height = storage.getSettingInMicrons("layer_height");`
`67`		`- if (train.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)`
	`65`	`+ if (storage.getSettingAsPlatformAdhesion("adhesion_type") != EPlatformAdhesion::RAFT)`
`68`	`66`	`{`
	`67`	`+ const int64_t normal_layer_height = storage.getSettingInMicrons("layer_height");`
`69`	`68`	`return normal_layer_height;`
`70`	`69`	`}`
`71`	`70`	`const unsigned int filler_layer_height = round_divide(getZdiffBetweenRaftAndLayer1(storage), getFillerLayerCount(storage));`