Skip to content

Commit

Permalink
Merge pull request #144 from Exabyte-io/feature/SOF-7164
Browse files Browse the repository at this point in the history 
Feature/SOF-7164: reset measurements on material change
  • Loading branch information
@timurbazhirov
timurbazhirov committed Jan 17, 2024
2 parents 6522012 + 435ead4 commit d7c8c45
Show file tree
Hide file tree
Showing 6 changed files with 201 additions and 190 deletions.
85 changes: 48 additions & 37 deletions src/components/ThreeDEditor.jsx
View file
Expand Up @@ -55,10 +55,10 @@ export class ThreeDEditor extends React.Component {
activeToolbarMenu: null,
isThreejsEditorModalShown: false,
// isDistanceAndAnglesShown: false,
measuresSettings: {
measurementsSettings: {
isDistanceShown: false,
isAnglesShown: false,
measureLabelsShown: false,
measurementLabelsShown: false,
distance: 0,
angle: 0,
},
Expand Down Expand Up @@ -105,9 +105,9 @@ export class ThreeDEditor extends React.Component {
this.handleToggleAnglesShown = this.handleToggleAnglesShown.bind(this);
this.handleSetState = this.handleSetState.bind(this);
this.handleDeleteConnection = this.handleDeleteConnection.bind(this);
this.handleResetMeasures = this.handleResetMeasures.bind(this);
this.offMeasureParam = this.offMeasureParam.bind(this);
this.onMeasureParam = this.onMeasureParam.bind(this);
this.handleResetMeasurements = this.handleResetMeasurements.bind(this);
this.offMeasurementParam = this.offMeasurementParam.bind(this);
this.onMeasurementParam = this.onMeasurementParam.bind(this);
this.addHotKeyListener = this.addHotKeyListener.bind(this);
this.removeHotKeyListener = this.removeHotKeyListener.bind(this);
}
Expand All @@ -117,7 +117,7 @@ export class ThreeDEditor extends React.Component {
}

componentWillUnmount() {
this.handleResetMeasures();
this.handleResetMeasurements();
this.WaveComponent.wave.destroyListeners();
this.removeHotKeyListener();
}
Expand All @@ -134,6 +134,7 @@ export class ThreeDEditor extends React.Component {
boundaryConditions: nextProps.boundaryConditions || {},
isConventionalCellShown: nextProps.isConventionalCellShown || false,
});
this.handleResetMeasurements();
}
}

