UXImport 01

Ogama/MainWindow/MainForm.cs

@@ -11,6 +11,8 @@
 // <author>Adrian Vo�k�hler</author>
 // <email>[email protected]</email>
 
+using Ogama.Modules.ImportExport.UXI;
+
 namespace Ogama.MainWindow
 {
   using System;
@@ -749,7 +751,7 @@ private bool ShowTaskChooseDialog()
           case Tasks.Import:
             if (this.CreateDatabaseView())
             {
-              ImportRawData.Start(this);
+              UXImport.Start(this);
             }
 
             break;

Ogama/Modules/Database/DatabaseModule.cs

@@ -27,6 +27,7 @@ namespace Ogama.Modules.Database
   using Ogama.Modules.Common.Tools;
   using Ogama.Modules.ImportExport.OgamaData;
   using Ogama.Modules.ImportExport.RawData;
+    using Ogama.Modules.ImportExport.UXI;
 
   /// <summary>
   /// Derived from <see cref="FormWithAccellerators"/>.
@@ -1852,6 +1853,12 @@ private void btnSpecial_Click(object sender, EventArgs e)
       ////    }
     }
 
-    #endregion //HELPER
-  }
+        #endregion //HELPER
+
+        private void uxImport_Click(object sender, EventArgs e)
+        {
+            UXImport.Start((MainForm)this.MdiParent);
+            ((MainForm)this.MdiParent).RefreshContextPanelSubjects();
+        }
+    }
 }

Ogama/Modules/ImportExport/RawData/ImportRawData.cs

@@ -50,28 +50,28 @@ public class ImportRawData
     /// <summary>
     ///   List to fill with imported and filtered <see cref="RawData" />
     /// </summary>
-    private static readonly List<RawData> RawDataList;
+    protected static readonly List<RawData> RawDataList;
 
     /// <summary>
     ///   List to fill with generated <see cref="SubjectsData" />
     /// </summary>
-    private static readonly List<SubjectsData> SubjectList;
+    protected static readonly List<SubjectsData> SubjectList;
 
     /// <summary>
     ///   List to fill with generated or imported <see cref="TrialsData" />
     /// </summary>
-    private static readonly List<TrialsData> TrialList;
+    protected static readonly List<TrialsData> TrialList;
 
     /// <summary>
     ///   Saves the ASCII file import specialized settings
     ///   during this import session.
     /// </summary>
-    private static ASCIISettings asciiSetting;
+    protected static ASCIISettings asciiSetting;
 
     /// <summary>
     ///   Saves the specialized settings used during this import session.
     /// </summary>
-    private static DetectionSettings detectionSetting;
+    protected static DetectionSettings detectionSetting;
 
     #endregion
 

Ogama/Modules/ImportExport/UXI/ProgressForm.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Ogama.Modules.ImportExport.UXI
+{
+    public partial class ProgressForm : Form
+    {
+        public ProgressForm()
+        {
+            InitializeComponent();
+        }
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            task.Cancel();
+            this.Text = "Cancelling...";
+        }
+    }
+}

Ogama/Modules/ImportExport/UXI/ProgressForm.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>