2.3.0

BiologyTools · Feb 27, 2023 · 4cfff91 · 4cfff91
1 parent 28da4a7
commit 4cfff91
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 17 deletions.
diff --git a/BioGTK.csproj b/BioGTK.csproj
@@ -4,21 +4,21 @@
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <RuntimeIdentifiers>osx-x64;linux-x64;win7-x64;linux-arm64</RuntimeIdentifiers>
-    <AssemblyVersion>2.2.0</AssemblyVersion>
-    <FileVersion>2.2.0</FileVersion>
+    <AssemblyVersion>2.3.0</AssemblyVersion>
+    <FileVersion>2.3.0</FileVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>BioGTK</PackageId>
     <Title>BioGTK</Title>
     <PackageProjectUrl>https://github.com/BiologyTools/BioGTK</PackageProjectUrl>
     <PackageIcon>banner.jpg</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageVersion>2.2.0</PackageVersion>
+    <PackageVersion>2.3.0</PackageVersion>
     <RepositoryUrl>https://github.com/BiologyTools/BioGTK</RepositoryUrl>
     <PackageTags>Biology; GTK; ImageJ; Bio-Formats; Image-Stacks; Microscopy;</PackageTags>
     <PackageLicenseExpression> GPL-3.0-only</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Description>A .NET application &amp; library for editing &amp; annotating various microscopy image formats. Supports all bioformats supported images. Integrates with ImageJ, running ImageJ filters &amp; macro functions. Supports Windows, Linux and Mac.</Description>
-    <Version>2.2.0</Version>
+    <Version>2.3.0</Version>
     <Platforms>AnyCPU;x64;ARM64</Platforms>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -47,6 +47,7 @@
     <WarningLevel>7</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <None Remove="bioformats_package.dll" />
     <None Remove="Glade\About.glade" />
     <None Remove="Glade\ApplyFilter.glade" />
     <None Remove="Glade\BioConsole.glade" />
@@ -75,6 +76,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Include="bioformats_package.dll" />
     <Content Include="Resources\banner.jpg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Pack>True</Pack>

diff --git a/Glade/BioConsole.glade b/Glade/BioConsole.glade
@@ -142,7 +142,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="resultBox">
+              <object class="GtkCheckButton" id="resultsBox">
                 <property name="label" translatable="yes">Open Result in New Tab</property>
                 <property name="width-request">100</property>
                 <property name="visible">True</property>

diff --git a/Glade/Console.glade b/Glade/Console.glade
@@ -57,7 +57,7 @@
                 <property name="receives-default">True</property>
               </object>
               <packing>
-                <property name="x">381</property>
+                <property name="x">400</property>
                 <property name="y">7</property>
               </packing>
             </child>
@@ -70,7 +70,7 @@
                 <property name="receives-default">True</property>
               </object>
               <packing>
-                <property name="x">278</property>
+                <property name="x">293</property>
                 <property name="y">8</property>
               </packing>
             </child>
@@ -98,7 +98,7 @@
                 <property name="draw-indicator">True</property>
               </object>
               <packing>
-                <property name="x">110</property>
+                <property name="x">89</property>
                 <property name="y">6</property>
               </packing>
             </child>
@@ -120,15 +120,28 @@
             <child>
               <object class="GtkRadioButton" id="tabRadioBut">
                 <property name="label" translatable="yes">Tab</property>
-                <property name="width-request">100</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="draw-indicator">True</property>
                 <property name="group">selRadioBut</property>
               </object>
               <packing>
-                <property name="x">110</property>
+                <property name="x">81</property>
+                <property name="y">29</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="resultsBox">
+                <property name="label" translatable="yes">Open Result in New Tab</property>
+                <property name="width-request">100</property>
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="draw-indicator">True</property>
+              </object>
+              <packing>
+                <property name="x">134</property>
                 <property name="y">29</property>
               </packing>
             </child>

