minor fixes for calculated datasets, and fix axis stuff

EMSL-MSC · Aug 11, 2014 · d6f90f4 · d6f90f4
1 parent 79f0aa3
commit d6f90f4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/libcview-data/CalculatedDataSet.m b/libcview-data/CalculatedDataSet.m
@@ -240,6 +240,7 @@ - (float)resetMax {
 	 * find the current max of the data.
 	 */
 	//NSLog(@"[CalculatedDataSet(%@) resetMax]", self);
+	NSLog(@"Tell Evan if you see this.");
 	int i;
 	float max = 0;
 	float *d = [newData mutableBytes];
@@ -338,6 +339,11 @@ -(void)performCalculation {
 	memcpy(d,new_data_bytes,width*height*sizeof(float));
 
 	currentMax=max;
+	if (lockedMax > 0.0) {
+		NSLog(@"[CalculatedDataSet(%@) performCalculation] %f",self,lockedMax);
+		currentMax=lockedMax;
+	}
+
 	//NSLog(@"CDS max: %f",currentMax);
 
 	[self unlock];

diff --git a/libcview/GLGrid.m b/libcview/GLGrid.m
@@ -284,8 +284,8 @@ -(NSArray *)attributeKeys {
 
 -(NSDictionary *)tweaksettings {
 	return [NSDictionary dictionaryWithObjectsAndKeys:
-		[NSString stringWithFormat: @"help='Tick separation in the X direction' min=1 max=%d step=1 precision=0",[dataSet width]],@"xTicks",
-		[NSString stringWithFormat: @"help='Tick separation in the Y direction' min=1 max=%d step=1 precision=0",[dataSet height]],@"yTicks",
+		[NSString stringWithFormat: @"help='Tick separation in the X direction' min=0 max=%d step=1 precision=0",[dataSet width]],@"xTicks",
+		[NSString stringWithFormat: @"help='Tick separation in the Y direction' min=0 max=%d step=1 precision=0",[dataSet height]],@"yTicks",
 		@"min=0.1 step=0.05",@"xscale",
 		@"min=0.1 step=0.05",@"yscale",
 		@"min=0.1 step=0.05",@"zscale",

diff --git a/mingw/CMakeLists.txt b/mingw/CMakeLists.txt
@@ -11,19 +11,19 @@ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/libs ${CMAKE_CURRENT_BINARY_DIR}
 ##########################
 #  freeglut
 ##########################
-SET(FREEGLUT_VERSION 2.8.0-1.mp)
+SET(FREEGLUT_VERSION 2.8.1-1.mp)
 SET(FREEGLUT_ZIP "freeglut-MinGW-${FREEGLUT_VERSION}.zip")
 SET(FREEGLUT_DOWNLOAD_URL "http://files.transmissionzero.co.uk/software/development/GLUT/${FREEGLUT_ZIP}")
 ADD_CUSTOM_COMMAND(OUTPUT ${FREEGLUT_ZIP} COMMAND ${URL_GRAB} ${FREEGLUT_DOWNLOAD_URL})
 ADD_CUSTOM_COMMAND(OUTPUT "freeglut/lib" COMMAND ${UNZIP} -o ${FREEGLUT_ZIP} DEPENDS ${FREEGLUT_ZIP})
-ADD_CUSTOM_COMMAND(OUTPUT "libs/libfreeglut.a" COMMAND cp "freeglut/lib/*" "freeglut/bin/freeglut.dll" "libs" COMMAND cp -a freeglut/include/* include DEPENDS "freeglut/lib")
+ADD_CUSTOM_COMMAND(OUTPUT "libs/libfreeglut.a" COMMAND cp "freeglut/lib/*.a" "freeglut/bin/freeglut.dll" "libs" COMMAND cp -a freeglut/include/* include DEPENDS "freeglut/lib")
 ADD_CUSTOM_TARGET(freeglut DEPENDS "libs/libfreeglut.a" )
 
 
 ##########################
 # AntTweakBar
 ##########################
-SET(ATB_VERSION 115)
+SET(ATB_VERSION 116)
 SET(ATB_ZIP "AntTweakBar_${ATB_VERSION}.zip")
 SET(ATB_DOWNLOAD_URL "http://www.antisphere.com/Tools/AntTweakBar/${ATB_ZIP}")
 ADD_CUSTOM_COMMAND(OUTPUT ${ATB_ZIP} COMMAND ${URL_GRAB} ${ATB_DOWNLOAD_URL})

diff --git a/src/oscview.m b/src/oscview.m
@@ -115,6 +115,10 @@ int main(int argc,char *argv[], char *env[]) {
 	NSArray *worlds = [plist valueForKey: @"worlds"];
 	if (worlds != nil) {
 		NSLog(@"Compat Mode Detected: %@",worlds);
+		//load value store
+		NSArray *arr = [plist objectForKey: @"valueStore"];
+		[[ValueStore valueStore] loadKeyValueArray: arr];
+
 		plist = [[worlds objectAtIndex: 0] valueForKey: @"world"];
 		NSLog(@"Compat list: %@",plist );
 	}