Changeset 9363 for branches/OaaS/HeuristicLab.ExtLibs

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.4.0 (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.5.0 (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.6.0 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.6.0)
• HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.7.0 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ALGLIB/3.7.0)
• HeuristicLab.ExtLibs/HeuristicLab.AutoDiff (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.AutoDiff)
• HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0 (modified) (1 prop)
• HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0/HeuristicLab.DayView-1.0.csproj (modified) (2 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3 (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.LibSVM/3.12 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/3.12)
• HeuristicLab.ExtLibs/HeuristicLab.MathJax/1.1/HeuristicLab.MathJax-1.1/HeuristicLab.MathJax-1.1.csproj (modified) (2 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Controller.cs (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/CustomTools/CustomPanTool.cs (modified) (4 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Ghosts.cs (modified) (4 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446.csproj (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/NetronVisualization.cs (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/TextEditor.cs (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/View.cs (modified) (5 diffs)
• HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446.csproj (modified) (1 diff)
• HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/0.9.1 (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.ProtobufCS/2.4.1)
• HeuristicLab.ExtLibs/HeuristicLab.SharpDevelop/3.1.1.5327 (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.SharpDevelop/3.2.1 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SharpDevelop/3.2.1)
• HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.3.1 (deleted)
• HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.7.0 (copied) (copied from trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.WinFormsUI/2.7.0)
• HeuristicLab.ExtLibs/HeuristicLab.log4net (deleted)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0

@@ -3 +3 @@
 HeuristicLab.DayView-1.0.csproj.user
 *.vs10x
+*.user

@@ -3 +3 @@
 HeuristicLab.DayView-1.0.csproj.user
 *.vs10x
+*.user

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.DayView/1.0/HeuristicLab.DayView-1.0.csproj

@@ -155 +155 @@
   -->
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -161 +161 @@
 
 call PreBuildEvent.cmd</PreBuildEvent>
+<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
+</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.MathJax/1.1/HeuristicLab.MathJax-1.1/HeuristicLab.MathJax-1.1.csproj

@@ -170 +170 @@
   -->
   <PropertyGroup>
-    <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -177 +177 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
+<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+export ProjectDir=$(ProjectDir)
+export SolutionDir=$(SolutionDir)
+
+$SolutionDir/PreBuildEvent.sh
+</PreBuildEvent>
   </PropertyGroup>
 </Project>

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Controller.cs

@@ -45 +45 @@
 
     public override bool ActivateTextEditor(ITextProvider textProvider) {
-      TextEditor.GetEditor(textProvider);
-      TextEditor.Show();
-      return true;
+      return false;
     }
 

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/CustomTools/CustomPanTool.cs

@@ -32 +32 @@
 
     public CustomPanTool() : base(ToolName) { }
-
     public CustomPanTool(string toolName) : base(toolName) { }
 
@@ -52 +51 @@
         IDiagramControl control = Controller.ParentControl;
         Point origin = Controller.View.Origin;
-
         Point offset = new Point(previousMouseLocation.X - currentLocation.X, previousMouseLocation.Y - currentLocation.Y);
-
         origin.Offset(offset);
 
         if (origin.X < 0) origin.X = 0;
-
-
         if (origin.Y < 0) origin.Y = 0;
 
@@ -68 +63 @@
     }
 
-    public void MouseUp(MouseEventArgs e) {
-      //if (IsActive && !IsSuspended) this.previousMouseLocation = Point.Empty;
-    }
+    public void MouseUp(MouseEventArgs e) { }
     #endregion
 
@@ -77 +70 @@
       if (e.KeyCode == Keys.Escape)
         DeactivateTool();
-      else if (e.KeyCode == Keys.Space)
-        ActivateTool();
     }
 
-    public void KeyUp(KeyEventArgs e) {
-      if (e.KeyCode == Keys.Space)
-        DeactivateTool();
-    }
+    public void KeyUp(KeyEventArgs e) { }
 
     public void KeyPress(KeyPressEventArgs e) { }

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/Ghosts.cs

@@ -35 +35 @@
 namespace HeuristicLab.Netron {
   internal static class GhostsFactory {
-    private static RectGhost mRectangular;
-    private static LineGhost mLine;
-    private static EllipticGhost mEllipse;
-    private static MultiLineGhost mMultiLine;
-    private static CurvedLineGhost mCurvedLine;
-    private static PolygonGhost mPolygon;
-
-    private static IView mView;
-    public static IView View {
-      get { return mView; }
-      set { mView = value; }
-    }
-
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
-    public static IGhost GetGhost(object pars, GhostTypes type) {
+    public static IGhost GetGhost(object pars, GhostTypes type, IView View) {
       Point[] points;
       switch (type) {
         case GhostTypes.Rectangle:
-          if (mRectangular == null)
-            mRectangular = new RectGhost(View);
+          var mRectangular = new RectGhost(View);
           points = (Point[])pars;
           mRectangular.Start = points[0];
@@ -60 +46 @@
           return mRectangular;
         case GhostTypes.Ellipse:
-          if (mEllipse == null)
-            mEllipse = new EllipticGhost(View);
+          var mEllipse = new EllipticGhost(View);
           points = (Point[])pars;
           mEllipse.Start = points[0];
@@ -67 +52 @@
           return mEllipse;
         case GhostTypes.Line:
-          if (mLine == null)
-            mLine = new LineGhost(View);
+          var mLine = new LineGhost(View);
           points = (Point[])pars;
           mLine.Start = points[0];
@@ -74 +58 @@
           return mLine;
         case GhostTypes.MultiLine:
-          if (mMultiLine == null)
-            mMultiLine = new MultiLineGhost(View);
+          var mMultiLine = new MultiLineGhost(View);
           points = (Point[])pars;
           mMultiLine.Points = points;
           return mMultiLine;
         case GhostTypes.CurvedLine:
-          if (mCurvedLine == null)
-            mCurvedLine = new CurvedLineGhost(View);
+          var mCurvedLine = new CurvedLineGhost(View);
           points = (Point[])pars;
           mCurvedLine.Points = points;
           return mCurvedLine;
         case GhostTypes.Polygon:
-          if (mPolygon == null)
-            mPolygon = new PolygonGhost(View);
+          var mPolygon = new PolygonGhost(View);
           points = (Point[])pars;
           mPolygon.Points = points;

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446.csproj

@@ -122 +122 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TextEditor.cs" />
     <Compile Include="View.cs" />
   </ItemGroup>

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/NetronVisualization.cs

@@ -49 +49 @@
         this.AttachToDocument(Document);
         this.Controller.View = View;
-        TextEditor.Init(this);
 
         View.OnCursorChange += new EventHandler<CursorEventArgs>(mView_OnCursorChange);

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/HeuristicLab.Netron-3.0.2672.12446/View.cs

@@ -42 +42 @@
       this.HorizontalRuler.Visible = true;
       this.VerticalRuler.Visible = true;
-      GhostsFactory.View = this;
     }
 
@@ -102 +101 @@
       Ghost = GhostsFactory.GetGhost(
           new Point[] { ltPoint, rbPoint },
-              GhostTypes.Ellipse);
+              GhostTypes.Ellipse, this);
     }
     public override void PaintGhostRectangle(
@@ -112 +111 @@
       Ghost = GhostsFactory.GetGhost(
           new Point[] { ltPoint, rbPoint },
-          GhostTypes.Rectangle);
+          GhostTypes.Rectangle, this);
     }
     public override void PaintAntsRectangle(
@@ -129 +128 @@
       Ghost = GhostsFactory.GetGhost(
           new Point[] { ltPoint, rbPoint },
-          GhostTypes.Line);
+          GhostTypes.Line, this);
     }
     public override void PaintGhostLine(
@@ -139 +138 @@
       switch (curveType) {
         case MultiPointType.Straight:
-          Ghost = GhostsFactory.GetGhost(points, GhostTypes.MultiLine);
+          Ghost = GhostsFactory.GetGhost(points, GhostTypes.MultiLine, this);
           break;
         case MultiPointType.Polygon:
-          Ghost = GhostsFactory.GetGhost(points, GhostTypes.Polygon);
+          Ghost = GhostsFactory.GetGhost(points, GhostTypes.Polygon, this);
           break;
         case MultiPointType.Curve:
-          Ghost = GhostsFactory.GetGhost(points, GhostTypes.CurvedLine);
+          Ghost = GhostsFactory.GetGhost(points, GhostTypes.CurvedLine, this);
           break;
 

branches/OaaS/HeuristicLab.ExtLibs/HeuristicLab.Netron/3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446/Netron.Diagramming.Core-3.0.2672.12446.csproj

@@ -593 +593 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>
+   <PreBuildEvent>
     </PreBuildEvent>
     <PostBuildEvent>

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -3 +3 @@
 HeuristicLab.DayView-1.0.csproj.user
 *.vs10x
+*.user