Expand Down Expand Up @@ -223,7 +224,7 @@ export class ThreeDEditor extends React.Component {

handleToggleConventionalCell() {
const { isConventionalCellShown, originalMaterial } = this.state;
this.handleResetMeasures();
this.handleResetMeasurements();
this.setState({
isConventionalCellShown: !isConventionalCellShown,
originalMaterial: this.getPrimitiveOrConventionalMaterial(
Expand Down Expand Up @@ -278,9 +279,13 @@ export class ThreeDEditor extends React.Component {

// TODO: reset the colors for other buttons in the panel on call to the function below
handleResetViewer() {
const { measuresSettings } = this.state;
const { measurementsSettings } = this.state;
this.setState({
measuresSettings: { ...measuresSettings, isDistanceShown: false, isAnglesShown: false },
measurementsSettings: {
...measurementsSettings,
isDistanceShown: false,
isAnglesShown: false,
},
});
this.WaveComponent.initViewer();
this._resetStateWaveComponent();
Expand Down Expand Up @@ -318,57 +323,63 @@ export class ThreeDEditor extends React.Component {
}

handleToggleDistanceShown() {
const { measuresSettings } = this.state;
const { isDistanceShown, isAnglesShown } = measuresSettings;
const { measurementsSettings } = this.state;
const { isDistanceShown, isAnglesShown } = measurementsSettings;
if (isAnglesShown) {
this.offMeasureParam("isAnglesShown");
this.offMeasurementParam("isAnglesShown");
}

if (!isDistanceShown) {
this.onMeasureParam("isDistanceShown", "isAnglesShown");
this.onMeasurementParam("isDistanceShown", "isAnglesShown");
} else {
this.offMeasureParam("isDistanceShown");
this.offMeasurementParam("isDistanceShown");
}
}

handleResetMeasures() {
const { measuresSettings } = this.state;
const { isDistanceShown, isAnglesShown } = measuresSettings;
if (isDistanceShown || isAnglesShown) this.WaveComponent.wave.resetMeasures();
handleResetMeasurements() {
const { measurementsSettings } = this.state;
const { isDistanceShown, isAnglesShown } = measurementsSettings;
if (isDistanceShown || isAnglesShown) this.WaveComponent.wave.resetMeasurements();
}

offMeasureParam(param) {
offMeasurementParam(param) {
this.WaveComponent.wave.destroyListeners();
this.handleResetMeasures();
this.handleResetMeasurements();
this.setState((prevState) => {
const { measuresSettings } = prevState;
return { ...prevState, measuresSettings: { ...measuresSettings, [param]: false } };
const { measurementsSettings } = prevState;
return {
...prevState,
measurementsSettings: { ...measurementsSettings, [param]: false },
};
});
}

onMeasureParam(param, offParam) {
onMeasurementParam(param, offParam) {
this.setState((prevState) => {
const { measuresSettings } = prevState;
return { ...prevState, measuresSettings: { ...measuresSettings, [param]: true } };
const { measurementsSettings } = prevState;
return {
...prevState,
measurementsSettings: { ...measurementsSettings, [param]: true },
};
});
const { measuresSettings } = this.state;
const { measurementsSettings } = this.state;
this.WaveComponent.wave.initListeners(this.handleSetState, {
...measuresSettings,
...measurementsSettings,
[param]: true,
[offParam]: false,
});
}

handleToggleAnglesShown() {
const { measuresSettings } = this.state;
const { isAnglesShown, isDistanceShown } = measuresSettings;
const { measurementsSettings } = this.state;
const { isAnglesShown, isDistanceShown } = measurementsSettings;
if (isDistanceShown) {
this.offMeasureParam("isDistanceShown");
this.offMeasurementParam("isDistanceShown");
}
if (!isAnglesShown) {
this.onMeasureParam("isAnglesShown", "isDistanceShown");
this.onMeasurementParam("isAnglesShown", "isDistanceShown");
} else {
this.offMeasureParam("isAnglesShown");
this.offMeasurementParam("isAnglesShown");
}
}

Expand Down Expand Up @@ -520,8 +531,8 @@ export class ThreeDEditor extends React.Component {
};

getMeasurementsActions = () => {
const { measuresSettings } = this.state;
const { isDistanceShown, isAnglesShown } = measuresSettings;
const { measurementsSettings } = this.state;
const { isDistanceShown, isAnglesShown } = measurementsSettings;
return [
{
id: "Distances",
Expand Down Expand Up @@ -551,10 +562,10 @@ export class ThreeDEditor extends React.Component {
isDivider: true,
},
{
id: "Reset Measures",
content: "Reset Measures",
id: "Reset measurements",
content: "Reset measurements",
leftIcon: <Replay />,
onClick: this.handleResetMeasures,
onClick: this.handleResetMeasurements,
shouldMenuStayOpened: true,
},
];
Expand Down
2 changes: 1 addition & 1 deletion src/enums.js
View file
Expand Up @@ -25,7 +25,7 @@ export const ATOM_GROUP_NAME = "Atoms";
export const ATOM_CONNECTIONS_GROUP_NAME = "Atom_Connections";
export const ATOM_CONNECTION_LINE_NAME = "Atom_Connection";
export const MIN_ANGLE_POINTS_DISTANCE = 0.7;
export const MEASURE_LABELS_GROUP_NAME = "Measure_Labels";
export const MEASUREMENT_LABELS_GROUP_NAME = "Measure_Labels";
export const ANGLE = "ANGLE";
export const LABELS_GROUP_NAME = "Labels_Group";

Expand Down

0 comments on commit d7c8c45

Please sign in to comment.