Fixed bug in slicer handling.

repetier · Aug 17, 2012 · 4017111 · 4017111
1 parent e12fd1a
commit 4017111
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/RepetierHost/RepetierHost/controller/RHSlicer.m b/RepetierHost/RepetierHost/controller/RHSlicer.m
@@ -61,44 +61,43 @@ -(void)updateSelections {
     NSString *oldPrinter = [d objectForKey:@"slic3rPrinter"];
     NSString *oldProfile = [d objectForKey:@"skeinforgeSelectedProfile"];
     // Filament list
-    NSDirectoryEnumerator* enumerator = [[NSFileManager defaultManager] enumeratorAtPath:[NSString stringWithFormat:@"%@/filament",cdir]];
+    NSArray* enumerator = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[NSString stringWithFormat:@"%@/filament",cdir] error:nil];
     [slic3rFilamentList removeAllObjects];
-    while (file = [enumerator nextObject])
+    for (NSString *file in enumerator)
     {
         // check if it's a directory
         BOOL isDirectory = NO;
         [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/filament/%@",cdir,file] isDirectory: &isDirectory];
-        if (!isDirectory)
+        if (!isDirectory && [file.pathExtension compare:@"ini"]==NSOrderedSame)
         {
             [slic3rFilamentList addObject:[file stringByDeletingPathExtension]];
         }
     }
     [slic3rFilamentSettings removeAllItems];
     [slic3rFilamentSettings addItemsWithTitles:slic3rFilamentList];
     // Print list
-    enumerator = [[NSFileManager defaultManager] enumeratorAtPath:[NSString stringWithFormat:@"%@/print",cdir]];
+    enumerator = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[NSString stringWithFormat:@"%@/print",cdir] error:nil];
     [slic3rPrintList removeAllObjects];
-    while (file = [enumerator nextObject])
+    for (NSString *file in enumerator)
     {
         // check if it's a directory
         BOOL isDirectory = NO;
         [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/print/%@",cdir,file] isDirectory: &isDirectory];
-        if (!isDirectory)
+        if (!isDirectory && [file.pathExtension compare:@"ini"]==NSOrderedSame)
         {
             [slic3rPrintList addObject:[file stringByDeletingPathExtension]];
         }
     }
     [slic3rPrintSettings removeAllItems];
     [slic3rPrintSettings addItemsWithTitles:slic3rPrintList];
     // Printer list
-    enumerator = [[NSFileManager defaultManager] enumeratorAtPath:[NSString stringWithFormat:@"%@/printer",cdir]];
-    [slic3rPrinterList removeAllObjects];
-    while (file = [enumerator nextObject])
+    enumerator = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[NSString stringWithFormat:@"%@/printer",cdir] error:nil];    [slic3rPrinterList removeAllObjects];
+    for (NSString *file in enumerator)
     {
         // check if it's a directory
         BOOL isDirectory = NO;
         [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/printer/%@",cdir,file] isDirectory: &isDirectory];
-        if (!isDirectory)
+        if (!isDirectory && [file.pathExtension compare:@"ini"]==NSOrderedSame)
         {
             [slic3rPrinterList addObject:[file stringByDeletingPathExtension]];
         }
@@ -108,9 +107,8 @@ -(void)updateSelections {
 
     // Skeinforge profiles list
     NSString *prof = [d stringForKey:@"skeinforgeProfiles"];
-    enumerator = [[NSFileManager defaultManager] enumeratorAtPath:[NSString stringWithFormat:@"%@/extrusion",prof]];
-    [skeinforgeProfileList removeAllObjects];
-    while (file = [enumerator nextObject])
+    enumerator = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:[NSString stringWithFormat:@"%@/extrusion",prof] error:nil];    [skeinforgeProfileList removeAllObjects];
+    for (NSString *file in enumerator)
     {
         // check if it's a directory
         BOOL isDirectory = NO;

diff --git a/RepetierHost/RepetierHost/models/GCodeVisual.m b/RepetierHost/RepetierHost/models/GCodeVisual.m
@@ -317,7 +317,7 @@ -(void)updateVBO:(BOOL)buffer
                 //NSLog(@"dir %f %f %f",dir[0],dir[1],dir[2]);
                 //NSLog(@"lastdir %f %f %f",lastdir[0],lastdir[1],lastdir[2]);
                 double vacos = dir[0] * lastdir[0] + dir[1] * lastdir[1] + dir[2] * lastdir[2];
-                if(vacos<-0.97) vacos = -0.97; else if(vacos>1) vacos = 1;
+                if(vacos<0.1) vacos = 0.1; else if(vacos>1) vacos = 1;
                 float zoomw = vacos; //cos(acos(vacos));
                 //NSLog(@"vacos %f,zoomz %f",vacos,zoomw);
                 lastdir[0] = actdir[0];

diff --git a/RepetierHost/RepetierHost/models/Slicer.m b/RepetierHost/RepetierHost/models/Slicer.m
@@ -236,6 +236,7 @@ -(void)killSlicing {
         [skeinforgeSlice kill];
     if(slic3rExtSlice!=nil)
         [slic3rExtSlice kill];
+    [app->rhslicer.killButton setEnabled:NO];
 }
 
 -(BOOL)skeinforgeConfigured {

diff --git a/RepetierHost/RepetierHost/windows/Slicer.xib b/RepetierHost/RepetierHost/windows/Slicer.xib
@@ -862,19 +862,32 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedObject: values.slic3rFilament</string>
+						<string key="label">selectedValue: values.slic3rFilament</string>
 						<reference key="source" ref="752862765"/>
 						<reference key="destination" ref="418764447"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="752862765"/>
 							<reference key="NSDestination" ref="418764447"/>
-							<string key="NSLabel">selectedObject: values.slic3rFilament</string>
-							<string key="NSBinding">selectedObject</string>
+							<string key="NSLabel">selectedValue: values.slic3rFilament</string>
+							<string key="NSBinding">selectedValue</string>
 							<string key="NSKeyPath">values.slic3rFilament</string>
+							<object class="NSDictionary" key="NSOptions">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<string>NSAllowsEditingMultipleValuesSelection</string>
+									<string>NSRaisesForNotApplicableKeys</string>
+								</object>
+								<object class="NSArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<boolean value="NO"/>
+									<boolean value="NO"/>
+								</object>
+							</object>
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">112</int>
+					<int key="connectionID">128</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
@@ -1001,9 +1014,9 @@
 							<reference ref="571985883"/>
 							<reference ref="1029859712"/>
 							<reference ref="826852478"/>
-							<reference ref="752862765"/>
 							<reference ref="622642233"/>
 							<reference ref="696432587"/>
+							<reference ref="752862765"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -1437,7 +1450,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">122</int>
+			<int key="maxID">128</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">