Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
YoshikoWrapper
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Philipp Spohr
YoshikoWrapper
Commits
98aff5db
Commit
98aff5db
authored
7 years ago
by
Philipp Spohr
Browse files
Options
Downloads
Patches
Plain Diff
Working on some basic object passing tests
parent
a8d55579
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java
+25
-4
25 additions, 4 deletions
src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java
src/main/java/de/hhu/ba/yoshikoWrapper/swig/package-info.java
+0
-5
0 additions, 5 deletions
...main/java/de/hhu/ba/yoshikoWrapper/swig/package-info.java
with
25 additions
and
9 deletions
src/main/java/de/hhu/ba/yoshikoWrapper/gui/MainPanel.java
+
25
−
4
View file @
98aff5db
...
@@ -15,6 +15,7 @@ import org.cytoscape.application.swing.CytoPanelName;
...
@@ -15,6 +15,7 @@ import org.cytoscape.application.swing.CytoPanelName;
import
de.hhu.ba.yoshikoWrapper.core.YoshikoLoader
;
import
de.hhu.ba.yoshikoWrapper.core.YoshikoLoader
;
import
de.hhu.ba.yoshikoWrapper.swig.LibraryInterface
;
import
de.hhu.ba.yoshikoWrapper.swig.LibraryInterface
;
import
de.hhu.ba.yoshikoWrapper.swig.SWIGTYPE_p_ysk__ClusterEditingInstance
;
/**This class describes the Swing Panel that the user interacts with in cytoscape
/**This class describes the Swing Panel that the user interacts with in cytoscape
* @author Philipp Spohr, Aug 6, 2017
* @author Philipp Spohr, Aug 6, 2017
...
@@ -28,7 +29,7 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
...
@@ -28,7 +29,7 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
private
static
final
long
serialVersionUID
=
6214827920591046457L
;
private
static
final
long
serialVersionUID
=
6214827920591046457L
;
//SYMBOLIC LINKS
//SYMBOLIC LINKS
private
YoshikoLoader
yoshiko
Interface
=
YoshikoLoader
.
getInstance
();
private
YoshikoLoader
yoshiko
Loader
=
YoshikoLoader
.
getInstance
();
private
MainPanel
self
=
this
;
//for lambda function references
private
MainPanel
self
=
this
;
//for lambda function references
//SWING COMPONENTS
//SWING COMPONENTS
...
@@ -44,7 +45,7 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
...
@@ -44,7 +45,7 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
//SWING COMPONENT INITIALIZATION
//SWING COMPONENT INITIALIZATION
libStatusPanel
=
new
LibStatusPanel
();
libStatusPanel
=
new
LibStatusPanel
();
libStatusPanel
.
setStyle
(
yoshiko
Interface
.
isLibraryLoaded
());
libStatusPanel
.
setStyle
(
yoshiko
Loader
.
isLibraryLoaded
());
this
.
add
(
libStatusPanel
);
this
.
add
(
libStatusPanel
);
searchLibButton
=
new
JButton
(
"SHOW YOSHIKO LIB"
);
searchLibButton
=
new
JButton
(
"SHOW YOSHIKO LIB"
);
...
@@ -55,15 +56,35 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
...
@@ -55,15 +56,35 @@ public class MainPanel extends JPanel implements CytoPanelComponent {
final
YLibChooser
c
=
new
YLibChooser
();
final
YLibChooser
c
=
new
YLibChooser
();
int
returnVal
=
c
.
showOpenDialog
(
self
);
int
returnVal
=
c
.
showOpenDialog
(
self
);
if
(
returnVal
==
JFileChooser
.
APPROVE_OPTION
)
{
if
(
returnVal
==
JFileChooser
.
APPROVE_OPTION
)
{
yoshiko
Interface
.
loadLibrary
(
c
.
getSelectedFile
().
getAbsolutePath
());
yoshiko
Loader
.
loadLibrary
(
c
.
getSelectedFile
().
getAbsolutePath
());
}
}
libStatusPanel
.
setStyle
(
yoshiko
Interface
.
isLibraryLoaded
());
libStatusPanel
.
setStyle
(
yoshiko
Loader
.
isLibraryLoaded
());
yoshikoVersionLabel
.
setText
(
LibraryInterface
.
getVersionString
());
yoshikoVersionLabel
.
setText
(
LibraryInterface
.
getVersionString
());
}
}
});
});
this
.
add
(
searchLibButton
);
this
.
add
(
searchLibButton
);
//
//
//TODO: REMOVE IN FINAL RELEASE
JButton
debugGraphActionButton
=
new
JButton
(
"DO MYSTERIOUS DEBUG STUFF"
);
debugGraphActionButton
.
addActionListener
(
new
ActionListener
()
{
@Override
public
void
actionPerformed
(
ActionEvent
e
)
{
if
(
yoshikoLoader
.
isLibraryLoaded
()){
SWIGTYPE_p_ysk__ClusterEditingInstance
testInstance
=
LibraryInterface
.
new_ClusterEditingInstance
();
LibraryInterface
.
ClusterEditingInstance_initEdge
(
testInstance
,
edge
,
0.5
,
false
,
false
);
}
}
});
this
.
add
(
debugGraphActionButton
);
//
//
//
yoshikoVersionLabel
=
new
JLabel
(
"YOSHIKO VERSION"
);
yoshikoVersionLabel
=
new
JLabel
(
"YOSHIKO VERSION"
);
this
.
add
(
yoshikoVersionLabel
);
this
.
add
(
yoshikoVersionLabel
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/de/hhu/ba/yoshikoWrapper/swig/package-info.java
deleted
100644 → 0
+
0
−
5
View file @
a8d55579
/**
* @author Philipp Spohr, Aug 6, 2017
*
*/
package
de.hhu.ba.yoshikoWrapper.swig
;
\ No newline at end of file
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