diff --git a/src/Miro/GridGraphList.class.st b/src/Miro/GridGraphList.class.st index fd0bc3b..7e38828 100644 --- a/src/Miro/GridGraphList.class.st +++ b/src/Miro/GridGraphList.class.st @@ -73,6 +73,6 @@ GridGraphList >> renderObjectOn: html graph: aGraphId [ | miroPlot | miroPlot := (MiroPlot allReportKinds detect: [ :report | report displayName = aGraphId ]) new. - miroPlot useRoassal. + miroPlot useChartJS. html render: miroPlot ] diff --git a/src/Miro/MiroData.class.st b/src/Miro/MiroData.class.st new file mode 100644 index 0000000..4d054df --- /dev/null +++ b/src/Miro/MiroData.class.st @@ -0,0 +1,5 @@ +Class { + #name : #MiroData, + #superclass : #Object, + #category : #'Miro-Data' +} diff --git a/src/Miro/MiroListOfPoints.class.st b/src/Miro/MiroListOfPoints.class.st new file mode 100644 index 0000000..d6cedfb --- /dev/null +++ b/src/Miro/MiroListOfPoints.class.st @@ -0,0 +1,8 @@ +Class { + #name : #MiroListOfPoints, + #superclass : #MiroData, + #instVars : [ + 'points' + ], + #category : #'Miro-Data' +} diff --git a/src/Miro/MiroListOfSingleValues.class.st b/src/Miro/MiroListOfSingleValues.class.st index acb8bb3..e7f3d9a 100644 --- a/src/Miro/MiroListOfSingleValues.class.st +++ b/src/Miro/MiroListOfSingleValues.class.st @@ -1,6 +1,6 @@ Class { #name : #MiroListOfSingleValues, - #superclass : #Object, + #superclass : #MiroData, #instVars : [ 'data', 'labels' diff --git a/src/Miro/MiroPoint.class.st b/src/Miro/MiroPoint.class.st new file mode 100644 index 0000000..eec8d95 --- /dev/null +++ b/src/Miro/MiroPoint.class.st @@ -0,0 +1,38 @@ +Class { + #name : #MiroPoint, + #superclass : #MiroData, + #instVars : [ + 'values' + ], + #category : #'Miro-Data' +} + +{ #category : #initialization } +MiroPoint >> addValue: aMiroValue [ + values add: aMiroValue. + ^aMiroValue + +] + +{ #category : #accessing } +MiroPoint >> dimension [ + "Dimension of a point" + ^ values size +] + +{ #category : #initialization } +MiroPoint >> initialize [ + super initialize . + values := OrderedCollection new + +] + +{ #category : #accessing } +MiroPoint >> values [ + ^ values +] + +{ #category : #accessing } +MiroPoint >> values: aCollection [ + values := aCollection +] diff --git a/src/Miro/MiroValue.class.st b/src/Miro/MiroValue.class.st new file mode 100644 index 0000000..0fd3651 --- /dev/null +++ b/src/Miro/MiroValue.class.st @@ -0,0 +1,35 @@ +Class { + #name : #MiroValue, + #superclass : #MiroData, + #instVars : [ + 'value' + ], + #category : #'Miro-Data' +} + +{ #category : #accessing } +MiroValue class >> value: aMiroValue [ + ^ self new value: aMiroValue; + yourself + +] + +{ #category : #testing } +MiroValue >> isLabel [ + ^ (self value isNumber) not +] + +{ #category : #testing } +MiroValue >> isNumber [ + ^ self value isNumber +] + +{ #category : #accessing } +MiroValue >> value [ + ^ value +] + +{ #category : #accessing } +MiroValue >> value: anObject [ + value := anObject +] diff --git a/src/MiroTest/MiroPointTest.class.st b/src/MiroTest/MiroPointTest.class.st new file mode 100644 index 0000000..c8985e2 --- /dev/null +++ b/src/MiroTest/MiroPointTest.class.st @@ -0,0 +1,22 @@ +Class { + #name : #MiroPointTest, + #superclass : #TestCase, + #category : #'MiroTest-Data' +} + +{ #category : #tests } +MiroPointTest >> testDimension [ + "comment stating purpose of message" + |mp| + mp := MiroPoint new. + self assert: mp dimension equals: 0. + mp addValue: MiroValue new. + self assert: mp dimension equals: 1. +] + +{ #category : #test } +MiroPointTest >> testValues [ + + self flag: #toImplement. + self assert: false +] diff --git a/src/MiroTest/MiroValueTest.class.st b/src/MiroTest/MiroValueTest.class.st new file mode 100644 index 0000000..396c7fe --- /dev/null +++ b/src/MiroTest/MiroValueTest.class.st @@ -0,0 +1,33 @@ +Class { + #name : #MiroValueTest, + #superclass : #TestCase, + #category : #'MiroTest-Data' +} + +{ #category : #testing } +MiroValueTest >> testIsLabel [ + "comment stating purpose of message" + |mv| + mv := MiroValue new. + mv value: 'lab1'. + self assert: mv isLabel equals: true. +] + +{ #category : #testing } +MiroValueTest >> testIsNumber [ + "comment stating purpose of message" + |mv| + mv := MiroValue new. + mv value: 'label'. + self assert: mv value isNumber equals: false. + mv value: 12. + self assert: mv value isNumber equals: true +] + +{ #category : #test } +MiroValueTest >> testValue [ + |mv| + mv := MiroValue new. + mv value: 'label'. + self assert: mv value equals: 'label' +]