Backup_Repos/jsketcher
1
0
Fork 0
mirror of https://github.com/xibyte/jsketcher synced 2025-12-24 01:15:25 +01:00
Code Issues Projects Releases Wiki Activity

misc clean up

Browse source
This commit is contained in:
Val Erastov 2022-07-24 14:27:06 -07:00
parent 66b9f6c56a
commit f6cc507ad0
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/workbenches/modeler/features/boolean/boolean.operation.ts
View file

@ -3,8 +3,6 @@ import {ApplicationContext} from "context";
import {EntityKind} from "cad/model/entities";
import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition";
import {OperationDescriptor} from "cad/craft/operationPlugin";
import { param } from 'cypress/types/jquery';
import { MObject } from 'cad/model/mobject';
interface BooleanParams {
tools: [];
@ -19,7 +17,6 @@ export const BooleanOperation: OperationDescriptor<BooleanParams> = {
info: 'Booleans 2D sketch',
paramsInfo: ({tools, boolean}) => `(${r(tools)} ${r(boolean)})`,
run: (params: BooleanParams, ctx: ApplicationContext) => {
console.log(params);
let occ = ctx.occService;
const oci = occ.commandInterface;

21
modules/workbenches/sheetMetal/features/smTab/smTab.operation.ts
View file

@ -1,12 +1,11 @@
import { roundValueForPresentation as r } from 'cad/craft/operationHelper';
import { MFace } from "cad/model/mface";
import { ApplicationContext } from "context";
import { EntityKind } from "cad/model/entities";
import { BooleanDefinition } from "cad/craft/schema/common/BooleanDefinition";
import { UnitVector } from "math/vector";
import { OperationDescriptor } from "cad/craft/operationPlugin";
import { FromSketchProductionAnalyzer } from "cad/craft/production/productionAnalyzer";
import { FaceRef } from "cad/craft/e0/OCCUtils";
import {roundValueForPresentation as r} from 'cad/craft/operationHelper';
import {MFace} from "cad/model/mface";
import {ApplicationContext} from "context";
import {EntityKind} from "cad/model/entities";
import {BooleanDefinition} from "cad/craft/schema/common/BooleanDefinition";
import {UnitVector} from "math/vector";
import {OperationDescriptor} from "cad/craft/operationPlugin";
import {FromSketchProductionAnalyzer} from "cad/craft/production/productionAnalyzer";
interface smTabParams {
thickness: number;
@ -48,14 +47,14 @@ export const smTabOperation: OperationDescriptor<smTabParams> = {
const dir: UnitVector = face.normal();
let extrusionVector = {};
let extrusionVector;
if (params.flipper == true) {
extrusionVector = dir.normalize()._multiply(params.thickness);
} else {
extrusionVector = dir.normalize()._multiply(params.thickness).negate();
}
const productionAnalyzer = new FromSketchProductionAnalyzer(occFaces,"SM/FLAT/A", "SM/FLAT/B","SM/THICKNESS");
const productionAnalyzer = new FromSketchProductionAnalyzer(occFaces);
const tools = occFaces.map((faceRef, i) => {

3
web/app/cad/craft/production/productionAnalyzer.ts
View file

@ -304,9 +304,6 @@ export class FromSketchProductionAnalyzer extends BasicProductionAnalyzer {
if (!createdEdge.data.productionInfo) {
const he = createdEdge.getHalfEdge(he => he?.loop?.face?.data?.productionInfo?.role === 'sweep');
if (!he) {
debugger;
}
if (he) {
const originatingPrimitive = he.loop.face.data.productionInfo.originatingPrimitive;
createdEdge.data.id = `E:LID[${originatingPrimitive}]`;