Dwinzo-Beta
/
Dwinzo_dev
4
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v3-ui #99

Merged
Vishnu merged 28 commits from v3-ui into main 2025-06-12 04:27:40 +00:00
Conversation 0 Commits 28 Files Changed 67 +6 -4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d03a2bc61 - Show all commits

8
app/src/components/layout/scenes/ComparisonScene.tsx
View File

@ -1,11 +1,11 @@
import { useProductContext } from '../../../modules/simulation/products/productContext' import { useProductContext } from '../../../modules/simulation/products/productContext'
import RegularDropDown from '../../ui/inputs/RegularDropDown'; import RegularDropDown from '../../ui/inputs/RegularDropDown';
import { useProductStore } from '../../../store/simulation/useProductStore'; import { useProductStore } from '../../../store/simulation/useProductStore';
import { useSaveVersion } from '../../../store/builder/store'; import { useLoadingProgress, useSaveVersion } from '../../../store/builder/store';
import useModuleStore from '../../../store/useModuleStore'; import useModuleStore from '../../../store/useModuleStore';
import CompareLayOut from '../../ui/compareVersion/CompareLayOut'; import CompareLayOut from '../../ui/compareVersion/CompareLayOut';
import ComparisonResult from '../../ui/compareVersion/ComparisonResult'; import ComparisonResult from '../../ui/compareVersion/ComparisonResult';
import { useComparisonProduct } from '../../../store/simulation/useSimulationStore'; import { useComparisonProduct, useMainProduct } from '../../../store/simulation/useSimulationStore';
import { usePauseButtonStore, usePlayButtonStore } from '../../../store/usePlayButtonStore'; import { usePauseButtonStore, usePlayButtonStore } from '../../../store/usePlayButtonStore';
function ComparisonScene() { function ComparisonScene() {
@ -16,7 +16,9 @@ function ComparisonScene() {
const { selectedProductStore } = useProductContext(); const { selectedProductStore } = useProductContext();
const { selectedProduct } = selectedProductStore(); const { selectedProduct } = selectedProductStore();
const { comparisonProduct, setComparisonProduct } = useComparisonProduct(); const { comparisonProduct, setComparisonProduct } = useComparisonProduct();
const { mainProduct } = useMainProduct();
const { setIsPaused } = usePauseButtonStore(); const { setIsPaused } = usePauseButtonStore();
const { loadingProgress } = useLoadingProgress();
const handleSelectLayout = (option: string) => { const handleSelectLayout = (option: string) => {
const product = products.find((product) => product.productName === option); const product = products.find((product) => product.productName === option);
@ -40,7 +42,7 @@ function ComparisonScene() {
</div> </div>
} }
<CompareLayOut /> <CompareLayOut />
{false && <ComparisonResult />} {(comparisonProduct && mainProduct && !loadingProgress) && <ComparisonResult />}
</> </>
)} )}
</> </>

2
app/src/modules/simulation/analysis/ROI/roiData.tsx
View File

@ -140,7 +140,7 @@ export default function ROIData() {
return [...prev, newData]; return [...prev, newData];
} }
}); });
console.log('compareProducts: ', compareProducts); // console.log('compareProducts: ', compareProducts);
} }