omero/websocket support, image provider illegal argument exception fi…

…x, class admin scrollbars
mstritt · Jun 9, 2020 · 53e25de · 53e25de
1 parent 3f99b3c
commit 53e25de
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -194,8 +194,8 @@ configurations {
 
 dependencies {
     implementation 'com.actelion.research:lib-orbit-common:1.2.12'
-    implementation ('com.actelion.research:image-provider-omero:1.7.2') {
-        because('Version 1.7.1 supports Omero 5.6.x')
+    implementation ('com.actelion.research:image-provider-omero:1.7.3') {
+        because('Version 1.7.3 supports Omero 5.6.x with Websockets')
 //        exclude (group:'com.amazonaws', module: 'aws-java-sdk-core')
 //        exclude (group:'com.amazonaws', module: 'aws-java-sdk-s3')
 //        exclude (group:'com.amazonaws', module: 'aws-java-sdk-kms')
@@ -287,12 +287,14 @@ dependencies {
  * parameters like inputDirectory were initialized at the wrong time.
  */
 task generateIcons {
-    ignite {
-        inputDirectory = file('src/main/resources/resource/svg')
-        outputDirectory = file('src/main/java/com/actelion/research/orbit/imageAnalysis/components/icons')
-        outputLanguage = 'java'
-        outputPackageName = 'com.actelion.research.orbit.imageAnalysis.components.icons'
-        useResizableTemplate = true
-        transcode()
+    doLast {
+        ignite {
+            inputDirectory = file('src/main/resources/resource/svg')
+            outputDirectory = file('src/main/java/com/actelion/research/orbit/imageAnalysis/components/icons')
+            outputLanguage = 'java'
+            outputPackageName = 'com.actelion.research.orbit.imageAnalysis.components.icons'
+            useResizableTemplate = true
+            transcode()
+        }
     }
 }
diff --git a/readme.md b/readme.md
@@ -6,6 +6,7 @@
 ### A versatile image analysis software for biological image-based quantification.
 
 ##### News:
+* 3.64: "illegal argument" constructor initialization bugfix, support for Omero/websockets, added scrollbars for class admin frame 
 * 3.63: bugfix for Orbit not starting up if OmeroOrbit.properties.template was not existing in home directory
 * 3.62: using image-provider-omero:1.7.2 for Omero 5.6.x, new keyboard shortcuts, bugfixes
 

diff --git a/src/main/java/com/actelion/research/orbit/imageAnalysis/components/ClassAdminFrame.java b/src/main/java/com/actelion/research/orbit/imageAnalysis/components/ClassAdminFrame.java
@@ -97,7 +97,7 @@ private void initialize() {
         }
         setResizable(false);
         setSize(new Dimension(frameWidth, frameHeight));
-        setLayout(new GridLayout(1, 3, 10, 10));
+        //setLayout(new GridLayout(1, 3, 10, 10));
 
         // class attributes panel
         JPanel p = getPanelClassAttributes();
@@ -132,11 +132,18 @@ private void initialize() {
         btnOK.setBounds(10, 500, (int) btnOK.getBounds().getWidth(), (int) btnOK.getBounds().getHeight());
         JPanel spacer = new JPanel();
         setCompBounds(spacer, 500);
-        p.add(spacer);
+        //p.add(spacer);
         p.add(btnOK);
 
-        add(getClassScrollPane());
-        add(p);
+        JPanel panel = new JPanel();
+        panel.setPreferredSize(new Dimension(frameWidth, frameHeight*2));
+
+        panel.setLayout(new GridLayout(1, 3, 10, 10));
+        panel.add(getClassScrollPane());
+        panel.add(p);
+
+        JScrollPane scrollPane = new JScrollPane(panel,ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+        add(scrollPane);
 
         addActionListeners();
 

diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt
@@ -1 +1 @@
-3.63
+3.64