- Timestamp:
- 04/16/13 13:13:41 (12 years ago)
- Location:
- branches/OaaS
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/OaaS
- Property svn:ignore
-
old new 21 21 protoc.exe 22 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll 23 24 packages
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3
- Property svn:ignore
-
old new 4 4 HeuristicLab.Operators.Views.GraphVisualization.Views-3.3.csproj.user 5 5 *.vs10x 6 *.user
-
- Property svn:ignore
-
branches/OaaS/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/GraphVisualizationInfoView.cs
r7259 r9363 35 35 [Content(typeof(IGraphVisualizationInfo), true)] 36 36 public partial class GraphVisualizationInfoView : AsynchronousContentView { 37 private Bidirectional Lookup<IShapeInfo, IShape> shapeInfoShapeMapping;38 private Bidirectional Lookup<IConnectionInfo, IConnection> connectionInfoConnectionMapping;37 private BidirectionalDictionary<IShapeInfo, IShape> shapeInfoShapeMapping; 38 private BidirectionalDictionary<IConnectionInfo, IConnection> connectionInfoConnectionMapping; 39 39 private LinePenStyle connectionPenStyle; 40 40 41 41 public GraphVisualizationInfoView() { 42 42 InitializeComponent(); 43 this.shapeInfoShapeMapping = new Bidirectional Lookup<IShapeInfo, IShape>();44 this.connectionInfoConnectionMapping = new Bidirectional Lookup<IConnectionInfo, IConnection>();43 this.shapeInfoShapeMapping = new BidirectionalDictionary<IShapeInfo, IShape>(); 44 this.connectionInfoConnectionMapping = new BidirectionalDictionary<IConnectionInfo, IConnection>(); 45 45 this.connectionPenStyle = new LinePenStyle(); 46 46 this.connectionPenStyle.EndCap = LineCap.ArrowAnchor; -
branches/OaaS/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/HeuristicLab.Operators.Views.GraphVisualization.Views-3.3.csproj
r7021 r9363 206 206 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 207 207 <PropertyGroup> 208 <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)208 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 209 209 set ProjectDir=$(ProjectDir) 210 210 set SolutionDir=$(SolutionDir) … … 212 212 213 213 call PreBuildEvent.cmd 214 </PreBuildEvent> 215 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 216 export ProjectDir=$(ProjectDir) 217 export SolutionDir=$(SolutionDir) 218 219 $SolutionDir/PreBuildEvent.sh 214 220 </PreBuildEvent> 215 221 </PropertyGroup> -
branches/OaaS/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/OperatorGraphView.cs
r8000 r9363 154 154 155 155 void ParentControl_MouseDown(object sender, MouseEventArgs e) { 156 lastActiveTool = this.graphVisualizationInfoView.Controller.ActiveTool;157 156 if (e.Button == MouseButtons.Middle) { 158 if (!(lastActiveTool is CustomPanTool)) this.graphVisualizationInfoView.Controller.ActivateTool(CustomPanTool.ToolName); 157 lastActiveTool = graphVisualizationInfoView.Controller.ActiveTool; 158 graphVisualizationInfoView.Controller.ActivateTool(CustomPanTool.ToolName); 159 159 } 160 160 } … … 162 162 void ParentControl_MouseUp(object sender, MouseEventArgs e) { 163 163 if (e.Button == MouseButtons.Middle) { 164 if (lastActiveTool != null) this.graphVisualizationInfoView.Controller.ActivateTool(lastActiveTool.Name); 165 else this.graphVisualizationInfoView.Controller.DeactivateAllTools(); 164 var activeTool = graphVisualizationInfoView.Controller.ActiveTool; 165 graphVisualizationInfoView.Controller.DeactivateTool(activeTool); 166 if (lastActiveTool != null && !(lastActiveTool is ZoomToolBase)) 167 graphVisualizationInfoView.Controller.ActivateTool(lastActiveTool.Name); 166 168 } 167 169 } -
branches/OaaS/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/Plugin.cs.frame
r7259 r9363 23 23 24 24 namespace HeuristicLab.Operators.Views.GraphVisualization.Views { 25 [Plugin("HeuristicLab.Operators.Views.GraphVisualization.Views-3.3", "3.3. 6.$WCREV$")]25 [Plugin("HeuristicLab.Operators.Views.GraphVisualization.Views-3.3", "3.3.7.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Operators.Views.GraphVisualization.Views-3.3.dll", PluginFileType.Assembly)] 27 27 [PluginDependency("HeuristicLab.Collections", "3.3")] -
branches/OaaS/HeuristicLab.Operators.Views.GraphVisualization.Views/3.3/Properties/AssemblyInfo.cs.frame
r7259 r9363 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3. 6.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")]
Note: See TracChangeset
for help on using the changeset viewer.