Some fixes for resource cleaning spreadsheets in simupedia

[simantics/platform.git] / bundles / org.simantics.spreadsheet.graph / scl / Spreadsheet / All.scl

diff --git a/bundles/org.simantics.spreadsheet.graph/scl/Spreadsheet/All.scl b/bundles/org.simantics.spreadsheet.graph/scl/Spreadsheet/All.scl
index cb35884c7048e1ff572bd511ded9bdf436b841dd..88d8e47aad2448cc299e3721bded398f92dcccd7 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/scl/Spreadsheet/All.scl
+++ b/bundles/org.simantics.spreadsheet.graph/scl/Spreadsheet/All.scl
@@ -1,81 +1,101 @@
-include "Simantics/DB"\r
-include "Simantics/Ontologies"\r
-include "Simantics/SCL"\r
-include "Document/All"\r
-include "File"\r
-\r
-importJava "org.simantics.spreadsheet.common.TableCell" where\r
-    data TableCell\r
-\r
-importJava "org.simantics.spreadsheet.common.SpreadsheetCell" where\r
-    data SpreadsheetCell\r
-\r
-importJava "org.simantics.spreadsheet.graph.SCL" where\r
-    toVariant :: a -> Variant\r
-    modelsSourceContribution :: Resource -> <ReadGraph> [Variable]\r
-    modelsSourceContributionLabeler :: Variable -> <ReadGraph> String\r
-\r
-importJava "org.simantics.spreadsheet.graph.SpreadsheetGraphUtils" where\r
-    @JavaName "fullSynchronization"\r
-    fullSynchronizeSheet :: Variable -> <ReadGraph> Boolean\r
-    evaluateAll :: Variable -> <ReadGraph> ()\r
-    saveInitialCondition :: Variable -> Resource -> String -> <WriteGraph> Resource\r
-    findCell :: Variable -> String -> <ReadGraph> Maybe Variable\r
-    invalidateAll :: Variable -> <ReadGraph> ()\r
-\r
-importJava "org.simantics.spreadsheet.util.SpreadsheetUtils" where\r
-    createSheet :: Resource -> String -> <WriteGraph> Resource\r
-    queryCells :: a -> [TableCell]\r
-    modifyCells1 :: [TableCell] -> (TableCell -> TableCell) -> [TableCell]\r
-    modifyCells :: [TableCell] -> [(TableCell -> TableCell)] -> [TableCell]\r
-    organizeCells :: Integer -> [String] -> [TableCell] -> [TableCell]\r
-    applyFont :: IFont -> (TableCell -> Boolean) -> TableCell -> TableCell\r
-    applyAlign :: Integer -> (TableCell -> Boolean) -> TableCell -> TableCell\r
-    applyForeground :: IColor -> (TableCell -> Boolean) -> TableCell -> TableCell\r
-    applyBackground :: IColor -> (TableCell -> Boolean) -> TableCell -> TableCell\r
-    simpleFont :: String -> String -> Integer -> IFont\r
-    rgbColor :: Integer -> Integer -> Integer -> IColor\r
-    selectRow :: Integer -> TableCell -> Boolean\r
-    selectColumn :: Integer -> TableCell -> Boolean\r
-    setSCLLine :: Resource -> Integer -> String -> <WriteGraph> ()\r
-    sheetRun :: Resource -> Variable -> <ReadGraph> Variable\r
-    \r
-importJava "org.simantics.spreadsheet.graph.ExcelImport" where\r
-    importBook :: Resource -> File -> <Proc> ()\r
-\r
-createSpreadsheetBookAction :: Resource -> <Proc> ()\r
-createSpreadsheetBookAction res = do\r
-  syncWrite (\() -> createSpreadsheetBookDefault res)\r
-  ()\r
-  \r
-createSpreadsheetSheetAction :: Resource -> <Proc> ()\r
-createSpreadsheetSheetAction res = do\r
-  syncWrite (\() -> createSpreadsheetDefault res)\r
-  ()\r
-\r
-createSpreadsheetDefault :: Resource -> <WriteGraph> Resource\r
-createSpreadsheetDefault library = createSheet library $ findFreshEscapedName "Sheet" library \r
-\r
-createSpreadsheetBookDefault :: Resource -> <WriteGraph> Resource\r
-createSpreadsheetBookDefault library = createSpreadsheetBook library $ findFreshEscapedName "Book" library \r
-\r
-createRange :: Resource -> Resource -> String -> String -> <WriteGraph> Resource\r
-createRange library type_ name expression = do\r
-    range = newResource ()\r
-    claim range L0.InstanceOf type_\r
-    claimRelatedValue range L0.HasName name\r
-    createSCLValue range SHEET.ExpressionRange.cells SHEET.SCLValue expression\r
-    claim range L0.PartOf library\r
-    range\r
-\r
-createSpreadsheetBook :: Resource -> String -> <WriteGraph> Resource\r
-createSpreadsheetBook library name = do\r
-    markUndoPoint ()\r
-    book = newResource ()\r
-    claim book L0.InstanceOf SHEET.Book\r
-    claimRelatedValue book L0.HasName name\r
-    claim book L0.PartOf library\r
-    createSheet book "Sheet"\r
-    addCommentMetadata ("Created Spreadsheet Book " + name)\r
-    book\r
+include "Simantics/DB"
+include "Simantics/Ontologies"
+include "Simantics/SCL"
+include "Document/All"
+include "File"
+
+importJava "org.simantics.spreadsheet.common.TableCell" where
+    data TableCell
+
+importJava "org.simantics.spreadsheet.common.TreeTableCell" where
+    data TreeTableCell
+
+    @JavaName getData
+    getTreeTableCellData :: TreeTableCell -> <Proc> a
+    
+    createTreeTableCell :: String -> a -> Maybe b -> Integer -> Integer -> Integer -> Boolean -> <Proc> TreeTableCell
+    
+    @JavaName getText
+    treeTableCellText :: TreeTableCell -> <Proc> String
+    @JavaName getFont
+    treeTableCellFont :: TreeTableCell -> <Proc> Maybe IFont
+    @JavaName getRow
+    treeTableCellRow :: TreeTableCell -> <Proc> Integer
+    @JavaName getColumn
+    treeTableCellColumn :: TreeTableCell -> <Proc> Integer
+    
+importJava "org.simantics.spreadsheet.common.SpreadsheetCell" where
+    data SpreadsheetCell
+
+importJava "org.simantics.spreadsheet.graph.SCL" where
+    toVariant :: a -> Variant
+    modelsSourceContribution :: Resource -> <ReadGraph> [Variable]
+    modelsSourceContributionLabeler :: Variable -> <ReadGraph> String
+
+importJava "org.simantics.spreadsheet.graph.SpreadsheetGraphUtils" where
+    @JavaName "fullSynchronization"
+    fullSynchronizeSheet :: Variable -> <ReadGraph> Boolean
+    evaluateAll :: Variable -> <ReadGraph> ()
+    saveInitialCondition :: Variable -> Resource -> String -> <WriteGraph> Resource
+    findCell :: Variable -> String -> <ReadGraph> Maybe Variable
+    invalidateAll :: Variable -> <ReadGraph> ()
+
+importJava "org.simantics.spreadsheet.util.SpreadsheetUtils" where
+    createSheet :: Resource -> String -> <WriteGraph> Resource
+    queryCells :: a -> [TableCell]
+    modifyCells1 :: [TableCell] -> (TableCell -> TableCell) -> [TableCell]
+    modifyCells :: [TableCell] -> [(TableCell -> TableCell)] -> [TableCell]
+    organizeCells :: Integer -> [String] -> [TableCell] -> [TableCell]
+    applyFont :: IFont -> (TableCell -> Boolean) -> TableCell -> TableCell
+    applyAlign :: Integer -> (TableCell -> Boolean) -> TableCell -> TableCell
+    applyForeground :: IColor -> (TableCell -> Boolean) -> TableCell -> TableCell
+    applyBackground :: IColor -> (TableCell -> Boolean) -> TableCell -> TableCell
+    simpleFont :: String -> String -> Integer -> IFont
+    rgbColor :: Integer -> Integer -> Integer -> IColor
+    selectRow :: Integer -> TableCell -> Boolean
+    selectColumn :: Integer -> TableCell -> Boolean
+    setSCLLine :: Resource -> Integer -> String -> <WriteGraph> ()
+    sheetRun :: Resource -> Variable -> <ReadGraph> Variable
+
+importJava "org.simantics.spreadsheet.graph.SpreadsheetSessionManager" where
+    removeSpreadsheetSession :: Variable -> <Proc, WriteGraph> ()
+
+importJava "org.simantics.spreadsheet.graph.ExcelImport" where
+    importBook :: Resource -> File -> <Proc> ()
+
+createSpreadsheetBookAction :: Resource -> <Proc> ()
+createSpreadsheetBookAction res = do
+  syncWrite (\() -> createSpreadsheetBookDefault res)
+  ()
+  
+createSpreadsheetSheetAction :: Resource -> <Proc> ()
+createSpreadsheetSheetAction res = do
+  syncWrite (\() -> createSpreadsheetDefault res)
+  ()
+
+createSpreadsheetDefault :: Resource -> <WriteGraph> Resource
+createSpreadsheetDefault library = createSheet library $ findFreshEscapedName "Sheet" library 
+
+createSpreadsheetBookDefault :: Resource -> <WriteGraph> Resource
+createSpreadsheetBookDefault library = createSpreadsheetBook library $ findFreshEscapedName "Book" library 
+
+createRange :: Resource -> Resource -> String -> String -> <WriteGraph> Resource
+createRange library type_ name expression = do
+    range = newResource ()
+    claim range L0.InstanceOf type_
+    claimRelatedValue range L0.HasName name
+    createSCLValue range SHEET.ExpressionRange.cells SHEET.SCLValue expression
+    claim range L0.PartOf library
+    range
+
+createSpreadsheetBook :: Resource -> String -> <WriteGraph> Resource
+createSpreadsheetBook library name = do
+    markUndoPoint ()
+    book = newResource ()
+    claim book L0.InstanceOf SHEET.Book
+    claimRelatedValue book L0.HasName name
+    claim book L0.PartOf library
+    createSheet book "Sheet"
+    addCommentMetadata ("Created Spreadsheet Book " + name)
+    book
     
\ No newline at end of file