Changeset 528

Show
Ignore:
Timestamp:
02/29/08 11:54:49 (10 months ago)
Author:
phill
Message:

o Removing cruft.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/x42view-upgrade/x42view.net/Gui/MainWnd.Designer.cs

    r404 r528  
    5555                        this.stats = new System.Windows.Forms.StatusStrip(); 
    5656                        this.ofd = new System.Windows.Forms.OpenFileDialog(); 
    57                         this.toActiveBench = new System.Windows.Forms.ToolStripMenuItem(); 
    5857                        this.btnOpen = new System.Windows.Forms.ToolStripButton(); 
    5958                        this.fiOpen = new System.Windows.Forms.ToolStripMenuItem(); 
    …… 
    153152                        this.toolsToolStripMenuItem.DropDownItems.AddRange( new System.Windows.Forms.ToolStripItem[] { 
    154153            this.toModelBrowser, 
    155             this.toActiveBench, 
    156154            this.toolStripSeparator1, 
    157155            this.toOptions} ); 
    …… 
    202200                        this.ofd.Filter = "x42 Files|*.x42"; 
    203201                        this.ofd.Multiselect = true; 
    204                         //  
    205                         // toActiveBench 
    206                         //  
    207                         this.toActiveBench.Name = "toActiveBench"; 
    208                         this.toActiveBench.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) 
    209                                                 | System.Windows.Forms.Keys.B))); 
    210                         this.toActiveBench.Size = new System.Drawing.Size( 204, 22 ); 
    211                         this.toActiveBench.Text = "Active Bench"; 
    212                         this.toActiveBench.Click += new System.EventHandler( this.toActiveBench_Click ); 
    213202                        //  
    214203                        // btnOpen 
    …… 
    313302                private System.Windows.Forms.ToolStripMenuItem fiDiff; 
    314303                private System.Windows.Forms.ToolStripMenuItem mnuOpenRaw; 
    315                 private System.Windows.Forms.ToolStripMenuItem toActiveBench; 
    316304        } 
    317305} 

  • branches/x42view-upgrade/x42view.net/Gui/MainWnd.cs

    r429 r528  
    163163                } 
    164164 
    165                 public ActiveBench OpenActiveBench() 
    166                 { 
    167                         ActiveBench bench = new ActiveBench(); 
    168                         bench.MdiParent = this; 
    169                         bench.Show(); 
    170  
    171                         return bench; 
    172                 } 
    173  
    174165                private void MainWnd_MdiChildActivate( object sender, EventArgs e ) 
    175166                { 
    …… 
    304295                        Helpers.DisposeAndClear( ref browser ); 
    305296                } 
    306  
    307                 private void toActiveBench_Click( object sender, EventArgs e ) 
    308                 { 
    309                         OpenActiveBench(); 
    310                 } 
    311297        } 
    312298} 

  • branches/x42view-upgrade/x42view.net/Gui/RawDataViewer.cs

    r476 r528  
    5555                                new DataBrowser.Controllers.VertexPositionController() ); 
    5656 
    57                         browser.CustomPageViews.Add( typeof( DataMetrics.IDataMetric ), 
    58                                 typeof( DataBrowser.PageHandlers.DataMetricPageHandler ) ); 
    5957                        browser.CustomPageViews.Add( typeof( Audit.ModelScore ), 
    6058                                typeof( DataBrowser.PageHandlers.ModelScorePageHandler ) ); 

  • branches/x42view-upgrade/x42view.net/x42view.net.csproj

    r495 r528  
    5151  </PropertyGroup> 
    5252  <ItemGroup> 
    53     <Reference Include="7zip, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> 
    54       <SpecificVersion>False</SpecificVersion> 
    55       <HintPath>..\dependencies\7zip\bin\Release\7zip.dll</HintPath> 
    56     </Reference> 
    57     <Reference Include="Boo.Lang, Version=2.0.0.0, Culture=neutral, PublicKeyToken=32c39770e9a21a67, processorArchitecture=MSIL"> 
    58       <SpecificVersion>False</SpecificVersion> 
    59       <HintPath>..\dependencies\Boo\Boo.Lang.dll</HintPath> 
    60     </Reference> 
    61     <Reference Include="Boo.Lang.Compiler, Version=2.0.0.0, Culture=neutral, PublicKeyToken=32c39770e9a21a67, processorArchitecture=MSIL"> 
    62       <SpecificVersion>False</SpecificVersion> 
    63       <HintPath>..\dependencies\Boo\Boo.Lang.Compiler.dll</HintPath> 
    64     </Reference> 
    65     <Reference Include="Boo.Lang.Interpreter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=32c39770e9a21a67, processorArchitecture=MSIL"> 
    66       <SpecificVersion>False</SpecificVersion> 
    67       <HintPath>..\dependencies\Boo\Boo.Lang.Interpreter.dll</HintPath> 
    68     </Reference> 
    69     <Reference Include="Boo.Lang.Parser, Version=2.0.0.0, Culture=neutral, PublicKeyToken=32c39770e9a21a67, processorArchitecture=MSIL"> 
    70       <SpecificVersion>False</SpecificVersion> 
    71       <HintPath>..\dependencies\Boo\Boo.Lang.Parser.dll</HintPath> 
    72     </Reference> 
    7353    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"> 
    7454      <SpecificVersion>False</SpecificVersion> 
    7555      <HintPath>..\dependencies\ICSharpCode\ICSharpCode.SharpZipLib.dll</HintPath> 
    76     </Reference> 
    77     <Reference Include="ICSharpCode.TextEditor, Version=2.2.1.2648, Culture=neutral, PublicKeyToken=4d61825e8dd49f1a, processorArchitecture=MSIL"> 
    78       <SpecificVersion>False</SpecificVersion> 
    79       <HintPath>..\dependencies\ICSharpCode\ICSharpCode.TextEditor.dll</HintPath> 
    8056    </Reference> 
    8157    <Reference Include="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" /> 
    …… 
    9975    <Compile Include="DataBrowser\IDisplayControl.cs" /> 
    10076    <Compile Include="DataBrowser\PageHandler.cs" /> 
    101     <Compile Include="Gui\ActiveBench.cs"> 
    102       <SubType>Form</SubType> 
    103     </Compile> 
    104     <Compile Include="Gui\ActiveBench.Designer.cs"> 
    105       <DependentUpon>ActiveBench.cs</DependentUpon> 
    106     </Compile> 
    10777    <Compile Include="Gui\Camera.cs"> 
    10878      <SubType>Component</SubType> 
    …… 
    173143    </Compile> 
    174144    <Compile Include="Gui\Options.cs"> 
    175       <SubType>Component</SubType> 
     145      <SubType>Form</SubType> 
    176146    </Compile> 
    177147    <Compile Include="Gui\Options.Designer.cs"> 
    …… 
    228198    <Compile Include="Program.cs" /> 
    229199    <Compile Include="Properties\AssemblyInfo.cs" /> 
    230     <EmbeddedResource Include="Gui\ActiveBench.resx"> 
    231       <SubType>Designer</SubType> 
    232       <DependentUpon>ActiveBench.cs</DependentUpon> 
    233     </EmbeddedResource> 
    234200    <EmbeddedResource Include="Gui\AnimationsPanel.resx"> 
    235201      <SubType>Designer</SubType> 
    236202      <DependentUpon>AnimationsPanel.cs</DependentUpon> 
    237     </EmbeddedResource> 
    238     <EmbeddedResource Include="Gui\CodeEditor.resx"> 
    239       <SubType>Designer</SubType> 
    240       <DependentUpon>CodeEditor.cs</DependentUpon> 
    241203    </EmbeddedResource> 
    242204    <EmbeddedResource Include="Gui\DXPanel.resx"> 
    …… 
    353315    <None Include="Resources\bounds.png" /> 
    354316    <None Include="Resources\topology.png" /> 
    355     <None Include="ActiveBench\Registered Model.boo"> 
    356       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
    357     </None> 
    358     <None Include="ActiveBench\Show Model Metrics.boo"> 
    359       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
    360     </None> 
    361317    <None Include="Resources\prop.png" /> 
    362318    <None Include="Resources\class.png" /> 
    …… 
    374330    <Compile Include="DataBrowser\Formatters\ModelFormatters.cs" /> 
    375331    <Compile Include="DataBrowser\Formatters\NumericFormatters.cs" /> 
    376     <Compile Include="DataBrowser\PageHandlers\DataMetricPageHandler.cs" /> 
    377332    <Compile Include="DataBrowser\PageHandlers\ModelScorePageHandler.cs" /> 
    378     <Compile Include="DataMetrics\BitWriter.cs" /> 
    379     <Compile Include="DataMetrics\DataMetric.cs" /> 
    380     <Compile Include="DataMetrics\Histogram.cs" /> 
    381     <Compile Include="DataMetrics\MetricStream.cs" /> 
    382     <Compile Include="DataMetrics\ModelMetrics.cs" /> 
    383     <Compile Include="DataMetrics\NullStream.cs" /> 
    384333    <Compile Include="Analysis\SpeedTest.cs" /> 
    385334    <Compile Include="Gui\AnimationsPanel.cs"> 
    …… 
    388337    <Compile Include="Gui\AnimationsPanel.Designer.cs"> 
    389338      <DependentUpon>AnimationsPanel.cs</DependentUpon> 
    390     </Compile> 
    391     <Compile Include="Gui\BooConsole.cs"> 
    392       <SubType>UserControl</SubType> 
    393     </Compile> 
    394     <Compile Include="Gui\CodeEditor.cs"> 
    395       <SubType>UserControl</SubType> 
    396     </Compile> 
    397     <Compile Include="Gui\CodeEditor.Designer.cs"> 
    398       <DependentUpon>CodeEditor.cs</DependentUpon> 
    399     </Compile> 
    400     <Compile Include="Gui\ConsoleEditor.cs"> 
    401       <SubType>UserControl</SubType> 
    402339    </Compile> 
    403340    <Compile Include="Gui\ModelWindow.Preview.Bounds.cs">