chart refactoring

eez-open · Oct 21, 2021 · b2b142b · b2b142b
1 parent 6498db8
commit b2b142b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 20 deletions.
diff --git a/packages/eez-studio-ui/chart/ChartViewOptions.tsx b/packages/eez-studio-ui/chart/ChartViewOptions.tsx
@@ -9,9 +9,9 @@ import type {
     IChartsController,
     WaveformRenderAlgorithm,
     IChartController
-} from "./chart";
+} from "eez-studio-ui/chart/chart";
 
-import { globalViewOptions } from "./GlobalViewOptions";
+import { globalViewOptions } from "eez-studio-ui/chart/GlobalViewOptions";
 
 ////////////////////////////////////////////////////////////////////////////////
 

diff --git a/packages/eez-studio-ui/chart/GlobalViewOptions.tsx b/packages/eez-studio-ui/chart/GlobalViewOptions.tsx
@@ -1,5 +1,5 @@
 import { autorun, observable, runInAction, toJS } from "mobx";
-import type { WaveformRenderAlgorithm } from "./chart";
+import type { WaveformRenderAlgorithm } from "eez-studio-ui/chart/chart";
 
 class GlobalViewOptions {
     static LOCAL_STORAGE_ITEM_ID = "shared/ui/chart/globalViewOptions";

diff --git a/packages/eez-studio-ui/chart/Measurement.tsx b/packages/eez-studio-ui/chart/Measurement.tsx
@@ -15,11 +15,11 @@ import type {
     IMeasurementDefinition,
     ISingleInputMeasurementTaskSpecification,
     IMultiInputMeasurementTaskSpecification
-} from "./chart";
+} from "eez-studio-ui/chart/chart";
 
 import { initValuesAccesor } from "eez-studio-ui/chart/value-accesor";
 
-import { clamp } from "./clamp";
+import { clamp } from "eez-studio-ui/chart/clamp";
 
 export class Measurement implements IMeasurement {
     constructor(

diff --git a/packages/eez-studio-ui/chart/WaveformLineView.tsx b/packages/eez-studio-ui/chart/WaveformLineView.tsx
@@ -6,8 +6,8 @@ import {
     renderWaveformPath,
     ILineController,
     IWaveform
-} from "./chart";
-import { globalViewOptions } from "./GlobalViewOptions";
+} from "eez-studio-ui/chart/chart";
+import { globalViewOptions } from "eez-studio-ui/chart/GlobalViewOptions";
 
 interface IWaveformLineController extends ILineController {
     waveform: IWaveform;

diff --git a/packages/eez-studio-ui/chart/chart.tsx b/packages/eez-studio-ui/chart/chart.tsx
@@ -48,19 +48,22 @@ import type {
     IMeasurementFunction,
     IMeasurementFunctionResultType
 } from "eez-studio-shared/extensions/extension";
-import { Measurement } from "./Measurement";
-import { clamp } from "./clamp";
-import { WaveformFormat } from "./WaveformFormat";
-import type { IWaveformDlogParams } from "./IWaveformDlogParams";
-import { WaveformLineView } from "./WaveformLineView";
-import { ChartViewOptionsProps, ChartViewOptions } from "./ChartViewOptions";
-import { globalViewOptions } from "./GlobalViewOptions";
+import { Measurement } from "eez-studio-ui/chart/Measurement";
+import { clamp } from "eez-studio-ui/chart/clamp";
+import { WaveformFormat } from "eez-studio-ui/chart/WaveformFormat";
+import type { IWaveformDlogParams } from "eez-studio-ui/chart/IWaveformDlogParams";
+import { WaveformLineView } from "eez-studio-ui/chart/WaveformLineView";
+import {
+    ChartViewOptionsProps,
+    ChartViewOptions
+} from "eez-studio-ui/chart/ChartViewOptions";
+import { globalViewOptions } from "eez-studio-ui/chart/GlobalViewOptions";
 import {
     IRulersController,
     IRulersModel,
     RulersController,
     RulersDockView
-} from "./rulers";
+} from "eez-studio-ui/chart/rulers";
 
 ////////////////////////////////////////////////////////////////////////////////
 

diff --git a/packages/eez-studio-ui/chart/rulers.tsx b/packages/eez-studio-ui/chart/rulers.tsx
@@ -15,8 +15,8 @@ import type {
     IChartView,
     ICursor,
     MouseHandler
-} from "./chart";
-import { globalViewOptions } from "./GlobalViewOptions";
+} from "eez-studio-ui/chart/chart";
+import { globalViewOptions } from "eez-studio-ui/chart/GlobalViewOptions";
 
 export interface IRulersController {
     rulersModel: IRulersModel;

diff --git a/packages/eez-studio-ui/chart/value-accesor.ts b/packages/eez-studio-ui/chart/value-accesor.ts
@@ -1,6 +1,6 @@
 import { DataType } from "./DataType";
-import type { IWaveformDlogParams } from "./IWaveformDlogParams";
-import { WaveformFormat } from "./WaveformFormat";
+import type { IWaveformDlogParams } from "eez-studio-ui/chart/IWaveformDlogParams";
+import { WaveformFormat } from "eez-studio-ui/chart/WaveformFormat";
 
 function getCsvValues(valuesArray: any) {
     var values = new Buffer(valuesArray.buffer || []).toString("binary");

diff --git a/packages/project-editor/project-editor-bootstrap.tsx b/packages/project-editor/project-editor-bootstrap.tsx
@@ -61,7 +61,7 @@ import { ConnectionLine, Flow } from "project-editor/flow/flow";
 import { Action } from "project-editor/features/action/action";
 import { ScpiCommand, ScpiSubsystem } from "project-editor/features/scpi/scpi";
 
-import "project-editor/flow/components/instrument";
+import "project-editor/flow/components/actions/instrument";
 
 let extensionsInitialized = false;