v0.3

Author: Otepipi

README.md

@@ -73,7 +73,7 @@ plotDSM(A,label)
 ```
 then
 
-![](https://user-images.githubusercontent.com/35882132/150766189-c486a062-8723-4654-8a30-1aaa2455fdad.svg)
+![](https://user-images.githubusercontent.com/35882132/150873248-843737c8-6619-4816-b54d-bec151d5ee69.svg)
 
 
 ## Clustering DSM
@@ -97,7 +97,7 @@ plotDSM(original_DSM,original_label)
 ```
 original_DSM
 
-![ClusteroriginalDSM](https://user-images.githubusercontent.com/35882132/150766202-73f94b96-cef5-46df-a8f9-20ecf4175b44.svg)
+![ClusteroriginalDSM](https://user-images.githubusercontent.com/35882132/150873257-5ccd5a7d-76ad-41e5-a98a-505f22266146.svg)
 
 
 
@@ -111,7 +111,7 @@ plotDSM(clustered_DSM,clustered_label)
 ```
 then, you get clustered DSM
 
-![Clustered_DSM](https://user-images.githubusercontent.com/35882132/150766197-5260e5c0-3063-4709-97a9-3a4b3415671a.svg)
+![Clustered_DSM](https://user-images.githubusercontent.com/35882132/150873258-69098483-9722-4b7c-ac24-cfc6e3675728.svg)
 
 ## Sequencing DSM
 
@@ -142,7 +142,7 @@ plotDSM(original_DSM,original_label)
 ```
 original DSM
 
-![SequencingoriginalDSM](https://user-images.githubusercontent.com/35882132/150766204-9d85760c-98b4-4b59-ae11-f75ec4d199d8.svg)
+![SequencingoriginalDSM](https://user-images.githubusercontent.com/35882132/150873259-5f4942f8-73bd-45ee-9fa2-34d6a006a4c6.svg)
 
 To get Sequenced DSM, please type
 
@@ -154,7 +154,7 @@ plotDSM(sequenced_DSM, sequenced_label)
 
 then, you get sequenced DSM
 
-![SequencedDSM](https://user-images.githubusercontent.com/35882132/150766200-cb57710a-509d-48e5-acf3-450445198ca2.svg)
+![SequencedDSM](https://user-images.githubusercontent.com/35882132/150873260-80546e4f-040d-4485-9c43-a79c821b89ea.svg)
 
 
 

src/plotDSM.jl

@@ -34,41 +34,36 @@ function plotDSM(DSM,label)
 
         CellSizeRow = min(50,450/(DSMr+5));
         CellSizeColumn = min(50,450/(DSMc+5));
-        t = Table(DSMr+1,DSMc+2, CellSizeRow, CellSizeColumn);
+        t = Table(DSMr+1,DSMc+1, CellSizeRow, CellSizeColumn);
 
         sethue("black")
 
         for r in 2 : DSMr+1
-            for c in 3 : DSMc+2
+            for c in 2 : DSMc+1
                 box(t[r,c], t.colwidths[t.currentcol], t.rowheights[t.currentrow], :stroke);
-                if r == c-1
+                if r == c
                     sethue("grey")
                     box(t[r,c], t.colwidths[t.currentcol], t.rowheights[t.currentrow], :fill);
                     sethue("white")
-                    fontsize(CellSizeColumn/2)
-                    text(string(r-1), t[r,c] ,halign=:center, valign=:middle);
+                    textfit(label[r-1], BoundingBox(box(t[r,c],CellSizeRow, CellSizeColumn)))
                     sethue("black")
                 end
 
-                if DSM[r-1,c-2] != 0
+                if DSM[r-1,c-1] != 0
                     circle(t[r,c], CellSizeColumn/3, :fill)
                 end
             end
         end
 
-        for r in 1 : DSMr
-            text(string(r), t[1,r+2] ,halign=:center, valign=:middle)
-        end
 
-        for c in 1 : DSMc
-            text(string(c), t[c+1,2] ,halign=:center, valign=:middle)
+
+        for r in 1 : DSMr
+            textfit(label[r], BoundingBox(box(t[r+1,1],CellSizeRow, CellSizeColumn)))
         end
 
         for c in 1 : DSMc
-            fontsize(min((CellSizeColumn/2)*(5/length(label[c])),CellSizeColumn/2))
-            text(string(label[c]), t[c+1,1] ,halign=:right, valign=:middle)
+            textfit(label[c], BoundingBox(box(t[1,c+1],CellSizeRow, CellSizeColumn)))
         end
 
-
     end
 end