diff --git a/Glade/Console.glade~ b/Glade/Console.glade~
@@ -125,6 +125,7 @@
                 <property name="can-focus">True</property>
                 <property name="receives-default">False</property>
                 <property name="draw-indicator">True</property>
+                <property name="group">selRadioBut</property>
               </object>
               <packing>
                 <property name="x">110</property>

diff --git a/Source/BioConsole.cs b/Source/BioConsole.cs
@@ -13,6 +13,7 @@ public class BioConsole : Window
         public static bool onTab = false;
         public static bool useBioformats = false;
         public static bool headless = false;
+        public static bool resultInNewTab = false;
         int line = 0;
 #pragma warning disable 649
         [Builder.Object]
@@ -67,12 +68,18 @@ protected void SetupHandlers()
             imagejBut.Clicked += ImagejBut_Clicked;
             headlessBox.Clicked += HeadlessBox_Clicked;
             bioformatsBox.Clicked += BioformatsBox_Clicked;
+            resultsBox.Clicked += ResultsBox_Clicked;
             selRadioBut.Clicked += SelRadioBox_Clicked;
             tabRadioBut.Clicked += TabRadioBox_Clicked;
             this.KeyPressEvent += Console_KeyPressEvent;
             this.DeleteEvent += BioConsole_DeleteEvent;
         }
 
+        private void ResultsBox_Clicked(object sender, EventArgs e)
+        {
+            throw new NotImplementedException();
+        }
+
         private void BioConsole_DeleteEvent(object o, DeleteEventArgs args)
         {
             Hide();
@@ -126,7 +133,7 @@ private void ImagejBut_Clicked(object sender, EventArgs e)
         {
             if (ImageView.SelectedImage == null)
                 return;
-            ImageJ.RunOnImage(textBox.Buffer.Text, headless, onTab, useBioformats);
+            ImageJ.RunOnImage(textBox.Buffer.Text, headless, onTab, useBioformats, resultsBox.Active);
             consoleBox.Buffer.Text += textBox.Buffer.Text + Environment.NewLine;
             textBox.Buffer.Text = "";
         }

diff --git a/Source/Functions.cs b/Source/Functions.cs
@@ -497,7 +497,7 @@ public object PerformFunction(bool imagej)
             }
             if (FuncType == Function.FunctionType.ImageJ)
             {
-                ImageJ.RunOnImage(script, false, BioConsole.onTab, BioConsole.useBioformats);
+                ImageJ.RunOnImage(script, false, BioConsole.onTab, BioConsole.useBioformats, BioConsole.resultInNewTab);
             }
             return null;
         }

diff --git a/Source/ImageJ.cs b/Source/ImageJ.cs
@@ -97,7 +97,7 @@ public static void RunString(string con, string param, bool headless)
         /// image is opened using the default imagej open command.
         /// 
         /// @return The image is being returned as a new tab.
-        public static void RunOnImage(string con, bool headless, bool onTab, bool bioformats)
+        public static void RunOnImage(string con, bool headless, bool onTab, bool bioformats, bool resultInNewTab)
         {
             if (ImageJPath == "")
             {
@@ -140,13 +140,13 @@ public static void RunOnImage(string con, bool headless, bool onTab, bool biofor
             //If not in images we add it to a new tab.
             if (Images.GetImage(ffile) == null)
             {
-                BioImage.OpenFile(ffile, false);
+                BioImage.OpenFile(ffile, resultInNewTab);
             }
             else
             {
-                BioImage b = BioImage.OpenFile(ffile, false);
-                ImageView.SelectedImage.Buffers = b.Buffers;
-                Image
+                //BioImage b = BioImage.OpenFile(ffile, false);
+                Images.UpdateImage(ffile,BioImage.OpenFile(ffile));
+                Images.GetImage(ffile).Update();
             }
             App.viewer.UpdateImage();
             App.viewer.UpdateView();

diff --git a/bioformats_package.dll b/bioformats_package.dll