feat(nimgsearch): make resource and xoonips paths dynamic

Refactor NimgsearchUtil to a class accepting path and xoonipsPath in
the constructor. Pass these props down from Page and routes to
NimgsearchPage to dynamically construct brain image, brainarea config,
and help video URLs.

Also include VS Code configuration settings, tasks, and cleanup plan
files.
This commit is contained in:
2026-06-11 18:39:29 +09:00
parent af4545445c
commit daff8d4e35
9 changed files with 388 additions and 964 deletions
+5 -1
View File
@@ -13,8 +13,12 @@ dist-ssr
*.local
# Editor directories and files
.vscode/*
#.vscode/*
!.vscode/extensions.json
!.vscode/launch.json
!.vscode/settings.json
!.vscode/tasks.json
.opencoe/*
.idea
.DS_Store
*.suo
-309
View File
@@ -1,309 +0,0 @@
# CSS Modules :global() 排除計画
## 概要
`:global()` を排除し、各コンポーネントに個別の `.module.css` を作成して `styles.xxx` で参照する方式に全面移行。
---
## 1. 新規作成する Module.css
### 1.1 `src/pages/xoonips/XoonipsAdvancedSearchPage.module.css`
```css
.advancedSearch {
}
.search {
text-align: center;
margin: 10px;
}
.formButton {
}
```
**対応 TSX 修正:** `src/pages/xoonips/XoonipsAdvancedSearchPage.tsx`
```tsx
// import 追加
import styles from './XoonipsAdvancedSearchPage.module.css';
// 変更
<div className="advancedSearch"> → <div className={styles.advancedSearch}>
<div className="search"> → <div className={styles.search}>
<button className="formButton" → <button className={styles.formButton}
```
---
### 1.2 `src/components/xoonips/item-type/lib/AdvancedSearchBase.module.css`
```css
.head {
width: 30%;
}
.itemtypeFields {
border-collapse: separate;
border-spacing: 1px;
}
.itemtypeName {
border-collapse: separate;
border-spacing: 1px;
}
.itemtypeName th {
padding: 5px;
}
.itemtype {
margin-bottom: 5px;
}
.fieldDate {
}
.fieldDateLabel {
display: inline-block;
width: 50px;
}
.fieldDate select,
.fieldDate input {
margin: 0 5px 0 0;
}
.fieldInputText {
}
.fieldSelect {
}
```
**対応 TSX 修正:** `src/components/xoonips/item-type/lib/AdvancedSearchBase.tsx`
```tsx
// import 追加
import styles from './AdvancedSearchBase.module.css';
// 変更 (237行目のファイル内)
<input className="fieldInputText" → <input className={styles.fieldInputText}
<select className="fieldSelect" → <select className={styles.fieldSelect}
<div className="fieldDate"> → <div className={styles.fieldDate}>
<label className="fieldDateLabel"> → <label className={styles.fieldDateLabel}>
<td className="head"> → <td className={styles.head}>
<table className="itemtypeFields outer"> → <table className={`itemtypeFields outer ${styles.itemtypeFields}`}>
<div className="itemtype"> → <div className={styles.itemtype}>
<table className="itemtypeName outer"> → <table className={`itemtypeName outer ${styles.itemtypeName}`}>
```
---
### 1.3 `src/components/xoonips/item-type/lib/TopBase.module.css`
```css
.itemTypeName {
vertical-align: middle;
font-size: large;
}
```
**対応 TSX 修正:** `src/components/xoonips/item-type/lib/TopBase.tsx`
```tsx
// import 追加
import styles from './TopBase.module.css';
// 変更
<td className="itemTypeName"> → <td className={styles.itemTypeName}>
```
---
### 1.4 `src/components/xoonips/item-type/lib/field/RelatedTo.module.css`
```css
.listTable {
width: 100%;
border-collapse: separate;
border-spacing: 5px;
}
```
**対応 TSX 修正:** `src/components/xoonips/item-type/lib/field/RelatedTo.tsx`
```tsx
// import 追加
import styles from './RelatedTo.module.css';
// 変更
<table className="listTable"> → <table className={styles.listTable}>
```
---
### 1.5 `src/components/xoonips/item-type/binder/BinderDetail.module.css`
```css
.listTable {
width: 100%;
border-collapse: separate;
border-spacing: 5px;
}
```
**対応 TSX 修正:** `src/components/xoonips/item-type/binder/BinderDetail.tsx`
```tsx
// import 追加
import styles from './BinderDetail.module.css';
// 変更
<table className="listTable"> → <table className={styles.listTable}>
```
---
### 1.6 `src/components/custom/blocks/CreditsMenu.module.css`
```css
.mainmenu {
margin: 0;
padding: 0;
list-style: none;
}
```
**対応 TSX 修正:** `src/components/custom/blocks/CreditsMenu.tsx`
```tsx
// import 追加
import styles from './CreditsMenu.module.css';
// 変更
<ul className="mainmenu"> → <ul className={styles.mainmenu}>
```
---
### 1.7 `src/components/xoonips/blocks/SearchForm.module.css`
```css
.formButton {
}
```
**対応 TSX 修正:** `src/components/xoonips/blocks/SearchForm.tsx`
```tsx
// import 追加
import styles from './SearchForm.module.css';
// 変更
<input className="formButton" → <input className={styles.formButton}
```
---
### 1.8 `src/components/xoonips/item-type/nimgcenter/NimgcenterAdvancedSearch.module.css`
```css
.fieldInputText {
}
```
**対応 TSX 修正:** `src/components/xoonips/item-type/nimgcenter/NimgcenterAdvancedSearch.tsx`
```tsx
// import 追加
import styles from './NimgcenterAdvancedSearch.module.css';
// 変更 (46, 81, 83, 85, 90, 100行目)
<input className="fieldInputText" → <input className={styles.fieldInputText}
```
---
## 2. 既存 Module.css の修正
### 2.1 `src/nimgsearch/Nimgsearch.module.css` - `:global()` 排除
`:global()` を除去し、クラス名をモジュールローカルに変更。
```css
/* 変更前 */
.mainPanel:global(.large) { ... }
.brainPanel:global(.large) { ... }
/* etc */
.navTabs > li:global(.actived) { ... }
.tabItemRetrievalTable :global(.advancedSearchCondition:not(:first-child)) { ... }
/* 変更後 */
.large { height: 430px; }
.medium { height: 330px; }
.small { height: 280px; }
.brainViewX.large { left: 184px; }
/* etc */
.navTabs > li.actived { ... }
.tabItemRetrievalTable .advancedSearchCondition:not(:first-child) { ... }
```
**対応 TSX 修正:** `src/nimgsearch/Nimgsearch.tsx` と `src/pages/nimgsearch/NimgsearchPage.tsx`
```tsx
<div className="nimgsearch"> → <div className={styles.container}> (または styles.nimgsearch)
<div className="advancedSearchCondition"> → <div className={styles.advancedSearchCondition}>
<li className={tab === 0 ? 'actived' : 'normal'} → <li className={tab === 0 ? styles.actived : ''}>
```
**注意:** `Nimgsearch.tsx` と `NimgsearchPage.tsx` は同じ Nimgsearch.module.css を参照している。`NimgsearchPage.tsx` も確認して同じ修正を適用。
---
### 2.2 `src/components/xoonips/item-type/lib/field/LicenseAgreementDialog.module.css` - 拡張
既存ファイルに `.formButton` を追加。
```css
.formButton {
}
```
**対応 TSX 修正:** `src/components/xoonips/item-type/lib/field/LicenseAgreementDialog.tsx`
```tsx
<button className="formButton" → <button className={styles.formButton}
```
---
## 3. 既存 Global CSS の修正
### 3.1 `src/custom/assets/style.css` - `.readme`, `.rights` 追加
`Description.tsx` から渡される動的 className として使用されるため、グローバルCSSに追加。
```css
.readme,
.rights {
background-color: #ffffff;
width: 100%;
max-height: 200px;
overflow: auto;
}
```
---
## 4. Module.css 内の `:global()` の確認
既存の `:global()` を含むファイルを確認:
| ファイル | `:global()` 使用 | 対応 |
|---------|-----------------|------|
| `XoonipsTopPage.module.css` | `:global(table)`, `:global(table .itemTypeName)` | TopBase.module.css に移行済みなので、`:global(table)` のみ残す |
| `IndexTree.module.css` | `:global(.rc-tree ...)` | 外部ライブラリのクラス名なので維持 |
| `NimgsearchPage.module.css` | 同上 Nimgsearch.module.css | 同上の修正を適用 |
---
## 5. 実行順序
1. 新規 Module.css を作成
2. 既存 Module.css を修正
3. style.css に `.readme`, `.rights` を追加
4. TSX ファイルを修正
5. `npm run build` でビルド検証
6. `npm run lint` で lint 検証
@@ -1,360 +0,0 @@
# ソースコードレイアウト再構成計画
## 目標
サイト固有のルーティングおよびCSSデザイン部分と、純粋なReactコンポーネントを分離する。
---
## 分離ルール
| ディレクトリ | 内容 | CSSモジュール | assets |
|---|---|---|---|
| `routes/` | `Routes`/`Route`/`Navigate`のみ。CSSもassetsもゼロ | なし | なし |
| `pages/` | ルーティングされるページコンポーネント | あり | あり(直配置) |
| `components/` | 純粋UIコンポーネント(ルーティングフックなし) | あり(隣接) | あり(`images/`) |
**`images/` の配置ルール**:
- 各コンポーネントカテゴリの直下にフラットな `images/` フォルダを配置
- サブカテゴリ(2階層目以降のディレクトリ)の画像は親カテゴリの `images/` に統合
- 固有の画像(1つのコンポーネントのみが使用)は `Xxx.images/` として配置
---
## 新しいディレクトリ構造
```
src/
├── App.tsx # BrowserRouterラッパー(変更なし)
├── App.css # グローバルCSS(変更なし)
├── config.ts # 設定(変更なし)
├── functions.ts # ユーティリティ(変更なし)
├── main.tsx # エントリポイント(変更なし)
│
├── routes/ # ★新設: ルーティング層
│ ├── AppRoutes.tsx # 最上位Routes(App.tsxから分離)
│ ├── PageRoutes.tsx # PageコンポーネントのRoutes/レイアウト
│ └── modules/
│ ├── XoonipsRoutes.tsx # XoonipsのRoutes抽出
│ ├── NimgdocsRoutes.tsx # NimgdocsのRoutes抽出
│ ├── CreditsRoutes.tsx # CreditsのRoutes抽出
│ ├── NimgcenterRoutes.tsx # NimgcenterのRoutes抽出
│ └── BrainExplorerRoutes.tsx # BrainExplorerのRoutes抽出
│
├── pages/ # ★新設: ページ層 (Routes + CSS混在)
│ ├── xoonips/
│ │ ├── XoonipsTopPage.tsx # XoonipsTop.tsx からリネーム
│ │ ├── XoonipsTopPage.module.css
│ │ ├── XoonipsDetailPage.tsx # XoonipsDetailItem.tsx からリネーム
│ │ ├── XoonipsSearchPage.tsx # XoonipsSearchBy*.tsx を統合
│ │ └── XoonipsSearchPage.module.css
│ ├── nimgdocs/
│ │ ├── NimgdocsPage.tsx # Nimgdocs.tsx + NimgdocsPage内容
│ │ └── NimgdocsTutorialsPage.tsx
│ ├── credits/
│ │ ├── CreditsIndexPage.tsx # CreditsIndex.tsx からリネーム
│ │ └── CreditsPagePage.tsx # CreditsPage.tsx からリネーム
│ ├── nimgsearch/
│ │ ├── NimgsearchPage.tsx # Nimgsearch.tsx そのまま(905行)
│ │ └── NimgsearchPage.module.css
│ └── brainexplorer/
│ ├── BrainExplorerPage.tsx # BrainExplorerIndex.tsx からリネーム
│ └── BrainExplorerPage.module.css
│
├── components/ # ★新設: 純粋UIコンポーネント
│ ├── common/
│ │ ├── Loading.tsx
│ │ ├── LangFlag.tsx
│ │ ├── LangFlag.images/
│ │ │ ├── mlang_english.gif
│ │ │ └── mlang_japanese.gif
│ │ ├── PageNotFound.tsx
│ │ ├── NoticeBanner.tsx
│ │ ├── XoopsCode.tsx
│ │ └── XoopsCode.images/
│ │ └── smil*.gif
│ ├── xoonips/
│ │ ├── blocks/
│ │ │ ├── IndexTree.tsx
│ │ │ ├── IndexTree.module.css
│ │ │ ├── SearchForm.tsx # Search.tsx からリネーム
│ │ │ ├── RecentContents.tsx
│ │ │ ├── RecentContents.module.css
│ │ │ ├── Rankings.tsx
│ │ │ ├── Rankings.module.css
│ │ │ └── images/
│ │ │ ├── star.gif
│ │ │ ├── tree_line.png
│ │ │ └── tree_node.png
│ │ ├── lib/
│ │ │ ├── XoonipsListItem.tsx
│ │ │ ├── XoonipsListItem.module.css
│ │ │ ├── XoonipsListIndex.tsx
│ │ │ ├── simpf-links.json # JSONは直配置
│ │ │ ├── tree.json # JSONは直配置
│ │ │ ├── AdvancedSearchQuery.ts
│ │ │ ├── IndexUtil.ts
│ │ │ ├── ItemUtil.ts
│ │ │ ├── field/
│ │ │ │ ├── (全23ファイル)
│ │ │ │ └── images/
│ │ │ │ └── simpf_button.png
│ │ │ └── images/
│ │ │ └── icon_folder.gif
│ │ ├── item-type/ # 14アイテムタイプ(構造維持)
│ │ │ ├── index.tsx
│ │ │ ├── lib/ # TopBase, ListBase, DetailBase, AdvancedSearchBase
│ │ │ ├── binder/
│ │ │ ├── book/
│ │ │ └── ...
│ │ └── images/ # xoonipsカテゴリ統合アセット
│ │ ├── icon_binder.gif
│ │ ├── icon_book.gif
│ │ ├── icon_conference.gif
│ │ ├── icon_data.gif
│ │ ├── icon_files.gif
│ │ ├── icon_memo.gif
│ │ ├── icon_model.gif
│ │ ├── icon_nimgcenter.gif
│ │ ├── icon_paper.gif
│ │ ├── icon_presentation.gif
│ │ ├── icon_simulator.gif
│ │ ├── icon_stimulus.gif
│ │ ├── icon_tool.gif
│ │ └── icon_url.gif
│ ├── nimgsearch/
│ │ └── images/
│ │ └── brainarea.json
│ └── custom/
│ ├── Header.tsx
│ ├── Footer.tsx
│ └── images/ # customカテゴリ統合アセット
│ ├── jnode.png
│ ├── banner-niu.png
│ ├── banner-riken.png
│ ├── banner-riken-cbs.png
│ ├── banner-xoonips.png
│ ├── blockTitle.png
│ ├── blockTitleBack.png
│ ├── blockTitleIndent16.png
│ ├── blockTitleIndent12.png
│ ├── footer_back.png
│ ├── h1_indent.png
│ ├── h2_background.png
│ ├── logo.png
│ ├── page_top.png
│ ├── smenu_01.png
│ ├── smenu_03.png
│ ├── smenu_04.png
│ ├── mmenu_01.png
│ ├── mmenu_02.png
│ ├── mmenu_03.png
│ └── mmenu_04.png
│
├── custom/ # ★大幅簡素化: レイアウトのみ
│ └── Page.tsx # Routesを分離、レイアウト構造のみ残す
│
├── common/
│ └── AppRoot.tsx # 変更なし
│
├── nimgcenter/ # 変更なし(routes層のみ参照)
└── data/ # 変更なし
```
---
## Phaseごとの作業詳細
### Phase 1: `routes/` 新設
#### 1a. `routes/AppRoutes.tsx` を作成
- `App.tsx` の BrowserRouter 直下の Routes を分離
- `AppRoot` を参照するだけの簡素なRoutes
#### 1b. `routes/PageRoutes.tsx` を作成
- `custom/Page.tsx` の Routes 構造を抽出
- `CenterColumn`, `LeftColumn`, `MainContent` のレイアウト構造を保持
- 各モジュールのRoutesを `routes/modules/` から import
#### 1c. `routes/modules/XoonipsRoutes.tsx` を作成
- `Xoonips.tsx` の Routes を抽出
- Pages (`XoonipsTopPage`, `XoonipsDetailPage` 等) を参照
- CSSモジュール・HelmetはPages側に移動
#### 1d. `routes/modules/NimgdocsRoutes.tsx` を作成
- `Nimgdocs.tsx` の Routes を抽出
- Pages を参照
#### 1e. `routes/modules/CreditsRoutes.tsx` を作成
- `Credits.tsx` の Routes を抽出
- Pages を参照
#### 1f. `routes/modules/NimgcenterRoutes.tsx` を作成
- `NimgenterUtilities.tsx` の Routes を抽出
- Pages を参照
#### 1g. `routes/modules/BrainExplorerRoutes.tsx` を作成
- `BrainExplorer.tsx` の Routes を抽出
- Pages を参照
### Phase 2: `components/` 新設
#### 2a. `components/common/` を作成
- `common/lib/` の全ファイル (`Loading.tsx`, `LangFlag.tsx`, `PageNotFound.tsx`, `NoticeSiteHasBeenArchived.tsx`, `XoopsCode.tsx`) を移動
- `common/assets/images/mlang_*.gif` → `components/common/LangFlag.images/`
- `common/assets/images/smil*.gif` → `components/common/XoopsCode.images/`
- `common/assets/xoops.css` はそのまま(グローバルCSS)
#### 2b. `components/xoonips/blocks/` を作成
- `xoonips/blocks/` の全ファイル (`IndexTree.tsx`, `Search.tsx`, `RecentContents.tsx`, `Rankings.tsx`) を移動
- `Search.tsx` → `SearchForm.tsx` にリネーム
- CSSモジュールは各ファイルの隣に保持
- `xoonips/assets/images/star.gif` → `components/xoonips/blocks/images/`
- `xoonips/assets/images/tree_*.png` → `components/xoonips/blocks/images/`
- IndexTree, Rankings の `useNavigate` を props/callback に変更
#### 2c. `components/xoonips/lib/` を作成
- `xoonips/lib/` の全ファイル (`XoonipsListItem.tsx`, `XoonipsListIndex.tsx`, `IndexUtil.ts`, `ItemUtil.ts`, `AdvancedSearchQuery.ts`) を移動
- CSSモジュールは各ファイルの隣に保持
- `xoonips/assets/images/icon_folder.gif` → `components/xoonips/lib/images/`
- `simpf-links.json`, `tree.json` は直配置
- XoonipsListItem の `useNavigate`/`useLocation` を props化
#### 2d. `components/xoonips/item-type/` を作成
- `xoonips/item-type/` の全構造をそのまま移動
- 各アイテムタイプの Top/List/Detail/AdvancedSearch コンポーネントを移動
- `xoonips/assets/images/icon_*.gif` (14種) → `components/xoonips/images/`
- `xoonips/item-type/lib/field/` の全ファイルを移動
- `simpf_button.png` → `components/xoonips/lib/field/images/`
#### 2e. `components/custom/` を作成
- `custom/Header.tsx`, `custom/Footer.tsx` を移動
- `custom/assets/images/*` (20種) → `components/custom/images/`
- Header の `useLocation` はそのまま(ルーティングフックだが、Headerはレイアウト固有)
- Footer の `useLocation` はそのまま
#### 2f. `components/custom/blocks/` を作成
- `custom/blocks/` の全ファイル (`Information.tsx`, `BulletinBoard.tsx`, `HowToUseLinks.tsx`, `HowToUseVideo.tsx`, `Questionnaire.tsx`, `RecentStatus.tsx`) を移動
#### 2g. `components/nimgsearch/images/` を作成
- `nimgsearch/assets/brainarea.json` → `components/nimgsearch/images/`
### Phase 3: `pages/` 新設
#### 3a. `pages/xoonips/` を作成
- `XoonipsTop.tsx` → `XoonipsTopPage.tsx` (CSSモジュール同行)
- `XoonipsDetailItem.tsx` → `XoonipsDetailPage.tsx`
- `XoonipsSearchByKeyword.tsx`, `XoonipsSearchByIndexId.tsx`, `XoonipsSearchByItemType.tsx`, `XoonipsSearchByAdvancedKeyword.tsx` → `XoonipsSearchPage.tsx` に統合(共通の検索結果表示ロジックを共有)
- `XoonipsTop.module.css` → `XoonipsTopPage.module.css`
#### 3b. `pages/nimgdocs/` を作成
- `Nimgdocs.tsx` の Routes + Pages を統合して `NimgdocsPage.tsx` に
- `NimgdocsTutorials.tsx` → `NimgdocsTutorialsPage.tsx`
- JSONアセット (`3dbrowse.json` 等) は直配置
#### 3c. `pages/credits/` を作成
- `CreditsIndex.tsx` → `CreditsIndexPage.tsx`
- `CreditsPage.tsx` → `CreditsPagePage.tsx`
#### 3d. `pages/nimgsearch/` を作成
- `Nimgsearch.tsx` → `NimgsearchPage.tsx` (905行、そのまま)
- `Nimgsearch.module.css` → `NimgsearchPage.module.css`
#### 3e. `pages/brainexplorer/` を作成
- `BrainExplorerIndex.tsx` → `BrainExplorerPage.tsx`
- `BrainExplorerIndex.module.css` → `BrainExplorerPage.module.css`
- `brainexplorer/assets/images/*` (3種) → `pages/brainexplorer/images/`
### Phase 4: クリーンアップ
#### 4a. 既存ファイルの削除
- `xoonips/Xoonips.tsx` → routes/へ移動済みなので削除
- `xoonips/XoonipsTop.tsx` → pages/へ移動済みなので削除
- `xoonips/XoonipsDetailItem.tsx` → pages/へ移動済みなので削除
- `xoonips/XoonipsAdvancedSearch.tsx` → routes/へ統合
- `xoonips/XoonipsSearchBy*.tsx` → pages/へ移動済みなので削除
- `xoonips/XoonipsXoopsPathRedirect.tsx` → routes/へ統合
- `xoonips/blocks/*` → components/へ移動済みなので削除
- `xoonips/lib/*` → components/へ移動済みなので削除
- `xoonips/item-type/*` → components/へ移動済みなので削除
- `xoonips/assets/*` → components/へ移動済みなので削除
- `custom/Page.tsx` → routes/へ移動済みなので削除
- `custom/Header.tsx` → components/へ移動済みなので削除
- `custom/Footer.tsx` → components/へ移動済みなので削除
- `custom/blocks/*` → components/へ移動済みなので削除
- `custom/assets/*` → components/へ移動済みなので削除
- `nimgdocs/Nimgdocs.tsx` → routes/へ統合
- `nimgdocs/NimgdocsTutorials.tsx` → pages/へ移動済みなので削除
- `nimgdocs/assets/*` → pages/へ移動済みなので削除
- `credits/Credits.tsx` → routes/へ統合
- `credits/CreditsIndex.tsx` → pages/へ移動済みなので削除
- `credits/CreditsPage.tsx` → pages/へ移動済みなので削除
- `credits/blocks/CreditsMenu.tsx` → components/へ移動済みなので削除
- `brainexplorer/BrainExplorer.tsx` → routes/へ統合
- `brainexplorer/BrainExplorerIndex.tsx` → pages/へ移動済みなので削除
- `brainexplorer/assets/*` → pages/へ移動済みなので削除
- `common/lib/*` → components/へ移動済みなので削除
- `common/assets/*` → components/へ移動済みなので削除
#### 4b. 空ディレクトリ削除
- `xoonips/blocks/`, `xoonips/lib/`, `xoonips/item-type/`, `xoonips/assets/`
- `custom/blocks/`, `custom/assets/`
- `nimgdocs/assets/`
- `credits/blocks/`
- `brainexplorer/assets/`
- `common/lib/`, `common/assets/`
### Phase 5: ビルド確認
```bash
npm run build
```
---
## 重要な変換ルール
### useNavigate/useLocation → props/callback
`useNavigate` を直接使用しているコンポーネントは、ナビゲーションコールバックを props で受けるように変更:
```tsx
// Before (IndexTree.tsx)
import { useNavigate } from 'react-router-dom';
const IndexTree: React.FC<Props> = () => {
const navigate = useNavigate();
const handleSelect = (key: number) => navigate(IndexUtil.getUrl(key));
};
// After
interface Props {
onNavigate: (url: string) => void;
}
const IndexTree: React.FC<Props> = ({ onNavigate }) => {
const handleSelect = (key: number) => onNavigate(IndexUtil.getUrl(key));
};
```
### ファイル命名規則
- Pages: `XxxPage.tsx` / `XxxPage.module.css`
- Components: `Xxx.tsx` / `Xxx.module.css`
- Routes: `XxxRoutes.tsx`
### Assets配置ルール
| 現在の場所 | 移動先 |
|---|---|
| `xoonips/assets/images/star.gif` | `components/xoonips/blocks/images/` |
| `xoonips/assets/images/tree_*.png` | `components/xoonips/blocks/images/` |
| `xoonips/assets/images/icon_*.gif` (14種) | `components/xoonips/images/` |
| `xoonips/assets/images/icon_folder.gif` | `components/xoonips/lib/images/` |
| `xoonips/assets/images/simpf_button.png` | `components/xoonips/lib/field/images/` |
| `common/assets/images/mlang_*.gif` | `components/common/LangFlag.images/` |
| `common/assets/images/smil*.gif` | `components/common/XoopsCode.images/` |
| `custom/assets/images/*` (20種) | `components/custom/images/` |
| `brainexplorer/assets/images/*` (3種) | `pages/brainexplorer/images/` |
| `nimgsearch/assets/brainarea.json` | `components/nimgsearch/images/` |
| `nimgdocs/assets/*.json` (7種) | `pages/nimgdocs/` (直配置) |
| `xoonips/assets/simpf-links.json` | `components/xoonips/lib/` (直配置) |
| `xoonips/assets/tree.json` | `components/xoonips/lib/` (直配置) |
+16
View File
@@ -0,0 +1,16 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:5173",
"webRoot": "${workspaceFolder}",
"preLaunchTask": "npm: dev"
}
]
}
+38
View File
@@ -0,0 +1,38 @@
{
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.biome": "explicit"
},
"[css]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[javascript]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[javascriptreact]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[json]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[jsonc]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[typescript]": {
"editor.defaultFormatter": "biomejs.biome"
},
"[typescriptreact]": {
"editor.defaultFormatter": "biomejs.biome"
},
// Extensions - Biome
// - see: biome.json
// Exteions - cSpell
// - see: .cspell.json
// Extensions - ESLint
"eslint.enable": false,
// Extensions - HTML
"html.format.wrapLineLength": 0,
// Extentions - Typescript
"javascript.updateImportsOnFileMove.enabled": "always",
"typescript.updateImportsOnFileMove.enabled": "always"
}
+20
View File
@@ -0,0 +1,20 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "dev",
"isBackground": true,
"problemMatcher": {
"owner": "custom",
"pattern": { "regexp": "^$" },
"background": {
"activeOnStart": true,
"beginsPattern": ".*",
"endsPattern": "Local:"
}
},
"label": "npm: dev"
}
]
}
+268 -269
View File
@@ -10,13 +10,6 @@ import {
let brainAreaCache: string[][] | null = null;
const loadBrainArea = async (): Promise<string[][]> => {
if (brainAreaCache !== null) return brainAreaCache;
const data = await ky.get('/modules/nimgsearch/images/brainarea.json').json<string[][]>();
brainAreaCache = data;
return data;
};
export type BrainCoordinateAxis = 'x' | 'y' | 'z';
interface BrainCoordinateBase<T> {
x: T;
@@ -63,283 +56,289 @@ const loadImage = async (url: string): Promise<HTMLImageElement> => {
return image;
};
const getResourceUrl: (name: string) => string = (name) => {
return `/modules/nimgsearch/res/${name}`;
};
export class NimgsearchUtil {
private path: string;
private xoonipsPath: string;
const getBrainImageUrl: (brainImageId: number, axis: BrainCoordinateAxis) => string = (brainImageId, axis) => {
return getResourceUrl(`${axis}/brain${brainImageId}.png`);
};
const getBrainAreaImageUrl: (brainAreaId: number, brainImageId: number, axis: BrainCoordinateAxis) => string = (
brainAreaId,
brainImageId,
axis,
) => {
const level = brainAreaId % 10;
return getResourceUrl(`level${level}/${brainAreaId}/${axis}/brain${brainImageId}.png`);
};
const roundBrainCoordinate: (coord: BrainCoordinate) => BrainCoordinate = (coord) => {
return { x: Math.round(coord.x), y: Math.round(coord.y), z: Math.round(coord.z) };
};
const fixBrainCoordinate: (coord: BrainCoordinate, type: BrainCoordinateType) => BrainCoordinate = (coord, type) => {
const mniCoord = type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('tal2icbm_spm', coord) : { ...coord };
const fixedMniCoord = {
x: fixRange(mniCoord.x, brainImageConfig.x.range.start, brainImageConfig.x.range.end),
y: fixRange(mniCoord.y, brainImageConfig.y.range.start, brainImageConfig.y.range.end),
z: fixRange(mniCoord.z, brainImageConfig.z.range.end, brainImageConfig.z.range.start),
};
return roundBrainCoordinate(
type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('icbm_spm2tal', fixedMniCoord) : fixedMniCoord,
);
};
const getBrainCoordinateFromOffset = (
currentCoord: BrainCoordinate,
type: BrainCoordinateType,
offset: { x: number; y: number },
imageSize: BrainImageSize,
axis: BrainCoordinateAxis,
): BrainCoordinate => {
const factor = brainImageFactor[imageSize];
const mniCoord =
type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('tal2icbm_spm', currentCoord) : { ...currentCoord };
switch (axis) {
case 'y':
mniCoord.x =
(offset.x * brainImageConfig.x.range.num) / brainImageConfig.y.width / factor + brainImageConfig.x.range.start;
mniCoord.z =
(offset.y * -brainImageConfig.z.range.num) / brainImageConfig.y.height / factor +
brainImageConfig.z.range.start;
break;
case 'x':
mniCoord.y =
(offset.x * brainImageConfig.y.range.num) / brainImageConfig.x.width / factor + brainImageConfig.y.range.start;
mniCoord.z =
(offset.y * -brainImageConfig.z.range.num) / brainImageConfig.x.height / factor +
brainImageConfig.z.range.start;
break;
case 'z':
mniCoord.x =
(offset.x * brainImageConfig.x.range.num) / brainImageConfig.z.width / factor + brainImageConfig.x.range.start;
mniCoord.y =
(offset.y * -brainImageConfig.y.range.num) / brainImageConfig.z.height / factor + brainImageConfig.y.range.end;
break;
constructor(path: string, xoonipsPath: string) {
this.path = path;
this.xoonipsPath = xoonipsPath;
}
return roundBrainCoordinate(
type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('icbm_spm2tal', mniCoord) : mniCoord,
);
};
const getOffsetFromBrainCoordinate = (
coord: BrainCoordinate,
type: BrainCoordinateType,
imageSize: BrainImageSize,
axis: BrainCoordinateAxis,
) => {
const mniCoord = type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('tal2icbm_spm', coord) : { ...coord };
const factor = brainImageFactor[imageSize];
const offset = { x: 0, y: 0 };
switch (axis) {
case 'y':
offset.x =
((mniCoord.x - brainImageConfig.x.range.start) / brainImageConfig.x.range.num) * brainImageConfig.y.width;
offset.y =
((mniCoord.z - brainImageConfig.z.range.start) / -brainImageConfig.z.range.num) * brainImageConfig.y.height;
break;
case 'x':
offset.x =
((mniCoord.y - brainImageConfig.y.range.start) / brainImageConfig.y.range.num) * brainImageConfig.x.width;
offset.y =
((mniCoord.z - brainImageConfig.z.range.start) / -brainImageConfig.z.range.num) * brainImageConfig.x.height;
break;
case 'z':
offset.x =
((mniCoord.x - brainImageConfig.x.range.start) / brainImageConfig.x.range.num) * brainImageConfig.z.width;
offset.y =
((mniCoord.y - brainImageConfig.y.range.end) / -brainImageConfig.y.range.num) * brainImageConfig.z.height;
break;
private async loadBrainArea(): Promise<string[][]> {
if (brainAreaCache !== null) return brainAreaCache;
const data = await ky.get(`${this.path}/images/brainarea.json`).json<string[][]>();
brainAreaCache = data;
return data;
}
return {
x: fixRange(Math.round(offset.x * factor), 0, Math.round(brainImageConfig[axis].width * factor)),
y: fixRange(Math.round(offset.y * factor), 0, Math.round(brainImageConfig[axis].height * factor)),
};
};
const getBrainImageId: (coord: BrainCoordinate, axis: BrainCoordinateAxis) => number = (coord, axis) => {
const im = brainImageConfig[axis];
const offset = coord[axis] - (axis === 'z' ? im.range.end : im.range.start);
return Math.floor(offset / 2 + 1);
};
private getResourceUrl(name: string): string {
return `${this.path}/res/${name}`;
}
const getBrainAreaImage = async (
brainAreaIds: number[],
brainImageId: number,
axis: BrainCoordinateAxis,
): Promise<HTMLImageElement> => {
const canvas = document.createElement('canvas');
canvas.width = brainImageConfig[axis].width;
canvas.height = brainImageConfig[axis].height;
const ctx = canvas.getContext('2d');
if (ctx !== null) {
const areas = await Promise.all(
brainAreaIds.map(async (brainAreaId) => loadImage(getBrainAreaImageUrl(brainAreaId, brainImageId, axis))),
private getBrainImageUrl(brainImageId: number, axis: BrainCoordinateAxis): string {
return this.getResourceUrl(`${axis}/brain${brainImageId}.png`);
}
private getBrainAreaImageUrl(brainAreaId: number, brainImageId: number, axis: BrainCoordinateAxis): string {
const level = brainAreaId % 10;
return this.getResourceUrl(`level${level}/${brainAreaId}/${axis}/brain${brainImageId}.png`);
}
roundBrainCoordinate(coord: BrainCoordinate): BrainCoordinate {
return { x: Math.round(coord.x), y: Math.round(coord.y), z: Math.round(coord.z) };
}
fixBrainCoordinate(coord: BrainCoordinate, type: BrainCoordinateType): BrainCoordinate {
const mniCoord = type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('tal2icbm_spm', coord) : { ...coord };
const fixedMniCoord = {
x: fixRange(mniCoord.x, brainImageConfig.x.range.start, brainImageConfig.x.range.end),
y: fixRange(mniCoord.y, brainImageConfig.y.range.start, brainImageConfig.y.range.end),
z: fixRange(mniCoord.z, brainImageConfig.z.range.end, brainImageConfig.z.range.start),
};
return this.roundBrainCoordinate(
type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('icbm_spm2tal', fixedMniCoord) : fixedMniCoord,
);
areas.forEach((area) => {
ctx.drawImage(area, 0, 0, canvas.width, canvas.height);
});
const idata = ctx.getImageData(0, 0, canvas.width, canvas.height);
for (let ii = 0; ii < idata.data.length; ii += 4) {
if (idata.data[ii + 3] > 0) {
idata.data[ii] = 0xff;
idata.data[ii + 1] = 0;
idata.data[ii + 2] = 0;
idata.data[ii + 3] = 0xff;
}
getBrainCoordinateFromOffset(
currentCoord: BrainCoordinate,
type: BrainCoordinateType,
offset: { x: number; y: number },
imageSize: BrainImageSize,
axis: BrainCoordinateAxis,
): BrainCoordinate {
const factor = brainImageFactor[imageSize];
const mniCoord =
type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('tal2icbm_spm', currentCoord) : { ...currentCoord };
switch (axis) {
case 'y':
mniCoord.x =
(offset.x * brainImageConfig.x.range.num) / brainImageConfig.y.width / factor +
brainImageConfig.x.range.start;
mniCoord.z =
(offset.y * -brainImageConfig.z.range.num) / brainImageConfig.y.height / factor +
brainImageConfig.z.range.start;
break;
case 'x':
mniCoord.y =
(offset.x * brainImageConfig.y.range.num) / brainImageConfig.x.width / factor +
brainImageConfig.y.range.start;
mniCoord.z =
(offset.y * -brainImageConfig.z.range.num) / brainImageConfig.x.height / factor +
brainImageConfig.z.range.start;
break;
case 'z':
mniCoord.x =
(offset.x * brainImageConfig.x.range.num) / brainImageConfig.z.width / factor +
brainImageConfig.x.range.start;
mniCoord.y =
(offset.y * -brainImageConfig.y.range.num) / brainImageConfig.z.height / factor +
brainImageConfig.z.range.end;
break;
}
return this.roundBrainCoordinate(
type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('icbm_spm2tal', mniCoord) : mniCoord,
);
}
getOffsetFromBrainCoordinate(
coord: BrainCoordinate,
type: BrainCoordinateType,
imageSize: BrainImageSize,
axis: BrainCoordinateAxis,
) {
const mniCoord = type === 'talairach' ? BrainCoordinateUtil.convertCoordinate('tal2icbm_spm', coord) : { ...coord };
const factor = brainImageFactor[imageSize];
const offset = { x: 0, y: 0 };
switch (axis) {
case 'y':
offset.x =
((mniCoord.x - brainImageConfig.x.range.start) / brainImageConfig.x.range.num) * brainImageConfig.y.width;
offset.y =
((mniCoord.z - brainImageConfig.z.range.start) / -brainImageConfig.z.range.num) * brainImageConfig.y.height;
break;
case 'x':
offset.x =
((mniCoord.y - brainImageConfig.y.range.start) / brainImageConfig.y.range.num) * brainImageConfig.x.width;
offset.y =
((mniCoord.z - brainImageConfig.z.range.start) / -brainImageConfig.z.range.num) * brainImageConfig.x.height;
break;
case 'z':
offset.x =
((mniCoord.x - brainImageConfig.x.range.start) / brainImageConfig.x.range.num) * brainImageConfig.z.width;
offset.y =
((mniCoord.y - brainImageConfig.y.range.end) / -brainImageConfig.y.range.num) * brainImageConfig.z.height;
break;
}
return {
x: fixRange(Math.round(offset.x * factor), 0, Math.round(brainImageConfig[axis].width * factor)),
y: fixRange(Math.round(offset.y * factor), 0, Math.round(brainImageConfig[axis].height * factor)),
};
}
getBrainImageId(coord: BrainCoordinate, axis: BrainCoordinateAxis): number {
const im = brainImageConfig[axis];
const offset = coord[axis] - (axis === 'z' ? im.range.end : im.range.start);
return Math.floor(offset / 2 + 1);
}
private async getBrainAreaImage(
brainAreaIds: number[],
brainImageId: number,
axis: BrainCoordinateAxis,
): Promise<HTMLImageElement> {
const canvas = document.createElement('canvas');
canvas.width = brainImageConfig[axis].width;
canvas.height = brainImageConfig[axis].height;
const ctx = canvas.getContext('2d');
if (ctx !== null) {
const areas = await Promise.all(
brainAreaIds.map(async (brainAreaId) => loadImage(this.getBrainAreaImageUrl(brainAreaId, brainImageId, axis))),
);
areas.forEach((area) => {
ctx.drawImage(area, 0, 0, canvas.width, canvas.height);
});
const idata = ctx.getImageData(0, 0, canvas.width, canvas.height);
for (let ii = 0; ii < idata.data.length; ii += 4) {
if (idata.data[ii + 3] > 0) {
idata.data[ii] = 0xff;
idata.data[ii + 1] = 0;
idata.data[ii + 2] = 0;
idata.data[ii + 3] = 0xff;
}
}
ctx.putImageData(idata, 0, 0);
}
const image = await loadImage(canvas.toDataURL('image/gif'));
return image;
}
async updateBrainImage(
canvas: HTMLCanvasElement,
coord: BrainCoordinate,
type: BrainCoordinateType,
axis: BrainCoordinateAxis,
imageSize: BrainImageSize,
brainAreaIds: number[],
showLines: boolean,
myItems: ItemNimgcenter[],
): Promise<void> {
const ctx = canvas.getContext('2d');
if (ctx !== null) {
const factor = brainImageFactor[imageSize];
const width = Math.round(brainImageConfig[axis].width * factor);
const height = Math.round(brainImageConfig[axis].height * factor);
if (canvas.width !== width || canvas.height !== height) {
canvas.width = width;
canvas.height = height;
}
const brainImageId = this.getBrainImageId(coord, axis);
const brainImage = await loadImage(this.getBrainImageUrl(brainImageId, axis));
ctx.drawImage(brainImage, 0, 0, width, height);
if (brainAreaIds.length > 0) {
const brainAreaImage = await this.getBrainAreaImage(brainAreaIds, brainImageId, axis);
ctx.save();
ctx.globalAlpha = 0.3;
ctx.drawImage(brainAreaImage, 0, 0, width, height);
ctx.restore();
}
if (myItems.length > 0) {
myItems.forEach((item, index) => {
ctx.save();
ctx.fillStyle = brainImageSpotConfig.color[index % 10];
ctx.globalAlpha = 0.6;
item.coordinate.forEach((spotCoord) => {
const gapSize = brainImageSpotConfig.gapSize.find(
(value) => Math.abs(coord[axis] - spotCoord[axis]) <= value.gap,
);
if (typeof gapSize !== 'undefined') {
const offset = this.getOffsetFromBrainCoordinate(spotCoord, type, imageSize, axis);
ctx.beginPath();
ctx.arc(offset.x + 0.5, offset.y - 0.5, gapSize.size, 0, Math.PI * 2, true);
ctx.fill();
}
});
ctx.restore();
});
}
if (showLines) {
const offset = this.getOffsetFromBrainCoordinate(coord, type, imageSize, axis);
ctx.save();
ctx.strokeStyle = '#8080c0';
ctx.lineWidth = 2.5;
ctx.beginPath();
ctx.moveTo(offset.x + 0.5, 0);
ctx.lineTo(offset.x + 0.5, height);
ctx.moveTo(0, offset.y - 0.5);
ctx.lineTo(width, offset.y - 0.5);
ctx.stroke();
ctx.restore();
}
}
ctx.putImageData(idata, 0, 0);
}
const image = await loadImage(canvas.toDataURL('image/gif'));
return image;
};
const updateBrainImage = async (
canvas: HTMLCanvasElement,
coord: BrainCoordinate,
type: BrainCoordinateType,
axis: BrainCoordinateAxis,
imageSize: BrainImageSize,
brainAreaIds: number[],
showLines: boolean,
myItems: ItemNimgcenter[],
): Promise<void> => {
const ctx = canvas.getContext('2d');
if (ctx !== null) {
const factor = brainImageFactor[imageSize];
const width = Math.round(brainImageConfig[axis].width * factor);
const height = Math.round(brainImageConfig[axis].height * factor);
if (canvas.width !== width || canvas.height !== height) {
canvas.width = width;
canvas.height = height;
async getBrainAreaNames(level: number): Promise<string[]> {
if (level < 1 || level > 5) {
return [];
}
const brainImageId = getBrainImageId(coord, axis);
const brainImage = await loadImage(getBrainImageUrl(brainImageId, axis));
ctx.drawImage(brainImage, 0, 0, width, height);
if (brainAreaIds.length > 0) {
const brainAreaImage = await getBrainAreaImage(brainAreaIds, brainImageId, axis);
ctx.save();
ctx.globalAlpha = 0.3;
ctx.drawImage(brainAreaImage, 0, 0, width, height);
ctx.restore();
const brainArea = await this.loadBrainArea();
return brainArea[level - 1];
}
async getBrainAreaName(id: number): Promise<string> {
const level = (id % 10) - 1;
const index = Math.floor(id / 10) - 1;
const brainArea = await this.loadBrainArea();
if (brainArea.length <= level || brainArea[level].length <= index) {
return '';
}
if (myItems.length > 0) {
myItems.forEach((item, index) => {
ctx.save();
ctx.fillStyle = brainImageSpotConfig.color[index % 10];
ctx.globalAlpha = 0.6;
item.coordinate.forEach((spotCoord) => {
const gapSize = brainImageSpotConfig.gapSize.find(
(value) => Math.abs(coord[axis] - spotCoord[axis]) <= value.gap,
);
if (typeof gapSize !== 'undefined') {
const offset = getOffsetFromBrainCoordinate(spotCoord, type, imageSize, axis);
ctx.beginPath();
ctx.arc(offset.x + 0.5, offset.y - 0.5, gapSize.size, 0, Math.PI * 2, true);
ctx.fill();
}
});
ctx.restore();
return brainArea[level][index];
}
getBrainAreaId(level: number, index: number): number {
return (index + 1) * 10 + level;
}
searchXoonipsItems(
coord: BrainCoordinate,
radius: number,
coordType: BrainCoordinateType,
searchType: SearchPaperType,
sortCondition: SortCondition,
advancedQeury: AdvancedSearchQuery,
andOr: string,
func: SearchCallbackFunc,
) {
const searchMain: (baseItemIds: number[]) => void = (baseItemIds) => {
const query = new AdvancedSearchQuery();
const coordTypeMap = { mni: 'M', talairach: 'T', unspecified: 'U' };
query.set('nimgcenter', 'tx', coord.x.toString());
query.set('nimgcenter', 'ty', coord.y.toString());
query.set('nimgcenter', 'tz', coord.z.toString());
query.set('nimgcenter', 'radius', radius.toString());
query.set('nimgcenter', 'coord_type', coordTypeMap[coordType]);
query.set('nimgcenter', 'coord_type_conversion', 'yes');
if (andOr !== '') {
query.set('nimgcenter', 'nimgsearch_andor', andOr);
}
if (searchType !== 'all') {
query.set('nimgcenter', 'index_id', searchType === 'normal' ? '4375' : '4376');
}
if (baseItemIds.length > 0) {
query.set('nimgcenter', 'baseitem_id', baseItemIds.join(','));
}
getItemUtil(this.xoonipsPath).getListByAdvancedSearchQuery(query, sortCondition, func);
};
if (!advancedQeury.empty()) {
getItemUtil(this.xoonipsPath).getListByAdvancedSearchQuery(advancedQeury, null, (result) => {
const baseItemIds = result.data.map((item) => item.item_id);
searchMain(baseItemIds);
});
}
if (showLines) {
const offset = getOffsetFromBrainCoordinate(coord, type, imageSize, axis);
ctx.save();
ctx.strokeStyle = '#8080c0';
ctx.lineWidth = 2.5;
ctx.beginPath();
ctx.moveTo(offset.x + 0.5, 0);
ctx.lineTo(offset.x + 0.5, height);
ctx.moveTo(0, offset.y - 0.5);
ctx.lineTo(width, offset.y - 0.5);
ctx.stroke();
ctx.restore();
} else {
searchMain([]);
}
}
};
const getBrainAreaNames = async (level: number): Promise<string[]> => {
if (level < 1 || level > 5) {
return [];
}
const brainArea = await loadBrainArea();
return brainArea[level - 1];
};
const getBrainAreaName = async (id: number): Promise<string> => {
const level = (id % 10) - 1;
const index = Math.floor(id / 10) - 1;
const brainArea = await loadBrainArea();
if (brainArea.length <= level || brainArea[level].length <= index) {
return '';
}
return brainArea[level][index];
};
const getBrainAreaId: (level: number, index: number) => number = (level, index) => {
return (index + 1) * 10 + level;
};
const searchXoonipsItems = (
coord: BrainCoordinate,
radius: number,
coordType: BrainCoordinateType,
searchType: SearchPaperType,
sortCondition: SortCondition,
advancedQeury: AdvancedSearchQuery,
andOr: string,
func: SearchCallbackFunc,
) => {
const searchMain: (baseItemIds: number[]) => void = (baseItemIds) => {
const query = new AdvancedSearchQuery();
const coordTypeMap = { mni: 'M', talairach: 'T', unspecified: 'U' };
query.set('nimgcenter', 'tx', coord.x.toString());
query.set('nimgcenter', 'ty', coord.y.toString());
query.set('nimgcenter', 'tz', coord.z.toString());
query.set('nimgcenter', 'radius', radius.toString());
query.set('nimgcenter', 'coord_type', coordTypeMap[coordType]);
query.set('nimgcenter', 'coord_type_conversion', 'yes');
if (andOr !== '') {
query.set('nimgcenter', 'nimgsearch_andor', andOr);
}
if (searchType !== 'all') {
query.set('nimgcenter', 'index_id', searchType === 'normal' ? '4375' : '4376');
}
if (baseItemIds.length > 0) {
query.set('nimgcenter', 'baseitem_id', baseItemIds.join(','));
}
getItemUtil('/modules/xoonips').getListByAdvancedSearchQuery(query, sortCondition, func);
};
if (!advancedQeury.empty()) {
getItemUtil('/modules/xoonips').getListByAdvancedSearchQuery(advancedQeury, null, (result) => {
const baseItemIds = result.data.map((item) => item.item_id);
searchMain(baseItemIds);
});
} else {
searchMain([]);
}
};
const NimgsearchUtil = {
fixBrainCoordinate,
roundBrainCoordinate,
getBrainCoordinateFromOffset,
updateBrainImage,
getBrainAreaNames,
getBrainAreaName,
getBrainAreaId,
searchXoonipsItems,
};
}
export default NimgsearchUtil;
+37 -23
View File
@@ -27,9 +27,12 @@ import styles from './NimgsearchPage.module.css';
interface Props {
lang: MultiLang;
path: string;
xoonipsPath: string;
}
const Nimgsearch: React.FC<Props> = ({ lang }) => {
const Nimgsearch: React.FC<Props> = ({ lang, path, xoonipsPath }) => {
const nimgsearchUtil = React.useMemo(() => new NimgsearchUtil(path, xoonipsPath), [path, xoonipsPath]);
const defaultCoord = React.useMemo(() => ({ x: 0, y: 0, z: 0 }) as BrainCoordinate, []);
const defaultSortCondition = React.useMemo(
() =>
@@ -82,7 +85,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
if (!isActive.current) return;
if (brainImageX.current) {
NimgsearchUtil.updateBrainImage(
nimgsearchUtil.updateBrainImage(
brainImageX.current,
coord,
formCoordType,
@@ -94,7 +97,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
);
}
if (brainImageY.current) {
NimgsearchUtil.updateBrainImage(
nimgsearchUtil.updateBrainImage(
brainImageY.current,
coord,
formCoordType,
@@ -106,7 +109,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
);
}
if (brainImageZ.current) {
NimgsearchUtil.updateBrainImage(
nimgsearchUtil.updateBrainImage(
brainImageZ.current,
coord,
formCoordType,
@@ -117,7 +120,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
showSpots ? myItems : [],
);
}
}, [coord, imageSize, brainAreaIds, showLines, showSpots, myItems, formCoordType]);
}, [coord, imageSize, brainAreaIds, showLines, showSpots, myItems, formCoordType, nimgsearchUtil]);
// Redraw canvas whenever relevant state changes
React.useEffect(() => {
@@ -159,10 +162,10 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
const promises = [];
const allNames: string[][] = [];
for (let i = 1; i <= 5; i++) {
promises.push(NimgsearchUtil.getBrainAreaNames(i).then((n) => allNames.push(n)));
promises.push(nimgsearchUtil.getBrainAreaNames(i).then((n) => allNames.push(n)));
}
Promise.all(promises).then(() => setBrainAreaNames(allNames));
}, []);
}, [nimgsearchUtil]);
React.useEffect(() => {
isActive.current = true;
@@ -175,22 +178,22 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
const onClickBrainImage = React.useCallback(
(event: React.MouseEvent<HTMLCanvasElement>, axis: BrainCoordinateAxis) => {
const offset = { x: event.nativeEvent.offsetX, y: event.nativeEvent.offsetY };
const newCoord = NimgsearchUtil.getBrainCoordinateFromOffset(coord, formCoordType, offset, imageSize, axis);
const newCoord = nimgsearchUtil.getBrainCoordinateFromOffset(coord, formCoordType, offset, imageSize, axis);
setPointer(newCoord);
updateBrainImage({ coord: newCoord });
},
[coord, formCoordType, imageSize, updateBrainImage],
[coord, formCoordType, imageSize, updateBrainImage, nimgsearchUtil],
);
const onMouseMoveBrainImage = React.useCallback(
(event: React.MouseEvent<HTMLCanvasElement>, axis: BrainCoordinateAxis) => {
const offset = { x: event.nativeEvent.offsetX, y: event.nativeEvent.offsetY };
const newPointer = NimgsearchUtil.getBrainCoordinateFromOffset(pointer, formCoordType, offset, imageSize, axis);
const newPointer = nimgsearchUtil.getBrainCoordinateFromOffset(pointer, formCoordType, offset, imageSize, axis);
if (newPointer.x !== pointer.x || newPointer.y !== pointer.y || newPointer.z !== pointer.z) {
setPointer(newPointer);
}
},
[pointer, formCoordType, imageSize],
[pointer, formCoordType, imageSize, nimgsearchUtil],
);
const onChnageCoordinate = React.useCallback(
@@ -202,7 +205,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
);
const onClickUpdateButton = React.useCallback(() => {
const newCoord = NimgsearchUtil.fixBrainCoordinate(
const newCoord = nimgsearchUtil.fixBrainCoordinate(
{
x: parseInt(formCoord.x, 10),
y: parseInt(formCoord.y, 10),
@@ -211,12 +214,12 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
formCoordType,
);
updateBrainImage({ coord: newCoord });
}, [formCoord, formCoordType, updateBrainImage]);
}, [formCoord, formCoordType, updateBrainImage, nimgsearchUtil]);
const updateSearchResults = React.useCallback(
(sc: SortCondition, ct: BrainCoordinateType) => {
const radius = parseInt(formRadiusRadio !== '' ? formRadiusRadio : formRadiusSelect, 10);
NimgsearchUtil.searchXoonipsItems(
nimgsearchUtil.searchXoonipsItems(
coord,
radius,
ct,
@@ -234,7 +237,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
.map(async (item) => {
const nc = item as ItemNimgcenter;
return new Promise<void>((resolve) => {
getItemUtil('/modules/xoonips').get(nc.baseitem_id, (baseItem) => {
getItemUtil(xoonipsPath).get(nc.baseitem_id, (baseItem) => {
if (baseItem !== null) {
setBaseItems((prev) => {
const next = new Map(prev);
@@ -255,7 +258,18 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
},
);
},
[coord, formRadiusRadio, formRadiusSelect, formPaperType, query, itemType, andOr, baseItems],
[
coord,
formRadiusRadio,
formRadiusSelect,
formPaperType,
query,
itemType,
andOr,
baseItems,
nimgsearchUtil,
xoonipsPath,
],
);
const renderListItem = React.useCallback(
@@ -271,7 +285,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
return (
<div className={styles.listItem}>
<div>
<a href={getItemUtil('/modules/xoonips').getUrl(item)} target="_blank" rel="noopener noreferrer">
<a href={getItemUtil(xoonipsPath).getUrl(item)} target="_blank" rel="noopener noreferrer">
{Functions.mlang(item.title, lang)}
</a>
</div>
@@ -328,7 +342,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
</div>
);
},
[showInfoItemIds, myItems, lang, updateBrainImage, baseItems],
[showInfoItemIds, myItems, lang, updateBrainImage, baseItems, xoonipsPath],
);
const renderBrainAreaTab = React.useCallback(() => {
@@ -347,7 +361,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
<div>
<select ref={brainAreaSource} className={styles.tabBrainAreaSelect} size={12} multiple>
{(brainAreaNames[brainAreaLevel - 1] || []).map((value, index) => {
const id = NimgsearchUtil.getBrainAreaId(brainAreaLevel, index);
const id = nimgsearchUtil.getBrainAreaId(brainAreaLevel, index);
return (
<option key={id} value={id}>
{value}
@@ -421,7 +435,7 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
</div>
</div>
);
}, [brainAreaLevel, brainAreaIds, updateBrainImage, brainAreaNames]);
}, [brainAreaLevel, brainAreaIds, updateBrainImage, brainAreaNames, nimgsearchUtil]);
const renderAdvancedSearchConditionTab = React.useCallback(() => {
return (
@@ -883,9 +897,9 @@ const Nimgsearch: React.FC<Props> = ({ lang }) => {
<span>{Functions.mlang('[en]Demo of usage[/en][ja]使い方のデモ[/ja]', lang)}</span>
</div>
<div>
<video width={240} height={210} poster="./help/demo.png" controls>
<source src="./help/demo.mp4" type="video/mp4" />
<source src="./help/demo.webm" type="video/webm" />
<video width={240} height={210} poster={`${path}/help/demo.png`} controls>
<source src={`${path}/help/demo.mp4`} type="video/mp4" />
<source src={`${path}/help/demo.webm`} type="video/webm" />
</video>
</div>
</div>
+4 -2
View File
@@ -7,9 +7,11 @@ interface Props {
path: string;
}
const XOONIPS_PATH = '/modules/xoonips';
const Nimgsearch: React.FC<Props> = (props) => {
const { lang } = props;
return <NimgsearchPage lang={lang} />;
const { lang, path } = props;
return <NimgsearchPage lang={lang} path={path} xoonipsPath={XOONIPS_PATH} />;
};
export default Nimgsearch;