Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
BensikinArchivingGUI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango controls archiving
BensikinArchivingGUI
Commits
1a7a7846
Commit
1a7a7846
authored
May 14, 2021
by
Raphael GIRARDOT
Browse files
Options
Downloads
Patches
Plain Diff
Bensikin uses common logging UI (fr.soleil.lib.project.application.logging.LogManager)
parent
a9492e15
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/fr/soleil/bensikin/Bensikin.java
+2
-0
2 additions, 0 deletions
src/main/java/fr/soleil/bensikin/Bensikin.java
src/main/java/fr/soleil/bensikin/containers/BensikinMainPanel.java
+8
-24
8 additions, 24 deletions
...java/fr/soleil/bensikin/containers/BensikinMainPanel.java
with
10 additions
and
24 deletions
src/main/java/fr/soleil/bensikin/Bensikin.java
+
2
−
0
View file @
1a7a7846
...
...
@@ -75,6 +75,7 @@ import fr.soleil.bensikin.options.Options;
import
fr.soleil.bensikin.options.manager.IOptionsManager
;
import
fr.soleil.bensikin.options.manager.OptionsManagerFactory
;
import
fr.soleil.bensikin.tools.Messages
;
import
fr.soleil.comete.swing.image.ImageJManager
;
import
fr.soleil.lib.project.application.user.manager.AccountManager
;
import
fr.soleil.lib.project.swing.Splash
;
...
...
@@ -86,6 +87,7 @@ import fr.soleil.lib.project.swing.Splash;
public
class
Bensikin
{
private
final
static
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
Bensikin
.
class
);
public
static
final
String
DEFAULT_LOG_ID
=
ImageJManager
.
generateApplicationId
(
Bensikin
.
class
.
getName
());
private
static
String
pathToResources
;
private
static
boolean
hires
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/fr/soleil/bensikin/containers/BensikinMainPanel.java
+
8
−
24
View file @
1a7a7846
...
...
@@ -33,31 +33,27 @@
package
fr.soleil.bensikin.containers
;
import
java.awt.BorderLayout
;
import
java.awt.Dimension
;
import
java.awt.Point
;
import
java.awt.Rectangle
;
import
javax.swing.JPanel
;
import
javax.swing.JScrollPane
;
import
javax.swing.JSplitPane
;
import
javax.swing.JViewport
;
import
javax.swing.ScrollPaneConstants
;
import
fr.soleil.archiving.gui.messages.MessagesPanel
;
import
fr.soleil.bensikin.Bensikin
;
import
fr.soleil.bensikin.components.BensikinToolbar
;
import
fr.soleil.bensikin.containers.context.ContextPanel
;
import
fr.soleil.bensikin.containers.snapshot.SnapshotPanel
;
import
fr.soleil.lib.project.application.logging.LogManager
;
import
fr.soleil.lib.project.application.logging.LogViewer
;
/**
* The container directly under the top-level container. Contains everything
*
onscreen except for popup dialogs. A
singleton class.
* The container directly under the top-level container. Contains everything
on screen except for popup dialogs. A
* singleton class.
*
* @author CLAISSE
*/
public
class
BensikinMainPanel
extends
JPanel
{
private
static
final
long
serialVersionUID
=
-
2492766171667913609
L
;
private
static
final
long
serialVersionUID
=
-
8285056630882222623
L
;
private
static
final
int
INITIAL_MESSAGE_SPLIT_POSITION_HIRES
=
840
;
private
static
final
int
INITIAL_CONTEXT_SPLIT_POSITION_HIRES
=
540
;
...
...
@@ -78,7 +74,7 @@ public class BensikinMainPanel extends JPanel {
private
static
final
double
CONTEXT_SPLIT_RESIZE_WEIGHT
=
0.5
;
private
static
BensikinMainPanel
bensikinMainPanelInstance
=
null
;
private
final
JScrollPane
messageScrollPane
;
private
final
LogViewer
logViewer
;
/**
* Instantiates itself if necessary, returns the instance.
...
...
@@ -115,9 +111,8 @@ public class BensikinMainPanel extends JPanel {
messageSplit
.
setDividerLocation
(
initialMessageSplitPosition
);
messageSplit
.
setTopComponent
(
contextSplit
);
messageScrollPane
=
new
JScrollPane
(
MessagesPanel
.
getInstance
());
messageScrollPane
.
setHorizontalScrollBarPolicy
(
ScrollPaneConstants
.
HORIZONTAL_SCROLLBAR_NEVER
);
messageSplit
.
setBottomComponent
(
messageScrollPane
);
logViewer
=
LogManager
.
getLogViewerInstance
(
Bensikin
.
DEFAULT_LOG_ID
,
true
);
messageSplit
.
setBottomComponent
(
logViewer
);
// END VERTICAL SPLIT
// START MAIN PART
...
...
@@ -147,15 +142,4 @@ public class BensikinMainPanel extends JPanel {
}
}
/**
* Scrolls down the log message area to make the latest log visible.
*/
public
void
scrollDownToLatestMessage
()
{
final
JViewport
viewport
=
messageScrollPane
.
getViewport
();
final
Point
point
=
new
Point
(
0
,
2000
);
final
Dimension
dim
=
new
Dimension
();
final
Rectangle
contentRect
=
new
Rectangle
(
point
,
dim
);
viewport
.
scrollRectToVisible
(
contentRect
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment