Adding GUI options to configure what is shown for the wall measurement(exterior/interior/midline) information

Author: aalavandhaann

build/js/app.js

@@ -698,15 +698,23 @@ function datGUI(three, floorplanner)
 	aCameraRange = new CameraProperties();
 	aWall = new WallProperties();
 	anItem = new ItemProperties(gui);
-
+	
 	aCameraRange.three = three;
 
-	globalPropFolder = getGlobalPropertiesFolder(gui, aGlobal);
+	globalPropFolder = getGlobalPropertiesFolder(gui, aGlobal);	
 	carbonPropsFolder = getCarbonSheetPropertiesFolder(gui, floorplanner.carbonSheet, aGlobal);
+	
+	var f = gui.addFolder('Wall Measurements');
+	f.add(BP3DJS.wallInformation, 'exterior').name('Exterior');
+	f.add(BP3DJS.wallInformation, 'interior').name('Interior');
+	f.add(BP3DJS.wallInformation, 'midline').name('Midline');
 
 	cameraPropFolder = getCameraRangePropertiesFolder(gui, aCameraRange);
 	wallPropFolder = getWallAndFloorPropertiesFolder(gui, aWall);
 	itemPropFolder = getItemPropertiesFolder(gui, anItem);
+	
+	
+	
 }
 
 

build/js/bp3djs.js

@@ -48982,6 +48982,8 @@ var BP3DJS = (function (exports) {
 
   var config = { dimUnit: dimCentiMeter, wallHeight: 250, wallThickness: 10, systemUI: false };
 
+  var wallInformation = { exterior: true, interior: true, midline: true };
+
   /** Global configuration to customize the whole system.  */
   var Configuration = function () {
   	function Configuration() {
@@ -117892,6 +117894,9 @@ var BP3DJS = (function (exports) {
   	}, {
   		key: 'drawWallLabelsMiddle',
   		value: function drawWallLabelsMiddle(wall) {
+  			if (!wallInformation.midline) {
+  				return;
+  			}
   			var pos = wall.wallCenter();
   			var length = wall.wallLength();
   			if (length < 60) {
@@ -117912,7 +117917,9 @@ var BP3DJS = (function (exports) {
   				// dont draw labels on walls this short
   				return;
   			}
-  			this.drawTextLabel('e:' + Dimensioning.cmToMeasure(length), this.viewmodel.convertX(pos.x), this.viewmodel.convertY(pos.y + 40));
+  			if (wallInformation.exterior) {
+  				this.drawTextLabel('e:' + Dimensioning.cmToMeasure(length), this.viewmodel.convertX(pos.x), this.viewmodel.convertY(pos.y + 40));
+  			}
   		}
 
   		/** */
@@ -117926,7 +117933,9 @@ var BP3DJS = (function (exports) {
   				// dont draw labels on walls this short
   				return;
   			}
-  			this.drawTextLabel('i:' + Dimensioning.cmToMeasure(length), this.viewmodel.convertX(pos.x), this.viewmodel.convertY(pos.y - 40));
+  			if (wallInformation.interior) {
+  				this.drawTextLabel('i:' + Dimensioning.cmToMeasure(length), this.viewmodel.convertX(pos.x), this.viewmodel.convertY(pos.y - 40));
+  			}
   		}
   	}, {
   		key: 'drawTextLabel',
@@ -170155,6 +170164,7 @@ var BP3DJS = (function (exports) {
   exports.wallColor = wallColor;
   exports.wallColorHover = wallColorHover;
   exports.wallColorSelected = wallColorSelected;
+  exports.wallInformation = wallInformation;
   exports.wallWidth = wallWidth;
   exports.wallWidthHover = wallWidthHover;
   exports.wallWidthSelected = wallWidthSelected;

src/scripts/blueprint.js

@@ -19,7 +19,7 @@ export {ELogContext, ELogLevel, logContext, isLogging, log} from './core/log.js'
 export {dimInch, dimFeetAndInch, dimMeter, dimCentiMeter, dimMilliMeter, dimensioningOptions, decimals, Dimensioning} from './core/dimensioning.js';
 export {cmPerFoot, pixelsPerFoot, cmPerPixel, pixelsPerCm} from './core/dimensioning.js';
 
-export {configDimUnit, configWallHeight, configWallThickness, configSystemUI, Configuration} from './core/configuration.js';
+export {configDimUnit, configWallHeight, configWallThickness, configSystemUI, wallInformation, Configuration} from './core/configuration.js';
 export {VIEW_TOP, VIEW_FRONT, VIEW_RIGHT, VIEW_LEFT, VIEW_ISOMETRY} from './core/constants.js';
 
 //Classes from model module

src/scripts/core/configuration.js

@@ -13,6 +13,8 @@ export const configSystemUI = 'systemUI';
 
 export var config = {dimUnit: dimCentiMeter, wallHeight: 250, wallThickness: 10, systemUI: false};
 
+export var wallInformation = {exterior: true, interior: true, midline: true};
+
 /** Global configuration to customize the whole system.  */
 export class Configuration 
 {

src/scripts/floorplanner/floorplanner_view.js

@@ -4,6 +4,7 @@ import {Utils} from '../core/utils.js';
 import {EVENT_UPDATED} from '../core/events.js';
 
 import {Dimensioning} from '../core/dimensioning.js';
+import {wallInformation} from '../core/configuration.js';
 import {CarbonSheet} from './carbonsheet.js';
 
 /** */
@@ -193,14 +194,18 @@ export class FloorplannerView2D
 
 	drawWallLabelsMiddle(wall)
 	{
-			var pos = wall.wallCenter();
-			var length = wall.wallLength();
-			if (length < 60)
-			{
-				// dont draw labels on walls this short
-				return;
-			}
-			this.drawTextLabel(`m:${Dimensioning.cmToMeasure(length)}` ,this.viewmodel.convertX(pos.x),this.viewmodel.convertY(pos.y));
+		if(! wallInformation.midline)
+		{
+			return;
+		}
+		var pos = wall.wallCenter();
+		var length = wall.wallLength();
+		if (length < 60)
+		{
+			// dont draw labels on walls this short
+			return;
+		}
+		this.drawTextLabel(`m:${Dimensioning.cmToMeasure(length)}` ,this.viewmodel.convertX(pos.x),this.viewmodel.convertY(pos.y));
 	}
 
 	/** */
@@ -213,7 +218,10 @@ export class FloorplannerView2D
 			// dont draw labels on walls this short
 			return;
 		}
-		this.drawTextLabel(`e:${Dimensioning.cmToMeasure(length)}` ,this.viewmodel.convertX(pos.x),this.viewmodel.convertY(pos.y+40));
+		if(wallInformation.exterior)
+		{
+			this.drawTextLabel(`e:${Dimensioning.cmToMeasure(length)}` ,this.viewmodel.convertX(pos.x),this.viewmodel.convertY(pos.y+40));
+		}
 	}
 
 	/** */
@@ -226,7 +234,11 @@ export class FloorplannerView2D
 			// dont draw labels on walls this short
 			return;
 		}
-		this.drawTextLabel(`i:${Dimensioning.cmToMeasure(length)}` ,this.viewmodel.convertX(pos.x),this.viewmodel.convertY(pos.y-40));
+		if(wallInformation.interior)
+		{
+			this.drawTextLabel(`i:${Dimensioning.cmToMeasure(length)}` ,this.viewmodel.convertX(pos.x),this.viewmodel.convertY(pos.y-40));
+		}
+		
 	}
 
 	drawTextLabel(label, x, y, textcolor='#000000', strokecolor='#ffffff', style='normal')