From 031afce6030e2bb80afdeeff0e848e67561f5fb6 Mon Sep 17 00:00:00 2001 From: Mike Molinari Date: Mon, 21 Feb 2022 01:01:51 +0000 Subject: [PATCH] Updated features to use included icons files --- .../features/boolean_tool/boolean.operation.ts | 2 +- .../modeler/features/fillet_tool/index.ts | 16 ++-------------- .../modeler/features/primitive_box/index.ts | 2 +- .../features/revolve_tool/revolve.operation.ts | 2 +- .../features/shell_tool/shell.operation.ts | 2 +- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/modules/workbenches/modeler/features/boolean_tool/boolean.operation.ts b/modules/workbenches/modeler/features/boolean_tool/boolean.operation.ts index 58a247a1..d73dd6e1 100644 --- a/modules/workbenches/modeler/features/boolean_tool/boolean.operation.ts +++ b/modules/workbenches/modeler/features/boolean_tool/boolean.operation.ts @@ -12,7 +12,7 @@ interface BooleanParams { const BooleanOperation: OperationDescriptor = { id: 'boolean_tool', label: 'Boolean', - icon: 'img/cad/Boolean', + icon: 'img/cad/intersection', info: 'Booleans 2D sketch', paramsInfo: ({tools, boolean}) => `(${r(tools)} ${r(boolean)})`, run: (params: BooleanParams, ctx: ApplicationContext) => { diff --git a/modules/workbenches/modeler/features/fillet_tool/index.ts b/modules/workbenches/modeler/features/fillet_tool/index.ts index 6f35369f..9588632a 100644 --- a/modules/workbenches/modeler/features/fillet_tool/index.ts +++ b/modules/workbenches/modeler/features/fillet_tool/index.ts @@ -2,25 +2,13 @@ import { ApplicationContext } from 'context'; import { MBrepShell } from 'cad/model/mshell'; import { roundValueForPresentation as r } from 'cad/craft/operationHelper'; import { occ2brep } from 'cad/occ/occ2models'; -import icon32 from './icon32.png'; -import icon96 from './icon96.png'; + import { EntityKind } from "cad/model/entities"; export default { id: 'fillet_tool', label: 'Fillet/Chapher', - icon: { - iconSet: { - medium: { - iconType: 'image', - iconContent: icon32 - }, - large: { - iconType: 'image', - iconContent: icon96 - } - }, - }, + icon: 'img/cad/fillet', info: 'Fillet/Champher', mutualExclusiveFields: [], paramsInfo: ({ size, opperationType, }) => `(${r(size)} ${r(opperationType)}})`, diff --git a/modules/workbenches/modeler/features/primitive_box/index.ts b/modules/workbenches/modeler/features/primitive_box/index.ts index e260930e..1a52cd48 100644 --- a/modules/workbenches/modeler/features/primitive_box/index.ts +++ b/modules/workbenches/modeler/features/primitive_box/index.ts @@ -16,7 +16,7 @@ interface PrimitiveBoxParams { const PrimitiveBoxOperation: OperationDescriptor = { id: 'primitive_box', label: 'Primitive Box', - icon: 'img/cad/extrude', + icon: 'img/cad/cube', info: 'Primitive Box', paramsInfo: ({x, y, z}) => `(${r(x)} , ${r(y)} , ${r(z)})`, form: [ diff --git a/modules/workbenches/modeler/features/revolve_tool/revolve.operation.ts b/modules/workbenches/modeler/features/revolve_tool/revolve.operation.ts index 287c746e..95773f3a 100644 --- a/modules/workbenches/modeler/features/revolve_tool/revolve.operation.ts +++ b/modules/workbenches/modeler/features/revolve_tool/revolve.operation.ts @@ -16,7 +16,7 @@ interface RevolveParams { const RevolveOperation: OperationDescriptor = { id: 'Revolve', label: 'Revolve', - icon: 'img/cad/Revolve', + icon: 'img/cad/revolve', info: 'Revolves 2D sketch', paramsInfo: ({angle}) => `(${r(angle)})`, run: (params: RevolveParams, ctx: ApplicationContext) => { diff --git a/modules/workbenches/modeler/features/shell_tool/shell.operation.ts b/modules/workbenches/modeler/features/shell_tool/shell.operation.ts index 099aaa33..07db0552 100644 --- a/modules/workbenches/modeler/features/shell_tool/shell.operation.ts +++ b/modules/workbenches/modeler/features/shell_tool/shell.operation.ts @@ -13,7 +13,7 @@ interface ShellParams { const ShellOperation: OperationDescriptor = { id: 'shell_tool', label: 'Shell', - icon: 'img/cad/Shell', + icon: 'img/cad/shell', info: 'Shells 2D sketch', paramsInfo: ({thickness}) => `(${r(thickness)})`, run: (params: ShellParams, ctx: ApplicationContext) => {