Merge branch 'dev'

Author: rabanti-github

Changelog.md

@@ -1,12 +1,24 @@
 # Change Log
 
+## v2.5.0
+
+---
+Release Date: **02.07.2018**
+
+- Added address types (no fixed rows and columns, fixed rows, fixed columns, fixed rows and columns; Useful in formulas)
+- Added new CellDirection Disabled, if the addresses of the cells are defined manually (AddNextCell will override the current cell in this case)
+- Altered Demo 3 to demonstrate disabling of automatic cell addressing
+- Extended Demo 1 to demonstrate the new address types
+- Minor, internal changes
+
+
 ## v2.4.0
 ---
 Release Date: **07.06.2018**
 
 - Added style appending (builder / method chaining)
 - Added new basic styles ColorizedText, ColorizedBackground and Font as functions
-- Added a new constructor for Workbooks without file name to handle stream-only workbooks more logiccal
+- Added a new constructor for Workbooks without file name to handle stream-only workbooks more logical
 - Added the functions HasCell, GetLastColumnNumber and GetLastRowNumber in the Worksheet class
 - Fixed a bug when overriding a worksheet name with sanitizing
 - Added new demo for the introduced style features

Demo/Program.cs

@@ -95,7 +95,7 @@ private static void StreamDemo()
 
 
         /// <summary>
-        /// This method shows the usage of AddNextCell with several data types and formulas
+        /// This method shows the usage of AddNextCell with several data types and formulas. Furthermore, the several types of Addresses are demonstrated
         /// </summary>
         private static void Demo1()
         {
@@ -111,7 +111,21 @@ private static void Demo1()
             workbook.CurrentWorksheet.AddNextCellFormula("B1*22");      // Add cell A3 as formula (B1 times 22)
             workbook.CurrentWorksheet.AddNextCellFormula("ROUNDDOWN(A2,1)"); // Add cell B3 as formula (Floor A2 with one decimal place)
             workbook.CurrentWorksheet.AddNextCellFormula("PI()");       // Add cell C3 as formula (Pi = 3.14.... )
-            workbook.Save();                                            // Save the workbook
+            workbook.AddWorksheet("Addresses");                                                 // Add new worksheet
+            workbook.CurrentWorksheet.CurrentCellDirection = Worksheet.CellDirection.Disabled;  // Disable automatic addressing
+            workbook.CurrentWorksheet.AddCell("Default", 0,0);                                  // Add a value
+            Cell.Address address = new Cell.Address(1, 0, Cell.AddressType.Default);            // Create Address with default behavior
+            workbook.CurrentWorksheet.AddCell(address.ToString(), 1,0);                         // Add the string of the address
+            workbook.CurrentWorksheet.AddCell("Fixed Column", 0, 1);                            // Add a value
+            address = new Cell.Address(1, 1, Cell.AddressType.FixedColumn);                     // Create Address with fixed column
+            workbook.CurrentWorksheet.AddCell(address.ToString(), 1, 1);                        // Add the string of the address
+            workbook.CurrentWorksheet.AddCell("Fixed Row", 0, 2);                               // Add a value
+            address = new Cell.Address(1, 2, Cell.AddressType.FixedRow);                        // Create Address with fixed row
+            workbook.CurrentWorksheet.AddCell(address.ToString(), 1, 2);                        // Add the string of the address
+            workbook.CurrentWorksheet.AddCell("Fixed Row and Column", 0, 3);                    // Add a value
+            address = new Cell.Address(1, 3, Cell.AddressType.FixedRowAndColumn);               // Create Address with fixed row and column
+            workbook.CurrentWorksheet.AddCell(address.ToString(), 1, 3);                        // Add the string of the address
+            workbook.Save();                                                                    // Save the workbook
         }
 
         /// <summary>
@@ -158,10 +172,14 @@ private static void Demo3()
             workbook.CurrentWorksheet.AddNextCell("C");                 // Add cell B3
             workbook.CurrentWorksheet.AddNextCell("D");                 // Add cell B4
             workbook.CurrentWorksheet.RemoveCell("A2");                 // Delete cell A2
-            workbook.CurrentWorksheet.RemoveCell(1, 1);                  // Delete cell B2
+            workbook.CurrentWorksheet.RemoveCell(1, 1);                 // Delete cell B2
             workbook.CurrentWorksheet.GoToNextRow(3);                   // Move 3 rows down
             object value = workbook.CurrentWorksheet.GetCell(1, 2).Value;  // Gets the value of cell B3
             workbook.CurrentWorksheet.AddNextCell("Value of B3 is: " + value);
+            workbook.CurrentWorksheet.CurrentCellDirection = Worksheet.CellDirection.Disabled;   // Disable automatic cell addressing
+            workbook.CurrentWorksheet.AddCell("Text A", 3, 0);       // Add manually placed value
+            workbook.CurrentWorksheet.AddCell("Text B", 4, 1);       // Add manually placed value
+            workbook.CurrentWorksheet.AddCell("Text C", 3, 2);       // Add manually placed value
             workbook.Save();                                            // Save the workbook
         }
 

Documentation/CodeDocumentation.shfbproj

@@ -65,7 +65,7 @@ If you want to compile the documentation project %28folder: Documentation%3b pro
 
 &lt%3bh3&gt%3bAs DLL&lt%3b/h3&gt%3b
 
-Simply place the PicoXLSX DLL into your .NET project and add a reference %28in VS or SharpDevelop%29 to it. Please keep in mind that the .NET version of your solution must match with the runtime version of the PicoXLSX DLL %28currently compiled with 4.5%29.
+Simply place the PicoXLSX DLL into your .NET project and add a reference to it. Please keep in mind that the .NET version of your solution must match with the runtime version of the PicoXLSX DLL %28currently compiled with 4.5%29.
 &lt%3bh3&gt%3bAs source files&lt%3b/h3&gt%3b
 
 Place all .CS files from the PicoXLSX source folder into your project. You can place them into a sub-folder if you wish. The files contains definitions for workbooks, worksheets, cells, styles, meta-data, low level methods and exceptions.
@@ -103,7 +103,8 @@ Place all .CS files from the PicoXLSX source folder into your project. You can p
       <Argument Key="requestExampleUrl" Value="" />
     </TransformComponentArguments>
     <NamespaceSummaries>
-      <NamespaceSummaryItem name="PicoXLSX" isDocumented="True" xmlns="" />
+      <NamespaceSummaryItem name="PicoXLSX" isDocumented="True">The namespace PicoXLSX contains all classes of the library</NamespaceSummaryItem>
+      <NamespaceSummaryItem name="(global)" isDocumented="False" />
     </NamespaceSummaries>
     <RootNamespaceTitle>PicoXLSX</RootNamespaceTitle>
   </PropertyGroup>