Changeset 12694 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Operators.Programmable.Views
- Timestamp:
- 07/09/15 13:07:30 (9 years ago)
- Location:
- branches/HeuristicLab.Problems.Orienteering
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Problems.Orienteering
- Property svn:mergeinfo changed
-
Property
svn:global-ignores
set to
*.nuget
packages
-
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Operators.Programmable.Views/3.3/HeuristicLab.Operators.Programmable.Views-3.3.csproj
r8600 r12694 11 11 <RootNamespace>HeuristicLab.Operators.Programmable.Views</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Operators.Programmable.Views-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 0</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 <TargetFrameworkProfile /> 15 16 </PropertyGroup> 16 17 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> … … 22 23 <ErrorReport>prompt</ErrorReport> 23 24 <WarningLevel>4</WarningLevel> 25 <Prefer32Bit>false</Prefer32Bit> 24 26 </PropertyGroup> 25 27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> … … 30 32 <ErrorReport>prompt</ErrorReport> 31 33 <WarningLevel>4</WarningLevel> 34 <Prefer32Bit>false</Prefer32Bit> 32 35 </PropertyGroup> 33 36 <PropertyGroup> … … 50 53 <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories> 51 54 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 55 <Prefer32Bit>false</Prefer32Bit> 52 56 </PropertyGroup> 53 57 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> … … 66 70 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 67 71 <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules> 72 <Prefer32Bit>false</Prefer32Bit> 68 73 </PropertyGroup> 69 74 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> … … 82 87 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 83 88 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 89 <Prefer32Bit>false</Prefer32Bit> 84 90 </PropertyGroup> 85 91 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> … … 98 104 <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories> 99 105 <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules> 106 <Prefer32Bit>false</Prefer32Bit> 100 107 </PropertyGroup> 101 108 <ItemGroup> … … 121 128 </ItemGroup> 122 129 <ItemGroup> 123 <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3. 3\HeuristicLab.CodeEditor-3.3.csproj">124 <Project>{ 489CFE09-FDF7-4C89-BAB5-BD09CADD61AD}</Project>125 <Name>HeuristicLab.CodeEditor-3. 3</Name>130 <ProjectReference Include="..\..\HeuristicLab.CodeEditor\3.4\HeuristicLab.CodeEditor-3.4.csproj"> 131 <Project>{C38691AE-ECB4-489A-A05D-B035554E0168}</Project> 132 <Name>HeuristicLab.CodeEditor-3.4</Name> 126 133 <Private>False</Private> 127 134 </ProjectReference> … … 179 186 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 180 187 <PropertyGroup> 181 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)188 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 182 189 set ProjectDir=$(ProjectDir) 183 190 set SolutionDir=$(SolutionDir) … … 186 193 call PreBuildEvent.cmd 187 194 </PreBuildEvent> 188 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">195 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 189 196 export ProjectDir=$(ProjectDir) 190 197 export SolutionDir=$(SolutionDir) -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Operators.Programmable.Views/3.3/Plugin.cs.frame
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 27 27 namespace HeuristicLab.Operators.Programmable { 28 [Plugin("HeuristicLab.Operators.Programmable.Views", "3.3.1 0.$WCREV$")]28 [Plugin("HeuristicLab.Operators.Programmable.Views", "3.3.11.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Operators.Programmable.Views-3.3.dll", PluginFileType.Assembly)] 30 [PluginDependency("HeuristicLab.CodeEditor", "3. 3")]30 [PluginDependency("HeuristicLab.CodeEditor", "3.4")] 31 31 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 32 32 [PluginDependency("HeuristicLab.Core", "3.3")] -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 55 55 this.showCodeButton = new System.Windows.Forms.Button(); 56 56 this.compileButton = new System.Windows.Forms.Button(); 57 #if __MonoCS__ 58 this.codeEditor = new HeuristicLab.CodeEditor.SimpleCodeEditor(); 59 #else 57 60 this.codeEditor = new HeuristicLab.CodeEditor.CodeEditor(); 61 #endif 58 62 this.tabControl1 = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl(); 59 63 this.tabPage1 = new System.Windows.Forms.TabPage(); … … 324 328 private HeuristicLab.Core.Views.ParameterCollectionView parameterCollectionView; 325 329 private System.Windows.Forms.SplitContainer splitContainer1; 326 private HeuristicLab.CodeEditor.CodeEditor codeEditor;330 private HeuristicLab.CodeEditor.CodeEditorBase codeEditor; 327 331 private System.Windows.Forms.Button compileButton; 328 332 private System.Windows.Forms.Button showCodeButton; -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Operators.Programmable.Views/3.3/ProgrammableOperatorView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 82 82 base.OnContentChanged(); 83 83 if (ProgrammableOperator == null) { 84 codeEditor.UserCode = "";84 codeEditor.UserCode = string.Empty; 85 85 assembliesTreeView.Nodes.Clear(); 86 86 parameterCollectionView.Content = null; 87 87 } else { 88 88 codeEditor.Prefix = GetGeneratedPrefix(); 89 codeEditor.Suffix = String.Format(" {0} \n }}\n}}", ProgrammableOperator.MethodSuffix);89 codeEditor.Suffix = String.Format(" {0}{1} }}{1}}}", ProgrammableOperator.MethodSuffix, Environment.NewLine); 90 90 codeEditor.UserCode = ProgrammableOperator.Code; 91 if (codeEditor.UserCode == "")92 codeEditor.UserCode = " \n \n \n \n";91 if (codeEditor.UserCode == string.Empty) 92 codeEditor.UserCode = string.Format(" {0}", Environment.NewLine); 93 93 InitializeAssemblyList(); 94 94 InitializeNamespacesList(); 95 foreach (var a in ProgrammableOperator.SelectedAssemblies) { 96 codeEditor.AddAssembly(a); 97 } 95 codeEditor.AddAssemblies(ProgrammableOperator.SelectedAssemblies); 98 96 codeEditor.ScrollAfterPrefix(); 99 codeEditor.ShowCompileErrors(ProgrammableOperator.CompileErrors, "ProgrammableOperator"); 100 showCodeButton.Enabled = 101 ProgrammableOperator.CompilationUnitCode != null && 102 ProgrammableOperator.CompilationUnitCode.Length > 0; 97 codeEditor.ShowCompileErrors(ProgrammableOperator.CompileErrors); 98 showCodeButton.Enabled = !string.IsNullOrEmpty(ProgrammableOperator.CompilationUnitCode); 103 99 parameterCollectionView.Content = ProgrammableOperator.Parameters; 104 100 if (ProgrammableOperator.CompileErrors == null) { … … 135 131 } 136 132 private void showCodeButton_Click(object sender, EventArgs e) { 133 #if __MonoCS__ 134 new TextDialog("CodeViewer", ProgrammableOperator.CompilationUnitCode, true).ShowDialog(this); 135 #else 137 136 new CodeViewer(ProgrammableOperator.CompilationUnitCode).ShowDialog(this); 137 #endif 138 138 } 139 139 private void codeEditor_Validated(object sender, EventArgs e) { … … 203 203 try { 204 204 ProgrammableOperator.Compile(); 205 } catch (Exception ex) { 205 } 206 catch (Exception ex) { 206 207 ErrorHandling.ShowErrorDialog(this, ex); 207 208 } -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Operators.Programmable.Views/3.3/Properties/AssemblyInfo.cs.frame
r11185 r12694 11 11 [assembly: AssemblyCompany("")] 12 12 [assembly: AssemblyProduct("HeuristicLab")] 13 [assembly: AssemblyCopyright("(c) 2002-201 4HEAL")]13 [assembly: AssemblyCopyright("(c) 2002-2015 HEAL")] 14 14 [assembly: AssemblyTrademark("")] 15 15 [assembly: AssemblyCulture("")] … … 34 34 // [assembly: AssemblyVersion("1.0.*")] 35 35 [assembly: AssemblyVersion("3.3.0.0")] 36 [assembly: AssemblyFileVersion("3.3.1 0.$WCREV$")]36 [assembly: AssemblyFileVersion("3.3.11.$WCREV$")]
Note: See TracChangeset
for help on using the changeset viewer.