Changeset 11009 for branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
- Timestamp:
- 06/12/14 13:26:18 (10 years ago)
- Location:
- branches/DataPreprocessing
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataPreprocessing
- Property svn:ignore
-
old new 8 8 FxCopResults.txt 9 9 Google.ProtocolBuffers-0.9.1.dll 10 Google.ProtocolBuffers-2.4.1.473.dll 10 11 HeuristicLab 3.3.5.1.ReSharper.user 11 12 HeuristicLab 3.3.6.0.ReSharper.user 12 13 HeuristicLab.4.5.resharper.user 13 14 HeuristicLab.ExtLibs.6.0.ReSharper.user 15 HeuristicLab.Scripting.Development 14 16 HeuristicLab.resharper.user 15 17 ProtoGen.exe … … 17 19 _ReSharper.HeuristicLab 18 20 _ReSharper.HeuristicLab 3.3 21 _ReSharper.HeuristicLab 3.3 Tests 19 22 _ReSharper.HeuristicLab.ExtLibs 20 23 bin 21 24 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views merged: 10540-10541,10543,10894
- Property svn:mergeinfo changed
-
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj
r10925 r11009 110 110 </ItemGroup> 111 111 <ItemGroup> 112 <Compile Include="InteractiveSymbolicRegressionSolutionSimplifierView.cs"> 113 <SubType>UserControl</SubType> 114 </Compile> 112 <Compile Include="InteractiveSymbolicRegressionSolutionSimplifierView.cs" /> 115 113 <Compile Include="InteractiveSymbolicRegressionSolutionSimplifierView.Designer.cs"> 116 114 <DependentUpon>InteractiveSymbolicRegressionSolutionSimplifierView.cs</DependentUpon> … … 155 153 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> 156 154 <Name>HeuristicLab.Collections-3.3</Name> 155 <Private>False</Private> 156 </ProjectReference> 157 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj"> 158 <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project> 159 <Name>HeuristicLab.Common.Resources-3.3</Name> 157 160 <Private>False</Private> 158 161 </ProjectReference> -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/Plugin.cs.frame
r10925 r11009 31 31 [PluginDependency("HeuristicLab.Collections", "3.3")] 32 32 [PluginDependency("HeuristicLab.Common", "3.3")] 33 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 33 34 [PluginDependency("HeuristicLab.Core", "3.3")] 34 35 [PluginDependency("HeuristicLab.Core.Views", "3.3")] -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs
r10878 r11009 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 this.exportButton = new System.Windows.Forms.Button(); 48 this.exportFileDialog = new System.Windows.Forms.SaveFileDialog(); 47 49 this.btnSimplify = new System.Windows.Forms.Button(); 48 50 this.transformModelButton = new System.Windows.Forms.Button(); … … 55 57 this.SuspendLayout(); 56 58 // 57 // splitContainer59 // flowLayoutPanel 58 60 // 59 // 60 // splitContainer.Panel1 61 // 62 this.splitContainer.Panel1.Controls.Add(this.btnSimplify); 63 // 64 // splitContainer.Panel2 65 // 66 this.splitContainer.Panel2.Controls.Add(this.transformModelButton); 67 // 68 // addButton 69 // 70 this.toolTip.SetToolTip(this.addButton, "Add"); 71 // 72 // removeButton 73 // 74 this.toolTip.SetToolTip(this.removeButton, "Remove"); 61 this.flowLayoutPanel.Controls.Add(this.btnSimplify); 62 this.flowLayoutPanel.Controls.Add(this.exportButton); 63 this.flowLayoutPanel.Controls.Add(this.transformModelButton); 75 64 // 76 65 // btnSimplify 77 66 // 78 this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 79 this.btnSimplify.Location = new System.Drawing.Point(172, 4); 67 this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); 68 this.btnSimplify.Image = HeuristicLab.Common.Resources.VSImageLibrary.FormulaEvaluator; 69 this.btnSimplify.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 80 70 this.btnSimplify.Name = "btnSimplify"; 81 this.btnSimplify.Size = new System.Drawing.Size(75, 23); 82 this.btnSimplify.TabIndex = 6; 83 this.btnSimplify.Text = "Simplify"; 71 this.btnSimplify.TabIndex = 7; 72 this.btnSimplify.Size = new System.Drawing.Size(105, 24); 73 this.btnSimplify.Text = "Simplify Model"; 74 this.btnSimplify.TextAlign = System.Drawing.ContentAlignment.MiddleRight; 84 75 this.btnSimplify.UseVisualStyleBackColor = true; 85 76 this.btnSimplify.Click += new System.EventHandler(this.btn_SimplifyModel_Click); 77 this.toolTip.SetToolTip(this.btnSimplify, "Simplify solution"); 78 // 79 // exportButton 80 // 81 this.exportButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); 82 this.exportButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Statistics; 83 this.exportButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 84 this.exportButton.Name = "exportButton"; 85 this.exportButton.Size = new System.Drawing.Size(105, 24); 86 this.exportButton.TabIndex = 8; 87 this.exportButton.Text = "Export to Excel "; 88 this.exportButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; 89 this.exportButton.UseVisualStyleBackColor = true; 90 this.exportButton.Click += new System.EventHandler(this.exportButton_Click); 91 this.toolTip.SetToolTip(this.exportButton, "Exports the symbolic regression solution to Excel."); 86 92 // 87 93 // transformModelButton 88 94 // 89 this.transformModelButton.Location = new System.Drawing.Point(84, 3); 95 this.transformModelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); 96 this.transformModelButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Event; 97 this.transformModelButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; 90 98 this.transformModelButton.Name = "transformModelButton"; 91 this.transformModelButton.Size = new System.Drawing.Size(1 25, 23);92 this.transformModelButton.TabIndex = 8;99 this.transformModelButton.Size = new System.Drawing.Size(135, 23); 100 this.transformModelButton.TabIndex = 9; 93 101 this.transformModelButton.Text = "Backtransform Model"; 102 this.transformModelButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; 94 103 this.transformModelButton.UseVisualStyleBackColor = true; 95 104 this.transformModelButton.Click += new System.EventHandler(this.transformModelButton_Click); 105 this.toolTip.SetToolTip(this.transformModelButton, "Backtransform model based on the stored transformations."); 96 106 // 97 107 // SymbolicRegressionSolutionView … … 110 120 111 121 #endregion 112 private System.Windows.Forms.Button btnSimplify; 113 private System.Windows.Forms.Button transformModelButton; 122 protected System.Windows.Forms.SaveFileDialog exportFileDialog; 123 protected System.Windows.Forms.Button exportButton; 124 protected System.Windows.Forms.Button btnSimplify; 125 protected System.Windows.Forms.Button transformModelButton; 114 126 } 115 127 } -
branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs
r10880 r11009 21 21 22 22 using System; 23 using System.ComponentModel; 23 24 using System.Windows.Forms; 24 25 using HeuristicLab.MainForm; 26 using HeuristicLab.Problems.DataAnalysis.Symbolic.Views; 25 27 using HeuristicLab.Problems.DataAnalysis.Views; 26 28 … … 40 42 protected override void SetEnabledStateOfControls() { 41 43 base.SetEnabledStateOfControls(); 42 if (Content == null) { 43 transformModelButton.Enabled = false; 44 } else { 45 transformModelButton.Enabled = !Locked; 46 } 44 btnSimplify.Enabled = Content != null && !Locked; 45 exportButton.Enabled = Content != null && !Locked; 46 transformModelButton.Enabled = Content != null && !Locked; 47 47 } 48 48 … … 53 53 } 54 54 55 private void exportButton_Click(object sender, EventArgs e) { 56 var exporter = new SymbolicSolutionExcelExporter(); 57 exportFileDialog.Filter = exporter.FileTypeFilter; 58 if (exportFileDialog.ShowDialog(this) == DialogResult.OK) { 59 var name = exportFileDialog.FileName; 60 using (BackgroundWorker bg = new BackgroundWorker()) { 61 MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Exporting solution to " + name + "."); 62 bg.DoWork += (o, a) => exporter.Export(Content, name); 63 bg.RunWorkerCompleted += (o, a) => MainFormManager.GetMainForm<MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this); 64 bg.RunWorkerAsync(); 65 } 66 } 67 } 68 55 69 private void transformModelButton_Click(object sender, EventArgs e) { 56 70 var mapper = new TransformationToSymbolicTreeMapper(); … … 58 72 var transformations = Content.ProblemData.Transformations; 59 73 var targetVar = Content.ProblemData.TargetVariable; 60 61 74 transformator.Backtransform(Content.Model, transformations, targetVar); 62 75 // TODO: cloning is needed for refreshing the view, find a better approach for this.
Note: See TracChangeset
for help on using the changeset viewer.