X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.graph%2Fscl%2FSpreadsheet%2FAll.scl;h=22f8043ff90d6d82c5a24afd3b6058a48eab22dc;hb=90506d09a405fb20380a41bb7c89fb9c510f2d42;hp=532331e55eec36fab7f7c36a3fbb4cc643eb354d;hpb=a0e3814041d624e3d72c21210d188e56439757aa;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.spreadsheet.graph/scl/Spreadsheet/All.scl b/bundles/org.simantics.spreadsheet.graph/scl/Spreadsheet/All.scl
index 532331e55..22f8043ff 100644
--- a/bundles/org.simantics.spreadsheet.graph/scl/Spreadsheet/All.scl
+++ b/bundles/org.simantics.spreadsheet.graph/scl/Spreadsheet/All.scl
@@ -1,12 +1,18 @@
 include "Simantics/DB"
 include "Simantics/Ontologies"
 include "Simantics/SCL"
+include "Simantics/UI"
 include "Document/All"
+include "Spreadsheet/Solver"
 include "File"
 
 importJava "org.simantics.spreadsheet.common.TableCell" where
     data TableCell
 
+@inline
+editProperty :: Serializable a => CellEditor -> String -> String -> a -> Maybe Consumer -> <SpreadsheetTransaction> ()
+editProperty editor location property value consumer = editProperty_ editor location property value binding consumer
+
 importJava "org.simantics.spreadsheet.common.TreeTableCell" where
     data TreeTableCell
 
@@ -14,6 +20,8 @@ importJava "org.simantics.spreadsheet.common.TreeTableCell" where
     getTreeTableCellData :: TreeTableCell -> <Proc> a
     
     createTreeTableCell :: String -> a -> Maybe b -> Integer -> Integer -> Integer -> Boolean -> <Proc> TreeTableCell
+
+    createTreeTableCell2 :: String -> a -> Maybe b -> a -> Integer -> Integer -> Boolean -> <Proc> TreeTableCell
     
     @JavaName getText
     treeTableCellText :: TreeTableCell -> <Proc> String
@@ -23,9 +31,6 @@ importJava "org.simantics.spreadsheet.common.TreeTableCell" where
     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
@@ -39,6 +44,15 @@ importJava "org.simantics.spreadsheet.graph.SpreadsheetGraphUtils" where
     saveInitialCondition :: Variable -> Resource -> String -> <WriteGraph> Resource
     findCell :: Variable -> String -> <ReadGraph> Maybe Variable
     invalidateAll :: Variable -> <ReadGraph> ()
+    extRefVariable :: Variable -> <ReadGraph> Variant
+    extRefActiveVariable :: Variable -> <ReadGraph> Variant
+    forRows :: Variable -> String -> Integer -> Integer -> (Variable -> <ReadGraph,Proc> ()) -> <ReadGraph> ()
+    rowCell :: Variable -> Integer -> <ReadGraph> Maybe Variable
+    offsetCell :: Variable -> Integer -> Integer -> <ReadGraph> Maybe Variable
+    cellEditor :: Resource -> <ReadGraph> CellEditor
+    syncExec :: CellEditor -> OperationMode -> (<SpreadsheetTransaction, Proc> a) -> <Proc> a
+    cellColumn :: Variable -> <ReadGraph> Integer
+    spreadsheetBook :: Variable -> <Proc> SpreadsheetBook
 
 importJava "org.simantics.spreadsheet.util.SpreadsheetUtils" where
     createSheet :: Resource -> String -> <WriteGraph> Resource
@@ -56,10 +70,22 @@ importJava "org.simantics.spreadsheet.util.SpreadsheetUtils" where
     selectColumn :: Integer -> TableCell -> Boolean
     setSCLLine :: Resource -> Integer -> String -> <WriteGraph> ()
     sheetRun :: Resource -> Variable -> <ReadGraph> Variable
-    
+    @JavaName "sheetRun"
+    bookRun :: Resource -> Variable -> <ReadGraph> Variable
+
+sheetRunDefault = bookRunDefault
+
+bookRunDefault :: Resource -> <ReadGraph> Variable
+bookRunDefault book = bookRun book (resourceVariable book)
+
 importJava "org.simantics.spreadsheet.graph.ExcelImport" where
     importBook :: Resource -> File -> <Proc> ()
 
+importSpreadsheetBookAction :: Resource -> <Proc> ()
+importSpreadsheetBookAction res = match fileDialog "foo" [("Excel file", "*.xls"), ("Excel File", "*.xlsx")] with
+  Nothing -> ()
+  Just file -> importBook res file
+
 createSpreadsheetBookAction :: Resource -> <Proc> ()
 createSpreadsheetBookAction res = do
   syncWrite (\() -> createSpreadsheetBookDefault res)