Merge pull request #172 from epam/fixs_In_3D

Fixs in 3 d
epam · Oct 11, 2023 · f51d974 · f51d974
2 parents 6e337c8 + f55045a
commit f51d974
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/engine/VolumeRenderer3d.js b/src/engine/VolumeRenderer3d.js
@@ -1406,7 +1406,7 @@ export default class VolumeRenderer3d {
 
   onMouseDown(xx, yy) {
     if (this.Tool23D) {
-      this.graphics23d.onMouseDown(xx / this.windowWidth, yy / this.windowHeight);
+      this.graphics23d.onMouseDown(xx / this.windowWidth, -yy / this.windowHeight);
       return;
     }
     this.orbitControl.onMouseDown(xx, yy);
@@ -1418,14 +1418,14 @@ export default class VolumeRenderer3d {
     this.eraserMouseDown = true;
     if (this.isEraseMode && this.eraserStart) {
       this.lockEraserBuffersUpdating = true;
-      this.volumeUpdater.eraser.eraseStart(xx, yy, this.windowWidth, this.matVolumeRender.uniforms.isoThreshold.value, true);
+      this.volumeUpdater.eraser.eraseStart(xx, -yy, this.windowWidth, this.matVolumeRender.uniforms.isoThreshold.value, true);
     }
   }
 
   onMouseMove(xx, yy) {
     //this.tools23d.onMouseMove(xx / this.windowWidth, yy / this.windowHeight);
     if (this.Tool23D) {
-      this.graphics23d.onMouseMove(xx / this.windowWidth, yy / this.windowHeight);
+      this.graphics23d.onMouseMove(xx / this.windowWidth, -yy / this.windowHeight);
       return;
     }
     if (this.checkFrameBufferMode !== CHECK_MODE_RESULT_OK) {
@@ -1435,13 +1435,13 @@ export default class VolumeRenderer3d {
     if (!(this.isEraseMode && this.eraserMouseDown && this.eraserStart)) {
       this.orbitControl.onMouseMove(xx, yy);
     } else {
-      this.volumeUpdater.eraser.eraseStart(xx, yy, this.windowWidth, this.matVolumeRender.uniforms.isoThreshold.value, false);
+      this.volumeUpdater.eraser.eraseStart(xx, -yy, this.windowWidth, this.matVolumeRender.uniforms.isoThreshold.value, false);
     }
   }
 
   onMouseUp(xx, yy) {
     if (this.Tool23D) {
-      this.graphics23d.onMouseUp(xx / this.windowWidth, yy / this.windowHeight);
+      this.graphics23d.onMouseUp(xx / this.windowWidth, -yy / this.windowHeight);
       return;
     }
     //this.tools23d.onMouseUp(xx / this.windowWidth, yy / this.windowHeight);

diff --git a/src/ui/Modals/UiModalWinCW.jsx b/src/ui/Modals/UiModalWinCW.jsx
@@ -267,7 +267,7 @@ class UiModalWindowCenterWidth extends React.Component {
   } // end render preview
 
   onSliderWindowRange(value) {
-    this.m_updateEnable = false;
+    this.m_updateEnable = true;
     const [min, max] = value;
     this.setState({ windowMin: min });
     this.setState({ windowMax: max });

diff --git a/src/ui/Panels/Tabs/Mode3dSelectionTabs.jsx b/src/ui/Panels/Tabs/Mode3dSelectionTabs.jsx
@@ -10,7 +10,6 @@ import Modes3d from '../../../store/Modes3d';
 import { Box, Tab, Tabs } from '@mui/material';
 import { TabPanel } from './TabPanel';
 import css from '../../Form/Slider.module.css';
-import { HistogramProperty } from '../Properties3d/HistogramProperty';
 import { IsosurfaceProperty } from '../Properties3d/IsosurfaceProperty';
 import { AmbientOcclusionProperty } from '../Properties3d/AmbientOcclusionProperty';
 import { SliderCaption } from '../../Form';
@@ -65,12 +64,10 @@ export function Mode3dSelectionTabs() {
         </Tabs>
       </Box>
       <TabPanel index={Modes3d.ISO} value={mode3d}>
-        <HistogramProperty />
         <IsosurfaceProperty />
         <AmbientOcclusionProperty />
       </TabPanel>
       <TabPanel index={Modes3d.RAYCAST} value={mode3d}>
-        <HistogramProperty />
         <SliderCaption caption="Set" />
         <RGBProperty />
         <OpacityProperty />