Changeset 2273 for trunk

Timestamp:

08/10/09 16:21:09 (15 years ago)

Author:

gkronber

Message:

Added functionality to open any database file to CEDMA console. #712

Location:

trunk/sources/HeuristicLab.CEDMA.Core/3.3

Files:

• Console.cs (modified) (2 diffs)
• ConsoleEditor.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.CEDMA.Core/3.3/Console.cs

@@ -33 +33 @@
 namespace HeuristicLab.CEDMA.Core {
   public class Console : ItemBase, IEditable {
-    private static readonly string sqlServerCompactFile = AppDomain.CurrentDomain.BaseDirectory + "HeuristicLab.Modeling.database.sdf";
-    private static readonly string sqlServerCompactConnectionString = @"Data Source=" + sqlServerCompactFile;
+    private static readonly string sqlServerCompactConnectionString = @"Data Source=";
+
+    private string database;
+    public string Database {
+      get {
+        return database;
+      }
+      set {
+        if (value != database) {
+          database = value;
+          results = null;
+        }
+      }
+    }
 
     private Results results;
@@ -56 +68 @@
 
     private void ReloadResults() {
-      results = new Results(new DatabaseService(sqlServerCompactConnectionString));
+      results = new Results(new DatabaseService(sqlServerCompactConnectionString + Database));
     }
   }

trunk/sources/HeuristicLab.CEDMA.Core/3.3/ConsoleEditor.cs

@@ -34 +34 @@
     private ComboBox viewComboBox;
     private Button resultsButton;
+    private Button openButton;
     private Console console;
 
@@ -39 +40 @@
       InitializeComponent();
       this.console = console;
+      resultsButton.Enabled = false;
+      viewComboBox.Enabled = false;
       PopulateViewComboBox();
     }
@@ -46 +49 @@
       this.viewComboBox = new System.Windows.Forms.ComboBox();
       this.resultsButton = new System.Windows.Forms.Button();
+      this.openButton = new System.Windows.Forms.Button();
       this.SuspendLayout();
       // 
       // viewComboBox
       // 
-      this.viewComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.viewComboBox.FormattingEnabled = true;
-      this.viewComboBox.Location = new System.Drawing.Point(3, 3);
+      this.viewComboBox.Location = new System.Drawing.Point(0, 29);
       this.viewComboBox.Name = "viewComboBox";
       this.viewComboBox.Size = new System.Drawing.Size(121, 21);
@@ -59 +62 @@
       // resultsButton
       // 
-      this.resultsButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-      this.resultsButton.Location = new System.Drawing.Point(130, 1);
+      this.resultsButton.Location = new System.Drawing.Point(127, 27);
       this.resultsButton.Name = "resultsButton";
       this.resultsButton.Size = new System.Drawing.Size(86, 23);
@@ -68 +70 @@
       this.resultsButton.Click += new System.EventHandler(this.resultsButton_Click);
       // 
+      // openButton
+      // 
+      this.openButton.Location = new System.Drawing.Point(4, 0);
+      this.openButton.Name = "openButton";
+      this.openButton.Size = new System.Drawing.Size(75, 23);
+      this.openButton.TabIndex = 8;
+      this.openButton.Text = "Open...";
+      this.openButton.UseVisualStyleBackColor = true;
+      this.openButton.Click += new System.EventHandler(this.openButton_Click);
+      // 
       // ConsoleEditor
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.Controls.Add(this.openButton);
       this.Controls.Add(this.viewComboBox);
       this.Controls.Add(this.resultsButton);
       this.Name = "ConsoleEditor";
-      this.Size = new System.Drawing.Size(445, 189);
+      this.Size = new System.Drawing.Size(224, 112);
       this.ResumeLayout(false);
 
@@ -94 +107 @@
       PluginManager.ControlManager.ShowControl(control);
     }
+
+    private void openButton_Click(object sender, EventArgs e) {
+      OpenFileDialog dialog = new OpenFileDialog();
+      DialogResult result = dialog.ShowDialog();
+      if (result == DialogResult.OK) {
+        viewComboBox.Enabled = true;
+        resultsButton.Enabled = true;
+        console.Database = dialog.FileName;
+      }
+    }
   }
 }