From 9dc6690bf0d42c3e10670f927fba3f8392747755 Mon Sep 17 00:00:00 2001 From: Eugene Katrukha Date: Wed, 12 Jun 2024 12:35:30 +0200 Subject: [PATCH] tracks v1 --- src/main/java/bigtrace/BigTrace.java | 4 +-- .../java/bigtrace/BigTraceControlPanel.java | 9 ++++-- src/main/java/bigtrace/rois/RoiManager3D.java | 5 +-- .../java/bigtrace/tracks/BigTraceTracks.java | 30 ++++++++++++++++++ src/main/resources/icons/tracks.png | Bin 0 -> 4683 bytes 5 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 src/main/java/bigtrace/tracks/BigTraceTracks.java create mode 100644 src/main/resources/icons/tracks.png diff --git a/src/main/java/bigtrace/BigTrace.java b/src/main/java/bigtrace/BigTrace.java index 0dc6742..364b873 100644 --- a/src/main/java/bigtrace/BigTrace.java +++ b/src/main/java/bigtrace/BigTrace.java @@ -1604,9 +1604,9 @@ public static void main(String... args) throws Exception new ImageJ(); BigTrace testI = new BigTrace(); - testI.run(""); + //testI.run(""); - //testI.run("/home/eugene/Desktop/BigTrace_data/ExM_MT_8bit.tif"); + testI.run("/home/eugene/Desktop/projects/BigTrace/BT_tracks/Snejana_small_example.tif"); /* testI.roiManager.setLockMode(true); diff --git a/src/main/java/bigtrace/BigTraceControlPanel.java b/src/main/java/bigtrace/BigTraceControlPanel.java index 1ef4ed9..4fb94d1 100644 --- a/src/main/java/bigtrace/BigTraceControlPanel.java +++ b/src/main/java/bigtrace/BigTraceControlPanel.java @@ -104,12 +104,17 @@ public BigTraceControlPanel(final BigTrace bt_,final BigTraceData btd_, fi tabIcon = new ImageIcon(icon_path); tabPane.addTab("",tabIcon ,roiManager,"Tracing"); - //MEASUREMENTS - + //MEASUREMENTS icon_path = bigtrace.BigTrace.class.getResource("/icons/measure.png"); tabIcon = new ImageIcon(icon_path); tabPane.addTab("",tabIcon ,roiMeasure,"Measure"); + //TRACKS + icon_path = bigtrace.BigTrace.class.getResource("/icons/tracks.png"); + tabIcon = new ImageIcon(icon_path); + tabPane.addTab("",tabIcon ,null,"Tracking"); + + icon_path = bigtrace.BigTrace.class.getResource("/icons/shortcut.png"); tabIcon = new ImageIcon(icon_path); tabPane.addTab("",tabIcon ,panelInformation(),"Help/Shortcuts"); diff --git a/src/main/java/bigtrace/rois/RoiManager3D.java b/src/main/java/bigtrace/rois/RoiManager3D.java index ede2064..bc09f03 100644 --- a/src/main/java/bigtrace/rois/RoiManager3D.java +++ b/src/main/java/bigtrace/rois/RoiManager3D.java @@ -260,13 +260,14 @@ public void mouseClicked(MouseEvent evt) { ///RoiLIST and buttons - listModel = new DefaultListModel(); - jlist = new JList(listModel); + listModel = new DefaultListModel<>(); + jlist = new JList<>(listModel); jlist.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); jlist.setLayoutOrientation(JList.VERTICAL); jlist.setVisibleRowCount(-1); jlist.addListSelectionListener(this); jlist.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent evt) { if (evt.getClickCount() == 2) { diff --git a/src/main/java/bigtrace/tracks/BigTraceTracks.java b/src/main/java/bigtrace/tracks/BigTraceTracks.java new file mode 100644 index 0000000..2564455 --- /dev/null +++ b/src/main/java/bigtrace/tracks/BigTraceTracks.java @@ -0,0 +1,30 @@ +package bigtrace.tracks; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JPanel; + +import net.imglib2.type.NativeType; +import net.imglib2.type.numeric.RealType; + +import bigtrace.BigTrace; + + +public class BigTraceTracks < T extends RealType< T > & NativeType< T > > extends JPanel implements ActionListener +{ + final BigTrace bt; + + + public BigTraceTracks(BigTrace bt) + { + this.bt = bt; + } + @Override + public void actionPerformed( ActionEvent e ) + { + + + } + +} diff --git a/src/main/resources/icons/tracks.png b/src/main/resources/icons/tracks.png new file mode 100644 index 0000000000000000000000000000000000000000..88afe084c697d869dc02e88b36bdd50b8ab287e0 GIT binary patch literal 4683 zcmeHKdsGu=77wDL2q+lpu?36)6$_KhW-@U(k z@9*C4o_s|q$qByR?|Rc{G+$++JPq6#)HQ4<__gQe{t9lVbJerSG}OVc+AKQ4h%?AV zR-A!52_22*ylhIj;#&_7>+GNh*GV7T$SR#!d^D!%p?E`hQSN3WsMTlJlNT+QGM6Yf zZ9cPbKi~6mMb;{;<)UNy97px?(1K@;d$@Hw1|M)5_&<-_p6sz$Qe*Q!!${tTJYiF_XEAA6pFNaliz7re{1i|@YsTsh>D*xY;9wBL}J>!pdmjlTRv{h zOs_He`N8vs#JD^gTI!S+71KHwq#68g*JVXt`zi10G0)B?ob+?+vZj6?8Cp^}V#|Yl zqw*DFVq5EYngH$-aca^@d;U-LO+QwLfBQJ9<6djJZK7xXphuD4`L1y;7abwmN;`_` zzY3q+aIXOyI)B5n;`@irT1rRwy;!7cPTX_1sJg&%t{>ApWQ&EDKe-{)#XwB?p!#p_q!pnR{q|W81CG9dq|8jGjt&>@$wUyMK zKDfkNow#mX=g3bSnRh2my1FYRs5Sp!`+9#yX_c_q4u^x~;Ib?>JsS~=#cY_v=5QdO0ofOsNz@6M?V%JzH-;Ry zV>ZG{5*9Oq!bCNeY*NN#f_290_)J!nsu$jD?_mM(!FHlnHo}70CKJ1_g`HI70Fa)5 ze%HdT23wV#hTARKHVjwf;AS$kFN7BBwYO&5jP7)_7#la@CZK8uUXgw-6O^iyUJHr> zJz=uCtpM5mG)Y4DhOB(rhPDGlo-80Gvet9Ik+a z^0~MU(xE&)#1mlvf(HvA1jcY7M+9qet*8&g3>yKu5;gXXih|MtC|JkAMTm$CAs7JQ z@da84)p1}*#DNi!MvUTIfzS=5#U$|-n+XNwBuuCtXIssB_X0(@Bql{EV{%yV8%c^0 zC3V0+#!Mp2+0Hi$YQlu4lPJX|B1C|10fKO00W1`A-YCt&ZFbO!6ea?*xZT-MWs!hn z0I?|5rvSih0dkSV*>IG!*whw_QO2Y~Vo;X7%PO#)v?z(nQ4$BBFo!3B1rmg#Mi2>~ zFF}w9m?MGv=v%aeZqfhJrZx{l+FkNQ!Vdf|a*MimR63s3{nq_zB-~qx!EkR135s>6 zU`KOstvgPD)xCrnP_rHf)1#+dU(1Q#X$77@s1b8`ItUa}1o04&4iXCyE+i6h_*x7X z=)@SmKf2wbBORy>kI@4j0au_s-CQxk-G!RmU)y28sVV@%AgaN73FGz<#_ma&P0ftg z8B5v!#fj9d&}Ya1yKWg6USJlodxv2UXVlpF13x{r_yauv=m95h#qR)J19ZI=18=1~ z&|L#`y%hs*r99AG|2Mk4-yElKGx!(e0Eea0kH#3mL2IaHdV-wRMSXW1+p`HshFcTo z*l9Gs2I}%CiST<52)#(9O5xQy)MvQRH-NJ}6`ZDBN_mWWc76K~G6Ox8KI8`59I*WK z>ZSCJ^ksVo%l$R_)w~azn+;>9q(=U=;zIHz12%qX23wv;KSd9?SXdyBT#EddXsJBJZJR1(yESQLd(jK+}1K~P+@D%ao%wZUH`n`2B}U>{ipTa z{dv||%hRtMSUu^{82!P*i4*@uZ|7~+l#jh?FWVNmsW#%P44wl-FkE*Xez3Yu27< z6h$4LoFT2$$4*(>R5|Kew4|l0W!Is(s~qvWx3)iZ&3qJ*bOdQ$ngjFBx%R#zUh!Gh zguir3{Svx@lW!&04c5ilCrit3MwlBr?KP)AsNSN^qi3GsTx)ze$O~SRS9a#N%$rq# zFVA)ElO~;>fs}Bi1tWvQTv5EXX0=oQGU0hg$BYJf&ELmn1t++s+^kp=uddww?3-1N z#+GJN*E)2P|M`+i#l3(pwz-hexg# rdi>g6AFWv6eA4mCkk?uk_{y`m=Fr#ouOBQ1?Lbp1lI7*G8O#0y;8fHL literal 0 HcmV?d00001